Merge branch 'main' into gemini

Co-Authored-By: Antonio <antonio@zed.dev>

.git-blame-ignore-revs

@@ -19,10 +19,6 @@
 # https://github.com/zed-industries/zed/pull/2394
 eca93c124a488b4e538946cd2d313bd571aa2b86
 
-# 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

.github/ISSUE_TEMPLATE/2_crash_report.yml

@@ -27,8 +27,7 @@ body:
     attributes:
       label: If applicable, attach your `~/Library/Logs/Zed/Zed.log` file to this issue.
       description: |
-        macOS: `~/Library/Logs/Zed/Zed.log`
-        Linux: `~/.local/share/zed/logs/Zed.log` or $XDG_DATA_HOME
+        Drag Zed.log into the text input below.
         If you only need the most recent lines, you can run the `zed: open log` command palette action to see the last 1000.
       value: |
         <details><summary>Zed.log</summary><pre>

.github/workflows/release_nightly.yml

@@ -93,9 +93,9 @@ jobs:
       - name: Upload Zed Nightly
         run: script/upload-nightly macos
 
-  bundle-linux-x86:
+  bundle-deb:
     timeout-minutes: 60
-    name: Create a Linux *.tar.gz bundle for x86
+    name: Create a Linux *.tar.gz bundle
     if: github.repository_owner == 'zed-industries'
     runs-on:
       - self-hosted
@@ -121,57 +121,8 @@ jobs:
           echo "Publishing version: ${version} on release channel nightly"
           echo "nightly" > crates/zed/RELEASE_CHANNEL
 
-      - name: Create Linux .tar.gz bundle
-        run: script/bundle-linux
-
-      - name: Upload Zed Nightly
-        run: script/upload-nightly linux-targz
-
-  bundle-linux-arm:
-    timeout-minutes: 60
-    name: Create a Linux *.tar.gz bundle for ARM
-    if: github.repository_owner == 'zed-industries'
-    runs-on:
-      - self-hosted
-      - hosted-linux-arm-1
-    needs: tests
-    env:
-      DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
-      DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          clean: false
-
-      - name: "Setup jq"
-        uses: dcarbone/install-jq-action@v2
-
-      - name: Set up Clang
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y llvm-10 clang-10 build-essential cmake pkg-config libasound2-dev libfontconfig-dev libwayland-dev libxkbcommon-x11-dev libssl-dev libsqlite3-dev libzstd-dev libvulkan1 libgit2-dev
-          echo "/usr/lib/llvm-10/bin" >> $GITHUB_PATH
-
-      - uses: rui314/setup-mold@v1
-        with:
-          mold-version: 2.32.0
-
-      - name: rustup
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-
-      - name: Limit target directory size
-        run: script/clear-target-dir-if-larger-than 100
-
-      - name: Set release channel to nightly
-        run: |
-          set -euo pipefail
-          version=$(git rev-parse --short HEAD)
-          echo "Publishing version: ${version} on release channel nightly"
-          echo "nightly" > crates/zed/RELEASE_CHANNEL
+      - name: Generate license file
+        run: script/generate-licenses
 
       - name: Create Linux .tar.gz bundle
         run: script/bundle-linux

Cargo.lock

@@ -341,9 +341,8 @@ dependencies = [
 
 [[package]]
 name = "ashpd"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a"
+version = "0.9.0"
+source = "git+https://github.com/bilelmoussaoui/ashpd?rev=29f2e1a#29f2e1a6f4b0911f504658f5f4630c02e01b13f2"
 dependencies = [
  "async-fs 2.1.1",
  "async-net 2.0.0",
@@ -372,7 +371,6 @@ version = "0.1.0"
 dependencies = [
  "anthropic",
  "anyhow",
- "assets",
  "assistant_slash_command",
  "async-watch",
  "breadcrumbs",
@@ -409,7 +407,6 @@ dependencies = [
  "rand 0.8.5",
  "regex",
  "rope",
- "roxmltree 0.20.0",
  "schemars",
  "search",
  "semantic_index",
@@ -418,6 +415,7 @@ dependencies = [
  "settings",
  "similar",
  "smol",
+ "strsim 0.11.1",
  "strum",
  "telemetry_events",
  "terminal",
@@ -2245,7 +2243,7 @@ dependencies = [
  "bitflags 1.3.2",
  "clap_lex 0.2.4",
  "indexmap 1.9.3",
- "strsim",
+ "strsim 0.10.0",
  "termcolor",
  "textwrap",
 ]
@@ -2269,7 +2267,7 @@ dependencies = [
  "anstream",
  "anstyle",
  "clap_lex 0.5.1",
- "strsim",
+ "strsim 0.10.0",
 ]
 
 [[package]]
@@ -2565,7 +2563,6 @@ dependencies = [
  "anyhow",
  "call",
  "channel",
- "chrono",
  "client",
  "collections",
  "db",
@@ -3404,13 +3401,11 @@ dependencies = [
  "ctor",
  "editor",
  "env_logger",
- "feature_flags",
  "futures 0.3.28",
  "gpui",
  "language",
  "log",
  "lsp",
- "multi_buffer",
  "pretty_assertions",
  "project",
  "rand 0.8.5",
@@ -3595,7 +3590,6 @@ dependencies = [
  "aho-corasick",
  "anyhow",
  "assets",
- "chrono",
  "client",
  "clock",
  "collections",
@@ -3604,7 +3598,6 @@ dependencies = [
  "db",
  "emojis",
  "env_logger",
- "file_icons",
  "futures 0.3.28",
  "fuzzy",
  "git",
@@ -3991,7 +3984,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "client",
- "collections",
  "db",
  "editor",
  "extension",
@@ -4011,7 +4003,6 @@ dependencies = [
  "theme_selector",
  "ui",
  "util",
- "vim",
  "workspace",
 ]
 
@@ -4273,7 +4264,7 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d"
 dependencies = [
- "roxmltree 0.19.0",
+ "roxmltree",
 ]
 
 [[package]]
@@ -4828,6 +4819,7 @@ name = "google_ai"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "chrono",
  "futures 0.3.28",
  "http 0.1.0",
  "serde",
@@ -4910,7 +4902,6 @@ dependencies = [
  "num_cpus",
  "objc",
  "oo7",
- "open",
  "parking",
  "parking_lot",
  "pathfinder_geometry",
@@ -5073,7 +5064,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "client",
- "extension",
  "fs",
  "futures 0.3.28",
  "gpui",
@@ -5497,6 +5487,7 @@ dependencies = [
  "gpui",
  "project",
  "ui",
+ "util",
  "workspace",
 ]
 
@@ -5722,25 +5713,6 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
 
-[[package]]
-name = "is-docker"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "is-wsl"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
-dependencies = [
- "is-docker",
- "once_cell",
-]
-
 [[package]]
 name = "isahc"
 version = "1.7.2"
@@ -5945,7 +5917,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "async-watch",
  "clock",
  "collections",
  "ctor",
@@ -7224,17 +7195,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
-[[package]]
-name = "open"
-version = "5.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3"
-dependencies = [
- "is-wsl",
- "libc",
- "pathdiff",
-]
-
 [[package]]
 name = "open_ai"
 version = "0.1.0"
@@ -8082,7 +8042,6 @@ dependencies = [
  "serde_json",
  "settings",
  "sha2 0.10.7",
- "shellexpand 2.1.2",
  "shlex",
  "similar",
  "smol",
@@ -8109,7 +8068,6 @@ dependencies = [
  "db",
  "editor",
  "file_icons",
- "futures 0.3.28",
  "git",
  "gpui",
  "language",
@@ -8321,9 +8279,7 @@ dependencies = [
  "search",
  "settings",
  "ui",
- "util",
  "workspace",
- "zed_actions",
 ]
 
 [[package]]
@@ -8530,6 +8486,7 @@ dependencies = [
  "client",
  "dev_server_projects",
  "editor",
+ "feature_flags",
  "fuzzy",
  "gpui",
  "language",
@@ -8541,7 +8498,6 @@ dependencies = [
  "rpc",
  "serde",
  "serde_json",
- "settings",
  "smol",
  "task",
  "terminal_view",
@@ -8903,12 +8859,6 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
 
-[[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"
@@ -10367,6 +10317,12 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
 [[package]]
 name = "strum"
 version = "0.25.0"
@@ -10925,18 +10881,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.62"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.62"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -11901,7 +11857,7 @@ dependencies = [
  "kurbo",
  "log",
  "pico-args",
- "roxmltree 0.19.0",
+ "roxmltree",
  "simplecss",
  "siphasher 1.0.1",
  "strict-num",
@@ -13496,7 +13452,7 @@ dependencies = [
 [[package]]
 name = "xkbcommon"
 version = "0.7.0"
-source = "git+https://github.com/ConradIrwin/xkbcommon-rs?rev=fcbb4612185cc129ceeff51d22f7fb51810a03b2#fcbb4612185cc129ceeff51d22f7fb51810a03b2"
+source = "git+https://github.com/ConradIrwin/xkbcommon-rs?rev=2d4c4439160c7846ede0f0ece93bf73b1e613339#2d4c4439160c7846ede0f0ece93bf73b1e613339"
 dependencies = [
  "as-raw-xcb-connection",
  "libc",
@@ -13633,7 +13589,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "0.146.0"
+version = "0.145.0"
 dependencies = [
  "activity_indicator",
  "anyhow",
@@ -13775,7 +13731,7 @@ dependencies = [
 
 [[package]]
 name = "zed_elixir"
-version = "0.0.6"
+version = "0.0.5"
 dependencies = [
  "zed_extension_api 0.0.6",
 ]
@@ -13875,9 +13831,9 @@ dependencies = [
 
 [[package]]
 name = "zed_php"
-version = "0.1.2"
+version = "0.0.6"
 dependencies = [
- "zed_extension_api 0.0.6",
+ "zed_extension_api 0.0.4",
 ]
 
 [[package]]
@@ -13896,7 +13852,7 @@ dependencies = [
 
 [[package]]
 name = "zed_ruby"
-version = "0.0.8"
+version = "0.0.6"
 dependencies = [
  "zed_extension_api 0.0.6",
 ]
@@ -13911,7 +13867,7 @@ dependencies = [
 
 [[package]]
 name = "zed_svelte"
-version = "0.0.3"
+version = "0.0.2"
 dependencies = [
  "zed_extension_api 0.0.6",
 ]
@@ -13946,17 +13902,16 @@ dependencies = [
 
 [[package]]
 name = "zed_vue"
-version = "0.1.0"
+version = "0.0.3"
 dependencies = [
- "serde",
  "zed_extension_api 0.0.6",
 ]
 
 [[package]]
 name = "zed_zig"
-version = "0.1.4"
+version = "0.1.3"
 dependencies = [
- "zed_extension_api 0.0.6",
+ "zed_extension_api 0.0.7",
 ]
 
 [[package]]

Cargo.toml

@@ -274,7 +274,7 @@ zed_actions = { path = "crates/zed_actions" }
 alacritty_terminal = "0.23"
 any_vec = "0.13"
 anyhow = "1.0.57"
-ashpd = "0.9.1"
+ashpd = { git = "https://github.com/bilelmoussaoui/ashpd", rev = "29f2e1a" }
 async-compression = { version = "0.4", features = ["gzip", "futures-io"] }
 async-dispatcher = { version = "0.1" }
 async-fs = "1.6"
@@ -457,6 +457,7 @@ features = [
     "Win32_System_SystemInformation",
     "Win32_System_SystemServices",
     "Win32_System_Threading",
+    "Win32_System_Time",
     "Win32_System_WinRT",
     "Win32_UI_Controls",
     "Win32_UI_HiDpi",

assets/icons/chevron_down_small.svg

@@ -1,3 +0,0 @@
-<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.49574 4.74787L5.99574 7.25214L8.49574 4.74787" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/repl_neutral.svg

@@ -1,13 +1,14 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_62_95)">
-<path d="M4.5 6C3.67157 6 3 5.32843 3 4.5C3 3.67157 3.67157 3 4.5 3C5.32843 3 6 3.67157 6 4.5C6 5.32843 5.32843 6 4.5 6Z" stroke="white" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.54433 13.4334C6.87775 13.5227 7.22046 13.3249 7.3098 12.9914C7.39914 12.658 7.20127 12.3153 6.86786 12.226L6.54433 13.4334ZM3.77426 6.86772L3.93603 6.26401L2.72862 5.94049L2.56686 6.54419L3.77426 6.86772ZM6.86786 12.226C4.53394 11.6006 3.14889 9.20163 3.77426 6.86772L2.56686 6.54419C1.76281 9.54494 3.54359 12.6293 6.54433 13.4334L6.86786 12.226Z" fill="white"/>
-<path d="M11.5 13C10.6716 13 10 12.3284 10 11.5C10 10.6716 10.6716 10 11.5 10C12.3284 10 13 10.6716 13 11.5C13 12.3284 12.3284 13 11.5 13Z" stroke="white" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.1875 4.21113C9.88852 4.03854 9.7861 3.65629 9.95869 3.35736C10.1313 3.05843 10.5135 2.95601 10.8125 3.12859L10.1875 4.21113ZM11.7888 10.1875C12.9969 8.09496 12.28 5.41925 10.1875 4.21113L10.8125 3.12859C13.5028 4.6819 14.4246 8.12209 12.8713 10.8125L11.7888 10.1875Z" fill="white"/>
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_32_58)">
+<path d="M19 7C20.1046 7 21 6.10457 21 5C21 3.89543 20.1046 3 19 3C17.8954 3 17 3.89543 17 5C17 6.10457 17.8954 7 19 7Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5 21C6.10457 21 7 20.1046 7 19C7 17.8954 6.10457 17 5 17C3.89543 17 3 17.8954 3 19C3 20.1046 3.89543 21 5 21Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.3999 21.9C12.3227 22.2159 14.2958 21.9632 16.0769 21.173C17.858 20.3827 19.3694 19.0893 20.4254 17.4517C21.4814 15.8142 22.036 13.9037 22.021 11.9553C22.006 10.0068 21.422 8.10512 20.3409 6.48401" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.4998 2.10002C11.5849 1.8076 9.62631 2.07763 7.86198 2.87732C6.09765 3.677 4.60356 4.9719 3.56126 6.60468C2.51896 8.23745 1.97332 10.1378 1.99063 12.0748C2.00795 14.0118 2.58749 15.9021 3.65882 17.516" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 13C12.5523 13 13 12.5523 13 12C13 11.4477 12.5523 11 12 11C11.4477 11 11 11.4477 11 12C11 12.5523 11.4477 13 12 13Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </g>
 <defs>
-<clipPath id="clip0_62_95">
-<rect width="16" height="16" fill="white" transform="matrix(-1 0 0 1 16 0)"/>
+<clipPath id="clip0_32_58">
+<rect width="24" height="24" fill="white"/>
 </clipPath>
 </defs>
 </svg>

assets/keymaps/default-linux.json

@@ -19,6 +19,7 @@
       "escape": "menu::Cancel",
       "ctrl-escape": "menu::Cancel",
       "ctrl-c": "menu::Cancel",
+      "shift-enter": "picker::UseSelectedQuery",
       "alt-enter": ["picker::ConfirmInput", { "secondary": false }],
       "ctrl-alt-enter": ["picker::ConfirmInput", { "secondary": true }],
       "ctrl-shift-w": "workspace::CloseWindow",
@@ -78,8 +79,10 @@
       "shift-down": "editor::SelectDown",
       "shift-left": "editor::SelectLeft",
       "shift-right": "editor::SelectRight",
-      "ctrl-shift-left": "editor::SelectToPreviousWordStart", // cursorWordLeftSelect
-      "ctrl-shift-right": "editor::SelectToNextWordEnd", // cursorWordRightSelect
+      "ctrl-shift-left": "editor::SelectToPreviousWordStart",
+      "ctrl-shift-right": "editor::SelectToNextWordEnd",
+      "ctrl-shift-up": "editor::AddSelectionAbove",
+      "ctrl-shift-down": "editor::AddSelectionBelow",
       "ctrl-shift-home": "editor::SelectToBeginning",
       "ctrl-shift-end": "editor::SelectToEnd",
       "ctrl-a": "editor::SelectAll",
@@ -205,7 +208,7 @@
     }
   },
   {
-    "context": "ProjectSearchBar && in_replace > Editor",
+    "context": "ProjectSearchBar && in_replace",
     "bindings": {
       "enter": "search::ReplaceNext",
       "ctrl-alt-enter": "search::ReplaceAll"
@@ -258,19 +261,20 @@
     "bindings": {
       "ctrl-[": "editor::Outdent",
       "ctrl-]": "editor::Indent",
-      "shift-alt-up": "editor::AddSelectionAbove", // Insert Cursor Above
-      "shift-alt-down": "editor::AddSelectionBelow", // Insert Cursor Below
+      "shift-alt-up": "editor::AddSelectionAbove",
+      "shift-alt-down": "editor::AddSelectionBelow",
       "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-shift-down": ["editor::SelectNext", { "replace_newest": false }], // Add selection to Next Find Match
-      "ctrl-shift-up": ["editor::SelectPrevious", { "replace_newest": false }],
+      "ctrl-shift-left": "editor::SelectToPreviousWordStart",
+      "ctrl-shift-right": "editor::SelectToNextWordEnd",
+      "ctrl-shift-up": "editor::SelectLargerSyntaxNode", //todo(linux) tmp keybinding
+      "ctrl-shift-down": "editor::SelectSmallerSyntaxNode", //todo(linux) tmp keybinding
+      "ctrl-d": ["editor::SelectNext", { "replace_newest": false }],
+      "ctrl-shift-l": "editor::SelectAllMatches",
+      "ctrl-shift-d": ["editor::SelectPrevious", { "replace_newest": false }],
       "ctrl-k ctrl-d": ["editor::SelectNext", { "replace_newest": true }],
       "ctrl-k ctrl-shift-d": ["editor::SelectPrevious", { "replace_newest": true }],
       "ctrl-k ctrl-i": "editor::Hover",
@@ -323,7 +327,7 @@
       "alt-9": ["pane::ActivateItem", 8],
       "alt-0": "pane::ActivateLastItem",
       "ctrl-alt--": "pane::GoBack",
-      "ctrl-alt-_": "pane::GoForward",
+      "ctrl-alt-shift--": "pane::GoForward",
       "ctrl-shift-t": "pane::ReopenClosedItem",
       "f3": "search::SelectNextMatch",
       "shift-f3": "search::SelectPrevMatch",
@@ -563,13 +567,6 @@
       "tab": "channel_modal::ToggleMode"
     }
   },
-  {
-    "context": "Picker > Editor",
-    "bindings": {
-      "tab": "picker::ConfirmCompletion",
-      "alt-enter": ["picker::ConfirmInput", { "secondary": false }]
-    }
-  },
   {
     "context": "ChannelModal > Picker > Editor",
     "bindings": {

assets/keymaps/default-macos.json

@@ -83,7 +83,7 @@
       "ctrl-n": "editor::MoveDown",
       "ctrl-b": "editor::MoveLeft",
       "ctrl-f": "editor::MoveRight",
-      "ctrl-l": "editor::ScrollCursorCenter",
+      "ctrl-l": "editor::NextScreen",
       "alt-left": "editor::MoveToPreviousWordStart",
       "alt-b": "editor::MoveToPreviousWordStart",
       "alt-right": "editor::MoveToNextWordEnd",
@@ -102,9 +102,9 @@
       "ctrl-shift-b": "editor::SelectLeft",
       "shift-right": "editor::SelectRight",
       "ctrl-shift-f": "editor::SelectRight",
-      "alt-shift-left": "editor::SelectToPreviousWordStart", // cursorWordLeftSelect
+      "alt-shift-left": "editor::SelectToPreviousWordStart",
       "alt-shift-b": "editor::SelectToPreviousWordStart",
-      "alt-shift-right": "editor::SelectToNextWordEnd", // cursorWordRightSelect
+      "alt-shift-right": "editor::SelectToNextWordEnd",
       "alt-shift-f": "editor::SelectToNextWordEnd",
       "ctrl-shift-up": "editor::SelectToStartOfParagraph",
       "ctrl-shift-down": "editor::SelectToEndOfParagraph",
@@ -255,7 +255,7 @@
     }
   },
   {
-    "context": "ProjectSearchBar && in_replace > Editor",
+    "context": "ProjectSearchBar && in_replace",
     "bindings": {
       "enter": "search::ReplaceNext",
       "cmd-enter": "search::ReplaceAll"
@@ -302,20 +302,19 @@
     "bindings": {
       "cmd-[": "editor::Outdent",
       "cmd-]": "editor::Indent",
-      "cmd-alt-up": "editor::AddSelectionAbove", // Insert cursor above
+      "cmd-alt-up": "editor::AddSelectionAbove",
       "cmd-ctrl-p": "editor::AddSelectionAbove",
-      "cmd-alt-down": "editor::AddSelectionBelow", // Insert cursor below
+      "cmd-alt-down": "editor::AddSelectionBelow",
       "cmd-ctrl-n": "editor::AddSelectionBelow",
       "cmd-shift-k": "editor::DeleteLine",
       "alt-up": "editor::MoveLineUp",
       "alt-down": "editor::MoveLineDown",
       "alt-shift-up": "editor::DuplicateLineUp",
       "alt-shift-down": "editor::DuplicateLineDown",
-      "ctrl-shift-right": "editor::SelectLargerSyntaxNode", // Expand Selection
-      "ctrl-shift-left": "editor::SelectSmallerSyntaxNode", // Shrink Selection
-      "cmd-d": ["editor::SelectNext", { "replace_newest": false }], // Add selection to Next Find Match
-      "cmd-shift-l": "editor::SelectAllMatches", // Select all occurrences of current selection
-      "cmd-f2": "editor::SelectAllMatches", // Select all occurrences of current word
+      "ctrl-shift-right": "editor::SelectLargerSyntaxNode",
+      "ctrl-shift-left": "editor::SelectSmallerSyntaxNode",
+      "cmd-d": ["editor::SelectNext", { "replace_newest": false }],
+      "cmd-shift-l": "editor::SelectAllMatches",
       "ctrl-cmd-d": ["editor::SelectPrevious", { "replace_newest": false }],
       "cmd-k cmd-d": ["editor::SelectNext", { "replace_newest": true }],
       "cmd-k ctrl-cmd-d": ["editor::SelectPrevious", { "replace_newest": true }],
@@ -595,14 +594,6 @@
       "tab": "channel_modal::ToggleMode"
     }
   },
-  {
-    "context": "Picker > Editor",
-    "bindings": {
-      "tab": "picker::ConfirmCompletion",
-      "alt-enter": ["picker::ConfirmInput", { "secondary": false }],
-      "cmd-alt-enter": ["picker::ConfirmInput", { "secondary": true }]
-    }
-  },
   {
     "context": "ChannelModal > Picker > Editor",
     "bindings": {
@@ -622,6 +613,14 @@
       "ctrl-backspace": "tab_switcher::CloseSelectedItem"
     }
   },
+  {
+    "context": "Picker",
+    "bindings": {
+      "f2": "picker::UseSelectedQuery",
+      "alt-enter": ["picker::ConfirmInput", { "secondary": false }],
+      "cmd-alt-enter": ["picker::ConfirmInput", { "secondary": true }]
+    }
+  },
   {
     "context": "Terminal",
     "bindings": {

assets/keymaps/initial.json

@@ -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",
-    "bindings": {
-      // "j k": ["workspace::SendKeystrokes", "escape"]
-    }
-  }
-]

assets/keymaps/linux/atom.json

@@ -25,7 +25,6 @@
       "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
     }
   },

assets/keymaps/linux/jetbrains.json

@@ -13,7 +13,6 @@
       "ctrl-shift-j": "editor::JoinLines",
       "ctrl-d": "editor::DuplicateLineDown",
       "ctrl-y": "editor::DeleteLine",
-      "ctrl-m": "editor::ScrollCursorCenter",
       "ctrl-pagedown": "editor::MovePageDown",
       "ctrl-pageup": "editor::MovePageUp",
       // "ctrl-alt-shift-b": "editor::SelectToPreviousWordStart",

assets/keymaps/linux/sublime_text.json

@@ -3,10 +3,10 @@
     "bindings": {
       "ctrl-shift-[": "pane::ActivatePrevItem",
       "ctrl-shift-]": "pane::ActivateNextItem",
-      "ctrl-pageup": "pane::ActivatePrevItem",
-      "ctrl-pagedown": "pane::ActivateNextItem",
-      "ctrl-tab": "pane::ActivateNextItem",
-      "ctrl-shift-tab": "pane::ActivatePrevItem"
+      "ctrl-pagedown": "pane::ActivatePrevItem",
+      "ctrl-pageup": "pane::ActivateNextItem",
+      "ctrl-shift-tab": "pane::ActivateNextItem",
+      "ctrl-tab": "pane::ActivatePrevItem"
     }
   },
   {

assets/keymaps/macos/atom.json

@@ -26,7 +26,6 @@
       "cmd-shift-d": "editor::DuplicateLineDown",
       "ctrl-cmd-up": "editor::MoveLineUp",
       "ctrl-cmd-down": "editor::MoveLineDown",
-      "cmd-\\": "workspace::ToggleLeftDock",
       "ctrl-shift-m": "markdown::OpenPreviewToTheSide"
     }
   },

assets/keymaps/macos/sublime_text.json

@@ -3,10 +3,10 @@
     "bindings": {
       "cmd-shift-[": "pane::ActivatePrevItem",
       "cmd-shift-]": "pane::ActivateNextItem",
-      "ctrl-pageup": "pane::ActivatePrevItem",
-      "ctrl-pagedown": "pane::ActivateNextItem",
-      "ctrl-tab": "pane::ActivateNextItem",
-      "ctrl-shift-tab": "pane::ActivatePrevItem"
+      "ctrl-pagedown": "pane::ActivatePrevItem",
+      "ctrl-pageup": "pane::ActivateNextItem",
+      "ctrl-shift-tab": "pane::ActivateNextItem",
+      "ctrl-tab": "pane::ActivatePrevItem"
     }
   },
   {

assets/keymaps/vim.json

@@ -10,7 +10,6 @@
       "backspace": "vim::Backspace",
       "j": "vim::Down",
       "down": "vim::Down",
-      "ctrl-j": "vim::Down",
       "enter": "vim::NextLineStart",
       "ctrl-m": "vim::NextLineStart",
       "+": "vim::NextLineStart",
@@ -216,7 +215,7 @@
       "shift-d": "vim::DeleteToEndOfLine",
       "shift-j": "vim::JoinLines",
       "y": ["vim::PushOperator", "Yank"],
-      "shift-y": "vim::YankToEndOfLine",
+      "shift-y": "vim::YankLine",
       "i": "vim::InsertBefore",
       "shift-i": "vim::InsertFirstNonWhitespace",
       "a": "vim::InsertAfter",
@@ -334,10 +333,7 @@
     "context": "vim_mode == waiting",
     "bindings": {
       "tab": "vim::Tab",
-      "enter": "vim::Enter",
-      "escape": "vim::ClearOperators",
-      "ctrl-c": "vim::ClearOperators",
-      "ctrl-[": "vim::ClearOperators"
+      "enter": "vim::Enter"
     }
   },
   {

assets/prompts/operations.md

@@ -1,241 +0,0 @@
-Your task is to map a step from the conversation above to operations on symbols inside the provided source files.
-
-Guidelines:
-- There's no need to describe *what* to do, just *where* to do it.
-- If creating a file, assume any subsequent updates are included at the time of creation.
-- Don't create and then update a file.
-- We'll create it in one shot.
-- Prefer updating symbols lower in the syntax tree if possible.
-- Never include operations on a parent symbol and one of its children in the same <operations> block.
-- Never nest an operation with another operation or include CDATA or other content. All operations are leaf nodes.
-- Include a description attribute for each operation with a brief, one-line description of the change to perform.
-- Descriptions are required for all operations except delete.
-- When generating multiple operations, ensure the descriptions are specific to each individual operation.
-- Avoid referring to the location in the description. Focus on the change to be made, not the location where it's made. That's implicit with the symbol you provide.
-- Don't generate multiple operations at the same location. Instead, combine them together in a single operation with a succinct combined description.
-
-The available operation types are:
-
-1. <update>: Modify an existing symbol in a file.
-2. <create_file>: Create a new file.
-3. <insert_sibling_after>: Add a new symbol as sibling after an existing symbol in a file.
-4. <append_child>: Add a new symbol as the last child of an existing symbol in a file.
-5. <prepend_child>: Add a new symbol as the first child of an existing symbol in a file.
-6. <delete>: Remove an existing symbol from a file. The `description` attribute is invalid for delete, but required for other ops.
-
-All operations *require* a path.
-Operations that *require* a symbol: <update>, <insert_sibling_after>, <delete>
-Operations that don't allow a symbol: <create>
-Operations that have an *optional* symbol: <prepend_child>, <append_child>
-
-Example 1:
-
-User:
-  ```rs src/rectangle.rs
-  struct Rectangle {
-      width: f64,
-      height: f64,
-  }
-
-  impl Rectangle {
-      fn new(width: f64, height: f64) -> Self {
-          Rectangle { width, height }
-      }
-  }
-  ```
-
-  Symbols for src/rectangle.rs:
-  - struct Rectangle
-  - impl Rectangle
-  - impl Rectangle fn new
-
-  <step>Add new methods 'calculate_area' and 'calculate_perimeter' to the Rectangle struct</step>
-  <step>Implement the 'Display' trait for the Rectangle struct</step>
-
-  What are the operations for the step: <step>Add a new method 'calculate_area' to the Rectangle struct</step>
-
-Assistant (wrong):
-<operations>
-    <append_child path="src/shapes.rs" symbol="impl Rectangle" description="Add calculate_area method" />
-    <append_child path="src/shapes.rs" symbol="impl Rectangle" description="Add calculate_perimeter method" />
-</operations>
-
-This demonstrates what NOT to do. NEVER append multiple children at the same location.
-
-Assistant (corrected):
-<operations>
-    <append_child path="src/shapes.rs" symbol="impl Rectangle" description="Add calculate area and perimeter methods" />
-</operations>
-
-User:
-What are the operations for the step: <step>Implement the 'Display' trait for the Rectangle struct</step>
-
-Assistant:
-<operations>
-    <insert_sibling_after path="src/shapes.rs" symbol="impl Rectangle" description="Implement Display trait for Rectangle"/>
-</operations>
-
-Example 2:
-
-User:
-```rs src/user.rs
-struct User {
-    pub name: String,
-    age: u32,
-    email: String,
-}
-
-impl User {
-    fn new(name: String, age: u32, email: String) -> Self {
-        User { name, age, email }
-    }
-
-    pub fn print_info(&self) {
-        println!("Name: {}, Age: {}, Email: {}", self.name, self.age, self.email);
-    }
-}
-```
-
-Symbols for src/user.rs:
-- struct User
-- struct User pub name
-- struct User age
-- struct User email
-- impl User
-- impl User fn new
-- impl User pub fn print_info
-
-<step>Update the 'print_info' method to use formatted output</step>
-<step>Remove the 'email' field from the User struct</step>
-
-What are the operations for the step: <step>Update the 'print_info' method to use formatted output</step>
-
-Assistant:
-<operations>
-    <update path="src/user.rs" symbol="impl User fn print_info" description="Use formatted output" />
-</operations>
-
-User:
-What are the operations for the step: <step>Remove the 'email' field from the User struct</step>
-
-Assistant:
-<operations>
-    <delete path="src/user.rs" symbol="struct User email" description="Remove the email field" />
-</operations>
-
-Example 3:
-
-User:
-```rs src/vehicle.rs
-struct Vehicle {
-    make: String,
-    model: String,
-    year: u32,
-}
-
-impl Vehicle {
-    fn new(make: String, model: String, year: u32) -> Self {
-        Vehicle { make, model, year }
-    }
-
-    fn print_year(&self) {
-        println!("Year: {}", self.year);
-    }
-}
-```
-
-Symbols for src/vehicle.rs:
-- struct Vehicle
-- struct Vehicle make
-- struct Vehicle model
-- struct Vehicle year
-- impl Vehicle
-- impl Vehicle fn new
-- impl Vehicle fn print_year
-
-<step>Add a 'use std::fmt;' statement at the beginning of the file</step>
-<step>Add a new method 'start_engine' in the Vehicle impl block</step>
-
-What are the operations for the step: <step>Add a 'use std::fmt;' statement at the beginning of the file</step>
-
-Assistant:
-<operations>
-    <prepend_child path="src/vehicle.rs" description="Add 'use std::fmt' statement" />
-</operations>
-
-User:
-What are the operations for the step: <step>Add a new method 'start_engine' in the Vehicle impl block</step>
-
-Assistant:
-<operations>
-    <insert_sibling_after path="src/vehicle.rs" symbol="impl Vehicle fn new" description="Add start_engine method"/>
-</operations>
-
-Example 4:
-
-User:
-```rs src/employee.rs
-struct Employee {
-    name: String,
-    position: String,
-    salary: u32,
-    department: String,
-}
-
-impl Employee {
-    fn new(name: String, position: String, salary: u32, department: String) -> Self {
-        Employee { name, position, salary, department }
-    }
-
-    fn print_details(&self) {
-        println!("Name: {}, Position: {}, Salary: {}, Department: {}",
-                  self.name, self.position, self.salary, self.department);
-    }
-
-    fn give_raise(&mut self, amount: u32) {
-        self.salary += amount;
-    }
-}
-```
-
-Symbols for src/employee.rs:
-- struct Employee
-- struct Employee name
-- struct Employee position
-- struct Employee salary
-- struct Employee department
-- impl Employee
-- impl Employee fn new
-- impl Employee fn print_details
-- impl Employee fn give_raise
-
-<step>Make salary an f32</step>
-
-What are the operations for the step: <step>Make salary an f32</step>
-
-A (wrong):
-  <operations>
-      <update path="src/employee.rs" symbol="struct Employee" description="Change the type of salary to an f32" />
-      <update path="src/employee.rs" symbol="struct Employee salary" description="Change the type to an f32" />
-  </operations>
-
-This example demonstrates what not to do. `struct Employee salary` is a child of `struct Employee`.
-
-A (corrected):
-  <operations>
-      <update path="src/employee.rs" symbol="struct Employee salary" description="Change the type to an f32" />
-  </operations>
-
-User:
-  What are the correct operations for the step: <step>Remove the 'department' field and update the 'print_details' method</step>
-
-A:
-  <operations>
-      <delete path="src/employee.rs" symbol="struct Employee department" />
-      <update path="src/employee.rs" symbol="impl Employee fn print_details" description="Don't print the 'department' field" />
-  </operations>
-
-Now generate the operations for the following step.
-Output only valid XML containing valid operations with their required attributes.
-NEVER output code or any other text inside <operation> tags. If you do, you will replaced with another model.
-Your response *MUST* begin with <operations> and end with </operations>:

assets/settings/default.json

@@ -94,9 +94,6 @@
   //  3. Never close the window
   //         "when_closing_with_no_tabs": "keep_window_open",
   "when_closing_with_no_tabs": "platform_default",
-  // 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 the cursor blinks in the editor.
   "cursor_blink": true,
   // How to highlight the current line in the editor.
@@ -396,7 +393,6 @@
       // 2. "gpt-4"
       // 3. "gpt-4-turbo-preview"
       // 4. "gpt-4o"
-      // 5. "gpt-4o-mini"
       "default_model": "gpt-4o"
     }
   },
@@ -435,9 +431,7 @@
     // Show git status colors in the editor tabs.
     "git_status": false,
     // Position of the close button on the editor tabs.
-    "close_position": "right",
-    // Whether to show the file icon for a tab.
-    "file_icons": false
+    "close_position": "right"
   },
   // Settings related to preview tabs.
   "preview_tabs": {
@@ -791,7 +785,6 @@
       }
     },
     "PHP": {
-      "language_servers": ["phpactor", "!intelephense", "..."],
       "prettier": {
         "allowed": true,
         "plugins": ["@prettier/plugin-php"],
@@ -799,7 +792,7 @@
       }
     },
     "Ruby": {
-      "language_servers": ["solargraph", "!ruby-lsp", "!rubocop", "..."]
+      "language_servers": ["solargraph", "!ruby-lsp", "..."]
     },
     "SCSS": {
       "prettier": {

assets/settings/initial_user_settings.json

@@ -4,8 +4,8 @@
 // documentation: https://zed.dev/docs/configuring-zed
 //
 // To see all of Zed's default settings without changing your
-// custom settings, run the `zed: Open Default Settings` command
-// from the command palette
+// custom settings, run the `open default settings` command
+// from the command palette or from `Zed` application menu.
 {
   "ui_font_size": 16,
   "buffer_font_size": 16,

crates/activity_indicator/src/activity_indicator.rs

@@ -107,7 +107,6 @@ impl ActivityIndicator {
                                 Editor::for_buffer(buffer, Some(project.clone()), cx)
                             })),
                             None,
-                            true,
                             cx,
                         );
                     })?;

crates/assistant/Cargo.toml

@@ -23,7 +23,6 @@ test-support = [
 [dependencies]
 anthropic = { workspace = true, features = ["schemars"] }
 anyhow.workspace = true
-assets.workspace = true
 assistant_slash_command.workspace = true
 async-watch.workspace = true
 breadcrumbs.workspace = true
@@ -64,6 +63,7 @@ serde_json.workspace = true
 settings.workspace = true
 similar.workspace = true
 smol.workspace = true
+strsim = "0.11"
 strum.workspace = true
 telemetry_events.workspace = true
 terminal.workspace = true
@@ -76,7 +76,6 @@ util.workspace = true
 uuid.workspace = true
 workspace.workspace = true
 picker.workspace = true
-roxmltree = "0.20.0"
 
 [dev-dependencies]
 ctor.workspace = true

crates/assistant/src/assistant.rs

@@ -7,6 +7,7 @@ mod inline_assistant;
 mod model_selector;
 mod prompt_library;
 mod prompts;
+mod search;
 mod slash_command;
 mod streaming_diff;
 mod terminal_inline_assistant;
@@ -20,7 +21,7 @@ pub use completion_provider::*;
 pub use context::*;
 pub use context_store::*;
 use fs::Fs;
-use gpui::{actions, impl_actions, AppContext, Global, SharedString, UpdateGlobal};
+use gpui::{actions, AppContext, Global, SharedString, UpdateGlobal};
 use indexed_docs::IndexedDocsRegistry;
 pub(crate) use inline_assistant::*;
 pub(crate) use model_selector::*;
@@ -29,8 +30,8 @@ use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsStore};
 use slash_command::{
     active_command, default_command, diagnostics_command, docs_command, fetch_command,
-    file_command, now_command, project_command, prompt_command, search_command, symbols_command,
-    tabs_command, term_command,
+    file_command, now_command, project_command, prompt_command, search_command, tabs_command,
+    term_command,
 };
 use std::{
     fmt::{self, Display},
@@ -48,22 +49,16 @@ actions!(
         InsertIntoEditor,
         ToggleFocus,
         ResetKey,
+        InlineAssist,
         InsertActivePrompt,
         DeployHistory,
         DeployPromptLibrary,
+        ApplyEdit,
         ConfirmCommand,
-        ToggleModelSelector,
-        DebugEditSteps
+        ToggleModelSelector
     ]
 );
 
-#[derive(Clone, Default, Deserialize, PartialEq)]
-pub struct InlineAssist {
-    prompt: Option<String>,
-}
-
-impl_actions!(assistant, [InlineAssist]);
-
 #[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 pub struct MessageId(clock::Lamport);
 
@@ -194,8 +189,12 @@ pub struct LanguageModelRequest {
     pub messages: Vec<LanguageModelRequestMessage>,
     pub stop: Vec<String>,
     pub temperature: f32,
+    pub cached_contents: Vec<CachedContentId>,
 }
 
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
+pub struct CachedContentId(String);
+
 impl LanguageModelRequest {
     pub fn to_proto(&self) -> proto::CompleteWithLanguageModel {
         proto::CompleteWithLanguageModel {
@@ -205,6 +204,7 @@ impl LanguageModelRequest {
             temperature: self.temperature,
             tool_choice: None,
             tools: Vec::new(),
+            cached_contents: self.cached_contents.iter().map(|id| id.0.clone()).collect(),
         }
     }
 
@@ -372,7 +372,6 @@ fn register_slash_commands(cx: &mut AppContext) {
     let slash_command_registry = SlashCommandRegistry::global(cx);
     slash_command_registry.register_command(file_command::FileSlashCommand, true);
     slash_command_registry.register_command(active_command::ActiveSlashCommand, true);
-    slash_command_registry.register_command(symbols_command::OutlineSlashCommand, true);
     slash_command_registry.register_command(tabs_command::TabsSlashCommand, true);
     slash_command_registry.register_command(project_command::ProjectSlashCommand, true);
     slash_command_registry.register_command(search_command::SearchSlashCommand, true);

crates/assistant/src/assistant_settings.rs

@@ -23,7 +23,6 @@ pub enum CloudModel {
     Gpt4Turbo,
     #[default]
     Gpt4Omni,
-    Gpt4OmniMini,
     Claude3_5Sonnet,
     Claude3Opus,
     Claude3Sonnet,
@@ -108,7 +107,6 @@ impl CloudModel {
             Self::Gpt4 => "gpt-4",
             Self::Gpt4Turbo => "gpt-4-turbo-preview",
             Self::Gpt4Omni => "gpt-4o",
-            Self::Gpt4OmniMini => "gpt-4o-mini",
             Self::Claude3_5Sonnet => "claude-3-5-sonnet",
             Self::Claude3Opus => "claude-3-opus",
             Self::Claude3Sonnet => "claude-3-sonnet",
@@ -125,7 +123,6 @@ impl CloudModel {
             Self::Gpt4 => "GPT 4",
             Self::Gpt4Turbo => "GPT 4 Turbo",
             Self::Gpt4Omni => "GPT 4 Omni",
-            Self::Gpt4OmniMini => "GPT 4 Omni Mini",
             Self::Claude3_5Sonnet => "Claude 3.5 Sonnet",
             Self::Claude3Opus => "Claude 3 Opus",
             Self::Claude3Sonnet => "Claude 3 Sonnet",
@@ -141,7 +138,6 @@ impl CloudModel {
             Self::Gpt3Point5Turbo => 2048,
             Self::Gpt4 => 4096,
             Self::Gpt4Turbo | Self::Gpt4Omni => 128000,
-            Self::Gpt4OmniMini => 128000,
             Self::Claude3_5Sonnet
             | Self::Claude3Opus
             | Self::Claude3Sonnet

crates/assistant/src/completion_provider.rs

@@ -20,10 +20,11 @@ use crate::{
 };
 use anyhow::Result;
 use client::Client;
-use futures::{future::BoxFuture, stream::BoxStream, StreamExt};
+use futures::{future::BoxFuture, stream::BoxStream};
 use gpui::{AnyView, AppContext, BorrowAppContext, Task, WindowContext};
 use settings::{Settings, SettingsStore};
-use std::{any::Any, pin::Pin, sync::Arc, task::Poll, time::Duration};
+use std::time::Duration;
+use std::{any::Any, sync::Arc};
 
 /// Choose which model to use for openai provider.
 /// If the model is not available, try to use the first available model, or fallback to the original model.
@@ -54,21 +55,10 @@ pub fn init(client: Arc<Client>, cx: &mut AppContext) {
 }
 
 pub struct CompletionResponse {
-    inner: BoxStream<'static, Result<String>>,
+    pub inner: BoxFuture<'static, Result<BoxStream<'static, Result<String>>>>,
     _lock: SemaphoreGuardArc,
 }
 
-impl futures::Stream for CompletionResponse {
-    type Item = Result<String>;
-
-    fn poll_next(
-        mut self: Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-    ) -> Poll<Option<Self::Item>> {
-        Pin::new(&mut self.inner).poll_next(cx)
-    }
-}
-
 pub trait LanguageModelCompletionProvider: Send + Sync {
     fn available_models(&self, cx: &AppContext) -> Vec<LanguageModel>;
     fn settings_version(&self) -> usize;
@@ -82,7 +72,7 @@ pub trait LanguageModelCompletionProvider: Send + Sync {
         request: LanguageModelRequest,
         cx: &AppContext,
     ) -> BoxFuture<'static, Result<usize>>;
-    fn stream_completion(
+    fn complete(
         &self,
         request: LanguageModelRequest,
     ) -> BoxFuture<'static, Result<BoxStream<'static, Result<String>>>>;
@@ -146,34 +136,20 @@ impl CompletionProvider {
         self.provider.read().count_tokens(request, cx)
     }
 
-    pub fn stream_completion(
+    pub fn complete(
         &self,
         request: LanguageModelRequest,
         cx: &AppContext,
-    ) -> Task<Result<CompletionResponse>> {
+    ) -> Task<CompletionResponse> {
         let rate_limiter = self.request_limiter.clone();
         let provider = self.provider.clone();
-        cx.foreground_executor().spawn(async move {
+        cx.background_executor().spawn(async move {
             let lock = rate_limiter.acquire_arc().await;
-            let response = provider.read().stream_completion(request);
-            let response = response.await?;
-            Ok(CompletionResponse {
+            let response = provider.read().complete(request);
+            CompletionResponse {
                 inner: response,
                 _lock: lock,
-            })
-        })
-    }
-
-    pub fn complete(&self, request: LanguageModelRequest, cx: &AppContext) -> Task<Result<String>> {
-        let response = self.stream_completion(request, cx);
-        cx.foreground_executor().spawn(async move {
-            let mut chunks = response.await?;
-            let mut completion = String::new();
-            while let Some(chunk) = chunks.next().await {
-                let chunk = chunk?;
-                completion.push_str(&chunk);
             }
-            Ok(completion)
         })
     }
 }
@@ -324,7 +300,7 @@ mod tests {
 
         // Enqueue some requests
         for i in 0..MAX_CONCURRENT_COMPLETION_REQUESTS * 2 {
-            let response = provider.stream_completion(
+            let response = provider.complete(
                 LanguageModelRequest {
                     temperature: i as f32 / 10.0,
                     ..Default::default()
@@ -333,7 +309,8 @@ mod tests {
             );
             cx.background_executor()
                 .spawn(async move {
-                    let mut stream = response.await.unwrap();
+                    let response = response.await;
+                    let mut stream = response.inner.await.unwrap();
                     while let Some(message) = stream.next().await {
                         message.unwrap();
                     }
@@ -349,7 +326,7 @@ mod tests {
 
         // Get the first completion request that is in flight and mark it as completed.
         let completion = fake_provider
-            .pending_completions()
+            .running_completions()
             .into_iter()
             .next()
             .unwrap();
@@ -370,7 +347,7 @@ mod tests {
         );
 
         // Mark all completion requests as finished that are in flight.
-        for request in fake_provider.pending_completions() {
+        for request in fake_provider.running_completions() {
             fake_provider.finish_completion(&request);
         }
 
@@ -385,7 +362,7 @@ mod tests {
         );
 
         // Finish all remaining completion requests.
-        for request in fake_provider.pending_completions() {
+        for request in fake_provider.running_completions() {
             fake_provider.finish_completion(&request);
         }
 

crates/assistant/src/completion_provider/anthropic.rs

@@ -94,7 +94,7 @@ impl LanguageModelCompletionProvider for AnthropicCompletionProvider {
         count_open_ai_tokens(request, cx.background_executor())
     }
 
-    fn stream_completion(
+    fn complete(
         &self,
         request: LanguageModelRequest,
     ) -> BoxFuture<'static, Result<BoxStream<'static, Result<String>>>> {

crates/assistant/src/completion_provider/cloud.rs

@@ -135,7 +135,7 @@ impl LanguageModelCompletionProvider for CloudCompletionProvider {
         }
     }
 
-    fn stream_completion(
+    fn complete(
         &self,
         mut request: LanguageModelRequest,
     ) -> BoxFuture<'static, Result<BoxStream<'static, Result<String>>>> {
@@ -152,6 +152,11 @@ impl LanguageModelCompletionProvider for CloudCompletionProvider {
             temperature: request.temperature,
             tools: Vec::new(),
             tool_choice: None,
+            cached_contents: request
+                .cached_contents
+                .iter()
+                .map(|id| id.0.clone())
+                .collect(),
         };
 
         self.client

crates/assistant/src/completion_provider/fake.rs

@@ -23,7 +23,7 @@ impl FakeCompletionProvider {
         this
     }
 
-    pub fn pending_completions(&self) -> Vec<LanguageModelRequest> {
+    pub fn running_completions(&self) -> Vec<LanguageModelRequest> {
         self.current_completion_txs
             .lock()
             .keys()
@@ -35,7 +35,7 @@ impl FakeCompletionProvider {
         self.current_completion_txs.lock().len()
     }
 
-    pub fn send_completion_chunk(&self, request: &LanguageModelRequest, chunk: String) {
+    pub fn send_completion(&self, request: &LanguageModelRequest, chunk: String) {
         let json = serde_json::to_string(request).unwrap();
         self.current_completion_txs
             .lock()
@@ -45,19 +45,10 @@ impl FakeCompletionProvider {
             .unwrap();
     }
 
-    pub fn send_last_completion_chunk(&self, chunk: String) {
-        self.send_completion_chunk(self.pending_completions().last().unwrap(), chunk);
-    }
-
     pub fn finish_completion(&self, request: &LanguageModelRequest) {
         self.current_completion_txs
             .lock()
-            .remove(&serde_json::to_string(request).unwrap())
-            .unwrap();
-    }
-
-    pub fn finish_last_completion(&self) {
-        self.finish_completion(self.pending_completions().last().unwrap());
+            .remove(&serde_json::to_string(request).unwrap());
     }
 }
 
@@ -98,7 +89,7 @@ impl LanguageModelCompletionProvider for FakeCompletionProvider {
         futures::future::ready(Ok(0)).boxed()
     }
 
-    fn stream_completion(
+    fn complete(
         &self,
         _request: LanguageModelRequest,
     ) -> BoxFuture<'static, Result<BoxStream<'static, Result<String>>>> {

crates/assistant/src/completion_provider/ollama.rs

@@ -91,7 +91,7 @@ impl LanguageModelCompletionProvider for OllamaCompletionProvider {
         async move { Ok(token_count) }.boxed()
     }
 
-    fn stream_completion(
+    fn complete(
         &self,
         request: LanguageModelRequest,
     ) -> BoxFuture<'static, Result<BoxStream<'static, Result<String>>>> {

crates/assistant/src/completion_provider/open_ai.rs

@@ -179,7 +179,7 @@ impl LanguageModelCompletionProvider for OpenAiCompletionProvider {
         count_open_ai_tokens(request, cx.background_executor())
     }
 
-    fn stream_completion(
+    fn complete(
         &self,
         request: LanguageModelRequest,
     ) -> BoxFuture<'static, Result<BoxStream<'static, Result<String>>>> {

crates/assistant/src/inline_assistant.rs

@@ -9,35 +9,27 @@ use collections::{hash_map, HashMap, HashSet, VecDeque};
 use editor::{
     actions::{MoveDown, MoveUp, SelectAll},
     display_map::{
-        BlockContext, BlockDisposition, BlockProperties, BlockStyle, CustomBlockId, RenderBlock,
+        BlockContext, BlockDisposition, BlockId, BlockProperties, BlockStyle, RenderBlock,
         ToDisplayPoint,
     },
     Anchor, AnchorRangeExt, Editor, EditorElement, EditorEvent, EditorMode, EditorStyle,
     ExcerptRange, GutterDimensions, MultiBuffer, MultiBufferSnapshot, ToOffset, ToPoint,
 };
 use fs::Fs;
-use futures::{
-    channel::mpsc,
-    future::LocalBoxFuture,
-    stream::{self, BoxStream},
-    SinkExt, Stream, StreamExt,
-};
+use futures::{channel::mpsc, SinkExt, Stream, StreamExt};
 use gpui::{
     point, AppContext, EventEmitter, FocusHandle, FocusableView, FontStyle, Global, HighlightStyle,
     Model, ModelContext, Subscription, Task, TextStyle, UpdateGlobal, View, ViewContext, WeakView,
     WhiteSpace, WindowContext,
 };
-use language::{Bias, Buffer, Point, Selection, TransactionId};
+use language::{Buffer, Point, Selection, TransactionId};
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
 use rope::Rope;
 use settings::{update_settings_file, Settings};
 use similar::TextDiff;
-use smol::future::FutureExt;
 use std::{
-    cmp,
-    future::Future,
-    mem,
+    cmp, mem,
     ops::{Range, RangeInclusive},
     pin::Pin,
     sync::Arc,
@@ -87,7 +79,6 @@ impl InlineAssistant {
         editor: &View<Editor>,
         workspace: Option<WeakView<Workspace>>,
         assistant_panel: Option<&View<AssistantPanel>>,
-        initial_prompt: Option<String>,
         cx: &mut WindowContext,
     ) {
         let snapshot = editor.read(cx).buffer().read(cx).snapshot(cx);
@@ -139,11 +130,11 @@ impl InlineAssistant {
         }
 
         let assist_group_id = self.next_assist_group_id.post_inc();
-        let prompt_buffer =
-            cx.new_model(|cx| Buffer::local(initial_prompt.unwrap_or_default(), cx));
+        let prompt_buffer = cx.new_model(|cx| Buffer::local("", cx));
         let prompt_buffer = cx.new_model(|cx| MultiBuffer::singleton(prompt_buffer, cx));
 
         let mut assists = Vec::new();
+        let mut assist_blocks = Vec::new();
         let mut assist_to_focus = None;
         for range in codegen_ranges {
             let assist_id = self.next_assist_id.post_inc();
@@ -151,7 +142,6 @@ impl InlineAssistant {
                 Codegen::new(
                     editor.read(cx).buffer().clone(),
                     range.clone(),
-                    false,
                     self.telemetry.clone(),
                     cx,
                 )
@@ -184,18 +174,42 @@ impl InlineAssistant {
                 }
             }
 
-            let [prompt_block_id, end_block_id] =
-                self.insert_assist_blocks(editor, range, &prompt_editor, cx);
-
-            assists.push((assist_id, prompt_editor, prompt_block_id, end_block_id));
+            assist_blocks.push(BlockProperties {
+                style: BlockStyle::Sticky,
+                position: range.start,
+                height: prompt_editor.read(cx).height_in_lines,
+                render: build_assist_editor_renderer(&prompt_editor),
+                disposition: BlockDisposition::Above,
+            });
+            assist_blocks.push(BlockProperties {
+                style: BlockStyle::Sticky,
+                position: range.end,
+                height: 1,
+                render: Box::new(|cx| {
+                    v_flex()
+                        .h_full()
+                        .w_full()
+                        .border_t_1()
+                        .border_color(cx.theme().status().info_border)
+                        .into_any_element()
+                }),
+                disposition: BlockDisposition::Below,
+            });
+            assists.push((assist_id, prompt_editor));
         }
 
+        let assist_block_ids = editor.update(cx, |editor, cx| {
+            editor.insert_blocks(assist_blocks, None, cx)
+        });
+
         let editor_assists = self
             .assists_by_editor
             .entry(editor.downgrade())
             .or_insert_with(|| EditorInlineAssists::new(&editor, cx));
         let mut assist_group = InlineAssistGroup::new();
-        for (assist_id, prompt_editor, prompt_block_id, end_block_id) in assists {
+        for ((assist_id, prompt_editor), block_ids) in
+            assists.into_iter().zip(assist_block_ids.chunks_exact(2))
+        {
             self.assists.insert(
                 assist_id,
                 InlineAssist::new(
@@ -204,8 +218,8 @@ impl InlineAssistant {
                     assistant_panel.is_some(),
                     editor,
                     &prompt_editor,
-                    prompt_block_id,
-                    end_block_id,
+                    block_ids[0],
+                    block_ids[1],
                     prompt_editor.read(cx).codegen.clone(),
                     workspace.clone(),
                     cx,
@@ -221,119 +235,6 @@ impl InlineAssistant {
         }
     }
 
-    #[allow(clippy::too_many_arguments)]
-    pub fn suggest_assist(
-        &mut self,
-        editor: &View<Editor>,
-        range: Range<Anchor>,
-        initial_prompt: String,
-        insert_newline: bool,
-        workspace: Option<WeakView<Workspace>>,
-        assistant_panel: Option<&View<AssistantPanel>>,
-        cx: &mut WindowContext,
-    ) -> InlineAssistId {
-        let assist_group_id = self.next_assist_group_id.post_inc();
-        let prompt_buffer = cx.new_model(|cx| Buffer::local(&initial_prompt, cx));
-        let prompt_buffer = cx.new_model(|cx| MultiBuffer::singleton(prompt_buffer, cx));
-
-        let assist_id = self.next_assist_id.post_inc();
-
-        let codegen = cx.new_model(|cx| {
-            Codegen::new(
-                editor.read(cx).buffer().clone(),
-                range.clone(),
-                insert_newline,
-                self.telemetry.clone(),
-                cx,
-            )
-        });
-
-        let gutter_dimensions = Arc::new(Mutex::new(GutterDimensions::default()));
-        let prompt_editor = cx.new_view(|cx| {
-            PromptEditor::new(
-                assist_id,
-                gutter_dimensions.clone(),
-                self.prompt_history.clone(),
-                prompt_buffer.clone(),
-                codegen.clone(),
-                editor,
-                assistant_panel,
-                workspace.clone(),
-                self.fs.clone(),
-                cx,
-            )
-        });
-
-        let [prompt_block_id, end_block_id] =
-            self.insert_assist_blocks(editor, range, &prompt_editor, cx);
-
-        let editor_assists = self
-            .assists_by_editor
-            .entry(editor.downgrade())
-            .or_insert_with(|| EditorInlineAssists::new(&editor, cx));
-
-        let mut assist_group = InlineAssistGroup::new();
-        self.assists.insert(
-            assist_id,
-            InlineAssist::new(
-                assist_id,
-                assist_group_id,
-                assistant_panel.is_some(),
-                editor,
-                &prompt_editor,
-                prompt_block_id,
-                end_block_id,
-                prompt_editor.read(cx).codegen.clone(),
-                workspace.clone(),
-                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_id
-    }
-
-    fn insert_assist_blocks(
-        &self,
-        editor: &View<Editor>,
-        mut range: Range<Anchor>,
-        prompt_editor: &View<PromptEditor>,
-        cx: &mut WindowContext,
-    ) -> [CustomBlockId; 2] {
-        let buffer = editor.read(cx).buffer();
-        range.start = range.start.bias_left(&buffer.read(cx).read(cx));
-        range.end = range.end.bias_right(&buffer.read(cx).read(cx));
-        let assist_blocks = vec![
-            BlockProperties {
-                style: BlockStyle::Sticky,
-                position: range.start,
-                height: prompt_editor.read(cx).height_in_lines,
-                render: build_assist_editor_renderer(prompt_editor),
-                disposition: BlockDisposition::Above,
-            },
-            BlockProperties {
-                style: BlockStyle::Sticky,
-                position: range.end,
-                height: 1,
-                render: Box::new(|cx| {
-                    v_flex()
-                        .h_full()
-                        .w_full()
-                        .border_t_1()
-                        .border_color(cx.theme().status().info_border)
-                        .into_any_element()
-                }),
-                disposition: BlockDisposition::Below,
-            },
-        ];
-
-        editor.update(cx, |editor, cx| {
-            let block_ids = editor.insert_blocks(assist_blocks, None, cx);
-            [block_ids[0], block_ids[1]]
-        })
-    }
-
     fn handle_prompt_editor_focus_in(&mut self, assist_id: InlineAssistId, cx: &mut WindowContext) {
         let assist = &self.assists[&assist_id];
         let Some(decorations) = assist.decorations.as_ref() else {
@@ -478,14 +379,6 @@ impl InlineAssistant {
         cx.propagate();
     }
 
-    fn handle_editor_release(&mut self, editor: WeakView<Editor>, cx: &mut WindowContext) {
-        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, cx);
-            }
-        }
-    }
-
     fn handle_editor_change(&mut self, editor: View<Editor>, cx: &mut WindowContext) {
         let Some(editor_assists) = self.assists_by_editor.get(&editor.downgrade()) else {
             return;
@@ -805,7 +698,7 @@ impl InlineAssistant {
         assist_group.assist_ids.clone()
     }
 
-    pub fn start_assist(&mut self, assist_id: InlineAssistId, cx: &mut WindowContext) {
+    fn start_assist(&mut self, assist_id: InlineAssistId, cx: &mut WindowContext) {
         let assist = if let Some(assist) = self.assists.get_mut(&assist_id) {
             assist
         } else {
@@ -834,26 +727,16 @@ impl InlineAssistant {
             self.prompt_history.pop_front();
         }
 
+        assist.codegen.update(cx, |codegen, cx| codegen.undo(cx));
         let codegen = assist.codegen.clone();
-        let telemetry_id = CompletionProvider::global(cx).model().telemetry_id();
-        let chunks: LocalBoxFuture<Result<BoxStream<Result<String>>>> =
-            if user_prompt.trim().to_lowercase() == "delete" {
-                async { Ok(stream::empty().boxed()) }.boxed_local()
-            } else {
-                let request = self.request_for_inline_assist(assist_id, cx);
-                let mut cx = cx.to_async();
-                async move {
-                    let request = request.await?;
-                    let chunks = cx
-                        .update(|cx| CompletionProvider::global(cx).stream_completion(request, cx))?
-                        .await?;
-                    Ok(chunks.boxed())
-                }
-                .boxed_local()
-            };
-        codegen.update(cx, |codegen, cx| {
-            codegen.start(telemetry_id, chunks, cx);
-        });
+        let request = self.request_for_inline_assist(assist_id, cx);
+
+        cx.spawn(|mut cx| async move {
+            let request = request.await?;
+            codegen.update(&mut cx, |codegen, cx| codegen.start(request, cx))?;
+            anyhow::Ok(())
+        })
+        .detach_and_log_err(cx);
     }
 
     fn request_for_inline_assist(
@@ -968,11 +851,12 @@ impl InlineAssistant {
                 messages,
                 stop: vec!["|END|>".to_string()],
                 temperature,
+                cached_contents: Vec::new(),
             })
         })
     }
 
-    pub fn stop_assist(&mut self, assist_id: InlineAssistId, cx: &mut WindowContext) {
+    fn stop_assist(&mut self, assist_id: InlineAssistId, cx: &mut WindowContext) {
         let assist = if let Some(assist) = self.assists.get_mut(&assist_id) {
             assist
         } else {
@@ -1191,14 +1075,6 @@ impl EditorInlineAssists {
                 }
             }),
             _subscriptions: vec![
-                cx.observe_release(editor, {
-                    let editor = editor.downgrade();
-                    |_, cx| {
-                        InlineAssistant::update_global(cx, |this, cx| {
-                            this.handle_editor_release(editor, cx);
-                        })
-                    }
-                }),
                 cx.observe(editor, move |editor, cx| {
                     InlineAssistant::update_global(cx, |this, cx| {
                         this.handle_editor_change(editor, cx)
@@ -1263,7 +1139,7 @@ fn build_assist_editor_renderer(editor: &View<PromptEditor>) -> RenderBlock {
 }
 
 #[derive(Copy, Clone, Default, Debug, PartialEq, Eq, Hash)]
-pub struct InlineAssistId(usize);
+struct InlineAssistId(usize);
 
 impl InlineAssistId {
     fn post_inc(&mut self) -> InlineAssistId {
@@ -1893,8 +1769,8 @@ impl InlineAssist {
         include_context: bool,
         editor: &View<Editor>,
         prompt_editor: &View<PromptEditor>,
-        prompt_block_id: CustomBlockId,
-        end_block_id: CustomBlockId,
+        prompt_block_id: BlockId,
+        end_block_id: BlockId,
         codegen: Model<Codegen>,
         workspace: Option<WeakView<Workspace>>,
         cx: &mut WindowContext,
@@ -1988,10 +1864,10 @@ impl InlineAssist {
 }
 
 struct InlineAssistDecorations {
-    prompt_block_id: CustomBlockId,
+    prompt_block_id: BlockId,
     prompt_editor: View<PromptEditor>,
-    removed_line_block_ids: HashSet<CustomBlockId>,
-    end_block_id: CustomBlockId,
+    removed_line_block_ids: HashSet<BlockId>,
+    end_block_id: BlockId,
 }
 
 #[derive(Debug)]
@@ -2007,7 +1883,6 @@ pub struct Codegen {
     range: Range<Anchor>,
     edit_position: Anchor,
     last_equal_ranges: Vec<Range<Anchor>>,
-    insert_newline: Option<Bias>,
     transaction_id: Option<TransactionId>,
     status: CodegenStatus,
     generation: Task<()>,
@@ -2037,8 +1912,6 @@ impl Codegen {
     pub fn new(
         buffer: Model<MultiBuffer>,
         range: Range<Anchor>,
-        /// If Some, insert an initial newline before generating (before or after the generation range).
-        insert_newline: Option<Bias>,
         telemetry: Option<Arc<Telemetry>>,
         cx: &mut ModelContext<Self>,
     ) -> Self {
@@ -2071,8 +1944,7 @@ impl Codegen {
             range,
             snapshot,
             last_equal_ranges: Default::default(),
-            insert_newline,
-            transaction_id: None,
+            transaction_id: Default::default(),
             status: CodegenStatus::Idle,
             generation: Task::ready(()),
             diff: Diff::default(),
@@ -2100,26 +1972,8 @@ impl Codegen {
         &self.last_equal_ranges
     }
 
-    pub fn start(
-        &mut self,
-        telemetry_id: String,
-        stream: impl 'static + Future<Output = Result<BoxStream<'static, Result<String>>>>,
-        cx: &mut ModelContext<Self>,
-    ) {
-        self.undo(cx);
-        self.buffer.update(cx, |buffer, cx| {
-            if self.insert_newline {
-                buffer.start_transaction(cx);
-                buffer.edit([(self.range.start..self.range.start, "\n")], None, cx);
-                self.transaction_id = buffer.end_transaction(cx);
-                self.snapshot = buffer.snapshot(cx);
-            }
-        });
-
-        let mut range = self.range.clone();
-        range.start = range.start.bias_left(&self.snapshot);
-        range.end = range.end.bias_right(&self.snapshot);
-
+    pub fn start(&mut self, prompt: LanguageModelRequest, cx: &mut ModelContext<Self>) {
+        let range = self.range.clone();
         let snapshot = self.snapshot.clone();
         let selected_text = snapshot
             .text_for_range(range.start..range.end)
@@ -2132,13 +1986,15 @@ impl Codegen {
             .next()
             .unwrap_or_else(|| snapshot.indent_size_for_line(MultiBufferRow(selection_start.row)));
 
+        let model_telemetry_id = prompt.model.telemetry_id();
+        let response = CompletionProvider::global(cx).complete(prompt, cx);
         let telemetry = self.telemetry.clone();
         self.edit_position = range.start;
         self.diff = Diff::default();
         self.status = CodegenStatus::Pending;
         self.generation = cx.spawn(|this, mut cx| {
             async move {
-                let chunks = stream.await;
+                let response = response.await;
                 let generate = async {
                     let mut edit_start = range.start.to_offset(&snapshot);
 
@@ -2148,7 +2004,7 @@ impl Codegen {
                             let mut response_latency = None;
                             let request_start = Instant::now();
                             let diff = async {
-                                let chunks = StripInvalidSpans::new(chunks?);
+                                let chunks = StripInvalidSpans::new(response.inner.await?);
                                 futures::pin_mut!(chunks);
                                 let mut diff = StreamingDiff::new(selected_text.to_string());
 
@@ -2231,7 +2087,7 @@ impl Codegen {
                                 telemetry.report_assistant_event(
                                     None,
                                     telemetry_events::AssistantKind::Inline,
-                                    telemetry_id,
+                                    model_telemetry_id,
                                     response_latency,
                                     error_message,
                                 );
@@ -2596,8 +2452,11 @@ fn merge_ranges(ranges: &mut Vec<Range<Anchor>>, buffer: &MultiBufferSnapshot) {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use std::sync::Arc;
+
     use crate::FakeCompletionProvider;
+
+    use super::*;
     use futures::stream::{self};
     use gpui::{Context, TestAppContext};
     use indoc::indoc;
@@ -2608,7 +2467,6 @@ mod tests {
     use rand::prelude::*;
     use serde::Serialize;
     use settings::SettingsStore;
-    use std::{future, sync::Arc};
 
     #[derive(Serialize)]
     pub struct DummyCompletionRequest {
@@ -2618,7 +2476,7 @@ mod tests {
     #[gpui::test(iterations = 10)]
     async fn test_transform_autoindent(cx: &mut TestAppContext, mut rng: StdRng) {
         cx.set_global(cx.update(SettingsStore::test));
-        cx.update(|cx| FakeCompletionProvider::setup_test(cx));
+        let provider = cx.update(|cx| FakeCompletionProvider::setup_test(cx));
         cx.update(language_settings::init);
 
         let text = indoc! {"
@@ -2636,17 +2494,14 @@ mod tests {
             let snapshot = buffer.snapshot(cx);
             snapshot.anchor_before(Point::new(1, 0))..snapshot.anchor_after(Point::new(4, 5))
         });
-        let codegen = cx.new_model(|cx| Codegen::new(buffer.clone(), range, false, None, cx));
+        let codegen = cx.new_model(|cx| Codegen::new(buffer.clone(), range, None, cx));
 
-        let (chunks_tx, chunks_rx) = mpsc::unbounded();
         codegen.update(cx, |codegen, cx| {
-            codegen.start(
-                String::new(),
-                future::ready(Ok(chunks_rx.map(|chunk| Ok(chunk)).boxed())),
-                cx,
-            )
+            codegen.start(LanguageModelRequest::default(), cx)
         });
 
+        cx.background_executor.run_until_parked();
+
         let mut new_text = concat!(
             "       let mut x = 0;\n",
             "       while x < 10 {\n",
@@ -2657,11 +2512,11 @@ mod tests {
             let max_len = cmp::min(new_text.len(), 10);
             let len = rng.gen_range(1..=max_len);
             let (chunk, suffix) = new_text.split_at(len);
-            chunks_tx.unbounded_send(chunk.to_string()).unwrap();
+            provider.send_completion(&LanguageModelRequest::default(), chunk.into());
             new_text = suffix;
             cx.background_executor.run_until_parked();
         }
-        drop(chunks_tx);
+        provider.finish_completion(&LanguageModelRequest::default());
         cx.background_executor.run_until_parked();
 
         assert_eq!(
@@ -2682,6 +2537,7 @@ mod tests {
         cx: &mut TestAppContext,
         mut rng: StdRng,
     ) {
+        let provider = cx.update(|cx| FakeCompletionProvider::setup_test(cx));
         cx.set_global(cx.update(SettingsStore::test));
         cx.update(language_settings::init);
 
@@ -2697,16 +2553,10 @@ mod tests {
             let snapshot = buffer.snapshot(cx);
             snapshot.anchor_before(Point::new(1, 6))..snapshot.anchor_after(Point::new(1, 6))
         });
-        let codegen = cx.new_model(|cx| Codegen::new(buffer.clone(), range, false, None, cx));
+        let codegen = cx.new_model(|cx| Codegen::new(buffer.clone(), range, None, cx));
 
-        let (chunks_tx, chunks_rx) = mpsc::unbounded();
-        codegen.update(cx, |codegen, cx| {
-            codegen.start(
-                String::new(),
-                future::ready(Ok(chunks_rx.map(|chunk| Ok(chunk)).boxed())),
-                cx,
-            )
-        });
+        let request = LanguageModelRequest::default();
+        codegen.update(cx, |codegen, cx| codegen.start(request, cx));
 
         cx.background_executor.run_until_parked();
 
@@ -2720,11 +2570,11 @@ mod tests {
             let max_len = cmp::min(new_text.len(), 10);
             let len = rng.gen_range(1..=max_len);
             let (chunk, suffix) = new_text.split_at(len);
-            chunks_tx.unbounded_send(chunk.to_string()).unwrap();
+            provider.send_completion(&LanguageModelRequest::default(), chunk.into());
             new_text = suffix;
             cx.background_executor.run_until_parked();
         }
-        drop(chunks_tx);
+        provider.finish_completion(&LanguageModelRequest::default());
         cx.background_executor.run_until_parked();
 
         assert_eq!(
@@ -2745,7 +2595,7 @@ mod tests {
         cx: &mut TestAppContext,
         mut rng: StdRng,
     ) {
-        cx.update(|cx| FakeCompletionProvider::setup_test(cx));
+        let provider = cx.update(|cx| FakeCompletionProvider::setup_test(cx));
         cx.set_global(cx.update(SettingsStore::test));
         cx.update(language_settings::init);
 
@@ -2761,16 +2611,10 @@ mod tests {
             let snapshot = buffer.snapshot(cx);
             snapshot.anchor_before(Point::new(1, 2))..snapshot.anchor_after(Point::new(1, 2))
         });
-        let codegen = cx.new_model(|cx| Codegen::new(buffer.clone(), range, false, None, cx));
+        let codegen = cx.new_model(|cx| Codegen::new(buffer.clone(), range, None, cx));
 
-        let (chunks_tx, chunks_rx) = mpsc::unbounded();
-        codegen.update(cx, |codegen, cx| {
-            codegen.start(
-                String::new(),
-                future::ready(Ok(chunks_rx.map(|chunk| Ok(chunk)).boxed())),
-                cx,
-            )
-        });
+        let request = LanguageModelRequest::default();
+        codegen.update(cx, |codegen, cx| codegen.start(request, cx));
 
         cx.background_executor.run_until_parked();
 
@@ -2784,11 +2628,11 @@ mod tests {
             let max_len = cmp::min(new_text.len(), 10);
             let len = rng.gen_range(1..=max_len);
             let (chunk, suffix) = new_text.split_at(len);
-            chunks_tx.unbounded_send(chunk.to_string()).unwrap();
+            provider.send_completion(&LanguageModelRequest::default(), chunk.into());
             new_text = suffix;
             cx.background_executor.run_until_parked();
         }
-        drop(chunks_tx);
+        provider.finish_completion(&LanguageModelRequest::default());
         cx.background_executor.run_until_parked();
 
         assert_eq!(

crates/assistant/src/prompt_library.rs

@@ -3,7 +3,6 @@ use crate::{
     InlineAssist, InlineAssistant, LanguageModelRequest, LanguageModelRequestMessage, Role,
 };
 use anyhow::{anyhow, Result};
-use assets::Assets;
 use chrono::{DateTime, Utc};
 use collections::{HashMap, HashSet};
 use editor::{actions::Tab, CurrentLineHighlight, Editor, EditorElement, EditorEvent, EditorStyle};
@@ -13,8 +12,8 @@ use futures::{
 };
 use fuzzy::StringMatchCandidate;
 use gpui::{
-    actions, point, size, transparent_black, AppContext, AssetSource, BackgroundExecutor, Bounds,
-    EventEmitter, Global, HighlightStyle, PromptLevel, ReadGlobal, Subscription, Task, TextStyle,
+    actions, point, size, transparent_black, AppContext, BackgroundExecutor, Bounds, EventEmitter,
+    Global, HighlightStyle, PromptLevel, ReadGlobal, Subscription, Task, TextStyle,
     TitlebarOptions, UpdateGlobal, View, WindowBounds, WindowHandle, WindowOptions,
 };
 use heed::{types::SerdeBincode, Database, RoTxn};
@@ -269,7 +268,7 @@ impl PickerDelegate for PromptPickerDelegate {
             .flex_none()
             .py_1()
             .px_2()
-            .mx_1()
+            .mx_2()
             .child(editor.clone())
     }
 }
@@ -628,7 +627,7 @@ impl PromptLibrary {
         self.picker.update(cx, |picker, cx| picker.focus(cx));
     }
 
-    pub fn inline_assist(&mut self, action: &InlineAssist, cx: &mut ViewContext<Self>) {
+    pub fn inline_assist(&mut self, _: &InlineAssist, cx: &mut ViewContext<Self>) {
         let Some(active_prompt_id) = self.active_prompt_id else {
             cx.propagate();
             return;
@@ -636,10 +635,9 @@ impl PromptLibrary {
 
         let prompt_editor = &self.prompt_editors[&active_prompt_id].body_editor;
         let provider = CompletionProvider::global(cx);
-        let initial_prompt = action.prompt.clone();
         if provider.is_authenticated() {
             InlineAssistant::update_global(cx, |assistant, cx| {
-                assistant.assist(&prompt_editor, None, None, initial_prompt, cx)
+                assistant.assist(&prompt_editor, None, None, cx)
             })
         } else {
             for window in cx.windows() {
@@ -746,6 +744,7 @@ impl PromptLibrary {
                                     }],
                                     stop: Vec::new(),
                                     temperature: 1.,
+                                    cached_contents: Vec::new(),
                                 },
                                 cx,
                             )
@@ -768,7 +767,6 @@ impl PromptLibrary {
             .capture_action(cx.listener(Self::focus_active_prompt))
             .bg(cx.theme().colors().panel_background)
             .h_full()
-            .px_1()
             .w_1_3()
             .overflow_x_hidden()
             .child(
@@ -1298,17 +1296,6 @@ impl PromptStore {
     fn first(&self) -> Option<PromptMetadata> {
         self.metadata_cache.read().metadata.first().cloned()
     }
-
-    pub fn operations_prompt(&self) -> String {
-        String::from_utf8(
-            Assets
-                .load("prompts/operations.md")
-                .unwrap()
-                .unwrap()
-                .to_vec(),
-        )
-        .unwrap()
-    }
 }
 
 /// Wraps a shared future to a prompt store so it can be assigned as a context global.

crates/assistant/src/search.rs

@@ -0,0 +1,171 @@
+use language::Rope;
+use std::ops::Range;
+
+/// Search the given buffer for the given substring, ignoring any differences
+/// in line indentation between the query and the buffer.
+///
+/// Returns a vector of ranges of byte offsets in the buffer corresponding
+/// to the entire lines of the buffer.
+pub fn fuzzy_search_lines(haystack: &Rope, needle: &str) -> Option<Range<usize>> {
+    const SIMILARITY_THRESHOLD: f64 = 0.8;
+
+    let mut best_match: Option<(Range<usize>, f64)> = None; // (range, score)
+    let mut haystack_lines = haystack.chunks().lines();
+    let mut haystack_line_start = 0;
+    while let Some(mut haystack_line) = haystack_lines.next() {
+        let next_haystack_line_start = haystack_line_start + haystack_line.len() + 1;
+        let mut advanced_to_next_haystack_line = false;
+
+        let mut matched = true;
+        let match_start = haystack_line_start;
+        let mut match_end = next_haystack_line_start;
+        let mut match_score = 0.0;
+        let mut needle_lines = needle.lines().peekable();
+        while let Some(needle_line) = needle_lines.next() {
+            let similarity = line_similarity(haystack_line, needle_line);
+            if similarity >= SIMILARITY_THRESHOLD {
+                match_end = haystack_lines.offset();
+                match_score += similarity;
+
+                if needle_lines.peek().is_some() {
+                    if let Some(next_haystack_line) = haystack_lines.next() {
+                        advanced_to_next_haystack_line = true;
+                        haystack_line = next_haystack_line;
+                    } else {
+                        matched = false;
+                        break;
+                    }
+                } else {
+                    break;
+                }
+            } else {
+                matched = false;
+                break;
+            }
+        }
+
+        if matched
+            && best_match
+                .as_ref()
+                .map(|(_, best_score)| match_score > *best_score)
+                .unwrap_or(true)
+        {
+            best_match = Some((match_start..match_end, match_score));
+        }
+
+        if advanced_to_next_haystack_line {
+            haystack_lines.seek(next_haystack_line_start);
+        }
+        haystack_line_start = next_haystack_line_start;
+    }
+
+    best_match.map(|(range, _)| range)
+}
+
+/// Calculates the similarity between two lines, ignoring leading and trailing whitespace,
+/// using the Jaro-Winkler distance.
+///
+/// Returns a value between 0.0 and 1.0, where 1.0 indicates an exact match.
+fn line_similarity(line1: &str, line2: &str) -> f64 {
+    strsim::jaro_winkler(line1.trim(), line2.trim())
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use gpui::{AppContext, Context as _};
+    use language::Buffer;
+    use unindent::Unindent as _;
+    use util::test::marked_text_ranges;
+
+    #[gpui::test]
+    fn test_fuzzy_search_lines(cx: &mut AppContext) {
+        let (text, expected_ranges) = marked_text_ranges(
+            &r#"
+            fn main() {
+                if a() {
+                    assert_eq!(
+                        1 + 2,
+                        does_not_match,
+                    );
+                }
+
+                println!("hi");
+
+                assert_eq!(
+                    1 + 2,
+                    3,
+                ); // this last line does not match
+
+            «    assert_eq!(
+                    1 + 2,
+                    3,
+                );
+            »
+
+            «    assert_eq!(
+                    "something",
+                    "else",
+                );
+            »
+            }
+            "#
+            .unindent(),
+            false,
+        );
+
+        let buffer = cx.new_model(|cx| Buffer::local(&text, cx));
+        let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot());
+
+        let actual_range = fuzzy_search_lines(
+            snapshot.as_rope(),
+            &"
+            assert_eq!(
+                1 + 2,
+                3,
+            );
+            "
+            .unindent(),
+        )
+        .unwrap();
+        assert_eq!(actual_range, expected_ranges[0]);
+
+        let actual_range = fuzzy_search_lines(
+            snapshot.as_rope(),
+            &"
+            assert_eq!(
+                1 + 2,
+                3,
+            );
+            "
+            .unindent(),
+        )
+        .unwrap();
+        assert_eq!(actual_range, expected_ranges[0]);
+
+        let actual_range = fuzzy_search_lines(
+            snapshot.as_rope(),
+            &"
+            asst_eq!(
+                \"something\",
+                \"els\"
+            )
+            "
+            .unindent(),
+        )
+        .unwrap();
+        assert_eq!(actual_range, expected_ranges[1]);
+
+        let actual_range = fuzzy_search_lines(
+            snapshot.as_rope(),
+            &"
+            assert_eq!(
+                2 + 1,
+                3,
+            );
+            "
+            .unindent(),
+        );
+        assert_eq!(actual_range, None);
+    }
+}

crates/assistant/src/slash_command.rs

@@ -27,7 +27,6 @@ pub mod now_command;
 pub mod project_command;
 pub mod prompt_command;
 pub mod search_command;
-pub mod symbols_command;
 pub mod tabs_command;
 pub mod term_command;
 

crates/assistant/src/slash_command/docs_command.rs

@@ -1,13 +1,12 @@
 use std::path::Path;
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
-use std::time::Duration;
 
 use anyhow::{anyhow, bail, Result};
 use assistant_slash_command::{
     ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
 };
-use gpui::{AppContext, BackgroundExecutor, Model, Task, WeakView};
+use gpui::{AppContext, Model, Task, WeakView};
 use indexed_docs::{
     DocsDotRsProvider, IndexedDocsRegistry, IndexedDocsStore, LocalRustdocProvider, PackageName,
     ProviderId,
@@ -91,55 +90,6 @@ impl DocsSlashCommand {
             }
         }
     }
-
-    /// Runs just-in-time indexing for a given package, in case the slash command
-    /// is run without any entries existing in the index.
-    fn run_just_in_time_indexing(
-        store: Arc<IndexedDocsStore>,
-        key: String,
-        package: PackageName,
-        executor: BackgroundExecutor,
-    ) -> Task<()> {
-        executor.clone().spawn(async move {
-            let (prefix, needs_full_index) = if let Some((prefix, _)) = key.split_once('*') {
-                // If we have a wildcard in the search, we want to wait until
-                // we've completely finished indexing so we get a full set of
-                // results for the wildcard.
-                (prefix.to_string(), true)
-            } else {
-                (key, false)
-            };
-
-            // If we already have some entries, we assume that we've indexed the package before
-            // and don't need to do it again.
-            let has_any_entries = store
-                .any_with_prefix(prefix.clone())
-                .await
-                .unwrap_or_default();
-            if has_any_entries {
-                return ();
-            };
-
-            let index_task = store.clone().index(package.clone());
-
-            if needs_full_index {
-                _ = index_task.await;
-            } else {
-                loop {
-                    executor.timer(Duration::from_millis(200)).await;
-
-                    if store
-                        .any_with_prefix(prefix.clone())
-                        .await
-                        .unwrap_or_default()
-                        || !store.is_indexing(&package)
-                    {
-                        break;
-                    }
-                }
-            }
-        })
-    }
 }
 
 impl SlashCommand for DocsSlashCommand {
@@ -250,14 +200,13 @@ impl SlashCommand for DocsSlashCommand {
         };
 
         let args = DocsSlashCommandArgs::parse(argument);
-        let executor = cx.background_executor().clone();
         let task = cx.background_executor().spawn({
             let store = args
                 .provider()
                 .ok_or_else(|| anyhow!("no docs provider specified"))
                 .and_then(|provider| IndexedDocsStore::try_global(provider, cx));
             async move {
-                let (provider, key) = match args.clone() {
+                let (provider, key) = match args {
                     DocsSlashCommandArgs::NoProvider => bail!("no docs provider specified"),
                     DocsSlashCommandArgs::SearchPackageDocs {
                         provider, package, ..
@@ -270,12 +219,6 @@ impl SlashCommand for DocsSlashCommand {
                 };
 
                 let store = store?;
-
-                if let Some(package) = args.package() {
-                    Self::run_just_in_time_indexing(store.clone(), key.clone(), package, executor)
-                        .await;
-                }
-
                 let (text, ranges) = if let Some((prefix, _)) = key.split_once('*') {
                     let docs = store.load_many_by_prefix(prefix.to_string()).await?;
 
@@ -326,7 +269,7 @@ fn is_item_path_delimiter(char: char) -> bool {
     !char.is_alphanumeric() && char != '-' && char != '_'
 }
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq)]
 pub(crate) enum DocsSlashCommandArgs {
     NoProvider,
     SearchPackageDocs {

crates/assistant/src/slash_command/now_command.rs

@@ -23,7 +23,7 @@ impl SlashCommand for NowSlashCommand {
     }
 
     fn menu_text(&self) -> String {
-        "Insert Current Date and Time".into()
+        "Insert current date and time".into()
     }
 
     fn requires_argument(&self) -> bool {

crates/assistant/src/slash_command/symbols_command.rs

@@ -1,89 +0,0 @@
-use super::{SlashCommand, SlashCommandOutput};
-use anyhow::{anyhow, Context as _, Result};
-use assistant_slash_command::{ArgumentCompletion, SlashCommandOutputSection};
-use editor::Editor;
-use gpui::{AppContext, Task, WeakView};
-use language::LspAdapterDelegate;
-use std::sync::Arc;
-use std::{path::Path, sync::atomic::AtomicBool};
-use ui::{IconName, WindowContext};
-use workspace::Workspace;
-
-pub(crate) struct OutlineSlashCommand;
-
-impl SlashCommand for OutlineSlashCommand {
-    fn name(&self) -> String {
-        "symbols".into()
-    }
-
-    fn description(&self) -> String {
-        "insert symbols for active tab".into()
-    }
-
-    fn menu_text(&self) -> String {
-        "Insert Symbols for Active Tab".into()
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        _query: String,
-        _cancel: Arc<AtomicBool>,
-        _workspace: Option<WeakView<Workspace>>,
-        _cx: &mut AppContext,
-    ) -> 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>,
-        _argument: Option<&str>,
-        workspace: WeakView<Workspace>,
-        _delegate: Arc<dyn LspAdapterDelegate>,
-        cx: &mut WindowContext,
-    ) -> Task<Result<SlashCommandOutput>> {
-        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(cx, true);
-
-            cx.background_executor().spawn(async move {
-                let outline = snapshot
-                    .outline(None)
-                    .context("no symbols for active tab")?;
-
-                let path = path.as_deref().unwrap_or(Path::new("untitled"));
-                let mut outline_text = format!("Symbols for {}:\n", path.display());
-                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: path.to_string_lossy().to_string().into(),
-                    }],
-                    text: outline_text,
-                    run_commands_in_text: false,
-                })
-            })
-        });
-
-        output.unwrap_or_else(|error| Task::ready(Err(error)))
-    }
-}

crates/assistant/src/slash_command/term_command.rs

@@ -31,7 +31,7 @@ impl SlashCommand for TermSlashCommand {
     }
 
     fn menu_text(&self) -> String {
-        "Insert Terminal Output".into()
+        "Insert terminal output".into()
     }
 
     fn requires_argument(&self) -> bool {

crates/assistant/src/terminal_inline_assistant.rs

@@ -73,13 +73,11 @@ impl TerminalInlineAssistant {
         terminal_view: &View<TerminalView>,
         workspace: Option<WeakView<Workspace>>,
         assistant_panel: Option<&View<AssistantPanel>>,
-        initial_prompt: Option<String>,
         cx: &mut WindowContext,
     ) {
         let terminal = terminal_view.read(cx).terminal().clone();
         let assist_id = self.next_assist_id.post_inc();
-        let prompt_buffer =
-            cx.new_model(|cx| Buffer::local(initial_prompt.unwrap_or_default(), cx));
+        let prompt_buffer = cx.new_model(|cx| Buffer::local("", cx));
         let prompt_buffer = cx.new_model(|cx| MultiBuffer::singleton(prompt_buffer, cx));
         let codegen = cx.new_model(|_| Codegen::new(terminal, self.telemetry.clone()));
 
@@ -271,6 +269,7 @@ impl TerminalInlineAssistant {
             messages,
             stop: Vec::new(),
             temperature: 1.0,
+            cached_contents: Vec::new(), // todo!
         })
     }
 
@@ -1028,7 +1027,7 @@ impl Codegen {
 
         let telemetry = self.telemetry.clone();
         let model_telemetry_id = prompt.model.telemetry_id();
-        let response = CompletionProvider::global(cx).stream_completion(prompt, cx);
+        let response = CompletionProvider::global(cx).complete(prompt, cx);
 
         self.generation = cx.spawn(|this, mut cx| async move {
             let response = response.await;
@@ -1039,8 +1038,8 @@ impl Codegen {
                     let mut response_latency = None;
                     let request_start = Instant::now();
                     let task = async {
-                        let mut chunks = response?;
-                        while let Some(chunk) = chunks.next().await {
+                        let mut response = response.inner.await?;
+                        while let Some(chunk) = response.next().await {
                             if response_latency.is_none() {
                                 response_latency = Some(request_start.elapsed());
                             }

crates/auto_update/src/auto_update.rs

@@ -1,7 +1,7 @@
 mod update_notification;
 
 use anyhow::{anyhow, Context, Result};
-use client::{Client, TelemetrySettings};
+use client::{Client, TelemetrySettings, ZED_APP_PATH};
 use db::kvp::KEY_VALUE_STORE;
 use db::RELEASE_CHANNEL;
 use editor::{Editor, MultiBuffer};
@@ -288,12 +288,7 @@ fn view_release_notes_locally(workspace: &mut Workspace, cx: &mut ViewContext<Wo
                                 Some(tab_description),
                                 cx,
                             );
-                            workspace.add_item_to_active_pane(
-                                Box::new(view.clone()),
-                                None,
-                                true,
-                                cx,
-                            );
+                            workspace.add_item_to_active_pane(Box::new(view.clone()), None, cx);
                             cx.notify();
                         })
                         .log_err();
@@ -453,7 +448,12 @@ impl AutoUpdater {
             cx.notify();
         })?;
 
-        let binary_path = match OS {
+        // We store the path of our current binary, before we install, since installation might
+        // delete it. Once deleted, it's hard to get the path to our binary on Linux.
+        // So we cache it here, which allows us to then restart later on.
+        let binary_path = cx.update(|cx| cx.app_path())??;
+
+        match OS {
             "macos" => install_release_macos(&temp_dir, downloaded_asset, &cx).await,
             "linux" => install_release_linux(&temp_dir, downloaded_asset, &cx).await,
             _ => Err(anyhow!("not supported: {:?}", OS)),
@@ -536,10 +536,9 @@ async fn install_release_linux(
     temp_dir: &tempfile::TempDir,
     downloaded_tar_gz: PathBuf,
     cx: &AsyncAppContext,
-) -> Result<PathBuf> {
+) -> Result<()> {
     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)
@@ -570,16 +569,7 @@ async fn install_release_linux(
     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 to = home_dir.join(".local");
 
     let output = Command::new("rsync")
         .args(&["-av", "--delete"])
@@ -596,15 +586,17 @@ async fn install_release_linux(
         String::from_utf8_lossy(&output.stderr)
     );
 
-    Ok(to.join(expected_suffix))
+    Ok(())
 }
 
 async fn install_release_macos(
     temp_dir: &tempfile::TempDir,
     downloaded_dmg: PathBuf,
     cx: &AsyncAppContext,
-) -> Result<PathBuf> {
-    let running_app_path = cx.update(|cx| cx.app_path())??;
+) -> Result<()> {
+    let running_app_path = ZED_APP_PATH
+        .clone()
+        .map_or_else(|| cx.update(|cx| cx.app_path())?, Ok)?;
     let running_app_filename = running_app_path
         .file_name()
         .ok_or_else(|| anyhow!("invalid running app path"))?;
@@ -652,5 +644,5 @@ async fn install_release_macos(
         String::from_utf8_lossy(&output.stderr)
     );
 
-    Ok(running_app_path)
+    Ok(())
 }

crates/breadcrumbs/src/breadcrumbs.rs

@@ -113,30 +113,29 @@ impl ToolbarItemView for Breadcrumbs {
     ) -> ToolbarItemLocation {
         cx.notify();
         self.active_item = None;
-
-        let Some(item) = active_pane_item else {
-            return ToolbarItemLocation::Hidden;
-        };
-
-        let this = cx.view().downgrade();
-        self.subscription = Some(item.subscribe_to_item_events(
-            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)
+        if let Some(item) = active_pane_item {
+            let this = cx.view().downgrade();
+            self.subscription = Some(item.subscribe_to_item_events(
+                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)
+        } else {
+            ToolbarItemLocation::Hidden
+        }
     }
 
     fn pane_focus_update(&mut self, pane_focused: bool, _: &mut ViewContext<Self>) {

crates/cli/src/cli.rs

@@ -11,7 +11,6 @@ pub struct IpcHandshake {
 pub enum CliRequest {
     Open {
         paths: Vec<String>,
-        urls: Vec<String>,
         wait: bool,
         open_new_workspace: Option<bool>,
         dev_server_token: Option<String>,

crates/cli/src/main.rs

@@ -5,7 +5,6 @@ use clap::Parser;
 use cli::{ipc::IpcOneShotServer, CliRequest, CliResponse, IpcHandshake};
 use parking_lot::Mutex;
 use std::{
-    convert::Infallible,
     env, fs, io,
     path::{Path, PathBuf},
     process::ExitStatus,
@@ -38,7 +37,8 @@ struct Args {
     ///
     /// Use `path:line:row` syntax to open a file at a specific location.
     /// Non-existing paths and directories will ignore `:line:row` suffix.
-    paths_with_position: Vec<String>,
+    #[arg(value_parser = parse_path_with_position)]
+    paths_with_position: Vec<PathLikeWithPosition<PathBuf>>,
     /// Print Zed's version and the app path.
     #[arg(short, long)]
     version: bool,
@@ -53,30 +53,12 @@ struct Args {
     dev_server_token: Option<String>,
 }
 
-fn parse_path_with_position(argument_str: &str) -> Result<String, std::io::Error> {
-    let path_like = PathLikeWithPosition::parse_str::<Infallible>(argument_str, |_, path_str| {
+fn parse_path_with_position(
+    argument_str: &str,
+) -> Result<PathLikeWithPosition<PathBuf>, std::convert::Infallible> {
+    PathLikeWithPosition::parse_str(argument_str, |_, path_str| {
         Ok(Path::new(path_str).to_path_buf())
     })
-    .unwrap();
-    let curdir = env::current_dir()?;
-
-    let canonicalized = path_like.map_path_like(|path| match fs::canonicalize(&path) {
-        Ok(path) => Ok(path),
-        Err(e) => {
-            if let Some(mut parent) = path.parent() {
-                if parent == Path::new("") {
-                    parent = &curdir
-                }
-                match fs::canonicalize(parent) {
-                    Ok(parent) => Ok(parent.join(path.file_name().unwrap())),
-                    Err(_) => Err(e),
-                }
-            } else {
-                Err(e)
-            }
-        }
-    })?;
-    Ok(canonicalized.to_string(|path| path.display().to_string()))
 }
 
 fn main() -> Result<()> {
@@ -109,6 +91,28 @@ fn main() -> Result<()> {
         return Ok(());
     }
 
+    let curdir = env::current_dir()?;
+    let mut paths = vec![];
+    for path in args.paths_with_position {
+        let canonicalized = path.map_path_like(|path| match fs::canonicalize(&path) {
+            Ok(path) => Ok(path),
+            Err(e) => {
+                if let Some(mut parent) = path.parent() {
+                    if parent == Path::new("") {
+                        parent = &curdir;
+                    }
+                    match fs::canonicalize(parent) {
+                        Ok(parent) => Ok(parent.join(path.file_name().unwrap())),
+                        Err(_) => Err(e),
+                    }
+                } else {
+                    Err(e)
+                }
+            }
+        })?;
+        paths.push(canonicalized.to_string(|path| path.display().to_string()))
+    }
+
     let (server, server_name) =
         IpcOneShotServer::<IpcHandshake>::new().context("Handshake before Zed spawn")?;
     let url = format!("zed-cli://{server_name}");
@@ -122,19 +126,6 @@ fn main() -> Result<()> {
     };
 
     let exit_status = Arc::new(Mutex::new(None));
-    let mut paths = vec![];
-    let mut urls = vec![];
-    for path in args.paths_with_position.iter() {
-        if path.starts_with("zed://")
-            || path.starts_with("http://")
-            || path.starts_with("https://")
-            || path.starts_with("file://")
-        {
-            urls.push(path.to_string());
-        } else {
-            paths.push(parse_path_with_position(path)?)
-        }
-    }
 
     let sender: JoinHandle<anyhow::Result<()>> = thread::spawn({
         let exit_status = exit_status.clone();
@@ -143,7 +134,6 @@ fn main() -> Result<()> {
             let (tx, rx) = (handshake.requests, handshake.responses);
             tx.send(CliRequest::Open {
                 paths,
-                urls,
                 wait: args.wait,
                 open_new_workspace,
                 dev_server_token: args.dev_server_token,

crates/collab/migrations.sqlite/20221109000000_test_schema.sql

@@ -414,5 +414,5 @@ CREATE TABLE dev_servers (
 CREATE TABLE dev_server_projects (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
     dev_server_id INTEGER NOT NULL REFERENCES dev_servers(id),
-    paths TEXT NOT NULL
+    path TEXT NOT NULL
 );

crates/collab/migrations/20240715230940_add_worktrees_to_dev_server_projects.sql

@@ -1,4 +0,0 @@
-ALTER TABLE dev_server_projects ADD COLUMN paths JSONB NULL;
-UPDATE dev_server_projects SET paths = to_json(ARRAY[path]);
-ALTER TABLE dev_server_projects ALTER COLUMN paths SET NOT NULL;
-ALTER TABLE dev_server_projects ALTER COLUMN path DROP NOT NULL;

crates/collab/src/ai.rs

@@ -101,6 +101,7 @@ pub fn language_model_request_to_google_ai(
             .collect::<Result<Vec<_>>>()?,
         generation_config: None,
         safety_settings: None,
+        cached_content: request.cached_contents.into_iter().next(),
     })
 }
 
@@ -125,6 +126,60 @@ pub fn language_model_request_message_to_google_ai(
     })
 }
 
+pub fn cache_language_model_content_request_to_google_ai(
+    request: proto::CacheLanguageModelContent,
+) -> Result<google_ai::CreateCachedContentRequest> {
+    Ok(google_ai::CreateCachedContentRequest {
+        contents: request
+            .messages
+            .into_iter()
+            .map(language_model_request_message_to_google_ai)
+            .collect::<Result<Vec<_>>>()?,
+        tools: if request.tools.is_empty() {
+            None
+        } else {
+            Some(
+                request
+                    .tools
+                    .into_iter()
+                    .try_fold(Vec::new(), |mut acc, tool| {
+                        if let Some(variant) = tool.variant {
+                            match variant {
+                                proto::chat_completion_tool::Variant::Function(f) => {
+                                    let description = f.description.ok_or_else(|| {
+                                        anyhow!("Function tool is missing a description")
+                                    })?;
+                                    let parameters = f.parameters.ok_or_else(|| {
+                                        anyhow!("Function tool is missing parameters")
+                                    })?;
+                                    let parsed_parameters = serde_json::from_str(&parameters)
+                                        .map_err(|e| {
+                                            anyhow!("Failed to parse parameters: {}", e)
+                                        })?;
+                                    acc.push(google_ai::Tool {
+                                        function_declarations: vec![
+                                            google_ai::FunctionDeclaration {
+                                                name: f.name,
+                                                description,
+                                                parameters: parsed_parameters,
+                                            },
+                                        ],
+                                    });
+                                }
+                            }
+                        }
+                        anyhow::Ok(acc)
+                    })?,
+            )
+        },
+        ttl: request.ttl_seconds.map(|s| format!("{}s", s)),
+        display_name: None,
+        model: request.model,
+        system_instruction: None,
+        tool_config: None,
+    })
+}
+
 pub fn count_tokens_request_to_google_ai(
     request: proto::CountTokensWithLanguageModel,
 ) -> Result<google_ai::CountTokensRequest> {

crates/collab/src/api/extensions.rs

@@ -43,36 +43,11 @@ async fn get_extensions(
     Extension(app): Extension<Arc<AppState>>,
     Query(params): Query<GetExtensionsParams>,
 ) -> Result<Json<GetExtensionsResponse>> {
-    let mut extensions = app
+    let extensions = app
         .db
         .get_extensions(params.filter.as_deref(), params.max_schema_version, 500)
         .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")

crates/collab/src/db/queries/dev_server_projects.rs

@@ -5,7 +5,7 @@ use rpc::{
 };
 use sea_orm::{
     ActiveModelTrait, ActiveValue, ColumnTrait, Condition, DatabaseTransaction, EntityTrait,
-    IntoActiveModel, ModelTrait, QueryFilter,
+    ModelTrait, QueryFilter,
 };
 
 use crate::db::ProjectId;
@@ -56,7 +56,12 @@ impl Database {
             .await?;
         Ok(servers
             .into_iter()
-            .map(|(dev_server_project, project)| dev_server_project.to_proto(project))
+            .map(|(dev_server_project, project)| proto::DevServerProject {
+                id: dev_server_project.id.to_proto(),
+                project_id: project.map(|p| p.id.to_proto()),
+                dev_server_id: dev_server_project.dev_server_id.to_proto(),
+                path: dev_server_project.path,
+            })
             .collect())
     }
 
@@ -129,7 +134,7 @@ impl Database {
             let project = dev_server_project::Entity::insert(dev_server_project::ActiveModel {
                 id: ActiveValue::NotSet,
                 dev_server_id: ActiveValue::Set(dev_server_id),
-                paths: ActiveValue::Set(dev_server_project::JSONPaths(vec![path.to_string()])),
+                path: ActiveValue::Set(path.to_string()),
             })
             .exec_with_returning(&*tx)
             .await?;
@@ -143,38 +148,6 @@ impl Database {
         .await
     }
 
-    pub async fn update_dev_server_project(
-        &self,
-        id: DevServerProjectId,
-        paths: &Vec<String>,
-        user_id: UserId,
-    ) -> crate::Result<(dev_server_project::Model, proto::DevServerProjectsUpdate)> {
-        self.transaction(move |tx| async move {
-            let paths = paths.clone();
-            let Some((project, Some(dev_server))) = dev_server_project::Entity::find_by_id(id)
-                .find_also_related(dev_server::Entity)
-                .one(&*tx)
-                .await?
-            else {
-                return Err(anyhow!("no such dev server project"))?;
-            };
-
-            if dev_server.user_id != user_id {
-                return Err(anyhow!("not your dev server"))?;
-            }
-            let mut project = project.into_active_model();
-            project.paths = ActiveValue::Set(dev_server_project::JSONPaths(paths));
-            let project = project.update(&*tx).await?;
-
-            let status = self
-                .dev_server_projects_update_internal(user_id, &tx)
-                .await?;
-
-            Ok((project, status))
-        })
-        .await
-    }
-
     pub async fn delete_dev_server_project(
         &self,
         dev_server_project_id: DevServerProjectId,
@@ -285,6 +258,7 @@ impl Database {
         dev_server_id: DevServerId,
         connection: ConnectionId,
     ) -> crate::Result<Vec<ResharedProject>> {
+        // todo!() project_transaction? (maybe we can make the lock per-dev-server instead of per-project?)
         self.transaction(|tx| async move {
             let mut ret = Vec::new();
             for reshared_project in reshared_projects {
@@ -348,6 +322,7 @@ impl Database {
         user_id: UserId,
         connection_id: ConnectionId,
     ) -> crate::Result<Vec<RejoinedProject>> {
+        // todo!() project_transaction? (maybe we can make the lock per-dev-server instead of per-project?)
         self.transaction(|tx| async move {
             let mut ret = Vec::new();
             for rejoined_project in rejoined_projects {

crates/collab/src/db/queries/dev_servers.rs

@@ -19,28 +19,6 @@ impl Database {
         .await
     }
 
-    pub async fn get_dev_server_for_user(
-        &self,
-        dev_server_id: DevServerId,
-        user_id: UserId,
-    ) -> crate::Result<dev_server::Model> {
-        self.transaction(|tx| async move {
-            let server = dev_server::Entity::find_by_id(dev_server_id)
-                .one(&*tx)
-                .await?
-                .ok_or_else(|| anyhow::anyhow!("no dev server with id {}", dev_server_id))?;
-            if server.user_id != user_id {
-                return Err(anyhow::anyhow!(
-                    "dev server {} is not owned by user {}",
-                    dev_server_id,
-                    user_id
-                ))?;
-            }
-            Ok(server)
-        })
-        .await
-    }
-
     pub async fn get_dev_servers(&self, user_id: UserId) -> crate::Result<Vec<dev_server::Model>> {
         self.transaction(|tx| async move {
             Ok(dev_server::Entity::find()

crates/collab/src/db/queries/remote_projects.rs

@@ -0,0 +1 @@
+

crates/collab/src/db/tables/dev_server_project.rs

@@ -1,8 +1,7 @@
 use super::project;
 use crate::db::{DevServerId, DevServerProjectId};
 use rpc::proto;
-use sea_orm::{entity::prelude::*, FromJsonQueryResult};
-use serde::{Deserialize, Serialize};
+use sea_orm::entity::prelude::*;
 
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
 #[sea_orm(table_name = "dev_server_projects")]
@@ -10,12 +9,9 @@ pub struct Model {
     #[sea_orm(primary_key)]
     pub id: DevServerProjectId,
     pub dev_server_id: DevServerId,
-    pub paths: JSONPaths,
+    pub path: String,
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, FromJsonQueryResult)]
-pub struct JSONPaths(pub Vec<String>);
-
 impl ActiveModelBehavior for ActiveModel {}
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
@@ -48,12 +44,7 @@ impl Model {
             id: self.id.to_proto(),
             project_id: project.map(|p| p.id.to_proto()),
             dev_server_id: self.dev_server_id.to_proto(),
-            path: self.paths().get(0).cloned().unwrap_or_default(),
-            paths: self.paths().clone(),
+            path: self.path.clone(),
         }
     }
-
-    pub fn paths(&self) -> &Vec<String> {
-        &self.paths.0
-    }
 }

crates/collab/src/rpc.rs

@@ -431,13 +431,11 @@ impl Server {
             .add_request_handler(user_handler(join_hosted_project))
             .add_request_handler(user_handler(rejoin_dev_server_projects))
             .add_request_handler(user_handler(create_dev_server_project))
-            .add_request_handler(user_handler(update_dev_server_project))
             .add_request_handler(user_handler(delete_dev_server_project))
             .add_request_handler(user_handler(create_dev_server))
             .add_request_handler(user_handler(regenerate_dev_server_token))
             .add_request_handler(user_handler(rename_dev_server))
             .add_request_handler(user_handler(delete_dev_server))
-            .add_request_handler(user_handler(list_remote_directory))
             .add_request_handler(dev_server_handler(share_dev_server_project))
             .add_request_handler(dev_server_handler(shutdown_dev_server))
             .add_request_handler(dev_server_handler(reconnect_dev_server))
@@ -618,6 +616,17 @@ impl Server {
                     )
                 }
             })
+            .add_request_handler({
+                let app_state = app_state.clone();
+                user_handler(move |request, response, session| {
+                    cache_language_model_content(
+                        request,
+                        response,
+                        session,
+                        app_state.config.google_ai_api_key.clone(),
+                    )
+                })
+            })
             .add_request_handler({
                 let app_state = app_state.clone();
                 user_handler(move |request, response, session| {
@@ -2315,69 +2324,6 @@ async fn join_hosted_project(
     join_project_internal(response, session, &mut project, &replica_id)
 }
 
-async fn list_remote_directory(
-    request: proto::ListRemoteDirectory,
-    response: Response<proto::ListRemoteDirectory>,
-    session: UserSession,
-) -> Result<()> {
-    let dev_server_id = DevServerId(request.dev_server_id as i32);
-    let dev_server_connection_id = session
-        .connection_pool()
-        .await
-        .dev_server_connection_id_supporting(dev_server_id, ZedVersion::with_list_directory())?;
-
-    session
-        .db()
-        .await
-        .get_dev_server_for_user(dev_server_id, session.user_id())
-        .await?;
-
-    response.send(
-        session
-            .peer
-            .forward_request(session.connection_id, dev_server_connection_id, request)
-            .await?,
-    )?;
-    Ok(())
-}
-
-async fn update_dev_server_project(
-    request: proto::UpdateDevServerProject,
-    response: Response<proto::UpdateDevServerProject>,
-    session: UserSession,
-) -> Result<()> {
-    let dev_server_project_id = DevServerProjectId(request.dev_server_project_id as i32);
-
-    let (dev_server_project, update) = session
-        .db()
-        .await
-        .update_dev_server_project(dev_server_project_id, &request.paths, session.user_id())
-        .await?;
-
-    let projects = session
-        .db()
-        .await
-        .get_projects_for_dev_server(dev_server_project.dev_server_id)
-        .await?;
-
-    let dev_server_connection_id = session
-        .connection_pool()
-        .await
-        .dev_server_connection_id_supporting(
-            dev_server_project.dev_server_id,
-            ZedVersion::with_list_directory(),
-        )?;
-
-    session.peer.send(
-        dev_server_connection_id,
-        proto::DevServerInstructions { projects },
-    )?;
-
-    send_dev_server_projects_update(session.user_id(), update, &session).await;
-
-    response.send(proto::Ack {})
-}
-
 async fn create_dev_server_project(
     request: proto::CreateDevServerProject,
     response: Response<proto::CreateDevServerProject>,
@@ -4788,6 +4734,43 @@ async fn complete_with_anthropic(
     Ok(())
 }
 
+async fn cache_language_model_content(
+    request: proto::CacheLanguageModelContent,
+    response: Response<proto::CacheLanguageModelContent>,
+    session: UserSession,
+    google_ai_api_key: Option<Arc<str>>,
+) -> Result<()> {
+    authorize_access_to_language_models(&session).await?;
+
+    if !request.model.starts_with("gemini") {
+        return Err(anyhow!(
+            "caching content for model: {:?} is not supported",
+            request.model
+        ))?;
+    }
+
+    let api_key = google_ai_api_key
+        .ok_or_else(|| anyhow!("no Google AI API key configured on the server"))?;
+
+    let cached_content = google_ai::create_cached_content(
+        session.http_client.as_ref(),
+        google_ai::API_URL,
+        &api_key,
+        crate::ai::cache_language_model_content_request_to_google_ai(request)?,
+    )
+    .await?;
+
+    response.send(proto::CacheLanguageModelContentResponse {
+        name: cached_content.name,
+        create_time: cached_content.create_time.timestamp() as u64,
+        update_time: cached_content.update_time.timestamp() as u64,
+        expire_time: cached_content.expire_time.map(|t| t.timestamp() as u64),
+        total_token_count: cached_content.usage_metadata.total_token_count,
+    })?;
+
+    Ok(())
+}
+
 struct CountTokensWithLanguageModelRateLimit;
 
 impl RateLimit for CountTokensWithLanguageModelRateLimit {

crates/collab/src/rpc/connection_pool.rs

@@ -38,10 +38,6 @@ impl ZedVersion {
     pub fn with_save_as() -> ZedVersion {
         ZedVersion(SemanticVersion::new(0, 134, 0))
     }
-
-    pub fn with_list_directory() -> ZedVersion {
-        ZedVersion(SemanticVersion::new(0, 145, 0))
-    }
 }
 
 pub trait VersionedMessage {
@@ -191,18 +187,6 @@ impl ConnectionPool {
         self.connected_dev_servers.get(&dev_server_id).copied()
     }
 
-    pub fn dev_server_connection_id_supporting(
-        &self,
-        dev_server_id: DevServerId,
-        required: ZedVersion,
-    ) -> Result<ConnectionId> {
-        match self.connected_dev_servers.get(&dev_server_id) {
-            Some(cid) if self.connections[cid].zed_version >= required => Ok(*cid),
-            Some(_) => Err(anyhow!(proto::ErrorCode::RemoteUpgradeRequired)),
-            None => Err(anyhow!(proto::ErrorCode::DevServerOffline)),
-        }
-    }
-
     pub fn channel_user_ids(
         &self,
         channel_id: ChannelId,

crates/collab/src/tests/dev_server_tests.rs

@@ -66,7 +66,7 @@ async fn test_dev_server(cx: &mut gpui::TestAppContext, cx2: &mut gpui::TestAppC
         .update(cx, |store, cx| {
             let projects = store.dev_server_projects();
             assert_eq!(projects.len(), 1);
-            assert_eq!(projects[0].paths, vec!["/remote"]);
+            assert_eq!(projects[0].path, "/remote");
             workspace::join_dev_server_project(
                 projects[0].id,
                 projects[0].project_id.unwrap(),
@@ -206,7 +206,7 @@ async fn create_dev_server_project(
         .update(cx, |store, cx| {
             let projects = store.dev_server_projects();
             assert_eq!(projects.len(), 1);
-            assert_eq!(projects[0].paths, vec!["/remote"]);
+            assert_eq!(projects[0].path, "/remote");
             workspace::join_dev_server_project(
                 projects[0].id,
                 projects[0].project_id.unwrap(),

crates/collab/src/tests/following_tests.rs

@@ -135,7 +135,7 @@ async fn test_basic_following(
         assert_eq!(editor.selections.ranges(cx), vec![2..1]);
     });
 
-    // When client B starts following client A, only the active view state is replicated to client B.
+    // When client B starts following client A, all visible view states are replicated to client B.
     workspace_b.update(cx_b, |workspace, cx| workspace.follow(peer_id_a, cx));
 
     cx_c.executor().run_until_parked();
@@ -156,7 +156,7 @@ async fn test_basic_following(
     );
     assert_eq!(
         editor_b1.update(cx_b, |editor, cx| editor.selections.ranges(cx)),
-        vec![3..3]
+        vec![3..2]
     );
 
     executor.run_until_parked();
@@ -194,7 +194,7 @@ async fn test_basic_following(
 
     // Client C unfollows client A.
     workspace_c.update(cx_c, |workspace, cx| {
-        workspace.unfollow(peer_id_a, cx).unwrap();
+        workspace.unfollow(&workspace.active_pane().clone(), cx);
     });
 
     // All clients see that clients B is following client A.
@@ -266,7 +266,7 @@ async fn test_basic_following(
 
     // When client A activates a different editor, client B does so as well.
     workspace_a.update(cx_a, |workspace, cx| {
-        workspace.activate_item(&editor_a1, true, true, cx)
+        workspace.activate_item(&editor_a1, cx)
     });
     executor.run_until_parked();
     workspace_b.update(cx_b, |workspace, cx| {
@@ -311,7 +311,7 @@ async fn test_basic_following(
         let editor = cx.new_view(|cx| {
             Editor::for_multibuffer(multibuffer_a, Some(project_a.clone()), true, cx)
         });
-        workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, cx);
+        workspace.add_item_to_active_pane(Box::new(editor.clone()), None, cx);
         editor
     });
     executor.run_until_parked();
@@ -398,10 +398,10 @@ async fn test_basic_following(
 
     // After unfollowing, client B stops receiving updates from client A.
     workspace_b.update(cx_b, |workspace, cx| {
-        workspace.unfollow(peer_id_a, cx).unwrap()
+        workspace.unfollow(&workspace.active_pane().clone(), cx)
     });
     workspace_a.update(cx_a, |workspace, cx| {
-        workspace.activate_item(&editor_a2, true, true, cx)
+        workspace.activate_item(&editor_a2, cx)
     });
     executor.run_until_parked();
     assert_eq!(
@@ -466,7 +466,7 @@ async fn test_basic_following(
 
     // Client B activates a multibuffer that was created by following client A. Client A returns to that multibuffer.
     workspace_b.update(cx_b, |workspace, cx| {
-        workspace.activate_item(&multibuffer_editor_b, true, true, cx)
+        workspace.activate_item(&multibuffer_editor_b, cx)
     });
     executor.run_until_parked();
     workspace_a.update(cx_a, |workspace, cx| {

crates/collab/src/tests/integration_tests.rs

@@ -1528,7 +1528,7 @@ async fn test_project_reconnect(
     });
     let (worktree_a2, _) = project_a1
         .update(cx_a, |p, cx| {
-            p.find_or_create_worktree("/root-1/dir2", true, cx)
+            p.find_or_create_local_worktree("/root-1/dir2", true, cx)
         })
         .await
         .unwrap();
@@ -1601,7 +1601,7 @@ async fn test_project_reconnect(
     });
     let (worktree_a3, _) = project_a1
         .update(cx_a, |p, cx| {
-            p.find_or_create_worktree("/root-1/dir3", true, cx)
+            p.find_or_create_local_worktree("/root-1/dir3", true, cx)
         })
         .await
         .unwrap();
@@ -1725,7 +1725,7 @@ async fn test_project_reconnect(
     // 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("/root-1/dir4", true, cx)
+            p.find_or_create_local_worktree("/root-1/dir4", true, cx)
         })
         .await
         .unwrap();
@@ -4887,7 +4887,7 @@ async fn test_project_search(
     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)
+            p.find_or_create_local_worktree("/root/dir-2", true, cx)
         })
         .await
         .unwrap();

crates/collab/src/tests/random_project_collaboration_tests.rs

@@ -581,7 +581,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                 }
                 project
                     .update(cx, |project, cx| {
-                        project.find_or_create_worktree(&new_root_path, true, cx)
+                        project.find_or_create_local_worktree(&new_root_path, true, cx)
                     })
                     .await
                     .unwrap();

crates/collab/src/tests/test_server.rs

@@ -805,7 +805,9 @@ impl TestClient {
     ) -> (Model<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))
+            .update(cx, |p, cx| {
+                p.find_or_create_local_worktree(root_path, true, cx)
+            })
             .await
             .unwrap();
         worktree

crates/collab_ui/Cargo.toml

@@ -32,7 +32,6 @@ test-support = [
 anyhow.workspace = true
 call.workspace = true
 channel.workspace = true
-chrono.workspace = true
 client.workspace = true
 collections.workspace = true
 db.workspace = true

crates/collab_ui/src/channel_view.rs

@@ -11,22 +11,21 @@ use editor::{
     EditorEvent,
 };
 use gpui::{
-    actions, AnyView, AppContext, ClipboardItem, Entity as _, EventEmitter, FocusableView, Model,
-    Pixels, Point, Render, Subscription, Task, View, ViewContext, VisualContext as _, WeakView,
-    WindowContext,
+    actions, AnyElement, AnyView, AppContext, ClipboardItem, Entity as _, EventEmitter,
+    FocusableView, IntoElement as _, Model, Pixels, Point, Render, Subscription, Task, View,
+    ViewContext, VisualContext as _, WeakView, WindowContext,
 };
 use project::Project;
-use rpc::proto::ChannelVisibility;
 use std::{
     any::{Any, TypeId},
     sync::Arc,
 };
-use ui::prelude::*;
+use ui::{prelude::*, Label};
 use util::ResultExt;
-use workspace::item::TabContentParams;
-use workspace::{item::Dedup, notifications::NotificationId};
+use workspace::notifications::NotificationId;
 use workspace::{
-    item::{FollowableItem, Item, ItemEvent, ItemHandle},
+    item::{FollowableItem, Item, ItemEvent, ItemHandle, TabContentParams},
+    register_followable_item,
     searchable::SearchableItemHandle,
     ItemNavHistory, Pane, SaveIntent, Toast, ViewId, Workspace, WorkspaceId,
 };
@@ -34,7 +33,7 @@ use workspace::{
 actions!(collab, [CopyLink]);
 
 pub fn init(cx: &mut AppContext) {
-    workspace::FollowableViewRegistry::register::<ChannelView>(cx)
+    register_followable_item::<ChannelView>(cx)
 }
 
 pub struct ChannelView {
@@ -84,56 +83,6 @@ impl ChannelView {
         pane: View<Pane>,
         workspace: View<Workspace>,
         cx: &mut WindowContext,
-    ) -> Task<Result<View<Self>>> {
-        let channel_view = Self::load(channel_id, workspace, cx);
-        cx.spawn(|mut cx| async move {
-            let channel_view = channel_view.await?;
-
-            pane.update(&mut cx, |pane, 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() {
-                    if 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, cx)
-                            });
-                        }
-                        return existing_view;
-                    }
-                }
-
-                // If the pane contained a disconnected view for this channel buffer,
-                // replace that.
-                if let Some(existing_item) = existing_view {
-                    if let Some(ix) = pane.index_for_item(&existing_item) {
-                        pane.close_item_by_id(existing_item.entity_id(), SaveIntent::Skip, cx)
-                            .detach();
-                        pane.add_item(Box::new(channel_view.clone()), true, true, Some(ix), cx);
-                    }
-                }
-
-                if let Some(link_position) = link_position {
-                    channel_view.update(cx, |channel_view, cx| {
-                        channel_view.focus_position_from_link(link_position, true, cx)
-                    });
-                }
-
-                channel_view
-            })
-        })
-    }
-
-    pub fn load(
-        channel_id: ChannelId,
-        workspace: View<Workspace>,
-        cx: &mut WindowContext,
     ) -> Task<Result<View<Self>>> {
         let weak_workspace = workspace.downgrade();
         let workspace = workspace.read(cx);
@@ -158,11 +107,49 @@ impl ChannelView {
                 })
             })?;
 
-            cx.new_view(|cx| {
-                let mut this =
-                    Self::new(project, weak_workspace, channel_store, channel_buffer, cx);
-                this.acknowledge_buffer_version(cx);
-                this
+            pane.update(&mut cx, |pane, cx| {
+                let buffer_id = 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() {
+                    if existing_view.read(cx).channel_buffer == 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, cx)
+                            });
+                        }
+                        return existing_view;
+                    }
+                }
+
+                let view = cx.new_view(|cx| {
+                    let mut this =
+                        Self::new(project, weak_workspace, channel_store, channel_buffer, cx);
+                    this.acknowledge_buffer_version(cx);
+                    this
+                });
+
+                // If the pane contained a disconnected view for this channel buffer,
+                // replace that.
+                if let Some(existing_item) = existing_view {
+                    if let Some(ix) = pane.index_for_item(&existing_item) {
+                        pane.close_item_by_id(existing_item.entity_id(), SaveIntent::Skip, cx)
+                            .detach();
+                        pane.add_item(Box::new(view.clone()), true, true, Some(ix), cx);
+                    }
+                }
+
+                if let Some(link_position) = link_position {
+                    view.update(cx, |channel_view, cx| {
+                        channel_view.focus_position_from_link(link_position, true, cx)
+                    });
+                }
+
+                view
             })
         })
     }
@@ -387,45 +374,24 @@ impl Item for ChannelView {
         }
     }
 
-    fn tab_icon(&self, cx: &WindowContext) -> 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(&self, params: TabContentParams, cx: &WindowContext) -> gpui::AnyElement {
-        let (channel_name, status) = if let Some(channel) = self.channel(cx) {
-            let status = match (
+    fn tab_content(&self, params: TabContentParams, cx: &WindowContext) -> AnyElement {
+        let label = if let Some(channel) = self.channel(cx) {
+            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)
+                (false, true) => format!("#{}", channel.name),
+                (true, true) => format!("#{} (read-only)", channel.name),
+                (_, false) => format!("#{} (disconnected)", channel.name),
+            }
         } else {
-            ("<unknown>".into(), Some("disconnected"))
+            "channel notes (disconnected)".to_string()
         };
-
-        h_flex()
-            .gap_2()
-            .child(
-                Label::new(channel_name)
-                    .color(params.text_color())
-                    .italic(params.preview),
-            )
-            .when_some(status, |element, status| {
-                element.child(
-                    Label::new(status)
-                        .size(LabelSize::XSmall)
-                        .color(Color::Muted),
-                )
+        Label::new(label)
+            .color(if params.selected {
+                Color::Default
+            } else {
+                Color::Muted
             })
             .into_any_element()
     }
@@ -512,6 +478,7 @@ impl FollowableItem for ChannelView {
     }
 
     fn from_state_proto(
+        pane: View<workspace::Pane>,
         workspace: View<workspace::Workspace>,
         remote_id: workspace::ViewId,
         state: &mut Option<proto::view::Variant>,
@@ -524,7 +491,8 @@ impl FollowableItem for ChannelView {
             unreachable!()
         };
 
-        let open = ChannelView::load(ChannelId(state.channel_id), workspace, cx);
+        let open =
+            ChannelView::open_in_pane(ChannelId(state.channel_id), None, pane, workspace, cx);
 
         Some(cx.spawn(|mut cx| async move {
             let this = open.await?;
@@ -595,19 +563,6 @@ impl FollowableItem for ChannelView {
     fn to_follow_event(event: &Self::Event) -> Option<workspace::item::FollowEvent> {
         Editor::to_follow_event(event)
     }
-
-    fn dedup(&self, existing: &Self, cx: &WindowContext) -> 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(Model<ChannelBuffer>);

crates/collab_ui/src/chat_panel.rs

@@ -111,7 +111,6 @@ impl ChatPanel {
                 this.is_scrolled_to_bottom = !event.is_scrolled;
             }));
 
-            let local_offset = chrono::Local::now().offset().local_minus_utc();
             let mut this = Self {
                 fs,
                 client,
@@ -121,7 +120,7 @@ impl ChatPanel {
                 active_chat: Default::default(),
                 pending_serialization: Task::ready(None),
                 message_editor: input_editor,
-                local_timezone: UtcOffset::from_whole_seconds(local_offset).unwrap(),
+                local_timezone: cx.local_timezone(),
                 subscriptions: Vec::new(),
                 is_scrolled_to_bottom: true,
                 active: false,

crates/collab_ui/src/collab_panel/contact_finder.rs

@@ -5,6 +5,7 @@ use gpui::{
 };
 use picker::{Picker, PickerDelegate};
 use std::sync::Arc;
+use theme::ActiveTheme as _;
 use ui::{prelude::*, Avatar, ListItem, ListItemSpacing};
 use util::{ResultExt as _, TryFutureExt};
 use workspace::ModalView;

crates/collab_ui/src/notification_panel.rs

@@ -127,12 +127,11 @@ impl NotificationPanel {
                 },
             ));
 
-            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(),
+                local_timezone: cx.local_timezone(),
                 channel_store: ChannelStore::global(cx),
                 notification_store: NotificationStore::global(cx),
                 notification_list,

crates/command_palette/src/command_palette.rs

@@ -477,7 +477,7 @@ mod tests {
         });
 
         workspace.update(cx, |workspace, cx| {
-            workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, cx);
+            workspace.add_item_to_active_pane(Box::new(editor.clone()), None, cx);
             editor.update(cx, |editor, cx| editor.focus(cx))
         });
 

crates/dev_server_projects/src/dev_server_projects.rs

@@ -20,7 +20,7 @@ pub struct Store {
 pub struct DevServerProject {
     pub id: DevServerProjectId,
     pub project_id: Option<ProjectId>,
-    pub paths: Vec<SharedString>,
+    pub path: SharedString,
     pub dev_server_id: DevServerId,
 }
 
@@ -29,7 +29,7 @@ impl From<proto::DevServerProject> for DevServerProject {
         Self {
             id: DevServerProjectId(project.id),
             project_id: project.project_id.map(|id| ProjectId(id)),
-            paths: project.paths.into_iter().map(|path| path.into()).collect(),
+            path: project.path.into(),
             dev_server_id: DevServerId(project.dev_server_id),
         }
     }
@@ -85,7 +85,7 @@ impl Store {
             .filter(|project| project.dev_server_id == id)
             .cloned()
             .collect();
-        projects.sort_by_key(|p| (p.paths.clone(), p.id));
+        projects.sort_by_key(|p| (p.path.clone(), p.id));
         projects
     }
 
@@ -108,7 +108,7 @@ impl Store {
     pub fn dev_server_projects(&self) -> Vec<DevServerProject> {
         let mut projects: Vec<DevServerProject> =
             self.dev_server_projects.values().cloned().collect();
-        projects.sort_by_key(|p| (p.paths.clone(), p.id));
+        projects.sort_by_key(|p| (p.path.clone(), p.id));
         projects
     }
 

crates/diagnostics/Cargo.toml

@@ -18,13 +18,11 @@ collections.workspace = true
 ctor.workspace = true
 editor.workspace = true
 env_logger.workspace = true
-feature_flags.workspace = true
 futures.workspace = true
 gpui.workspace = true
 language.workspace = true
 log.workspace = true
 lsp.workspace = true
-multi_buffer.workspace = true
 project.workspace = true
 rand.workspace = true
 schemars.workspace = true

crates/diagnostics/src/diagnostics.rs

@@ -4,18 +4,16 @@ mod toolbar_controls;
 
 #[cfg(test)]
 mod diagnostics_tests;
-pub(crate) mod grouped_diagnostics;
 
 use anyhow::Result;
 use collections::{BTreeSet, HashSet};
 use editor::{
     diagnostic_block_renderer,
-    display_map::{BlockDisposition, BlockProperties, BlockStyle, CustomBlockId, RenderBlock},
+    display_map::{BlockDisposition, BlockId, BlockProperties, BlockStyle, RenderBlock},
     highlight_diagnostic_message,
     scroll::Autoscroll,
     Editor, EditorEvent, ExcerptId, ExcerptRange, MultiBuffer, ToOffset,
 };
-use feature_flags::FeatureFlagAppExt;
 use futures::{
     channel::mpsc::{self, UnboundedSender},
     StreamExt as _,
@@ -45,7 +43,7 @@ use ui::{h_flex, prelude::*, Icon, IconName, Label};
 use util::ResultExt;
 use workspace::{
     item::{BreadcrumbText, Item, ItemEvent, ItemHandle, TabContentParams},
-    ItemNavHistory, ToolbarItemLocation, Workspace,
+    ItemNavHistory, Pane, ToolbarItemLocation, Workspace,
 };
 
 actions!(diagnostics, [Deploy, ToggleWarnings]);
@@ -54,9 +52,6 @@ pub fn init(cx: &mut AppContext) {
     ProjectDiagnosticsSettings::register(cx);
     cx.observe_new_views(ProjectDiagnosticsEditor::register)
         .detach();
-    if !cx.has_flag::<feature_flags::GroupedDiagnostics>() {
-        grouped_diagnostics::init(cx);
-    }
 }
 
 struct ProjectDiagnosticsEditor {
@@ -85,7 +80,7 @@ struct DiagnosticGroupState {
     primary_diagnostic: DiagnosticEntry<language::Anchor>,
     primary_excerpt_ix: usize,
     excerpts: Vec<ExcerptId>,
-    blocks: HashSet<CustomBlockId>,
+    blocks: HashSet<BlockId>,
     block_count: usize,
 }
 
@@ -237,13 +232,13 @@ impl ProjectDiagnosticsEditor {
 
     fn deploy(workspace: &mut Workspace, _: &Deploy, cx: &mut ViewContext<Workspace>) {
         if let Some(existing) = workspace.item_of_type::<ProjectDiagnosticsEditor>(cx) {
-            workspace.activate_item(&existing, true, true, cx);
+            workspace.activate_item(&existing, cx);
         } else {
             let workspace_handle = cx.view().downgrade();
             let diagnostics = cx.new_view(|cx| {
                 ProjectDiagnosticsEditor::new(workspace.project().clone(), workspace_handle, cx)
             });
-            workspace.add_item_to_active_pane(Box::new(diagnostics), None, true, cx);
+            workspace.add_item_to_active_pane(Box::new(diagnostics), None, cx);
         }
     }
 
@@ -471,9 +466,7 @@ impl ProjectDiagnosticsEditor {
                                         position: (excerpt_id, entry.range.start),
                                         height: diagnostic.message.matches('\n').count() as u8 + 1,
                                         style: BlockStyle::Fixed,
-                                        render: diagnostic_block_renderer(
-                                            diagnostic, None, true, true,
-                                        ),
+                                        render: diagnostic_block_renderer(diagnostic, true),
                                         disposition: BlockDisposition::Below,
                                     });
                                 }
@@ -649,7 +642,11 @@ impl Item for ProjectDiagnosticsEditor {
     fn tab_content(&self, params: TabContentParams, _: &WindowContext) -> AnyElement {
         if self.summary.error_count == 0 && self.summary.warning_count == 0 {
             Label::new("No problems")
-                .color(params.text_color())
+                .color(if params.selected {
+                    Color::Default
+                } else {
+                    Color::Muted
+                })
                 .into_any_element()
         } else {
             h_flex()
@@ -659,10 +656,13 @@ impl Item for ProjectDiagnosticsEditor {
                         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()),
-                            ),
+                            .child(Label::new(self.summary.error_count.to_string()).color(
+                                if params.selected {
+                                    Color::Default
+                                } else {
+                                    Color::Muted
+                                },
+                            )),
                     )
                 })
                 .when(self.summary.warning_count > 0, |then| {
@@ -670,10 +670,13 @@ impl Item for ProjectDiagnosticsEditor {
                         h_flex()
                             .gap_1()
                             .child(Icon::new(IconName::ExclamationTriangle).color(Color::Warning))
-                            .child(
-                                Label::new(self.summary.warning_count.to_string())
-                                    .color(params.text_color()),
-                            ),
+                            .child(Label::new(self.summary.warning_count.to_string()).color(
+                                if params.selected {
+                                    Color::Default
+                                } else {
+                                    Color::Muted
+                                },
+                            )),
                     )
                 })
                 .into_any_element()
@@ -776,12 +779,26 @@ impl Item for ProjectDiagnosticsEditor {
         self.editor
             .update(cx, |editor, cx| editor.added_to_workspace(workspace, cx));
     }
+
+    fn serialized_item_kind() -> Option<&'static str> {
+        Some("diagnostics")
+    }
+
+    fn deserialize(
+        project: Model<Project>,
+        workspace: WeakView<Workspace>,
+        _workspace_id: workspace::WorkspaceId,
+        _item_id: workspace::ItemId,
+        cx: &mut ViewContext<Pane>,
+    ) -> Task<Result<View<Self>>> {
+        Task::ready(Ok(cx.new_view(|cx| Self::new(project, workspace, cx))))
+    }
 }
 
 const DIAGNOSTIC_HEADER: &'static str = "diagnostic header";
 
 fn diagnostic_header_renderer(diagnostic: Diagnostic) -> RenderBlock {
-    let (message, code_ranges) = highlight_diagnostic_message(&diagnostic, None);
+    let (message, code_ranges) = highlight_diagnostic_message(&diagnostic);
     let message: SharedString = message;
     Box::new(move |cx| {
         let highlight_style: HighlightStyle = cx.theme().colors().text_accent.into();

crates/diagnostics/src/diagnostics_tests.rs

@@ -1,7 +1,7 @@
 use super::*;
 use collections::HashMap;
 use editor::{
-    display_map::{Block, BlockContext, DisplayRow},
+    display_map::{BlockContext, DisplayRow, TransformBlock},
     DisplayPoint, GutterDimensions,
 };
 use gpui::{px, AvailableSpace, Stateful, TestAppContext, VisualTestContext};
@@ -973,10 +973,10 @@ fn editor_blocks(
             blocks.extend(
                 snapshot
                     .blocks_in_range(DisplayRow(0)..snapshot.max_point().row())
-                    .filter_map(|(row, block)| {
-                        let block_id = block.id();
+                    .enumerate()
+                    .filter_map(|(ix, (row, block))| {
                         let name: SharedString = match block {
-                            Block::Custom(block) => {
+                            TransformBlock::Custom(block) => {
                                 let mut element = block.render(&mut BlockContext {
                                     context: cx,
                                     anchor_x: px(0.),
@@ -984,7 +984,7 @@ fn editor_blocks(
                                     line_height: px(0.),
                                     em_width: px(0.),
                                     max_width: px(0.),
-                                    block_id,
+                                    block_id: ix,
                                     editor_style: &editor::EditorStyle::default(),
                                 });
                                 let element = element.downcast_mut::<Stateful<Div>>().unwrap();
@@ -996,7 +996,7 @@ fn editor_blocks(
                                     .ok()?
                             }
 
-                            Block::ExcerptHeader {
+                            TransformBlock::ExcerptHeader {
                                 starts_new_buffer, ..
                             } => {
                                 if *starts_new_buffer {
@@ -1005,7 +1005,7 @@ fn editor_blocks(
                                     EXCERPT_HEADER.into()
                                 }
                             }
-                            Block::ExcerptFooter { .. } => EXCERPT_FOOTER.into(),
+                            TransformBlock::ExcerptFooter { .. } => EXCERPT_FOOTER.into(),
                         };
 
                         Some((row, name))

crates/diagnostics/src/toolbar_controls.rs

@@ -1,12 +1,11 @@
-use crate::{grouped_diagnostics::GroupedDiagnosticsEditor, ProjectDiagnosticsEditor};
-use futures::future::Either;
-use gpui::{EventEmitter, ParentElement, Render, View, ViewContext, WeakView};
+use crate::ProjectDiagnosticsEditor;
+use gpui::{EventEmitter, ParentElement, Render, ViewContext, WeakView};
 use ui::prelude::*;
 use ui::{IconButton, IconName, Tooltip};
 use workspace::{item::ItemHandle, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView};
 
 pub struct ToolbarControls {
-    editor: Option<Either<WeakView<ProjectDiagnosticsEditor>, WeakView<GroupedDiagnosticsEditor>>>,
+    editor: Option<WeakView<ProjectDiagnosticsEditor>>,
 }
 
 impl Render for ToolbarControls {
@@ -15,33 +14,18 @@ impl Render for ToolbarControls {
         let mut has_stale_excerpts = false;
         let mut is_updating = false;
 
-        if let Some(editor) = self.editor() {
-            match editor {
-                Either::Left(editor) => {
-                    let editor = editor.read(cx);
-                    include_warnings = editor.include_warnings;
-                    has_stale_excerpts = !editor.paths_to_update.is_empty();
-                    is_updating = editor.update_paths_tx.len() > 0
-                        || editor
-                            .project
-                            .read(cx)
-                            .language_servers_running_disk_based_diagnostics()
-                            .next()
-                            .is_some();
-                }
-                Either::Right(editor) => {
-                    let editor = editor.read(cx);
-                    include_warnings = editor.include_warnings;
-                    has_stale_excerpts = !editor.paths_to_update.is_empty();
-                    is_updating = editor.update_paths_tx.len() > 0
-                        || editor
-                            .project
-                            .read(cx)
-                            .language_servers_running_disk_based_diagnostics()
-                            .next()
-                            .is_some();
-                }
-            }
+        if let Some(editor) = self.editor.as_ref().and_then(|editor| editor.upgrade()) {
+            let editor = editor.read(cx);
+
+            include_warnings = editor.include_warnings;
+            has_stale_excerpts = !editor.paths_to_update.is_empty();
+            is_updating = editor.update_paths_tx.len() > 0
+                || editor
+                    .project
+                    .read(cx)
+                    .language_servers_running_disk_based_diagnostics()
+                    .next()
+                    .is_some();
         }
 
         let tooltip = if include_warnings {
@@ -58,19 +42,12 @@ impl Render for ToolbarControls {
                         .disabled(is_updating)
                         .tooltip(move |cx| Tooltip::text("Update excerpts", cx))
                         .on_click(cx.listener(|this, _, cx| {
-                            if let Some(editor) = this.editor() {
-                                match editor {
-                                    Either::Left(editor) => {
-                                        editor.update(cx, |editor, _| {
-                                            editor.enqueue_update_stale_excerpts(None);
-                                        });
-                                    }
-                                    Either::Right(editor) => {
-                                        editor.update(cx, |editor, _| {
-                                            editor.enqueue_update_stale_excerpts(None);
-                                        });
-                                    }
-                                }
+                            if let Some(editor) =
+                                this.editor.as_ref().and_then(|editor| editor.upgrade())
+                            {
+                                editor.update(cx, |editor, _| {
+                                    editor.enqueue_update_stale_excerpts(None);
+                                });
                             }
                         })),
                 )
@@ -79,19 +56,12 @@ impl Render for ToolbarControls {
                 IconButton::new("toggle-warnings", IconName::ExclamationTriangle)
                     .tooltip(move |cx| Tooltip::text(tooltip, cx))
                     .on_click(cx.listener(|this, _, cx| {
-                        if let Some(editor) = this.editor() {
-                            match editor {
-                                Either::Left(editor) => {
-                                    editor.update(cx, |editor, cx| {
-                                        editor.toggle_warnings(&Default::default(), cx);
-                                    });
-                                }
-                                Either::Right(editor) => {
-                                    editor.update(cx, |editor, cx| {
-                                        editor.toggle_warnings(&Default::default(), cx);
-                                    });
-                                }
-                            }
+                        if let Some(editor) =
+                            this.editor.as_ref().and_then(|editor| editor.upgrade())
+                        {
+                            editor.update(cx, |editor, cx| {
+                                editor.toggle_warnings(&Default::default(), cx);
+                            });
                         }
                     })),
             )
@@ -108,10 +78,7 @@ impl ToolbarItemView for ToolbarControls {
     ) -> ToolbarItemLocation {
         if let Some(pane_item) = active_pane_item.as_ref() {
             if let Some(editor) = pane_item.downcast::<ProjectDiagnosticsEditor>() {
-                self.editor = Some(Either::Left(editor.downgrade()));
-                ToolbarItemLocation::PrimaryRight
-            } else if let Some(editor) = pane_item.downcast::<GroupedDiagnosticsEditor>() {
-                self.editor = Some(Either::Right(editor.downgrade()));
+                self.editor = Some(editor.downgrade());
                 ToolbarItemLocation::PrimaryRight
             } else {
                 ToolbarItemLocation::Hidden
@@ -126,13 +93,4 @@ impl ToolbarControls {
     pub fn new() -> Self {
         ToolbarControls { editor: None }
     }
-
-    fn editor(
-        &self,
-    ) -> Option<Either<View<ProjectDiagnosticsEditor>, View<GroupedDiagnosticsEditor>>> {
-        Some(match self.editor.as_ref()? {
-            Either::Left(diagnostics) => Either::Left(diagnostics.upgrade()?),
-            Either::Right(grouped_diagnostics) => Either::Right(grouped_diagnostics.upgrade()?),
-        })
-    }
 }

crates/editor/Cargo.toml

@@ -31,14 +31,12 @@ test-support = [
 aho-corasick = "1.1"
 anyhow.workspace = true
 assets.workspace = true
-chrono.workspace = true
 client.workspace = true
 clock.workspace = true
 collections.workspace = true
 convert_case = "0.6.0"
 db.workspace = true
 emojis.workspace = true
-file_icons.workspace = true
 futures.workspace = true
 fuzzy.workspace = true
 git.workspace = true

crates/editor/src/actions.rs

@@ -129,7 +129,7 @@ pub struct ExpandExcerptsDown {
 #[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct ShowCompletions {
     #[serde(default)]
-    pub(super) trigger: Option<String>,
+    pub(super) trigger: Option<char>,
 }
 
 impl_actions!(

crates/editor/src/blame_entry_tooltip.rs

@@ -8,7 +8,6 @@ use gpui::{
 use settings::Settings;
 use std::hash::Hash;
 use theme::{ActiveTheme, ThemeSettings};
-use time::UtcOffset;
 use ui::{
     div, h_flex, tooltip_container, v_flex, Avatar, Button, ButtonStyle, Clickable as _, Color,
     FluentBuilder, Icon, IconName, IconPosition, InteractiveElement as _, IntoElement,
@@ -130,7 +129,7 @@ impl Render for BlameEntryTooltip {
         let author_email = self.blame_entry.author_mail.clone();
 
         let short_commit_id = self.blame_entry.sha.display_short();
-        let absolute_timestamp = blame_entry_absolute_timestamp(&self.blame_entry);
+        let absolute_timestamp = blame_entry_absolute_timestamp(&self.blame_entry, cx);
 
         let message = self
             .details
@@ -248,25 +247,30 @@ impl Render for BlameEntryTooltip {
     }
 }
 
-fn blame_entry_timestamp(blame_entry: &BlameEntry, format: time_format::TimestampFormat) -> String {
+fn blame_entry_timestamp(
+    blame_entry: &BlameEntry,
+    format: time_format::TimestampFormat,
+    cx: &WindowContext,
+) -> String {
     match blame_entry.author_offset_date_time() {
-        Ok(timestamp) => {
-            let local = chrono::Local::now().offset().local_minus_utc();
-            time_format::format_localized_timestamp(
-                timestamp,
-                time::OffsetDateTime::now_utc(),
-                UtcOffset::from_whole_seconds(local).unwrap(),
-                format,
-            )
-        }
+        Ok(timestamp) => time_format::format_localized_timestamp(
+            timestamp,
+            time::OffsetDateTime::now_utc(),
+            cx.local_timezone(),
+            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)
+pub fn blame_entry_relative_timestamp(blame_entry: &BlameEntry, cx: &WindowContext) -> String {
+    blame_entry_timestamp(blame_entry, time_format::TimestampFormat::Relative, cx)
 }
 
-fn blame_entry_absolute_timestamp(blame_entry: &BlameEntry) -> String {
-    blame_entry_timestamp(blame_entry, time_format::TimestampFormat::MediumAbsolute)
+fn blame_entry_absolute_timestamp(blame_entry: &BlameEntry, cx: &WindowContext) -> String {
+    blame_entry_timestamp(
+        blame_entry,
+        time_format::TimestampFormat::MediumAbsolute,
+        cx,
+    )
 }

crates/editor/src/display_map.rs

@@ -28,8 +28,8 @@ use crate::{
     hover_links::InlayHighlight, movement::TextLayoutDetails, EditorStyle, InlayId, RowExt,
 };
 pub use block_map::{
-    Block, BlockBufferRows, BlockChunks as DisplayChunks, BlockContext, BlockDisposition, BlockId,
-    BlockMap, BlockPoint, BlockProperties, BlockStyle, CustomBlockId, RenderBlock,
+    BlockBufferRows, BlockChunks as DisplayChunks, BlockContext, BlockDisposition, BlockId,
+    BlockMap, BlockPoint, BlockProperties, BlockStyle, RenderBlock, TransformBlock,
 };
 use block_map::{BlockRow, BlockSnapshot};
 use collections::{HashMap, HashSet};
@@ -269,7 +269,7 @@ impl DisplayMap {
         &mut self,
         blocks: impl IntoIterator<Item = BlockProperties<Anchor>>,
         cx: &mut ModelContext<Self>,
-    ) -> Vec<CustomBlockId> {
+    ) -> Vec<BlockId> {
         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);
@@ -285,7 +285,7 @@ impl DisplayMap {
 
     pub fn replace_blocks(
         &mut self,
-        heights_and_renderers: HashMap<CustomBlockId, (Option<u8>, RenderBlock)>,
+        heights_and_renderers: HashMap<BlockId, (Option<u8>, RenderBlock)>,
         cx: &mut ModelContext<Self>,
     ) {
         //
@@ -306,8 +306,8 @@ impl DisplayMap {
         // directly and the new behavior separately.
         //
         //
-        let mut only_renderers = HashMap::<CustomBlockId, RenderBlock>::default();
-        let mut full_replace = HashMap::<CustomBlockId, (u8, RenderBlock)>::default();
+        let mut only_renderers = HashMap::<BlockId, RenderBlock>::default();
+        let mut full_replace = HashMap::<BlockId, (u8, RenderBlock)>::default();
         for (id, (height, render)) in heights_and_renderers {
             if let Some(height) = height {
                 full_replace.insert(id, (height, render));
@@ -334,7 +334,7 @@ impl DisplayMap {
         block_map.replace(full_replace);
     }
 
-    pub fn remove_blocks(&mut self, ids: HashSet<CustomBlockId>, cx: &mut ModelContext<Self>) {
+    pub fn remove_blocks(&mut self, ids: HashSet<BlockId>, cx: &mut ModelContext<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);
@@ -350,7 +350,7 @@ impl DisplayMap {
 
     pub fn row_for_block(
         &mut self,
-        block_id: CustomBlockId,
+        block_id: BlockId,
         cx: &mut ModelContext<Self>,
     ) -> Option<DisplayRow> {
         let snapshot = self.buffer.read(cx).snapshot(cx);
@@ -885,16 +885,12 @@ impl DisplaySnapshot {
     pub fn blocks_in_range(
         &self,
         rows: Range<DisplayRow>,
-    ) -> impl Iterator<Item = (DisplayRow, &Block)> {
+    ) -> impl Iterator<Item = (DisplayRow, &TransformBlock)> {
         self.block_snapshot
             .blocks_in_range(rows.start.0..rows.end.0)
             .map(|(row, block)| (DisplayRow(row), block))
     }
 
-    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)
     }

crates/editor/src/display_map/block_map.rs

@@ -4,7 +4,7 @@ use super::{
 };
 use crate::{EditorStyle, GutterDimensions};
 use collections::{Bound, HashMap, HashSet};
-use gpui::{AnyElement, EntityId, Pixels, WindowContext};
+use gpui::{AnyElement, Pixels, WindowContext};
 use language::{BufferSnapshot, Chunk, Patch, Point};
 use multi_buffer::{Anchor, ExcerptId, ExcerptRange, MultiBufferRow, ToPoint as _};
 use parking_lot::Mutex;
@@ -18,9 +18,8 @@ use std::{
         Arc,
     },
 };
-use sum_tree::{Bias, SumTree, TreeMap};
+use sum_tree::{Bias, SumTree};
 use text::Edit;
-use ui::ElementId;
 
 const NEWLINES: &[u8] = &[b'\n'; u8::MAX as usize];
 
@@ -30,8 +29,7 @@ const NEWLINES: &[u8] = &[b'\n'; u8::MAX as usize];
 pub struct BlockMap {
     next_block_id: AtomicUsize,
     wrap_snapshot: RefCell<WrapSnapshot>,
-    custom_blocks: Vec<Arc<CustomBlock>>,
-    custom_blocks_by_id: TreeMap<CustomBlockId, Arc<CustomBlock>>,
+    blocks: Vec<Arc<Block>>,
     transforms: RefCell<SumTree<Transform>>,
     show_excerpt_controls: bool,
     buffer_header_height: u8,
@@ -40,7 +38,7 @@ pub struct BlockMap {
 }
 
 pub struct BlockMapReader<'a> {
-    blocks: &'a Vec<Arc<CustomBlock>>,
+    blocks: &'a Vec<Arc<Block>>,
     pub snapshot: BlockSnapshot,
 }
 
@@ -50,17 +48,10 @@ pub struct BlockMapWriter<'a>(&'a mut BlockMap);
 pub struct BlockSnapshot {
     wrap_snapshot: WrapSnapshot,
     transforms: SumTree<Transform>,
-    custom_blocks_by_id: TreeMap<CustomBlockId, Arc<CustomBlock>>,
 }
 
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct CustomBlockId(usize);
-
-impl Into<ElementId> for CustomBlockId {
-    fn into(self) -> ElementId {
-        ElementId::Integer(self.0)
-    }
-}
+pub struct BlockId(usize);
 
 #[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
 pub struct BlockPoint(pub Point);
@@ -71,10 +62,10 @@ pub struct BlockRow(pub(super) u32);
 #[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
 struct WrapRow(u32);
 
-pub type RenderBlock = Box<dyn Send + FnMut(&mut BlockContext) -> AnyElement>;
+pub type RenderBlock = Box<dyn Send + Fn(&mut BlockContext) -> AnyElement>;
 
-pub struct CustomBlock {
-    id: CustomBlockId,
+pub struct Block {
+    id: BlockId,
     position: Anchor,
     height: u8,
     style: BlockStyle,
@@ -86,22 +77,11 @@ pub struct BlockProperties<P> {
     pub position: P,
     pub height: u8,
     pub style: BlockStyle,
-    pub render: RenderBlock,
+    pub render: Box<dyn Send + Fn(&mut BlockContext) -> AnyElement>,
     pub disposition: BlockDisposition,
 }
 
-impl<P: Debug> Debug for BlockProperties<P> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("BlockProperties")
-            .field("position", &self.position)
-            .field("height", &self.height)
-            .field("style", &self.style)
-            .field("disposition", &self.disposition)
-            .finish()
-    }
-}
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
 pub enum BlockStyle {
     Fixed,
     Flex,
@@ -115,47 +95,10 @@ pub struct BlockContext<'a, 'b> {
     pub gutter_dimensions: &'b GutterDimensions,
     pub em_width: Pixels,
     pub line_height: Pixels,
-    pub block_id: BlockId,
+    pub block_id: usize,
     pub editor_style: &'b EditorStyle,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum BlockId {
-    Custom(CustomBlockId),
-    ExcerptHeader(ExcerptId),
-    ExcerptFooter(ExcerptId),
-}
-
-impl From<BlockId> for EntityId {
-    fn from(value: BlockId) -> Self {
-        match value {
-            BlockId::Custom(CustomBlockId(id)) => EntityId::from(id as u64),
-            BlockId::ExcerptHeader(id) => id.into(),
-            BlockId::ExcerptFooter(id) => id.into(),
-        }
-    }
-}
-
-impl Into<ElementId> for BlockId {
-    fn into(self) -> ElementId {
-        match self {
-            Self::Custom(CustomBlockId(id)) => ("Block", id).into(),
-            Self::ExcerptHeader(id) => ("ExcerptHeader", EntityId::from(id)).into(),
-            Self::ExcerptFooter(id) => ("ExcerptFooter", 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::ExcerptHeader(id) => write!(f, "ExcerptHeader({id:?})"),
-            Self::ExcerptFooter(id) => write!(f, "ExcerptFooter({id:?})"),
-        }
-    }
-}
-
 /// Whether the block should be considered above or below the anchor line
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub enum BlockDisposition {
@@ -166,11 +109,11 @@ pub enum BlockDisposition {
 #[derive(Clone, Debug)]
 struct Transform {
     summary: TransformSummary,
-    block: Option<Block>,
+    block: Option<TransformBlock>,
 }
 
 pub(crate) enum BlockType {
-    Custom(CustomBlockId),
+    Custom(BlockId),
     Header,
     Footer,
 }
@@ -182,8 +125,8 @@ pub(crate) trait BlockLike {
 
 #[allow(clippy::large_enum_variant)]
 #[derive(Clone)]
-pub enum Block {
-    Custom(Arc<CustomBlock>),
+pub enum TransformBlock {
+    Custom(Arc<Block>),
     ExcerptHeader {
         id: ExcerptId,
         buffer: BufferSnapshot,
@@ -199,12 +142,12 @@ pub enum Block {
     },
 }
 
-impl BlockLike for Block {
+impl BlockLike for TransformBlock {
     fn block_type(&self) -> BlockType {
         match self {
-            Block::Custom(block) => BlockType::Custom(block.id),
-            Block::ExcerptHeader { .. } => BlockType::Header,
-            Block::ExcerptFooter { .. } => BlockType::Footer,
+            TransformBlock::Custom(block) => BlockType::Custom(block.id),
+            TransformBlock::ExcerptHeader { .. } => BlockType::Header,
+            TransformBlock::ExcerptFooter { .. } => BlockType::Footer,
         }
     }
 
@@ -213,41 +156,25 @@ impl BlockLike for Block {
     }
 }
 
-impl Block {
-    pub fn id(&self) -> BlockId {
-        match self {
-            Block::Custom(block) => BlockId::Custom(block.id),
-            Block::ExcerptHeader { id, .. } => BlockId::ExcerptHeader(*id),
-            Block::ExcerptFooter { id, .. } => BlockId::ExcerptFooter(*id),
-        }
-    }
-
+impl TransformBlock {
     fn disposition(&self) -> BlockDisposition {
         match self {
-            Block::Custom(block) => block.disposition,
-            Block::ExcerptHeader { .. } => BlockDisposition::Above,
-            Block::ExcerptFooter { disposition, .. } => *disposition,
+            TransformBlock::Custom(block) => block.disposition,
+            TransformBlock::ExcerptHeader { .. } => BlockDisposition::Above,
+            TransformBlock::ExcerptFooter { disposition, .. } => *disposition,
         }
     }
 
     pub fn height(&self) -> u8 {
         match self {
-            Block::Custom(block) => block.height,
-            Block::ExcerptHeader { height, .. } => *height,
-            Block::ExcerptFooter { height, .. } => *height,
-        }
-    }
-
-    pub fn style(&self) -> BlockStyle {
-        match self {
-            Block::Custom(block) => block.style,
-            Block::ExcerptHeader { .. } => BlockStyle::Sticky,
-            Block::ExcerptFooter { .. } => BlockStyle::Sticky,
+            TransformBlock::Custom(block) => block.height,
+            TransformBlock::ExcerptHeader { height, .. } => *height,
+            TransformBlock::ExcerptFooter { height, .. } => *height,
         }
     }
 }
 
-impl Debug for Block {
+impl Debug for TransformBlock {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Self::Custom(block) => f.debug_struct("Custom").field("block", block).finish(),
@@ -262,7 +189,7 @@ impl Debug for Block {
                 .field("path", &buffer.file().map(|f| f.path()))
                 .field("starts_new_buffer", &starts_new_buffer)
                 .finish(),
-            Block::ExcerptFooter {
+            TransformBlock::ExcerptFooter {
                 id, disposition, ..
             } => f
                 .debug_struct("ExcerptFooter")
@@ -306,8 +233,7 @@ impl BlockMap {
         let row_count = wrap_snapshot.max_point().row() + 1;
         let map = Self {
             next_block_id: AtomicUsize::new(0),
-            custom_blocks: Vec::new(),
-            custom_blocks_by_id: TreeMap::default(),
+            blocks: Vec::new(),
             transforms: RefCell::new(SumTree::from_item(Transform::isomorphic(row_count), &())),
             wrap_snapshot: RefCell::new(wrap_snapshot.clone()),
             show_excerpt_controls,
@@ -329,11 +255,10 @@ impl BlockMap {
         self.sync(&wrap_snapshot, edits);
         *self.wrap_snapshot.borrow_mut() = wrap_snapshot.clone();
         BlockMapReader {
-            blocks: &self.custom_blocks,
+            blocks: &self.blocks,
             snapshot: BlockSnapshot {
                 wrap_snapshot,
                 transforms: self.transforms.borrow().clone(),
-                custom_blocks_by_id: self.custom_blocks_by_id.clone(),
             },
         }
     }
@@ -455,26 +380,25 @@ impl BlockMap {
             let new_buffer_start =
                 wrap_snapshot.to_point(WrapPoint::new(new_start.0, 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
-                        .position
-                        .to_point(buffer)
-                        .cmp(&new_buffer_start)
-                        .then(Ordering::Greater)
-                }) {
-                    Ok(ix) | Err(ix) => last_block_ix + ix,
-                };
+            let start_block_ix = match self.blocks[last_block_ix..].binary_search_by(|probe| {
+                probe
+                    .position
+                    .to_point(buffer)
+                    .cmp(&new_buffer_start)
+                    .then(Ordering::Greater)
+            }) {
+                Ok(ix) | Err(ix) => last_block_ix + ix,
+            };
 
             let end_bound;
             let end_block_ix = if new_end.0 > wrap_snapshot.max_point().row() {
                 end_bound = Bound::Unbounded;
-                self.custom_blocks.len()
+                self.blocks.len()
             } else {
                 let new_buffer_end =
                     wrap_snapshot.to_point(WrapPoint::new(new_end.0, 0), Bias::Left);
                 end_bound = Bound::Excluded(new_buffer_end);
-                match self.custom_blocks[start_block_ix..].binary_search_by(|probe| {
+                match self.blocks[start_block_ix..].binary_search_by(|probe| {
                     probe
                         .position
                         .to_point(buffer)
@@ -487,22 +411,24 @@ impl BlockMap {
             last_block_ix = end_block_ix;
 
             debug_assert!(blocks_in_edit.is_empty());
-            blocks_in_edit.extend(self.custom_blocks[start_block_ix..end_block_ix].iter().map(
-                |block| {
-                    let mut position = block.position.to_point(buffer);
-                    match block.disposition {
-                        BlockDisposition::Above => position.column = 0,
-                        BlockDisposition::Below => {
-                            position.column = buffer.line_len(MultiBufferRow(position.row))
+            blocks_in_edit.extend(
+                self.blocks[start_block_ix..end_block_ix]
+                    .iter()
+                    .map(|block| {
+                        let mut position = block.position.to_point(buffer);
+                        match block.disposition {
+                            BlockDisposition::Above => position.column = 0,
+                            BlockDisposition::Below => {
+                                position.column = buffer.line_len(MultiBufferRow(position.row))
+                            }
                         }
-                    }
-                    let position = wrap_snapshot.make_wrap_point(position, Bias::Left);
-                    (position.row(), Block::Custom(block.clone()))
-                },
-            ));
+                        let position = wrap_snapshot.make_wrap_point(position, Bias::Left);
+                        (position.row(), TransformBlock::Custom(block.clone()))
+                    }),
+            );
 
             if buffer.show_headers() {
-                blocks_in_edit.extend(BlockMap::header_and_footer_blocks(
+                blocks_in_edit.extend(BlockMap::header_blocks(
                     self.show_excerpt_controls,
                     self.excerpt_footer_height,
                     self.buffer_header_height,
@@ -549,8 +475,8 @@ impl BlockMap {
         *transforms = new_transforms;
     }
 
-    pub fn replace_renderers(&mut self, mut renderers: HashMap<CustomBlockId, RenderBlock>) {
-        for block in &mut self.custom_blocks {
+    pub fn replace_renderers(&mut self, mut renderers: HashMap<BlockId, RenderBlock>) {
+        for block in &mut self.blocks {
             if let Some(render) = renderers.remove(&block.id) {
                 *block.render.lock() = render;
             }
@@ -561,7 +487,7 @@ impl BlockMap {
         self.show_excerpt_controls
     }
 
-    pub fn header_and_footer_blocks<'a, 'b: 'a, 'c: 'a + 'b, R, T>(
+    pub fn header_blocks<'a, 'b: 'a, 'c: 'a + 'b, R, T>(
         show_excerpt_controls: bool,
         excerpt_footer_height: u8,
         buffer_header_height: u8,
@@ -569,7 +495,7 @@ impl BlockMap {
         buffer: &'b multi_buffer::MultiBufferSnapshot,
         range: R,
         wrap_snapshot: &'c WrapSnapshot,
-    ) -> impl Iterator<Item = (u32, Block)> + 'b
+    ) -> impl Iterator<Item = (u32, TransformBlock)> + 'b
     where
         R: RangeBounds<T>,
         T: multi_buffer::ToOffset,
@@ -577,36 +503,24 @@ impl BlockMap {
         buffer
             .excerpt_boundaries_in_range(range)
             .flat_map(move |excerpt_boundary| {
-                let mut wrap_row = wrap_snapshot
+                let wrap_row = wrap_snapshot
                     .make_wrap_point(Point::new(excerpt_boundary.row.0, 0), Bias::Left)
                     .row();
 
                 [
                     show_excerpt_controls
                         .then(|| {
-                            let disposition;
-                            if excerpt_boundary.next.is_some() {
-                                disposition = BlockDisposition::Above;
-                            } else {
-                                wrap_row = wrap_snapshot
-                                    .make_wrap_point(
-                                        Point::new(
-                                            excerpt_boundary.row.0,
-                                            buffer.line_len(excerpt_boundary.row),
-                                        ),
-                                        Bias::Left,
-                                    )
-                                    .row();
-                                disposition = BlockDisposition::Below;
-                            }
-
                             excerpt_boundary.prev.as_ref().map(|prev| {
                                 (
                                     wrap_row,
-                                    Block::ExcerptFooter {
+                                    TransformBlock::ExcerptFooter {
                                         id: prev.id,
                                         height: excerpt_footer_height,
-                                        disposition,
+                                        disposition: if excerpt_boundary.next.is_some() {
+                                            BlockDisposition::Above
+                                        } else {
+                                            BlockDisposition::Below
+                                        },
                                     },
                                 )
                             })
@@ -619,7 +533,7 @@ impl BlockMap {
 
                         (
                             wrap_row,
-                            Block::ExcerptHeader {
+                            TransformBlock::ExcerptHeader {
                                 id: next.id,
                                 buffer: next.buffer,
                                 range: next.range,
@@ -715,7 +629,7 @@ impl<'a> DerefMut for BlockMapReader<'a> {
 }
 
 impl<'a> BlockMapReader<'a> {
-    pub fn row_for_block(&self, block_id: CustomBlockId) -> Option<BlockRow> {
+    pub fn row_for_block(&self, block_id: BlockId) -> Option<BlockRow> {
         let block = self.blocks.iter().find(|block| block.id == block_id)?;
         let buffer_row = block
             .position
@@ -760,14 +674,14 @@ impl<'a> BlockMapWriter<'a> {
     pub fn insert(
         &mut self,
         blocks: impl IntoIterator<Item = BlockProperties<Anchor>>,
-    ) -> Vec<CustomBlockId> {
+    ) -> Vec<BlockId> {
         let mut ids = Vec::new();
         let mut edits = Patch::default();
         let wrap_snapshot = &*self.0.wrap_snapshot.borrow();
         let buffer = wrap_snapshot.buffer_snapshot();
 
         for block in blocks {
-            let id = CustomBlockId(self.0.next_block_id.fetch_add(1, SeqCst));
+            let id = BlockId(self.0.next_block_id.fetch_add(1, SeqCst));
             ids.push(id);
 
             let position = block.position;
@@ -782,21 +696,22 @@ impl<'a> BlockMapWriter<'a> {
 
             let block_ix = match self
                 .0
-                .custom_blocks
+                .blocks
                 .binary_search_by(|probe| probe.position.cmp(&position, buffer))
             {
                 Ok(ix) | Err(ix) => ix,
             };
-            let new_block = Arc::new(CustomBlock {
-                id,
-                position,
-                height: block.height,
-                render: Mutex::new(block.render),
-                disposition: block.disposition,
-                style: block.style,
-            });
-            self.0.custom_blocks.insert(block_ix, new_block.clone());
-            self.0.custom_blocks_by_id.insert(id, new_block);
+            self.0.blocks.insert(
+                block_ix,
+                Arc::new(Block {
+                    id,
+                    position,
+                    height: block.height,
+                    render: Mutex::new(block.render),
+                    disposition: block.disposition,
+                    style: block.style,
+                }),
+            );
 
             edits = edits.compose([Edit {
                 old: start_row..end_row,
@@ -808,19 +723,16 @@ impl<'a> BlockMapWriter<'a> {
         ids
     }
 
-    pub fn replace(
-        &mut self,
-        mut heights_and_renderers: HashMap<CustomBlockId, (u8, RenderBlock)>,
-    ) {
+    pub fn replace(&mut self, mut heights_and_renderers: HashMap<BlockId, (u8, RenderBlock)>) {
         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 {
+        for block in &mut self.0.blocks {
             if let Some((new_height, render)) = heights_and_renderers.remove(&block.id) {
                 if block.height != new_height {
-                    let new_block = CustomBlock {
+                    let new_block = Block {
                         id: block.id,
                         position: block.position,
                         height: new_height,
@@ -828,9 +740,7 @@ impl<'a> BlockMapWriter<'a> {
                         render: Mutex::new(render),
                         disposition: block.disposition,
                     };
-                    let new_block = Arc::new(new_block);
-                    *block = new_block.clone();
-                    self.0.custom_blocks_by_id.insert(block.id, new_block);
+                    *block = Arc::new(new_block);
 
                     let buffer_row = block.position.to_point(buffer).row;
                     if last_block_buffer_row != Some(buffer_row) {
@@ -855,12 +765,12 @@ impl<'a> BlockMapWriter<'a> {
         self.0.sync(wrap_snapshot, edits);
     }
 
-    pub fn remove(&mut self, block_ids: HashSet<CustomBlockId>) {
+    pub fn remove(&mut self, block_ids: HashSet<BlockId>) {
         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;
-        self.0.custom_blocks.retain(|block| {
+        self.0.blocks.retain(|block| {
             if block_ids.contains(&block.id) {
                 let buffer_row = block.position.to_point(buffer).row;
                 if last_block_buffer_row != Some(buffer_row) {
@@ -877,7 +787,6 @@ impl<'a> BlockMapWriter<'a> {
                         new: start_row..end_row,
                     })
                 }
-                self.0.custom_blocks_by_id.remove(&block.id);
                 false
             } else {
                 true
@@ -962,7 +871,10 @@ impl BlockSnapshot {
         }
     }
 
-    pub fn blocks_in_range(&self, rows: Range<u32>) -> impl Iterator<Item = (u32, &Block)> {
+    pub fn blocks_in_range(
+        &self,
+        rows: Range<u32>,
+    ) -> impl Iterator<Item = (u32, &TransformBlock)> {
         let mut cursor = self.transforms.cursor::<BlockRow>();
         cursor.seek(&BlockRow(rows.start), Bias::Right, &());
         std::iter::from_fn(move || {
@@ -982,60 +894,6 @@ impl BlockSnapshot {
         })
     }
 
-    pub fn block_for_id(&self, block_id: BlockId) -> Option<Block> {
-        let buffer = self.wrap_snapshot.buffer_snapshot();
-
-        match block_id {
-            BlockId::Custom(custom_block_id) => {
-                let custom_block = self.custom_blocks_by_id.get(&custom_block_id)?;
-                Some(Block::Custom(custom_block.clone()))
-            }
-            BlockId::ExcerptHeader(excerpt_id) => {
-                let excerpt_range = buffer.range_for_excerpt::<Point>(excerpt_id)?;
-                let wrap_point = self
-                    .wrap_snapshot
-                    .make_wrap_point(excerpt_range.start, Bias::Left);
-                let mut cursor = self.transforms.cursor::<(WrapRow, BlockRow)>();
-                cursor.seek(&WrapRow(wrap_point.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().0 > WrapRow(wrap_point.row()) {
-                        break;
-                    }
-
-                    cursor.next(&());
-                }
-
-                None
-            }
-            BlockId::ExcerptFooter(excerpt_id) => {
-                let excerpt_range = buffer.range_for_excerpt::<Point>(excerpt_id)?;
-                let wrap_point = self
-                    .wrap_snapshot
-                    .make_wrap_point(excerpt_range.end, Bias::Left);
-
-                let mut cursor = self.transforms.cursor::<(WrapRow, BlockRow)>();
-                cursor.seek(&WrapRow(wrap_point.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().0 > WrapRow(wrap_point.row()) {
-                        break;
-                    }
-
-                    cursor.next(&());
-                }
-
-                None
-            }
-        }
-    }
-
     pub fn max_point(&self) -> BlockPoint {
         let row = self.transforms.summary().output_rows - 1;
         BlockPoint::new(row, self.line_len(BlockRow(row)))
@@ -1165,7 +1023,7 @@ impl Transform {
         }
     }
 
-    fn block(block: Block) -> Self {
+    fn block(block: TransformBlock) -> Self {
         Self {
             summary: TransformSummary {
                 input_rows: 0,
@@ -1314,7 +1172,7 @@ impl DerefMut for BlockContext<'_, '_> {
     }
 }
 
-impl CustomBlock {
+impl Block {
     pub fn render(&self, cx: &mut BlockContext) -> AnyElement {
         self.render.lock()(cx)
     }
@@ -1328,7 +1186,7 @@ impl CustomBlock {
     }
 }
 
-impl Debug for CustomBlock {
+impl Debug for Block {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("Block")
             .field("id", &self.id)
@@ -1358,16 +1216,15 @@ fn offset_for_row(s: &str, target: u32) -> (u32, usize) {
 
 #[cfg(test)]
 mod tests {
+    use std::env;
+
     use super::*;
-    use crate::display_map::{
-        fold_map::FoldMap, inlay_map::InlayMap, tab_map::TabMap, wrap_map::WrapMap,
-    };
-    use gpui::{div, font, px, AppContext, Context as _, Element};
-    use language::{Buffer, Capability};
+    use crate::display_map::inlay_map::InlayMap;
+    use crate::display_map::{fold_map::FoldMap, tab_map::TabMap, wrap_map::WrapMap};
+    use gpui::{div, font, px, Element};
     use multi_buffer::MultiBuffer;
     use rand::prelude::*;
     use settings::SettingsStore;
-    use std::env;
     use util::RandomCharIter;
 
     #[gpui::test]
@@ -1554,89 +1411,6 @@ mod tests {
         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 AppContext) {
-        init_test(cx);
-
-        let buffer1 = cx.new_model(|cx| Buffer::local("Buffer 1", cx));
-        let buffer2 = cx.new_model(|cx| Buffer::local("Buffer 2", cx));
-        let buffer3 = cx.new_model(|cx| Buffer::local("Buffer 3", cx));
-
-        let mut excerpt_ids = Vec::new();
-        let multi_buffer = cx.new_model(|cx| {
-            let mut multi_buffer = MultiBuffer::new(0, Capability::ReadWrite);
-            excerpt_ids.extend(multi_buffer.push_excerpts(
-                buffer1.clone(),
-                [ExcerptRange {
-                    context: 0..buffer1.read(cx).len(),
-                    primary: None,
-                }],
-                cx,
-            ));
-            excerpt_ids.extend(multi_buffer.push_excerpts(
-                buffer2.clone(),
-                [ExcerptRange {
-                    context: 0..buffer2.read(cx).len(),
-                    primary: None,
-                }],
-                cx,
-            ));
-            excerpt_ids.extend(multi_buffer.push_excerpts(
-                buffer3.clone(),
-                [ExcerptRange {
-                    context: 0..buffer3.read(cx).len(),
-                    primary: None,
-                }],
-                cx,
-            ));
-
-            multi_buffer
-        });
-
-        let font = font("Helvetica");
-        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.clone());
-        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(), true, 1, 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\n\nBuff\ner 2\n\n\nBuff\ner 3\n"
-        );
-
-        let blocks: Vec<_> = snapshot
-            .blocks_in_range(0..u32::MAX)
-            .map(|(row, block)| (row, block.id()))
-            .collect();
-        assert_eq!(
-            blocks,
-            vec![
-                (0, BlockId::ExcerptHeader(excerpt_ids[0])),
-                (3, BlockId::ExcerptFooter(excerpt_ids[0])),
-                (4, BlockId::ExcerptHeader(excerpt_ids[1])),
-                (7, BlockId::ExcerptFooter(excerpt_ids[1])),
-                (8, BlockId::ExcerptHeader(excerpt_ids[2])),
-                (11, BlockId::ExcerptFooter(excerpt_ids[2]))
-            ]
-        );
-    }
-
     #[gpui::test]
     fn test_replace_with_heights(cx: &mut gpui::TestAppContext) {
         let _update = cx.update(|cx| init_test(cx));
@@ -1970,7 +1744,7 @@ mod tests {
 
             // Note that this needs to be synced with the related section in BlockMap::sync
             expected_blocks.extend(
-                BlockMap::header_and_footer_blocks(
+                BlockMap::header_blocks(
                     true,
                     excerpt_footer_height,
                     buffer_start_header_height,
@@ -2074,16 +1848,6 @@ mod tests {
                 expected_block_positions
             );
 
-            for (_, expected_block) in
-                blocks_snapshot.blocks_in_range(0..(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) in expected_block_positions {
                 if let BlockType::Custom(block_id) = block.block_type() {
                     assert_eq!(
@@ -2180,7 +1944,7 @@ mod tests {
             },
             Custom {
                 disposition: BlockDisposition,
-                id: CustomBlockId,
+                id: BlockId,
                 height: u8,
             },
         }
@@ -2217,15 +1981,15 @@ mod tests {
             }
         }
 
-        impl From<Block> for ExpectedBlock {
-            fn from(block: Block) -> Self {
+        impl From<TransformBlock> for ExpectedBlock {
+            fn from(block: TransformBlock) -> Self {
                 match block {
-                    Block::Custom(block) => ExpectedBlock::Custom {
+                    TransformBlock::Custom(block) => ExpectedBlock::Custom {
                         id: block.id,
                         disposition: block.disposition,
                         height: block.height,
                     },
-                    Block::ExcerptHeader {
+                    TransformBlock::ExcerptHeader {
                         height,
                         starts_new_buffer,
                         ..
@@ -2233,7 +1997,7 @@ mod tests {
                         height,
                         starts_new_buffer,
                     },
-                    Block::ExcerptFooter {
+                    TransformBlock::ExcerptFooter {
                         height,
                         disposition,
                         ..
@@ -2253,12 +2017,12 @@ mod tests {
         assets::Assets.load_test_fonts(cx);
     }
 
-    impl Block {
-        fn as_custom(&self) -> Option<&CustomBlock> {
+    impl TransformBlock {
+        fn as_custom(&self) -> Option<&Block> {
             match self {
-                Block::Custom(block) => Some(block),
-                Block::ExcerptHeader { .. } => None,
-                Block::ExcerptFooter { .. } => None,
+                TransformBlock::Custom(block) => Some(block),
+                TransformBlock::ExcerptHeader { .. } => None,
+                TransformBlock::ExcerptFooter { .. } => None,
             }
         }
     }

crates/editor/src/display_map/fold_map.rs

@@ -164,7 +164,7 @@ impl<'a> FoldMapWriter<'a> {
             new_tree
         };
 
-        let edits = consolidate_inlay_edits(edits);
+        consolidate_inlay_edits(&mut edits);
         let edits = self.0.sync(snapshot.clone(), edits);
         (self.0.snapshot.clone(), edits)
     }
@@ -212,7 +212,7 @@ impl<'a> FoldMapWriter<'a> {
             folds
         };
 
-        let edits = consolidate_inlay_edits(edits);
+        consolidate_inlay_edits(&mut edits);
         let edits = self.0.sync(snapshot.clone(), edits);
         (self.0.snapshot.clone(), edits)
     }
@@ -513,7 +513,7 @@ impl FoldMap {
                     });
                 }
 
-                fold_edits = consolidate_fold_edits(fold_edits);
+                consolidate_fold_edits(&mut fold_edits);
             }
 
             self.snapshot.transforms = new_transforms;
@@ -809,7 +809,7 @@ where
     cursor
 }
 
-fn consolidate_inlay_edits(mut edits: Vec<InlayEdit>) -> Vec<InlayEdit> {
+fn consolidate_inlay_edits(edits: &mut Vec<InlayEdit>) {
     edits.sort_unstable_by(|a, b| {
         a.old
             .start
@@ -817,68 +817,42 @@ fn consolidate_inlay_edits(mut edits: Vec<InlayEdit>) -> Vec<InlayEdit> {
             .then_with(|| b.old.end.cmp(&a.old.end))
     });
 
-    let _old_alloc_ptr = edits.as_ptr();
-    let mut inlay_edits = edits.into_iter();
-    let inlay_edits = 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![]
-    };
-
-    inlay_edits
+    let mut i = 1;
+    while i < edits.len() {
+        let edit = edits[i].clone();
+        let prev_edit = &mut edits[i - 1];
+        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);
+            edits.remove(i);
+            continue;
+        }
+        i += 1;
+    }
 }
 
-fn consolidate_fold_edits(mut edits: Vec<FoldEdit>) -> Vec<FoldEdit> {
+fn consolidate_fold_edits(edits: &mut 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();
-    let fold_edits = 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![]
-    };
 
-    fold_edits
+    let mut i = 1;
+    while i < edits.len() {
+        let edit = edits[i].clone();
+        let prev_edit = &mut edits[i - 1];
+        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);
+            edits.remove(i);
+            continue;
+        }
+        i += 1;
+    }
 }
 
 #[derive(Clone, Debug, Default)]

crates/editor/src/display_map/tab_map.rs

@@ -103,33 +103,20 @@ impl TabMap {
                 }
             }
 
-            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();
-            let fold_edits = 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.clone();
-                            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
-            } else {
-                vec![]
-            };
+            let mut ix = 1;
+            while ix < fold_edits.len() {
+                let (prev_edits, next_edits) = fold_edits.split_at_mut(ix);
+                let prev_edit = prev_edits.last_mut().unwrap();
+                let edit = &next_edits[0];
+                if prev_edit.old.end >= edit.old.start {
+                    prev_edit.old.end = edit.old.end;
+                    prev_edit.new.end = edit.new.end;
+                    fold_edits.remove(ix);
+                } else {
+                    ix += 1;
+                }
+            }
 
             for fold_edit in fold_edits {
                 let old_start = fold_edit.old.start.to_point(&old_snapshot.fold_snapshot);

crates/editor/src/display_map/wrap_map.rs

@@ -567,7 +567,7 @@ impl WrapSnapshot {
             });
         }
 
-        wrap_edits = consolidate_wrap_edits(wrap_edits);
+        consolidate_wrap_edits(&mut wrap_edits);
         Patch::new(wrap_edits)
     }
 
@@ -1008,33 +1008,19 @@ impl<'a> sum_tree::Dimension<'a, TransformSummary> for WrapPoint {
     }
 }
 
-fn consolidate_wrap_edits(edits: Vec<WrapEdit>) -> Vec<WrapEdit> {
-    let _old_alloc_ptr = edits.as_ptr();
-    let mut wrap_edits = edits.into_iter();
-    let wrap_edits = 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![]
-    };
-
-    wrap_edits
+fn consolidate_wrap_edits(edits: &mut Vec<WrapEdit>) {
+    let mut i = 1;
+    while i < edits.len() {
+        let edit = edits[i].clone();
+        let prev_edit = &mut edits[i - 1];
+        if prev_edit.old.end >= edit.old.start {
+            prev_edit.old.end = edit.old.end;
+            prev_edit.new.end = edit.new.end;
+            edits.remove(i);
+            continue;
+        }
+        i += 1;
+    }
 }
 
 #[cfg(test)]

crates/editor/src/editor.rs

@@ -68,17 +68,17 @@ use git::diff_hunk_to_display;
 use gpui::{
     div, impl_actions, point, prelude::*, px, relative, size, uniform_list, Action, AnyElement,
     AppContext, AsyncWindowContext, AvailableSpace, BackgroundExecutor, Bounds, ClipboardItem,
-    Context, DispatchPhase, ElementId, EntityId, EventEmitter, FocusHandle, FocusOutEvent,
-    FocusableView, FontId, FontStyle, FontWeight, HighlightStyle, Hsla, InteractiveText,
-    KeyContext, ListSizingBehavior, Model, MouseButton, PaintQuad, ParentElement, Pixels, Render,
-    SharedString, Size, StrikethroughStyle, Styled, StyledText, Subscription, Task, TextStyle,
-    UnderlineStyle, UniformListScrollHandle, View, ViewContext, ViewInputHandler, VisualContext,
-    WeakFocusHandle, WeakView, WhiteSpace, WindowContext,
+    Context, DispatchPhase, ElementId, EventEmitter, FocusHandle, FocusOutEvent, FocusableView,
+    FontId, FontStyle, FontWeight, HighlightStyle, Hsla, InteractiveText, KeyContext,
+    ListSizingBehavior, Model, MouseButton, PaintQuad, ParentElement, Pixels, Render, SharedString,
+    Size, StrikethroughStyle, Styled, StyledText, Subscription, Task, TextStyle, UnderlineStyle,
+    UniformListScrollHandle, View, ViewContext, ViewInputHandler, VisualContext, WeakFocusHandle,
+    WeakView, WhiteSpace, WindowContext,
 };
 use highlight_matching_bracket::refresh_matching_bracket_highlights;
 use hover_popover::{hide_hover, HoverState};
 use hunk_diff::ExpandedHunks;
-pub(crate) use hunk_diff::HoveredHunk;
+pub(crate) use hunk_diff::HunkToExpand;
 use indent_guides::ActiveIndentGuidesState;
 use inlay_hint_cache::{InlayHintCache, InlaySplice, InvalidationStrategy};
 pub use inline_completion_provider::*;
@@ -131,7 +131,7 @@ use std::{
     mem,
     num::NonZeroU32,
     ops::{ControlFlow, Deref, DerefMut, Not as _, Range, RangeInclusive},
-    path::{Path, PathBuf},
+    path::Path,
     rc::Rc,
     sync::Arc,
     time::{Duration, Instant},
@@ -271,9 +271,8 @@ pub fn init(cx: &mut AppContext) {
     init_settings(cx);
 
     workspace::register_project_item::<Editor>(cx);
-    workspace::FollowableViewRegistry::register::<Editor>(cx);
-    workspace::register_serializable_item::<Editor>(cx);
-
+    workspace::register_followable_item::<Editor>(cx);
+    workspace::register_deserializable_item::<Editor>(cx);
     cx.observe_new_views(
         |workspace: &mut Workspace, _cx: &mut ViewContext<Workspace>| {
             workspace.register_action(Editor::new_file);
@@ -551,7 +550,6 @@ pub struct Editor {
     show_git_blame_inline: bool,
     show_git_blame_inline_delay_task: Option<Task<()>>,
     git_blame_inline_enabled: bool,
-    serialize_dirty_buffers: bool,
     show_selection_menu: Option<bool>,
     blame: Option<Model<GitBlame>>,
     blame_subscription: Option<Subscription>,
@@ -568,7 +566,6 @@ pub struct Editor {
     previous_search_ranges: Option<Arc<[Range<Anchor>]>>,
     file_header_size: u8,
     breadcrumb_header: Option<String>,
-    focused_block: Option<FocusedBlock>,
 }
 
 #[derive(Clone)]
@@ -786,7 +783,7 @@ pub struct RenameState {
     pub range: Range<Anchor>,
     pub old_name: Arc<str>,
     pub editor: View<Editor>,
-    block_id: CustomBlockId,
+    block_id: BlockId,
 }
 
 struct InvalidationStack<T>(Vec<T>);
@@ -1538,7 +1535,7 @@ struct ActiveDiagnosticGroup {
     primary_range: Range<Anchor>,
     primary_message: String,
     group_id: usize,
-    blocks: HashMap<CustomBlockId, Diagnostic>,
+    blocks: HashMap<BlockId, Diagnostic>,
     is_valid: bool,
 }
 
@@ -1586,11 +1583,6 @@ impl InlayHintRefreshReason {
     }
 }
 
-pub(crate) struct FocusedBlock {
-    id: BlockId,
-    focus_handle: WeakFocusHandle,
-}
-
 impl Editor {
     pub fn single_line(cx: &mut ViewContext<Self>) -> Self {
         let buffer = cx.new_model(|cx| Buffer::local("", cx));
@@ -1778,8 +1770,6 @@ impl Editor {
         );
         let focus_handle = cx.focus_handle();
         cx.on_focus(&focus_handle, Self::handle_focus).detach();
-        cx.on_focus_in(&focus_handle, Self::handle_focus_in)
-            .detach();
         cx.on_focus_out(&focus_handle, Self::handle_focus_out)
             .detach();
         cx.on_blur(&focus_handle, Self::handle_blur).detach();
@@ -1884,9 +1874,6 @@ impl Editor {
             show_selection_menu: None,
             show_git_blame_inline_delay_task: None,
             git_blame_inline_enabled: ProjectSettings::get_global(cx).git.inline_blame_enabled(),
-            serialize_dirty_buffers: ProjectSettings::get_global(cx)
-                .session
-                .restore_unsaved_buffers,
             blame: None,
             blame_subscription: None,
             file_header_size,
@@ -1914,7 +1901,6 @@ impl Editor {
             linked_edit_ranges: Default::default(),
             previous_search_ranges: None,
             breadcrumb_header: None,
-            focused_block: None,
         };
         this.tasks_update_task = Some(this.refresh_runnables(cx));
         this._subscriptions.extend(project_subscriptions);
@@ -1999,35 +1985,28 @@ impl Editor {
         _: &workspace::NewFile,
         cx: &mut ViewContext<Workspace>,
     ) {
-        Self::new_in_workspace(workspace, cx).detach_and_prompt_err(
-            "Failed to create buffer",
-            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,
-        cx: &mut ViewContext<Workspace>,
-    ) -> Task<Result<View<Editor>>> {
         let project = workspace.project().clone();
         let create = project.update(cx, |project, cx| project.create_buffer(cx));
 
         cx.spawn(|workspace, mut cx| async move {
             let buffer = create.await?;
             workspace.update(&mut cx, |workspace, cx| {
-                let editor =
-                    cx.new_view(|cx| Editor::for_buffer(buffer, Some(project.clone()), cx));
-                workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, cx);
-                editor
+                workspace.add_item_to_active_pane(
+                    Box::new(
+                        cx.new_view(|cx| Editor::for_buffer(buffer, Some(project.clone()), cx)),
+                    ),
+                    None,
+                    cx,
+                )
             })
         })
+        .detach_and_prompt_err("Failed to create buffer", 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_file_in_direction(
@@ -2880,10 +2859,7 @@ impl Editor {
     }
 
     pub fn cancel(&mut self, _: &Cancel, cx: &mut ViewContext<Self>) {
-        if self.clear_clicked_diff_hunks(cx) {
-            cx.notify();
-            return;
-        }
+        self.clear_expanded_diff_hunks(cx);
         if self.dismiss_menus_and_popups(true, cx) {
             return;
         }
@@ -2918,10 +2894,6 @@ impl Editor {
             return true;
         }
 
-        if self.mouse_context_menu.take().is_some() {
-            return true;
-        }
-
         if self.discard_inline_completion(should_report_inline_completion_event, cx) {
             return true;
         }
@@ -3659,7 +3631,7 @@ impl Editor {
         if self.is_completion_trigger(text, trigger_in_words, cx) {
             self.show_completions(
                 &ShowCompletions {
-                    trigger: Some(text.to_owned()).filter(|x| !x.is_empty()),
+                    trigger: text.chars().last(),
                 },
                 cx,
             );
@@ -4083,18 +4055,15 @@ impl Editor {
                 Some(ContextMenu::Completions(_))
             )
         };
-        let trigger_kind = match (&options.trigger, is_followup_invoke) {
+        let trigger_kind = match (options.trigger, is_followup_invoke) {
             (_, true) => CompletionTriggerKind::TRIGGER_FOR_INCOMPLETE_COMPLETIONS,
-            (Some(trigger), _) if buffer.read(cx).completion_triggers().contains(&trigger) => {
-                CompletionTriggerKind::TRIGGER_CHARACTER
-            }
-
+            (Some(_), _) => CompletionTriggerKind::TRIGGER_CHARACTER,
             _ => CompletionTriggerKind::INVOKED,
         };
         let completion_context = CompletionContext {
-            trigger_character: options.trigger.as_ref().and_then(|trigger| {
+            trigger_character: options.trigger.and_then(|c| {
                 if trigger_kind == CompletionTriggerKind::TRIGGER_CHARACTER {
-                    Some(String::from(trigger))
+                    Some(String::from(c))
                 } else {
                     None
                 }
@@ -4679,7 +4648,7 @@ impl Editor {
             let project = workspace.project().clone();
             let editor =
                 cx.new_view(|cx| Editor::for_multibuffer(excerpt_buffer, Some(project), true, cx));
-            workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, cx);
+            workspace.add_item_to_active_pane(Box::new(editor.clone()), None, cx);
             editor.update(cx, |editor, cx| {
                 editor.highlight_background::<Self>(
                     &ranges_to_highlight,
@@ -5139,23 +5108,6 @@ impl Editor {
             }))
     }
 
-    fn render_close_hunk_diff_button(
-        &self,
-        hunk: HoveredHunk,
-        row: DisplayRow,
-        cx: &mut ViewContext<Self>,
-    ) -> IconButton {
-        IconButton::new(
-            ("close_hunk_diff_indicator", row.0 as usize),
-            ui::IconName::Close,
-        )
-        .shape(ui::IconButtonShape::Square)
-        .icon_size(IconSize::XSmall)
-        .icon_color(Color::Muted)
-        .tooltip(|cx| Tooltip::for_action("Close hunk diff", &ToggleHunkDiff, cx))
-        .on_click(cx.listener(move |editor, _e, cx| editor.toggle_hovered_hunk(&hunk, cx)))
-    }
-
     pub fn context_menu_visible(&self) -> bool {
         self.context_menu
             .read()
@@ -5910,7 +5862,22 @@ impl Editor {
         let revert_changes = self.gather_revert_changes(&self.selections.disjoint_anchors(), cx);
         if !revert_changes.is_empty() {
             self.transact(cx, |editor, cx| {
-                editor.revert(revert_changes, cx);
+                editor.buffer().update(cx, |multi_buffer, cx| {
+                    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().map(Arc::<str>::from))
+                                    }),
+                                    None,
+                                    cx,
+                                );
+                            });
+                        }
+                    }
+                });
+                editor.change_selections(None, cx, |selections| selections.refresh());
             });
         }
     }
@@ -5940,20 +5907,22 @@ impl Editor {
         cx: &mut ViewContext<'_, Editor>,
     ) -> HashMap<BufferId, Vec<(Range<text::Anchor>, Rope)>> {
         let mut revert_changes = HashMap::default();
-        let multi_buffer_snapshot = self.buffer.read(cx).snapshot(cx);
-        for hunk in hunks_for_selections(&multi_buffer_snapshot, selections) {
-            Self::prepare_revert_change(&mut revert_changes, self.buffer(), &hunk, cx);
-        }
+        self.buffer.update(cx, |multi_buffer, cx| {
+            let multi_buffer_snapshot = multi_buffer.snapshot(cx);
+            for hunk in hunks_for_selections(&multi_buffer_snapshot, selections) {
+                Self::prepare_revert_change(&mut revert_changes, &multi_buffer, &hunk, cx);
+            }
+        });
         revert_changes
     }
 
-    pub fn prepare_revert_change(
+    fn prepare_revert_change(
         revert_changes: &mut HashMap<BufferId, Vec<(Range<text::Anchor>, Rope)>>,
-        multi_buffer: &Model<MultiBuffer>,
+        multi_buffer: &MultiBuffer,
         hunk: &DiffHunk<MultiBufferRow>,
-        cx: &AppContext,
+        cx: &mut AppContext,
     ) -> Option<()> {
-        let buffer = multi_buffer.read(cx).buffer(hunk.buffer_id)?;
+        let buffer = multi_buffer.buffer(hunk.buffer_id)?;
         let buffer = buffer.read(cx);
         let original_text = buffer.diff_base()?.slice(hunk.diff_base_byte_range.clone());
         let buffer_snapshot = buffer.snapshot();
@@ -9114,13 +9083,7 @@ impl Editor {
                                             workspace.active_pane().clone()
                                         };
 
-                                        workspace.open_project_item(
-                                            pane,
-                                            target.buffer.clone(),
-                                            true,
-                                            true,
-                                            cx,
-                                        )
+                                        workspace.open_project_item(pane, target.buffer.clone(), cx)
                                     });
                                 target_editor.update(cx, |target_editor, cx| {
                                     // When selecting a definition in a different buffer, disable the nav history
@@ -9418,7 +9381,7 @@ impl Editor {
                     None
                 }
             });
-            workspace.add_item_to_active_pane(item.clone(), destination_index, true, cx);
+            workspace.add_item_to_active_pane(item.clone(), destination_index, cx);
         }
         workspace.active_pane().update(cx, |pane, cx| {
             pane.set_preview_item_id(Some(item_id), cx);
@@ -9526,11 +9489,6 @@ impl Editor {
                         }
                         editor
                     });
-                    cx.subscribe(&rename_editor, |_, _, e, cx| match e {
-                        EditorEvent::Focused => cx.emit(EditorEvent::FocusedIn),
-                        _ => {}
-                    })
-                    .detach();
 
                     let write_highlights =
                         this.clear_background_highlights::<DocumentHighlightWrite>(cx);
@@ -9804,7 +9762,7 @@ impl Editor {
                         *block_id,
                         (
                             None,
-                            diagnostic_block_renderer(diagnostic.clone(), None, true, is_valid),
+                            diagnostic_block_renderer(diagnostic.clone(), is_valid),
                         ),
                     );
                 }
@@ -9857,7 +9815,7 @@ impl Editor {
                             style: BlockStyle::Fixed,
                             position: buffer.anchor_after(entry.range.start),
                             height: message_height,
-                            render: diagnostic_block_renderer(diagnostic, None, true, true),
+                            render: diagnostic_block_renderer(diagnostic, true),
                             disposition: BlockDisposition::Below,
                         }
                     }),
@@ -10157,7 +10115,7 @@ impl Editor {
         blocks: impl IntoIterator<Item = BlockProperties<Anchor>>,
         autoscroll: Option<Autoscroll>,
         cx: &mut ViewContext<Self>,
-    ) -> Vec<CustomBlockId> {
+    ) -> Vec<BlockId> {
         let blocks = self
             .display_map
             .update(cx, |display_map, cx| display_map.insert_blocks(blocks, cx));
@@ -10169,7 +10127,7 @@ impl Editor {
 
     pub fn replace_blocks(
         &mut self,
-        blocks: HashMap<CustomBlockId, (Option<u8>, RenderBlock)>,
+        blocks: HashMap<BlockId, (Option<u8>, RenderBlock)>,
         autoscroll: Option<Autoscroll>,
         cx: &mut ViewContext<Self>,
     ) {
@@ -10182,7 +10140,7 @@ impl Editor {
 
     pub fn remove_blocks(
         &mut self,
-        block_ids: HashSet<CustomBlockId>,
+        block_ids: HashSet<BlockId>,
         autoscroll: Option<Autoscroll>,
         cx: &mut ViewContext<Self>,
     ) {
@@ -10196,21 +10154,13 @@ impl Editor {
 
     pub fn row_for_block(
         &self,
-        block_id: CustomBlockId,
+        block_id: BlockId,
         cx: &mut ViewContext<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>,
@@ -10424,22 +10374,6 @@ impl Editor {
         cx.notify();
     }
 
-    pub fn working_directory(&self, cx: &WindowContext) -> 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
-    }
-
     pub fn reveal_in_finder(&mut self, _: &RevealInFileManager, cx: &mut ViewContext<Self>) {
         if let Some(buffer) = self.buffer().read(cx).as_singleton() {
             if let Some(file) = buffer.read(cx).file().and_then(|f| f.as_local()) {
@@ -11309,11 +11243,8 @@ impl Editor {
         self.scroll_manager.vertical_scroll_margin = editor_settings.vertical_scroll_margin;
         self.show_breadcrumbs = editor_settings.toolbar.breadcrumbs;
 
-        let project_settings = ProjectSettings::get_global(cx);
-        self.serialize_dirty_buffers = project_settings.session.restore_unsaved_buffers;
-
         if self.mode == EditorMode::Full {
-            let inline_blame_enabled = project_settings.git.inline_blame_enabled();
+            let inline_blame_enabled = ProjectSettings::get_global(cx).git.inline_blame_enabled();
             if self.git_blame_inline_enabled != inline_blame_enabled {
                 self.toggle_git_blame_inline_internal(false, cx);
             }
@@ -11377,8 +11308,7 @@ impl Editor {
                 };
 
                 for (buffer, ranges) in new_selections_by_buffer {
-                    let editor =
-                        workspace.open_project_item::<Self>(pane.clone(), buffer, true, true, cx);
+                    let editor = workspace.open_project_item::<Self>(pane.clone(), buffer, cx);
                     editor.update(cx, |editor, cx| {
                         editor.change_selections(Some(Autoscroll::newest()), cx, |s| {
                             s.select_ranges(ranges);
@@ -11702,10 +11632,6 @@ impl Editor {
         }
     }
 
-    fn handle_focus_in(&mut self, cx: &mut ViewContext<Self>) {
-        cx.emit(EditorEvent::FocusedIn)
-    }
-
     fn handle_focus_out(&mut self, event: FocusOutEvent, _cx: &mut ViewContext<Self>) {
         if event.blurred != self.focus_handle {
             self.last_focused_descendant = Some(event.blurred);
@@ -11759,81 +11685,15 @@ impl Editor {
     pub fn file_header_size(&self) -> u8 {
         self.file_header_size
     }
-
-    pub fn revert(
-        &mut self,
-        revert_changes: HashMap<BufferId, Vec<(Range<text::Anchor>, Rope)>>,
-        cx: &mut ViewContext<Self>,
-    ) {
-        self.buffer().update(cx, |multi_buffer, cx| {
-            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().map(Arc::<str>::from))
-                            }),
-                            None,
-                            cx,
-                        );
-                    });
-                }
-            }
-        });
-        self.change_selections(None, cx, |selections| selections.refresh());
-    }
-
-    pub fn to_pixel_point(
-        &mut self,
-        source: multi_buffer::Anchor,
-        editor_snapshot: &EditorSnapshot,
-        cx: &mut ViewContext<Self>,
-    ) -> Option<gpui::Point<Pixels>> {
-        let text_layout_details = self.text_layout_details(cx);
-        let line_height = text_layout_details
-            .editor_style
-            .text
-            .line_height_in_pixels(cx.rem_size());
-        let source_point = source.to_display_point(editor_snapshot);
-        let first_visible_line = text_layout_details
-            .scroll_anchor
-            .anchor
-            .to_display_point(editor_snapshot);
-        if first_visible_line > source_point {
-            return None;
-        }
-        let source_x = editor_snapshot.x_for_display_point(source_point, &text_layout_details);
-        let source_y = line_height
-            * ((source_point.row() - first_visible_line.row()).0 as f32
-                - text_layout_details.scroll_anchor.offset.y);
-        Some(gpui::Point::new(source_x, source_y))
-    }
-
-    pub fn display_to_pixel_point(
-        &mut self,
-        source: DisplayPoint,
-        editor_snapshot: &EditorSnapshot,
-        cx: &mut ViewContext<Self>,
-    ) -> Option<gpui::Point<Pixels>> {
-        let line_height = self.style()?.text.line_height_in_pixels(cx.rem_size());
-        let text_layout_details = self.text_layout_details(cx);
-        let first_visible_line = text_layout_details
-            .scroll_anchor
-            .anchor
-            .to_display_point(editor_snapshot);
-        if first_visible_line > source {
-            return None;
-        }
-        let source_x = editor_snapshot.x_for_display_point(source, &text_layout_details);
-        let source_y = line_height * (source.row() - first_visible_line.row()).0 as f32;
-        Some(gpui::Point::new(source_x, source_y))
-    }
 }
 
 fn hunks_for_selections(
     multi_buffer_snapshot: &MultiBufferSnapshot,
     selections: &[Selection<Anchor>],
 ) -> Vec<DiffHunk<MultiBufferRow>> {
+    let mut hunks = Vec::with_capacity(selections.len());
+    let mut processed_buffer_rows: HashMap<BufferId, HashSet<Range<text::Anchor>>> =
+        HashMap::default();
     let buffer_rows_for_selections = selections.iter().map(|selection| {
         let head = selection.head();
         let tail = selection.tail();
@@ -11846,17 +11706,7 @@ fn hunks_for_selections(
         }
     });
 
-    hunks_for_rows(buffer_rows_for_selections, multi_buffer_snapshot)
-}
-
-pub fn hunks_for_rows(
-    rows: impl Iterator<Item = Range<MultiBufferRow>>,
-    multi_buffer_snapshot: &MultiBufferSnapshot,
-) -> Vec<DiffHunk<MultiBufferRow>> {
-    let mut hunks = Vec::new();
-    let mut processed_buffer_rows: HashMap<BufferId, HashSet<Range<text::Anchor>>> =
-        HashMap::default();
-    for selected_multi_buffer_rows in rows {
+    for selected_multi_buffer_rows in buffer_rows_for_selections {
         let query_rows =
             selected_multi_buffer_rows.start..selected_multi_buffer_rows.end.next_row();
         for hunk in multi_buffer_snapshot.git_diff_hunks_in_range(query_rows.clone()) {
@@ -12386,7 +12236,6 @@ pub enum EditorEvent {
     },
     Reparsed(BufferId),
     Focused,
-    FocusedIn,
     Blurred,
     DirtyChanged,
     Saved,
@@ -12835,14 +12684,8 @@ impl InvalidationRegion for SnippetState {
     }
 }
 
-pub fn diagnostic_block_renderer(
-    diagnostic: Diagnostic,
-    max_message_rows: Option<u8>,
-    allow_closing: bool,
-    _is_valid: bool,
-) -> RenderBlock {
-    let (text_without_backticks, code_ranges) =
-        highlight_diagnostic_message(&diagnostic, max_message_rows);
+pub fn diagnostic_block_renderer(diagnostic: Diagnostic, _is_valid: bool) -> RenderBlock {
+    let (text_without_backticks, code_ranges) = highlight_diagnostic_message(&diagnostic);
 
     Box::new(move |cx: &mut BlockContext| {
         let group_id: SharedString = cx.block_id.to_string().into();
@@ -12857,25 +12700,23 @@ pub fn diagnostic_block_renderer(
 
         let multi_line_diagnostic = diagnostic.message.contains('\n');
 
-        let buttons = |diagnostic: &Diagnostic, block_id: BlockId| {
+        let buttons = |diagnostic: &Diagnostic, block_id: usize| {
             if multi_line_diagnostic {
                 v_flex()
             } else {
                 h_flex()
             }
-            .when(allow_closing, |div| {
-                div.children(diagnostic.is_primary.then(|| {
-                    IconButton::new(("close-block", EntityId::from(block_id)), IconName::XCircle)
-                        .icon_color(Color::Muted)
-                        .size(ButtonSize::Compact)
-                        .style(ButtonStyle::Transparent)
-                        .visible_on_hover(group_id.clone())
-                        .on_click(move |_click, cx| cx.dispatch_action(Box::new(Cancel)))
-                        .tooltip(|cx| Tooltip::for_action("Close Diagnostics", &Cancel, cx))
-                }))
-            })
+            .children(diagnostic.is_primary.then(|| {
+                IconButton::new(("close-block", block_id), IconName::XCircle)
+                    .icon_color(Color::Muted)
+                    .size(ButtonSize::Compact)
+                    .style(ButtonStyle::Transparent)
+                    .visible_on_hover(group_id.clone())
+                    .on_click(move |_click, cx| cx.dispatch_action(Box::new(Cancel)))
+                    .tooltip(|cx| Tooltip::for_action("Close Diagnostics", &Cancel, cx))
+            }))
             .child(
-                IconButton::new(("copy-block", EntityId::from(block_id)), IconName::Copy)
+                IconButton::new(("copy-block", block_id), IconName::Copy)
                     .icon_color(Color::Muted)
                     .size(ButtonSize::Compact)
                     .style(ButtonStyle::Transparent)
@@ -12924,10 +12765,7 @@ pub fn diagnostic_block_renderer(
     })
 }
 
-pub fn highlight_diagnostic_message(
-    diagnostic: &Diagnostic,
-    mut max_message_rows: Option<u8>,
-) -> (SharedString, Vec<Range<usize>>) {
+pub fn highlight_diagnostic_message(diagnostic: &Diagnostic) -> (SharedString, Vec<Range<usize>>) {
     let mut text_without_backticks = String::new();
     let mut code_ranges = Vec::new();
 
@@ -12939,53 +12777,18 @@ pub fn highlight_diagnostic_message(
 
     let mut prev_offset = 0;
     let mut in_code_block = false;
-    let has_row_limit = max_message_rows.is_some();
-    let mut newline_indices = diagnostic
-        .message
-        .match_indices('\n')
-        .filter(|_| has_row_limit)
-        .map(|(ix, _)| ix)
-        .fuse()
-        .peekable();
-
-    for (quote_ix, _) in diagnostic
+    for (ix, _) in diagnostic
         .message
         .match_indices('`')
         .chain([(diagnostic.message.len(), "")])
     {
-        let mut first_newline_ix = None;
-        let mut last_newline_ix = None;
-        while let Some(newline_ix) = newline_indices.peek() {
-            if *newline_ix < quote_ix {
-                if first_newline_ix.is_none() {
-                    first_newline_ix = Some(*newline_ix);
-                }
-                last_newline_ix = Some(*newline_ix);
-
-                if let Some(rows_left) = &mut max_message_rows {
-                    if *rows_left == 0 {
-                        break;
-                    } else {
-                        *rows_left -= 1;
-                    }
-                }
-                let _ = newline_indices.next();
-            } else {
-                break;
-            }
-        }
         let prev_len = text_without_backticks.len();
-        let new_text = &diagnostic.message[prev_offset..first_newline_ix.unwrap_or(quote_ix)];
-        text_without_backticks.push_str(new_text);
+        text_without_backticks.push_str(&diagnostic.message[prev_offset..ix]);
+        prev_offset = ix + 1;
         if in_code_block {
             code_ranges.push(prev_len..text_without_backticks.len());
         }
-        prev_offset = last_newline_ix.unwrap_or(quote_ix) + 1;
         in_code_block = !in_code_block;
-        if first_newline_ix.map_or(false, |newline_ix| newline_ix < quote_ix) {
-            text_without_backticks.push_str("...");
-            break;
-        }
     }
 
     (text_without_backticks.into(), code_ranges)
@@ -13066,13 +12869,8 @@ pub(crate) fn split_words(text: &str) -> impl std::iter::Iterator<Item = &str> +
         })
 }
 
-pub trait RangeToAnchorExt: Sized {
+pub trait RangeToAnchorExt {
     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> {

crates/editor/src/editor_tests.rs

@@ -8812,6 +8812,7 @@ async fn test_following_with_multiple_excerpts(cx: &mut gpui::TestAppContext) {
     let follower_1 = cx
         .update_window(*workspace.deref(), |_, cx| {
             Editor::from_state_proto(
+                pane.clone(),
                 workspace.root_view(cx).unwrap(),
                 ViewId {
                     creator: Default::default(),
@@ -8903,6 +8904,7 @@ async fn test_following_with_multiple_excerpts(cx: &mut gpui::TestAppContext) {
     let follower_2 = cx
         .update_window(*workspace.deref(), |_, cx| {
             Editor::from_state_proto(
+                pane.clone(),
                 workspace.root_view(cx).unwrap().clone(),
                 ViewId {
                     creator: Default::default(),
@@ -10445,12 +10447,7 @@ async fn test_mutlibuffer_in_navigation_history(cx: &mut gpui::TestAppContext) {
                 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,
-                cx,
-            );
+            workspace.add_item_to_active_pane(Box::new(multi_buffer_editor.clone()), None, cx);
             let active_item = workspace
                 .active_item(cx)
                 .expect("should have an active item after adding the multi buffer");

crates/editor/src/hunk_diff.rs

@@ -5,31 +5,28 @@ use std::{
 
 use collections::{hash_map, HashMap, HashSet};
 use git::diff::{DiffHunk, DiffHunkStatus};
-use gpui::{Action, AppContext, Hsla, Model, MouseButton, Subscription, Task, View};
+use gpui::{AppContext, Hsla, Model, Task, View};
 use language::Buffer;
 use multi_buffer::{
-    Anchor, AnchorRangeExt, ExcerptRange, MultiBuffer, MultiBufferRow, MultiBufferSnapshot, ToPoint,
+    Anchor, ExcerptRange, MultiBuffer, MultiBufferRow, MultiBufferSnapshot, ToPoint,
 };
 use settings::SettingsStore;
 use text::{BufferId, Point};
 use ui::{
-    h_flex, v_flex, ActiveTheme, Context as _, ContextMenu, InteractiveElement, IntoElement,
-    ParentElement, Pixels, Styled, ViewContext, VisualContext,
+    div, ActiveTheme, Context as _, IntoElement, ParentElement, Styled, ViewContext, VisualContext,
 };
 use util::{debug_panic, RangeExt};
 
 use crate::{
     editor_settings::CurrentLineHighlight,
     git::{diff_hunk_to_display, DisplayDiffHunk},
-    hunk_status, hunks_for_selections,
-    mouse_context_menu::MouseContextMenu,
-    BlockDisposition, BlockProperties, BlockStyle, CustomBlockId, DiffRowHighlight, Editor,
-    EditorSnapshot, ExpandAllHunkDiffs, RangeToAnchorExt, RevertSelectedHunks, ToDisplayPoint,
-    ToggleHunkDiff,
+    hunk_status, hunks_for_selections, BlockDisposition, BlockId, BlockProperties, BlockStyle,
+    DiffRowHighlight, Editor, EditorSnapshot, ExpandAllHunkDiffs, RangeToAnchorExt,
+    RevertSelectedHunks, ToDisplayPoint, ToggleHunkDiff,
 };
 
 #[derive(Debug, Clone)]
-pub(super) struct HoveredHunk {
+pub(super) struct HunkToExpand {
     pub multi_buffer_range: Range<Anchor>,
     pub status: DiffHunkStatus,
     pub diff_base_byte_range: Range<usize>,
@@ -58,7 +55,7 @@ impl ExpandedHunks {
 
 #[derive(Debug, Clone)]
 pub(super) struct ExpandedHunk {
-    pub block: Option<CustomBlockId>,
+    pub block: Option<BlockId>,
     pub hunk_range: Range<Anchor>,
     pub diff_base_byte_range: Range<usize>,
     pub status: DiffHunkStatus,
@@ -66,123 +63,6 @@ pub(super) struct ExpandedHunk {
 }
 
 impl Editor {
-    pub(super) fn open_hunk_context_menu(
-        &mut self,
-        hovered_hunk: HoveredHunk,
-        clicked_point: gpui::Point<Pixels>,
-        cx: &mut ViewContext<Editor>,
-    ) {
-        let focus_handle = self.focus_handle.clone();
-        let expanded = self
-            .expanded_hunks
-            .hunks(false)
-            .any(|expanded_hunk| expanded_hunk.hunk_range == hovered_hunk.multi_buffer_range);
-        let editor_handle = cx.view().clone();
-        let editor_snapshot = self.snapshot(cx);
-        let start_point = self
-            .to_pixel_point(hovered_hunk.multi_buffer_range.start, &editor_snapshot, cx)
-            .unwrap_or(clicked_point);
-        let end_point = self
-            .to_pixel_point(hovered_hunk.multi_buffer_range.start, &editor_snapshot, cx)
-            .unwrap_or(clicked_point);
-        let norm =
-            |a: gpui::Point<Pixels>, b: gpui::Point<Pixels>| (a.x - b.x).abs() + (a.y - b.y).abs();
-        let closest_source = if norm(start_point, clicked_point) < norm(end_point, clicked_point) {
-            hovered_hunk.multi_buffer_range.start
-        } else {
-            hovered_hunk.multi_buffer_range.end
-        };
-
-        self.mouse_context_menu = MouseContextMenu::pinned_to_editor(
-            self,
-            closest_source,
-            clicked_point,
-            ContextMenu::build(cx, move |menu, _| {
-                menu.on_blur_subscription(Subscription::new(|| {}))
-                    .context(focus_handle)
-                    .entry(
-                        if expanded {
-                            "Collapse Hunk"
-                        } else {
-                            "Expand Hunk"
-                        },
-                        Some(ToggleHunkDiff.boxed_clone()),
-                        {
-                            let editor = editor_handle.clone();
-                            let hunk = hovered_hunk.clone();
-                            move |cx| {
-                                editor.update(cx, |editor, cx| {
-                                    editor.toggle_hovered_hunk(&hunk, cx);
-                                });
-                            }
-                        },
-                    )
-                    .entry("Revert Hunk", Some(RevertSelectedHunks.boxed_clone()), {
-                        let editor = editor_handle.clone();
-                        let hunk = hovered_hunk.clone();
-                        move |cx| {
-                            let multi_buffer = editor.read(cx).buffer().clone();
-                            let multi_buffer_snapshot = multi_buffer.read(cx).snapshot(cx);
-                            let mut revert_changes = HashMap::default();
-                            if let Some(hunk) =
-                                crate::hunk_diff::to_diff_hunk(&hunk, &multi_buffer_snapshot)
-                            {
-                                Editor::prepare_revert_change(
-                                    &mut revert_changes,
-                                    &multi_buffer,
-                                    &hunk,
-                                    cx,
-                                );
-                            }
-                            if !revert_changes.is_empty() {
-                                editor.update(cx, |editor, cx| editor.revert(revert_changes, cx));
-                            }
-                        }
-                    })
-                    .entry("Revert File", None, {
-                        let editor = editor_handle.clone();
-                        move |cx| {
-                            let mut revert_changes = HashMap::default();
-                            let multi_buffer = editor.read(cx).buffer().clone();
-                            let multi_buffer_snapshot = multi_buffer.read(cx).snapshot(cx);
-                            for hunk in crate::hunks_for_rows(
-                                Some(MultiBufferRow(0)..multi_buffer_snapshot.max_buffer_row())
-                                    .into_iter(),
-                                &multi_buffer_snapshot,
-                            ) {
-                                Editor::prepare_revert_change(
-                                    &mut revert_changes,
-                                    &multi_buffer,
-                                    &hunk,
-                                    cx,
-                                );
-                            }
-                            if !revert_changes.is_empty() {
-                                editor.update(cx, |editor, cx| {
-                                    editor.transact(cx, |editor, cx| {
-                                        editor.revert(revert_changes, cx);
-                                    });
-                                });
-                            }
-                        }
-                    })
-            }),
-            cx,
-        )
-    }
-
-    pub(super) fn toggle_hovered_hunk(
-        &mut self,
-        hovered_hunk: &HoveredHunk,
-        cx: &mut ViewContext<Editor>,
-    ) {
-        let editor_snapshot = self.snapshot(cx);
-        if let Some(diff_hunk) = to_diff_hunk(hovered_hunk, &editor_snapshot.buffer_snapshot) {
-            self.toggle_hunks_expanded(vec![diff_hunk], cx);
-            self.change_selections(None, cx, |selections| selections.refresh());
-        }
-    }
-
     pub fn toggle_hunk_diff(&mut self, _: &ToggleHunkDiff, cx: &mut ViewContext<Self>) {
         let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx);
         let selections = self.selections.disjoint_anchors();
@@ -284,7 +164,7 @@ impl Editor {
                                         retain = false;
                                         break;
                                     } else {
-                                        hunks_to_expand.push(HoveredHunk {
+                                        hunks_to_expand.push(HunkToExpand {
                                             status,
                                             multi_buffer_range,
                                             diff_base_byte_range,
@@ -302,7 +182,7 @@ impl Editor {
                         let remaining_hunk_point_range =
                             Point::new(remaining_hunk.associated_range.start.0, 0)
                                 ..Point::new(remaining_hunk.associated_range.end.0, 0);
-                        hunks_to_expand.push(HoveredHunk {
+                        hunks_to_expand.push(HunkToExpand {
                             status: hunk_status(&remaining_hunk),
                             multi_buffer_range: remaining_hunk_point_range
                                 .to_anchors(&snapshot.buffer_snapshot),
@@ -335,7 +215,7 @@ impl Editor {
     pub(super) fn expand_diff_hunk(
         &mut self,
         diff_base_buffer: Option<Model<Buffer>>,
-        hunk: &HoveredHunk,
+        hunk: &HunkToExpand,
         cx: &mut ViewContext<'_, Editor>,
     ) -> Option<()> {
         let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx);
@@ -423,58 +303,28 @@ impl Editor {
         &mut self,
         diff_base_buffer: Model<Buffer>,
         deleted_text_height: u8,
-        hunk: &HoveredHunk,
+        hunk: &HunkToExpand,
         cx: &mut ViewContext<'_, Self>,
-    ) -> Option<CustomBlockId> {
+    ) -> Option<BlockId> {
         let deleted_hunk_color = deleted_hunk_color(cx);
         let (editor_height, editor_with_deleted_text) =
             editor_with_deleted_text(diff_base_buffer, deleted_hunk_color, hunk, cx);
-        let editor = cx.view().clone();
         let editor_model = cx.model().clone();
-        let hunk = hunk.clone();
         let mut new_block_ids = self.insert_blocks(
             Some(BlockProperties {
                 position: hunk.multi_buffer_range.start,
                 height: editor_height.max(deleted_text_height),
                 style: BlockStyle::Flex,
-                disposition: BlockDisposition::Above,
                 render: Box::new(move |cx| {
-                    let close_button = editor.update(cx.context, |editor, cx| {
-                        let editor_snapshot = editor.snapshot(cx);
-                        let hunk_start_row = hunk
-                            .multi_buffer_range
-                            .start
-                            .to_display_point(&editor_snapshot)
-                            .row();
-                        editor.render_close_hunk_diff_button(hunk.clone(), hunk_start_row, cx)
-                    });
                     let gutter_dimensions = editor_model.read(cx).gutter_dimensions;
-                    let click_editor = editor.clone();
-                    h_flex()
+                    div()
                         .bg(deleted_hunk_color)
                         .size_full()
-                        .child(
-                            v_flex()
-                                .justify_center()
-                                .max_w(gutter_dimensions.full_width())
-                                .min_w(gutter_dimensions.full_width())
-                                .size_full()
-                                .on_mouse_down(MouseButton::Left, {
-                                    let click_hunk = hunk.clone();
-                                    move |e, cx| {
-                                        let modifiers = e.modifiers;
-                                        if modifiers.control || modifiers.platform {
-                                            click_editor.update(cx, |editor, cx| {
-                                                editor.toggle_hovered_hunk(&click_hunk, cx);
-                                            });
-                                        }
-                                    }
-                                })
-                                .child(close_button),
-                        )
+                        .pl(gutter_dimensions.full_width())
                         .child(editor_with_deleted_text.clone())
                         .into_any_element()
                 }),
+                disposition: BlockDisposition::Above,
             }),
             None,
             cx,
@@ -489,21 +339,16 @@ impl Editor {
         }
     }
 
-    pub(super) fn clear_clicked_diff_hunks(&mut self, cx: &mut ViewContext<'_, Editor>) -> bool {
+    pub(super) fn clear_expanded_diff_hunks(&mut self, cx: &mut ViewContext<'_, Editor>) {
         self.expanded_hunks.hunk_update_tasks.clear();
-        self.clear_row_highlights::<DiffRowHighlight>();
         let to_remove = self
             .expanded_hunks
             .hunks
             .drain(..)
             .filter_map(|expanded_hunk| expanded_hunk.block)
-            .collect::<HashSet<_>>();
-        if to_remove.is_empty() {
-            false
-        } else {
-            self.remove_blocks(to_remove, None, cx);
-            true
-        }
+            .collect();
+        self.clear_row_highlights::<DiffRowHighlight>();
+        self.remove_blocks(to_remove, None, cx);
     }
 
     pub(super) fn sync_expanded_diff_hunks(
@@ -612,7 +457,7 @@ impl Editor {
                                                 recalculated_hunks.next();
                                                 retain = true;
                                             } else {
-                                                hunks_to_reexpand.push(HoveredHunk {
+                                                hunks_to_reexpand.push(HunkToExpand {
                                                     status,
                                                     multi_buffer_range,
                                                     diff_base_byte_range,
@@ -677,29 +522,6 @@ impl Editor {
     }
 }
 
-fn to_diff_hunk(
-    hovered_hunk: &HoveredHunk,
-    multi_buffer_snapshot: &MultiBufferSnapshot,
-) -> Option<DiffHunk<MultiBufferRow>> {
-    let buffer_id = hovered_hunk
-        .multi_buffer_range
-        .start
-        .buffer_id
-        .or_else(|| hovered_hunk.multi_buffer_range.end.buffer_id)?;
-    let buffer_range = hovered_hunk.multi_buffer_range.start.text_anchor
-        ..hovered_hunk.multi_buffer_range.end.text_anchor;
-    let point_range = hovered_hunk
-        .multi_buffer_range
-        .to_point(&multi_buffer_snapshot);
-    Some(DiffHunk {
-        associated_range: MultiBufferRow(point_range.start.row)
-            ..MultiBufferRow(point_range.end.row),
-        buffer_id,
-        buffer_range,
-        diff_base_byte_range: hovered_hunk.diff_base_byte_range.clone(),
-    })
-}
-
 fn create_diff_base_buffer(buffer: &Model<Buffer>, cx: &mut AppContext) -> Option<Model<Buffer>> {
     buffer
         .update(cx, |buffer, _| {
@@ -733,7 +555,7 @@ fn deleted_hunk_color(cx: &AppContext) -> Hsla {
 fn editor_with_deleted_text(
     diff_base_buffer: Model<Buffer>,
     deleted_color: Hsla,
-    hunk: &HoveredHunk,
+    hunk: &HunkToExpand,
     cx: &mut ViewContext<'_, Editor>,
 ) -> (u8, View<Editor>) {
     let parent_editor = cx.view().downgrade();
@@ -791,12 +613,11 @@ fn editor_with_deleted_text(
                 }
             }),
         ]);
-        let parent_editor_for_reverts = parent_editor.clone();
         let original_multi_buffer_range = hunk.multi_buffer_range.clone();
         let diff_base_range = hunk.diff_base_byte_range.clone();
         editor
             .register_action::<RevertSelectedHunks>(move |_, cx| {
-                parent_editor_for_reverts
+                parent_editor
                     .update(cx, |editor, cx| {
                         let Some((buffer, original_text)) =
                             editor.buffer().update(cx, |buffer, cx| {
@@ -824,16 +645,6 @@ fn editor_with_deleted_text(
                     .ok();
             })
             .detach();
-        let hunk = hunk.clone();
-        editor
-            .register_action::<ToggleHunkDiff>(move |_, cx| {
-                parent_editor
-                    .update(cx, |editor, cx| {
-                        editor.toggle_hovered_hunk(&hunk, cx);
-                    })
-                    .ok();
-            })
-            .detach();
         editor
     });
 

crates/editor/src/items.rs

@@ -5,7 +5,6 @@ use crate::{
 };
 use anyhow::{anyhow, Context as _, Result};
 use collections::HashSet;
-use file_icons::FileIcons;
 use futures::future::try_join_all;
 use git::repository::GitFileStatus;
 use gpui::{
@@ -17,13 +16,10 @@ use language::{
     proto::serialize_anchor as serialize_text_anchor, Bias, Buffer, CharKind, Point, SelectionGoal,
 };
 use multi_buffer::AnchorRangeExt;
-use project::{
-    project_settings::ProjectSettings, search::SearchQuery, FormatTrigger, Item as _, Project,
-    ProjectPath,
-};
+use project::{search::SearchQuery, FormatTrigger, Item as _, Project, ProjectPath};
 use rpc::proto::{self, update_view, PeerId};
 use settings::Settings;
-use workspace::item::{Dedup, ItemSettings, SerializableItem, TabContentParams};
+use workspace::item::{ItemSettings, TabContentParams};
 
 use std::{
     any::TypeId,
@@ -38,9 +34,9 @@ use text::{BufferId, Selection};
 use theme::{Theme, ThemeSettings};
 use ui::{h_flex, prelude::*, Label};
 use util::{paths::PathExt, ResultExt, TryFutureExt};
-use workspace::item::{BreadcrumbText, FollowEvent};
+use workspace::item::{BreadcrumbText, FollowEvent, FollowableItemHandle};
 use workspace::{
-    item::{FollowableItem, Item, ItemEvent, ProjectItem},
+    item::{FollowableItem, Item, ItemEvent, ItemHandle, ProjectItem},
     searchable::{Direction, SearchEvent, SearchableItem, SearchableItemHandle},
     ItemId, ItemNavHistory, Pane, ToolbarItemLocation, ViewId, Workspace, WorkspaceId,
 };
@@ -53,6 +49,7 @@ impl FollowableItem for Editor {
     }
 
     fn from_state_proto(
+        pane: View<workspace::Pane>,
         workspace: View<Workspace>,
         remote_id: ViewId,
         state: &mut Option<proto::view::Variant>,
@@ -66,6 +63,7 @@ impl FollowableItem for Editor {
             unreachable!()
         };
 
+        let client = project.read(cx).client();
         let replica_id = project.read(cx).replica_id();
         let buffer_ids = state
             .excerpts
@@ -79,55 +77,72 @@ impl FollowableItem for Editor {
                 .collect::<Result<Vec<_>>>()
         });
 
+        let pane = pane.downgrade();
         Some(cx.spawn(|mut cx| async move {
             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(|cx| {
-                let multibuffer = cx.new_model(|cx| {
-                    let mut multibuffer;
-                    if state.singleton && buffers.len() == 1 {
-                        multibuffer = MultiBuffer::singleton(buffers.pop().unwrap(), cx)
-                    } else {
-                        multibuffer = MultiBuffer::new(replica_id, project.read(cx).capability());
-                        let mut excerpts = state.excerpts.into_iter().peekable();
-                        while let Some(excerpt) = excerpts.peek() {
-                            let Ok(buffer_id) = BufferId::new(excerpt.buffer_id) else {
-                                continue;
-                            };
-                            let buffer_excerpts = iter::from_fn(|| {
-                                let excerpt = excerpts.peek()?;
-                                (excerpt.buffer_id == u64::from(buffer_id))
-                                    .then(|| excerpts.next().unwrap())
-                            });
-                            let buffer =
-                                buffers.iter().find(|b| b.read(cx).remote_id() == buffer_id);
-                            if let Some(buffer) = buffer {
-                                multibuffer.push_excerpts(
-                                    buffer.clone(),
-                                    buffer_excerpts.filter_map(deserialize_excerpt_range),
-                                    cx,
-                                );
-                            }
-                        }
-                    };
-
-                    if let Some(title) = &state.title {
-                        multibuffer = multibuffer.with_title(title.clone())
-                    }
-
-                    multibuffer
-                });
-
-                cx.new_view(|cx| {
-                    let mut editor =
-                        Editor::for_multibuffer(multibuffer, Some(project.clone()), true, cx);
-                    editor.remote_id = Some(remote_id);
-                    editor
+            let editor = pane.update(&mut cx, |pane, cx| {
+                let mut editors = pane.items_of_type::<Self>();
+                editors.find(|editor| {
+                    let ids_match = editor.remote_id(&client, cx) == Some(remote_id);
+                    let singleton_buffer_matches = state.singleton
+                        && buffers.first()
+                            == editor.read(cx).buffer.read(cx).as_singleton().as_ref();
+                    ids_match || singleton_buffer_matches
                 })
             })?;
 
+            let editor = if let Some(editor) = editor {
+                editor
+            } else {
+                pane.update(&mut cx, |_, cx| {
+                    let multibuffer = cx.new_model(|cx| {
+                        let mut multibuffer;
+                        if state.singleton && buffers.len() == 1 {
+                            multibuffer = MultiBuffer::singleton(buffers.pop().unwrap(), cx)
+                        } else {
+                            multibuffer =
+                                MultiBuffer::new(replica_id, project.read(cx).capability());
+                            let mut excerpts = state.excerpts.into_iter().peekable();
+                            while let Some(excerpt) = excerpts.peek() {
+                                let Ok(buffer_id) = BufferId::new(excerpt.buffer_id) else {
+                                    continue;
+                                };
+                                let buffer_excerpts = iter::from_fn(|| {
+                                    let excerpt = excerpts.peek()?;
+                                    (excerpt.buffer_id == u64::from(buffer_id))
+                                        .then(|| excerpts.next().unwrap())
+                                });
+                                let buffer =
+                                    buffers.iter().find(|b| b.read(cx).remote_id() == buffer_id);
+                                if let Some(buffer) = buffer {
+                                    multibuffer.push_excerpts(
+                                        buffer.clone(),
+                                        buffer_excerpts.filter_map(deserialize_excerpt_range),
+                                        cx,
+                                    );
+                                }
+                            }
+                        };
+
+                        if let Some(title) = &state.title {
+                            multibuffer = multibuffer.with_title(title.clone())
+                        }
+
+                        multibuffer
+                    });
+
+                    cx.new_view(|cx| {
+                        let mut editor =
+                            Editor::for_multibuffer(multibuffer, Some(project.clone()), true, cx);
+                        editor.remote_id = Some(remote_id);
+                        editor
+                    })
+                })?
+            };
+
             update_editor_from_message(
                 editor.downgrade(),
                 project,
@@ -312,16 +327,6 @@ impl FollowableItem for Editor {
     fn is_project_item(&self, _cx: &WindowContext) -> bool {
         true
     }
-
-    fn dedup(&self, existing: &Self, cx: &WindowContext) -> 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
-        }
-    }
 }
 
 async fn update_editor_from_message(
@@ -591,20 +596,6 @@ impl Item for Editor {
         Some(path.to_string_lossy().to_string().into())
     }
 
-    fn tab_icon(&self, cx: &WindowContext) -> Option<Icon> {
-        ItemSettings::get_global(cx)
-            .file_icons
-            .then(|| {
-                self.buffer
-                    .read(cx)
-                    .as_singleton()
-                    .and_then(|buffer| buffer.read(cx).project_path(cx))
-                    .and_then(|path| FileIcons::get_icon(path.path.as_ref(), cx))
-            })
-            .flatten()
-            .map(|icon| Icon::from_path(icon))
-    }
-
     fn tab_content(&self, params: TabContentParams, cx: &WindowContext) -> AnyElement {
         let label_color = if ItemSettings::get_global(cx).git_status {
             self.buffer()
@@ -855,8 +846,54 @@ impl Item for Editor {
         Some(breadcrumbs)
     }
 
-    fn added_to_workspace(&mut self, workspace: &mut Workspace, _: &mut ViewContext<Self>) {
+    fn added_to_workspace(&mut self, workspace: &mut Workspace, cx: &mut ViewContext<Self>) {
         self.workspace = Some((workspace.weak_handle(), workspace.database_id()));
+        let Some(workspace_id) = workspace.database_id() else {
+            return;
+        };
+
+        let item_id = cx.view().item_id().as_u64() as ItemId;
+
+        fn serialize(
+            buffer: Model<Buffer>,
+            workspace_id: WorkspaceId,
+            item_id: ItemId,
+            cx: &mut AppContext,
+        ) {
+            if let Some(file) = buffer.read(cx).file().and_then(|file| file.as_local()) {
+                let path = file.abs_path(cx);
+
+                cx.background_executor()
+                    .spawn(async move {
+                        DB.save_path(item_id, workspace_id, path.clone())
+                            .await
+                            .log_err()
+                    })
+                    .detach();
+            }
+        }
+
+        if let Some(buffer) = self.buffer().read(cx).as_singleton() {
+            serialize(buffer.clone(), workspace_id, item_id, cx);
+
+            cx.subscribe(&buffer, |this, buffer, event, cx| {
+                if let Some((_, Some(workspace_id))) = this.workspace.as_ref() {
+                    if let language::Event::FileHandleChanged = event {
+                        serialize(
+                            buffer,
+                            *workspace_id,
+                            cx.view().item_id().as_u64() as ItemId,
+                            cx,
+                        );
+                    }
+                }
+            })
+            .detach();
+        }
+    }
+
+    fn serialized_item_kind() -> Option<&'static str> {
+        Some("Editor")
     }
 
     fn to_item_events(event: &EditorEvent, mut f: impl FnMut(ItemEvent)) {
@@ -892,20 +929,6 @@ impl Item for Editor {
             _ => {}
         }
     }
-}
-
-impl SerializableItem for Editor {
-    fn serialized_item_kind() -> &'static str {
-        "Editor"
-    }
-
-    fn cleanup(
-        workspace_id: WorkspaceId,
-        alive_items: Vec<ItemId>,
-        cx: &mut WindowContext,
-    ) -> Task<Result<()>> {
-        cx.spawn(|_| DB.delete_unloaded_items(workspace_id, alive_items))
-    }
 
     fn deserialize(
         project: Model<Project>,
@@ -914,171 +937,41 @@ impl SerializableItem for Editor {
         item_id: ItemId,
         cx: &mut ViewContext<Pane>,
     ) -> Task<Result<View<Self>>> {
-        let path_content_language = match DB
-            .get_path_and_contents(item_id, workspace_id)
-            .context("Failed to query editor state")
-        {
-            Ok(Some((path, content, language))) => {
-                if ProjectSettings::get_global(cx)
-                    .session
-                    .restore_unsaved_buffers
-                {
-                    (path, content, language)
-                } else {
-                    (path, None, None)
-                }
-            }
-            Ok(None) => {
-                return Task::ready(Err(anyhow!("No path or contents found for buffer")));
-            }
-            Err(error) => {
-                return Task::ready(Err(error));
-            }
-        };
+        let project_item: Result<_> = project.update(cx, |project, cx| {
+            // Look up the path with this key associated, create a self with that path
+            let path = DB
+                .get_path(item_id, workspace_id)?
+                .context("No path stored for this editor")?;
 
-        match path_content_language {
-            (None, Some(content), language_name) => cx.spawn(|_, mut cx| async move {
-                let language = if let Some(language_name) = language_name {
-                    let language_registry =
-                        project.update(&mut cx, |project, _| project.languages().clone())?;
+            let (worktree, path) = project
+                .find_local_worktree(&path, cx)
+                .with_context(|| format!("No worktree for path: {path:?}"))?;
+            let project_path = ProjectPath {
+                worktree_id: worktree.read(cx).id(),
+                path: path.into(),
+            };
 
-                    Some(language_registry.language_for_name(&language_name).await?)
-                } else {
-                    None
-                };
+            Ok(project.open_path(project_path, cx))
+        });
 
-                // First create the empty buffer
-                let buffer = project.update(&mut cx, |project, cx| {
-                    project.create_local_buffer("", language, cx)
-                })?;
+        project_item
+            .map(|project_item| {
+                cx.spawn(|pane, mut cx| async move {
+                    let (_, project_item) = project_item.await?;
+                    let buffer = project_item
+                        .downcast::<Buffer>()
+                        .map_err(|_| anyhow!("Project item at stored path was not a buffer"))?;
+                    pane.update(&mut cx, |_, cx| {
+                        cx.new_view(|cx| {
+                            let mut editor = Editor::for_buffer(buffer, Some(project), cx);
 
-                // Then set the text so that the dirty bit is set correctly
-                buffer.update(&mut cx, |buffer, cx| {
-                    buffer.set_text(content, cx);
-                })?;
-
-                cx.new_view(|cx| {
-                    let mut editor = Editor::for_buffer(buffer, Some(project), cx);
-                    editor.read_scroll_position_from_db(item_id, workspace_id, cx);
-                    editor
-                })
-            }),
-            (Some(path), contents, _) => {
-                let project_item = project.update(cx, |project, cx| {
-                    let (worktree, path) = project
-                        .find_worktree(&path, cx)
-                        .with_context(|| format!("No worktree for path: {path:?}"))?;
-                    let project_path = ProjectPath {
-                        worktree_id: worktree.read(cx).id(),
-                        path: path.into(),
-                    };
-
-                    Ok(project.open_path(project_path, cx))
-                });
-
-                project_item
-                    .map(|project_item| {
-                        cx.spawn(|pane, mut cx| async move {
-                            let (_, project_item) = project_item.await?;
-                            let buffer = project_item.downcast::<Buffer>().map_err(|_| {
-                                anyhow!("Project item at stored path was not a buffer")
-                            })?;
-
-                            // 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, mtime, ...).
-                            if let Some(buffer_text) = contents {
-                                buffer.update(&mut cx, |buffer, cx| {
-                                    buffer.set_text(buffer_text, cx);
-                                })?;
-                            }
-
-                            pane.update(&mut cx, |_, cx| {
-                                cx.new_view(|cx| {
-                                    let mut editor = Editor::for_buffer(buffer, Some(project), cx);
-
-                                    editor.read_scroll_position_from_db(item_id, workspace_id, cx);
-                                    editor
-                                })
-                            })
+                            editor.read_scroll_position_from_db(item_id, workspace_id, cx);
+                            editor
                         })
                     })
-                    .unwrap_or_else(|error| Task::ready(Err(error)))
-            }
-            _ => Task::ready(Err(anyhow!("No path or contents found for buffer"))),
-        }
-    }
-
-    fn serialize(
-        &mut self,
-        workspace: &mut Workspace,
-        item_id: ItemId,
-        closing: bool,
-        cx: &mut ViewContext<Self>,
-    ) -> Option<Task<Result<()>>> {
-        let mut serialize_dirty_buffers = self.serialize_dirty_buffers;
-
-        let project = self.project.clone()?;
-        if project.read(cx).visible_worktrees(cx).next().is_none() {
-            // If we don't have a worktree, we don't serialize, because
-            // projects without worktrees aren't deserialized.
-            serialize_dirty_buffers = false;
-        }
-
-        if closing && !serialize_dirty_buffers {
-            return None;
-        }
-
-        let workspace_id = workspace.database_id()?;
-
-        let buffer = self.buffer().read(cx).as_singleton()?;
-
-        let is_dirty = buffer.read(cx).is_dirty();
-        let path = buffer
-            .read(cx)
-            .file()
-            .and_then(|file| file.as_local())
-            .map(|file| file.abs_path(cx));
-        let snapshot = buffer.read(cx).snapshot();
-
-        Some(cx.spawn(|_this, cx| async move {
-            cx.background_executor()
-                .spawn(async move {
-                    if let Some(path) = path {
-                        DB.save_path(item_id, workspace_id, path.clone())
-                            .await
-                            .context("failed to save path of buffer")?
-                    }
-
-                    if serialize_dirty_buffers {
-                        let (contents, language) = if is_dirty {
-                            let contents = snapshot.text();
-                            let language = snapshot.language().map(|lang| lang.name().to_string());
-                            (Some(contents), language)
-                        } else {
-                            (None, None)
-                        };
-
-                        DB.save_contents(item_id, workspace_id, contents, language)
-                            .await?;
-                    }
-
-                    anyhow::Ok(())
                 })
-                .await
-                .context("failed to save contents of buffer")?;
-
-            Ok(())
-        }))
-    }
-
-    fn should_serialize(&self, event: &Self::Event) -> bool {
-        matches!(
-            event,
-            EditorEvent::Saved | EditorEvent::DirtyChanged | EditorEvent::BufferEdited
-        )
+            })
+            .unwrap_or_else(|error| Task::ready(Err(error)))
     }
 }
 

crates/editor/src/mouse_context_menu.rs

@@ -10,62 +10,14 @@ use gpui::prelude::FluentBuilder;
 use gpui::{DismissEvent, Pixels, Point, Subscription, View, ViewContext};
 use workspace::OpenInTerminal;
 
-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_x: Pixels,
-        offset_y: Pixels,
-    },
-}
-
 pub struct MouseContextMenu {
-    pub(crate) position: MenuPosition,
+    pub(crate) position: Point<Pixels>,
     pub(crate) context_menu: View<ui::ContextMenu>,
     _subscription: Subscription,
 }
 
 impl MouseContextMenu {
-    pub(crate) fn pinned_to_editor(
-        editor: &mut Editor,
-        source: multi_buffer::Anchor,
-        position: Point<Pixels>,
-        context_menu: View<ui::ContextMenu>,
-        cx: &mut ViewContext<Editor>,
-    ) -> Option<Self> {
-        let context_menu_focus = context_menu.focus_handle(cx);
-        cx.focus(&context_menu_focus);
-
-        let _subscription = cx.subscribe(
-            &context_menu,
-            move |editor, _, _event: &DismissEvent, cx| {
-                editor.mouse_context_menu.take();
-                if context_menu_focus.contains_focused(cx) {
-                    editor.focus(cx);
-                }
-            },
-        );
-
-        let editor_snapshot = editor.snapshot(cx);
-        let source_point = editor.to_pixel_point(source, &editor_snapshot, cx)?;
-        let offset = position - source_point;
-
-        Some(Self {
-            position: MenuPosition::PinnedToEditor {
-                source,
-                offset_x: offset.x,
-                offset_y: offset.y,
-            },
-            context_menu,
-            _subscription,
-        })
-    }
-
-    pub(crate) fn pinned_to_screen(
+    pub(crate) fn new(
         position: Point<Pixels>,
         context_menu: View<ui::ContextMenu>,
         cx: &mut ViewContext<Editor>,
@@ -73,18 +25,16 @@ impl MouseContextMenu {
         let context_menu_focus = context_menu.focus_handle(cx);
         cx.focus(&context_menu_focus);
 
-        let _subscription = cx.subscribe(
-            &context_menu,
-            move |editor, _, _event: &DismissEvent, cx| {
-                editor.mouse_context_menu.take();
+        let _subscription =
+            cx.subscribe(&context_menu, move |this, _, _event: &DismissEvent, cx| {
+                this.mouse_context_menu.take();
                 if context_menu_focus.contains_focused(cx) {
-                    editor.focus(cx);
+                    this.focus(cx);
                 }
-            },
-        );
+            });
 
         Self {
-            position: MenuPosition::PinnedToScreen(position),
+            position,
             context_menu,
             _subscription,
         }
@@ -121,15 +71,13 @@ pub fn deploy_context_menu(
         return;
     }
 
-    let display_map = editor.selections.display_map(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, cx);
         editor.custom_context_menu = Some(custom);
-        let Some(menu) = menu else {
+        if menu.is_none() {
             return;
-        };
-        menu
+        }
+        menu.unwrap()
     } else {
         // Don't show the context menu if there isn't a project associated with this editor
         if editor.project.is_none() {
@@ -137,20 +85,17 @@ pub fn deploy_context_menu(
         }
 
         let display_map = editor.selections.display_map(cx);
-        let buffer = &editor.snapshot(cx).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(None, cx, |s| {
                 s.clear_disjoint();
-                s.set_pending_anchor_range(anchor..anchor, SelectMode::Character);
+                s.set_pending_display_range(point..point, SelectMode::Character);
             });
         }
 
         let focus = cx.focused();
         ui::ContextMenu::build(cx, |menu, _cx| {
             let builder = menu
-                .on_blur_subscription(Subscription::new(|| {}))
                 .action("Rename Symbol", Box::new(Rename))
                 .action("Go to Definition", Box::new(GoToDefinition))
                 .action("Go to Type Definition", Box::new(GoToTypeDefinition))
@@ -181,9 +126,8 @@ pub fn deploy_context_menu(
             }
         })
     };
-
-    editor.mouse_context_menu =
-        MouseContextMenu::pinned_to_editor(editor, source_anchor, position, context_menu, cx);
+    let mouse_context_menu = MouseContextMenu::new(position, context_menu, cx);
+    editor.mouse_context_menu = Some(mouse_context_menu);
     cx.notify();
 }
 

crates/editor/src/persistence.rs

@@ -1,5 +1,3 @@
-use anyhow::Result;
-use db::sqlez::statement::Statement;
 use std::path::PathBuf;
 
 use db::sqlez_macros::sql;
@@ -12,12 +10,10 @@ define_connection!(
     // editors(
     //   item_id: usize,
     //   workspace_id: usize,
-    //   path: Option<PathBuf>,
+    //   path: PathBuf,
     //   scroll_top_row: usize,
     //   scroll_vertical_offset: f32,
     //   scroll_horizontal_offset: f32,
-    //   content: Option<String>,
-    //   language: Option<String>,
     // )
     pub static ref DB: EditorDb<WorkspaceDb> =
         &[sql! (
@@ -35,39 +31,13 @@ define_connection!(
             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;
         )];
 );
 
 impl EditorDb {
     query! {
-        pub fn get_path_and_contents(item_id: ItemId, workspace_id: WorkspaceId) -> Result<Option<(Option<PathBuf>, Option<String>, Option<String>)>> {
-            SELECT path, contents, language FROM editors
+        pub fn get_path(item_id: ItemId, workspace_id: WorkspaceId) -> Result<Option<PathBuf>> {
+            SELECT path FROM editors
             WHERE item_id = ? AND workspace_id = ?
         }
     }
@@ -85,20 +55,6 @@ impl EditorDb {
         }
     }
 
-    query! {
-        pub async fn save_contents(item_id: ItemId, workspace: WorkspaceId, contents: Option<String>, language: Option<String>) -> Result<()> {
-            INSERT INTO editors
-                (item_id, workspace_id, contents, language)
-            VALUES
-                (?1, ?2, ?3, ?4)
-            ON CONFLICT DO UPDATE SET
-                item_id = ?1,
-                workspace_id = ?2,
-                contents = ?3,
-                language = ?4
-        }
-    }
-
     // Returns the scroll top row, and offset
     query! {
         pub fn get_scroll_position(item_id: ItemId, workspace_id: WorkspaceId) -> Result<Option<(u32, f32, f32)>> {
@@ -124,75 +80,4 @@ impl EditorDb {
             WHERE item_id = ?1 AND workspace_id = ?2
         }
     }
-
-    pub async fn delete_unloaded_items(
-        &self,
-        workspace: WorkspaceId,
-        alive_items: Vec<ItemId>,
-    ) -> Result<()> {
-        let placeholders = alive_items
-            .iter()
-            .map(|_| "?")
-            .collect::<Vec<&str>>()
-            .join(", ");
-
-        let query = format!(
-            "DELETE FROM editors WHERE workspace_id = ? AND item_id NOT IN ({placeholders})"
-        );
-
-        self.write(move |conn| {
-            let mut statement = Statement::prepare(conn, query)?;
-            let mut next_index = statement.bind(&workspace, 1)?;
-            for id in alive_items {
-                next_index = statement.bind(&id, next_index)?;
-            }
-            statement.exec()
-        })
-        .await
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui;
-
-    #[gpui::test]
-    async fn test_saving_content() {
-        env_logger::try_init().ok();
-
-        let workspace_id = workspace::WORKSPACE_DB.next_id().await.unwrap();
-
-        // Sanity check: make sure there is no row in the `editors` table
-        assert_eq!(DB.get_path_and_contents(1234, workspace_id).unwrap(), None);
-
-        // Save content/language
-        DB.save_contents(
-            1234,
-            workspace_id,
-            Some("testing".into()),
-            Some("Go".into()),
-        )
-        .await
-        .unwrap();
-
-        // Check that it can be read from DB
-        let path_and_contents = DB.get_path_and_contents(1234, workspace_id).unwrap();
-        let (path, contents, language) = path_and_contents.unwrap();
-        assert!(path.is_none());
-        assert_eq!(contents, Some("testing".to_owned()));
-        assert_eq!(language, Some("Go".to_owned()));
-
-        // Update it with NULL
-        DB.save_contents(1234, workspace_id, None, None)
-            .await
-            .unwrap();
-
-        // Check that it worked
-        let path_and_contents = DB.get_path_and_contents(1234, workspace_id).unwrap();
-        let (path, contents, language) = path_and_contents.unwrap();
-        assert!(path.is_none());
-        assert!(contents.is_none());
-        assert!(language.is_none());
-    }
 }

crates/editor/src/rust_analyzer_ext.rs

@@ -113,7 +113,6 @@ pub fn expand_macro_recursively(
                     cx.new_view(|cx| Editor::for_multibuffer(multibuffer, Some(project), true, cx)),
                 ),
                 None,
-                true,
                 cx,
             );
         })

crates/editor/src/scroll.rs

@@ -476,10 +476,7 @@ impl Editor {
         }
 
         let cur_position = self.scroll_position(cx);
-        let Some(visible_line_count) = self.visible_line_count() else {
-            return;
-        };
-        let new_pos = cur_position + point(0., amount.lines(visible_line_count));
+        let new_pos = cur_position + point(0., amount.lines(self));
         self.set_scroll_position(new_pos, cx);
     }
 

crates/editor/src/scroll/autoscroll.rs

@@ -27,7 +27,7 @@ impl Autoscroll {
         Self::Strategy(AutoscrollStrategy::Center)
     }
 
-    /// scrolls so the newest cursor is near the top
+    /// scrolls so the neweset cursor is near the top
     /// (offset by vertical_scroll_margin)
     pub fn focused() -> Self {
         Self::Strategy(AutoscrollStrategy::Focused)

crates/editor/src/scroll/scroll_amount.rs

@@ -1,3 +1,4 @@
+use crate::Editor;
 use serde::Deserialize;
 use ui::{px, Pixels};
 
@@ -10,16 +11,19 @@ pub enum ScrollAmount {
 }
 
 impl ScrollAmount {
-    pub fn lines(&self, mut visible_line_count: f32) -> f32 {
+    pub fn lines(&self, editor: &mut Editor) -> f32 {
         match self {
             Self::Line(count) => *count,
-            Self::Page(count) => {
-                // for full pages subtract one to leave an anchor line
-                if count.abs() == 1.0 {
-                    visible_line_count -= 1.0
-                }
-                (visible_line_count * count).trunc()
-            }
+            Self::Page(count) => editor
+                .visible_line_count()
+                .map(|mut l| {
+                    // for full pages subtract one to leave an anchor line
+                    if count.abs() == 1.0 {
+                        l -= 1.0
+                    }
+                    (l * count).trunc()
+                })
+                .unwrap_or(0.),
         }
     }
 

crates/editor/src/selections_collection.rs

@@ -157,18 +157,6 @@ impl SelectionsCollection {
         selections
     }
 
-    /// Returns the newest selection, adjusted to take into account the selection line_mode
-    pub fn newest_adjusted(&self, cx: &mut AppContext) -> Selection<Point> {
-        let mut selection = self.newest::<Point>(cx);
-        if self.line_mode {
-            let map = self.display_map(cx);
-            let new_range = map.expand_to_line(selection.range());
-            selection.start = new_range.start;
-            selection.end = new_range.end;
-        }
-        selection
-    }
-
     pub fn all_adjusted_display(
         &self,
         cx: &mut AppContext,
@@ -438,6 +426,46 @@ impl<'a> MutableSelectionsCollection<'a> {
         self.selections_changed = true;
     }
 
+    pub(crate) fn set_pending_display_range(
+        &mut self,
+        range: Range<DisplayPoint>,
+        mode: SelectMode,
+    ) {
+        let (start, end, reversed) = {
+            let display_map = self.display_map();
+            let buffer = self.buffer();
+            let mut start = range.start;
+            let mut end = range.end;
+            let reversed = if start > end {
+                mem::swap(&mut start, &mut end);
+                true
+            } else {
+                false
+            };
+
+            let end_bias = if end > start { Bias::Left } else { Bias::Right };
+            (
+                buffer.anchor_before(start.to_point(&display_map)),
+                buffer.anchor_at(end.to_point(&display_map), end_bias),
+                reversed,
+            )
+        };
+
+        let new_pending = PendingSelection {
+            selection: Selection {
+                id: post_inc(&mut self.collection.next_selection_id),
+                start,
+                end,
+                reversed,
+                goal: SelectionGoal::None,
+            },
+            mode,
+        };
+
+        self.collection.pending = Some(new_pending);
+        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;

crates/editor/src/test/editor_lsp_test_context.rs

@@ -79,7 +79,7 @@ impl EditorLspTestContext {
         let mut cx = VisualTestContext::from_window(*window.deref(), cx);
         project
             .update(&mut cx, |project, cx| {
-                project.find_or_create_worktree("/root", true, cx)
+                project.find_or_create_local_worktree("/root", true, cx)
             })
             .await
             .unwrap();

crates/extension/src/extension_store.rs

@@ -456,9 +456,9 @@ impl ExtensionStore {
         let extension_ids = self
             .extension_index
             .extensions
-            .iter()
-            .filter(|(id, entry)| !entry.dev && extension_settings.should_auto_update(id))
-            .map(|(id, _)| id.as_ref())
+            .keys()
+            .map(|id| id.as_ref())
+            .filter(|id| extension_settings.should_auto_update(id))
             .collect::<Vec<_>>()
             .join(",");
         let task = self.fetch_extensions_from_api(

crates/extensions_ui/Cargo.toml

@@ -17,7 +17,6 @@ test-support = []
 [dependencies]
 anyhow.workspace = true
 client.workspace = true
-collections.workspace = true
 db.workspace = true
 editor.workspace = true
 extension.workspace = true
@@ -37,7 +36,6 @@ theme.workspace = true
 theme_selector.workspace = true
 ui.workspace = true
 util.workspace = true
-vim.workspace = true
 workspace.workspace = true
 
 [dev-dependencies]

crates/extensions_ui/src/components.rs

@@ -1,5 +1,3 @@
 mod extension_card;
-mod feature_upsell;
 
 pub use extension_card::*;
-pub use feature_upsell::*;

crates/extensions_ui/src/components/feature_upsell.rs

@@ -1,83 +0,0 @@
-use std::sync::Arc;
-
-use client::telemetry::Telemetry;
-use gpui::{AnyElement, Div, StyleRefinement};
-use smallvec::SmallVec;
-use ui::{prelude::*, ButtonLike};
-
-#[derive(IntoElement)]
-pub struct FeatureUpsell {
-    base: Div,
-    telemetry: Arc<Telemetry>,
-    text: SharedString,
-    docs_url: Option<SharedString>,
-    children: SmallVec<[AnyElement; 2]>,
-}
-
-impl FeatureUpsell {
-    pub fn new(telemetry: Arc<Telemetry>, text: impl Into<SharedString>) -> Self {
-        Self {
-            base: h_flex(),
-            telemetry,
-            text: text.into(),
-            docs_url: None,
-            children: SmallVec::new(),
-        }
-    }
-
-    pub fn docs_url(mut self, docs_url: impl Into<SharedString>) -> Self {
-        self.docs_url = Some(docs_url.into());
-        self
-    }
-}
-
-impl ParentElement for FeatureUpsell {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-// Style methods.
-impl FeatureUpsell {
-    fn style(&mut self) -> &mut StyleRefinement {
-        self.base.style()
-    }
-
-    gpui::border_style_methods!({
-        visibility: pub
-    });
-}
-
-impl RenderOnce for FeatureUpsell {
-    fn render(self, cx: &mut WindowContext) -> impl IntoElement {
-        self.base
-            .p_4()
-            .justify_between()
-            .border_color(cx.theme().colors().border)
-            .child(v_flex().overflow_hidden().child(Label::new(self.text)))
-            .child(h_flex().gap_2().children(self.children).when_some(
-                self.docs_url,
-                |el, docs_url| {
-                    el.child(
-                        ButtonLike::new("open_docs")
-                            .child(
-                                h_flex()
-                                    .gap_2()
-                                    .child(Label::new("View docs"))
-                                    .child(Icon::new(IconName::ArrowUpRight)),
-                            )
-                            .on_click({
-                                let telemetry = self.telemetry.clone();
-                                let docs_url = docs_url.clone();
-                                move |_event, cx| {
-                                    telemetry.report_app_event(format!(
-                                        "feature upsell: viewed docs ({docs_url})"
-                                    ));
-                                    cx.open_url(&docs_url)
-                                }
-                            }),
-                    )
-                },
-            ))
-    }
-}

crates/extensions_ui/src/extensions_ui.rs

@@ -2,39 +2,35 @@ mod components;
 mod extension_suggest;
 mod extension_version_selector;
 
-use std::ops::DerefMut;
-use std::sync::OnceLock;
-use std::time::Duration;
-use std::{ops::Range, sync::Arc};
-
+use crate::components::ExtensionCard;
+use crate::extension_version_selector::{
+    ExtensionVersionSelector, ExtensionVersionSelectorDelegate,
+};
 use client::telemetry::Telemetry;
 use client::ExtensionMetadata;
-use collections::{BTreeMap, BTreeSet};
 use editor::{Editor, EditorElement, EditorStyle};
 use extension::{ExtensionManifest, ExtensionOperation, ExtensionStore};
 use fuzzy::{match_strings, StringMatchCandidate};
 use gpui::{
-    actions, uniform_list, AppContext, EventEmitter, Flatten, FocusableView, FontStyle,
+    actions, uniform_list, AnyElement, AppContext, EventEmitter, FocusableView, FontStyle,
     InteractiveElement, KeyContext, ParentElement, Render, Styled, Task, TextStyle,
     UniformListScrollHandle, View, ViewContext, VisualContext, WeakView, WhiteSpace, WindowContext,
 };
 use num_format::{Locale, ToFormattedString};
-use project::DirectoryLister;
 use release_channel::ReleaseChannel;
 use settings::Settings;
+use std::ops::DerefMut;
+use std::time::Duration;
+use std::{ops::Range, sync::Arc};
 use theme::ThemeSettings;
-use ui::{prelude::*, CheckboxWithLabel, ContextMenu, PopoverMenu, ToggleButton, Tooltip};
-use vim::VimModeSetting;
+use ui::{prelude::*, ContextMenu, PopoverMenu, ToggleButton, Tooltip};
+use util::ResultExt as _;
+use workspace::item::TabContentParams;
 use workspace::{
     item::{Item, ItemEvent},
     Workspace, WorkspaceId,
 };
 
-use crate::components::{ExtensionCard, FeatureUpsell};
-use crate::extension_version_selector::{
-    ExtensionVersionSelector, ExtensionVersionSelectorDelegate,
-};
-
 actions!(zed, [Extensions, InstallDevExtension]);
 
 pub fn init(cx: &mut AppContext) {
@@ -48,41 +44,23 @@ pub fn init(cx: &mut AppContext) {
                     .find_map(|item| item.downcast::<ExtensionsPage>());
 
                 if let Some(existing) = existing {
-                    workspace.activate_item(&existing, true, true, cx);
+                    workspace.activate_item(&existing, cx);
                 } else {
                     let extensions_page = ExtensionsPage::new(workspace, cx);
-                    workspace.add_item_to_active_pane(Box::new(extensions_page), None, true, cx)
+                    workspace.add_item_to_active_pane(Box::new(extensions_page), None, cx)
                 }
             })
-            .register_action(move |workspace, _: &InstallDevExtension, cx| {
+            .register_action(move |_, _: &InstallDevExtension, cx| {
                 let store = ExtensionStore::global(cx);
-                let prompt = workspace.prompt_for_open_path(
-                    gpui::PathPromptOptions {
-                        files: false,
-                        directories: true,
-                        multiple: false,
-                    },
-                    DirectoryLister::Local(workspace.app_state().fs.clone()),
-                    cx,
-                );
+                let prompt = cx.prompt_for_paths(gpui::PathPromptOptions {
+                    files: false,
+                    directories: true,
+                    multiple: false,
+                });
 
-                let workspace_handle = cx.view().downgrade();
                 cx.deref_mut()
                     .spawn(|mut cx| async move {
-                        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(&mut cx, |workspace, cx| {
-                                            workspace.show_portal_error(err.to_string(), cx);
-                                        })
-                                        .ok();
-                                    return None;
-                                }
-                            };
-
+                        let extension_path = prompt.await.log_err()??.pop()?;
                         store
                             .update(&mut cx, |store, cx| {
                                 store
@@ -131,41 +109,6 @@ impl ExtensionFilter {
     }
 }
 
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-enum Feature {
-    Git,
-    Vim,
-    LanguageBash,
-    LanguageC,
-    LanguageCpp,
-    LanguageGo,
-    LanguagePython,
-    LanguageReact,
-    LanguageRust,
-    LanguageTypescript,
-}
-
-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::Git, vec!["git"]),
-            (Feature::Vim, vec!["vim"]),
-            (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"],
-            ),
-        ])
-    })
-}
-
 pub struct ExtensionsPage {
     workspace: WeakView<Workspace>,
     list: UniformListScrollHandle,
@@ -179,7 +122,6 @@ pub struct ExtensionsPage {
     query_contains_error: bool,
     _subscriptions: [gpui::Subscription; 2],
     extension_fetch_task: Option<Task<()>>,
-    upsells: BTreeSet<Feature>,
 }
 
 impl ExtensionsPage {
@@ -218,7 +160,6 @@ impl ExtensionsPage {
                 extension_fetch_task: None,
                 _subscriptions: subscriptions,
                 query_editor,
-                upsells: BTreeSet::default(),
             };
             this.fetch_extensions(None, cx);
             this
@@ -777,19 +718,25 @@ impl ExtensionsPage {
             cx.theme().colors().border
         };
 
-        h_flex().w_full().gap_2().key_context(key_context).child(
-            h_flex()
-                .flex_1()
-                .px_2()
-                .py_1()
-                .gap_2()
-                .border_1()
-                .border_color(editor_border)
-                .min_w(rems_from_px(384.))
-                .rounded_lg()
-                .child(Icon::new(IconName::MagnifyingGlass))
-                .child(self.render_text_input(&self.query_editor, cx)),
-        )
+        h_flex()
+            .w_full()
+            .gap_2()
+            .key_context(key_context)
+            // .capture_action(cx.listener(Self::tab))
+            // .on_action(cx.listener(Self::dismiss))
+            .child(
+                h_flex()
+                    .flex_1()
+                    .px_2()
+                    .py_1()
+                    .gap_2()
+                    .border_1()
+                    .border_color(editor_border)
+                    .min_w(rems_from_px(384.))
+                    .rounded_lg()
+                    .child(Icon::new(IconName::MagnifyingGlass))
+                    .child(self.render_text_input(&self.query_editor, cx)),
+            )
     }
 
     fn render_text_input(&self, editor: &View<Editor>, cx: &ViewContext<Self>) -> impl IntoElement {
@@ -832,7 +779,6 @@ impl ExtensionsPage {
         if let editor::EditorEvent::Edited { .. } = event {
             self.query_contains_error = false;
             self.fetch_extensions_debounced(cx);
-            self.refresh_feature_upsells(cx);
         }
     }
 
@@ -904,120 +850,6 @@ impl ExtensionsPage {
 
         Label::new(message)
     }
-
-    fn update_settings<T: Settings>(
-        &mut self,
-        selection: &Selection,
-        cx: &mut ViewContext<Self>,
-        callback: impl 'static + Send + Fn(&mut T::FileContent, bool),
-    ) {
-        if let Some(workspace) = self.workspace.upgrade() {
-            let fs = workspace.read(cx).app_state().fs.clone();
-            let selection = *selection;
-            settings::update_settings_file::<T>(fs, cx, move |settings| {
-                let value = match selection {
-                    Selection::Unselected => false,
-                    Selection::Selected => true,
-                    _ => return,
-                };
-
-                callback(settings, value)
-            });
-        }
-    }
-
-    fn refresh_feature_upsells(&mut self, cx: &mut ViewContext<Self>) {
-        let Some(search) = self.search_query(cx) else {
-            self.upsells.clear();
-            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_upsells(&self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let upsells_count = self.upsells.len();
-
-        v_flex().children(self.upsells.iter().enumerate().map(|(ix, feature)| {
-            let telemetry = self.telemetry.clone();
-            let upsell = match feature {
-                Feature::Git => FeatureUpsell::new(
-                    telemetry,
-                    "Zed comes with basic Git support. More Git features are coming in the future.",
-                )
-                .docs_url("https://zed.dev/docs/git"),
-                Feature::Vim => FeatureUpsell::new(telemetry, "Vim support is built-in to Zed!")
-                    .docs_url("https://zed.dev/docs/vim")
-                    .child(CheckboxWithLabel::new(
-                        "enable-vim",
-                        Label::new("Enable vim mode"),
-                        if VimModeSetting::get_global(cx).0 {
-                            ui::Selection::Selected
-                        } else {
-                            ui::Selection::Unselected
-                        },
-                        cx.listener(move |this, selection, cx| {
-                            this.telemetry
-                                .report_app_event("feature upsell: toggle vim".to_string());
-                            this.update_settings::<VimModeSetting>(
-                                selection,
-                                cx,
-                                |setting, value| *setting = Some(value),
-                            );
-                        }),
-                    )),
-                Feature::LanguageBash => {
-                    FeatureUpsell::new(telemetry, "Shell support is built-in to Zed!")
-                        .docs_url("https://zed.dev/docs/languages/bash")
-                }
-                Feature::LanguageC => {
-                    FeatureUpsell::new(telemetry, "C support is built-in to Zed!")
-                        .docs_url("https://zed.dev/docs/languages/c")
-                }
-                Feature::LanguageCpp => {
-                    FeatureUpsell::new(telemetry, "C++ support is built-in to Zed!")
-                        .docs_url("https://zed.dev/docs/languages/cpp")
-                }
-                Feature::LanguageGo => {
-                    FeatureUpsell::new(telemetry, "Go support is built-in to Zed!")
-                        .docs_url("https://zed.dev/docs/languages/go")
-                }
-                Feature::LanguagePython => {
-                    FeatureUpsell::new(telemetry, "Python support is built-in to Zed!")
-                        .docs_url("https://zed.dev/docs/languages/python")
-                }
-                Feature::LanguageReact => {
-                    FeatureUpsell::new(telemetry, "React support is built-in to Zed!")
-                        .docs_url("https://zed.dev/docs/languages/typescript")
-                }
-                Feature::LanguageRust => {
-                    FeatureUpsell::new(telemetry, "Rust support is built-in to Zed!")
-                        .docs_url("https://zed.dev/docs/languages/rust")
-                }
-                Feature::LanguageTypescript => {
-                    FeatureUpsell::new(telemetry, "Typescript support is built-in to Zed!")
-                        .docs_url("https://zed.dev/docs/languages/typescript")
-                }
-            };
-
-            upsell.when(ix < upsells_count, |upsell| upsell.border_b_1())
-        }))
-    }
 }
 
 impl Render for ExtensionsPage {
@@ -1100,7 +932,6 @@ impl Render for ExtensionsPage {
                             ),
                     ),
             )
-            .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() {
@@ -1134,8 +965,14 @@ impl FocusableView for ExtensionsPage {
 impl Item for ExtensionsPage {
     type Event = ItemEvent;
 
-    fn tab_content_text(&self, _cx: &WindowContext) -> Option<SharedString> {
-        Some("Extensions".into())
+    fn tab_content(&self, params: TabContentParams, _: &WindowContext) -> AnyElement {
+        Label::new("Extensions")
+            .color(if params.selected {
+                Color::Default
+            } else {
+                Color::Muted
+            })
+            .into_any_element()
     }
 
     fn telemetry_event_text(&self) -> Option<&'static str> {

crates/feature_flags/src/feature_flags.rs

@@ -34,11 +34,6 @@ impl FeatureFlag for TerminalInlineAssist {
     const NAME: &'static str = "terminal-inline-assist";
 }
 
-pub struct GroupedDiagnostics {}
-impl FeatureFlag for GroupedDiagnostics {
-    const NAME: &'static str = "grouped-diagnostics";
-}
-
 pub trait FeatureFlagViewExt<V: 'static> {
     fn observe_flag<T: FeatureFlag, F>(&mut self, callback: F) -> Subscription
     where

crates/file_finder/src/file_finder.rs

@@ -2,7 +2,6 @@
 mod file_finder_tests;
 
 mod new_path_prompt;
-mod open_path_prompt;
 
 use collections::{BTreeSet, HashMap};
 use editor::{scroll::Autoscroll, Bias, Editor};
@@ -14,7 +13,6 @@ use gpui::{
 };
 use itertools::Itertools;
 use new_path_prompt::NewPathPrompt;
-use open_path_prompt::OpenPathPrompt;
 use picker::{Picker, PickerDelegate};
 use project::{PathMatchCandidateSet, Project, ProjectPath, WorktreeId};
 use settings::Settings;
@@ -43,7 +41,6 @@ pub struct FileFinder {
 pub fn init(cx: &mut AppContext) {
     cx.observe_new_views(FileFinder::register).detach();
     cx.observe_new_views(NewPathPrompt::register).detach();
-    cx.observe_new_views(OpenPathPrompt::register).detach();
 }
 
 impl FileFinder {
@@ -679,7 +676,7 @@ impl FileFinderDelegate {
                     let update_result = project
                         .update(&mut cx, |project, cx| {
                             if let Some((worktree, relative_path)) =
-                                project.find_worktree(query_path, cx)
+                                project.find_local_worktree(query_path, cx)
                             {
                                 path_matches.push(ProjectPanelOrdMatch(PathMatch {
                                     score: 1.0,

crates/file_finder/src/file_finder_tests.rs

@@ -767,7 +767,7 @@ async fn test_external_files_history(cx: &mut gpui::TestAppContext) {
     let project = Project::test(app_state.fs.clone(), ["/src".as_ref()], cx).await;
     cx.update(|cx| {
         project.update(cx, |project, cx| {
-            project.find_or_create_worktree("/external-src", false, cx)
+            project.find_or_create_local_worktree("/external-src", false, cx)
         })
     })
     .detach();
@@ -1513,7 +1513,7 @@ async fn test_search_results_refreshed_on_adding_and_removing_worktrees(
     project
         .update(cx, |project, cx| {
             project
-                .find_or_create_worktree("/test/project_2", true, cx)
+                .find_or_create_local_worktree("/test/project_2", true, cx)
                 .into_future()
         })
         .await