WIP use of scap for linux screencapture

Specifically to pull in https://github.com/webrtc-sdk/webrtc/pull/156

.github/workflows/ci.yml

@@ -129,9 +129,7 @@ jobs:
         run: |
           cargo build --workspace --bins --all-features
           cargo check -p gpui --features "macos-blade"
-          cargo check -p workspace
           cargo build -p remote_server
-          script/check-rust-livekit-macos
 
   linux_tests:
     timeout-minutes: 60
@@ -163,10 +161,8 @@ jobs:
       - name: Run tests
         uses: ./.github/actions/run_tests
 
-      - name: Build other binaries and features
-        run: |
-          cargo build -p zed
-          cargo check -p workspace
+      - name: Build Zed
+        run: cargo build -p zed
 
   build_remote_server:
     timeout-minutes: 60

.github/workflows/deploy_cloudflare.yml

@@ -37,28 +37,28 @@ jobs:
           mdbook build ./docs --dest-dir=../target/deploy/docs/
 
       - name: Deploy Docs
-        uses: cloudflare/wrangler-action@6d58852c35a27e6034745c5d0bc373d739014f7f # v3
+        uses: cloudflare/wrangler-action@05f17c4a695b4d94b57b59997562c6a4624c64e4 # v3
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           command: pages deploy target/deploy --project-name=docs
 
       - name: Deploy Install
-        uses: cloudflare/wrangler-action@6d58852c35a27e6034745c5d0bc373d739014f7f # v3
+        uses: cloudflare/wrangler-action@05f17c4a695b4d94b57b59997562c6a4624c64e4 # v3
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           command: r2 object put -f script/install.sh zed-open-source-website-assets/install.sh
 
       - name: Deploy Docs Workers
-        uses: cloudflare/wrangler-action@6d58852c35a27e6034745c5d0bc373d739014f7f # v3
+        uses: cloudflare/wrangler-action@05f17c4a695b4d94b57b59997562c6a4624c64e4 # v3
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           command: deploy .cloudflare/docs-proxy/src/worker.js
 
       - name: Deploy Install Workers
-        uses: cloudflare/wrangler-action@6d58852c35a27e6034745c5d0bc373d739014f7f # v3
+        uses: cloudflare/wrangler-action@05f17c4a695b4d94b57b59997562c6a4624c64e4 # v3
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}

Cargo.toml

@@ -141,7 +141,6 @@ members = [
     "crates/worktree",
     "crates/zed",
     "crates/zed_actions",
-    "crates/zeta",
 
     #
     # Extensions
@@ -326,7 +325,6 @@ workspace = { path = "crates/workspace" }
 worktree = { path = "crates/worktree" }
 zed = { path = "crates/zed" }
 zed_actions = { path = "crates/zed_actions" }
-zeta = { path = "crates/zeta" }
 
 #
 # External crates
@@ -360,6 +358,7 @@ cargo_metadata = "0.19"
 cargo_toml = "0.20"
 chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4.4", features = ["derive"] }
+clickhouse = "0.11.6"
 cocoa = "0.26"
 cocoa-foundation = "0.2.0"
 convert_case = "0.6.0"
@@ -442,6 +441,7 @@ rustc-demangle = "0.1.23"
 rust-embed = { version = "8.4", features = ["include-exclude"] }
 rustls = "0.21.12"
 rustls-native-certs = "0.8.0"
+scap = { version = "0.0.7" }
 schemars = { version = "0.8", features = ["impl_json_schema"] }
 semver = "1.0"
 serde = { version = "1.0", features = ["derive", "rc"] }
@@ -507,7 +507,7 @@ unindent = "0.1.7"
 unicode-segmentation = "1.10"
 unicode-script = "0.5.7"
 url = "2.2"
-uuid = { version = "1.1.2", features = ["v4", "v5", "v7", "serde"] }
+uuid = { version = "1.1.2", features = ["v4", "v5", "serde"] }
 wasmparser = "0.215"
 wasm-encoder = "0.215"
 wasmtime = { version = "24", default-features = false, features = [
@@ -682,7 +682,6 @@ new_ret_no_self = { level = "allow" }
 # We have a few `next` functions that differ in lifetimes
 # compared to Iterator::next. Yet, clippy complains about those.
 should_implement_trait = { level = "allow" }
-let_underscore_future = "allow"
 
 [workspace.metadata.cargo-machete]
 ignored = ["bindgen", "cbindgen", "prost_build", "serde"]

assets/icons/eraser.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-eraser">
-    <path d="m7 21-4.3-4.3c-1-1-1-2.5 0-3.4l9.6-9.6c1-1 2.5-1 3.4 0l5.6 5.6c1 1 1 2.5 0 3.4L13 21"/>
-    <path d="M22 21H7"/><path d="m5 11 9 9"/>
-</svg>

assets/icons/info.svg

@@ -1,12 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2131_1193)">
-<circle cx="7" cy="7" r="6" stroke="black" stroke-width="1.5"/>
-<path d="M6 10H7M8 10H7M7 10V7.1C7 7.04477 6.95523 7 6.9 7H6" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<circle cx="7" cy="4.5" r="1" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_2131_1193">
-<rect width="14" height="14" fill="white"/>
-</clipPath>
-</defs>
-</svg>

assets/icons/triangle.svg

@@ -1,3 +1,3 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.5 3L3 12H14L8.5 3Z" fill="black"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M8 4L4 12H12L8 4Z" fill="currentColor"/>
 </svg>

assets/icons/x.svg

@@ -1,3 +1,3 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 4.5L12 11.5M12 4.5L5 11.5" stroke="black" stroke-width="2" stroke-linecap="round"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M4 4L12 12M12 4L4 12" stroke="currentColor" stroke-width="2"/>
 </svg>

assets/keymaps/default-linux.json

@@ -108,9 +108,7 @@
       "ctrl-'": "editor::ToggleHunkDiff",
       "ctrl-\"": "editor::ExpandAllHunkDiffs",
       "ctrl-i": "editor::ShowSignatureHelp",
-      "alt-g b": "editor::ToggleGitBlame",
-      "menu": "editor::OpenContextMenu",
-      "shift-f10": "editor::OpenContextMenu"
+      "alt-g b": "editor::ToggleGitBlame"
     }
   },
   {

assets/keymaps/default-macos.json

@@ -1,7 +1,6 @@
 [
   // Standard macOS bindings
   {
-    "use_key_equivalents": true,
     "bindings": {
       "up": "menu::SelectPrev",
       "shift-tab": "menu::SelectPrev",
@@ -41,7 +40,6 @@
   },
   {
     "context": "Editor",
-    "use_key_equivalents": true,
     "bindings": {
       "escape": "editor::Cancel",
       "backspace": "editor::Backspace",
@@ -133,7 +131,6 @@
   },
   {
     "context": "Editor && mode == full",
-    "use_key_equivalents": true,
     "bindings": {
       "enter": "editor::Newline",
       "shift-enter": "editor::Newline",
@@ -151,23 +148,20 @@
   },
   {
     "context": "Editor && mode == full && inline_completion",
-    "use_key_equivalents": true,
     "bindings": {
-      "alt-tab": "editor::NextInlineCompletion",
-      "alt-shift-tab": "editor::PreviousInlineCompletion",
+      "alt-]": "editor::NextInlineCompletion",
+      "alt-[": "editor::PreviousInlineCompletion",
       "ctrl-right": "editor::AcceptPartialInlineCompletion"
     }
   },
   {
     "context": "Editor && !inline_completion",
-    "use_key_equivalents": true,
     "bindings": {
-      "alt-tab": "editor::ShowInlineCompletion"
+      "alt-\\": "editor::ShowInlineCompletion"
     }
   },
   {
     "context": "Editor && mode == auto_height",
-    "use_key_equivalents": true,
     "bindings": {
       "ctrl-enter": "editor::Newline",
       "shift-enter": "editor::Newline",
@@ -176,14 +170,12 @@
   },
   {
     "context": "Markdown",
-    "use_key_equivalents": true,
     "bindings": {
       "cmd-c": "markdown::Copy"
     }
   },
   {
     "context": "Editor && jupyter && !ContextEditor",
-    "use_key_equivalents": true,
     "bindings": {
       "ctrl-shift-enter": "repl::Run",
       "ctrl-alt-enter": "repl::RunInPlace"
@@ -191,7 +183,6 @@
   },
   {
     "context": "AssistantPanel",
-    "use_key_equivalents": true,
     "bindings": {
       "cmd-k c": "assistant::CopyCode",
       "cmd-g": "search::SelectNextMatch",
@@ -204,7 +195,6 @@
   },
   {
     "context": "ContextEditor > Editor",
-    "use_key_equivalents": true,
     "bindings": {
       "cmd-enter": "assistant::Assist",
       "cmd-shift-enter": "assistant::Edit",
@@ -219,7 +209,6 @@
   },
   {
     "context": "AssistantPanel2",
-    "use_key_equivalents": true,
     "bindings": {
       "cmd-n": "assistant2::NewThread",
       "cmd-shift-h": "assistant2::OpenHistory"
@@ -227,14 +216,12 @@
   },
   {
     "context": "MessageEditor > Editor",
-    "use_key_equivalents": true,
     "bindings": {
-      "enter": "assistant2::Chat"
+      "cmd-enter": "assistant2::Chat"
     }
   },
   {
     "context": "PromptLibrary",
-    "use_key_equivalents": true,
     "bindings": {
       "cmd-n": "prompt_library::NewPrompt",
       "cmd-shift-s": "prompt_library::ToggleDefaultPrompt",
@@ -243,7 +230,6 @@
   },
   {
     "context": "BufferSearchBar",
-    "use_key_equivalents": true,
     "bindings": {
       "escape": "buffer_search::Dismiss",
       "tab": "buffer_search::FocusEditor",
@@ -257,7 +243,6 @@
   },
   {
     "context": "BufferSearchBar && in_replace > Editor",
-    "use_key_equivalents": true,
     "bindings": {
       "enter": "search::ReplaceNext",
       "cmd-enter": "search::ReplaceAll"
@@ -265,7 +250,6 @@
   },
   {
     "context": "BufferSearchBar && !in_replace > Editor",
-    "use_key_equivalents": true,
     "bindings": {
       "up": "search::PreviousHistoryQuery",
       "down": "search::NextHistoryQuery"
@@ -273,7 +257,6 @@
   },
   {
     "context": "ProjectSearchBar",
-    "use_key_equivalents": true,
     "bindings": {
       "escape": "project_search::ToggleFocus",
       "cmd-shift-j": "project_search::ToggleFilters",
@@ -285,7 +268,6 @@
   },
   {
     "context": "ProjectSearchBar > Editor",
-    "use_key_equivalents": true,
     "bindings": {
       "up": "search::PreviousHistoryQuery",
       "down": "search::NextHistoryQuery"
@@ -293,7 +275,6 @@
   },
   {
     "context": "ProjectSearchBar && in_replace > Editor",
-    "use_key_equivalents": true,
     "bindings": {
       "enter": "search::ReplaceNext",
       "cmd-enter": "search::ReplaceAll"
@@ -301,7 +282,6 @@
   },
   {
     "context": "ProjectSearchView",
-    "use_key_equivalents": true,
     "bindings": {
       "escape": "project_search::ToggleFocus",
       "cmd-shift-j": "project_search::ToggleFilters",
@@ -312,7 +292,6 @@
   },
   {
     "context": "Pane",
-    "use_key_equivalents": true,
     "bindings": {
       "cmd-{": "pane::ActivatePrevItem",
       "cmd-}": "pane::ActivateNextItem",
@@ -341,7 +320,6 @@
   // Bindings from VS Code
   {
     "context": "Editor",
-    "use_key_equivalents": true,
     "bindings": {
       "cmd-[": "editor::Outdent",
       "cmd-]": "editor::Indent",
@@ -405,7 +383,6 @@
   },
   {
     "context": "Editor && mode == full",
-    "use_key_equivalents": true,
     "bindings": {
       "cmd-shift-o": "outline::Toggle",
       "ctrl-g": "go_to_line::Toggle"
@@ -413,7 +390,6 @@
   },
   {
     "context": "Pane",
-    "use_key_equivalents": true,
     "bindings": {
       "ctrl-1": ["pane::ActivateItem", 0],
       "ctrl-2": ["pane::ActivateItem", 1],
@@ -433,7 +409,6 @@
   },
   {
     "context": "Workspace",
-    "use_key_equivalents": true,
     "bindings": {
       // Change the default action on `menu::Confirm` by setting the parameter
       // "alt-cmd-o": ["projects::OpenRecent", {"create_new_window": true }],
@@ -489,7 +464,6 @@
   },
   {
     "context": "Workspace && !Terminal",
-    "use_key_equivalents": true,
     "bindings": {
       "cmd-shift-r": "task::Spawn",
       "cmd-alt-r": "task::Rerun",
@@ -500,7 +474,6 @@
   // Bindings from Sublime Text
   {
     "context": "Editor",
-    "use_key_equivalents": true,
     "bindings": {
       "ctrl-j": "editor::JoinLines",
       "ctrl-alt-backspace": "editor::DeleteToPreviousSubwordStart",
@@ -520,7 +493,6 @@
   // Bindings from Atom
   {
     "context": "Pane",
-    "use_key_equivalents": true,
     "bindings": {
       "cmd-k up": "pane::SplitUp",
       "cmd-k down": "pane::SplitDown",
@@ -531,14 +503,12 @@
   // Bindings that should be unified with bindings for more general actions
   {
     "context": "Editor && renaming",
-    "use_key_equivalents": true,
     "bindings": {
       "enter": "editor::ConfirmRename"
     }
   },
   {
     "context": "Editor && showing_completions",
-    "use_key_equivalents": true,
     "bindings": {
       "enter": "editor::ConfirmCompletion",
       "tab": "editor::ComposeCompletion"
@@ -546,21 +516,18 @@
   },
   {
     "context": "Editor && inline_completion && !showing_completions",
-    "use_key_equivalents": true,
     "bindings": {
       "tab": "editor::AcceptInlineCompletion"
     }
   },
   {
     "context": "Editor && showing_code_actions",
-    "use_key_equivalents": true,
     "bindings": {
       "enter": "editor::ConfirmCodeAction"
     }
   },
   {
     "context": "Editor && (showing_code_actions || showing_completions)",
-    "use_key_equivalents": true,
     "bindings": {
       "up": "editor::ContextMenuPrev",
       "ctrl-p": "editor::ContextMenuPrev",
@@ -572,7 +539,6 @@
   },
   // Custom bindings
   {
-    "use_key_equivalents": true,
     "bindings": {
       "ctrl-alt-cmd-f": "workspace::FollowNextCollaborator",
       // TODO: Move this to a dock open action
@@ -583,7 +549,6 @@
   },
   {
     "context": "Editor && mode == full",
-    "use_key_equivalents": true,
     "bindings": {
       "alt-enter": "editor::OpenExcerpts",
       "shift-enter": "editor::ExpandExcerpts",
@@ -595,7 +560,6 @@
   },
   {
     "context": "ProposedChangesEditor",
-    "use_key_equivalents": true,
     "bindings": {
       "cmd-shift-y": "editor::ApplyDiffHunk",
       "cmd-shift-a": "editor::ApplyAllDiffHunks"
@@ -603,7 +567,6 @@
   },
   {
     "context": "PromptEditor",
-    "use_key_equivalents": true,
     "bindings": {
       "ctrl-[": "assistant::CyclePreviousInlineAssist",
       "ctrl-]": "assistant::CycleNextInlineAssist"
@@ -611,14 +574,12 @@
   },
   {
     "context": "ProjectSearchBar && !in_replace",
-    "use_key_equivalents": true,
     "bindings": {
       "cmd-enter": "project_search::SearchInNew"
     }
   },
   {
     "context": "OutlinePanel && not_editing",
-    "use_key_equivalents": true,
     "bindings": {
       "escape": "menu::Cancel",
       "left": "outline_panel::CollapseSelectedEntry",
@@ -635,7 +596,6 @@
   },
   {
     "context": "ProjectPanel",
-    "use_key_equivalents": true,
     "bindings": {
       "left": "project_panel::CollapseSelectedEntry",
       "right": "project_panel::ExpandSelectedEntry",
@@ -665,14 +625,12 @@
   },
   {
     "context": "ProjectPanel && not_editing",
-    "use_key_equivalents": true,
     "bindings": {
       "space": "project_panel::Open"
     }
   },
   {
     "context": "CollabPanel && not_editing",
-    "use_key_equivalents": true,
     "bindings": {
       "ctrl-backspace": "collab_panel::Remove",
       "space": "menu::Confirm"
@@ -680,21 +638,18 @@
   },
   {
     "context": "(CollabPanel && editing) > Editor",
-    "use_key_equivalents": true,
     "bindings": {
       "space": "collab_panel::InsertSpace"
     }
   },
   {
     "context": "ChannelModal",
-    "use_key_equivalents": true,
     "bindings": {
       "tab": "channel_modal::ToggleMode"
     }
   },
   {
     "context": "Picker > Editor",
-    "use_key_equivalents": true,
     "bindings": {
       "tab": "picker::ConfirmCompletion",
       "alt-enter": ["picker::ConfirmInput", { "secondary": false }],
@@ -703,21 +658,18 @@
   },
   {
     "context": "ChannelModal > Picker > Editor",
-    "use_key_equivalents": true,
     "bindings": {
       "tab": "channel_modal::ToggleMode"
     }
   },
   {
     "context": "FileFinder",
-    "use_key_equivalents": true,
     "bindings": {
       "cmd": "file_finder::ToggleMenu"
     }
   },
   {
     "context": "FileFinder && !menu_open",
-    "use_key_equivalents": true,
     "bindings": {
       "cmd-shift-p": "file_finder::SelectPrev",
       "cmd-j": "pane::SplitDown",
@@ -728,7 +680,6 @@
   },
   {
     "context": "FileFinder && menu_open",
-    "use_key_equivalents": true,
     "bindings": {
       "j": "pane::SplitDown",
       "k": "pane::SplitUp",
@@ -738,7 +689,6 @@
   },
   {
     "context": "TabSwitcher",
-    "use_key_equivalents": true,
     "bindings": {
       "ctrl-up": "menu::SelectPrev",
       "ctrl-down": "menu::SelectNext",
@@ -748,7 +698,6 @@
   },
   {
     "context": "Terminal",
-    "use_key_equivalents": true,
     "bindings": {
       "ctrl-cmd-space": "terminal::ShowCharacterPalette",
       "cmd-c": "terminal::Copy",

assets/keymaps/vim.json

@@ -1,6 +1,7 @@
 [
   {
     "context": "VimControl && !menu",
+    "use_layout_keys": true,
     "bindings": {
       "i": ["vim::PushOperator", { "Object": { "around": false } }],
       "a": ["vim::PushOperator", { "Object": { "around": true } }],
@@ -187,6 +188,7 @@
   },
   {
     "context": "vim_mode == normal",
+    "use_layout_keys": true,
     "bindings": {
       "escape": "editor::Cancel",
       "ctrl-[": "editor::Cancel",
@@ -241,6 +243,7 @@
   },
   {
     "context": "VimControl && VimCount",
+    "use_layout_keys": true,
     "bindings": {
       "0": ["vim::Number", 0],
       ":": "vim::CountCommand"
@@ -248,6 +251,7 @@
   },
   {
     "context": "vim_mode == visual",
+    "use_layout_keys": true,
     "bindings": {
       ":": "vim::VisualCommand",
       "u": "vim::ConvertToLowerCase",
@@ -297,6 +301,7 @@
   },
   {
     "context": "vim_mode == insert",
+    "use_layout_keys": true,
     "bindings": {
       "escape": "vim::NormalBefore",
       "ctrl-c": "vim::NormalBefore",
@@ -326,7 +331,6 @@
     "bindings": {
       "i": "vim::InsertBefore",
       "a": "vim::InsertAfter",
-      "d": "vim::HelixDelete",
       "w": "vim::NextWordStart",
       "e": "vim::NextWordEnd",
       "b": "vim::PreviousWordStart",
@@ -340,6 +344,7 @@
 
   {
     "context": "vim_mode == insert && !(showing_code_actions || showing_completions)",
+    "use_layout_keys": true,
     "bindings": {
       "ctrl-p": "editor::ShowCompletions",
       "ctrl-n": "editor::ShowCompletions"
@@ -347,6 +352,7 @@
   },
   {
     "context": "vim_mode == replace",
+    "use_layout_keys": true,
     "bindings": {
       "escape": "vim::NormalBefore",
       "ctrl-c": "vim::NormalBefore",
@@ -364,6 +370,7 @@
   },
   {
     "context": "vim_mode == waiting",
+    "use_layout_keys": true,
     "bindings": {
       "tab": "vim::Tab",
       "enter": "vim::Enter",
@@ -377,6 +384,7 @@
   },
   {
     "context": "vim_mode == operator",
+    "use_layout_keys": true,
     "bindings": {
       "escape": "vim::ClearOperators",
       "ctrl-c": "vim::ClearOperators",
@@ -386,6 +394,7 @@
   },
   {
     "context": "vim_operator == a || vim_operator == i || vim_operator == cs",
+    "use_layout_keys": true,
     "bindings": {
       "w": "vim::Word",
       "shift-w": ["vim::Word", { "ignorePunctuation": true }],
@@ -416,6 +425,7 @@
   },
   {
     "context": "vim_operator == c",
+    "use_layout_keys": true,
     "bindings": {
       "c": "vim::CurrentLine",
       "d": "editor::Rename", // zed specific
@@ -424,6 +434,7 @@
   },
   {
     "context": "vim_operator == d",
+    "use_layout_keys": true,
     "bindings": {
       "d": "vim::CurrentLine",
       "s": ["vim::PushOperator", "DeleteSurrounds"],
@@ -433,6 +444,7 @@
   },
   {
     "context": "vim_operator == gu",
+    "use_layout_keys": true,
     "bindings": {
       "g u": "vim::CurrentLine",
       "u": "vim::CurrentLine"
@@ -440,6 +452,7 @@
   },
   {
     "context": "vim_operator == gU",
+    "use_layout_keys": true,
     "bindings": {
       "g shift-u": "vim::CurrentLine",
       "shift-u": "vim::CurrentLine"
@@ -447,6 +460,7 @@
   },
   {
     "context": "vim_operator == g~",
+    "use_layout_keys": true,
     "bindings": {
       "g ~": "vim::CurrentLine",
       "~": "vim::CurrentLine"
@@ -454,6 +468,7 @@
   },
   {
     "context": "vim_operator == gq",
+    "use_layout_keys": true,
     "bindings": {
       "g q": "vim::CurrentLine",
       "q": "vim::CurrentLine",
@@ -463,6 +478,7 @@
   },
   {
     "context": "vim_operator == y",
+    "use_layout_keys": true,
     "bindings": {
       "y": "vim::CurrentLine",
       "s": ["vim::PushOperator", { "AddSurrounds": {} }]
@@ -470,36 +486,42 @@
   },
   {
     "context": "vim_operator == ys",
+    "use_layout_keys": true,
     "bindings": {
       "s": "vim::CurrentLine"
     }
   },
   {
     "context": "vim_operator == >",
+    "use_layout_keys": true,
     "bindings": {
       ">": "vim::CurrentLine"
     }
   },
   {
     "context": "vim_operator == <",
+    "use_layout_keys": true,
     "bindings": {
       "<": "vim::CurrentLine"
     }
   },
   {
     "context": "vim_operator == eq",
+    "use_layout_keys": true,
     "bindings": {
       "=": "vim::CurrentLine"
     }
   },
   {
     "context": "vim_operator == gc",
+    "use_layout_keys": true,
     "bindings": {
       "c": "vim::CurrentLine"
     }
   },
   {
     "context": "vim_mode == literal",
+    "use_layout_keys": true,
     "bindings": {
       "ctrl-@": ["vim::Literal", ["ctrl-@", "\u0000"]],
       "ctrl-a": ["vim::Literal", ["ctrl-a", "\u0001"]],
@@ -543,6 +565,7 @@
   },
   {
     "context": "BufferSearchBar && !in_replace",
+    "use_layout_keys": true,
     "bindings": {
       "enter": "vim::SearchSubmit",
       "escape": "buffer_search::Dismiss"
@@ -550,6 +573,7 @@
   },
   {
     "context": "ProjectPanel || CollabPanel || OutlinePanel || ChatPanel || VimControl || EmptyPane || SharedScreen || MarkdownPreview || KeyContextView",
+    "use_layout_keys": true,
     "bindings": {
       // window related commands (ctrl-w X)
       "ctrl-w": null,
@@ -606,6 +630,7 @@
   },
   {
     "context": "EmptyPane || SharedScreen || MarkdownPreview || KeyContextView || Welcome",
+    "use_layout_keys": true,
     "bindings": {
       ":": "command_palette::Toggle",
       "g /": "pane::DeploySearch"
@@ -614,6 +639,7 @@
   {
     // netrw compatibility
     "context": "ProjectPanel && not_editing",
+    "use_layout_keys": true,
     "bindings": {
       ":": "command_palette::Toggle",
       "%": "project_panel::NewFile",
@@ -633,12 +659,6 @@
       "p": "project_panel::Open",
       "x": "project_panel::RevealInFileManager",
       "s": "project_panel::OpenWithSystem",
-      "] c": "project_panel::SelectNextGitEntry",
-      "[ c": "project_panel::SelectPrevGitEntry",
-      "] d": "project_panel::SelectNextDiagnostic",
-      "[ d": "project_panel::SelectPrevDiagnostic",
-      "}": "project_panel::SelectNextDirectory",
-      "{": "project_panel::SelectPrevDirectory",
       "shift-g": "menu::SelectLast",
       "g g": "menu::SelectFirst",
       "-": "project_panel::SelectParent",
@@ -647,6 +667,7 @@
   },
   {
     "context": "OutlinePanel && not_editing",
+    "use_layout_keys": true,
     "bindings": {
       "j": "menu::SelectNext",
       "k": "menu::SelectPrev",

assets/settings/default.json

@@ -150,6 +150,9 @@
   // Whether to display inline and alongside documentation for items in the
   // completions menu
   "show_completion_documentation": true,
+  // The debounce delay before re-querying the language server for completion
+  // documentation when not included in original completion list.
+  "completion_documentation_secondary_query_debounce": 300,
   // Show method signatures in the editor, when inside parentheses.
   "auto_signature_help": false,
   /// Whether to show the signature help after completion or a bracket pair inserted.
@@ -561,23 +564,10 @@
     // What to do after closing the current tab.
     //
     // 1. Activate the tab that was open previously (default)
-    //     "history"
-    // 2. Activate the right neighbour tab if present
-    //     "neighbour"
-    // 3. Activate the left neighbour tab if present
-    //     "left_neighbour"
-    "activate_on_close": "history",
-    /// Which files containing diagnostic errors/warnings to mark in the tabs.
-    /// Diagnostics are only shown when file icons are also active.
-    /// This setting only works when can take the following three values:
-    ///
-    /// 1. Do not mark any files:
-    ///    "off"
-    /// 2. Only mark files with errors:
-    ///    "errors"
-    /// 3. Mark files with errors and warnings:
-    ///    "all"
-    "show_diagnostics": "off"
+    //     "History"
+    // 2. Activate the neighbour tab (prefers the right one, if present)
+    //     "Neighbour"
+    "activate_on_close": "history"
   },
   // Settings related to preview tabs.
   "preview_tabs": {
@@ -684,7 +674,6 @@
     "**/.git",
     "**/.svn",
     "**/.hg",
-    "**/.jj",
     "**/CVS",
     "**/.DS_Store",
     "**/Thumbs.db",

assets/themes/andromeda/andromeda.json

@@ -46,7 +46,7 @@
         "tab.active_background": "#1e2025ff",
         "search.match_background": "#11a79366",
         "panel.background": "#21242bff",
-        "panel.focused_border": "#10a793ff",
+        "panel.focused_border": null,
         "pane.focused_border": null,
         "scrollbar.thumb.background": "#f7f7f84c",
         "scrollbar.thumb.hover_background": "#252931ff",

assets/themes/atelier/atelier.json

@@ -46,7 +46,7 @@
         "tab.active_background": "#19171cff",
         "search.match_background": "#576dda66",
         "panel.background": "#221f26ff",
-        "panel.focused_border": "#566ddaff",
+        "panel.focused_border": null,
         "pane.focused_border": null,
         "scrollbar.thumb.background": "#efecf44c",
         "scrollbar.thumb.hover_background": "#332f38ff",
@@ -431,7 +431,7 @@
         "tab.active_background": "#efecf4ff",
         "search.match_background": "#586dda66",
         "panel.background": "#e6e3ebff",
-        "panel.focused_border": "#586cdaff",
+        "panel.focused_border": null,
         "pane.focused_border": null,
         "scrollbar.thumb.background": "#19171c4c",
         "scrollbar.thumb.hover_background": "#cbc8d1ff",

assets/themes/ayu/ayu.json

@@ -46,7 +46,7 @@
         "tab.active_background": "#0d1016ff",
         "search.match_background": "#5ac2fe66",
         "panel.background": "#1f2127ff",
-        "panel.focused_border": "#5ac1feff",
+        "panel.focused_border": null,
         "pane.focused_border": null,
         "scrollbar.thumb.background": "#bfbdb64c",
         "scrollbar.thumb.hover_background": "#2d2f34ff",
@@ -416,7 +416,7 @@
         "tab.active_background": "#fcfcfcff",
         "search.match_background": "#3b9ee566",
         "panel.background": "#ececedff",
-        "panel.focused_border": "#3b9ee5ff",
+        "panel.focused_border": null,
         "pane.focused_border": null,
         "scrollbar.thumb.background": "#5c61664c",
         "scrollbar.thumb.hover_background": "#dfe0e1ff",

assets/themes/gruvbox/gruvbox.json

@@ -55,7 +55,7 @@
         "tab.active_background": "#282828ff",
         "search.match_background": "#83a59866",
         "panel.background": "#3a3735ff",
-        "panel.focused_border": "#83a598ff",
+        "panel.focused_border": null,
         "pane.focused_border": null,
         "scrollbar.thumb.background": "#fbf1c74c",
         "scrollbar.thumb.hover_background": "#494340ff",
@@ -439,7 +439,7 @@
         "tab.active_background": "#1d2021ff",
         "search.match_background": "#83a59866",
         "panel.background": "#393634ff",
-        "panel.focused_border": "#83a598ff",
+        "panel.focused_border": null,
         "pane.focused_border": null,
         "scrollbar.thumb.background": "#fbf1c74c",
         "scrollbar.thumb.hover_background": "#494340ff",

assets/themes/rose_pine/rose_pine.json

@@ -46,7 +46,7 @@
         "tab.active_background": "#191724ff",
         "search.match_background": "#57949f66",
         "panel.background": "#1c1b2aff",
-        "panel.focused_border": "#9bced6ff",
+        "panel.focused_border": null,
         "pane.focused_border": null,
         "scrollbar.thumb.background": "#e0def44c",
         "scrollbar.thumb.hover_background": "#232132ff",
@@ -426,7 +426,7 @@
         "tab.active_background": "#faf4edff",
         "search.match_background": "#9cced766",
         "panel.background": "#fef9f2ff",
-        "panel.focused_border": "#57949fff",
+        "panel.focused_border": null,
         "pane.focused_border": null,
         "scrollbar.thumb.background": "#5752794c",
         "scrollbar.thumb.hover_background": "#e5e0dfff",
@@ -806,7 +806,7 @@
         "tab.active_background": "#232136ff",
         "search.match_background": "#9cced766",
         "panel.background": "#28253cff",
-        "panel.focused_border": "#9bced6ff",
+        "panel.focused_border": null,
         "pane.focused_border": null,
         "scrollbar.thumb.background": "#e0def44c",
         "scrollbar.thumb.hover_background": "#322f48ff",

assets/themes/sandcastle/sandcastle.json

@@ -46,7 +46,7 @@
         "tab.active_background": "#282c33ff",
         "search.match_background": "#528b8b66",
         "panel.background": "#2b3038ff",
-        "panel.focused_border": "#518b8bff",
+        "panel.focused_border": null,
         "pane.focused_border": null,
         "scrollbar.thumb.background": "#fdf4c14c",
         "scrollbar.thumb.hover_background": "#313741ff",

assets/themes/solarized/solarized.json

@@ -46,7 +46,7 @@
         "tab.active_background": "#002a35ff",
         "search.match_background": "#288bd166",
         "panel.background": "#04313bff",
-        "panel.focused_border": "#278ad1ff",
+        "panel.focused_border": null,
         "pane.focused_border": null,
         "scrollbar.thumb.background": "#fdf6e34c",
         "scrollbar.thumb.hover_background": "#053541ff",
@@ -416,7 +416,7 @@
         "tab.active_background": "#fdf6e3ff",
         "search.match_background": "#298bd166",
         "panel.background": "#f3eddaff",
-        "panel.focused_border": "#288bd1ff",
+        "panel.focused_border": null,
         "pane.focused_border": null,
         "scrollbar.thumb.background": "#002a354c",
         "scrollbar.thumb.hover_background": "#dcdacbff",

assets/themes/summercamp/summercamp.json

@@ -46,7 +46,7 @@
         "tab.active_background": "#1b1810ff",
         "search.match_background": "#499bef66",
         "panel.background": "#231f16ff",
-        "panel.focused_border": "#499befff",
+        "panel.focused_border": null,
         "pane.focused_border": null,
         "scrollbar.thumb.background": "#f8f5de4c",
         "scrollbar.thumb.hover_background": "#29251bff",

crates/assistant/Cargo.toml

@@ -90,7 +90,6 @@ util.workspace = true
 uuid.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
-itertools.workspace = true
 
 [dev-dependencies]
 ctor.workspace = true

crates/assistant/src/assistant.rs

@@ -70,8 +70,7 @@ actions!(
         NewContext,
         ToggleModelSelector,
         CycleNextInlineAssist,
-        CyclePreviousInlineAssist,
-        TurboFix
+        CyclePreviousInlineAssist
     ]
 );
 

crates/assistant/src/assistant_panel.rs

@@ -18,7 +18,7 @@ use crate::{
     InsertIntoEditor, InvokedSlashCommandId, InvokedSlashCommandStatus, Message, MessageId,
     MessageMetadata, MessageStatus, NewContext, ParsedSlashCommand, PendingSlashCommandStatus,
     QuoteSelection, RemoteContextMetadata, RequestType, SavedContextMetadata, Split, ToggleFocus,
-    ToggleModelSelector, TurboFix,
+    ToggleModelSelector,
 };
 use anyhow::Result;
 use assistant_slash_command::{SlashCommand, SlashCommandOutputSection};
@@ -47,10 +47,8 @@ use gpui::{
     Task, Transformation, UpdateGlobal, View, WeakModel, WeakView,
 };
 use indexed_docs::IndexedDocsStore;
-use itertools::Itertools;
 use language::{
-    language_settings::SoftWrap, BufferSnapshot, DiagnosticGroup, LanguageRegistry,
-    LspAdapterDelegate, ToOffset,
+    language_settings::SoftWrap, BufferSnapshot, LanguageRegistry, LspAdapterDelegate, ToOffset,
 };
 use language_model::{LanguageModelImage, LanguageModelToolUse};
 use language_model::{
@@ -58,7 +56,6 @@ use language_model::{
     ZED_CLOUD_PROVIDER_ID,
 };
 use language_model_selector::{LanguageModelPickerDelegate, LanguageModelSelector};
-use lsp::LanguageServerId;
 use multi_buffer::MultiBufferRow;
 use picker::{Picker, PickerDelegate};
 use project::lsp_store::LocalLspAdapterDelegate;
@@ -78,7 +75,7 @@ use std::{
     time::Duration,
 };
 use terminal_view::{terminal_panel::TerminalPanel, TerminalView};
-use text::{OffsetRangeExt, SelectionGoal};
+use text::SelectionGoal;
 use ui::{
     prelude::*,
     utils::{format_distance_from_now, DateTimeType},
@@ -118,8 +115,7 @@ pub fn init(cx: &mut AppContext) {
                 .register_action(ContextEditor::insert_dragged_files)
                 .register_action(AssistantPanel::show_configuration)
                 .register_action(AssistantPanel::create_new_context)
-                .register_action(AssistantPanel::restart_context_servers)
-                .register_action(AssistantPanel::turbo_fix);
+                .register_action(AssistantPanel::restart_context_servers);
         },
     )
     .detach();
@@ -153,7 +149,6 @@ pub struct AssistantPanel {
     configuration_subscription: Option<Subscription>,
     client_status: Option<client::Status>,
     watch_client_status: Option<Task<()>>,
-    turbo_fix_task: Option<Task<()>>,
     show_zed_ai_notice: bool,
 }
 
@@ -543,7 +538,6 @@ impl AssistantPanel {
             configuration_subscription: None,
             client_status: None,
             watch_client_status: Some(watch_client_status),
-            turbo_fix_task: None,
             show_zed_ai_notice: false,
         };
         this.new_context(cx);
@@ -1337,98 +1331,6 @@ impl AssistantPanel {
                 });
         });
     }
-
-    fn turbo_fix(workspace: &mut Workspace, _: &TurboFix, cx: &mut ViewContext<Workspace>) {
-        let Some(assistant_panel) = workspace.panel::<AssistantPanel>(cx) else {
-            return;
-        };
-
-        // Snapshots of all buffers that have errors.
-        let buffer_snapshots = assistant_panel.model.read_with(cx, |assistant_panel, cx| {
-            assistant_panel.project.read_with(cx, |project, cx| {
-                let lsp_store = project.lsp_store();
-                let paths_that_have_errors = lsp_store.read_with(cx, |lsp_store, cx| {
-                    lsp_store
-                        .diagnostic_summaries(false, cx)
-                        .filter(|(_, _, summary)| summary.error_count > 0)
-                        .map(|(path, _, _)| path)
-                        .sorted()
-                        .dedup()
-                });
-
-                paths_that_have_errors
-                    .filter_map(|path| {
-                        project
-                            .buffer_store()
-                            .read_with(cx, |buffer_store, cx| buffer_store.get_by_path(&path, cx))
-                            .map(|buffer| (path, buffer))
-                    })
-                    .map(|(path, buffer)| {
-                        (path, buffer.read_with(cx, |buffer, _| buffer.snapshot()))
-                    })
-                    .collect::<Vec<_>>()
-            })
-        });
-
-        let task = cx.spawn(move |_this, _cx| async {
-            for (path, snapshot) in buffer_snapshots {
-                let mut groups = snapshot
-                    .diagnostic_groups(None)
-                    .into_iter()
-                    .flat_map(|(language_server_id, group)| {
-                        let entry = &group.entries[group.primary_ix];
-                        let range = entry.range.clone();
-                        // TODO: instead move up to statement level orso.
-                        let Some(expanded_range) = snapshot.range_for_syntax_ancestor(range) else {
-                            log::error!(
-                                "Turbo-fix skipping diagnostic due to no TreeSitter node:\n{:?}",
-                                group
-                            );
-                            return None;
-                        };
-                        Some((expanded_range, language_server_id, group))
-                    })
-                    .collect::<Vec<_>>();
-                groups.sort_by_key(|(ancestor_range, _, _)| ancestor_range.start);
-
-                #[derive(Debug)]
-                struct Chunk {
-                    range: Range<Point>,
-                    entry_groups: Vec<(LanguageServerId, DiagnosticGroup<text::Anchor>)>,
-                }
-
-                let mut chunks = Vec::new();
-                let mut chunk_accumulator: Option<Chunk> = None;
-                for (range, language_server_id, group) in groups {
-                    let range = range.to_point(&snapshot);
-                    if let Some(mut chunk) = chunk_accumulator.take() {
-                        if range.start.row - 1 <= range.end.row {
-                            chunk.range = cmp::min(chunk.range.start, range.start)
-                                ..cmp::max(chunk.range.end, range.end);
-                            chunk.entry_groups.push((language_server_id, group));
-                            chunk_accumulator.replace(chunk);
-                            continue;
-                        } else {
-                            chunks.push(chunk);
-                        }
-                    }
-                    chunk_accumulator = Some(Chunk {
-                        range,
-                        entry_groups: vec![(language_server_id, group)],
-                    });
-                }
-
-                log::error!("TurboFix chunks for {:?}:\n{:?}", path, chunks);
-
-                // TODO: 1 LLM call per chunk and apply delta directly to buffer.
-            }
-        });
-
-        // TODO: should take() when the task is done.
-        assistant_panel.update(cx, |assistant_panel, _cx| {
-            assistant_panel.turbo_fix_task = Some(task);
-        });
-    }
 }
 
 impl Render for AssistantPanel {

crates/assistant2/Cargo.toml

@@ -15,7 +15,6 @@ doctest = false
 [dependencies]
 anyhow.workspace = true
 assistant_tool.workspace = true
-chrono.workspace = true
 client.workspace = true
 collections.workspace = true
 command_palette_hooks.workspace = true
@@ -30,7 +29,6 @@ language_model_selector.workspace = true
 language_models.workspace = true
 log.workspace = true
 markdown.workspace = true
-picker.workspace = true
 project.workspace = true
 proto.workspace = true
 serde.workspace = true
@@ -38,10 +36,6 @@ serde_json.workspace = true
 settings.workspace = true
 smol.workspace = true
 theme.workspace = true
-time.workspace = true
-time_format.workspace = true
 ui.workspace = true
-unindent.workspace = true
 util.workspace = true
-uuid.workspace = true
 workspace.workspace = true

crates/assistant2/src/active_thread.rs

@@ -1,254 +0,0 @@
-use std::sync::Arc;
-
-use assistant_tool::ToolWorkingSet;
-use collections::HashMap;
-use gpui::{
-    list, AnyElement, AppContext, Empty, ListAlignment, ListState, Model, StyleRefinement,
-    Subscription, TextStyleRefinement, View, WeakView,
-};
-use language::LanguageRegistry;
-use language_model::Role;
-use markdown::{Markdown, MarkdownStyle};
-use settings::Settings as _;
-use theme::ThemeSettings;
-use ui::prelude::*;
-use workspace::Workspace;
-
-use crate::thread::{MessageId, Thread, ThreadError, ThreadEvent};
-use crate::ui::ContextPill;
-
-pub struct ActiveThread {
-    workspace: WeakView<Workspace>,
-    language_registry: Arc<LanguageRegistry>,
-    tools: Arc<ToolWorkingSet>,
-    thread: Model<Thread>,
-    messages: Vec<MessageId>,
-    list_state: ListState,
-    rendered_messages_by_id: HashMap<MessageId, View<Markdown>>,
-    last_error: Option<ThreadError>,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl ActiveThread {
-    pub fn new(
-        thread: Model<Thread>,
-        workspace: WeakView<Workspace>,
-        language_registry: Arc<LanguageRegistry>,
-        tools: Arc<ToolWorkingSet>,
-        cx: &mut ViewContext<Self>,
-    ) -> Self {
-        let subscriptions = vec![
-            cx.observe(&thread, |_, _, cx| cx.notify()),
-            cx.subscribe(&thread, Self::handle_thread_event),
-        ];
-
-        let mut this = Self {
-            workspace,
-            language_registry,
-            tools,
-            thread: thread.clone(),
-            messages: Vec::new(),
-            rendered_messages_by_id: HashMap::default(),
-            list_state: ListState::new(0, ListAlignment::Bottom, px(1024.), {
-                let this = cx.view().downgrade();
-                move |ix, cx: &mut WindowContext| {
-                    this.update(cx, |this, cx| this.render_message(ix, cx))
-                        .unwrap()
-                }
-            }),
-            last_error: None,
-            _subscriptions: subscriptions,
-        };
-
-        for message in thread.read(cx).messages().cloned().collect::<Vec<_>>() {
-            this.push_message(&message.id, message.text.clone(), cx);
-        }
-
-        this
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.messages.is_empty()
-    }
-
-    pub fn summary(&self, cx: &AppContext) -> Option<SharedString> {
-        self.thread.read(cx).summary()
-    }
-
-    pub fn last_error(&self) -> Option<ThreadError> {
-        self.last_error.clone()
-    }
-
-    pub fn clear_last_error(&mut self) {
-        self.last_error.take();
-    }
-
-    fn push_message(&mut self, id: &MessageId, text: String, cx: &mut ViewContext<Self>) {
-        let old_len = self.messages.len();
-        self.messages.push(*id);
-        self.list_state.splice(old_len..old_len, 1);
-
-        let theme_settings = ThemeSettings::get_global(cx);
-        let ui_font_size = TextSize::Default.rems(cx);
-        let buffer_font_size = theme_settings.buffer_font_size;
-
-        let mut text_style = cx.text_style();
-        text_style.refine(&TextStyleRefinement {
-            font_family: Some(theme_settings.ui_font.family.clone()),
-            font_size: Some(ui_font_size.into()),
-            color: Some(cx.theme().colors().text),
-            ..Default::default()
-        });
-
-        let markdown_style = MarkdownStyle {
-            base_text_style: text_style,
-            syntax: cx.theme().syntax().clone(),
-            selection_background_color: cx.theme().players().local().selection,
-            code_block: StyleRefinement {
-                text: Some(TextStyleRefinement {
-                    font_family: Some(theme_settings.buffer_font.family.clone()),
-                    font_size: Some(buffer_font_size.into()),
-                    ..Default::default()
-                }),
-                ..Default::default()
-            },
-            inline_code: TextStyleRefinement {
-                font_family: Some(theme_settings.buffer_font.family.clone()),
-                font_size: Some(ui_font_size.into()),
-                background_color: Some(cx.theme().colors().editor_background),
-                ..Default::default()
-            },
-            ..Default::default()
-        };
-
-        let markdown = cx.new_view(|cx| {
-            Markdown::new(
-                text,
-                markdown_style,
-                Some(self.language_registry.clone()),
-                None,
-                cx,
-            )
-        });
-        self.rendered_messages_by_id.insert(*id, markdown);
-    }
-
-    fn handle_thread_event(
-        &mut self,
-        _: Model<Thread>,
-        event: &ThreadEvent,
-        cx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            ThreadEvent::ShowError(error) => {
-                self.last_error = Some(error.clone());
-            }
-            ThreadEvent::StreamedCompletion => {}
-            ThreadEvent::SummaryChanged => {}
-            ThreadEvent::StreamedAssistantText(message_id, text) => {
-                if let Some(markdown) = self.rendered_messages_by_id.get_mut(&message_id) {
-                    markdown.update(cx, |markdown, cx| {
-                        markdown.append(text, cx);
-                    });
-                }
-            }
-            ThreadEvent::MessageAdded(message_id) => {
-                if let Some(message_text) = self
-                    .thread
-                    .read(cx)
-                    .message(*message_id)
-                    .map(|message| message.text.clone())
-                {
-                    self.push_message(message_id, message_text, cx);
-                }
-
-                cx.notify();
-            }
-            ThreadEvent::UsePendingTools => {
-                let pending_tool_uses = self
-                    .thread
-                    .read(cx)
-                    .pending_tool_uses()
-                    .into_iter()
-                    .filter(|tool_use| tool_use.status.is_idle())
-                    .cloned()
-                    .collect::<Vec<_>>();
-
-                for tool_use in pending_tool_uses {
-                    if let Some(tool) = self.tools.tool(&tool_use.name, cx) {
-                        let task = tool.run(tool_use.input, self.workspace.clone(), cx);
-
-                        self.thread.update(cx, |thread, cx| {
-                            thread.insert_tool_output(
-                                tool_use.assistant_message_id,
-                                tool_use.id.clone(),
-                                task,
-                                cx,
-                            );
-                        });
-                    }
-                }
-            }
-            ThreadEvent::ToolFinished { .. } => {}
-        }
-    }
-
-    fn render_message(&self, ix: usize, cx: &mut ViewContext<Self>) -> AnyElement {
-        let message_id = self.messages[ix];
-        let Some(message) = self.thread.read(cx).message(message_id) else {
-            return Empty.into_any();
-        };
-
-        let Some(markdown) = self.rendered_messages_by_id.get(&message_id) else {
-            return Empty.into_any();
-        };
-
-        let context = self.thread.read(cx).context_for_message(message_id);
-
-        let (role_icon, role_name) = match message.role {
-            Role::User => (IconName::Person, "You"),
-            Role::Assistant => (IconName::ZedAssistant, "Assistant"),
-            Role::System => (IconName::Settings, "System"),
-        };
-
-        div()
-            .id(("message-container", ix))
-            .p_2()
-            .child(
-                v_flex()
-                    .border_1()
-                    .border_color(cx.theme().colors().border_variant)
-                    .rounded_md()
-                    .child(
-                        h_flex()
-                            .justify_between()
-                            .p_1p5()
-                            .border_b_1()
-                            .border_color(cx.theme().colors().border_variant)
-                            .child(
-                                h_flex()
-                                    .gap_2()
-                                    .child(Icon::new(role_icon).size(IconSize::Small))
-                                    .child(Label::new(role_name).size(LabelSize::Small)),
-                            ),
-                    )
-                    .child(v_flex().p_1p5().text_ui(cx).child(markdown.clone()))
-                    .when_some(context, |parent, context| {
-                        parent.child(
-                            h_flex().flex_wrap().gap_2().p_1p5().children(
-                                context
-                                    .iter()
-                                    .map(|context| ContextPill::new(context.clone())),
-                            ),
-                        )
-                    }),
-            )
-            .into_any()
-    }
-}
-
-impl Render for ActiveThread {
-    fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
-        list(self.list_state.clone()).flex_1()
-    }
-}

crates/assistant2/src/assistant.rs

@@ -1,12 +1,7 @@
-mod active_thread;
 mod assistant_panel;
-mod context;
-mod context_picker;
 mod message_editor;
 mod thread;
-mod thread_history;
 mod thread_store;
-mod ui;
 
 use command_palette_hooks::CommandPaletteFilter;
 use feature_flags::{Assistant2FeatureFlag, FeatureFlagAppExt};

crates/assistant2/src/assistant_panel.rs

@@ -3,23 +3,27 @@ use std::sync::Arc;
 use anyhow::Result;
 use assistant_tool::ToolWorkingSet;
 use client::zed_urls;
+use collections::HashMap;
 use gpui::{
-    prelude::*, px, svg, Action, AnyElement, AppContext, AsyncWindowContext, EventEmitter,
-    FocusHandle, FocusableView, FontWeight, Model, Pixels, Task, View, ViewContext, WeakView,
+    list, prelude::*, px, svg, Action, AnyElement, AppContext, AsyncWindowContext, Empty,
+    EventEmitter, FocusHandle, FocusableView, FontWeight, ListAlignment, ListState, Model, Pixels,
+    StyleRefinement, Subscription, Task, TextStyleRefinement, View, ViewContext, WeakView,
     WindowContext,
 };
 use language::LanguageRegistry;
-use time::UtcOffset;
-use ui::{prelude::*, Divider, IconButtonShape, KeyBinding, Tab, Tooltip};
+use language_model::{LanguageModelRegistry, Role};
+use language_model_selector::LanguageModelSelector;
+use markdown::{Markdown, MarkdownStyle};
+use settings::Settings;
+use theme::ThemeSettings;
+use ui::{prelude::*, ButtonLike, Divider, IconButtonShape, KeyBinding, ListItem, Tab, Tooltip};
 use workspace::dock::{DockPosition, Panel, PanelEvent};
 use workspace::Workspace;
 
-use crate::active_thread::ActiveThread;
 use crate::message_editor::MessageEditor;
-use crate::thread::{ThreadError, ThreadId};
-use crate::thread_history::{PastThread, ThreadHistory};
+use crate::thread::{MessageId, Thread, ThreadError, ThreadEvent};
 use crate::thread_store::ThreadStore;
-use crate::{NewThread, OpenHistory, ToggleFocus};
+use crate::{NewThread, OpenHistory, ToggleFocus, ToggleModelSelector};
 
 pub fn init(cx: &mut AppContext) {
     cx.observe_new_views(
@@ -32,21 +36,19 @@ pub fn init(cx: &mut AppContext) {
     .detach();
 }
 
-enum ActiveView {
-    Thread,
-    History,
-}
-
 pub struct AssistantPanel {
     workspace: WeakView<Workspace>,
     language_registry: Arc<LanguageRegistry>,
+    #[allow(unused)]
     thread_store: Model<ThreadStore>,
-    thread: View<ActiveThread>,
+    thread: Model<Thread>,
+    thread_messages: Vec<MessageId>,
+    rendered_messages_by_id: HashMap<MessageId, View<Markdown>>,
+    thread_list_state: ListState,
     message_editor: View<MessageEditor>,
     tools: Arc<ToolWorkingSet>,
-    local_timezone: UtcOffset,
-    active_view: ActiveView,
-    history: View<ThreadHistory>,
+    last_error: Option<ThreadError>,
+    _subscriptions: Vec<Subscription>,
 }
 
 impl AssistantPanel {
@@ -75,92 +77,160 @@ impl AssistantPanel {
         tools: Arc<ToolWorkingSet>,
         cx: &mut ViewContext<Self>,
     ) -> Self {
-        let thread = thread_store.update(cx, |this, cx| this.create_thread(cx));
-        let language_registry = workspace.project().read(cx).languages().clone();
-        let workspace = workspace.weak_handle();
-        let weak_self = cx.view().downgrade();
+        let thread = cx.new_model(|cx| Thread::new(tools.clone(), cx));
+        let subscriptions = vec![
+            cx.observe(&thread, |_, _, cx| cx.notify()),
+            cx.subscribe(&thread, Self::handle_thread_event),
+        ];
 
         Self {
-            active_view: ActiveView::Thread,
-            workspace: workspace.clone(),
-            language_registry: language_registry.clone(),
-            thread_store: thread_store.clone(),
-            thread: cx.new_view(|cx| {
-                ActiveThread::new(
-                    thread.clone(),
-                    workspace,
-                    language_registry,
-                    tools.clone(),
-                    cx,
-                )
+            workspace: workspace.weak_handle(),
+            language_registry: workspace.project().read(cx).languages().clone(),
+            thread_store,
+            thread: thread.clone(),
+            thread_messages: Vec::new(),
+            rendered_messages_by_id: HashMap::default(),
+            thread_list_state: ListState::new(0, ListAlignment::Bottom, px(1024.), {
+                let this = cx.view().downgrade();
+                move |ix, cx: &mut WindowContext| {
+                    this.update(cx, |this, cx| this.render_message(ix, cx))
+                        .unwrap()
+                }
             }),
-            message_editor: cx.new_view(|cx| MessageEditor::new(thread.clone(), cx)),
+            message_editor: cx.new_view(|cx| MessageEditor::new(thread, cx)),
             tools,
-            local_timezone: UtcOffset::from_whole_seconds(
-                chrono::Local::now().offset().local_minus_utc(),
-            )
-            .unwrap(),
-            history: cx.new_view(|cx| ThreadHistory::new(weak_self, thread_store, cx)),
+            last_error: None,
+            _subscriptions: subscriptions,
         }
     }
 
-    pub(crate) fn local_timezone(&self) -> UtcOffset {
-        self.local_timezone
-    }
-
     fn new_thread(&mut self, cx: &mut ViewContext<Self>) {
-        let thread = self
-            .thread_store
-            .update(cx, |this, cx| this.create_thread(cx));
+        let tools = self.thread.read(cx).tools().clone();
+        let thread = cx.new_model(|cx| Thread::new(tools, cx));
+        let subscriptions = vec![
+            cx.observe(&thread, |_, _, cx| cx.notify()),
+            cx.subscribe(&thread, Self::handle_thread_event),
+        ];
+
+        self.message_editor = cx.new_view(|cx| MessageEditor::new(thread.clone(), cx));
+        self.thread = thread;
+        self.thread_messages.clear();
+        self.thread_list_state.reset(0);
+        self.rendered_messages_by_id.clear();
+        self._subscriptions = subscriptions;
 
-        self.active_view = ActiveView::Thread;
-        self.thread = cx.new_view(|cx| {
-            ActiveThread::new(
-                thread.clone(),
-                self.workspace.clone(),
-                self.language_registry.clone(),
-                self.tools.clone(),
-                cx,
-            )
-        });
-        self.message_editor = cx.new_view(|cx| MessageEditor::new(thread, cx));
         self.message_editor.focus_handle(cx).focus(cx);
     }
 
-    pub(crate) fn open_thread(&mut self, thread_id: &ThreadId, cx: &mut ViewContext<Self>) {
-        let Some(thread) = self
-            .thread_store
-            .update(cx, |this, cx| this.open_thread(thread_id, cx))
-        else {
-            return;
-        };
+    fn handle_thread_event(
+        &mut self,
+        _: Model<Thread>,
+        event: &ThreadEvent,
+        cx: &mut ViewContext<Self>,
+    ) {
+        match event {
+            ThreadEvent::ShowError(error) => {
+                self.last_error = Some(error.clone());
+            }
+            ThreadEvent::StreamedCompletion => {}
+            ThreadEvent::StreamedAssistantText(message_id, text) => {
+                if let Some(markdown) = self.rendered_messages_by_id.get_mut(&message_id) {
+                    markdown.update(cx, |markdown, cx| {
+                        markdown.append(text, cx);
+                    });
+                }
+            }
+            ThreadEvent::MessageAdded(message_id) => {
+                let old_len = self.thread_messages.len();
+                self.thread_messages.push(*message_id);
+                self.thread_list_state.splice(old_len..old_len, 1);
 
-        self.active_view = ActiveView::Thread;
-        self.thread = cx.new_view(|cx| {
-            ActiveThread::new(
-                thread.clone(),
-                self.workspace.clone(),
-                self.language_registry.clone(),
-                self.tools.clone(),
-                cx,
-            )
-        });
-        self.message_editor = cx.new_view(|cx| MessageEditor::new(thread, cx));
-        self.message_editor.focus_handle(cx).focus(cx);
-    }
+                if let Some(message_text) = self
+                    .thread
+                    .read(cx)
+                    .message(*message_id)
+                    .map(|message| message.text.clone())
+                {
+                    let theme_settings = ThemeSettings::get_global(cx);
+                    let ui_font_size = TextSize::Default.rems(cx);
+                    let buffer_font_size = theme_settings.buffer_font_size;
 
-    pub(crate) fn delete_thread(&mut self, thread_id: &ThreadId, cx: &mut ViewContext<Self>) {
-        self.thread_store
-            .update(cx, |this, cx| this.delete_thread(thread_id, cx));
+                    let mut text_style = cx.text_style();
+                    text_style.refine(&TextStyleRefinement {
+                        font_family: Some(theme_settings.ui_font.family.clone()),
+                        font_size: Some(ui_font_size.into()),
+                        color: Some(cx.theme().colors().text),
+                        ..Default::default()
+                    });
+
+                    let markdown_style = MarkdownStyle {
+                        base_text_style: text_style,
+                        syntax: cx.theme().syntax().clone(),
+                        selection_background_color: cx.theme().players().local().selection,
+                        code_block: StyleRefinement {
+                            text: Some(TextStyleRefinement {
+                                font_family: Some(theme_settings.buffer_font.family.clone()),
+                                font_size: Some(buffer_font_size.into()),
+                                ..Default::default()
+                            }),
+                            ..Default::default()
+                        },
+                        inline_code: TextStyleRefinement {
+                            font_family: Some(theme_settings.buffer_font.family.clone()),
+                            font_size: Some(ui_font_size.into()),
+                            background_color: Some(cx.theme().colors().editor_background),
+                            ..Default::default()
+                        },
+                        ..Default::default()
+                    };
+
+                    let markdown = cx.new_view(|cx| {
+                        Markdown::new(
+                            message_text,
+                            markdown_style,
+                            Some(self.language_registry.clone()),
+                            None,
+                            cx,
+                        )
+                    });
+                    self.rendered_messages_by_id.insert(*message_id, markdown);
+                }
+
+                cx.notify();
+            }
+            ThreadEvent::UsePendingTools => {
+                let pending_tool_uses = self
+                    .thread
+                    .read(cx)
+                    .pending_tool_uses()
+                    .into_iter()
+                    .filter(|tool_use| tool_use.status.is_idle())
+                    .cloned()
+                    .collect::<Vec<_>>();
+
+                for tool_use in pending_tool_uses {
+                    if let Some(tool) = self.tools.tool(&tool_use.name, cx) {
+                        let task = tool.run(tool_use.input, self.workspace.clone(), cx);
+
+                        self.thread.update(cx, |thread, cx| {
+                            thread.insert_tool_output(
+                                tool_use.assistant_message_id,
+                                tool_use.id.clone(),
+                                task,
+                                cx,
+                            );
+                        });
+                    }
+                }
+            }
+            ThreadEvent::ToolFinished { .. } => {}
+        }
     }
 }
 
 impl FocusableView for AssistantPanel {
     fn focus_handle(&self, cx: &AppContext) -> FocusHandle {
-        match self.active_view {
-            ActiveView::Thread => self.message_editor.focus_handle(cx),
-            ActiveView::History => self.history.focus_handle(cx),
-        }
+        self.message_editor.focus_handle(cx)
     }
 }
 
@@ -219,10 +289,11 @@ impl AssistantPanel {
             .bg(cx.theme().colors().tab_bar_background)
             .border_b_1()
             .border_color(cx.theme().colors().border_variant)
-            .child(h_flex().children(self.thread.read(cx).summary(cx).map(Label::new)))
+            .child(h_flex().child(Label::new("Thread Title Goes Here")))
             .child(
                 h_flex()
                     .gap(DynamicSpacing::Base08.rems(cx))
+                    .child(self.render_language_model_selector(cx))
                     .child(Divider::vertical())
                     .child(
                         IconButton::new("new-thread", IconName::Plus)
@@ -277,68 +348,210 @@ impl AssistantPanel {
             )
     }
 
-    fn render_active_thread_or_empty_state(&self, cx: &mut ViewContext<Self>) -> AnyElement {
-        if self.thread.read(cx).is_empty() {
-            return self.render_thread_empty_state(cx).into_any_element();
-        }
+    fn render_language_model_selector(&self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+        let active_provider = LanguageModelRegistry::read_global(cx).active_provider();
+        let active_model = LanguageModelRegistry::read_global(cx).active_model();
 
-        self.thread.clone().into_any()
+        LanguageModelSelector::new(
+            |model, _cx| {
+                println!("Selected {:?}", model.name());
+            },
+            ButtonLike::new("active-model")
+                .style(ButtonStyle::Subtle)
+                .child(
+                    h_flex()
+                        .w_full()
+                        .gap_0p5()
+                        .child(
+                            div()
+                                .overflow_x_hidden()
+                                .flex_grow()
+                                .whitespace_nowrap()
+                                .child(match (active_provider, active_model) {
+                                    (Some(provider), Some(model)) => h_flex()
+                                        .gap_1()
+                                        .child(
+                                            Icon::new(
+                                                model.icon().unwrap_or_else(|| provider.icon()),
+                                            )
+                                            .color(Color::Muted)
+                                            .size(IconSize::XSmall),
+                                        )
+                                        .child(
+                                            Label::new(model.name().0)
+                                                .size(LabelSize::Small)
+                                                .color(Color::Muted),
+                                        )
+                                        .into_any_element(),
+                                    _ => Label::new("No model selected")
+                                        .size(LabelSize::Small)
+                                        .color(Color::Muted)
+                                        .into_any_element(),
+                                }),
+                        )
+                        .child(
+                            Icon::new(IconName::ChevronDown)
+                                .color(Color::Muted)
+                                .size(IconSize::XSmall),
+                        ),
+                )
+                .tooltip(move |cx| Tooltip::for_action("Change Model", &ToggleModelSelector, cx)),
+        )
     }
 
-    fn render_thread_empty_state(&self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let recent_threads = self
-            .thread_store
-            .update(cx, |this, cx| this.recent_threads(3, cx));
+    fn render_message_list(&self, cx: &mut ViewContext<Self>) -> AnyElement {
+        if self.thread_messages.is_empty() {
+            #[allow(clippy::useless_vec)]
+            let recent_threads = vec![1, 2, 3];
 
-        v_flex()
-            .gap_2()
-            .mx_auto()
+            return v_flex()
+                .gap_2()
+                .mx_auto()
+                .child(
+                    v_flex().w_full().child(
+                        svg()
+                            .path("icons/logo_96.svg")
+                            .text_color(cx.theme().colors().text)
+                            .w(px(40.))
+                            .h(px(40.))
+                            .mx_auto()
+                            .mb_4(),
+                    ),
+                )
+                .child(v_flex())
+                .child(
+                    h_flex()
+                        .w_full()
+                        .justify_center()
+                        .child(Label::new("Context Examples:").size(LabelSize::Small)),
+                )
+                .child(
+                    h_flex()
+                        .gap_2()
+                        .justify_center()
+                        .child(
+                            h_flex()
+                                .gap_1()
+                                .p_0p5()
+                                .rounded_md()
+                                .border_1()
+                                .border_color(cx.theme().colors().border_variant)
+                                .child(
+                                    Icon::new(IconName::Terminal)
+                                        .size(IconSize::Small)
+                                        .color(Color::Disabled),
+                                )
+                                .child(Label::new("Terminal").size(LabelSize::Small)),
+                        )
+                        .child(
+                            h_flex()
+                                .gap_1()
+                                .p_0p5()
+                                .rounded_md()
+                                .border_1()
+                                .border_color(cx.theme().colors().border_variant)
+                                .child(
+                                    Icon::new(IconName::Folder)
+                                        .size(IconSize::Small)
+                                        .color(Color::Disabled),
+                                )
+                                .child(Label::new("/src/components").size(LabelSize::Small)),
+                        ),
+                )
+                .child(
+                    h_flex()
+                        .w_full()
+                        .justify_center()
+                        .child(Label::new("Recent Threads:").size(LabelSize::Small)),
+                )
+                .child(
+                    v_flex().gap_2().children(
+                        recent_threads
+                            .iter()
+                            .map(|_thread| self.render_past_thread(cx)),
+                    ),
+                )
+                .child(
+                    h_flex().w_full().justify_center().child(
+                        Button::new("view-all-past-threads", "View All Past Threads")
+                            .style(ButtonStyle::Subtle)
+                            .label_size(LabelSize::Small)
+                            .key_binding(KeyBinding::for_action_in(
+                                &OpenHistory,
+                                &self.focus_handle(cx),
+                                cx,
+                            ))
+                            .on_click(move |_event, cx| {
+                                cx.dispatch_action(OpenHistory.boxed_clone());
+                            }),
+                    ),
+                )
+                .into_any();
+        }
+
+        list(self.thread_list_state.clone()).flex_1().into_any()
+    }
+
+    fn render_message(&self, ix: usize, cx: &mut ViewContext<Self>) -> AnyElement {
+        let message_id = self.thread_messages[ix];
+        let Some(message) = self.thread.read(cx).message(message_id) else {
+            return Empty.into_any();
+        };
+
+        let Some(markdown) = self.rendered_messages_by_id.get(&message_id) else {
+            return Empty.into_any();
+        };
+
+        let (role_icon, role_name) = match message.role {
+            Role::User => (IconName::Person, "You"),
+            Role::Assistant => (IconName::ZedAssistant, "Assistant"),
+            Role::System => (IconName::Settings, "System"),
+        };
+
+        div()
+            .id(("message-container", ix))
+            .p_2()
             .child(
-                v_flex().w_full().child(
-                    svg()
-                        .path("icons/logo_96.svg")
-                        .text_color(cx.theme().colors().text)
-                        .w(px(40.))
-                        .h(px(40.))
-                        .mx_auto()
-                        .mb_4(),
-                ),
-            )
-            .when(!recent_threads.is_empty(), |parent| {
-                parent
+                v_flex()
+                    .border_1()
+                    .border_color(cx.theme().colors().border_variant)
+                    .rounded_md()
                     .child(
                         h_flex()
-                            .w_full()
-                            .justify_center()
-                            .child(Label::new("Recent Threads:").size(LabelSize::Small)),
+                            .justify_between()
+                            .p_1p5()
+                            .border_b_1()
+                            .border_color(cx.theme().colors().border_variant)
+                            .child(
+                                h_flex()
+                                    .gap_2()
+                                    .child(Icon::new(role_icon).size(IconSize::Small))
+                                    .child(Label::new(role_name).size(LabelSize::Small)),
+                            ),
                     )
+                    .child(v_flex().p_1p5().text_ui(cx).child(markdown.clone())),
+            )
+            .into_any()
+    }
+
+    fn render_past_thread(&self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
+        ListItem::new("temp")
+            .start_slot(Icon::new(IconName::MessageBubbles))
+            .child(Label::new("Some Thread Title"))
+            .end_slot(
+                h_flex()
+                    .gap_2()
+                    .child(Label::new("1 hour ago").color(Color::Disabled))
                     .child(
-                        v_flex().gap_2().children(
-                            recent_threads
-                                .into_iter()
-                                .map(|thread| PastThread::new(thread, cx.view().downgrade())),
-                        ),
-                    )
-                    .child(
-                        h_flex().w_full().justify_center().child(
-                            Button::new("view-all-past-threads", "View All Past Threads")
-                                .style(ButtonStyle::Subtle)
-                                .label_size(LabelSize::Small)
-                                .key_binding(KeyBinding::for_action_in(
-                                    &OpenHistory,
-                                    &self.focus_handle(cx),
-                                    cx,
-                                ))
-                                .on_click(move |_event, cx| {
-                                    cx.dispatch_action(OpenHistory.boxed_clone());
-                                }),
-                        ),
-                    )
-            })
+                        IconButton::new("delete", IconName::TrashAlt)
+                            .shape(IconButtonShape::Square)
+                            .icon_size(IconSize::Small),
+                    ),
+            )
     }
 
     fn render_last_error(&self, cx: &mut ViewContext<Self>) -> Option<AnyElement> {
-        let last_error = self.thread.read(cx).last_error()?;
+        let last_error = self.last_error.as_ref()?;
 
         Some(
             div()
@@ -356,7 +569,7 @@ impl AssistantPanel {
                         self.render_max_monthly_spend_reached_error(cx)
                     }
                     ThreadError::Message(error_message) => {
-                        self.render_error_message(&error_message, cx)
+                        self.render_error_message(error_message, cx)
                     }
                 })
                 .into_any(),
@@ -388,20 +601,14 @@ impl AssistantPanel {
                     .mt_1()
                     .child(Button::new("subscribe", "Subscribe").on_click(cx.listener(
                         |this, _, cx| {
-                            this.thread.update(cx, |this, _cx| {
-                                this.clear_last_error();
-                            });
-
+                            this.last_error = None;
                             cx.open_url(&zed_urls::account_url(cx));
                             cx.notify();
                         },
                     )))
                     .child(Button::new("dismiss", "Dismiss").on_click(cx.listener(
                         |this, _, cx| {
-                            this.thread.update(cx, |this, _cx| {
-                                this.clear_last_error();
-                            });
-
+                            this.last_error = None;
                             cx.notify();
                         },
                     ))),
@@ -435,10 +642,7 @@ impl AssistantPanel {
                     .child(
                         Button::new("subscribe", "Update Monthly Spend Limit").on_click(
                             cx.listener(|this, _, cx| {
-                                this.thread.update(cx, |this, _cx| {
-                                    this.clear_last_error();
-                                });
-
+                                this.last_error = None;
                                 cx.open_url(&zed_urls::account_url(cx));
                                 cx.notify();
                             }),
@@ -446,10 +650,7 @@ impl AssistantPanel {
                     )
                     .child(Button::new("dismiss", "Dismiss").on_click(cx.listener(
                         |this, _, cx| {
-                            this.thread.update(cx, |this, _cx| {
-                                this.clear_last_error();
-                            });
-
+                            this.last_error = None;
                             cx.notify();
                         },
                     ))),
@@ -487,10 +688,7 @@ impl AssistantPanel {
                     .mt_1()
                     .child(Button::new("dismiss", "Dismiss").on_click(cx.listener(
                         |this, _, cx| {
-                            this.thread.update(cx, |this, _cx| {
-                                this.clear_last_error();
-                            });
-
+                            this.last_error = None;
                             cx.notify();
                         },
                     ))),
@@ -508,23 +706,17 @@ impl Render for AssistantPanel {
             .on_action(cx.listener(|this, _: &NewThread, cx| {
                 this.new_thread(cx);
             }))
-            .on_action(cx.listener(|this, _: &OpenHistory, cx| {
-                this.active_view = ActiveView::History;
-                this.history.focus_handle(cx).focus(cx);
-                cx.notify();
+            .on_action(cx.listener(|_this, _: &OpenHistory, _cx| {
+                println!("Open History");
             }))
             .child(self.render_toolbar(cx))
-            .map(|parent| match self.active_view {
-                ActiveView::Thread => parent
-                    .child(self.render_active_thread_or_empty_state(cx))
-                    .child(
-                        h_flex()
-                            .border_t_1()
-                            .border_color(cx.theme().colors().border_variant)
-                            .child(self.message_editor.clone()),
-                    )
-                    .children(self.render_last_error(cx)),
-                ActiveView::History => parent.child(self.history.clone()),
-            })
+            .child(self.render_message_list(cx))
+            .child(
+                h_flex()
+                    .border_t_1()
+                    .border_color(cx.theme().colors().border_variant)
+                    .child(self.message_editor.clone()),
+            )
+            .children(self.render_last_error(cx))
     }
 }

crates/assistant2/src/context.rs

@@ -1,14 +0,0 @@
-use gpui::SharedString;
-
-/// Some context attached to a message in a thread.
-#[derive(Debug, Clone)]
-pub struct Context {
-    pub name: SharedString,
-    pub kind: ContextKind,
-    pub text: SharedString,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum ContextKind {
-    File,
-}

crates/assistant2/src/context_picker.rs

@@ -1,197 +0,0 @@
-use std::sync::Arc;
-
-use gpui::{DismissEvent, SharedString, Task, WeakView};
-use picker::{Picker, PickerDelegate, PickerEditorPosition};
-use ui::{prelude::*, ListItem, ListItemSpacing, PopoverMenu, PopoverTrigger, Tooltip};
-
-use crate::message_editor::MessageEditor;
-
-#[derive(IntoElement)]
-pub(super) struct ContextPicker<T: PopoverTrigger> {
-    message_editor: WeakView<MessageEditor>,
-    trigger: T,
-}
-
-#[derive(Clone)]
-struct ContextPickerEntry {
-    name: SharedString,
-    description: SharedString,
-    icon: IconName,
-}
-
-pub(crate) struct ContextPickerDelegate {
-    all_entries: Vec<ContextPickerEntry>,
-    filtered_entries: Vec<ContextPickerEntry>,
-    message_editor: WeakView<MessageEditor>,
-    selected_ix: usize,
-}
-
-impl<T: PopoverTrigger> ContextPicker<T> {
-    pub(crate) fn new(message_editor: WeakView<MessageEditor>, trigger: T) -> Self {
-        ContextPicker {
-            message_editor,
-            trigger,
-        }
-    }
-}
-
-impl PickerDelegate for ContextPickerDelegate {
-    type ListItem = ListItem;
-
-    fn match_count(&self) -> usize {
-        self.filtered_entries.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_ix
-    }
-
-    fn set_selected_index(&mut self, ix: usize, cx: &mut ViewContext<Picker<Self>>) {
-        self.selected_ix = ix.min(self.filtered_entries.len().saturating_sub(1));
-        cx.notify();
-    }
-
-    fn placeholder_text(&self, _cx: &mut WindowContext) -> Arc<str> {
-        "Select a context source…".into()
-    }
-
-    fn update_matches(&mut self, query: String, cx: &mut ViewContext<Picker<Self>>) -> Task<()> {
-        let all_commands = self.all_entries.clone();
-        cx.spawn(|this, mut cx| async move {
-            let filtered_commands = cx
-                .background_executor()
-                .spawn(async move {
-                    if query.is_empty() {
-                        all_commands
-                    } else {
-                        all_commands
-                            .into_iter()
-                            .filter(|model_info| {
-                                model_info
-                                    .name
-                                    .to_lowercase()
-                                    .contains(&query.to_lowercase())
-                            })
-                            .collect()
-                    }
-                })
-                .await;
-
-            this.update(&mut cx, |this, cx| {
-                this.delegate.filtered_entries = filtered_commands;
-                this.delegate.set_selected_index(0, cx);
-                cx.notify();
-            })
-            .ok();
-        })
-    }
-
-    fn confirm(&mut self, _secondary: bool, cx: &mut ViewContext<Picker<Self>>) {
-        if let Some(entry) = self.filtered_entries.get(self.selected_ix) {
-            self.message_editor
-                .update(cx, |_message_editor, _cx| {
-                    println!("Insert context from {}", entry.name);
-                })
-                .ok();
-            cx.emit(DismissEvent);
-        }
-    }
-
-    fn dismissed(&mut self, _cx: &mut ViewContext<Picker<Self>>) {}
-
-    fn editor_position(&self) -> PickerEditorPosition {
-        PickerEditorPosition::End
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _cx: &mut ViewContext<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let entry = self.filtered_entries.get(ix)?;
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Dense)
-                .selected(selected)
-                .tooltip({
-                    let description = entry.description.clone();
-                    move |cx| cx.new_view(|_cx| Tooltip::new(description.clone())).into()
-                })
-                .child(
-                    v_flex()
-                        .group(format!("context-entry-label-{ix}"))
-                        .w_full()
-                        .py_0p5()
-                        .min_w(px(250.))
-                        .max_w(px(400.))
-                        .child(
-                            h_flex()
-                                .gap_1p5()
-                                .child(Icon::new(entry.icon).size(IconSize::XSmall))
-                                .child(
-                                    Label::new(entry.name.clone())
-                                        .single_line()
-                                        .size(LabelSize::Small),
-                                ),
-                        )
-                        .child(
-                            div().overflow_hidden().text_ellipsis().child(
-                                Label::new(entry.description.clone())
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted),
-                            ),
-                        ),
-                ),
-        )
-    }
-}
-
-impl<T: PopoverTrigger> RenderOnce for ContextPicker<T> {
-    fn render(self, cx: &mut WindowContext) -> impl IntoElement {
-        let entries = vec![
-            ContextPickerEntry {
-                name: "directory".into(),
-                description: "Insert any directory".into(),
-                icon: IconName::Folder,
-            },
-            ContextPickerEntry {
-                name: "file".into(),
-                description: "Insert any file".into(),
-                icon: IconName::File,
-            },
-            ContextPickerEntry {
-                name: "web".into(),
-                description: "Fetch content from URL".into(),
-                icon: IconName::Globe,
-            },
-        ];
-
-        let delegate = ContextPickerDelegate {
-            all_entries: entries.clone(),
-            message_editor: self.message_editor.clone(),
-            filtered_entries: entries,
-            selected_ix: 0,
-        };
-
-        let picker =
-            cx.new_view(|cx| Picker::uniform_list(delegate, cx).max_height(Some(rems(20.).into())));
-
-        let handle = self
-            .message_editor
-            .update(cx, |this, _| this.context_picker_handle.clone())
-            .ok();
-        PopoverMenu::new("context-picker")
-            .menu(move |_cx| Some(picker.clone()))
-            .trigger(self.trigger)
-            .attach(gpui::AnchorCorner::TopLeft)
-            .anchor(gpui::AnchorCorner::BottomLeft)
-            .offset(gpui::Point {
-                x: px(0.0),
-                y: px(-16.0),
-            })
-            .when_some(handle, |this, handle| this.with_handle(handle))
-    }
-}

crates/assistant2/src/message_editor.rs

@@ -1,47 +1,29 @@
 use editor::{Editor, EditorElement, EditorStyle};
 use gpui::{AppContext, FocusableView, Model, TextStyle, View};
 use language_model::{LanguageModelRegistry, LanguageModelRequestTool};
-use language_model_selector::LanguageModelSelector;
-use picker::Picker;
 use settings::Settings;
 use theme::ThemeSettings;
-use ui::{
-    prelude::*, ButtonLike, CheckboxWithLabel, ElevationIndex, IconButtonShape, KeyBinding,
-    PopoverMenuHandle, Tooltip,
-};
+use ui::{prelude::*, ButtonLike, CheckboxWithLabel, ElevationIndex, KeyBinding};
 
-use crate::context::{Context, ContextKind};
-use crate::context_picker::{ContextPicker, ContextPickerDelegate};
 use crate::thread::{RequestKind, Thread};
-use crate::ui::ContextPill;
-use crate::{Chat, ToggleModelSelector};
+use crate::Chat;
 
 pub struct MessageEditor {
     thread: Model<Thread>,
     editor: View<Editor>,
-    context: Vec<Context>,
-    pub(crate) context_picker_handle: PopoverMenuHandle<Picker<ContextPickerDelegate>>,
     use_tools: bool,
 }
 
 impl MessageEditor {
     pub fn new(thread: Model<Thread>, cx: &mut ViewContext<Self>) -> Self {
-        let mocked_context = vec![Context {
-            name: "shape.rs".into(),
-            kind: ContextKind::File,
-            text: "```rs\npub enum Shape {\n    Circle,\n    Square,\n    Triangle,\n}".into(),
-        }];
-
         Self {
             thread,
             editor: cx.new_view(|cx| {
                 let mut editor = Editor::auto_height(80, cx);
-                editor.set_placeholder_text("Ask anything or type @ to add context", cx);
+                editor.set_placeholder_text("Ask anything…", cx);
 
                 editor
             }),
-            context: mocked_context,
-            context_picker_handle: PopoverMenuHandle::default(),
             use_tools: false,
         }
     }
@@ -72,10 +54,9 @@ impl MessageEditor {
             editor.clear(cx);
             text
         });
-        let context = self.context.drain(..).collect::<Vec<_>>();
 
         self.thread.update(cx, |thread, cx| {
-            thread.insert_user_message(user_message, context, cx);
+            thread.insert_user_message(user_message, cx);
             let mut request = thread.to_completion_request(request_kind, cx);
 
             if self.use_tools {
@@ -96,57 +77,6 @@ impl MessageEditor {
 
         None
     }
-
-    fn render_language_model_selector(&self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let active_provider = LanguageModelRegistry::read_global(cx).active_provider();
-        let active_model = LanguageModelRegistry::read_global(cx).active_model();
-
-        LanguageModelSelector::new(
-            |model, _cx| {
-                println!("Selected {:?}", model.name());
-            },
-            ButtonLike::new("active-model")
-                .style(ButtonStyle::Subtle)
-                .child(
-                    h_flex()
-                        .w_full()
-                        .gap_0p5()
-                        .child(
-                            div()
-                                .overflow_x_hidden()
-                                .flex_grow()
-                                .whitespace_nowrap()
-                                .child(match (active_provider, active_model) {
-                                    (Some(provider), Some(model)) => h_flex()
-                                        .gap_1()
-                                        .child(
-                                            Icon::new(
-                                                model.icon().unwrap_or_else(|| provider.icon()),
-                                            )
-                                            .color(Color::Muted)
-                                            .size(IconSize::XSmall),
-                                        )
-                                        .child(
-                                            Label::new(model.name().0)
-                                                .size(LabelSize::Small)
-                                                .color(Color::Muted),
-                                        )
-                                        .into_any_element(),
-                                    _ => Label::new("No model selected")
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted)
-                                        .into_any_element(),
-                                }),
-                        )
-                        .child(
-                            Icon::new(IconName::ChevronDown)
-                                .color(Color::Muted)
-                                .size(IconSize::XSmall),
-                        ),
-                )
-                .tooltip(move |cx| Tooltip::for_action("Change Model", &ToggleModelSelector, cx)),
-        )
-    }
 }
 
 impl FocusableView for MessageEditor {
@@ -168,34 +98,6 @@ impl Render for MessageEditor {
             .gap_2()
             .p_2()
             .bg(cx.theme().colors().editor_background)
-            .child(
-                h_flex()
-                    .flex_wrap()
-                    .gap_2()
-                    .child(ContextPicker::new(
-                        cx.view().downgrade(),
-                        IconButton::new("add-context", IconName::Plus)
-                            .shape(IconButtonShape::Square)
-                            .icon_size(IconSize::Small),
-                    ))
-                    .children(
-                        self.context
-                            .iter()
-                            .map(|context| ContextPill::new(context.clone())),
-                    )
-                    .when(!self.context.is_empty(), |parent| {
-                        parent.child(
-                            IconButton::new("remove-all-context", IconName::Eraser)
-                                .shape(IconButtonShape::Square)
-                                .icon_size(IconSize::Small)
-                                .tooltip(move |cx| Tooltip::text("Remove All Context", cx))
-                                .on_click(cx.listener(|this, _event, cx| {
-                                    this.context.clear();
-                                    cx.notify();
-                                })),
-                        )
-                    }),
-            )
             .child({
                 let settings = ThemeSettings::get_global(cx);
                 let text_style = TextStyle {
@@ -221,26 +123,36 @@ impl Render for MessageEditor {
             .child(
                 h_flex()
                     .justify_between()
-                    .child(h_flex().gap_2().child(CheckboxWithLabel::new(
-                        "use-tools",
-                        Label::new("Tools"),
-                        self.use_tools.into(),
-                        cx.listener(|this, selection, _cx| {
-                            this.use_tools = match selection {
-                                Selection::Selected => true,
-                                Selection::Unselected | Selection::Indeterminate => false,
-                            };
-                        }),
-                    )))
+                    .child(
+                        h_flex()
+                            .child(
+                                Button::new("add-context", "Add Context")
+                                    .style(ButtonStyle::Filled)
+                                    .icon(IconName::Plus)
+                                    .icon_position(IconPosition::Start),
+                            )
+                            .child(CheckboxWithLabel::new(
+                                "use-tools",
+                                Label::new("Tools"),
+                                self.use_tools.into(),
+                                cx.listener(|this, selection, _cx| {
+                                    this.use_tools = match selection {
+                                        Selection::Selected => true,
+                                        Selection::Unselected | Selection::Indeterminate => false,
+                                    };
+                                }),
+                            )),
+                    )
                     .child(
                         h_flex()
                             .gap_2()
-                            .child(self.render_language_model_selector(cx))
+                            .child(Button::new("codebase", "Codebase").style(ButtonStyle::Filled))
+                            .child(Label::new("or"))
                             .child(
                                 ButtonLike::new("chat")
                                     .style(ButtonStyle::Filled)
                                     .layer(ElevationIndex::ModalSurface)
-                                    .child(Label::new("Submit"))
+                                    .child(Label::new("Chat"))
                                     .children(
                                         KeyBinding::for_action_in(&Chat, &focus_handle, cx)
                                             .map(|binding| binding.into_any_element()),

crates/assistant2/src/thread.rs

@@ -2,43 +2,24 @@ use std::sync::Arc;
 
 use anyhow::Result;
 use assistant_tool::ToolWorkingSet;
-use chrono::{DateTime, Utc};
 use collections::HashMap;
 use futures::future::Shared;
 use futures::{FutureExt as _, StreamExt as _};
 use gpui::{AppContext, EventEmitter, ModelContext, SharedString, Task};
 use language_model::{
-    LanguageModel, LanguageModelCompletionEvent, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, LanguageModelToolResult, LanguageModelToolUse,
-    LanguageModelToolUseId, MessageContent, Role, StopReason,
+    LanguageModel, LanguageModelCompletionEvent, LanguageModelRequest, LanguageModelRequestMessage,
+    LanguageModelToolResult, LanguageModelToolUse, LanguageModelToolUseId, MessageContent, Role,
+    StopReason,
 };
 use language_models::provider::cloud::{MaxMonthlySpendReachedError, PaymentRequiredError};
 use serde::{Deserialize, Serialize};
-use util::{post_inc, TryFutureExt as _};
-use uuid::Uuid;
-
-use crate::context::{Context, ContextKind};
+use util::post_inc;
 
 #[derive(Debug, Clone, Copy)]
 pub enum RequestKind {
     Chat,
 }
 
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Serialize, Deserialize)]
-pub struct ThreadId(Arc<str>);
-
-impl ThreadId {
-    pub fn new() -> Self {
-        Self(Uuid::new_v4().to_string().into())
-    }
-}
-
-impl std::fmt::Display for ThreadId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Serialize, Deserialize)]
 pub struct MessageId(usize);
 
@@ -58,13 +39,8 @@ pub struct Message {
 
 /// A thread of conversation with the LLM.
 pub struct Thread {
-    id: ThreadId,
-    updated_at: DateTime<Utc>,
-    summary: Option<SharedString>,
-    pending_summary: Task<Option<()>>,
     messages: Vec<Message>,
     next_message_id: MessageId,
-    context_by_message: HashMap<MessageId, Vec<Context>>,
     completion_count: usize,
     pending_completions: Vec<PendingCompletion>,
     tools: Arc<ToolWorkingSet>,
@@ -76,13 +52,8 @@ pub struct Thread {
 impl Thread {
     pub fn new(tools: Arc<ToolWorkingSet>, _cx: &mut ModelContext<Self>) -> Self {
         Self {
-            id: ThreadId::new(),
-            updated_at: Utc::now(),
-            summary: None,
-            pending_summary: Task::ready(None),
             messages: Vec::new(),
             next_message_id: MessageId(0),
-            context_by_message: HashMap::default(),
             completion_count: 0,
             pending_completions: Vec::new(),
             tools,
@@ -92,76 +63,26 @@ impl Thread {
         }
     }
 
-    pub fn id(&self) -> &ThreadId {
-        &self.id
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.messages.is_empty()
-    }
-
-    pub fn updated_at(&self) -> DateTime<Utc> {
-        self.updated_at
-    }
-
-    pub fn touch_updated_at(&mut self) {
-        self.updated_at = Utc::now();
-    }
-
-    pub fn summary(&self) -> Option<SharedString> {
-        self.summary.clone()
-    }
-
-    pub fn set_summary(&mut self, summary: impl Into<SharedString>, cx: &mut ModelContext<Self>) {
-        self.summary = Some(summary.into());
-        cx.emit(ThreadEvent::SummaryChanged);
-    }
-
     pub fn message(&self, id: MessageId) -> Option<&Message> {
         self.messages.iter().find(|message| message.id == id)
     }
 
-    pub fn messages(&self) -> impl Iterator<Item = &Message> {
-        self.messages.iter()
-    }
-
     pub fn tools(&self) -> &Arc<ToolWorkingSet> {
         &self.tools
     }
 
-    pub fn context_for_message(&self, id: MessageId) -> Option<&Vec<Context>> {
-        self.context_by_message.get(&id)
-    }
-
     pub fn pending_tool_uses(&self) -> Vec<&PendingToolUse> {
         self.pending_tool_uses_by_id.values().collect()
     }
 
-    pub fn insert_user_message(
-        &mut self,
-        text: impl Into<String>,
-        context: Vec<Context>,
-        cx: &mut ModelContext<Self>,
-    ) {
-        let message_id = self.insert_message(Role::User, text, cx);
-        self.context_by_message.insert(message_id, context);
-    }
-
-    pub fn insert_message(
-        &mut self,
-        role: Role,
-        text: impl Into<String>,
-        cx: &mut ModelContext<Self>,
-    ) -> MessageId {
+    pub fn insert_user_message(&mut self, text: impl Into<String>, cx: &mut ModelContext<Self>) {
         let id = self.next_message_id.post_inc();
         self.messages.push(Message {
             id,
-            role,
+            role: Role::User,
             text: text.into(),
         });
-        self.touch_updated_at();
         cx.emit(ThreadEvent::MessageAdded(id));
-        id
     }
 
     pub fn to_completion_request(
@@ -191,29 +112,6 @@ impl Thread {
                 }
             }
 
-            if let Some(context) = self.context_for_message(message.id) {
-                let mut file_context = String::new();
-
-                for context in context.iter() {
-                    match context.kind {
-                        ContextKind::File => {
-                            file_context.push_str(&context.text);
-                            file_context.push_str("\n");
-                        }
-                    }
-                }
-
-                let mut context_text = String::new();
-                if !file_context.is_empty() {
-                    context_text.push_str("The following files are available:\n");
-                    context_text.push_str(&file_context);
-                }
-
-                request_message
-                    .content
-                    .push(MessageContent::Text(context_text))
-            }
-
             if !message.text.is_empty() {
                 request_message
                     .content
@@ -254,7 +152,13 @@ impl Thread {
                     thread.update(&mut cx, |thread, cx| {
                         match event {
                             LanguageModelCompletionEvent::StartMessage { .. } => {
-                                thread.insert_message(Role::Assistant, String::new(), cx);
+                                let id = thread.next_message_id.post_inc();
+                                thread.messages.push(Message {
+                                    id,
+                                    role: Role::Assistant,
+                                    text: String::new(),
+                                });
+                                cx.emit(ThreadEvent::MessageAdded(id));
                             }
                             LanguageModelCompletionEvent::Stop(reason) => {
                                 stop_reason = reason;
@@ -296,7 +200,6 @@ impl Thread {
                             }
                         }
 
-                        thread.touch_updated_at();
                         cx.emit(ThreadEvent::StreamedCompletion);
                         cx.notify();
                     })?;
@@ -304,14 +207,10 @@ impl Thread {
                     smol::future::yield_now().await;
                 }
 
-                thread.update(&mut cx, |thread, cx| {
+                thread.update(&mut cx, |thread, _cx| {
                     thread
                         .pending_completions
                         .retain(|completion| completion.id != pending_completion_id);
-
-                    if thread.summary.is_none() && thread.messages.len() >= 2 {
-                        thread.summarize(cx);
-                    }
                 })?;
 
                 anyhow::Ok(stop_reason)
@@ -354,59 +253,6 @@ impl Thread {
         });
     }
 
-    pub fn summarize(&mut self, cx: &mut ModelContext<Self>) {
-        let Some(provider) = LanguageModelRegistry::read_global(cx).active_provider() else {
-            return;
-        };
-        let Some(model) = LanguageModelRegistry::read_global(cx).active_model() else {
-            return;
-        };
-
-        if !provider.is_authenticated(cx) {
-            return;
-        }
-
-        let mut request = self.to_completion_request(RequestKind::Chat, cx);
-        request.messages.push(LanguageModelRequestMessage {
-            role: Role::User,
-            content: vec![
-                "Generate a concise 3-7 word title for this conversation, omitting punctuation. Go straight to the title, without any preamble and prefix like `Here's a concise suggestion:...` or `Title:`"
-                    .into(),
-            ],
-            cache: false,
-        });
-
-        self.pending_summary = cx.spawn(|this, mut cx| {
-            async move {
-                let stream = model.stream_completion_text(request, &cx);
-                let mut messages = stream.await?;
-
-                let mut new_summary = String::new();
-                while let Some(message) = messages.stream.next().await {
-                    let text = message?;
-                    let mut lines = text.lines();
-                    new_summary.extend(lines.next());
-
-                    // Stop if the LLM generated multiple lines.
-                    if lines.next().is_some() {
-                        break;
-                    }
-                }
-
-                this.update(&mut cx, |this, cx| {
-                    if !new_summary.is_empty() {
-                        this.summary = Some(new_summary.into());
-                    }
-
-                    cx.emit(ThreadEvent::SummaryChanged);
-                })?;
-
-                anyhow::Ok(())
-            }
-            .log_err()
-        });
-    }
-
     pub fn insert_tool_output(
         &mut self,
         assistant_message_id: MessageId,
@@ -480,7 +326,6 @@ pub enum ThreadEvent {
     StreamedCompletion,
     StreamedAssistantText(MessageId, String),
     MessageAdded(MessageId),
-    SummaryChanged,
     UsePendingTools,
     ToolFinished {
         #[allow(unused)]

crates/assistant2/src/thread_history.rs

@@ -1,156 +0,0 @@
-use gpui::{
-    uniform_list, AppContext, FocusHandle, FocusableView, Model, UniformListScrollHandle, WeakView,
-};
-use time::{OffsetDateTime, UtcOffset};
-use ui::{prelude::*, IconButtonShape, ListItem};
-
-use crate::thread::Thread;
-use crate::thread_store::ThreadStore;
-use crate::AssistantPanel;
-
-pub struct ThreadHistory {
-    focus_handle: FocusHandle,
-    assistant_panel: WeakView<AssistantPanel>,
-    thread_store: Model<ThreadStore>,
-    scroll_handle: UniformListScrollHandle,
-}
-
-impl ThreadHistory {
-    pub(crate) fn new(
-        assistant_panel: WeakView<AssistantPanel>,
-        thread_store: Model<ThreadStore>,
-        cx: &mut ViewContext<Self>,
-    ) -> Self {
-        Self {
-            focus_handle: cx.focus_handle(),
-            assistant_panel,
-            thread_store,
-            scroll_handle: UniformListScrollHandle::default(),
-        }
-    }
-}
-
-impl FocusableView for ThreadHistory {
-    fn focus_handle(&self, _cx: &AppContext) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for ThreadHistory {
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let threads = self.thread_store.update(cx, |this, cx| this.threads(cx));
-
-        v_flex()
-            .id("thread-history-container")
-            .track_focus(&self.focus_handle)
-            .overflow_y_scroll()
-            .size_full()
-            .p_1()
-            .map(|history| {
-                if threads.is_empty() {
-                    history
-                        .justify_center()
-                        .child(
-                            h_flex().w_full().justify_center().child(
-                                Label::new("You don't have any past threads yet.")
-                                    .size(LabelSize::Small),
-                            ),
-                        )
-                } else {
-                    history.child(
-                        uniform_list(
-                            cx.view().clone(),
-                            "thread-history",
-                            threads.len(),
-                            move |history, range, _cx| {
-                                threads[range]
-                                    .iter()
-                                    .map(|thread| {
-                                        PastThread::new(
-                                            thread.clone(),
-                                            history.assistant_panel.clone(),
-                                        )
-                                    })
-                                    .collect()
-                            },
-                        )
-                        .track_scroll(self.scroll_handle.clone())
-                        .flex_grow(),
-                    )
-                }
-            })
-    }
-}
-
-#[derive(IntoElement)]
-pub struct PastThread {
-    thread: Model<Thread>,
-    assistant_panel: WeakView<AssistantPanel>,
-}
-
-impl PastThread {
-    pub fn new(thread: Model<Thread>, assistant_panel: WeakView<AssistantPanel>) -> Self {
-        Self {
-            thread,
-            assistant_panel,
-        }
-    }
-}
-
-impl RenderOnce for PastThread {
-    fn render(self, cx: &mut WindowContext) -> impl IntoElement {
-        let (id, summary) = {
-            const DEFAULT_SUMMARY: SharedString = SharedString::new_static("New Thread");
-            let thread = self.thread.read(cx);
-            (
-                thread.id().clone(),
-                thread.summary().unwrap_or(DEFAULT_SUMMARY),
-            )
-        };
-
-        let thread_timestamp = time_format::format_localized_timestamp(
-            OffsetDateTime::from_unix_timestamp(self.thread.read(cx).updated_at().timestamp())
-                .unwrap(),
-            OffsetDateTime::now_utc(),
-            self.assistant_panel
-                .update(cx, |this, _cx| this.local_timezone())
-                .unwrap_or(UtcOffset::UTC),
-            time_format::TimestampFormat::EnhancedAbsolute,
-        );
-        ListItem::new(("past-thread", self.thread.entity_id()))
-            .start_slot(Icon::new(IconName::MessageBubbles))
-            .child(Label::new(summary))
-            .end_slot(
-                h_flex()
-                    .gap_2()
-                    .child(Label::new(thread_timestamp).color(Color::Disabled))
-                    .child(
-                        IconButton::new("delete", IconName::TrashAlt)
-                            .shape(IconButtonShape::Square)
-                            .icon_size(IconSize::Small)
-                            .on_click({
-                                let assistant_panel = self.assistant_panel.clone();
-                                let id = id.clone();
-                                move |_event, cx| {
-                                    assistant_panel
-                                        .update(cx, |this, cx| {
-                                            this.delete_thread(&id, cx);
-                                        })
-                                        .ok();
-                                }
-                            }),
-                    ),
-            )
-            .on_click({
-                let assistant_panel = self.assistant_panel.clone();
-                let id = id.clone();
-                move |_event, cx| {
-                    assistant_panel
-                        .update(cx, |this, cx| {
-                            this.open_thread(&id, cx);
-                        })
-                        .ok();
-                }
-            })
-    }
-}

crates/assistant2/src/thread_store.rs

@@ -7,18 +7,14 @@ use context_server::manager::ContextServerManager;
 use context_server::{ContextServerFactoryRegistry, ContextServerTool};
 use gpui::{prelude::*, AppContext, Model, ModelContext, Task};
 use project::Project;
-use unindent::Unindent;
 use util::ResultExt as _;
 
-use crate::thread::{Thread, ThreadId};
-
 pub struct ThreadStore {
     #[allow(unused)]
     project: Model<Project>,
     tools: Arc<ToolWorkingSet>,
     context_server_manager: Model<ContextServerManager>,
     context_server_tool_ids: HashMap<Arc<str>, Vec<ToolId>>,
-    threads: Vec<Model<Thread>>,
 }
 
 impl ThreadStore {
@@ -35,14 +31,12 @@ impl ThreadStore {
                     ContextServerManager::new(context_server_factory_registry, project.clone(), cx)
                 });
 
-                let mut this = Self {
+                let this = Self {
                     project,
                     tools,
                     context_server_manager,
                     context_server_tool_ids: HashMap::default(),
-                    threads: Vec::new(),
                 };
-                this.mock_recent_threads(cx);
                 this.register_context_server_handlers(cx);
 
                 this
@@ -52,38 +46,6 @@ impl ThreadStore {
         })
     }
 
-    pub fn threads(&self, cx: &ModelContext<Self>) -> Vec<Model<Thread>> {
-        let mut threads = self
-            .threads
-            .iter()
-            .filter(|thread| !thread.read(cx).is_empty())
-            .cloned()
-            .collect::<Vec<_>>();
-        threads.sort_unstable_by_key(|thread| std::cmp::Reverse(thread.read(cx).updated_at()));
-        threads
-    }
-
-    pub fn recent_threads(&self, limit: usize, cx: &ModelContext<Self>) -> Vec<Model<Thread>> {
-        self.threads(cx).into_iter().take(limit).collect()
-    }
-
-    pub fn create_thread(&mut self, cx: &mut ModelContext<Self>) -> Model<Thread> {
-        let thread = cx.new_model(|cx| Thread::new(self.tools.clone(), cx));
-        self.threads.push(thread.clone());
-        thread
-    }
-
-    pub fn open_thread(&self, id: &ThreadId, cx: &mut ModelContext<Self>) -> Option<Model<Thread>> {
-        self.threads
-            .iter()
-            .find(|thread| thread.read(cx).id() == id)
-            .cloned()
-    }
-
-    pub fn delete_thread(&mut self, id: &ThreadId, cx: &mut ModelContext<Self>) {
-        self.threads.retain(|thread| thread.read(cx).id() != id);
-    }
-
     fn register_context_server_handlers(&self, cx: &mut ModelContext<Self>) {
         cx.subscribe(
             &self.context_server_manager.clone(),
@@ -150,93 +112,3 @@ impl ThreadStore {
         }
     }
 }
-
-impl ThreadStore {
-    /// Creates some mocked recent threads for testing purposes.
-    fn mock_recent_threads(&mut self, cx: &mut ModelContext<Self>) {
-        use language_model::Role;
-
-        self.threads.push(cx.new_model(|cx| {
-            let mut thread = Thread::new(self.tools.clone(), cx);
-            thread.set_summary("Introduction to quantum computing", cx);
-            thread.insert_user_message("Hello! Can you help me understand quantum computing?", Vec::new(), cx);
-            thread.insert_message(Role::Assistant, "Of course! I'd be happy to help you understand quantum computing. Quantum computing is a fascinating field that uses the principles of quantum mechanics to process information. Unlike classical computers that use bits (0s and 1s), quantum computers use quantum bits or 'qubits'. These qubits can exist in multiple states simultaneously, a property called superposition. This allows quantum computers to perform certain calculations much faster than classical computers. What specific aspect of quantum computing would you like to know more about?", cx);
-            thread.insert_user_message("That's interesting! Can you explain how quantum entanglement is used in quantum computing?", Vec::new(), cx);
-            thread.insert_message(Role::Assistant, "Certainly! Quantum entanglement is a key principle used in quantum computing. When two qubits become entangled, the state of one qubit is directly related to the state of the other, regardless of the distance between them. This property is used in quantum computing to create complex quantum states and to perform operations on multiple qubits simultaneously. Entanglement allows quantum computers to process information in ways that classical computers cannot, potentially solving certain problems much more efficiently. For example, it's crucial in quantum error correction and in algorithms like quantum teleportation, which is important for quantum communication.", cx);
-            thread
-        }));
-
-        self.threads.push(cx.new_model(|cx| {
-            let mut thread = Thread::new(self.tools.clone(), cx);
-            thread.set_summary("Rust web development and async programming", cx);
-            thread.insert_user_message("Can you show me an example of Rust code for a simple web server?", Vec::new(), cx);
-            thread.insert_message(Role::Assistant, "Certainly! Here's an example of a simple web server in Rust using the `actix-web` framework:
-
-        ```rust
-        use actix_web::{web, App, HttpResponse, HttpServer, Responder};
-
-        async fn hello() -> impl Responder {
-            HttpResponse::Ok().body(\"Hello, World!\")
-        }
-
-        #[actix_web::main]
-        async fn main() -> std::io::Result<()> {
-            HttpServer::new(|| {
-                App::new()
-                    .route(\"/\", web::get().to(hello))
-            })
-            .bind(\"127.0.0.1:8080\")?
-            .run()
-            .await
-        }
-        ```
-
-        This code creates a basic web server that responds with 'Hello, World!' when you access the root URL. Here's a breakdown of what's happening:
-
-        1. We import necessary items from the `actix-web` crate.
-        2. We define an async `hello` function that returns a simple HTTP response.
-        3. In the `main` function, we set up the server to listen on `127.0.0.1:8080`.
-        4. We configure the app to respond to GET requests on the root path with our `hello` function.
-
-        To run this, you'd need to add `actix-web` to your `Cargo.toml` dependencies:
-
-        ```toml
-        [dependencies]
-        actix-web = \"4.0\"
-        ```
-
-        Then you can run the server with `cargo run` and access it at `http://localhost:8080`.".unindent(), cx);
-            thread.insert_user_message("That's great! Can you explain more about async functions in Rust?", Vec::new(), cx);
-            thread.insert_message(Role::Assistant, "Certainly! Async functions are a key feature in Rust for writing efficient, non-blocking code, especially for I/O-bound operations. Here's an overview:
-
-        1. **Syntax**: Async functions are declared using the `async` keyword:
-
-           ```rust
-           async fn my_async_function() -> Result<(), Error> {
-               // Asynchronous code here
-           }
-           ```
-
-        2. **Futures**: Async functions return a `Future`. A `Future` represents a value that may not be available yet but will be at some point.
-
-        3. **Await**: Inside an async function, you can use the `.await` syntax to wait for other async operations to complete:
-
-           ```rust
-           async fn fetch_data() -> Result<String, Error> {
-               let response = make_http_request().await?;
-               let data = process_response(response).await?;
-               Ok(data)
-           }
-           ```
-
-        4. **Non-blocking**: Async functions allow the runtime to work on other tasks while waiting for I/O or other operations to complete, making efficient use of system resources.
-
-        5. **Runtime**: To execute async code, you need a runtime like `tokio` or `async-std`. Actix-web, which we used in the previous example, includes its own runtime.
-
-        6. **Error Handling**: Async functions work well with Rust's `?` operator for error handling.
-
-        Async programming in Rust provides a powerful way to write concurrent code that's both safe and efficient. It's particularly useful for servers, network programming, and any application that deals with many concurrent operations.".unindent(), cx);
-            thread
-        }));
-    }
-}

crates/assistant2/src/ui.rs

@@ -1,3 +0,0 @@
-mod context_pill;
-
-pub use context_pill::*;

crates/assistant2/src/ui/context_pill.rs

@@ -1,25 +0,0 @@
-use ui::prelude::*;
-
-use crate::context::Context;
-
-#[derive(IntoElement)]
-pub struct ContextPill {
-    context: Context,
-}
-
-impl ContextPill {
-    pub fn new(context: Context) -> Self {
-        Self { context }
-    }
-}
-
-impl RenderOnce for ContextPill {
-    fn render(self, cx: &mut WindowContext) -> impl IntoElement {
-        div()
-            .px_1()
-            .border_1()
-            .border_color(cx.theme().colors().border)
-            .rounded_md()
-            .child(Label::new(self.context.name.clone()).size(LabelSize::Small))
-    }
-}

crates/call/Cargo.toml

@@ -18,7 +18,6 @@ test-support = [
     "collections/test-support",
     "gpui/test-support",
     "livekit_client/test-support",
-    "livekit_client_macos/test-support",
     "project/test-support",
     "util/test-support"
 ]
@@ -43,10 +42,10 @@ settings.workspace = true
 util.workspace = true
 
 [target.'cfg(target_os = "macos")'.dependencies]
-livekit_client_macos = { workspace = true }
+livekit_client_macos.workspace = true
 
 [target.'cfg(not(target_os = "macos"))'.dependencies]
-livekit_client = { workspace = true }
+livekit_client.workspace = true
 
 [dev-dependencies]
 client = { workspace = true, features = ["test-support"] }

crates/cli/src/main.rs

@@ -548,7 +548,7 @@ mod mac_os {
         },
         LocalPath {
             executable: PathBuf,
-            plist: InfoPlist,
+            short_version_string: String,
         },
     }
 
@@ -587,17 +587,9 @@ mod mac_os {
                 }
                 _ => {
                     println!("Bundle path {bundle_path:?} has no *.app extension, attempting to locate a dev build");
-                    let plist_path = bundle_path
-                        .parent()
-                        .with_context(|| format!("Bundle path {bundle_path:?} has no parent"))?
-                        .join("WebRTC.framework/Resources/Info.plist");
-                    let plist =
-                        plist::from_file::<_, InfoPlist>(&plist_path).with_context(|| {
-                            format!("Reading dev bundle plist file at {plist_path:?}")
-                        })?;
                     Ok(Bundle::LocalPath {
                         executable: bundle_path,
-                        plist,
+                        short_version_string: "test-dev-version".to_string(),
                     })
                 }
             }
@@ -607,9 +599,16 @@ mod mac_os {
     impl InstalledApp for Bundle {
         fn zed_version_string(&self) -> String {
             let is_dev = matches!(self, Self::LocalPath { .. });
+            let version = match self {
+                Bundle::App { plist, .. } => &plist.bundle_short_version_string,
+                Bundle::LocalPath {
+                    short_version_string,
+                    ..
+                } => &short_version_string,
+            };
             format!(
                 "Zed {}{} – {}",
-                self.plist().bundle_short_version_string,
+                version,
                 if is_dev { " (dev)" } else { "" },
                 self.path().display(),
             )
@@ -691,13 +690,6 @@ mod mac_os {
     }
 
     impl Bundle {
-        fn plist(&self) -> &InfoPlist {
-            match self {
-                Self::App { plist, .. } => plist,
-                Self::LocalPath { plist, .. } => plist,
-            }
-        }
-
         fn path(&self) -> &Path {
             match self {
                 Self::App { app_bundle, .. } => app_bundle,

crates/client/src/telemetry.rs

@@ -18,8 +18,7 @@ use std::time::Instant;
 use std::{env, mem, path::PathBuf, sync::Arc, time::Duration};
 use telemetry_events::{
     ActionEvent, AppEvent, AssistantEvent, CallEvent, EditEvent, EditorEvent, Event,
-    EventRequestBody, EventWrapper, ExtensionEvent, InlineCompletionEvent, InlineCompletionRating,
-    InlineCompletionRatingEvent, ReplEvent, SettingEvent,
+    EventRequestBody, EventWrapper, ExtensionEvent, InlineCompletionEvent, ReplEvent, SettingEvent,
 };
 use util::{ResultExt, TryFutureExt};
 use worktree::{UpdatedEntriesSet, WorktreeId};
@@ -356,24 +355,6 @@ impl Telemetry {
         self.report_event(event)
     }
 
-    pub fn report_inline_completion_rating_event(
-        self: &Arc<Self>,
-        rating: InlineCompletionRating,
-        input_events: Arc<str>,
-        input_excerpt: Arc<str>,
-        output_excerpt: Arc<str>,
-        feedback: String,
-    ) {
-        let event = Event::InlineCompletionRating(InlineCompletionRatingEvent {
-            rating,
-            input_events,
-            input_excerpt,
-            output_excerpt,
-            feedback,
-        });
-        self.report_event(event);
-    }
-
     pub fn report_assistant_event(self: &Arc<Self>, event: AssistantEvent) {
         self.report_event(Event::Assistant(event));
     }

crates/collab/.env.toml

@@ -19,6 +19,11 @@ LLM_DATABASE_URL = "postgres://postgres@localhost/zed_llm"
 LLM_DATABASE_MAX_CONNECTIONS = 5
 LLM_API_SECRET = "llm-secret"
 
+# CLICKHOUSE_URL = ""
+# CLICKHOUSE_USER = "default"
+# CLICKHOUSE_PASSWORD = ""
+# CLICKHOUSE_DATABASE = "default"
+
 # SLACK_PANICS_WEBHOOK = ""
 
 # RUST_LOG=info

crates/collab/Cargo.toml

@@ -29,6 +29,7 @@ axum = { version = "0.6", features = ["json", "headers", "ws"] }
 axum-extra = { version = "0.4", features = ["erased-json"] }
 base64.workspace = true
 chrono.workspace = true
+clickhouse.workspace = true
 clock.workspace = true
 collections.workspace = true
 dashmap.workspace = true
@@ -76,6 +77,12 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json", "re
 util.workspace = true
 uuid.workspace = true
 
+[target.'cfg(target_os = "macos")'.dependencies]
+livekit_client_macos = { workspace = true, features = ["test-support"] }
+
+[target.'cfg(not(target_os = "macos"))'.dependencies]
+livekit_client = { workspace = true, features = ["test-support"] }
+
 [dev-dependencies]
 assistant = { workspace = true, features = ["test-support"] }
 assistant_tool.workspace = true

crates/collab/k8s/collab.template.yml

@@ -149,21 +149,6 @@ spec:
                 secretKeyRef:
                   name: google-ai
                   key: api_key
-            - name: PREDICTION_API_URL
-              valueFrom:
-                secretKeyRef:
-                  name: prediction
-                  key: api_url
-            - name: PREDICTION_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: prediction
-                  key: api_key
-            - name: PREDICTION_MODEL
-              valueFrom:
-                secretKeyRef:
-                  name: prediction
-                  key: model
             - name: BLOB_STORE_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
@@ -214,6 +199,26 @@ spec:
                 secretKeyRef:
                   name: blob-store
                   key: bucket
+            - name: CLICKHOUSE_URL
+              valueFrom:
+                secretKeyRef:
+                  name: clickhouse
+                  key: url
+            - name: CLICKHOUSE_USER
+              valueFrom:
+                secretKeyRef:
+                  name: clickhouse
+                  key: user
+            - name: CLICKHOUSE_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: clickhouse
+                  key: password
+            - name: CLICKHOUSE_DATABASE
+              valueFrom:
+                secretKeyRef:
+                  name: clickhouse
+                  key: database
             - name: SLACK_PANICS_WEBHOOK
               valueFrom:
                 secretKeyRef:

crates/collab/src/api/billing.rs

@@ -9,7 +9,6 @@ use collections::HashSet;
 use reqwest::StatusCode;
 use sea_orm::ActiveValue;
 use serde::{Deserialize, Serialize};
-use serde_json::json;
 use std::{str::FromStr, sync::Arc, time::Duration};
 use stripe::{
     BillingPortalSession, CreateBillingPortalSession, CreateBillingPortalSessionFlowData,
@@ -20,7 +19,6 @@ use stripe::{
 };
 use util::ResultExt;
 
-use crate::api::events::SnowflakeRow;
 use crate::llm::{DEFAULT_MAX_MONTHLY_SPEND, FREE_TIER_MONTHLY_SPENDING_LIMIT};
 use crate::rpc::{ResultExt as _, Server};
 use crate::{
@@ -102,9 +100,6 @@ async fn update_billing_preferences(
         .await?
         .ok_or_else(|| anyhow!("user not found"))?;
 
-    let max_monthly_llm_usage_spending_in_cents =
-        body.max_monthly_llm_usage_spending_in_cents.max(0);
-
     let billing_preferences =
         if let Some(_billing_preferences) = app.db.get_billing_preferences(user.id).await? {
             app.db
@@ -112,7 +107,7 @@ async fn update_billing_preferences(
                     user.id,
                     &UpdateBillingPreferencesParams {
                         max_monthly_llm_usage_spending_in_cents: ActiveValue::set(
-                            max_monthly_llm_usage_spending_in_cents,
+                            body.max_monthly_llm_usage_spending_in_cents,
                         ),
                     },
                 )
@@ -122,26 +117,13 @@ async fn update_billing_preferences(
                 .create_billing_preferences(
                     user.id,
                     &crate::db::CreateBillingPreferencesParams {
-                        max_monthly_llm_usage_spending_in_cents,
+                        max_monthly_llm_usage_spending_in_cents: body
+                            .max_monthly_llm_usage_spending_in_cents,
                     },
                 )
                 .await?
         };
 
-    SnowflakeRow::new(
-        "Spend Limit Updated",
-        user.metrics_id,
-        user.admin,
-        None,
-        json!({
-            "user_id": user.id,
-            "max_monthly_llm_usage_spending_in_cents": billing_preferences.max_monthly_llm_usage_spending_in_cents,
-        }),
-    )
-    .write(&app.kinesis_client, &app.config.kinesis_stream)
-    .await
-    .log_err();
-
     rpc_server.refresh_llm_tokens_for_user(user.id).await;
 
     Ok(Json(BillingPreferencesResponse {

crates/collab/src/clickhouse.rs

@@ -0,0 +1,28 @@
+use serde::Serialize;
+
+/// Writes the given rows to the specified Clickhouse table.
+pub async fn write_to_table<T: clickhouse::Row + Serialize + std::fmt::Debug>(
+    table: &str,
+    rows: &[T],
+    clickhouse_client: &clickhouse::Client,
+) -> anyhow::Result<()> {
+    if rows.is_empty() {
+        return Ok(());
+    }
+
+    let mut insert = clickhouse_client.insert(table)?;
+
+    for event in rows {
+        insert.write(event).await?;
+    }
+
+    insert.end().await?;
+
+    let event_count = rows.len();
+    log::info!(
+        "wrote {event_count} {event_specifier} to '{table}'",
+        event_specifier = if event_count == 1 { "event" } else { "events" }
+    );
+
+    Ok(())
+}

crates/collab/src/lib.rs

@@ -1,6 +1,7 @@
 pub mod api;
 pub mod auth;
 mod cents;
+pub mod clickhouse;
 pub mod db;
 pub mod env;
 pub mod executor;
@@ -150,6 +151,10 @@ pub struct Config {
     pub seed_path: Option<PathBuf>,
     pub database_max_connections: u32,
     pub api_token: String,
+    pub clickhouse_url: Option<String>,
+    pub clickhouse_user: Option<String>,
+    pub clickhouse_password: Option<String>,
+    pub clickhouse_database: Option<String>,
     pub invite_link_prefix: String,
     pub livekit_server: Option<String>,
     pub livekit_key: Option<String>,
@@ -175,9 +180,6 @@ pub struct Config {
     pub anthropic_api_key: Option<Arc<str>>,
     pub anthropic_staff_api_key: Option<Arc<str>>,
     pub llm_closed_beta_model_name: Option<Arc<str>>,
-    pub prediction_api_url: Option<Arc<str>>,
-    pub prediction_api_key: Option<Arc<str>>,
-    pub prediction_model: Option<Arc<str>>,
     pub zed_client_checksum_seed: Option<String>,
     pub slack_panics_webhook: Option<String>,
     pub auto_join_channel_id: Option<ChannelId>,
@@ -228,9 +230,10 @@ impl Config {
             anthropic_api_key: None,
             anthropic_staff_api_key: None,
             llm_closed_beta_model_name: None,
-            prediction_api_url: None,
-            prediction_api_key: None,
-            prediction_model: None,
+            clickhouse_url: None,
+            clickhouse_user: None,
+            clickhouse_password: None,
+            clickhouse_database: None,
             zed_client_checksum_seed: None,
             slack_panics_webhook: None,
             auto_join_channel_id: None,
@@ -280,6 +283,7 @@ pub struct AppState {
     pub stripe_billing: Option<Arc<StripeBilling>>,
     pub rate_limiter: Arc<RateLimiter>,
     pub executor: Executor,
+    pub clickhouse_client: Option<::clickhouse::Client>,
     pub kinesis_client: Option<::aws_sdk_kinesis::Client>,
     pub config: Config,
 }
@@ -333,6 +337,10 @@ impl AppState {
             stripe_client,
             rate_limiter: Arc::new(RateLimiter::new(db)),
             executor,
+            clickhouse_client: config
+                .clickhouse_url
+                .as_ref()
+                .and_then(|_| build_clickhouse_client(&config).log_err()),
             kinesis_client: if config.kinesis_access_key.is_some() {
                 build_kinesis_client(&config).await.log_err()
             } else {
@@ -415,3 +423,31 @@ async fn build_kinesis_client(config: &Config) -> anyhow::Result<aws_sdk_kinesis
 
     Ok(aws_sdk_kinesis::Client::new(&kinesis_config))
 }
+
+fn build_clickhouse_client(config: &Config) -> anyhow::Result<::clickhouse::Client> {
+    Ok(::clickhouse::Client::default()
+        .with_url(
+            config
+                .clickhouse_url
+                .as_ref()
+                .ok_or_else(|| anyhow!("missing clickhouse_url"))?,
+        )
+        .with_user(
+            config
+                .clickhouse_user
+                .as_ref()
+                .ok_or_else(|| anyhow!("missing clickhouse_user"))?,
+        )
+        .with_password(
+            config
+                .clickhouse_password
+                .as_ref()
+                .ok_or_else(|| anyhow!("missing clickhouse_password"))?,
+        )
+        .with_database(
+            config
+                .clickhouse_database
+                .as_ref()
+                .ok_or_else(|| anyhow!("missing clickhouse_database"))?,
+        ))
+}

crates/collab/src/llm.rs

@@ -1,11 +1,14 @@
 mod authorization;
 pub mod db;
+mod telemetry;
 mod token;
 
 use crate::api::events::SnowflakeRow;
 use crate::api::CloudflareIpCountryHeader;
 use crate::build_kinesis_client;
-use crate::{db::UserId, executor::Executor, Cents, Config, Error, Result};
+use crate::{
+    build_clickhouse_client, db::UserId, executor::Executor, Cents, Config, Error, Result,
+};
 use anyhow::{anyhow, Context as _};
 use authorization::authorize_access_to_language_model;
 use axum::routing::get;
@@ -26,10 +29,7 @@ use reqwest_client::ReqwestClient;
 use rpc::{
     proto::Plan, LanguageModelProvider, PerformCompletionParams, EXPIRED_LLM_TOKEN_HEADER_NAME,
 };
-use rpc::{
-    ListModelsResponse, PredictEditsParams, PredictEditsResponse,
-    MAX_LLM_MONTHLY_SPEND_REACHED_HEADER_NAME,
-};
+use rpc::{ListModelsResponse, MAX_LLM_MONTHLY_SPEND_REACHED_HEADER_NAME};
 use serde_json::json;
 use std::{
     pin::Pin,
@@ -37,6 +37,7 @@ use std::{
     task::{Context, Poll},
 };
 use strum::IntoEnumIterator;
+use telemetry::{report_llm_rate_limit, report_llm_usage, LlmRateLimitEventRow, LlmUsageEventRow};
 use tokio::sync::RwLock;
 use util::ResultExt;
 
@@ -48,6 +49,7 @@ pub struct LlmState {
     pub db: Arc<LlmDatabase>,
     pub http_client: ReqwestClient,
     pub kinesis_client: Option<aws_sdk_kinesis::Client>,
+    pub clickhouse_client: Option<clickhouse::Client>,
     active_user_count_by_model:
         RwLock<HashMap<(LanguageModelProvider, String), (DateTime<Utc>, ActiveUserCount)>>,
 }
@@ -84,6 +86,10 @@ impl LlmState {
             } else {
                 None
             },
+            clickhouse_client: config
+                .clickhouse_url
+                .as_ref()
+                .and_then(|_| build_clickhouse_client(&config).log_err()),
             active_user_count_by_model: RwLock::new(HashMap::default()),
             config,
         };
@@ -120,7 +126,6 @@ pub fn routes() -> Router<(), Body> {
     Router::new()
         .route("/models", get(list_models))
         .route("/completion", post(perform_completion))
-        .route("/predict_edits", post(predict_edits))
         .layer(middleware::from_fn(validate_api_token))
 }
 
@@ -434,59 +439,6 @@ fn normalize_model_name(known_models: Vec<String>, name: String) -> String {
     }
 }
 
-async fn predict_edits(
-    Extension(state): Extension<Arc<LlmState>>,
-    Extension(claims): Extension<LlmTokenClaims>,
-    _country_code_header: Option<TypedHeader<CloudflareIpCountryHeader>>,
-    Json(params): Json<PredictEditsParams>,
-) -> Result<impl IntoResponse> {
-    if !claims.is_staff {
-        return Err(anyhow!("not found"))?;
-    }
-
-    let api_url = state
-        .config
-        .prediction_api_url
-        .as_ref()
-        .context("no PREDICTION_API_URL configured on the server")?;
-    let api_key = state
-        .config
-        .prediction_api_key
-        .as_ref()
-        .context("no PREDICTION_API_KEY configured on the server")?;
-    let model = state
-        .config
-        .prediction_model
-        .as_ref()
-        .context("no PREDICTION_MODEL configured on the server")?;
-    let prompt = include_str!("./llm/prediction_prompt.md")
-        .replace("<events>", &params.input_events)
-        .replace("<excerpt>", &params.input_excerpt);
-    let mut response = open_ai::complete_text(
-        &state.http_client,
-        api_url,
-        api_key,
-        open_ai::CompletionRequest {
-            model: model.to_string(),
-            prompt: prompt.clone(),
-            max_tokens: 1024,
-            temperature: 0.,
-            prediction: Some(open_ai::Prediction::Content {
-                content: params.input_excerpt,
-            }),
-            rewrite_speculation: Some(true),
-        },
-    )
-    .await?;
-    let choice = response
-        .choices
-        .pop()
-        .context("no output from completion response")?;
-    Ok(Json(PredictEditsResponse {
-        output_excerpt: choice.text,
-    }))
-}
-
 /// The maximum monthly spending an individual user can reach on the free tier
 /// before they have to pay.
 pub const FREE_TIER_MONTHLY_SPENDING_LIMIT: Cents = Cents::from_dollars(10);
@@ -621,6 +573,34 @@ async fn check_usage_limit(
             .await
             .log_err();
 
+            if let Some(client) = state.clickhouse_client.as_ref() {
+                report_llm_rate_limit(
+                    client,
+                    LlmRateLimitEventRow {
+                        time: Utc::now().timestamp_millis(),
+                        user_id: claims.user_id as i32,
+                        is_staff: claims.is_staff,
+                        plan: match claims.plan {
+                            Plan::Free => "free".to_string(),
+                            Plan::ZedPro => "zed_pro".to_string(),
+                        },
+                        model: model.name.clone(),
+                        provider: provider.to_string(),
+                        usage_measure: resource.to_string(),
+                        requests_this_minute: usage.requests_this_minute as u64,
+                        tokens_this_minute: usage.tokens_this_minute as u64,
+                        tokens_this_day: usage.tokens_this_day as u64,
+                        users_in_recent_minutes: users_in_recent_minutes as u64,
+                        users_in_recent_days: users_in_recent_days as u64,
+                        max_requests_per_minute: per_user_max_requests_per_minute as u64,
+                        max_tokens_per_minute: per_user_max_tokens_per_minute as u64,
+                        max_tokens_per_day: per_user_max_tokens_per_day as u64,
+                    },
+                )
+                .await
+                .log_err();
+            }
+
             return Err(Error::http(
                 StatusCode::TOO_MANY_REQUESTS,
                 format!("Rate limit exceeded. Maximum {} reached.", resource),
@@ -707,8 +687,6 @@ impl<S> Drop for TokenCountingStream<S> {
                 );
 
                 let properties = json!({
-                    "has_llm_subscription": claims.has_llm_subscription,
-                    "max_monthly_spend_in_cents": claims.max_monthly_spend_in_cents,
                     "plan": match claims.plan {
                         Plan::Free => "free".to_string(),
                         Plan::ZedPro => "zed_pro".to_string(),
@@ -728,6 +706,44 @@ impl<S> Drop for TokenCountingStream<S> {
                 .write(&state.kinesis_client, &state.config.kinesis_stream)
                 .await
                 .log_err();
+
+                if let Some(clickhouse_client) = state.clickhouse_client.as_ref() {
+                    report_llm_usage(
+                        clickhouse_client,
+                        LlmUsageEventRow {
+                            time: Utc::now().timestamp_millis(),
+                            user_id: claims.user_id as i32,
+                            is_staff: claims.is_staff,
+                            plan: match claims.plan {
+                                Plan::Free => "free".to_string(),
+                                Plan::ZedPro => "zed_pro".to_string(),
+                            },
+                            model,
+                            provider: provider.to_string(),
+                            input_token_count: tokens.input as u64,
+                            cache_creation_input_token_count: tokens.input_cache_creation as u64,
+                            cache_read_input_token_count: tokens.input_cache_read as u64,
+                            output_token_count: tokens.output as u64,
+                            requests_this_minute: usage.requests_this_minute as u64,
+                            tokens_this_minute: usage.tokens_this_minute as u64,
+                            tokens_this_day: usage.tokens_this_day as u64,
+                            input_tokens_this_month: usage.tokens_this_month.input as u64,
+                            cache_creation_input_tokens_this_month: usage
+                                .tokens_this_month
+                                .input_cache_creation
+                                as u64,
+                            cache_read_input_tokens_this_month: usage
+                                .tokens_this_month
+                                .input_cache_read
+                                as u64,
+                            output_tokens_this_month: usage.tokens_this_month.output as u64,
+                            spending_this_month: usage.spending_this_month.0 as u64,
+                            lifetime_spending: usage.lifetime_spending.0 as u64,
+                        },
+                    )
+                    .await
+                    .log_err();
+                }
             }
         })
     }

crates/collab/src/llm/prediction_prompt.md

@@ -1,12 +0,0 @@
-Below is an instruction that describes a task, paired with an input that provides further context. Write a response that appropriately completes the request.
-
-### Instruction:
-You are a code completion assistant and your task is to analyze user edits and then rewrite an excerpt that the user provides, suggesting the appropriate edits within the excerpt, taking into account the cursor location.
-
-### Events:
-<events>
-
-### Input:
-<excerpt>
-
-### Response:

crates/collab/src/llm/telemetry.rs

@@ -0,0 +1,65 @@
+use anyhow::{Context, Result};
+use serde::Serialize;
+
+use crate::clickhouse::write_to_table;
+
+#[derive(Serialize, Debug, clickhouse::Row)]
+pub struct LlmUsageEventRow {
+    pub time: i64,
+    pub user_id: i32,
+    pub is_staff: bool,
+    pub plan: String,
+    pub model: String,
+    pub provider: String,
+    pub input_token_count: u64,
+    pub cache_creation_input_token_count: u64,
+    pub cache_read_input_token_count: u64,
+    pub output_token_count: u64,
+    pub requests_this_minute: u64,
+    pub tokens_this_minute: u64,
+    pub tokens_this_day: u64,
+    pub input_tokens_this_month: u64,
+    pub cache_creation_input_tokens_this_month: u64,
+    pub cache_read_input_tokens_this_month: u64,
+    pub output_tokens_this_month: u64,
+    pub spending_this_month: u64,
+    pub lifetime_spending: u64,
+}
+
+#[derive(Serialize, Debug, clickhouse::Row)]
+pub struct LlmRateLimitEventRow {
+    pub time: i64,
+    pub user_id: i32,
+    pub is_staff: bool,
+    pub plan: String,
+    pub model: String,
+    pub provider: String,
+    pub usage_measure: String,
+    pub requests_this_minute: u64,
+    pub tokens_this_minute: u64,
+    pub tokens_this_day: u64,
+    pub users_in_recent_minutes: u64,
+    pub users_in_recent_days: u64,
+    pub max_requests_per_minute: u64,
+    pub max_tokens_per_minute: u64,
+    pub max_tokens_per_day: u64,
+}
+
+pub async fn report_llm_usage(client: &clickhouse::Client, row: LlmUsageEventRow) -> Result<()> {
+    const LLM_USAGE_EVENTS_TABLE: &str = "llm_usage_events";
+    write_to_table(LLM_USAGE_EVENTS_TABLE, &[row], client)
+        .await
+        .with_context(|| format!("failed to upload to table '{LLM_USAGE_EVENTS_TABLE}'"))?;
+    Ok(())
+}
+
+pub async fn report_llm_rate_limit(
+    client: &clickhouse::Client,
+    row: LlmRateLimitEventRow,
+) -> Result<()> {
+    const LLM_RATE_LIMIT_EVENTS_TABLE: &str = "llm_rate_limit_events";
+    write_to_table(LLM_RATE_LIMIT_EVENTS_TABLE, &[row], client)
+        .await
+        .with_context(|| format!("failed to upload to table '{LLM_RATE_LIMIT_EVENTS_TABLE}'"))?;
+    Ok(())
+}

crates/collab/src/llm/token.rs

@@ -17,8 +17,10 @@ pub struct LlmTokenClaims {
     pub exp: u64,
     pub jti: String,
     pub user_id: u64,
+    #[serde(default)]
     pub system_id: Option<String>,
-    pub metrics_id: Uuid,
+    #[serde(default)]
+    pub metrics_id: Option<Uuid>,
     pub github_user_login: String,
     pub is_staff: bool,
     pub has_llm_closed_beta_feature_flag: bool,
@@ -54,7 +56,7 @@ impl LlmTokenClaims {
             jti: uuid::Uuid::new_v4().to_string(),
             user_id: user.id.to_proto(),
             system_id,
-            metrics_id: user.metrics_id,
+            metrics_id: Some(user.metrics_id),
             github_user_login: user.github_login.clone(),
             is_staff,
             has_llm_closed_beta_feature_flag,

crates/collab/src/rpc.rs

@@ -309,7 +309,6 @@ impl Server {
             .add_request_handler(forward_read_only_project_request::<proto::ResolveInlayHint>)
             .add_request_handler(forward_read_only_project_request::<proto::OpenBufferByPath>)
             .add_request_handler(forward_read_only_project_request::<proto::GitBranches>)
-            .add_request_handler(forward_read_only_project_request::<proto::GetStagedText>)
             .add_request_handler(forward_mutating_project_request::<proto::UpdateGitBranch>)
             .add_request_handler(forward_mutating_project_request::<proto::GetCompletions>)
             .add_request_handler(

crates/collab/src/tests/following_tests.rs

@@ -1,5 +1,5 @@
 #![allow(clippy::reversed_empty_ranges)]
-use crate::tests::TestServer;
+use crate::{rpc::RECONNECT_TIMEOUT, tests::TestServer};
 use call::{ActiveCall, ParticipantLocation};
 use client::ChannelId;
 use collab_ui::{
@@ -9,14 +9,19 @@ use collab_ui::{
 use editor::{Editor, ExcerptRange, MultiBuffer};
 use gpui::{
     point, BackgroundExecutor, BorrowAppContext, Context, Entity, SharedString, TestAppContext,
-    View, VisualContext, VisualTestContext,
+    TestScreenCaptureSource, View, VisualContext, VisualTestContext,
 };
 use language::Capability;
 use project::WorktreeSettings;
 use rpc::proto::PeerId;
 use serde_json::json;
 use settings::SettingsStore;
-use workspace::{item::ItemHandle as _, SplitDirection, Workspace};
+use workspace::{
+    dock::{test::TestPanel, DockPosition},
+    item::{test::TestItem, ItemHandle as _},
+    shared_screen::SharedScreen,
+    SplitDirection, Workspace,
+};
 
 use super::TestClient;
 
@@ -422,118 +427,106 @@ async fn test_basic_following(
         editor_a1.item_id()
     );
 
-    // TODO: Re-enable this test once we can replace our swift Livekit SDK with the rust SDK
-    #[cfg(not(target_os = "macos"))]
-    {
-        use crate::rpc::RECONNECT_TIMEOUT;
-        use gpui::TestScreenCaptureSource;
-        use workspace::{
-            dock::{test::TestPanel, DockPosition},
-            item::test::TestItem,
-            shared_screen::SharedScreen,
-        };
-
-        // Client B activates an external window, which causes a new screen-sharing item to be added to the pane.
-        let display = TestScreenCaptureSource::new();
-        active_call_b
-            .update(cx_b, |call, cx| call.set_location(None, cx))
-            .await
-            .unwrap();
-        cx_b.set_screen_capture_sources(vec![display]);
-        active_call_b
-            .update(cx_b, |call, cx| {
-                call.room()
-                    .unwrap()
-                    .update(cx, |room, cx| room.share_screen(cx))
-            })
-            .await
-            .unwrap(); // This is what breaks
-        executor.run_until_parked();
-        let shared_screen = workspace_a.update(cx_a, |workspace, cx| {
-            workspace
-                .active_item(cx)
-                .expect("no active item")
-                .downcast::<SharedScreen>()
-                .expect("active item isn't a shared screen")
-        });
-
-        // Client B activates Zed again, which causes the previous editor to become focused again.
-        active_call_b
-            .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
-            .await
-            .unwrap();
-        executor.run_until_parked();
-        workspace_a.update(cx_a, |workspace, cx| {
-            assert_eq!(
-                workspace.active_item(cx).unwrap().item_id(),
-                editor_a1.item_id()
-            )
-        });
-
-        // Client B activates a multibuffer that was created by following client A. Client A returns to that multibuffer.
-        workspace_b.update(cx_b, |workspace, cx| {
-            workspace.activate_item(&multibuffer_editor_b, true, true, cx)
-        });
-        executor.run_until_parked();
-        workspace_a.update(cx_a, |workspace, cx| {
-            assert_eq!(
-                workspace.active_item(cx).unwrap().item_id(),
-                multibuffer_editor_a.item_id()
-            )
-        });
-
-        // Client B activates a panel, and the previously-opened screen-sharing item gets activated.
-        let panel = cx_b.new_view(|cx| TestPanel::new(DockPosition::Left, cx));
-        workspace_b.update(cx_b, |workspace, cx| {
-            workspace.add_panel(panel, cx);
-            workspace.toggle_panel_focus::<TestPanel>(cx);
-        });
-        executor.run_until_parked();
-        assert_eq!(
-            workspace_a.update(cx_a, |workspace, cx| workspace
-                .active_item(cx)
+    // Client B activates an external window, which causes a new screen-sharing item to be added to the pane.
+    let display = TestScreenCaptureSource::new();
+    active_call_b
+        .update(cx_b, |call, cx| call.set_location(None, cx))
+        .await
+        .unwrap();
+    cx_b.set_screen_capture_sources(vec![display]);
+    active_call_b
+        .update(cx_b, |call, cx| {
+            call.room()
                 .unwrap()
-                .item_id()),
-            shared_screen.item_id()
-        );
+                .update(cx, |room, cx| room.share_screen(cx))
+        })
+        .await
+        .unwrap();
+    executor.run_until_parked();
+    let shared_screen = workspace_a.update(cx_a, |workspace, cx| {
+        workspace
+            .active_item(cx)
+            .expect("no active item")
+            .downcast::<SharedScreen>()
+            .expect("active item isn't a shared screen")
+    });
 
-        // Toggling the focus back to the pane causes client A to return to the multibuffer.
-        workspace_b.update(cx_b, |workspace, cx| {
-            workspace.toggle_panel_focus::<TestPanel>(cx);
-        });
-        executor.run_until_parked();
-        workspace_a.update(cx_a, |workspace, cx| {
-            assert_eq!(
-                workspace.active_item(cx).unwrap().item_id(),
-                multibuffer_editor_a.item_id()
-            )
-        });
-
-        // Client B activates an item that doesn't implement following,
-        // so the previously-opened screen-sharing item gets activated.
-        let unfollowable_item = cx_b.new_view(TestItem::new);
-        workspace_b.update(cx_b, |workspace, cx| {
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.add_item(Box::new(unfollowable_item), true, true, None, cx)
-            })
-        });
-        executor.run_until_parked();
+    // Client B activates Zed again, which causes the previous editor to become focused again.
+    active_call_b
+        .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
+        .await
+        .unwrap();
+    executor.run_until_parked();
+    workspace_a.update(cx_a, |workspace, cx| {
         assert_eq!(
-            workspace_a.update(cx_a, |workspace, cx| workspace
-                .active_item(cx)
-                .unwrap()
-                .item_id()),
-            shared_screen.item_id()
-        );
+            workspace.active_item(cx).unwrap().item_id(),
+            editor_a1.item_id()
+        )
+    });
 
-        // Following interrupts when client B disconnects.
-        client_b.disconnect(&cx_b.to_async());
-        executor.advance_clock(RECONNECT_TIMEOUT);
+    // 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)
+    });
+    executor.run_until_parked();
+    workspace_a.update(cx_a, |workspace, cx| {
         assert_eq!(
-            workspace_a.update(cx_a, |workspace, _| workspace.leader_for_pane(&pane_a)),
-            None
-        );
-    }
+            workspace.active_item(cx).unwrap().item_id(),
+            multibuffer_editor_a.item_id()
+        )
+    });
+
+    // Client B activates a panel, and the previously-opened screen-sharing item gets activated.
+    let panel = cx_b.new_view(|cx| TestPanel::new(DockPosition::Left, cx));
+    workspace_b.update(cx_b, |workspace, cx| {
+        workspace.add_panel(panel, cx);
+        workspace.toggle_panel_focus::<TestPanel>(cx);
+    });
+    executor.run_until_parked();
+    assert_eq!(
+        workspace_a.update(cx_a, |workspace, cx| workspace
+            .active_item(cx)
+            .unwrap()
+            .item_id()),
+        shared_screen.item_id()
+    );
+
+    // Toggling the focus back to the pane causes client A to return to the multibuffer.
+    workspace_b.update(cx_b, |workspace, cx| {
+        workspace.toggle_panel_focus::<TestPanel>(cx);
+    });
+    executor.run_until_parked();
+    workspace_a.update(cx_a, |workspace, cx| {
+        assert_eq!(
+            workspace.active_item(cx).unwrap().item_id(),
+            multibuffer_editor_a.item_id()
+        )
+    });
+
+    // Client B activates an item that doesn't implement following,
+    // so the previously-opened screen-sharing item gets activated.
+    let unfollowable_item = cx_b.new_view(TestItem::new);
+    workspace_b.update(cx_b, |workspace, cx| {
+        workspace.active_pane().update(cx, |pane, cx| {
+            pane.add_item(Box::new(unfollowable_item), true, true, None, cx)
+        })
+    });
+    executor.run_until_parked();
+    assert_eq!(
+        workspace_a.update(cx_a, |workspace, cx| workspace
+            .active_item(cx)
+            .unwrap()
+            .item_id()),
+        shared_screen.item_id()
+    );
+
+    // Following interrupts when client B disconnects.
+    client_b.disconnect(&cx_b.to_async());
+    executor.advance_clock(RECONNECT_TIMEOUT);
+    assert_eq!(
+        workspace_a.update(cx_a, |workspace, _| workspace.leader_for_pane(&pane_a)),
+        None
+    );
 }
 
 #[gpui::test]

crates/collab/src/tests/integration_tests.rs

@@ -16,7 +16,7 @@ use futures::{channel::mpsc, StreamExt as _};
 use git::repository::GitFileStatus;
 use gpui::{
     px, size, AppContext, BackgroundExecutor, Model, Modifiers, MouseButton, MouseDownEvent,
-    TestAppContext, UpdateGlobal,
+    TestAppContext, TestScreenCaptureSource, UpdateGlobal,
 };
 use language::{
     language_settings::{
@@ -240,60 +240,56 @@ async fn test_basic_calls(
         }
     );
 
-    // TODO: Re-enable this test once we can replace our swift Livekit SDK with the rust SDK
-    #[cfg(not(target_os = "macos"))]
-    {
-        // User A shares their screen
-        let display = gpui::TestScreenCaptureSource::new();
-        let events_b = active_call_events(cx_b);
-        let events_c = active_call_events(cx_c);
-        cx_a.set_screen_capture_sources(vec![display]);
-        active_call_a
-            .update(cx_a, |call, cx| {
-                call.room()
-                    .unwrap()
-                    .update(cx, |room, cx| room.share_screen(cx))
-            })
-            .await
-            .unwrap();
+    // User A shares their screen
+    let display = TestScreenCaptureSource::new();
+    let events_b = active_call_events(cx_b);
+    let events_c = active_call_events(cx_c);
+    cx_a.set_screen_capture_sources(vec![display]);
+    active_call_a
+        .update(cx_a, |call, cx| {
+            call.room()
+                .unwrap()
+                .update(cx, |room, cx| room.share_screen(cx))
+        })
+        .await
+        .unwrap();
 
-        executor.run_until_parked();
+    executor.run_until_parked();
 
-        // User B observes the remote screen sharing track.
-        assert_eq!(events_b.borrow().len(), 1);
-        let event_b = events_b.borrow().first().unwrap().clone();
-        if let call::room::Event::RemoteVideoTracksChanged { participant_id } = event_b {
-            assert_eq!(participant_id, client_a.peer_id().unwrap());
+    // User B observes the remote screen sharing track.
+    assert_eq!(events_b.borrow().len(), 1);
+    let event_b = events_b.borrow().first().unwrap().clone();
+    if let call::room::Event::RemoteVideoTracksChanged { participant_id } = event_b {
+        assert_eq!(participant_id, client_a.peer_id().unwrap());
 
-            room_b.read_with(cx_b, |room, _| {
-                assert_eq!(
-                    room.remote_participants()[&client_a.user_id().unwrap()]
-                        .video_tracks
-                        .len(),
-                    1
-                );
-            });
-        } else {
-            panic!("unexpected event")
-        }
+        room_b.read_with(cx_b, |room, _| {
+            assert_eq!(
+                room.remote_participants()[&client_a.user_id().unwrap()]
+                    .video_tracks
+                    .len(),
+                1
+            );
+        });
+    } else {
+        panic!("unexpected event")
+    }
 
-        // User C observes the remote screen sharing track.
-        assert_eq!(events_c.borrow().len(), 1);
-        let event_c = events_c.borrow().first().unwrap().clone();
-        if let call::room::Event::RemoteVideoTracksChanged { participant_id } = event_c {
-            assert_eq!(participant_id, client_a.peer_id().unwrap());
+    // User C observes the remote screen sharing track.
+    assert_eq!(events_c.borrow().len(), 1);
+    let event_c = events_c.borrow().first().unwrap().clone();
+    if let call::room::Event::RemoteVideoTracksChanged { participant_id } = event_c {
+        assert_eq!(participant_id, client_a.peer_id().unwrap());
 
-            room_c.read_with(cx_c, |room, _| {
-                assert_eq!(
-                    room.remote_participants()[&client_a.user_id().unwrap()]
-                        .video_tracks
-                        .len(),
-                    1
-                );
-            });
-        } else {
-            panic!("unexpected event")
-        }
+        room_c.read_with(cx_c, |room, _| {
+            assert_eq!(
+                room.remote_participants()[&client_a.user_id().unwrap()]
+                    .video_tracks
+                    .len(),
+                1
+            );
+        });
+    } else {
+        panic!("unexpected event")
     }
 
     // User A leaves the room.
@@ -2574,23 +2570,19 @@ async fn test_git_diff_base_change(
         .update(cx_a, |p, cx| p.open_buffer((worktree_id, "a.txt"), cx))
         .await
         .unwrap();
-    let change_set_local_a = project_local
-        .update(cx_a, |p, cx| {
-            p.open_unstaged_changes(buffer_local_a.clone(), cx)
-        })
-        .await
-        .unwrap();
 
     // Wait for it to catch up to the new diff
     executor.run_until_parked();
-    change_set_local_a.read_with(cx_a, |change_set, cx| {
-        let buffer = buffer_local_a.read(cx);
+
+    // Smoke test diffing
+
+    buffer_local_a.read_with(cx_a, |buffer, _| {
         assert_eq!(
-            change_set.base_text_string(cx).as_deref(),
+            buffer.diff_base().map(|rope| rope.to_string()).as_deref(),
             Some(diff_base.as_str())
         );
         git::diff::assert_hunks(
-            change_set.diff_to_buffer.hunks_in_row_range(0..4, buffer),
+            buffer.snapshot().git_diff_hunks_in_row_range(0..4),
             buffer,
             &diff_base,
             &[(1..2, "", "two\n")],
@@ -2602,30 +2594,25 @@ async fn test_git_diff_base_change(
         .update(cx_b, |p, cx| p.open_buffer((worktree_id, "a.txt"), cx))
         .await
         .unwrap();
-    let change_set_remote_a = project_remote
-        .update(cx_b, |p, cx| {
-            p.open_unstaged_changes(buffer_remote_a.clone(), cx)
-        })
-        .await
-        .unwrap();
 
     // Wait remote buffer to catch up to the new diff
     executor.run_until_parked();
-    change_set_remote_a.read_with(cx_b, |change_set, cx| {
-        let buffer = buffer_remote_a.read(cx);
+
+    // Smoke test diffing
+
+    buffer_remote_a.read_with(cx_b, |buffer, _| {
         assert_eq!(
-            change_set.base_text_string(cx).as_deref(),
+            buffer.diff_base().map(|rope| rope.to_string()).as_deref(),
             Some(diff_base.as_str())
         );
         git::diff::assert_hunks(
-            change_set.diff_to_buffer.hunks_in_row_range(0..4, buffer),
+            buffer.snapshot().git_diff_hunks_in_row_range(0..4),
             buffer,
             &diff_base,
             &[(1..2, "", "two\n")],
         );
     });
 
-    // Update the staged text of the open buffer
     client_a.fs().set_index_for_repo(
         Path::new("/dir/.git"),
         &[(Path::new("a.txt"), new_diff_base.clone())],
@@ -2633,35 +2620,40 @@ async fn test_git_diff_base_change(
 
     // Wait for buffer_local_a to receive it
     executor.run_until_parked();
-    change_set_local_a.read_with(cx_a, |change_set, cx| {
-        let buffer = buffer_local_a.read(cx);
+
+    // Smoke test new diffing
+
+    buffer_local_a.read_with(cx_a, |buffer, _| {
         assert_eq!(
-            change_set.base_text_string(cx).as_deref(),
+            buffer.diff_base().map(|rope| rope.to_string()).as_deref(),
             Some(new_diff_base.as_str())
         );
+
         git::diff::assert_hunks(
-            change_set.diff_to_buffer.hunks_in_row_range(0..4, buffer),
+            buffer.snapshot().git_diff_hunks_in_row_range(0..4),
             buffer,
-            &new_diff_base,
+            &diff_base,
             &[(2..3, "", "three\n")],
         );
     });
 
-    change_set_remote_a.read_with(cx_b, |change_set, cx| {
-        let buffer = buffer_remote_a.read(cx);
+    // Smoke test B
+
+    buffer_remote_a.read_with(cx_b, |buffer, _| {
         assert_eq!(
-            change_set.base_text_string(cx).as_deref(),
+            buffer.diff_base().map(|rope| rope.to_string()).as_deref(),
             Some(new_diff_base.as_str())
         );
         git::diff::assert_hunks(
-            change_set.diff_to_buffer.hunks_in_row_range(0..4, buffer),
+            buffer.snapshot().git_diff_hunks_in_row_range(0..4),
             buffer,
-            &new_diff_base,
+            &diff_base,
             &[(2..3, "", "three\n")],
         );
     });
 
-    // Nested git dir
+    //Nested git dir
+
     let diff_base = "
         one
         three
@@ -2684,23 +2676,19 @@ async fn test_git_diff_base_change(
         .update(cx_a, |p, cx| p.open_buffer((worktree_id, "sub/b.txt"), cx))
         .await
         .unwrap();
-    let change_set_local_b = project_local
-        .update(cx_a, |p, cx| {
-            p.open_unstaged_changes(buffer_local_b.clone(), cx)
-        })
-        .await
-        .unwrap();
 
     // Wait for it to catch up to the new diff
     executor.run_until_parked();
-    change_set_local_b.read_with(cx_a, |change_set, cx| {
-        let buffer = buffer_local_b.read(cx);
+
+    // Smoke test diffing
+
+    buffer_local_b.read_with(cx_a, |buffer, _| {
         assert_eq!(
-            change_set.base_text_string(cx).as_deref(),
+            buffer.diff_base().map(|rope| rope.to_string()).as_deref(),
             Some(diff_base.as_str())
         );
         git::diff::assert_hunks(
-            change_set.diff_to_buffer.hunks_in_row_range(0..4, buffer),
+            buffer.snapshot().git_diff_hunks_in_row_range(0..4),
             buffer,
             &diff_base,
             &[(1..2, "", "two\n")],
@@ -2712,29 +2700,25 @@ async fn test_git_diff_base_change(
         .update(cx_b, |p, cx| p.open_buffer((worktree_id, "sub/b.txt"), cx))
         .await
         .unwrap();
-    let change_set_remote_b = project_remote
-        .update(cx_b, |p, cx| {
-            p.open_unstaged_changes(buffer_remote_b.clone(), cx)
-        })
-        .await
-        .unwrap();
 
+    // Wait remote buffer to catch up to the new diff
     executor.run_until_parked();
-    change_set_remote_b.read_with(cx_b, |change_set, cx| {
-        let buffer = buffer_remote_b.read(cx);
+
+    // Smoke test diffing
+
+    buffer_remote_b.read_with(cx_b, |buffer, _| {
         assert_eq!(
-            change_set.base_text_string(cx).as_deref(),
+            buffer.diff_base().map(|rope| rope.to_string()).as_deref(),
             Some(diff_base.as_str())
         );
         git::diff::assert_hunks(
-            change_set.diff_to_buffer.hunks_in_row_range(0..4, buffer),
+            buffer.snapshot().git_diff_hunks_in_row_range(0..4),
             buffer,
             &diff_base,
             &[(1..2, "", "two\n")],
         );
     });
 
-    // Update the staged text
     client_a.fs().set_index_for_repo(
         Path::new("/dir/sub/.git"),
         &[(Path::new("b.txt"), new_diff_base.clone())],
@@ -2742,30 +2726,43 @@ async fn test_git_diff_base_change(
 
     // Wait for buffer_local_b to receive it
     executor.run_until_parked();
-    change_set_local_b.read_with(cx_a, |change_set, cx| {
-        let buffer = buffer_local_b.read(cx);
+
+    // Smoke test new diffing
+
+    buffer_local_b.read_with(cx_a, |buffer, _| {
         assert_eq!(
-            change_set.base_text_string(cx).as_deref(),
+            buffer.diff_base().map(|rope| rope.to_string()).as_deref(),
             Some(new_diff_base.as_str())
         );
+        println!("{:?}", buffer.as_rope().to_string());
+        println!("{:?}", buffer.diff_base());
+        println!(
+            "{:?}",
+            buffer
+                .snapshot()
+                .git_diff_hunks_in_row_range(0..4)
+                .collect::<Vec<_>>()
+        );
+
         git::diff::assert_hunks(
-            change_set.diff_to_buffer.hunks_in_row_range(0..4, buffer),
+            buffer.snapshot().git_diff_hunks_in_row_range(0..4),
             buffer,
-            &new_diff_base,
+            &diff_base,
             &[(2..3, "", "three\n")],
         );
     });
 
-    change_set_remote_b.read_with(cx_b, |change_set, cx| {
-        let buffer = buffer_remote_b.read(cx);
+    // Smoke test B
+
+    buffer_remote_b.read_with(cx_b, |buffer, _| {
         assert_eq!(
-            change_set.base_text_string(cx).as_deref(),
+            buffer.diff_base().map(|rope| rope.to_string()).as_deref(),
             Some(new_diff_base.as_str())
         );
         git::diff::assert_hunks(
-            change_set.diff_to_buffer.hunks_in_row_range(0..4, buffer),
+            buffer.snapshot().git_diff_hunks_in_row_range(0..4),
             buffer,
-            &new_diff_base,
+            &diff_base,
             &[(2..3, "", "three\n")],
         );
     });
@@ -6028,8 +6025,6 @@ async fn test_contact_requests(
     }
 }
 
-// TODO: Re-enable this test once we can replace our swift Livekit SDK with the rust SDK
-#[cfg(not(target_os = "macos"))]
 #[gpui::test(iterations = 10)]
 async fn test_join_call_after_screen_was_shared(
     executor: BackgroundExecutor,
@@ -6072,7 +6067,7 @@ async fn test_join_call_after_screen_was_shared(
     assert_eq!(call_b.calling_user.github_login, "user_a");
 
     // User A shares their screen
-    let display = gpui::TestScreenCaptureSource::new();
+    let display = TestScreenCaptureSource::new();
     cx_a.set_screen_capture_sources(vec![display]);
     active_call_a
         .update(cx_a, |call, cx| {

crates/collab/src/tests/random_project_collaboration_tests.rs

@@ -1336,24 +1336,10 @@ impl RandomizedTest for ProjectCollaborationTest {
                         (_, None) => panic!("guest's file is None, hosts's isn't"),
                     }
 
-                    let host_diff_base = host_project.read_with(host_cx, |project, cx| {
-                        project
-                            .buffer_store()
-                            .read(cx)
-                            .get_unstaged_changes(host_buffer.read(cx).remote_id())
-                            .unwrap()
-                            .read(cx)
-                            .base_text_string(cx)
-                    });
-                    let guest_diff_base = guest_project.read_with(client_cx, |project, cx| {
-                        project
-                            .buffer_store()
-                            .read(cx)
-                            .get_unstaged_changes(guest_buffer.read(cx).remote_id())
-                            .unwrap()
-                            .read(cx)
-                            .base_text_string(cx)
-                    });
+                    let host_diff_base = host_buffer
+                        .read_with(host_cx, |b, _| b.diff_base().map(ToString::to_string));
+                    let guest_diff_base = guest_buffer
+                        .read_with(client_cx, |b, _| b.diff_base().map(ToString::to_string));
                     assert_eq!(
                             guest_diff_base, host_diff_base,
                             "guest {} diff base does not match host's for path {path:?} in project {project_id}",

crates/collab/src/tests/test_server.rs

@@ -518,6 +518,7 @@ impl TestServer {
             stripe_billing: None,
             rate_limiter: Arc::new(RateLimiter::new(test_db.db().clone())),
             executor,
+            clickhouse_client: None,
             kinesis_client: None,
             config: Config {
                 http_port: 0,
@@ -545,9 +546,10 @@ impl TestServer {
                 anthropic_api_key: None,
                 anthropic_staff_api_key: None,
                 llm_closed_beta_model_name: None,
-                prediction_api_url: None,
-                prediction_api_key: None,
-                prediction_model: None,
+                clickhouse_url: None,
+                clickhouse_user: None,
+                clickhouse_password: None,
+                clickhouse_database: None,
                 zed_client_checksum_seed: None,
                 slack_panics_webhook: None,
                 auto_join_channel_id: None,
@@ -589,7 +591,7 @@ impl Deref for TestClient {
 }
 
 impl TestClient {
-    pub fn fs(&self) -> Arc<FakeFs> {
+    pub fn fs(&self) -> &FakeFs {
         self.app_state.fs.as_fake()
     }
 

crates/copilot/Cargo.toml

@@ -59,21 +59,18 @@ workspace.workspace = true
 async-std = { version = "1.12.0", features = ["unstable"] }
 
 [dev-dependencies]
+clock.workspace = true
 indoc.workspace = true
 serde_json.workspace = true
-clock = { workspace = true, features = ["test-support"] }
-client = { workspace = true, features = ["test-support"] }
 collections = { workspace = true, features = ["test-support"] }
 editor = { workspace = true, features = ["test-support"] }
 fs = { workspace = true, features = ["test-support"] }
 gpui = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
 language = { workspace = true, features = ["test-support"] }
 lsp = { workspace = true, features = ["test-support"] }
-node_runtime = { workspace = true, features = ["test-support"] }
 project = { workspace = true, features = ["test-support"] }
 rpc = { workspace = true, features = ["test-support"] }
 settings = { workspace = true, features = ["test-support"] }
 theme = { workspace = true, features = ["test-support"] }
 util = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
+http_client = { workspace = true, features = ["test-support"] }

crates/copilot/src/copilot_completion_provider.rs

@@ -1,13 +1,14 @@
 use crate::{Completion, Copilot};
 use anyhow::Result;
+use client::telemetry::Telemetry;
 use gpui::{AppContext, EntityId, Model, ModelContext, Task};
-use inline_completion::{Direction, InlineCompletion, InlineCompletionProvider};
+use inline_completion::{CompletionProposal, Direction, InlayProposal, InlineCompletionProvider};
 use language::{
     language_settings::{all_language_settings, AllLanguageSettings},
     Buffer, OffsetRangeExt, ToOffset,
 };
 use settings::Settings;
-use std::{path::Path, time::Duration};
+use std::{path::Path, sync::Arc, time::Duration};
 
 pub const COPILOT_DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(75);
 
@@ -20,6 +21,7 @@ pub struct CopilotCompletionProvider {
     pending_refresh: Task<Result<()>>,
     pending_cycling_refresh: Task<Result<()>>,
     copilot: Model<Copilot>,
+    telemetry: Option<Arc<Telemetry>>,
 }
 
 impl CopilotCompletionProvider {
@@ -33,9 +35,15 @@ impl CopilotCompletionProvider {
             pending_refresh: Task::ready(Ok(())),
             pending_cycling_refresh: Task::ready(Ok(())),
             copilot,
+            telemetry: None,
         }
     }
 
+    pub fn with_telemetry(mut self, telemetry: Arc<Telemetry>) -> Self {
+        self.telemetry = Some(telemetry);
+        self
+    }
+
     fn active_completion(&self) -> Option<&Completion> {
         self.completions.get(self.active_completion_index)
     }
@@ -182,10 +190,23 @@ impl InlineCompletionProvider for CopilotCompletionProvider {
             self.copilot
                 .update(cx, |copilot, cx| copilot.accept_completion(completion, cx))
                 .detach_and_log_err(cx);
+            if self.active_completion().is_some() {
+                if let Some(telemetry) = self.telemetry.as_ref() {
+                    telemetry.report_inline_completion_event(
+                        Self::name().to_string(),
+                        true,
+                        self.file_extension.clone(),
+                    );
+                }
+            }
         }
     }
 
-    fn discard(&mut self, cx: &mut ModelContext<Self>) {
+    fn discard(
+        &mut self,
+        should_report_inline_completion_event: bool,
+        cx: &mut ModelContext<Self>,
+    ) {
         let settings = AllLanguageSettings::get_global(cx);
 
         let copilot_enabled = settings.inline_completions_enabled(None, None, cx);
@@ -199,14 +220,24 @@ impl InlineCompletionProvider for CopilotCompletionProvider {
                 copilot.discard_completions(&self.completions, cx)
             })
             .detach_and_log_err(cx);
+
+        if should_report_inline_completion_event && self.active_completion().is_some() {
+            if let Some(telemetry) = self.telemetry.as_ref() {
+                telemetry.report_inline_completion_event(
+                    Self::name().to_string(),
+                    false,
+                    self.file_extension.clone(),
+                );
+            }
+        }
     }
 
-    fn suggest(
-        &mut self,
+    fn active_completion_text<'a>(
+        &'a self,
         buffer: &Model<Buffer>,
         cursor_position: language::Anchor,
-        cx: &mut ModelContext<Self>,
-    ) -> Option<InlineCompletion> {
+        cx: &'a AppContext,
+    ) -> Option<CompletionProposal> {
         let buffer_id = buffer.entity_id();
         let buffer = buffer.read(cx);
         let completion = self.active_completion()?;
@@ -236,9 +267,13 @@ impl InlineCompletionProvider for CopilotCompletionProvider {
             if completion_text.trim().is_empty() {
                 None
             } else {
-                let position = cursor_position.bias_right(buffer);
-                Some(InlineCompletion {
-                    edits: vec![(position..position, completion_text.into())],
+                Some(CompletionProposal {
+                    inlays: vec![InlayProposal::Suggestion(
+                        cursor_position.bias_right(buffer),
+                        completion_text.into(),
+                    )],
+                    text: completion_text.into(),
+                    delete_range: None,
                 })
             }
         } else {
@@ -324,7 +359,7 @@ mod tests {
         executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
         cx.update_editor(|editor, cx| {
             assert!(editor.context_menu_visible());
-            assert!(!editor.has_active_inline_completion());
+            assert!(!editor.has_active_inline_completion(cx));
 
             // Confirming a completion inserts it and hides the context menu, without showing
             // the copilot suggestion afterwards.
@@ -333,7 +368,7 @@ mod tests {
                 .unwrap()
                 .detach();
             assert!(!editor.context_menu_visible());
-            assert!(!editor.has_active_inline_completion());
+            assert!(!editor.has_active_inline_completion(cx));
             assert_eq!(editor.text(cx), "one.completion_a\ntwo\nthree\n");
             assert_eq!(editor.display_text(cx), "one.completion_a\ntwo\nthree\n");
         });
@@ -366,7 +401,7 @@ mod tests {
         executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
         cx.update_editor(|editor, cx| {
             assert!(!editor.context_menu_visible());
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one.copilot1\ntwo\nthree\n");
             assert_eq!(editor.text(cx), "one.\ntwo\nthree\n");
         });
@@ -399,12 +434,12 @@ mod tests {
         executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
         cx.update_editor(|editor, cx| {
             assert!(editor.context_menu_visible());
-            assert!(!editor.has_active_inline_completion());
+            assert!(!editor.has_active_inline_completion(cx));
 
             // When hiding the context menu, the Copilot suggestion becomes visible.
             editor.cancel(&Default::default(), cx);
             assert!(!editor.context_menu_visible());
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one.copilot1\ntwo\nthree\n");
             assert_eq!(editor.text(cx), "one.\ntwo\nthree\n");
         });
@@ -414,7 +449,7 @@ mod tests {
         executor.run_until_parked();
         cx.update_editor(|editor, cx| {
             assert!(!editor.context_menu_visible());
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one.copilot1\ntwo\nthree\n");
             assert_eq!(editor.text(cx), "one.c\ntwo\nthree\n");
         });
@@ -432,25 +467,25 @@ mod tests {
         executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
         cx.update_editor(|editor, cx| {
             assert!(!editor.context_menu_visible());
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one.copilot2\ntwo\nthree\n");
             assert_eq!(editor.text(cx), "one.c\ntwo\nthree\n");
 
             // Canceling should remove the active Copilot suggestion.
             editor.cancel(&Default::default(), cx);
-            assert!(!editor.has_active_inline_completion());
+            assert!(!editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one.c\ntwo\nthree\n");
             assert_eq!(editor.text(cx), "one.c\ntwo\nthree\n");
 
             // After canceling, tabbing shouldn't insert the previously shown suggestion.
             editor.tab(&Default::default(), cx);
-            assert!(!editor.has_active_inline_completion());
+            assert!(!editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one.c   \ntwo\nthree\n");
             assert_eq!(editor.text(cx), "one.c   \ntwo\nthree\n");
 
             // When undoing the previously active suggestion is shown again.
             editor.undo(&Default::default(), cx);
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one.copilot2\ntwo\nthree\n");
             assert_eq!(editor.text(cx), "one.c\ntwo\nthree\n");
         });
@@ -458,25 +493,25 @@ mod tests {
         // If an edit occurs outside of this editor, the suggestion is still correctly interpolated.
         cx.update_buffer(|buffer, cx| buffer.edit([(5..5, "o")], None, cx));
         cx.update_editor(|editor, cx| {
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one.copilot2\ntwo\nthree\n");
             assert_eq!(editor.text(cx), "one.co\ntwo\nthree\n");
 
             // AcceptInlineCompletion when there is an active suggestion inserts it.
             editor.accept_inline_completion(&Default::default(), cx);
-            assert!(!editor.has_active_inline_completion());
+            assert!(!editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one.copilot2\ntwo\nthree\n");
             assert_eq!(editor.text(cx), "one.copilot2\ntwo\nthree\n");
 
             // When undoing the previously active suggestion is shown again.
             editor.undo(&Default::default(), cx);
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one.copilot2\ntwo\nthree\n");
             assert_eq!(editor.text(cx), "one.co\ntwo\nthree\n");
 
             // Hide suggestion.
             editor.cancel(&Default::default(), cx);
-            assert!(!editor.has_active_inline_completion());
+            assert!(!editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one.co\ntwo\nthree\n");
             assert_eq!(editor.text(cx), "one.co\ntwo\nthree\n");
         });
@@ -485,7 +520,7 @@ mod tests {
         // we won't make it visible.
         cx.update_buffer(|buffer, cx| buffer.edit([(6..6, "p")], None, cx));
         cx.update_editor(|editor, cx| {
-            assert!(!editor.has_active_inline_completion());
+            assert!(!editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one.cop\ntwo\nthree\n");
             assert_eq!(editor.text(cx), "one.cop\ntwo\nthree\n");
         });
@@ -510,19 +545,19 @@ mod tests {
         cx.update_editor(|editor, cx| editor.next_inline_completion(&Default::default(), cx));
         executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
         cx.update_editor(|editor, cx| {
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "fn foo() {\n    let x = 4;\n}");
             assert_eq!(editor.text(cx), "fn foo() {\n  \n}");
 
             // Tabbing inside of leading whitespace inserts indentation without accepting the suggestion.
             editor.tab(&Default::default(), cx);
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(editor.text(cx), "fn foo() {\n    \n}");
             assert_eq!(editor.display_text(cx), "fn foo() {\n    let x = 4;\n}");
 
             // Using AcceptInlineCompletion again accepts the suggestion.
             editor.accept_inline_completion(&Default::default(), cx);
-            assert!(!editor.has_active_inline_completion());
+            assert!(!editor.has_active_inline_completion(cx));
             assert_eq!(editor.text(cx), "fn foo() {\n    let x = 4;\n}");
             assert_eq!(editor.display_text(cx), "fn foo() {\n    let x = 4;\n}");
         });
@@ -580,17 +615,17 @@ mod tests {
         );
         executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
         cx.update_editor(|editor, cx| {
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
 
             // Accepting the first word of the suggestion should only accept the first word and still show the rest.
             editor.accept_partial_inline_completion(&Default::default(), cx);
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(editor.text(cx), "one.copilot\ntwo\nthree\n");
             assert_eq!(editor.display_text(cx), "one.copilot1\ntwo\nthree\n");
 
             // Accepting next word should accept the non-word and copilot suggestion should be gone
             editor.accept_partial_inline_completion(&Default::default(), cx);
-            assert!(!editor.has_active_inline_completion());
+            assert!(!editor.has_active_inline_completion(cx));
             assert_eq!(editor.text(cx), "one.copilot1\ntwo\nthree\n");
             assert_eq!(editor.display_text(cx), "one.copilot1\ntwo\nthree\n");
         });
@@ -622,11 +657,11 @@ mod tests {
         );
         executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
         cx.update_editor(|editor, cx| {
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
 
             // Accepting the first word (non-word) of the suggestion should only accept the first word and still show the rest.
             editor.accept_partial_inline_completion(&Default::default(), cx);
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(editor.text(cx), "one.123. \ntwo\nthree\n");
             assert_eq!(
                 editor.display_text(cx),
@@ -635,7 +670,7 @@ mod tests {
 
             // Accepting next word should accept the next word and copilot suggestion should still exist
             editor.accept_partial_inline_completion(&Default::default(), cx);
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(editor.text(cx), "one.123. copilot\ntwo\nthree\n");
             assert_eq!(
                 editor.display_text(cx),
@@ -644,7 +679,7 @@ mod tests {
 
             // Accepting the whitespace should accept the non-word/whitespaces with newline and copilot suggestion should be gone
             editor.accept_partial_inline_completion(&Default::default(), cx);
-            assert!(!editor.has_active_inline_completion());
+            assert!(!editor.has_active_inline_completion(cx));
             assert_eq!(editor.text(cx), "one.123. copilot\n 456\ntwo\nthree\n");
             assert_eq!(
                 editor.display_text(cx),
@@ -695,29 +730,29 @@ mod tests {
         cx.update_editor(|editor, cx| editor.next_inline_completion(&Default::default(), cx));
         executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
         cx.update_editor(|editor, cx| {
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one\ntwo.foo()\nthree\n");
             assert_eq!(editor.text(cx), "one\ntw\nthree\n");
 
             editor.backspace(&Default::default(), cx);
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one\ntwo.foo()\nthree\n");
             assert_eq!(editor.text(cx), "one\nt\nthree\n");
 
             editor.backspace(&Default::default(), cx);
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one\ntwo.foo()\nthree\n");
             assert_eq!(editor.text(cx), "one\n\nthree\n");
 
             // Deleting across the original suggestion range invalidates it.
             editor.backspace(&Default::default(), cx);
-            assert!(!editor.has_active_inline_completion());
+            assert!(!editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one\nthree\n");
             assert_eq!(editor.text(cx), "one\nthree\n");
 
             // Undoing the deletion restores the suggestion.
             editor.undo(&Default::default(), cx);
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one\ntwo.foo()\nthree\n");
             assert_eq!(editor.text(cx), "one\n\nthree\n");
         });
@@ -778,7 +813,7 @@ mod tests {
         });
         executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
         _ = editor.update(cx, |editor, cx| {
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(
                 editor.display_text(cx),
                 "\n\n\na = 1\nb = 2 + a\n\n\n\n\n\nc = 3\nd = 4\n\n"
@@ -800,7 +835,7 @@ mod tests {
             editor.change_selections(None, cx, |s| {
                 s.select_ranges([Point::new(4, 5)..Point::new(4, 5)])
             });
-            assert!(!editor.has_active_inline_completion());
+            assert!(!editor.has_active_inline_completion(cx));
             assert_eq!(
                 editor.display_text(cx),
                 "\n\n\na = 1\nb = 2\n\n\n\n\n\nc = 3\nd = 4\n\n"
@@ -809,7 +844,7 @@ mod tests {
 
             // Type a character, ensuring we don't even try to interpolate the previous suggestion.
             editor.handle_input(" ", cx);
-            assert!(!editor.has_active_inline_completion());
+            assert!(!editor.has_active_inline_completion(cx));
             assert_eq!(
                 editor.display_text(cx),
                 "\n\n\na = 1\nb = 2\n\n\n\n\n\nc = 3\nd = 4 \n\n"
@@ -820,7 +855,7 @@ mod tests {
         // Ensure the new suggestion is displayed when the debounce timeout expires.
         executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
         _ = editor.update(cx, |editor, cx| {
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(
                 editor.display_text(cx),
                 "\n\n\na = 1\nb = 2\n\n\n\n\n\nc = 3\nd = 4 + c\n\n"
@@ -881,7 +916,7 @@ mod tests {
         executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
         cx.update_editor(|editor, cx| {
             assert!(!editor.context_menu_visible(), "Even there are some completions available, those are not triggered when active copilot suggestion is present");
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one\ntwo.foo()\nthree\n");
             assert_eq!(editor.text(cx), "one\ntw\nthree\n");
         });
@@ -908,7 +943,7 @@ mod tests {
         executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
         cx.update_editor(|editor, cx| {
             assert!(!editor.context_menu_visible());
-            assert!(editor.has_active_inline_completion());
+            assert!(editor.has_active_inline_completion(cx));
             assert_eq!(editor.display_text(cx), "one\ntwo.foo()\nthree\n");
             assert_eq!(editor.text(cx), "one\ntwo\nthree\n");
         });
@@ -939,7 +974,7 @@ mod tests {
                 "On completion trigger input, the completions should be fetched and visible"
             );
             assert!(
-                !editor.has_active_inline_completion(),
+                !editor.has_active_inline_completion(cx),
                 "On completion trigger input, copilot suggestion should be dismissed"
             );
             assert_eq!(editor.display_text(cx), "one\ntwo.\nthree\n");
@@ -963,7 +998,7 @@ mod tests {
             "/test",
             json!({
                 ".env": "SECRET=something\n",
-                "README.md": "hello\nworld\nhow\nare\nyou\ntoday"
+                "README.md": "hello\n"
             }),
         )
         .await;
@@ -995,7 +1030,7 @@ mod tests {
             multibuffer.push_excerpts(
                 public_buffer.clone(),
                 [ExcerptRange {
-                    context: Point::new(0, 0)..Point::new(6, 0),
+                    context: Point::new(0, 0)..Point::new(1, 0),
                     primary: None,
                 }],
                 cx,
@@ -1003,7 +1038,6 @@ mod tests {
             multibuffer
         });
         let editor = cx.add_window(|cx| Editor::for_multibuffer(multibuffer, None, true, cx));
-        editor.update(cx, |editor, cx| editor.focus(cx)).unwrap();
         let copilot_provider = cx.new_model(|_| CopilotCompletionProvider::new(copilot));
         editor
             .update(cx, |editor, cx| {
@@ -1039,7 +1073,7 @@ mod tests {
 
         _ = editor.update(cx, |editor, cx| {
             editor.change_selections(None, cx, |s| {
-                s.select_ranges([Point::new(5, 0)..Point::new(5, 0)])
+                s.select_ranges([Point::new(2, 0)..Point::new(2, 0)])
             });
             editor.refresh_inline_completion(true, false, cx);
         });

crates/diagnostics/src/diagnostics.rs

@@ -16,8 +16,8 @@ use editor::{
 };
 use gpui::{
     actions, div, svg, AnyElement, AnyView, AppContext, Context, EventEmitter, FocusHandle,
-    FocusableView, Global, HighlightStyle, InteractiveElement, IntoElement, Model, ParentElement,
-    Render, SharedString, Styled, StyledText, Subscription, Task, View, ViewContext, VisualContext,
+    FocusableView, HighlightStyle, InteractiveElement, IntoElement, Model, ParentElement, Render,
+    SharedString, Styled, StyledText, Subscription, Task, View, ViewContext, VisualContext,
     WeakView, WindowContext,
 };
 use language::{
@@ -46,9 +46,6 @@ use workspace::{
 
 actions!(diagnostics, [Deploy, ToggleWarnings]);
 
-struct IncludeWarnings(bool);
-impl Global for IncludeWarnings {}
-
 pub fn init(cx: &mut AppContext) {
     ProjectDiagnosticsSettings::register(cx);
     cx.observe_new_views(ProjectDiagnosticsEditor::register)
@@ -120,7 +117,6 @@ impl ProjectDiagnosticsEditor {
 
     fn new_with_context(
         context: u32,
-        include_warnings: bool,
         project_handle: Model<Project>,
         workspace: WeakView<Workspace>,
         cx: &mut ViewContext<Self>,
@@ -138,16 +134,27 @@ impl ProjectDiagnosticsEditor {
                     language_server_id,
                     path,
                 } => {
-                    this.paths_to_update
-                        .insert((path.clone(), Some(*language_server_id)));
-                    this.summary = project.read(cx).diagnostic_summary(false, cx);
-                    cx.emit(EditorEvent::TitleChanged);
+                    let max_severity = this.max_severity();
+                    let has_diagnostics_to_display = project.read(cx).lsp_store().read(cx).diagnostics_for_buffer(path)
+                        .into_iter().flatten()
+                        .filter(|(server_id, _)| language_server_id == server_id)
+                        .flat_map(|(_, diagnostics)| diagnostics)
+                        .any(|diagnostic| diagnostic.diagnostic.severity <= max_severity);
 
-                    if this.editor.focus_handle(cx).contains_focused(cx) || this.focus_handle.contains_focused(cx) {
-                        log::debug!("diagnostics updated for server {language_server_id}, path {path:?}. recording change");
+                    if has_diagnostics_to_display {
+                        this.paths_to_update
+                            .insert((path.clone(), Some(*language_server_id)));
+                        this.summary = project.read(cx).diagnostic_summary(false, cx);
+                        cx.emit(EditorEvent::TitleChanged);
+
+                        if this.editor.focus_handle(cx).contains_focused(cx) || this.focus_handle.contains_focused(cx) {
+                            log::debug!("diagnostics updated for server {language_server_id}, path {path:?}. recording change");
+                        } else {
+                            log::debug!("diagnostics updated for server {language_server_id}, path {path:?}. updating excerpts");
+                            this.update_stale_excerpts(cx);
+                        }
                     } else {
-                        log::debug!("diagnostics updated for server {language_server_id}, path {path:?}. updating excerpts");
-                        this.update_stale_excerpts(cx);
+                        log::debug!("diagnostics updated for server {language_server_id}, path {path:?}. no diagnostics to display");
                     }
                 }
                 _ => {}
@@ -179,24 +186,19 @@ impl ProjectDiagnosticsEditor {
             }
         })
         .detach();
-        cx.observe_global::<IncludeWarnings>(|this, cx| {
-            this.include_warnings = cx.global::<IncludeWarnings>().0;
-            this.update_all_excerpts(cx);
-        })
-        .detach();
 
         let project = project_handle.read(cx);
         let mut this = Self {
             project: project_handle.clone(),
             context,
             summary: project.diagnostic_summary(false, cx),
-            include_warnings,
             workspace,
             excerpts,
             focus_handle,
             editor,
             path_states: Default::default(),
             paths_to_update: Default::default(),
+            include_warnings: ProjectDiagnosticsSettings::get_global(cx).include_warnings,
             update_excerpts_task: None,
             _subscription: project_event_subscription,
         };
@@ -241,13 +243,11 @@ impl ProjectDiagnosticsEditor {
 
     fn new(
         project_handle: Model<Project>,
-        include_warnings: bool,
         workspace: WeakView<Workspace>,
         cx: &mut ViewContext<Self>,
     ) -> Self {
         Self::new_with_context(
             editor::DEFAULT_MULTIBUFFER_CONTEXT,
-            include_warnings,
             project_handle,
             workspace,
             cx,
@@ -259,19 +259,8 @@ impl ProjectDiagnosticsEditor {
             workspace.activate_item(&existing, true, true, cx);
         } else {
             let workspace_handle = cx.view().downgrade();
-
-            let include_warnings = match cx.try_global::<IncludeWarnings>() {
-                Some(include_warnings) => include_warnings.0,
-                None => ProjectDiagnosticsSettings::get_global(cx).include_warnings,
-            };
-
             let diagnostics = cx.new_view(|cx| {
-                ProjectDiagnosticsEditor::new(
-                    workspace.project().clone(),
-                    include_warnings,
-                    workspace_handle,
-                    cx,
-                )
+                ProjectDiagnosticsEditor::new(workspace.project().clone(), workspace_handle, cx)
             });
             workspace.add_item_to_active_pane(Box::new(diagnostics), None, true, cx);
         }
@@ -279,7 +268,6 @@ impl ProjectDiagnosticsEditor {
 
     fn toggle_warnings(&mut self, _: &ToggleWarnings, cx: &mut ViewContext<Self>) {
         self.include_warnings = !self.include_warnings;
-        cx.set_global(IncludeWarnings(self.include_warnings));
         self.update_all_excerpts(cx);
         cx.notify();
     }
@@ -352,16 +340,12 @@ impl ProjectDiagnosticsEditor {
             ExcerptId::min()
         };
 
+        let max_severity = self.max_severity();
         let path_state = &mut self.path_states[path_ix];
         let mut new_group_ixs = Vec::new();
         let mut blocks_to_add = Vec::new();
         let mut blocks_to_remove = HashSet::default();
         let mut first_excerpt_id = None;
-        let max_severity = if self.include_warnings {
-            DiagnosticSeverity::WARNING
-        } else {
-            DiagnosticSeverity::ERROR
-        };
         let excerpts_snapshot = self.excerpts.update(cx, |excerpts, cx| {
             let mut old_groups = mem::take(&mut path_state.diagnostic_groups)
                 .into_iter()
@@ -650,6 +634,14 @@ impl ProjectDiagnosticsEditor {
             prev_path = Some(path);
         }
     }
+
+    fn max_severity(&self) -> DiagnosticSeverity {
+        if self.include_warnings {
+            DiagnosticSeverity::WARNING
+        } else {
+            DiagnosticSeverity::ERROR
+        }
+    }
 }
 
 impl FocusableView for ProjectDiagnosticsEditor {
@@ -748,12 +740,7 @@ impl Item for ProjectDiagnosticsEditor {
         Self: Sized,
     {
         Some(cx.new_view(|cx| {
-            ProjectDiagnosticsEditor::new(
-                self.project.clone(),
-                self.include_warnings,
-                self.workspace.clone(),
-                cx,
-            )
+            ProjectDiagnosticsEditor::new(self.project.clone(), self.workspace.clone(), cx)
         }))
     }
 

crates/diagnostics/src/diagnostics_tests.rs

@@ -151,13 +151,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
 
     // Open the project diagnostics view while there are already diagnostics.
     let view = window.build_view(cx, |cx| {
-        ProjectDiagnosticsEditor::new_with_context(
-            1,
-            true,
-            project.clone(),
-            workspace.downgrade(),
-            cx,
-        )
+        ProjectDiagnosticsEditor::new_with_context(1, project.clone(), workspace.downgrade(), cx)
     });
     let editor = view.update(cx, |view, _| view.editor.clone());
 
@@ -465,13 +459,7 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
     let workspace = window.root(cx).unwrap();
 
     let view = window.build_view(cx, |cx| {
-        ProjectDiagnosticsEditor::new_with_context(
-            1,
-            true,
-            project.clone(),
-            workspace.downgrade(),
-            cx,
-        )
+        ProjectDiagnosticsEditor::new_with_context(1, project.clone(), workspace.downgrade(), cx)
     });
     let editor = view.update(cx, |view, _| view.editor.clone());
 
@@ -732,13 +720,7 @@ async fn test_random_diagnostics(cx: &mut TestAppContext, mut rng: StdRng) {
     let workspace = window.root(cx).unwrap();
 
     let mutated_view = window.build_view(cx, |cx| {
-        ProjectDiagnosticsEditor::new_with_context(
-            1,
-            true,
-            project.clone(),
-            workspace.downgrade(),
-            cx,
-        )
+        ProjectDiagnosticsEditor::new_with_context(1, project.clone(), workspace.downgrade(), cx)
     });
 
     workspace.update(cx, |workspace, cx| {
@@ -809,7 +791,7 @@ async fn test_random_diagnostics(cx: &mut TestAppContext, mut rng: StdRng) {
 
                 updated_language_servers.insert(server_id);
 
-                lsp_store.update(cx, |lsp_store, cx| {
+                project.update(cx, |project, cx| {
                     log::info!("updating diagnostics. language server {server_id} path {path:?}");
                     randomly_update_diagnostics_for_path(
                         &fs,
@@ -818,12 +800,10 @@ async fn test_random_diagnostics(cx: &mut TestAppContext, mut rng: StdRng) {
                         &mut next_group_id,
                         &mut rng,
                     );
-                    lsp_store
+                    project
                         .update_diagnostic_entries(server_id, path, None, diagnostics.clone(), cx)
                         .unwrap()
                 });
-                cx.executor()
-                    .advance_clock(DIAGNOSTICS_UPDATE_DEBOUNCE + Duration::from_millis(10));
 
                 cx.run_until_parked();
             }
@@ -836,33 +816,12 @@ async fn test_random_diagnostics(cx: &mut TestAppContext, mut rng: StdRng) {
 
     log::info!("constructing reference diagnostics view");
     let reference_view = window.build_view(cx, |cx| {
-        ProjectDiagnosticsEditor::new_with_context(
-            1,
-            true,
-            project.clone(),
-            workspace.downgrade(),
-            cx,
-        )
+        ProjectDiagnosticsEditor::new_with_context(1, project.clone(), workspace.downgrade(), cx)
     });
-    cx.executor()
-        .advance_clock(DIAGNOSTICS_UPDATE_DEBOUNCE + Duration::from_millis(10));
     cx.run_until_parked();
 
     let mutated_excerpts = get_diagnostics_excerpts(&mutated_view, cx);
     let reference_excerpts = get_diagnostics_excerpts(&reference_view, cx);
-
-    for ((path, language_server_id), diagnostics) in current_diagnostics {
-        for diagnostic in diagnostics {
-            let found_excerpt = reference_excerpts.iter().any(|info| {
-                let row_range = info.range.context.start.row..info.range.context.end.row;
-                info.path == path.strip_prefix("/test").unwrap()
-                    && info.language_server == language_server_id
-                    && row_range.contains(&diagnostic.range.start.0.row)
-            });
-            assert!(found_excerpt, "diagnostic not found in reference view");
-        }
-    }
-
     assert_eq!(mutated_excerpts, reference_excerpts);
 }
 

crates/editor/Cargo.toml

@@ -39,7 +39,6 @@ collections.workspace = true
 convert_case.workspace = true
 db.workspace = true
 emojis.workspace = true
-feature_flags.workspace = true
 file_icons.workspace = true
 futures.workspace = true
 fuzzy.workspace = true
@@ -85,7 +84,6 @@ unindent = { workspace = true, optional = true }
 ui.workspace = true
 url.workspace = true
 util.workspace = true
-uuid.workspace = true
 workspace.workspace = true
 
 [dev-dependencies]
@@ -99,7 +97,6 @@ project = { workspace = true, features = ["test-support"] }
 release_channel.workspace = true
 rand.workspace = true
 settings = { workspace = true, features = ["test-support"] }
-tempfile.workspace = true
 text = { workspace = true, features = ["test-support"] }
 theme = { workspace = true, features = ["test-support"] }
 tree-sitter-html.workspace = true

crates/editor/src/actions.rs

@@ -105,7 +105,6 @@ pub struct MoveDownByLines {
     #[serde(default)]
     pub(super) lines: u32,
 }
-
 #[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct SelectUpByLines {
     #[serde(default)]
@@ -167,13 +166,6 @@ pub struct SpawnNearestTask {
     pub reveal: task::RevealStrategy,
 }
 
-#[derive(Debug, PartialEq, Eq, Clone, Copy, Deserialize, Default)]
-pub enum UuidVersion {
-    #[default]
-    V4,
-    V7,
-}
-
 impl_actions!(
     editor,
     [
@@ -279,8 +271,6 @@ gpui::actions!(
         HalfPageUp,
         Hover,
         Indent,
-        InsertUuidV4,
-        InsertUuidV7,
         JoinLines,
         KillRingCut,
         KillRingYank,
@@ -306,7 +296,6 @@ gpui::actions!(
         NewlineBelow,
         NextInlineCompletion,
         NextScreen,
-        OpenContextMenu,
         OpenExcerpts,
         OpenExcerptsSplit,
         OpenProposedChangesEditor,

crates/editor/src/code_context_menus.rs

@@ -1,963 +0,0 @@
-use std::{
-    cell::Cell,
-    cmp::{min, Reverse},
-    ops::Range,
-    sync::Arc,
-};
-
-use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{
-    div, px, uniform_list, AnyElement, BackgroundExecutor, Div, FontWeight, ListSizingBehavior,
-    Model, MouseButton, Pixels, ScrollStrategy, SharedString, StrikethroughStyle, StyledText,
-    UniformListScrollHandle, ViewContext, WeakView,
-};
-use language::Buffer;
-use language::{CodeLabel, Documentation};
-use lsp::LanguageServerId;
-use multi_buffer::{Anchor, ExcerptId};
-use ordered_float::OrderedFloat;
-use parking_lot::{Mutex, RwLock};
-use project::{CodeAction, Completion, TaskSourceKind};
-use std::iter;
-use task::ResolvedTask;
-use ui::{
-    h_flex, ActiveTheme as _, Color, FluentBuilder as _, InteractiveElement as _, IntoElement,
-    Label, LabelCommon as _, LabelSize, ListItem, ParentElement as _, Popover, Selectable as _,
-    StatefulInteractiveElement as _, Styled, StyledExt as _,
-};
-use util::ResultExt as _;
-use workspace::Workspace;
-
-use crate::{
-    actions::{ConfirmCodeAction, ConfirmCompletion},
-    display_map::DisplayPoint,
-    render_parsed_markdown, split_words, styled_runs_for_code_label, CodeActionProvider,
-    CompletionId, CompletionProvider, DisplayRow, Editor, EditorStyle, ResolvedTasks,
-};
-
-pub enum CodeContextMenu {
-    Completions(CompletionsMenu),
-    CodeActions(CodeActionsMenu),
-}
-
-impl CodeContextMenu {
-    pub fn select_first(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        cx: &mut ViewContext<Editor>,
-    ) -> bool {
-        if self.visible() {
-            match self {
-                CodeContextMenu::Completions(menu) => menu.select_first(provider, cx),
-                CodeContextMenu::CodeActions(menu) => menu.select_first(cx),
-            }
-            true
-        } else {
-            false
-        }
-    }
-
-    pub fn select_prev(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        cx: &mut ViewContext<Editor>,
-    ) -> bool {
-        if self.visible() {
-            match self {
-                CodeContextMenu::Completions(menu) => menu.select_prev(provider, cx),
-                CodeContextMenu::CodeActions(menu) => menu.select_prev(cx),
-            }
-            true
-        } else {
-            false
-        }
-    }
-
-    pub fn select_next(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        cx: &mut ViewContext<Editor>,
-    ) -> bool {
-        if self.visible() {
-            match self {
-                CodeContextMenu::Completions(menu) => menu.select_next(provider, cx),
-                CodeContextMenu::CodeActions(menu) => menu.select_next(cx),
-            }
-            true
-        } else {
-            false
-        }
-    }
-
-    pub fn select_last(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        cx: &mut ViewContext<Editor>,
-    ) -> bool {
-        if self.visible() {
-            match self {
-                CodeContextMenu::Completions(menu) => menu.select_last(provider, cx),
-                CodeContextMenu::CodeActions(menu) => menu.select_last(cx),
-            }
-            true
-        } else {
-            false
-        }
-    }
-
-    pub fn visible(&self) -> bool {
-        match self {
-            CodeContextMenu::Completions(menu) => menu.visible(),
-            CodeContextMenu::CodeActions(menu) => menu.visible(),
-        }
-    }
-
-    pub fn render(
-        &self,
-        cursor_position: DisplayPoint,
-        style: &EditorStyle,
-        max_height: Pixels,
-        workspace: Option<WeakView<Workspace>>,
-        cx: &mut ViewContext<Editor>,
-    ) -> (ContextMenuOrigin, AnyElement) {
-        match self {
-            CodeContextMenu::Completions(menu) => (
-                ContextMenuOrigin::EditorPoint(cursor_position),
-                menu.render(style, max_height, workspace, cx),
-            ),
-            CodeContextMenu::CodeActions(menu) => {
-                menu.render(cursor_position, style, max_height, cx)
-            }
-        }
-    }
-}
-
-pub enum ContextMenuOrigin {
-    EditorPoint(DisplayPoint),
-    GutterIndicator(DisplayRow),
-}
-
-#[derive(Clone, Debug)]
-pub struct CompletionsMenu {
-    pub id: CompletionId,
-    sort_completions: bool,
-    pub initial_position: Anchor,
-    pub buffer: Model<Buffer>,
-    pub completions: Arc<RwLock<Box<[Completion]>>>,
-    match_candidates: Arc<[StringMatchCandidate]>,
-    pub matches: Arc<[StringMatch]>,
-    pub selected_item: usize,
-    scroll_handle: UniformListScrollHandle,
-    resolve_completions: bool,
-    pub aside_was_displayed: Cell<bool>,
-    show_completion_documentation: bool,
-    last_rendered_range: Arc<Mutex<Option<Range<usize>>>>,
-}
-
-impl CompletionsMenu {
-    pub fn new(
-        id: CompletionId,
-        sort_completions: bool,
-        show_completion_documentation: bool,
-        initial_position: Anchor,
-        buffer: Model<Buffer>,
-        completions: Box<[Completion]>,
-        aside_was_displayed: bool,
-    ) -> Self {
-        let match_candidates = completions
-            .iter()
-            .enumerate()
-            .map(|(id, completion)| {
-                StringMatchCandidate::new(
-                    id,
-                    completion.label.text[completion.label.filter_range.clone()].into(),
-                )
-            })
-            .collect();
-
-        Self {
-            id,
-            sort_completions,
-            initial_position,
-            buffer,
-            completions: Arc::new(RwLock::new(completions)),
-            match_candidates,
-            matches: Vec::new().into(),
-            selected_item: 0,
-            scroll_handle: UniformListScrollHandle::new(),
-            resolve_completions: true,
-            aside_was_displayed: Cell::new(aside_was_displayed),
-            show_completion_documentation,
-            last_rendered_range: Arc::new(Mutex::new(None)),
-        }
-    }
-
-    pub fn new_snippet_choices(
-        id: CompletionId,
-        sort_completions: bool,
-        choices: &Vec<String>,
-        selection: Range<Anchor>,
-        buffer: Model<Buffer>,
-    ) -> Self {
-        let completions = choices
-            .iter()
-            .map(|choice| Completion {
-                old_range: selection.start.text_anchor..selection.end.text_anchor,
-                new_text: choice.to_string(),
-                label: CodeLabel {
-                    text: choice.to_string(),
-                    runs: Default::default(),
-                    filter_range: Default::default(),
-                },
-                server_id: LanguageServerId(usize::MAX),
-                documentation: None,
-                lsp_completion: Default::default(),
-                confirm: None,
-            })
-            .collect();
-
-        let match_candidates = choices
-            .iter()
-            .enumerate()
-            .map(|(id, completion)| StringMatchCandidate::new(id, completion.to_string()))
-            .collect();
-        let matches = choices
-            .iter()
-            .enumerate()
-            .map(|(id, completion)| StringMatch {
-                candidate_id: id,
-                score: 1.,
-                positions: vec![],
-                string: completion.clone(),
-            })
-            .collect();
-        Self {
-            id,
-            sort_completions,
-            initial_position: selection.start,
-            buffer,
-            completions: Arc::new(RwLock::new(completions)),
-            match_candidates,
-            matches,
-            selected_item: 0,
-            scroll_handle: UniformListScrollHandle::new(),
-            resolve_completions: false,
-            aside_was_displayed: Cell::new(false),
-            show_completion_documentation: false,
-            last_rendered_range: Arc::new(Mutex::new(None)),
-        }
-    }
-
-    fn select_first(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        cx: &mut ViewContext<Editor>,
-    ) {
-        self.update_selection_index(0, provider, cx);
-    }
-
-    fn select_prev(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        cx: &mut ViewContext<Editor>,
-    ) {
-        self.update_selection_index(self.prev_match_index(), provider, cx);
-    }
-
-    fn select_next(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        cx: &mut ViewContext<Editor>,
-    ) {
-        self.update_selection_index(self.next_match_index(), provider, cx);
-    }
-
-    fn select_last(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        cx: &mut ViewContext<Editor>,
-    ) {
-        self.update_selection_index(self.matches.len() - 1, provider, cx);
-    }
-
-    fn update_selection_index(
-        &mut self,
-        match_index: usize,
-        provider: Option<&dyn CompletionProvider>,
-        cx: &mut ViewContext<Editor>,
-    ) {
-        if self.selected_item != match_index {
-            self.selected_item = match_index;
-            self.scroll_handle
-                .scroll_to_item(self.selected_item, ScrollStrategy::Top);
-            self.resolve_visible_completions(provider, cx);
-            cx.notify();
-        }
-    }
-
-    fn prev_match_index(&self) -> usize {
-        if self.selected_item > 0 {
-            self.selected_item - 1
-        } else {
-            self.matches.len() - 1
-        }
-    }
-
-    fn next_match_index(&self) -> usize {
-        if self.selected_item + 1 < self.matches.len() {
-            self.selected_item + 1
-        } else {
-            0
-        }
-    }
-
-    pub fn resolve_visible_completions(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        cx: &mut ViewContext<Editor>,
-    ) {
-        if !self.resolve_completions {
-            return;
-        }
-        let Some(provider) = provider else {
-            return;
-        };
-
-        // Attempt to resolve completions for every item that will be displayed. This matters
-        // because single line documentation may be displayed inline with the completion.
-        //
-        // When navigating to the very beginning or end of completions, `last_rendered_range` may
-        // have no overlap with the completions that will be displayed, so instead use a range based
-        // on the last rendered count.
-        const APPROXIMATE_VISIBLE_COUNT: usize = 12;
-        let last_rendered_range = self.last_rendered_range.lock().clone();
-        let visible_count = last_rendered_range
-            .clone()
-            .map_or(APPROXIMATE_VISIBLE_COUNT, |range| range.count());
-        let matches_range = if self.selected_item == 0 {
-            0..min(visible_count, self.matches.len())
-        } else if self.selected_item == self.matches.len() - 1 {
-            self.matches.len().saturating_sub(visible_count)..self.matches.len()
-        } else {
-            last_rendered_range.unwrap_or_else(|| self.selected_item..self.selected_item + 1)
-        };
-
-        // Expand the range to resolve more completions than are predicted to be visible, to reduce
-        // jank on navigation.
-        const EXTRA_TO_RESOLVE: usize = 4;
-        let matches_indices = util::iterate_expanded_and_wrapped_usize_range(
-            matches_range.clone(),
-            EXTRA_TO_RESOLVE,
-            EXTRA_TO_RESOLVE,
-            self.matches.len(),
-        );
-
-        // Avoid work by sometimes filtering out completions that already have documentation.
-        // This filtering doesn't happen if the completions are currently being updated.
-        let candidate_ids = matches_indices.map(|i| self.matches[i].candidate_id);
-        let candidate_ids = match self.completions.try_read() {
-            None => candidate_ids.collect::<Vec<usize>>(),
-            Some(completions) => candidate_ids
-                .filter(|i| completions[*i].documentation.is_none())
-                .collect::<Vec<usize>>(),
-        };
-
-        // Current selection is always resolved even if it already has documentation, to handle
-        // out-of-spec language servers that return more results later.
-        let selected_candidate_id = self.matches[self.selected_item].candidate_id;
-        let candidate_ids = iter::once(selected_candidate_id)
-            .chain(
-                candidate_ids
-                    .into_iter()
-                    .filter(|id| *id != selected_candidate_id),
-            )
-            .collect::<Vec<usize>>();
-
-        let resolve_task = provider.resolve_completions(
-            self.buffer.clone(),
-            candidate_ids,
-            self.completions.clone(),
-            cx,
-        );
-
-        cx.spawn(move |editor, mut cx| async move {
-            if let Some(true) = resolve_task.await.log_err() {
-                editor.update(&mut cx, |_, cx| cx.notify()).ok();
-            }
-        })
-        .detach();
-    }
-
-    fn visible(&self) -> bool {
-        !self.matches.is_empty()
-    }
-
-    fn render(
-        &self,
-        style: &EditorStyle,
-        max_height: Pixels,
-        workspace: Option<WeakView<Workspace>>,
-        cx: &mut ViewContext<Editor>,
-    ) -> AnyElement {
-        let show_completion_documentation = self.show_completion_documentation;
-        let widest_completion_ix = self
-            .matches
-            .iter()
-            .enumerate()
-            .max_by_key(|(_, mat)| {
-                let completions = self.completions.read();
-                let completion = &completions[mat.candidate_id];
-                let documentation = &completion.documentation;
-
-                let mut len = completion.label.text.chars().count();
-                if let Some(Documentation::SingleLine(text)) = documentation {
-                    if show_completion_documentation {
-                        len += text.chars().count();
-                    }
-                }
-
-                len
-            })
-            .map(|(ix, _)| ix);
-
-        let completions = self.completions.clone();
-        let matches = self.matches.clone();
-        let selected_item = self.selected_item;
-        let style = style.clone();
-
-        let multiline_docs = if show_completion_documentation {
-            let mat = &self.matches[selected_item];
-            match &self.completions.read()[mat.candidate_id].documentation {
-                Some(Documentation::MultiLinePlainText(text)) => {
-                    Some(div().child(SharedString::from(text.clone())))
-                }
-                Some(Documentation::MultiLineMarkdown(parsed)) if !parsed.text.is_empty() => {
-                    Some(div().child(render_parsed_markdown(
-                        "completions_markdown",
-                        parsed,
-                        &style,
-                        workspace,
-                        cx,
-                    )))
-                }
-                Some(Documentation::Undocumented) if self.aside_was_displayed.get() => {
-                    Some(div().child("No documentation"))
-                }
-                _ => None,
-            }
-        } else {
-            None
-        };
-
-        let aside_contents = if let Some(multiline_docs) = multiline_docs {
-            Some(multiline_docs)
-        } else if self.aside_was_displayed.get() {
-            Some(div().child("Fetching documentation..."))
-        } else {
-            None
-        };
-        self.aside_was_displayed.set(aside_contents.is_some());
-
-        let aside_contents = aside_contents.map(|div| {
-            div.id("multiline_docs")
-                .max_h(max_height)
-                .flex_1()
-                .px_1p5()
-                .py_1()
-                .min_w(px(260.))
-                .max_w(px(640.))
-                .w(px(500.))
-                .overflow_y_scroll()
-                .occlude()
-        });
-
-        let last_rendered_range = self.last_rendered_range.clone();
-
-        let list = uniform_list(
-            cx.view().clone(),
-            "completions",
-            matches.len(),
-            move |_editor, range, cx| {
-                last_rendered_range.lock().replace(range.clone());
-                let start_ix = range.start;
-                let completions_guard = completions.read();
-
-                matches[range]
-                    .iter()
-                    .enumerate()
-                    .map(|(ix, mat)| {
-                        let item_ix = start_ix + ix;
-                        let candidate_id = mat.candidate_id;
-                        let completion = &completions_guard[candidate_id];
-
-                        let documentation = if show_completion_documentation {
-                            &completion.documentation
-                        } else {
-                            &None
-                        };
-
-                        let highlights = gpui::combine_highlights(
-                            mat.ranges().map(|range| (range, FontWeight::BOLD.into())),
-                            styled_runs_for_code_label(&completion.label, &style.syntax).map(
-                                |(range, mut highlight)| {
-                                    // Ignore font weight for syntax highlighting, as we'll use it
-                                    // for fuzzy matches.
-                                    highlight.font_weight = None;
-
-                                    if completion.lsp_completion.deprecated.unwrap_or(false) {
-                                        highlight.strikethrough = Some(StrikethroughStyle {
-                                            thickness: 1.0.into(),
-                                            ..Default::default()
-                                        });
-                                        highlight.color = Some(cx.theme().colors().text_muted);
-                                    }
-
-                                    (range, highlight)
-                                },
-                            ),
-                        );
-                        let completion_label = StyledText::new(completion.label.text.clone())
-                            .with_highlights(&style.text, highlights);
-                        let documentation_label =
-                            if let Some(Documentation::SingleLine(text)) = documentation {
-                                if text.trim().is_empty() {
-                                    None
-                                } else {
-                                    Some(
-                                        Label::new(text.clone())
-                                            .ml_4()
-                                            .size(LabelSize::Small)
-                                            .color(Color::Muted),
-                                    )
-                                }
-                            } else {
-                                None
-                            };
-
-                        let color_swatch = completion
-                            .color()
-                            .map(|color| div().size_4().bg(color).rounded_sm());
-
-                        div().min_w(px(220.)).max_w(px(540.)).child(
-                            ListItem::new(mat.candidate_id)
-                                .inset(true)
-                                .selected(item_ix == selected_item)
-                                .on_click(cx.listener(move |editor, _event, cx| {
-                                    cx.stop_propagation();
-                                    if let Some(task) = editor.confirm_completion(
-                                        &ConfirmCompletion {
-                                            item_ix: Some(item_ix),
-                                        },
-                                        cx,
-                                    ) {
-                                        task.detach_and_log_err(cx)
-                                    }
-                                }))
-                                .start_slot::<Div>(color_swatch)
-                                .child(h_flex().overflow_hidden().child(completion_label))
-                                .end_slot::<Label>(documentation_label),
-                        )
-                    })
-                    .collect()
-            },
-        )
-        .occlude()
-        .max_h(max_height)
-        .track_scroll(self.scroll_handle.clone())
-        .with_width_from_item(widest_completion_ix)
-        .with_sizing_behavior(ListSizingBehavior::Infer);
-
-        Popover::new()
-            .child(list)
-            .when_some(aside_contents, |popover, aside_contents| {
-                popover.aside(aside_contents)
-            })
-            .into_any_element()
-    }
-
-    pub async fn filter(&mut self, query: Option<&str>, executor: BackgroundExecutor) {
-        let mut matches = if let Some(query) = query {
-            fuzzy::match_strings(
-                &self.match_candidates,
-                query,
-                query.chars().any(|c| c.is_uppercase()),
-                100,
-                &Default::default(),
-                executor,
-            )
-            .await
-        } else {
-            self.match_candidates
-                .iter()
-                .enumerate()
-                .map(|(candidate_id, candidate)| StringMatch {
-                    candidate_id,
-                    score: Default::default(),
-                    positions: Default::default(),
-                    string: candidate.string.clone(),
-                })
-                .collect()
-        };
-
-        // Remove all candidates where the query's start does not match the start of any word in the candidate
-        if let Some(query) = query {
-            if let Some(query_start) = query.chars().next() {
-                matches.retain(|string_match| {
-                    split_words(&string_match.string).any(|word| {
-                        // Check that the first codepoint of the word as lowercase matches the first
-                        // codepoint of the query as lowercase
-                        word.chars()
-                            .flat_map(|codepoint| codepoint.to_lowercase())
-                            .zip(query_start.to_lowercase())
-                            .all(|(word_cp, query_cp)| word_cp == query_cp)
-                    })
-                });
-            }
-        }
-
-        let completions = self.completions.read();
-        if self.sort_completions {
-            matches.sort_unstable_by_key(|mat| {
-                // We do want to strike a balance here between what the language server tells us
-                // to sort by (the sort_text) and what are "obvious" good matches (i.e. when you type
-                // `Creat` and there is a local variable called `CreateComponent`).
-                // So what we do is: we bucket all matches into two buckets
-                // - Strong matches
-                // - Weak matches
-                // Strong matches are the ones with a high fuzzy-matcher score (the "obvious" matches)
-                // and the Weak matches are the rest.
-                //
-                // For the strong matches, we sort by our fuzzy-finder score first and for the weak
-                // matches, we prefer language-server sort_text first.
-                //
-                // The thinking behind that: we want to show strong matches first in order of relevance(fuzzy score).
-                // Rest of the matches(weak) can be sorted as language-server expects.
-
-                #[derive(PartialEq, Eq, PartialOrd, Ord)]
-                enum MatchScore<'a> {
-                    Strong {
-                        score: Reverse<OrderedFloat<f64>>,
-                        sort_text: Option<&'a str>,
-                        sort_key: (usize, &'a str),
-                    },
-                    Weak {
-                        sort_text: Option<&'a str>,
-                        score: Reverse<OrderedFloat<f64>>,
-                        sort_key: (usize, &'a str),
-                    },
-                }
-
-                let completion = &completions[mat.candidate_id];
-                let sort_key = completion.sort_key();
-                let sort_text = completion.lsp_completion.sort_text.as_deref();
-                let score = Reverse(OrderedFloat(mat.score));
-
-                if mat.score >= 0.2 {
-                    MatchScore::Strong {
-                        score,
-                        sort_text,
-                        sort_key,
-                    }
-                } else {
-                    MatchScore::Weak {
-                        sort_text,
-                        score,
-                        sort_key,
-                    }
-                }
-            });
-        }
-
-        for mat in &mut matches {
-            let completion = &completions[mat.candidate_id];
-            mat.string.clone_from(&completion.label.text);
-            for position in &mut mat.positions {
-                *position += completion.label.filter_range.start;
-            }
-        }
-        drop(completions);
-
-        self.matches = matches.into();
-        self.selected_item = 0;
-    }
-}
-
-#[derive(Clone)]
-pub struct AvailableCodeAction {
-    pub excerpt_id: ExcerptId,
-    pub action: CodeAction,
-    pub provider: Arc<dyn CodeActionProvider>,
-}
-
-#[derive(Clone)]
-pub struct CodeActionContents {
-    pub tasks: Option<Arc<ResolvedTasks>>,
-    pub actions: Option<Arc<[AvailableCodeAction]>>,
-}
-
-impl CodeActionContents {
-    fn len(&self) -> usize {
-        match (&self.tasks, &self.actions) {
-            (Some(tasks), Some(actions)) => actions.len() + tasks.templates.len(),
-            (Some(tasks), None) => tasks.templates.len(),
-            (None, Some(actions)) => actions.len(),
-            (None, None) => 0,
-        }
-    }
-
-    fn is_empty(&self) -> bool {
-        match (&self.tasks, &self.actions) {
-            (Some(tasks), Some(actions)) => actions.is_empty() && tasks.templates.is_empty(),
-            (Some(tasks), None) => tasks.templates.is_empty(),
-            (None, Some(actions)) => actions.is_empty(),
-            (None, None) => true,
-        }
-    }
-
-    fn iter(&self) -> impl Iterator<Item = CodeActionsItem> + '_ {
-        self.tasks
-            .iter()
-            .flat_map(|tasks| {
-                tasks
-                    .templates
-                    .iter()
-                    .map(|(kind, task)| CodeActionsItem::Task(kind.clone(), task.clone()))
-            })
-            .chain(self.actions.iter().flat_map(|actions| {
-                actions.iter().map(|available| CodeActionsItem::CodeAction {
-                    excerpt_id: available.excerpt_id,
-                    action: available.action.clone(),
-                    provider: available.provider.clone(),
-                })
-            }))
-    }
-
-    pub fn get(&self, index: usize) -> Option<CodeActionsItem> {
-        match (&self.tasks, &self.actions) {
-            (Some(tasks), Some(actions)) => {
-                if index < tasks.templates.len() {
-                    tasks
-                        .templates
-                        .get(index)
-                        .cloned()
-                        .map(|(kind, task)| CodeActionsItem::Task(kind, task))
-                } else {
-                    actions.get(index - tasks.templates.len()).map(|available| {
-                        CodeActionsItem::CodeAction {
-                            excerpt_id: available.excerpt_id,
-                            action: available.action.clone(),
-                            provider: available.provider.clone(),
-                        }
-                    })
-                }
-            }
-            (Some(tasks), None) => tasks
-                .templates
-                .get(index)
-                .cloned()
-                .map(|(kind, task)| CodeActionsItem::Task(kind, task)),
-            (None, Some(actions)) => {
-                actions
-                    .get(index)
-                    .map(|available| CodeActionsItem::CodeAction {
-                        excerpt_id: available.excerpt_id,
-                        action: available.action.clone(),
-                        provider: available.provider.clone(),
-                    })
-            }
-            (None, None) => None,
-        }
-    }
-}
-
-#[allow(clippy::large_enum_variant)]
-#[derive(Clone)]
-pub enum CodeActionsItem {
-    Task(TaskSourceKind, ResolvedTask),
-    CodeAction {
-        excerpt_id: ExcerptId,
-        action: CodeAction,
-        provider: Arc<dyn CodeActionProvider>,
-    },
-}
-
-impl CodeActionsItem {
-    fn as_task(&self) -> Option<&ResolvedTask> {
-        let Self::Task(_, task) = self else {
-            return None;
-        };
-        Some(task)
-    }
-
-    fn as_code_action(&self) -> Option<&CodeAction> {
-        let Self::CodeAction { action, .. } = self else {
-            return None;
-        };
-        Some(action)
-    }
-
-    pub fn label(&self) -> String {
-        match self {
-            Self::CodeAction { action, .. } => action.lsp_action.title.clone(),
-            Self::Task(_, task) => task.resolved_label.clone(),
-        }
-    }
-}
-
-pub struct CodeActionsMenu {
-    pub actions: CodeActionContents,
-    pub buffer: Model<Buffer>,
-    pub selected_item: usize,
-    pub scroll_handle: UniformListScrollHandle,
-    pub deployed_from_indicator: Option<DisplayRow>,
-}
-
-impl CodeActionsMenu {
-    fn select_first(&mut self, cx: &mut ViewContext<Editor>) {
-        self.selected_item = 0;
-        self.scroll_handle
-            .scroll_to_item(self.selected_item, ScrollStrategy::Top);
-        cx.notify()
-    }
-
-    fn select_prev(&mut self, cx: &mut ViewContext<Editor>) {
-        if self.selected_item > 0 {
-            self.selected_item -= 1;
-        } else {
-            self.selected_item = self.actions.len() - 1;
-        }
-        self.scroll_handle
-            .scroll_to_item(self.selected_item, ScrollStrategy::Top);
-        cx.notify();
-    }
-
-    fn select_next(&mut self, cx: &mut ViewContext<Editor>) {
-        if self.selected_item + 1 < self.actions.len() {
-            self.selected_item += 1;
-        } else {
-            self.selected_item = 0;
-        }
-        self.scroll_handle
-            .scroll_to_item(self.selected_item, ScrollStrategy::Top);
-        cx.notify();
-    }
-
-    fn select_last(&mut self, cx: &mut ViewContext<Editor>) {
-        self.selected_item = self.actions.len() - 1;
-        self.scroll_handle
-            .scroll_to_item(self.selected_item, ScrollStrategy::Top);
-        cx.notify()
-    }
-
-    fn visible(&self) -> bool {
-        !self.actions.is_empty()
-    }
-
-    fn render(
-        &self,
-        cursor_position: DisplayPoint,
-        _style: &EditorStyle,
-        max_height: Pixels,
-        cx: &mut ViewContext<Editor>,
-    ) -> (ContextMenuOrigin, AnyElement) {
-        let actions = self.actions.clone();
-        let selected_item = self.selected_item;
-        let element = uniform_list(
-            cx.view().clone(),
-            "code_actions_menu",
-            self.actions.len(),
-            move |_this, range, cx| {
-                actions
-                    .iter()
-                    .skip(range.start)
-                    .take(range.end - range.start)
-                    .enumerate()
-                    .map(|(ix, action)| {
-                        let item_ix = range.start + ix;
-                        let selected = selected_item == item_ix;
-                        let colors = cx.theme().colors();
-                        div()
-                            .px_1()
-                            .rounded_md()
-                            .text_color(colors.text)
-                            .when(selected, |style| {
-                                style
-                                    .bg(colors.element_active)
-                                    .text_color(colors.text_accent)
-                            })
-                            .hover(|style| {
-                                style
-                                    .bg(colors.element_hover)
-                                    .text_color(colors.text_accent)
-                            })
-                            .whitespace_nowrap()
-                            .when_some(action.as_code_action(), |this, action| {
-                                this.on_mouse_down(
-                                    MouseButton::Left,
-                                    cx.listener(move |editor, _, cx| {
-                                        cx.stop_propagation();
-                                        if let Some(task) = editor.confirm_code_action(
-                                            &ConfirmCodeAction {
-                                                item_ix: Some(item_ix),
-                                            },
-                                            cx,
-                                        ) {
-                                            task.detach_and_log_err(cx)
-                                        }
-                                    }),
-                                )
-                                // TASK: It would be good to make lsp_action.title a SharedString to avoid allocating here.
-                                .child(SharedString::from(
-                                    action.lsp_action.title.replace("\n", ""),
-                                ))
-                            })
-                            .when_some(action.as_task(), |this, task| {
-                                this.on_mouse_down(
-                                    MouseButton::Left,
-                                    cx.listener(move |editor, _, cx| {
-                                        cx.stop_propagation();
-                                        if let Some(task) = editor.confirm_code_action(
-                                            &ConfirmCodeAction {
-                                                item_ix: Some(item_ix),
-                                            },
-                                            cx,
-                                        ) {
-                                            task.detach_and_log_err(cx)
-                                        }
-                                    }),
-                                )
-                                .child(SharedString::from(task.resolved_label.replace("\n", "")))
-                            })
-                    })
-                    .collect()
-            },
-        )
-        .elevation_1(cx)
-        .p_1()
-        .max_h(max_height)
-        .occlude()
-        .track_scroll(self.scroll_handle.clone())
-        .with_width_from_item(
-            self.actions
-                .iter()
-                .enumerate()
-                .max_by_key(|(_, action)| match action {
-                    CodeActionsItem::Task(_, task) => task.resolved_label.chars().count(),
-                    CodeActionsItem::CodeAction { action, .. } => {
-                        action.lsp_action.title.chars().count()
-                    }
-                })
-                .map(|(ix, _)| ix),
-        )
-        .with_sizing_behavior(ListSizingBehavior::Infer)
-        .into_any_element();
-
-        let cursor_position = if let Some(row) = self.deployed_from_indicator {
-            ContextMenuOrigin::GutterIndicator(row)
-        } else {
-            ContextMenuOrigin::EditorPoint(cursor_position)
-        };
-
-        (cursor_position, element)
-    }
-}

crates/editor/src/debounced_delay.rs

@@ -0,0 +1,46 @@
+use std::time::Duration;
+
+use futures::{channel::oneshot, FutureExt};
+use gpui::{Task, ViewContext};
+
+use crate::Editor;
+
+#[derive(Debug)]
+pub struct DebouncedDelay {
+    task: Option<Task<()>>,
+    cancel_channel: Option<oneshot::Sender<()>>,
+}
+
+impl DebouncedDelay {
+    pub fn new() -> DebouncedDelay {
+        DebouncedDelay {
+            task: None,
+            cancel_channel: None,
+        }
+    }
+
+    pub fn fire_new<F>(&mut self, delay: Duration, cx: &mut ViewContext<Editor>, func: F)
+    where
+        F: 'static + Send + FnOnce(&mut Editor, &mut ViewContext<Editor>) -> Task<()>,
+    {
+        if let Some(channel) = self.cancel_channel.take() {
+            _ = channel.send(());
+        }
+
+        let (sender, mut receiver) = oneshot::channel::<()>();
+        self.cancel_channel = Some(sender);
+
+        drop(self.task.take());
+        self.task = Some(cx.spawn(move |model, mut cx| async move {
+            let mut timer = cx.background_executor().timer(delay).fuse();
+            futures::select_biased! {
+                _ = receiver => return,
+                _ = timer => {}
+            }
+
+            if let Ok(task) = model.update(&mut cx, |project, cx| (func)(project, cx)) {
+                task.await;
+            }
+        }));
+    }
+}

crates/editor/src/display_map.rs

@@ -82,7 +82,7 @@ pub trait ToDisplayPoint {
     fn to_display_point(&self, map: &DisplaySnapshot) -> DisplayPoint;
 }
 
-type TextHighlights = TreeMap<TypeId, Arc<(HighlightStyle, Vec<Range<Anchor>>)>>;
+type TextHighlights = TreeMap<Option<TypeId>, Arc<(HighlightStyle, Vec<Range<Anchor>>)>>;
 type InlayHighlights = TreeMap<TypeId, TreeMap<InlayId, (HighlightStyle, InlayHighlight)>>;
 
 /// Decides how text in a [`MultiBuffer`] should be displayed in a buffer, handling inlay hints,
@@ -434,7 +434,7 @@ impl DisplayMap {
         style: HighlightStyle,
     ) {
         self.text_highlights
-            .insert(type_id, Arc::new((style, ranges)));
+            .insert(Some(type_id), Arc::new((style, ranges)));
     }
 
     pub(crate) fn highlight_inlays(
@@ -457,11 +457,11 @@ impl DisplayMap {
     }
 
     pub fn text_highlights(&self, type_id: TypeId) -> Option<(HighlightStyle, &[Range<Anchor>])> {
-        let highlights = self.text_highlights.get(&type_id)?;
+        let highlights = self.text_highlights.get(&Some(type_id))?;
         Some((highlights.0, &highlights.1))
     }
     pub fn clear_highlights(&mut self, type_id: TypeId) -> bool {
-        let mut cleared = self.text_highlights.remove(&type_id).is_some();
+        let mut cleared = self.text_highlights.remove(&Some(type_id)).is_some();
         cleared |= self.inlay_highlights.remove(&type_id).is_some();
         cleared
     }
@@ -1125,12 +1125,6 @@ impl DisplaySnapshot {
         DisplayRow(self.block_snapshot.longest_row())
     }
 
-    pub fn longest_row_in_range(&self, range: Range<DisplayRow>) -> DisplayRow {
-        let block_range = BlockRow(range.start.0)..BlockRow(range.end.0);
-        let longest_row = self.block_snapshot.longest_row_in_range(block_range);
-        DisplayRow(longest_row.0)
-    }
-
     pub fn starts_indent(&self, buffer_row: MultiBufferRow) -> bool {
         let max_row = self.buffer_snapshot.max_row();
         if buffer_row >= max_row {
@@ -1245,7 +1239,7 @@ impl DisplaySnapshot {
         &self,
     ) -> Option<Arc<(HighlightStyle, Vec<Range<Anchor>>)>> {
         let type_id = TypeId::of::<Tag>();
-        self.text_highlights.get(&type_id).cloned()
+        self.text_highlights.get(&Some(type_id)).cloned()
     }
 
     #[allow(unused)]

crates/editor/src/display_map/block_map.rs

@@ -1339,57 +1339,6 @@ impl BlockSnapshot {
         self.transforms.summary().longest_row
     }
 
-    pub fn longest_row_in_range(&self, range: Range<BlockRow>) -> BlockRow {
-        let mut cursor = self.transforms.cursor::<(BlockRow, WrapRow)>(&());
-        cursor.seek(&range.start, Bias::Right, &());
-
-        let mut longest_row = range.start;
-        let mut longest_row_chars = 0;
-        if let Some(transform) = cursor.item() {
-            if transform.block.is_none() {
-                let (output_start, input_start) = cursor.start();
-                let overshoot = range.start.0 - output_start.0;
-                let wrap_start_row = input_start.0 + overshoot;
-                let wrap_end_row = cmp::min(
-                    input_start.0 + (range.end.0 - output_start.0),
-                    cursor.end(&()).1 .0,
-                );
-                let summary = self
-                    .wrap_snapshot
-                    .text_summary_for_range(wrap_start_row..wrap_end_row);
-                longest_row = BlockRow(range.start.0 + summary.longest_row);
-                longest_row_chars = summary.longest_row_chars;
-            }
-            cursor.next(&());
-        }
-
-        let cursor_start_row = cursor.start().0;
-        if range.end > cursor_start_row {
-            let summary = cursor.summary::<_, TransformSummary>(&range.end, Bias::Right, &());
-            if summary.longest_row_chars > longest_row_chars {
-                longest_row = BlockRow(cursor_start_row.0 + summary.longest_row);
-                longest_row_chars = summary.longest_row_chars;
-            }
-
-            if let Some(transform) = cursor.item() {
-                if transform.block.is_none() {
-                    let (output_start, input_start) = cursor.start();
-                    let overshoot = range.end.0 - output_start.0;
-                    let wrap_start_row = input_start.0;
-                    let wrap_end_row = input_start.0 + overshoot;
-                    let summary = self
-                        .wrap_snapshot
-                        .text_summary_for_range(wrap_start_row..wrap_end_row);
-                    if summary.longest_row_chars > longest_row_chars {
-                        longest_row = BlockRow(output_start.0 + summary.longest_row);
-                    }
-                }
-            }
-        }
-
-        longest_row
-    }
-
     pub(super) fn line_len(&self, row: BlockRow) -> u32 {
         let mut cursor = self.transforms.cursor::<(BlockRow, WrapRow)>(&());
         cursor.seek(&BlockRow(row.0), Bias::Right, &());
@@ -2756,40 +2705,6 @@ mod tests {
                 longest_line_len,
             );
 
-            for _ in 0..10 {
-                let end_row = rng.gen_range(1..=expected_lines.len());
-                let start_row = rng.gen_range(0..end_row);
-
-                let mut expected_longest_rows_in_range = vec![];
-                let mut longest_line_len_in_range = 0;
-
-                let mut row = start_row as u32;
-                for line in &expected_lines[start_row..end_row] {
-                    let line_char_count = line.chars().count() as isize;
-                    match line_char_count.cmp(&longest_line_len_in_range) {
-                        Ordering::Less => {}
-                        Ordering::Equal => expected_longest_rows_in_range.push(row),
-                        Ordering::Greater => {
-                            longest_line_len_in_range = line_char_count;
-                            expected_longest_rows_in_range.clear();
-                            expected_longest_rows_in_range.push(row);
-                        }
-                    }
-                    row += 1;
-                }
-
-                let longest_row_in_range = blocks_snapshot
-                    .longest_row_in_range(BlockRow(start_row as u32)..BlockRow(end_row as u32));
-                assert!(
-                    expected_longest_rows_in_range.contains(&longest_row_in_range.0),
-                    "incorrect longest row {} in range {:?}. expected {:?} with length {}",
-                    longest_row,
-                    start_row..end_row,
-                    expected_longest_rows_in_range,
-                    longest_line_len_in_range,
-                );
-            }
-
             // Ensure that conversion between block points and wrap points is stable.
             for row in 0..=blocks_snapshot.wrap_snapshot.max_point().row() {
                 let wrap_point = WrapPoint::new(row, 0);

crates/editor/src/display_map/inlay_map.rs

@@ -211,7 +211,7 @@ pub struct InlayBufferRows<'a> {
 struct HighlightEndpoint {
     offset: InlayOffset,
     is_start: bool,
-    tag: TypeId,
+    tag: Option<TypeId>,
     style: HighlightStyle,
 }
 
@@ -239,7 +239,7 @@ pub struct InlayChunks<'a> {
     max_output_offset: InlayOffset,
     highlight_styles: HighlightStyles,
     highlight_endpoints: Peekable<vec::IntoIter<HighlightEndpoint>>,
-    active_highlights: BTreeMap<TypeId, HighlightStyle>,
+    active_highlights: BTreeMap<Option<TypeId>, HighlightStyle>,
     highlights: Highlights<'a>,
     snapshot: &'a InlaySnapshot,
 }
@@ -1096,7 +1096,7 @@ impl InlaySnapshot {
         &self,
         cursor: &mut Cursor<'_, Transform, (InlayOffset, usize)>,
         range: &Range<InlayOffset>,
-        text_highlights: &TreeMap<TypeId, Arc<(HighlightStyle, Vec<Range<Anchor>>)>>,
+        text_highlights: &TreeMap<Option<TypeId>, Arc<(HighlightStyle, Vec<Range<Anchor>>)>>,
         highlight_endpoints: &mut Vec<HighlightEndpoint>,
     ) {
         while cursor.start().0 < range.end {
@@ -1112,7 +1112,7 @@ impl InlaySnapshot {
                     )))
                 };
 
-            for (&tag, text_highlights) in text_highlights.iter() {
+            for (tag, text_highlights) in text_highlights.iter() {
                 let style = text_highlights.0;
                 let ranges = &text_highlights.1;
 
@@ -1134,13 +1134,13 @@ impl InlaySnapshot {
                     highlight_endpoints.push(HighlightEndpoint {
                         offset: self.to_inlay_offset(range.start.to_offset(&self.buffer)),
                         is_start: true,
-                        tag,
+                        tag: *tag,
                         style,
                     });
                     highlight_endpoints.push(HighlightEndpoint {
                         offset: self.to_inlay_offset(range.end.to_offset(&self.buffer)),
                         is_start: false,
-                        tag,
+                        tag: *tag,
                         style,
                     });
                 }
@@ -1708,7 +1708,7 @@ mod tests {
             text_highlight_ranges.sort_by_key(|range| (range.start, Reverse(range.end)));
             log::info!("highlighting text ranges {text_highlight_ranges:?}");
             text_highlights.insert(
-                TypeId::of::<()>(),
+                Some(TypeId::of::<()>()),
                 Arc::new((
                     HighlightStyle::default(),
                     text_highlight_ranges

crates/editor/src/editor_settings.rs

@@ -10,6 +10,9 @@ pub struct EditorSettings {
     pub cursor_shape: Option<CursorShape>,
     pub current_line_highlight: CurrentLineHighlight,
     pub hover_popover_enabled: bool,
+    pub show_completions_on_input: bool,
+    pub show_completion_documentation: bool,
+    pub completion_documentation_secondary_query_debounce: u64,
     pub toolbar: Toolbar,
     pub scrollbar: Scrollbar,
     pub gutter: Gutter,
@@ -191,6 +194,21 @@ pub struct EditorSettingsContent {
     /// Default: true
     pub hover_popover_enabled: Option<bool>,
 
+    /// Whether to pop the completions menu while typing in an editor without
+    /// explicitly requesting it.
+    ///
+    /// Default: true
+    pub show_completions_on_input: Option<bool>,
+    /// Whether to display inline and alongside documentation for items in the
+    /// completions menu.
+    ///
+    /// Default: true
+    pub show_completion_documentation: Option<bool>,
+    /// The debounce delay before re-querying the language server for completion
+    /// documentation when not included in original completion list.
+    ///
+    /// Default: 300 ms
+    pub completion_documentation_secondary_query_debounce: Option<u64>,
     /// Toolbar related settings
     pub toolbar: Option<ToolbarContent>,
     /// Scrollbar related settings

crates/editor/src/element.rs

@@ -1,6 +1,5 @@
 use crate::{
     blame_entry_tooltip::{blame_entry_relative_timestamp, BlameEntryTooltip},
-    code_context_menus::CodeActionsMenu,
     display_map::{
         Block, BlockContext, BlockStyle, DisplaySnapshot, HighlightedChunk, ToDisplayPoint,
     },
@@ -17,13 +16,13 @@ use crate::{
     items::BufferSearchHighlights,
     mouse_context_menu::{self, MenuPosition, MouseContextMenu},
     scroll::scroll_amount::ScrollAmount,
-    BlockId, ChunkReplacement, CursorShape, CustomBlockId, DisplayPoint, DisplayRow,
-    DocumentHighlightRead, DocumentHighlightWrite, Editor, EditorMode, EditorSettings,
+    BlockId, ChunkReplacement, CodeActionsMenu, CursorShape, CustomBlockId, DisplayPoint,
+    DisplayRow, DocumentHighlightRead, DocumentHighlightWrite, Editor, EditorMode, EditorSettings,
     EditorSnapshot, EditorStyle, ExpandExcerpts, FocusedBlock, GutterDimensions, HalfPageDown,
-    HalfPageUp, HandleInput, HoveredCursor, HoveredHunk, InlineCompletion, JumpData, LineDown,
-    LineUp, OpenExcerpts, PageDown, PageUp, Point, RowExt, RowRangeExt, SelectPhase, Selection,
-    SoftWrap, ToPoint, CURSORS_VISIBLE_FOR, FILE_HEADER_HEIGHT,
-    GIT_BLAME_MAX_AUTHOR_CHARS_DISPLAYED, MAX_LINE_LEN, MULTI_BUFFER_EXCERPT_HEADER_HEIGHT,
+    HalfPageUp, HandleInput, HoveredCursor, HoveredHunk, JumpData, LineDown, LineUp, OpenExcerpts,
+    PageDown, PageUp, Point, RowExt, RowRangeExt, SelectPhase, Selection, SoftWrap, ToPoint,
+    CURSORS_VISIBLE_FOR, FILE_HEADER_HEIGHT, GIT_BLAME_MAX_AUTHOR_CHARS_DISPLAYED, MAX_LINE_LEN,
+    MULTI_BUFFER_EXCERPT_HEADER_HEIGHT,
 };
 use client::ParticipantIndex;
 use collections::{BTreeMap, HashMap, HashSet};
@@ -32,7 +31,7 @@ use gpui::{
     anchored, deferred, div, fill, outline, point, px, quad, relative, size, svg,
     transparent_black, Action, AnchorCorner, AnyElement, AvailableSpace, Bounds, ClipboardItem,
     ContentMask, Corners, CursorStyle, DispatchPhase, Edges, Element, ElementInputHandler, Entity,
-    FontId, GlobalElementId, HighlightStyle, Hitbox, Hsla, InteractiveElement, IntoElement, Length,
+    FontId, GlobalElementId, Hitbox, Hsla, InteractiveElement, IntoElement, Length,
     ModifiersChangedEvent, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, PaintQuad,
     ParentElement, Pixels, ScrollDelta, ScrollWheelEvent, ShapedLine, SharedString, Size,
     StatefulInteractiveElement, Style, Styled, TextRun, TextStyleRefinement, View, ViewContext,
@@ -48,10 +47,7 @@ use language::{
     ChunkRendererContext,
 };
 use lsp::DiagnosticSeverity;
-use multi_buffer::{
-    Anchor, AnchorRangeExt, ExcerptId, ExpandExcerptDirection, MultiBufferPoint, MultiBufferRow,
-    MultiBufferSnapshot,
-};
+use multi_buffer::{Anchor, ExcerptId, ExpandExcerptDirection, MultiBufferPoint, MultiBufferRow};
 use project::{
     project_settings::{GitGutterSetting, ProjectSettings},
     ProjectPath,
@@ -173,7 +169,6 @@ impl EditorElement {
 
         crate::rust_analyzer_ext::apply_related_actions(view, cx);
         crate::clangd_ext::apply_related_actions(view, cx);
-        register_action(view, cx, Editor::open_context_menu);
         register_action(view, cx, Editor::move_left);
         register_action(view, cx, Editor::move_right);
         register_action(view, cx, Editor::move_down);
@@ -460,8 +455,6 @@ impl EditorElement {
         register_action(view, cx, Editor::open_active_item_in_terminal);
         register_action(view, cx, Editor::reload_file);
         register_action(view, cx, Editor::spawn_nearest_task);
-        register_action(view, cx, Editor::insert_uuid_v4);
-        register_action(view, cx, Editor::insert_uuid_v7);
     }
 
     fn register_key_listeners(&self, cx: &mut WindowContext, layout: &EditorLayout) {
@@ -602,7 +595,7 @@ impl EditorElement {
             position_map.point_for_position(text_hitbox.bounds, event.position);
         mouse_context_menu::deploy_context_menu(
             editor,
-            Some(event.position),
+            event.position,
             point_for_position.previous_valid,
             cx,
         );
@@ -1175,7 +1168,7 @@ impl EditorElement {
                 let editor = self.editor.read(cx);
                 let is_singleton = editor.is_singleton(cx);
                 // Git
-                (is_singleton && scrollbar_settings.git_diff && !snapshot.diff_map.is_empty())
+                (is_singleton && scrollbar_settings.git_diff && snapshot.buffer_snapshot.has_git_diffs())
                     ||
                     // Buffer Search Results
                     (is_singleton && scrollbar_settings.search_results && editor.has_background_highlights::<BufferSearchHighlights>())
@@ -1326,8 +1319,17 @@ impl EditorElement {
         cx: &mut WindowContext,
     ) -> Vec<(DisplayDiffHunk, Option<Hitbox>)> {
         let buffer_snapshot = &snapshot.buffer_snapshot;
-        let buffer_start = DisplayPoint::new(display_rows.start, 0).to_point(snapshot);
-        let buffer_end = DisplayPoint::new(display_rows.end, 0).to_point(snapshot);
+
+        let buffer_start_row = MultiBufferRow(
+            DisplayPoint::new(display_rows.start, 0)
+                .to_point(snapshot)
+                .row,
+        );
+        let buffer_end_row = MultiBufferRow(
+            DisplayPoint::new(display_rows.end, 0)
+                .to_point(snapshot)
+                .row,
+        );
 
         let git_gutter_setting = ProjectSettings::get_global(cx)
             .git
@@ -1335,7 +1337,7 @@ impl EditorElement {
             .unwrap_or_default();
 
         self.editor.update(cx, |editor, cx| {
-            let expanded_hunks = &editor.diff_map.hunks;
+            let expanded_hunks = &editor.expanded_hunks.hunks;
             let expanded_hunks_start_ix = expanded_hunks
                 .binary_search_by(|hunk| {
                     hunk.hunk_range
@@ -1346,10 +1348,8 @@ impl EditorElement {
                 .unwrap_err();
             let mut expanded_hunks = expanded_hunks[expanded_hunks_start_ix..].iter().peekable();
 
-            let mut display_hunks: Vec<(DisplayDiffHunk, Option<Hitbox>)> = editor
-                .diff_map
-                .snapshot
-                .diff_hunks_in_range(buffer_start..buffer_end, &buffer_snapshot)
+            let display_hunks = buffer_snapshot
+                .git_diff_hunks_in_range(buffer_start_row..buffer_end_row)
                 .filter_map(|hunk| {
                     let display_hunk = diff_hunk_to_display(&hunk, snapshot);
 
@@ -1392,23 +1392,25 @@ impl EditorElement {
                     Some(display_hunk)
                 })
                 .dedup()
-                .map(|hunk| (hunk, None))
+                .map(|hunk| match git_gutter_setting {
+                    GitGutterSetting::TrackedFiles => {
+                        let hitbox = match hunk {
+                            DisplayDiffHunk::Unfolded { .. } => {
+                                let hunk_bounds = Self::diff_hunk_bounds(
+                                    snapshot,
+                                    line_height,
+                                    gutter_hitbox.bounds,
+                                    &hunk,
+                                );
+                                Some(cx.insert_hitbox(hunk_bounds, true))
+                            }
+                            DisplayDiffHunk::Folded { .. } => None,
+                        };
+                        (hunk, hitbox)
+                    }
+                    GitGutterSetting::Hide => (hunk, None),
+                })
                 .collect();
-
-            if let GitGutterSetting::TrackedFiles = git_gutter_setting {
-                for (hunk, hitbox) in &mut display_hunks {
-                    if let DisplayDiffHunk::Unfolded { .. } = hunk {
-                        let hunk_bounds = Self::diff_hunk_bounds(
-                            snapshot,
-                            line_height,
-                            gutter_hitbox.bounds,
-                            &hunk,
-                        );
-                        *hitbox = Some(cx.insert_hitbox(hunk_bounds, true));
-                    };
-                }
-            }
-
             display_hunks
         })
     }
@@ -1681,7 +1683,7 @@ impl EditorElement {
     ) -> Vec<AnyElement> {
         self.editor.update(cx, |editor, cx| {
             let active_task_indicator_row =
-                if let Some(crate::CodeContextMenu::CodeActions(CodeActionsMenu {
+                if let Some(crate::ContextMenu::CodeActions(CodeActionsMenu {
                     deployed_from_indicator,
                     actions,
                     ..
@@ -1756,7 +1758,7 @@ impl EditorElement {
         let mut button = None;
         let row = newest_selection_head.row();
         self.editor.update(cx, |editor, cx| {
-            if let Some(crate::CodeContextMenu::CodeActions(CodeActionsMenu {
+            if let Some(crate::ContextMenu::CodeActions(CodeActionsMenu {
                 deployed_from_indicator,
                 ..
             })) = editor.context_menu.read().as_ref()
@@ -2724,161 +2726,10 @@ impl EditorElement {
         true
     }
 
-    #[allow(clippy::too_many_arguments)]
-    fn layout_inline_completion_popover(
-        &self,
-        text_bounds: &Bounds<Pixels>,
-        editor_snapshot: &EditorSnapshot,
-        visible_row_range: Range<DisplayRow>,
-        scroll_top: f32,
-        scroll_bottom: f32,
-        line_layouts: &[LineWithInvisibles],
-        line_height: Pixels,
-        scroll_pixel_position: gpui::Point<Pixels>,
-        editor_width: Pixels,
-        style: &EditorStyle,
-        cx: &mut WindowContext,
-    ) -> Option<AnyElement> {
-        const PADDING_X: Pixels = Pixels(25.);
-        const PADDING_Y: Pixels = Pixels(2.);
-
-        let active_inline_completion = self.editor.read(cx).active_inline_completion.as_ref()?;
-
-        match &active_inline_completion.completion {
-            InlineCompletion::Move(target_position) => {
-                let container_element = div()
-                    .bg(cx.theme().colors().editor_background)
-                    .border_1()
-                    .border_color(cx.theme().colors().border)
-                    .rounded_md()
-                    .px_1();
-
-                let target_display_point = target_position.to_display_point(editor_snapshot);
-                if target_display_point.row().as_f32() < scroll_top {
-                    let mut element = container_element
-                        .child(
-                            h_flex()
-                                .gap_1()
-                                .child(Icon::new(IconName::Tab))
-                                .child(Label::new("Jump to Edit"))
-                                .child(Icon::new(IconName::ArrowUp)),
-                        )
-                        .into_any();
-                    let size = element.layout_as_root(AvailableSpace::min_size(), cx);
-                    let offset = point((text_bounds.size.width - size.width) / 2., PADDING_Y);
-                    element.prepaint_at(text_bounds.origin + offset, cx);
-                    Some(element)
-                } else if (target_display_point.row().as_f32() + 1.) > scroll_bottom {
-                    let mut element = container_element
-                        .child(
-                            h_flex()
-                                .gap_1()
-                                .child(Icon::new(IconName::Tab))
-                                .child(Label::new("Jump to Edit"))
-                                .child(Icon::new(IconName::ArrowDown)),
-                        )
-                        .into_any();
-                    let size = element.layout_as_root(AvailableSpace::min_size(), cx);
-                    let offset = point(
-                        (text_bounds.size.width - size.width) / 2.,
-                        text_bounds.size.height - size.height - PADDING_Y,
-                    );
-                    element.prepaint_at(text_bounds.origin + offset, cx);
-                    Some(element)
-                } else {
-                    let mut element = container_element
-                        .child(
-                            h_flex()
-                                .gap_1()
-                                .child(Icon::new(IconName::Tab))
-                                .child(Label::new("Jump to Edit")),
-                        )
-                        .into_any();
-
-                    let target_line_end = DisplayPoint::new(
-                        target_display_point.row(),
-                        editor_snapshot.line_len(target_display_point.row()),
-                    );
-                    let origin = self.editor.update(cx, |editor, cx| {
-                        editor.display_to_pixel_point(target_line_end, editor_snapshot, cx)
-                    })?;
-                    element.prepaint_as_root(
-                        text_bounds.origin + origin + point(PADDING_X, px(0.)),
-                        AvailableSpace::min_size(),
-                        cx,
-                    );
-                    Some(element)
-                }
-            }
-            InlineCompletion::Edit(edits) => {
-                let edit_start = edits
-                    .first()
-                    .unwrap()
-                    .0
-                    .start
-                    .to_display_point(editor_snapshot);
-                let edit_end = edits
-                    .last()
-                    .unwrap()
-                    .0
-                    .end
-                    .to_display_point(editor_snapshot);
-
-                let is_visible = visible_row_range.contains(&edit_start.row())
-                    || visible_row_range.contains(&edit_end.row());
-                if !is_visible {
-                    return None;
-                }
-
-                if all_edits_insertions_or_deletions(edits, &editor_snapshot.buffer_snapshot) {
-                    return None;
-                }
-
-                let (text, highlights) = inline_completion_popover_text(editor_snapshot, edits, cx);
-
-                let longest_row =
-                    editor_snapshot.longest_row_in_range(edit_start.row()..edit_end.row() + 1);
-                let longest_line_width = if visible_row_range.contains(&longest_row) {
-                    line_layouts[(longest_row.0 - visible_row_range.start.0) as usize].width
-                } else {
-                    layout_line(
-                        longest_row,
-                        editor_snapshot,
-                        style,
-                        editor_width,
-                        |_| false,
-                        cx,
-                    )
-                    .width
-                };
-
-                let text = gpui::StyledText::new(text).with_highlights(&style.text, highlights);
-
-                let mut element = div()
-                    .bg(cx.theme().colors().editor_background)
-                    .border_1()
-                    .border_color(cx.theme().colors().border)
-                    .rounded_md()
-                    .px_1()
-                    .child(text)
-                    .into_any();
-
-                let origin = text_bounds.origin
-                    + point(
-                        longest_line_width + PADDING_X - scroll_pixel_position.x,
-                        edit_start.row().as_f32() * line_height - scroll_pixel_position.y,
-                    );
-                element.prepaint_as_root(origin, AvailableSpace::min_size(), cx);
-                Some(element)
-            }
-        }
-    }
-
     fn layout_mouse_context_menu(
         &self,
         editor_snapshot: &EditorSnapshot,
         visible_range: Range<DisplayRow>,
-        content_origin: gpui::Point<Pixels>,
         cx: &mut WindowContext,
     ) -> Option<AnyElement> {
         let position = self.editor.update(cx, |editor, cx| {
@@ -2896,11 +2747,16 @@ impl EditorElement {
             let mouse_context_menu = editor.mouse_context_menu.as_ref()?;
             let (source_display_point, position) = match mouse_context_menu.position {
                 MenuPosition::PinnedToScreen(point) => (None, point),
-                MenuPosition::PinnedToEditor { source, offset } => {
+                MenuPosition::PinnedToEditor {
+                    source,
+                    offset_x,
+                    offset_y,
+                } => {
                     let source_display_point = source.to_display_point(editor_snapshot);
-                    let source_point = editor.to_pixel_point(source, editor_snapshot, cx)?;
-                    let position = content_origin + source_point + offset;
-                    (Some(source_display_point), position)
+                    let mut source_point = editor.to_pixel_point(source, editor_snapshot, cx)?;
+                    source_point.x += offset_x;
+                    source_point.y += offset_y;
+                    (Some(source_display_point), source_point)
                 }
             };
 
@@ -3902,8 +3758,10 @@ impl EditorElement {
                             let mut marker_quads = Vec::new();
                             if scrollbar_settings.git_diff {
                                 let marker_row_ranges = snapshot
-                                    .diff_map
-                                    .diff_hunks(&snapshot.buffer_snapshot)
+                                    .buffer_snapshot
+                                    .git_diff_hunks_in_range(
+                                        MultiBufferRow::MIN..MultiBufferRow::MAX,
+                                    )
                                     .map(|hunk| {
                                         let start_display_row =
                                             MultiBufferPoint::new(hunk.row_range.start.0, 0)
@@ -4096,16 +3954,6 @@ impl EditorElement {
         }
     }
 
-    fn paint_inline_completion_popover(
-        &mut self,
-        layout: &mut EditorLayout,
-        cx: &mut WindowContext,
-    ) {
-        if let Some(inline_completion_popover) = layout.inline_completion_popover.as_mut() {
-            inline_completion_popover.paint(cx);
-        }
-    }
-
     fn paint_mouse_context_menu(&mut self, layout: &mut EditorLayout, cx: &mut WindowContext) {
         if let Some(mouse_context_menu) = layout.mouse_context_menu.as_mut() {
             mouse_context_menu.paint(cx);
@@ -4298,89 +4146,6 @@ impl EditorElement {
     }
 }
 
-fn inline_completion_popover_text(
-    editor_snapshot: &EditorSnapshot,
-    edits: &Vec<(Range<Anchor>, String)>,
-    cx: &WindowContext,
-) -> (String, Vec<(Range<usize>, HighlightStyle)>) {
-    let edit_start = edits
-        .first()
-        .unwrap()
-        .0
-        .start
-        .to_display_point(editor_snapshot);
-
-    let mut text = String::new();
-    let mut offset = DisplayPoint::new(edit_start.row(), 0).to_offset(editor_snapshot, Bias::Left);
-    let mut highlights = Vec::new();
-    for (old_range, new_text) in edits {
-        let old_offset_range = old_range.to_offset(&editor_snapshot.buffer_snapshot);
-        text.extend(
-            editor_snapshot
-                .buffer_snapshot
-                .chunks(offset..old_offset_range.start, false)
-                .map(|chunk| chunk.text),
-        );
-        offset = old_offset_range.end;
-
-        let start = text.len();
-        text.push_str(new_text);
-        let end = text.len();
-        highlights.push((
-            start..end,
-            HighlightStyle {
-                background_color: Some(cx.theme().status().created_background),
-                ..Default::default()
-            },
-        ));
-    }
-
-    let edit_end = edits
-        .last()
-        .unwrap()
-        .0
-        .end
-        .to_display_point(editor_snapshot);
-    let end_of_line = DisplayPoint::new(edit_end.row(), editor_snapshot.line_len(edit_end.row()))
-        .to_offset(editor_snapshot, Bias::Right);
-    text.extend(
-        editor_snapshot
-            .buffer_snapshot
-            .chunks(offset..end_of_line, false)
-            .map(|chunk| chunk.text),
-    );
-
-    (text, highlights)
-}
-
-fn all_edits_insertions_or_deletions(
-    edits: &Vec<(Range<Anchor>, String)>,
-    snapshot: &MultiBufferSnapshot,
-) -> bool {
-    let mut all_insertions = true;
-    let mut all_deletions = true;
-
-    for (range, new_text) in edits.iter() {
-        let range_is_empty = range.to_offset(&snapshot).is_empty();
-        let text_is_empty = new_text.is_empty();
-
-        if range_is_empty != text_is_empty {
-            if range_is_empty {
-                all_deletions = false;
-            } else {
-                all_insertions = false;
-            }
-        } else {
-            return false;
-        }
-
-        if !all_insertions && !all_deletions {
-            return false;
-        }
-    }
-    all_insertions || all_deletions
-}
-
 #[allow(clippy::too_many_arguments)]
 fn prepaint_gutter_button(
     button: IconButton,
@@ -4560,8 +4325,8 @@ fn deploy_blame_entry_context_menu(
     });
 
     editor.update(cx, move |editor, cx| {
-        editor.mouse_context_menu = Some(MouseContextMenu::new(
-            MenuPosition::PinnedToScreen(position),
+        editor.mouse_context_menu = Some(MouseContextMenu::pinned_to_screen(
+            position,
             context_menu,
             cx,
         ));
@@ -5678,7 +5443,7 @@ impl Element for EditorElement {
 
                     let expanded_add_hunks_by_rows = self.editor.update(cx, |editor, _| {
                         editor
-                            .diff_map
+                            .expanded_hunks
                             .hunks(false)
                             .filter(|hunk| hunk.status == DiffHunkStatus::Added)
                             .map(|expanded_hunk| {
@@ -5813,26 +5578,8 @@ impl Element for EditorElement {
                         );
                     }
 
-                    let inline_completion_popover = self.layout_inline_completion_popover(
-                        &text_hitbox.bounds,
-                        &snapshot,
-                        start_row..end_row,
-                        scroll_position.y,
-                        scroll_position.y + height_in_lines,
-                        &line_layouts,
-                        line_height,
-                        scroll_pixel_position,
-                        editor_width,
-                        &style,
-                        cx,
-                    );
-
-                    let mouse_context_menu = self.layout_mouse_context_menu(
-                        &snapshot,
-                        start_row..end_row,
-                        content_origin,
-                        cx,
-                    );
+                    let mouse_context_menu =
+                        self.layout_mouse_context_menu(&snapshot, start_row..end_row, cx);
 
                     cx.with_element_namespace("crease_toggles", |cx| {
                         self.prepaint_crease_toggles(
@@ -5913,7 +5660,6 @@ impl Element for EditorElement {
                         cursors,
                         visible_cursors,
                         selections,
-                        inline_completion_popover,
                         mouse_context_menu,
                         test_indicators,
                         code_actions_indicator,
@@ -6003,7 +5749,6 @@ impl Element for EditorElement {
                     }
 
                     self.paint_scrollbar(layout, cx);
-                    self.paint_inline_completion_popover(layout, cx);
                     self.paint_mouse_context_menu(layout, cx);
                 });
             })
@@ -6059,7 +5804,6 @@ pub struct EditorLayout {
     test_indicators: Vec<AnyElement>,
     crease_toggles: Vec<Option<AnyElement>>,
     crease_trailers: Vec<Option<CreaseTrailerLayout>>,
-    inline_completion_popover: Option<AnyElement>,
     mouse_context_menu: Option<AnyElement>,
     tab_invisible: ShapedLine,
     space_invisible: ShapedLine,
@@ -7101,161 +6845,6 @@ mod tests {
         }
     }
 
-    #[gpui::test]
-    fn test_inline_completion_popover_text(cx: &mut TestAppContext) {
-        init_test(cx, |_| {});
-
-        // Test case 1: Simple insertion
-        {
-            let window = cx.add_window(|cx| {
-                let buffer = MultiBuffer::build_simple("Hello, world!", cx);
-                Editor::new(EditorMode::Full, buffer, None, true, cx)
-            });
-            let cx = &mut VisualTestContext::from_window(*window, cx);
-
-            window
-                .update(cx, |editor, cx| {
-                    let snapshot = editor.snapshot(cx);
-                    let edit_range = snapshot.buffer_snapshot.anchor_after(Point::new(0, 6))
-                        ..snapshot.buffer_snapshot.anchor_before(Point::new(0, 6));
-                    let edits = vec![(edit_range, " beautiful".to_string())];
-
-                    let (text, highlights) = inline_completion_popover_text(&snapshot, &edits, cx);
-
-                    assert_eq!(text, "Hello, beautiful world!");
-                    assert_eq!(highlights.len(), 1);
-                    assert_eq!(highlights[0].0, 6..16);
-                    assert_eq!(
-                        highlights[0].1.background_color,
-                        Some(cx.theme().status().created_background)
-                    );
-                })
-                .unwrap();
-        }
-
-        // Test case 2: Replacement
-        {
-            let window = cx.add_window(|cx| {
-                let buffer = MultiBuffer::build_simple("This is a test.", cx);
-                Editor::new(EditorMode::Full, buffer, None, true, cx)
-            });
-            let cx = &mut VisualTestContext::from_window(*window, cx);
-
-            window
-                .update(cx, |editor, cx| {
-                    let snapshot = editor.snapshot(cx);
-                    let edits = vec![(
-                        snapshot.buffer_snapshot.anchor_after(Point::new(0, 0))
-                            ..snapshot.buffer_snapshot.anchor_before(Point::new(0, 4)),
-                        "That".to_string(),
-                    )];
-
-                    let (text, highlights) = inline_completion_popover_text(&snapshot, &edits, cx);
-
-                    assert_eq!(text, "That is a test.");
-                    assert_eq!(highlights.len(), 1);
-                    assert_eq!(highlights[0].0, 0..4);
-                    assert_eq!(
-                        highlights[0].1.background_color,
-                        Some(cx.theme().status().created_background)
-                    );
-                })
-                .unwrap();
-        }
-
-        // Test case 3: Multiple edits
-        {
-            let window = cx.add_window(|cx| {
-                let buffer = MultiBuffer::build_simple("Hello, world!", cx);
-                Editor::new(EditorMode::Full, buffer, None, true, cx)
-            });
-            let cx = &mut VisualTestContext::from_window(*window, cx);
-
-            window
-                .update(cx, |editor, cx| {
-                    let snapshot = editor.snapshot(cx);
-                    let edits = vec![
-                        (
-                            snapshot.buffer_snapshot.anchor_after(Point::new(0, 0))
-                                ..snapshot.buffer_snapshot.anchor_before(Point::new(0, 5)),
-                            "Greetings".into(),
-                        ),
-                        (
-                            snapshot.buffer_snapshot.anchor_after(Point::new(0, 12))
-                                ..snapshot.buffer_snapshot.anchor_before(Point::new(0, 12)),
-                            " and universe".into(),
-                        ),
-                    ];
-
-                    let (text, highlights) = inline_completion_popover_text(&snapshot, &edits, cx);
-
-                    assert_eq!(text, "Greetings, world and universe!");
-                    assert_eq!(highlights.len(), 2);
-                    assert_eq!(highlights[0].0, 0..9);
-                    assert_eq!(highlights[1].0, 16..29);
-                    assert_eq!(
-                        highlights[0].1.background_color,
-                        Some(cx.theme().status().created_background)
-                    );
-                    assert_eq!(
-                        highlights[1].1.background_color,
-                        Some(cx.theme().status().created_background)
-                    );
-                })
-                .unwrap();
-        }
-
-        // Test case 4: Multiple lines with edits
-        {
-            let window = cx.add_window(|cx| {
-                let buffer = MultiBuffer::build_simple(
-                    "First line\nSecond line\nThird line\nFourth line",
-                    cx,
-                );
-                Editor::new(EditorMode::Full, buffer, None, true, cx)
-            });
-            let cx = &mut VisualTestContext::from_window(*window, cx);
-
-            window
-                .update(cx, |editor, cx| {
-                    let snapshot = editor.snapshot(cx);
-                    let edits = vec![
-                        (
-                            snapshot.buffer_snapshot.anchor_before(Point::new(1, 7))
-                                ..snapshot.buffer_snapshot.anchor_before(Point::new(1, 11)),
-                            "modified".to_string(),
-                        ),
-                        (
-                            snapshot.buffer_snapshot.anchor_before(Point::new(2, 0))
-                                ..snapshot.buffer_snapshot.anchor_before(Point::new(2, 10)),
-                            "New third line".to_string(),
-                        ),
-                        (
-                            snapshot.buffer_snapshot.anchor_before(Point::new(3, 6))
-                                ..snapshot.buffer_snapshot.anchor_before(Point::new(3, 6)),
-                            " updated".to_string(),
-                        ),
-                    ];
-
-                    let (text, highlights) = inline_completion_popover_text(&snapshot, &edits, cx);
-
-                    assert_eq!(text, "Second modified\nNew third line\nFourth updated line");
-                    assert_eq!(highlights.len(), 3);
-                    assert_eq!(highlights[0].0, 7..15); // "modified"
-                    assert_eq!(highlights[1].0, 16..30); // "New third line"
-                    assert_eq!(highlights[2].0, 37..45); // " updated"
-
-                    for highlight in &highlights {
-                        assert_eq!(
-                            highlight.1.background_color,
-                            Some(cx.theme().status().created_background)
-                        );
-                    }
-                })
-                .unwrap();
-        }
-    }
-
     fn collect_invisibles_from_new_editor(
         cx: &mut TestAppContext,
         editor_mode: EditorMode,

crates/editor/src/git.rs

@@ -1,2 +1 @@
 pub mod blame;
-pub mod project_diff;

crates/editor/src/git/blame.rs

@@ -154,7 +154,7 @@ impl GitBlame {
                         this.generate(cx);
                     }
                 }
-                project::Event::WorktreeUpdatedGitRepositories(_) => {
+                project::Event::WorktreeUpdatedGitRepositories => {
                     log::debug!("Status of git repositories updated. Regenerating blame data...",);
                     this.generate(cx);
                 }

crates/editor/src/hunk_diff.rs

@@ -1,17 +1,12 @@
-use collections::{HashMap, HashSet};
+use collections::{hash_map, HashMap, HashSet};
 use git::diff::DiffHunkStatus;
-use gpui::{
-    Action, AnchorCorner, AppContext, CursorStyle, Hsla, Model, MouseButton, Subscription, Task,
-    View,
-};
+use gpui::{Action, AnchorCorner, AppContext, CursorStyle, Hsla, Model, MouseButton, Task, View};
 use language::{Buffer, BufferId, Point};
 use multi_buffer::{
     Anchor, AnchorRangeExt, ExcerptRange, MultiBuffer, MultiBufferDiffHunk, MultiBufferRow,
-    MultiBufferSnapshot, ToOffset, ToPoint,
+    MultiBufferSnapshot, ToPoint,
 };
-use project::buffer_store::BufferChangeSet;
 use std::{ops::Range, sync::Arc};
-use sum_tree::TreeMap;
 use text::OffsetRangeExt;
 use ui::{
     prelude::*, ActiveTheme, ContextMenu, IconButtonShape, InteractiveElement, IntoElement,
@@ -34,11 +29,10 @@ pub(super) struct HoveredHunk {
     pub diff_base_byte_range: Range<usize>,
 }
 
-#[derive(Default)]
-pub(super) struct DiffMap {
+#[derive(Debug, Default)]
+pub(super) struct ExpandedHunks {
     pub(crate) hunks: Vec<ExpandedHunk>,
-    pub(crate) diff_bases: HashMap<BufferId, DiffBaseState>,
-    pub(crate) snapshot: DiffMapSnapshot,
+    diff_base: HashMap<BufferId, DiffBaseBuffer>,
     hunk_update_tasks: HashMap<Option<BufferId>, Task<()>>,
     expand_all: bool,
 }
@@ -52,13 +46,10 @@ pub(super) struct ExpandedHunk {
     pub folded: bool,
 }
 
-#[derive(Clone, Debug, Default)]
-pub(crate) struct DiffMapSnapshot(TreeMap<BufferId, git::diff::BufferDiff>);
-
-pub(crate) struct DiffBaseState {
-    pub(crate) change_set: Model<BufferChangeSet>,
-    pub(crate) last_version: Option<usize>,
-    _subscription: Subscription,
+#[derive(Debug)]
+struct DiffBaseBuffer {
+    buffer: Model<Buffer>,
+    diff_base_version: usize,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -75,38 +66,7 @@ pub enum DisplayDiffHunk {
     },
 }
 
-impl DiffMap {
-    pub fn snapshot(&self) -> DiffMapSnapshot {
-        self.snapshot.clone()
-    }
-
-    pub fn add_change_set(
-        &mut self,
-        change_set: Model<BufferChangeSet>,
-        cx: &mut ViewContext<Editor>,
-    ) {
-        let buffer_id = change_set.read(cx).buffer_id;
-        self.snapshot
-            .0
-            .insert(buffer_id, change_set.read(cx).diff_to_buffer.clone());
-        self.diff_bases.insert(
-            buffer_id,
-            DiffBaseState {
-                last_version: None,
-                _subscription: cx.observe(&change_set, move |editor, change_set, cx| {
-                    editor
-                        .diff_map
-                        .snapshot
-                        .0
-                        .insert(buffer_id, change_set.read(cx).diff_to_buffer.clone());
-                    Editor::sync_expanded_diff_hunks(&mut editor.diff_map, buffer_id, cx);
-                }),
-                change_set,
-            },
-        );
-        Editor::sync_expanded_diff_hunks(self, buffer_id, cx);
-    }
-
+impl ExpandedHunks {
     pub fn hunks(&self, include_folded: bool) -> impl Iterator<Item = &ExpandedHunk> {
         self.hunks
             .iter()
@@ -114,92 +74,9 @@ impl DiffMap {
     }
 }
 
-impl DiffMapSnapshot {
-    pub fn is_empty(&self) -> bool {
-        self.0.values().all(|diff| diff.is_empty())
-    }
-
-    pub fn diff_hunks<'a>(
-        &'a self,
-        buffer_snapshot: &'a MultiBufferSnapshot,
-    ) -> impl Iterator<Item = MultiBufferDiffHunk> + 'a {
-        self.diff_hunks_in_range(0..buffer_snapshot.len(), buffer_snapshot)
-    }
-
-    pub fn diff_hunks_in_range<'a, T: ToOffset>(
-        &'a self,
-        range: Range<T>,
-        buffer_snapshot: &'a MultiBufferSnapshot,
-    ) -> impl Iterator<Item = MultiBufferDiffHunk> + 'a {
-        let range = range.start.to_offset(buffer_snapshot)..range.end.to_offset(buffer_snapshot);
-        buffer_snapshot
-            .excerpts_for_range(range.clone())
-            .filter_map(move |excerpt| {
-                let buffer = excerpt.buffer();
-                let buffer_id = buffer.remote_id();
-                let diff = self.0.get(&buffer_id)?;
-                let buffer_range = excerpt.map_range_to_buffer(range.clone());
-                let buffer_range =
-                    buffer.anchor_before(buffer_range.start)..buffer.anchor_after(buffer_range.end);
-                Some(
-                    diff.hunks_intersecting_range(buffer_range, excerpt.buffer())
-                        .map(move |hunk| {
-                            let start =
-                                excerpt.map_point_from_buffer(Point::new(hunk.row_range.start, 0));
-                            let end =
-                                excerpt.map_point_from_buffer(Point::new(hunk.row_range.end, 0));
-                            MultiBufferDiffHunk {
-                                row_range: MultiBufferRow(start.row)..MultiBufferRow(end.row),
-                                buffer_id,
-                                buffer_range: hunk.buffer_range.clone(),
-                                diff_base_byte_range: hunk.diff_base_byte_range.clone(),
-                            }
-                        }),
-                )
-            })
-            .flatten()
-    }
-
-    pub fn diff_hunks_in_range_rev<'a, T: ToOffset>(
-        &'a self,
-        range: Range<T>,
-        buffer_snapshot: &'a MultiBufferSnapshot,
-    ) -> impl Iterator<Item = MultiBufferDiffHunk> + 'a {
-        let range = range.start.to_offset(buffer_snapshot)..range.end.to_offset(buffer_snapshot);
-        buffer_snapshot
-            .excerpts_for_range_rev(range.clone())
-            .filter_map(move |excerpt| {
-                let buffer = excerpt.buffer();
-                let buffer_id = buffer.remote_id();
-                let diff = self.0.get(&buffer_id)?;
-                let buffer_range = excerpt.map_range_to_buffer(range.clone());
-                let buffer_range =
-                    buffer.anchor_before(buffer_range.start)..buffer.anchor_after(buffer_range.end);
-                Some(
-                    diff.hunks_intersecting_range_rev(buffer_range, excerpt.buffer())
-                        .map(move |hunk| {
-                            let start_row = excerpt
-                                .map_point_from_buffer(Point::new(hunk.row_range.start, 0))
-                                .row;
-                            let end_row = excerpt
-                                .map_point_from_buffer(Point::new(hunk.row_range.end, 0))
-                                .row;
-                            MultiBufferDiffHunk {
-                                row_range: MultiBufferRow(start_row)..MultiBufferRow(end_row),
-                                buffer_id,
-                                buffer_range: hunk.buffer_range.clone(),
-                                diff_base_byte_range: hunk.diff_base_byte_range.clone(),
-                            }
-                        }),
-                )
-            })
-            .flatten()
-    }
-}
-
 impl Editor {
     pub fn set_expand_all_diff_hunks(&mut self) {
-        self.diff_map.expand_all = true;
+        self.expanded_hunks.expand_all = true;
     }
 
     pub(super) fn toggle_hovered_hunk(
@@ -215,15 +92,18 @@ impl Editor {
     }
 
     pub fn toggle_hunk_diff(&mut self, _: &ToggleHunkDiff, cx: &mut ViewContext<Self>) {
-        let snapshot = self.snapshot(cx);
-        let selections = self.selections.all(cx);
-        self.toggle_hunks_expanded(hunks_for_selections(&snapshot, &selections), cx);
+        let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx);
+        let selections = self.selections.disjoint_anchors();
+        self.toggle_hunks_expanded(
+            hunks_for_selections(&multi_buffer_snapshot, &selections),
+            cx,
+        );
     }
 
     pub fn expand_all_hunk_diffs(&mut self, _: &ExpandAllHunkDiffs, cx: &mut ViewContext<Self>) {
         let snapshot = self.snapshot(cx);
         let display_rows_with_expanded_hunks = self
-            .diff_map
+            .expanded_hunks
             .hunks(false)
             .map(|hunk| &hunk.hunk_range)
             .map(|anchor_range| {
@@ -239,10 +119,10 @@ impl Editor {
                 )
             })
             .collect::<HashMap<_, _>>();
-        let hunks = self
-            .diff_map
-            .snapshot
-            .diff_hunks(&snapshot.display_snapshot.buffer_snapshot)
+        let hunks = snapshot
+            .display_snapshot
+            .buffer_snapshot
+            .git_diff_hunks_in_range(MultiBufferRow::MIN..MultiBufferRow::MAX)
             .filter(|hunk| {
                 let hunk_display_row_range = Point::new(hunk.row_range.start.0, 0)
                     .to_display_point(&snapshot.display_snapshot)
@@ -260,11 +140,11 @@ impl Editor {
         hunks_to_toggle: Vec<MultiBufferDiffHunk>,
         cx: &mut ViewContext<Self>,
     ) {
-        if self.diff_map.expand_all {
+        if self.expanded_hunks.expand_all {
             return;
         }
 
-        let previous_toggle_task = self.diff_map.hunk_update_tasks.remove(&None);
+        let previous_toggle_task = self.expanded_hunks.hunk_update_tasks.remove(&None);
         let new_toggle_task = cx.spawn(move |editor, mut cx| async move {
             if let Some(task) = previous_toggle_task {
                 task.await;
@@ -274,10 +154,11 @@ impl Editor {
                 .update(&mut cx, |editor, cx| {
                     let snapshot = editor.snapshot(cx);
                     let mut hunks_to_toggle = hunks_to_toggle.into_iter().fuse().peekable();
-                    let mut highlights_to_remove = Vec::with_capacity(editor.diff_map.hunks.len());
+                    let mut highlights_to_remove =
+                        Vec::with_capacity(editor.expanded_hunks.hunks.len());
                     let mut blocks_to_remove = HashSet::default();
                     let mut hunks_to_expand = Vec::new();
-                    editor.diff_map.hunks.retain(|expanded_hunk| {
+                    editor.expanded_hunks.hunks.retain(|expanded_hunk| {
                         if expanded_hunk.folded {
                             return true;
                         }
@@ -357,7 +238,7 @@ impl Editor {
                 .ok();
         });
 
-        self.diff_map
+        self.expanded_hunks
             .hunk_update_tasks
             .insert(None, cx.background_executor().spawn(new_toggle_task));
     }
@@ -371,34 +252,30 @@ impl Editor {
         let buffer = self.buffer.clone();
         let multi_buffer_snapshot = buffer.read(cx).snapshot(cx);
         let hunk_range = hunk.multi_buffer_range.clone();
-        let buffer_id = hunk_range.start.buffer_id?;
-        let diff_base_buffer = diff_base_buffer.or_else(|| {
-            self.diff_map
-                .diff_bases
-                .get(&buffer_id)?
-                .change_set
-                .read(cx)
-                .base_text
-                .clone()
+        let (diff_base_buffer, deleted_text_lines) = buffer.update(cx, |buffer, cx| {
+            let buffer = buffer.buffer(hunk_range.start.buffer_id?)?;
+            let diff_base_buffer = diff_base_buffer
+                .or_else(|| self.current_diff_base_buffer(&buffer, cx))
+                .or_else(|| create_diff_base_buffer(&buffer, cx))?;
+            let deleted_text_lines = buffer.read(cx).diff_base().map(|diff_base| {
+                let diff_start_row = diff_base
+                    .offset_to_point(hunk.diff_base_byte_range.start)
+                    .row;
+                let diff_end_row = diff_base.offset_to_point(hunk.diff_base_byte_range.end).row;
+                diff_end_row - diff_start_row
+            })?;
+            Some((diff_base_buffer, deleted_text_lines))
         })?;
 
-        let diff_base = diff_base_buffer.read(cx);
-        let diff_start_row = diff_base
-            .offset_to_point(hunk.diff_base_byte_range.start)
-            .row;
-        let diff_end_row = diff_base.offset_to_point(hunk.diff_base_byte_range.end).row;
-        let deleted_text_lines = diff_end_row - diff_start_row;
-
-        let block_insert_index = self
-            .diff_map
-            .hunks
-            .binary_search_by(|probe| {
-                probe
-                    .hunk_range
-                    .start
-                    .cmp(&hunk_range.start, &multi_buffer_snapshot)
-            })
-            .err()?;
+        let block_insert_index = match self.expanded_hunks.hunks.binary_search_by(|probe| {
+            probe
+                .hunk_range
+                .start
+                .cmp(&hunk_range.start, &multi_buffer_snapshot)
+        }) {
+            Ok(_already_present) => return None,
+            Err(ix) => ix,
+        };
 
         let blocks;
         match hunk.status {
@@ -438,7 +315,7 @@ impl Editor {
                 );
             }
         };
-        self.diff_map.hunks.insert(
+        self.expanded_hunks.hunks.insert(
             block_insert_index,
             ExpandedHunk {
                 blocks,
@@ -497,8 +374,8 @@ impl Editor {
         _: &ApplyDiffHunk,
         cx: &mut ViewContext<Self>,
     ) {
-        let snapshot = self.snapshot(cx);
-        let hunks = hunks_for_selections(&snapshot, &self.selections.all(cx));
+        let snapshot = self.buffer.read(cx).snapshot(cx);
+        let hunks = hunks_for_selections(&snapshot, &self.selections.disjoint_anchors());
         let mut ranges_by_buffer = HashMap::default();
         self.transact(cx, |editor, cx| {
             for hunk in hunks {
@@ -524,7 +401,7 @@ impl Editor {
 
     fn has_multiple_hunks(&self, cx: &AppContext) -> bool {
         let snapshot = self.buffer.read(cx).snapshot(cx);
-        let mut hunks = self.diff_map.snapshot.diff_hunks(&snapshot);
+        let mut hunks = snapshot.git_diff_hunks_in_range(MultiBufferRow::MIN..MultiBufferRow::MAX);
         hunks.nth(1).is_some()
     }
 
@@ -538,7 +415,7 @@ impl Editor {
             .read(cx)
             .point_to_buffer_offset(hunk.multi_buffer_range.start, cx)
             .map_or(false, |(buffer, _, _)| {
-                buffer.read(cx).base_buffer().is_some()
+                buffer.read(cx).diff_base_buffer().is_some()
             });
 
         let border_color = cx.theme().colors().border_variant;
@@ -675,9 +552,29 @@ impl Editor {
                                                     let editor = editor.clone();
                                                     let hunk = hunk.clone();
                                                     move |_event, cx| {
-                                                        editor.update(cx, |editor, cx| {
-                                                            editor.revert_hunk(hunk.clone(), 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)
+                                                            });
+                                                        }
                                                     }
                                                 }),
                                         )
@@ -866,13 +763,13 @@ impl Editor {
     }
 
     pub(super) fn clear_expanded_diff_hunks(&mut self, cx: &mut ViewContext<'_, Editor>) -> bool {
-        if self.diff_map.expand_all {
+        if self.expanded_hunks.expand_all {
             return false;
         }
-        self.diff_map.hunk_update_tasks.clear();
+        self.expanded_hunks.hunk_update_tasks.clear();
         self.clear_row_highlights::<DiffRowHighlight>();
         let to_remove = self
-            .diff_map
+            .expanded_hunks
             .hunks
             .drain(..)
             .flat_map(|expanded_hunk| expanded_hunk.blocks.into_iter())
@@ -886,39 +783,48 @@ impl Editor {
     }
 
     pub(super) fn sync_expanded_diff_hunks(
-        diff_map: &mut DiffMap,
-        buffer_id: BufferId,
+        &mut self,
+        buffer: Model<Buffer>,
         cx: &mut ViewContext<'_, Self>,
     ) {
-        let diff_base_state = diff_map.diff_bases.get_mut(&buffer_id);
-        let mut diff_base_buffer = None;
-        let mut diff_base_buffer_unchanged = true;
-        if let Some(diff_base_state) = diff_base_state {
-            diff_base_state.change_set.update(cx, |change_set, _| {
-                if diff_base_state.last_version != Some(change_set.base_text_version) {
-                    diff_base_state.last_version = Some(change_set.base_text_version);
-                    diff_base_buffer_unchanged = false;
-                }
-                diff_base_buffer = change_set.base_text.clone();
-            })
-        }
-
-        diff_map.hunk_update_tasks.remove(&Some(buffer_id));
-
+        let buffer_id = buffer.read(cx).remote_id();
+        let buffer_diff_base_version = buffer.read(cx).diff_base_version();
+        self.expanded_hunks
+            .hunk_update_tasks
+            .remove(&Some(buffer_id));
+        let diff_base_buffer = self.current_diff_base_buffer(&buffer, cx);
         let new_sync_task = cx.spawn(move |editor, mut cx| async move {
+            let diff_base_buffer_unchanged = diff_base_buffer.is_some();
+            let Ok(diff_base_buffer) =
+                cx.update(|cx| diff_base_buffer.or_else(|| create_diff_base_buffer(&buffer, cx)))
+            else {
+                return;
+            };
             editor
                 .update(&mut cx, |editor, cx| {
+                    if let Some(diff_base_buffer) = &diff_base_buffer {
+                        editor.expanded_hunks.diff_base.insert(
+                            buffer_id,
+                            DiffBaseBuffer {
+                                buffer: diff_base_buffer.clone(),
+                                diff_base_version: buffer_diff_base_version,
+                            },
+                        );
+                    }
+
                     let snapshot = editor.snapshot(cx);
                     let mut recalculated_hunks = snapshot
-                        .diff_map
-                        .diff_hunks(&snapshot.buffer_snapshot)
+                        .buffer_snapshot
+                        .git_diff_hunks_in_range(MultiBufferRow::MIN..MultiBufferRow::MAX)
                         .filter(|hunk| hunk.buffer_id == buffer_id)
                         .fuse()
                         .peekable();
-                    let mut highlights_to_remove = Vec::with_capacity(editor.diff_map.hunks.len());
+                    let mut highlights_to_remove =
+                        Vec::with_capacity(editor.expanded_hunks.hunks.len());
                     let mut blocks_to_remove = HashSet::default();
-                    let mut hunks_to_reexpand = Vec::with_capacity(editor.diff_map.hunks.len());
-                    editor.diff_map.hunks.retain_mut(|expanded_hunk| {
+                    let mut hunks_to_reexpand =
+                        Vec::with_capacity(editor.expanded_hunks.hunks.len());
+                    editor.expanded_hunks.hunks.retain_mut(|expanded_hunk| {
                         if expanded_hunk.hunk_range.start.buffer_id != Some(buffer_id) {
                             return true;
                         };
@@ -968,7 +874,7 @@ impl Editor {
                                             > hunk_display_range.end
                                         {
                                             recalculated_hunks.next();
-                                            if editor.diff_map.expand_all {
+                                            if editor.expanded_hunks.expand_all {
                                                 hunks_to_reexpand.push(HoveredHunk {
                                                     status,
                                                     multi_buffer_range,
@@ -1011,7 +917,7 @@ impl Editor {
                         retain
                     });
 
-                    if editor.diff_map.expand_all {
+                    if editor.expanded_hunks.expand_all {
                         for hunk in recalculated_hunks {
                             match diff_hunk_to_display(&hunk, &snapshot) {
                                 DisplayDiffHunk::Folded { .. } => {}
@@ -1029,8 +935,6 @@ impl Editor {
                                 }
                             }
                         }
-                    } else {
-                        drop(recalculated_hunks);
                     }
 
                     editor.remove_highlighted_rows::<DiffRowHighlight>(highlights_to_remove, cx);
@@ -1045,12 +949,32 @@ impl Editor {
                 .ok();
         });
 
-        diff_map.hunk_update_tasks.insert(
+        self.expanded_hunks.hunk_update_tasks.insert(
             Some(buffer_id),
             cx.background_executor().spawn(new_sync_task),
         );
     }
 
+    fn current_diff_base_buffer(
+        &mut self,
+        buffer: &Model<Buffer>,
+        cx: &mut AppContext,
+    ) -> Option<Model<Buffer>> {
+        buffer.update(cx, |buffer, _| {
+            match self.expanded_hunks.diff_base.entry(buffer.remote_id()) {
+                hash_map::Entry::Occupied(o) => {
+                    if o.get().diff_base_version != buffer.diff_base_version() {
+                        o.remove();
+                        None
+                    } else {
+                        Some(o.get().buffer.clone())
+                    }
+                }
+                hash_map::Entry::Vacant(_) => None,
+            }
+        })
+    }
+
     fn go_to_subsequent_hunk(&mut self, position: Anchor, cx: &mut ViewContext<Self>) {
         let snapshot = self.snapshot(cx);
         let position = position.to_point(&snapshot.buffer_snapshot);
@@ -1097,7 +1021,7 @@ impl Editor {
     }
 }
 
-pub(crate) fn to_diff_hunk(
+fn to_diff_hunk(
     hovered_hunk: &HoveredHunk,
     multi_buffer_snapshot: &MultiBufferSnapshot,
 ) -> Option<MultiBufferDiffHunk> {
@@ -1119,6 +1043,24 @@ pub(crate) fn to_diff_hunk(
     })
 }
 
+fn create_diff_base_buffer(buffer: &Model<Buffer>, cx: &mut AppContext) -> Option<Model<Buffer>> {
+    buffer
+        .update(cx, |buffer, _| {
+            let language = buffer.language().cloned();
+            let diff_base = buffer.diff_base()?.clone();
+            Some((buffer.line_ending(), diff_base, language))
+        })
+        .map(|(line_ending, diff_base, language)| {
+            cx.new_model(|cx| {
+                let buffer = Buffer::local_normalized(diff_base, line_ending, cx);
+                match language {
+                    Some(language) => buffer.with_language(language, cx),
+                    None => buffer,
+                }
+            })
+        })
+}
+
 fn added_hunk_color(cx: &AppContext) -> Hsla {
     let mut created_color = cx.theme().status().git().created;
     created_color.fade_out(0.7);
@@ -1176,27 +1118,51 @@ fn editor_with_deleted_text(
                 });
             })]);
 
+        let original_multi_buffer_range = hunk.multi_buffer_range.clone();
+        let diff_base_range = hunk.diff_base_byte_range.clone();
         editor
             .register_action::<RevertSelectedHunks>({
-                let hunk = hunk.clone();
                 let parent_editor = parent_editor.clone();
                 move |_, cx| {
                     parent_editor
-                        .update(cx, |editor, cx| editor.revert_hunk(hunk.clone(), cx))
+                        .update(cx, |editor, cx| {
+                            let Some((buffer, original_text)) =
+                                editor.buffer().update(cx, |buffer, cx| {
+                                    let (_, buffer, _) = buffer.excerpt_containing(
+                                        original_multi_buffer_range.start,
+                                        cx,
+                                    )?;
+                                    let original_text =
+                                        buffer.read(cx).diff_base()?.slice(diff_base_range.clone());
+                                    Some((buffer, Arc::from(original_text.to_string())))
+                                })
+                            else {
+                                return;
+                            };
+                            buffer.update(cx, |buffer, cx| {
+                                buffer.edit(
+                                    Some((
+                                        original_multi_buffer_range.start.text_anchor
+                                            ..original_multi_buffer_range.end.text_anchor,
+                                        original_text,
+                                    )),
+                                    None,
+                                    cx,
+                                )
+                            });
+                        })
                         .ok();
                 }
             })
             .detach();
+        let hunk = hunk.clone();
         editor
-            .register_action::<ToggleHunkDiff>({
-                let hunk = hunk.clone();
-                move |_, cx| {
-                    parent_editor
-                        .update(cx, |editor, cx| {
-                            editor.toggle_hovered_hunk(&hunk, cx);
-                        })
-                        .ok();
-                }
+            .register_action::<ToggleHunkDiff>(move |_, cx| {
+                parent_editor
+                    .update(cx, |editor, cx| {
+                        editor.toggle_hovered_hunk(&hunk, cx);
+                    })
+                    .ok();
             })
             .detach();
         editor
@@ -1306,57 +1272,78 @@ mod tests {
         let project = Project::test(fs, [], cx).await;
 
         // buffer has two modified hunks with two rows each
-        let diff_base_1 = "
-            1.zero
-            1.one
-            1.two
-            1.three
-            1.four
-            1.five
-            1.six
-        "
-        .unindent();
-
-        let text_1 = "
-            1.zero
-            1.ONE
-            1.TWO
-            1.three
-            1.FOUR
-            1.FIVE
-            1.six
-        "
-        .unindent();
+        let buffer_1 = project.update(cx, |project, cx| {
+            project.create_local_buffer(
+                "
+                        1.zero
+                        1.ONE
+                        1.TWO
+                        1.three
+                        1.FOUR
+                        1.FIVE
+                        1.six
+                    "
+                .unindent()
+                .as_str(),
+                None,
+                cx,
+            )
+        });
+        buffer_1.update(cx, |buffer, cx| {
+            buffer.set_diff_base(
+                Some(
+                    "
+                        1.zero
+                        1.one
+                        1.two
+                        1.three
+                        1.four
+                        1.five
+                        1.six
+                    "
+                    .unindent(),
+                ),
+                cx,
+            );
+        });
 
         // buffer has a deletion hunk and an insertion hunk
-        let diff_base_2 = "
-            2.zero
-            2.one
-            2.one-and-a-half
-            2.two
-            2.three
-            2.four
-            2.six
-        "
-        .unindent();
-
-        let text_2 = "
-            2.zero
-            2.one
-            2.two
-            2.three
-            2.four
-            2.five
-            2.six
-        "
-        .unindent();
-
-        let buffer_1 = project.update(cx, |project, cx| {
-            project.create_local_buffer(text_1.as_str(), None, cx)
-        });
         let buffer_2 = project.update(cx, |project, cx| {
-            project.create_local_buffer(text_2.as_str(), None, cx)
+            project.create_local_buffer(
+                "
+                        2.zero
+                        2.one
+                        2.two
+                        2.three
+                        2.four
+                        2.five
+                        2.six
+                    "
+                .unindent()
+                .as_str(),
+                None,
+                cx,
+            )
         });
+        buffer_2.update(cx, |buffer, cx| {
+            buffer.set_diff_base(
+                Some(
+                    "
+                        2.zero
+                        2.one
+                        2.one-and-a-half
+                        2.two
+                        2.three
+                        2.four
+                        2.six
+                    "
+                    .unindent(),
+                ),
+                cx,
+            );
+        });
+
+        cx.background_executor.run_until_parked();
 
         let multibuffer = cx.new_model(|cx| {
             let mut multibuffer = MultiBuffer::new(ReadWrite);
@@ -1405,30 +1392,10 @@ mod tests {
             multibuffer
         });
 
-        let editor = cx.add_window(|cx| Editor::for_multibuffer(multibuffer, None, false, cx));
-        editor
-            .update(cx, |editor, cx| {
-                for (buffer, diff_base) in [
-                    (buffer_1.clone(), diff_base_1),
-                    (buffer_2.clone(), diff_base_2),
-                ] {
-                    let change_set = cx.new_model(|cx| {
-                        BufferChangeSet::new_with_base_text(
-                            diff_base.to_string(),
-                            buffer.read(cx).text_snapshot(),
-                            cx,
-                        )
-                    });
-                    editor.diff_map.add_change_set(change_set, cx)
-                }
-            })
-            .unwrap();
-        cx.background_executor.run_until_parked();
-
-        let snapshot = editor.update(cx, |editor, cx| editor.snapshot(cx)).unwrap();
+        let snapshot = multibuffer.read_with(cx, |b, cx| b.snapshot(cx));
 
         assert_eq!(
-            snapshot.buffer_snapshot.text(),
+            snapshot.text(),
             "
                 1.zero
                 1.ONE
@@ -1471,8 +1438,7 @@ mod tests {
 
         assert_eq!(
             snapshot
-                .diff_map
-                .diff_hunks_in_range(Point::zero()..Point::new(12, 0), &snapshot.buffer_snapshot)
+                .git_diff_hunks_in_range(MultiBufferRow(0)..MultiBufferRow(12))
                 .map(|hunk| (hunk_status(&hunk), hunk.row_range))
                 .collect::<Vec<_>>(),
             &expected,
@@ -1480,11 +1446,7 @@ mod tests {
 
         assert_eq!(
             snapshot
-                .diff_map
-                .diff_hunks_in_range_rev(
-                    Point::zero()..Point::new(12, 0),
-                    &snapshot.buffer_snapshot
-                )
+                .git_diff_hunks_in_range_rev(MultiBufferRow(0)..MultiBufferRow(12))
                 .map(|hunk| (hunk_status(&hunk), hunk.row_range))
                 .collect::<Vec<_>>(),
             expected

crates/editor/src/inline_completion_tests.rs

@@ -1,360 +0,0 @@
-use gpui::Model;
-use indoc::indoc;
-use inline_completion::InlineCompletionProvider;
-use multi_buffer::{Anchor, MultiBufferSnapshot, ToPoint};
-use std::ops::Range;
-use text::{Point, ToOffset};
-use ui::Context;
-
-use crate::{
-    editor_tests::init_test, test::editor_test_context::EditorTestContext, InlineCompletion,
-};
-
-#[gpui::test]
-async fn test_inline_completion_insert(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let provider = cx.new_model(|_| FakeInlineCompletionProvider::default());
-    assign_editor_completion_provider(provider.clone(), &mut cx);
-    cx.set_state("let absolute_zero_celsius = ˇ;");
-
-    propose_edits(&provider, vec![(28..28, "-273.15")], &mut cx);
-    cx.update_editor(|editor, cx| editor.update_visible_inline_completion(cx));
-
-    assert_editor_active_edit_completion(&mut cx, |_, edits| {
-        assert_eq!(edits.len(), 1);
-        assert_eq!(edits[0].1.as_str(), "-273.15");
-    });
-
-    accept_completion(&mut cx);
-
-    cx.assert_editor_state("let absolute_zero_celsius = -273.15ˇ;")
-}
-
-#[gpui::test]
-async fn test_inline_completion_modification(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let provider = cx.new_model(|_| FakeInlineCompletionProvider::default());
-    assign_editor_completion_provider(provider.clone(), &mut cx);
-    cx.set_state("let pi = ˇ\"foo\";");
-
-    propose_edits(&provider, vec![(9..14, "3.14159")], &mut cx);
-    cx.update_editor(|editor, cx| editor.update_visible_inline_completion(cx));
-
-    assert_editor_active_edit_completion(&mut cx, |_, edits| {
-        assert_eq!(edits.len(), 1);
-        assert_eq!(edits[0].1.as_str(), "3.14159");
-    });
-
-    accept_completion(&mut cx);
-
-    cx.assert_editor_state("let pi = 3.14159ˇ;")
-}
-
-#[gpui::test]
-async fn test_inline_completion_jump_button(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let provider = cx.new_model(|_| FakeInlineCompletionProvider::default());
-    assign_editor_completion_provider(provider.clone(), &mut cx);
-
-    // Cursor is 2+ lines above the proposed edit
-    cx.set_state(indoc! {"
-        line 0
-        line ˇ1
-        line 2
-        line 3
-        line
-    "});
-
-    propose_edits(
-        &provider,
-        vec![(Point::new(4, 3)..Point::new(4, 3), " 4")],
-        &mut cx,
-    );
-
-    cx.update_editor(|editor, cx| editor.update_visible_inline_completion(cx));
-    assert_editor_active_move_completion(&mut cx, |snapshot, move_target| {
-        assert_eq!(move_target.to_point(&snapshot), Point::new(4, 3));
-    });
-
-    // When accepting, cursor is moved to the proposed location
-    accept_completion(&mut cx);
-    cx.assert_editor_state(indoc! {"
-        line 0
-        line 1
-        line 2
-        line 3
-        linˇe
-    "});
-
-    // Cursor is 2+ lines below the proposed edit
-    cx.set_state(indoc! {"
-        line 0
-        line
-        line 2
-        line 3
-        line ˇ4
-    "});
-
-    propose_edits(
-        &provider,
-        vec![(Point::new(1, 3)..Point::new(1, 3), " 1")],
-        &mut cx,
-    );
-
-    cx.update_editor(|editor, cx| editor.update_visible_inline_completion(cx));
-    assert_editor_active_move_completion(&mut cx, |snapshot, move_target| {
-        assert_eq!(move_target.to_point(&snapshot), Point::new(1, 3));
-    });
-
-    // When accepting, cursor is moved to the proposed location
-    accept_completion(&mut cx);
-    cx.assert_editor_state(indoc! {"
-        line 0
-        linˇe
-        line 2
-        line 3
-        line 4
-    "});
-}
-
-#[gpui::test]
-async fn test_inline_completion_invalidation_range(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let provider = cx.new_model(|_| FakeInlineCompletionProvider::default());
-    assign_editor_completion_provider(provider.clone(), &mut cx);
-
-    // Cursor is 3+ lines above the proposed edit
-    cx.set_state(indoc! {"
-        line 0
-        line ˇ1
-        line 2
-        line 3
-        line 4
-        line
-    "});
-    let edit_location = Point::new(5, 3);
-
-    propose_edits(
-        &provider,
-        vec![(edit_location..edit_location, " 5")],
-        &mut cx,
-    );
-
-    cx.update_editor(|editor, cx| editor.update_visible_inline_completion(cx));
-    assert_editor_active_move_completion(&mut cx, |snapshot, move_target| {
-        assert_eq!(move_target.to_point(&snapshot), edit_location);
-    });
-
-    // If we move *towards* the completion, it stays active
-    cx.set_selections_state(indoc! {"
-        line 0
-        line 1
-        line ˇ2
-        line 3
-        line 4
-        line
-    "});
-    assert_editor_active_move_completion(&mut cx, |snapshot, move_target| {
-        assert_eq!(move_target.to_point(&snapshot), edit_location);
-    });
-
-    // If we move *away* from the completion, it is discarded
-    cx.set_selections_state(indoc! {"
-        line ˇ0
-        line 1
-        line 2
-        line 3
-        line 4
-        line
-    "});
-    cx.editor(|editor, _| {
-        assert!(editor.active_inline_completion.is_none());
-    });
-
-    // Cursor is 3+ lines below the proposed edit
-    cx.set_state(indoc! {"
-        line
-        line 1
-        line 2
-        line 3
-        line ˇ4
-        line 5
-    "});
-    let edit_location = Point::new(0, 3);
-
-    propose_edits(
-        &provider,
-        vec![(edit_location..edit_location, " 0")],
-        &mut cx,
-    );
-
-    cx.update_editor(|editor, cx| editor.update_visible_inline_completion(cx));
-    assert_editor_active_move_completion(&mut cx, |snapshot, move_target| {
-        assert_eq!(move_target.to_point(&snapshot), edit_location);
-    });
-
-    // If we move *towards* the completion, it stays active
-    cx.set_selections_state(indoc! {"
-        line
-        line 1
-        line 2
-        line ˇ3
-        line 4
-        line 5
-    "});
-    assert_editor_active_move_completion(&mut cx, |snapshot, move_target| {
-        assert_eq!(move_target.to_point(&snapshot), edit_location);
-    });
-
-    // If we move *away* from the completion, it is discarded
-    cx.set_selections_state(indoc! {"
-        line
-        line 1
-        line 2
-        line 3
-        line 4
-        line ˇ5
-    "});
-    cx.editor(|editor, _| {
-        assert!(editor.active_inline_completion.is_none());
-    });
-}
-
-fn assert_editor_active_edit_completion(
-    cx: &mut EditorTestContext,
-    assert: impl FnOnce(MultiBufferSnapshot, &Vec<(Range<Anchor>, String)>),
-) {
-    cx.editor(|editor, cx| {
-        let completion_state = editor
-            .active_inline_completion
-            .as_ref()
-            .expect("editor has no active completion");
-
-        if let InlineCompletion::Edit(edits) = &completion_state.completion {
-            assert(editor.buffer().read(cx).snapshot(cx), edits);
-        } else {
-            panic!("expected edit completion");
-        }
-    })
-}
-
-fn assert_editor_active_move_completion(
-    cx: &mut EditorTestContext,
-    assert: impl FnOnce(MultiBufferSnapshot, Anchor),
-) {
-    cx.editor(|editor, cx| {
-        let completion_state = editor
-            .active_inline_completion
-            .as_ref()
-            .expect("editor has no active completion");
-
-        if let InlineCompletion::Move(anchor) = &completion_state.completion {
-            assert(editor.buffer().read(cx).snapshot(cx), *anchor);
-        } else {
-            panic!("expected move completion");
-        }
-    })
-}
-
-fn accept_completion(cx: &mut EditorTestContext) {
-    cx.update_editor(|editor, cx| {
-        editor.accept_inline_completion(&crate::AcceptInlineCompletion, cx)
-    })
-}
-
-fn propose_edits<T: ToOffset>(
-    provider: &Model<FakeInlineCompletionProvider>,
-    edits: Vec<(Range<T>, &str)>,
-    cx: &mut EditorTestContext,
-) {
-    let snapshot = cx.buffer_snapshot();
-    let edits = edits.into_iter().map(|(range, text)| {
-        let range = snapshot.anchor_after(range.start)..snapshot.anchor_before(range.end);
-        (range, text.into())
-    });
-
-    cx.update(|cx| {
-        provider.update(cx, |provider, _| {
-            provider.set_inline_completion(Some(inline_completion::InlineCompletion {
-                edits: edits.collect(),
-            }))
-        })
-    });
-}
-
-fn assign_editor_completion_provider(
-    provider: Model<FakeInlineCompletionProvider>,
-    cx: &mut EditorTestContext,
-) {
-    cx.update_editor(|editor, cx| {
-        editor.set_inline_completion_provider(Some(provider), cx);
-    })
-}
-
-#[derive(Default, Clone)]
-struct FakeInlineCompletionProvider {
-    completion: Option<inline_completion::InlineCompletion>,
-}
-
-impl FakeInlineCompletionProvider {
-    pub fn set_inline_completion(
-        &mut self,
-        completion: Option<inline_completion::InlineCompletion>,
-    ) {
-        self.completion = completion;
-    }
-}
-
-impl InlineCompletionProvider for FakeInlineCompletionProvider {
-    fn name() -> &'static str {
-        "fake-completion-provider"
-    }
-
-    fn is_enabled(
-        &self,
-        _buffer: &gpui::Model<language::Buffer>,
-        _cursor_position: language::Anchor,
-        _cx: &gpui::AppContext,
-    ) -> bool {
-        true
-    }
-
-    fn refresh(
-        &mut self,
-        _buffer: gpui::Model<language::Buffer>,
-        _cursor_position: language::Anchor,
-        _debounce: bool,
-        _cx: &mut gpui::ModelContext<Self>,
-    ) {
-    }
-
-    fn cycle(
-        &mut self,
-        _buffer: gpui::Model<language::Buffer>,
-        _cursor_position: language::Anchor,
-        _direction: inline_completion::Direction,
-        _cx: &mut gpui::ModelContext<Self>,
-    ) {
-    }
-
-    fn accept(&mut self, _cx: &mut gpui::ModelContext<Self>) {}
-
-    fn discard(&mut self, _cx: &mut gpui::ModelContext<Self>) {}
-
-    fn suggest<'a>(
-        &mut self,
-        _buffer: &gpui::Model<language::Buffer>,
-        _cursor_position: language::Anchor,
-        _cx: &mut gpui::ModelContext<Self>,
-    ) -> Option<inline_completion::InlineCompletion> {
-        self.completion.clone()
-    }
-}

crates/editor/src/items.rs

@@ -737,7 +737,7 @@ impl Item for Editor {
         let buffers = self.buffer().clone().read(cx).all_buffers();
         let buffers = buffers
             .into_iter()
-            .map(|handle| handle.read(cx).base_buffer().unwrap_or(handle.clone()))
+            .map(|handle| handle.read(cx).diff_base_buffer().unwrap_or(handle.clone()))
             .collect::<HashSet<_>>();
         cx.spawn(|this, mut cx| async move {
             if format {

crates/editor/src/lsp_ext.rs

@@ -37,7 +37,7 @@ where
         .find_map(|(trigger_anchor, language, buffer)| {
             project
                 .read(cx)
-                .language_servers_for_local_buffer(buffer.read(cx), cx)
+                .language_servers_for_buffer(buffer.read(cx), cx)
                 .find_map(|(adapter, server)| {
                     if adapter.name.0.as_ref() == language_server_name {
                         Some((

crates/editor/src/mouse_context_menu.rs

@@ -20,7 +20,8 @@ pub enum MenuPosition {
     /// Disappears when the position is no longer visible.
     PinnedToEditor {
         source: multi_buffer::Anchor,
-        offset: Point<Pixels>,
+        offset_x: Pixels,
+        offset_y: Pixels,
     },
 }
 
@@ -47,22 +48,36 @@ impl MouseContextMenu {
         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 content_origin = editor.last_bounds?.origin
-            + Point {
-                x: editor.gutter_dimensions.width,
-                y: Pixels(0.0),
-            };
-        let source_position = editor.to_pixel_point(source, &editor_snapshot, cx)?;
-        let menu_position = MenuPosition::PinnedToEditor {
-            source,
-            offset: position - (source_position + content_origin),
-        };
-        return Some(MouseContextMenu::new(menu_position, context_menu, 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 new(
-        position: MenuPosition,
+    pub(crate) fn pinned_to_screen(
+        position: Point<Pixels>,
         context_menu: View<ui::ContextMenu>,
         cx: &mut ViewContext<Editor>,
     ) -> Self {
@@ -80,7 +95,7 @@ impl MouseContextMenu {
         );
 
         Self {
-            position,
+            position: MenuPosition::PinnedToScreen(position),
             context_menu,
             _subscription,
         }
@@ -104,7 +119,7 @@ fn display_ranges<'a>(
 
 pub fn deploy_context_menu(
     editor: &mut Editor,
-    position: Option<Point<Pixels>>,
+    position: Point<Pixels>,
     point: DisplayPoint,
     cx: &mut ViewContext<Editor>,
 ) {
@@ -198,18 +213,8 @@ pub fn deploy_context_menu(
         })
     };
 
-    editor.mouse_context_menu = match position {
-        Some(position) => {
-            MouseContextMenu::pinned_to_editor(editor, source_anchor, position, context_menu, cx)
-        }
-        None => {
-            let menu_position = MenuPosition::PinnedToEditor {
-                source: source_anchor,
-                offset: editor.character_size(cx),
-            };
-            Some(MouseContextMenu::new(menu_position, context_menu, cx))
-        }
-    };
+    editor.mouse_context_menu =
+        MouseContextMenu::pinned_to_editor(editor, source_anchor, position, context_menu, cx);
     cx.notify();
 }
 
@@ -243,9 +248,7 @@ mod tests {
             }
         "});
         cx.editor(|editor, _app| assert!(editor.mouse_context_menu.is_none()));
-        cx.update_editor(|editor, cx| {
-            deploy_context_menu(editor, Some(Default::default()), point, cx)
-        });
+        cx.update_editor(|editor, cx| deploy_context_menu(editor, Default::default(), point, cx));
 
         cx.assert_editor_state(indoc! {"
             fn test() {

crates/editor/src/proposed_changes_editor.rs

@@ -4,7 +4,7 @@ use futures::{channel::mpsc, future::join_all};
 use gpui::{AppContext, EventEmitter, FocusableView, Model, Render, Subscription, Task, View};
 use language::{Buffer, BufferEvent, Capability};
 use multi_buffer::{ExcerptRange, MultiBuffer};
-use project::{buffer_store::BufferChangeSet, Project};
+use project::Project;
 use smol::stream::StreamExt;
 use std::{any::TypeId, ops::Range, rc::Rc, time::Duration};
 use text::ToOffset;
@@ -75,7 +75,7 @@ impl ProposedChangesEditor {
             title: title.into(),
             buffer_entries: Vec::new(),
             recalculate_diffs_tx,
-            _recalculate_diffs_task: cx.spawn(|this, mut cx| async move {
+            _recalculate_diffs_task: cx.spawn(|_, mut cx| async move {
                 let mut buffers_to_diff = HashSet::default();
                 while let Some(mut recalculate_diff) = recalculate_diffs_rx.next().await {
                     buffers_to_diff.insert(recalculate_diff.buffer);
@@ -96,37 +96,12 @@ impl ProposedChangesEditor {
                         }
                     }
 
-                    let recalculate_diff_futures = this
-                        .update(&mut cx, |this, cx| {
-                            buffers_to_diff
-                                .drain()
-                                .filter_map(|buffer| {
-                                    let buffer = buffer.read(cx);
-                                    let base_buffer = buffer.base_buffer()?;
-                                    let buffer = buffer.text_snapshot();
-                                    let change_set = this.editor.update(cx, |editor, _| {
-                                        Some(
-                                            editor
-                                                .diff_map
-                                                .diff_bases
-                                                .get(&buffer.remote_id())?
-                                                .change_set
-                                                .clone(),
-                                        )
-                                    })?;
-                                    Some(change_set.update(cx, |change_set, cx| {
-                                        change_set.set_base_text(
-                                            base_buffer.read(cx).text(),
-                                            buffer,
-                                            cx,
-                                        )
-                                    }))
-                                })
-                                .collect::<Vec<_>>()
-                        })
-                        .ok()?;
-
-                    join_all(recalculate_diff_futures).await;
+                    join_all(buffers_to_diff.drain().filter_map(|buffer| {
+                        buffer
+                            .update(&mut cx, |buffer, cx| buffer.recalculate_diff(cx))
+                            .ok()?
+                    }))
+                    .await;
                 }
                 None
             }),
@@ -179,7 +154,6 @@ impl ProposedChangesEditor {
         });
 
         let mut buffer_entries = Vec::new();
-        let mut new_change_sets = Vec::new();
         for location in locations {
             let branch_buffer;
             if let Some(ix) = self
@@ -192,15 +166,6 @@ impl ProposedChangesEditor {
                 buffer_entries.push(entry);
             } else {
                 branch_buffer = location.buffer.update(cx, |buffer, cx| buffer.branch(cx));
-                new_change_sets.push(cx.new_model(|cx| {
-                    let mut change_set = BufferChangeSet::new(branch_buffer.read(cx));
-                    let _ = change_set.set_base_text(
-                        location.buffer.read(cx).text(),
-                        branch_buffer.read(cx).text_snapshot(),
-                        cx,
-                    );
-                    change_set
-                }));
                 buffer_entries.push(BufferEntry {
                     branch: branch_buffer.clone(),
                     base: location.buffer.clone(),
@@ -222,10 +187,7 @@ impl ProposedChangesEditor {
 
         self.buffer_entries = buffer_entries;
         self.editor.update(cx, |editor, cx| {
-            editor.change_selections(None, cx, |selections| selections.refresh());
-            for change_set in new_change_sets {
-                editor.diff_map.add_change_set(change_set, cx)
-            }
+            editor.change_selections(None, cx, |selections| selections.refresh())
         });
     }
 
@@ -255,14 +217,14 @@ impl ProposedChangesEditor {
                     })
                     .ok();
             }
-            // BufferEvent::DiffBaseChanged => {
-            //     self.recalculate_diffs_tx
-            //         .unbounded_send(RecalculateDiff {
-            //             buffer,
-            //             debounce: false,
-            //         })
-            //         .ok();
-            // }
+            BufferEvent::DiffBaseChanged => {
+                self.recalculate_diffs_tx
+                    .unbounded_send(RecalculateDiff {
+                        buffer,
+                        debounce: false,
+                    })
+                    .ok();
+            }
             _ => (),
         }
     }
@@ -411,7 +373,7 @@ impl BranchBufferSemanticsProvider {
         positions: &[text::Anchor],
         cx: &AppContext,
     ) -> Option<Model<Buffer>> {
-        let base_buffer = buffer.read(cx).base_buffer()?;
+        let base_buffer = buffer.read(cx).diff_base_buffer()?;
         let version = base_buffer.read(cx).version();
         if positions
             .iter()

crates/editor/src/test/editor_lsp_test_context.rs

@@ -113,15 +113,7 @@ impl EditorLspTestContext {
         app_state
             .fs
             .as_fake()
-            .insert_tree(
-                root,
-                json!({
-                    ".git": {},
-                    "dir": {
-                        file_name.clone(): ""
-                    }
-                }),
-            )
+            .insert_tree(root, json!({ "dir": { file_name.clone(): "" }}))
             .await;
 
         let window = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));

crates/editor/src/test/editor_test_context.rs

@@ -42,16 +42,16 @@ pub struct EditorTestContext {
 impl EditorTestContext {
     pub async fn new(cx: &mut gpui::TestAppContext) -> EditorTestContext {
         let fs = FakeFs::new(cx.executor());
+        // fs.insert_file("/file", "".to_owned()).await;
         let root = Self::root_path();
         fs.insert_tree(
             root,
             serde_json::json!({
-                ".git": {},
                 "file": "",
             }),
         )
         .await;
-        let project = Project::test(fs.clone(), [root], cx).await;
+        let project = Project::test(fs, [root], cx).await;
         let buffer = project
             .update(cx, |project, cx| {
                 project.open_local_buffer(root.join("file"), cx)
@@ -65,8 +65,6 @@ impl EditorTestContext {
             editor
         });
         let editor_view = editor.root_view(cx).unwrap();
-
-        cx.run_until_parked();
         Self {
             cx: VisualTestContext::from_window(*editor.deref(), cx),
             window: editor.into(),
@@ -278,16 +276,8 @@ impl EditorTestContext {
         snapshot.anchor_before(ranges[0].start)..snapshot.anchor_after(ranges[0].end)
     }
 
-    pub fn set_diff_base(&mut self, diff_base: &str) {
-        self.cx.run_until_parked();
-        let fs = self
-            .update_editor(|editor, cx| editor.project.as_ref().unwrap().read(cx).fs().as_fake());
-        let path = self.update_buffer(|buffer, _| buffer.file().unwrap().path().clone());
-        fs.set_index_for_repo(
-            &Self::root_path().join(".git"),
-            &[(path.as_ref(), diff_base.to_string())],
-        );
-        self.cx.run_until_parked();
+    pub fn set_diff_base(&mut self, diff_base: Option<&str>) {
+        self.update_buffer(|buffer, cx| buffer.set_diff_base(diff_base.map(ToOwned::to_owned), cx));
     }
 
     /// Change the editor's text and selections using a string containing
@@ -329,12 +319,10 @@ impl EditorTestContext {
         state_context
     }
 
-    /// Assert about the text of the editor, the selections, and the expanded
-    /// diff hunks.
-    ///
-    /// Diff hunks are indicated by lines starting with `+` and `-`.
     #[track_caller]
-    pub fn assert_state_with_diff(&mut self, expected_diff: String) {
+    pub fn assert_diff_hunks(&mut self, expected_diff: String) {
+        // Normalize the expected diff. If it has no diff markers, then insert blank markers
+        // before each line. Strip any whitespace-only lines.
         let has_diff_markers = expected_diff
             .lines()
             .any(|line| line.starts_with("+") || line.starts_with("-"));
@@ -352,14 +340,11 @@ impl EditorTestContext {
             })
             .join("\n");
 
-        let actual_selections = self.editor_selections();
-        let actual_marked_text =
-            generate_marked_text(&self.buffer_text(), &actual_selections, true);
-
         // Read the actual diff from the editor's row highlights and block
         // decorations.
         let actual_diff = self.editor.update(&mut self.cx, |editor, cx| {
             let snapshot = editor.snapshot(cx);
+            let text = editor.text(cx);
             let insertions = editor
                 .highlighted_rows::<DiffRowHighlight>()
                 .map(|(range, _)| {
@@ -369,7 +354,7 @@ impl EditorTestContext {
                 })
                 .collect::<Vec<_>>();
             let deletions = editor
-                .diff_map
+                .expanded_hunks
                 .hunks
                 .iter()
                 .filter_map(|hunk| {
@@ -386,20 +371,10 @@ impl EditorTestContext {
                         .read(cx)
                         .excerpt_containing(hunk.hunk_range.start, cx)
                         .expect("no excerpt for expanded buffer's hunk start");
-                    let buffer_id = buffer.read(cx).remote_id();
-                    let change_set = &editor
-                        .diff_map
-                        .diff_bases
-                        .get(&buffer_id)
+                    let deleted_text = buffer
+                        .read(cx)
+                        .diff_base()
                         .expect("should have a diff base for expanded hunk")
-                        .change_set;
-                    let deleted_text = change_set
-                        .read(cx)
-                        .base_text
-                        .as_ref()
-                        .expect("no base text for expanded hunk")
-                        .read(cx)
-                        .as_rope()
                         .slice(hunk.diff_base_byte_range.clone())
                         .to_string();
                     if let DiffHunkStatus::Modified | DiffHunkStatus::Removed = hunk.status {
@@ -409,7 +384,7 @@ impl EditorTestContext {
                     }
                 })
                 .collect::<Vec<_>>();
-            format_diff(actual_marked_text, deletions, insertions)
+            format_diff(text, deletions, insertions)
         });
 
         pretty_assertions::assert_eq!(actual_diff, expected_diff_text, "unexpected diff state");

crates/extension_api/wit/since_v0.2.0/github.wit

@@ -24,8 +24,6 @@ interface github {
     }
 
     /// Returns the latest release for the given GitHub repository.
-    ///
-    /// Takes repo as a string in the form "<owner-name>/<repo-name>", for example: "zed-industries/zed".
     latest-github-release: func(repo: string, options: github-release-options) -> result<github-release, string>;
 
     /// Returns the GitHub release with the specified tag name for the given GitHub repository.

crates/extension_host/src/extension_host.rs

@@ -32,7 +32,7 @@ use gpui::{
 };
 use http_client::{AsyncBody, HttpClient, HttpClientWithUrl};
 use language::{
-    LanguageConfig, LanguageMatcher, LanguageName, LanguageQueries, LoadedLanguage, Rope,
+    LanguageConfig, LanguageMatcher, LanguageName, LanguageQueries, LoadedLanguage,
     QUERY_FILENAME_PREFIXES,
 };
 use node_runtime::NodeRuntime;
@@ -1387,7 +1387,6 @@ impl ExtensionStore {
     fn prepare_remote_extension(
         &mut self,
         extension_id: Arc<str>,
-        is_dev: bool,
         tmp_dir: PathBuf,
         cx: &mut ModelContext<Self>,
     ) -> Task<Result<()>> {
@@ -1398,45 +1397,26 @@ impl ExtensionStore {
         };
         let fs = self.fs.clone();
         cx.background_executor().spawn(async move {
-            const EXTENSION_TOML: &str = "extension.toml";
-            const EXTENSION_WASM: &str = "extension.wasm";
-            const CONFIG_TOML: &str = "config.toml";
-
-            if is_dev {
-                let manifest_toml = toml::to_string(&loaded_extension.manifest)?;
-                fs.save(
-                    &tmp_dir.join(EXTENSION_TOML),
-                    &Rope::from(manifest_toml),
-                    language::LineEnding::Unix,
-                )
-                .await?;
-            } else {
-                fs.copy_file(
-                    &src_dir.join(EXTENSION_TOML),
-                    &tmp_dir.join(EXTENSION_TOML),
-                    fs::CopyOptions::default(),
-                )
-                .await?
-            }
-
-            if fs.is_file(&src_dir.join(EXTENSION_WASM)).await {
-                fs.copy_file(
-                    &src_dir.join(EXTENSION_WASM),
-                    &tmp_dir.join(EXTENSION_WASM),
-                    fs::CopyOptions::default(),
-                )
-                .await?
+            for well_known_path in ["extension.toml", "extension.json", "extension.wasm"] {
+                if fs.is_file(&src_dir.join(well_known_path)).await {
+                    fs.copy_file(
+                        &src_dir.join(well_known_path),
+                        &tmp_dir.join(well_known_path),
+                        fs::CopyOptions::default(),
+                    )
+                    .await?
+                }
             }
 
             for language_path in loaded_extension.manifest.languages.iter() {
                 if fs
-                    .is_file(&src_dir.join(language_path).join(CONFIG_TOML))
+                    .is_file(&src_dir.join(language_path).join("config.toml"))
                     .await
                 {
                     fs.create_dir(&tmp_dir.join(language_path)).await?;
                     fs.copy_file(
-                        &src_dir.join(language_path).join(CONFIG_TOML),
-                        &tmp_dir.join(language_path).join(CONFIG_TOML),
+                        &src_dir.join(language_path).join("config.toml"),
+                        &tmp_dir.join(language_path).join("config.toml"),
                         fs::CopyOptions::default(),
                     )
                     .await?
@@ -1482,7 +1462,6 @@ impl ExtensionStore {
             this.update(cx, |this, cx| {
                 this.prepare_remote_extension(
                     missing_extension.id.clone().into(),
-                    missing_extension.dev,
                     tmp_dir.path().to_owned(),
                     cx,
                 )
@@ -1497,11 +1476,6 @@ impl ExtensionStore {
                 })?
                 .await?;
 
-            log::info!(
-                "Finished uploading extension {}",
-                missing_extension.clone().id
-            );
-
             client
                 .update(cx, |client, _cx| {
                     client.proto_client().request(proto::InstallExtension {

crates/feature_flags/src/feature_flags.rs

@@ -59,11 +59,6 @@ impl FeatureFlag for ToolUseFeatureFlag {
     }
 }
 
-pub struct ZetaFeatureFlag;
-impl FeatureFlag for ZetaFeatureFlag {
-    const NAME: &'static str = "zeta";
-}
-
 pub struct Remoting {}
 impl FeatureFlag for Remoting {
     const NAME: &'static str = "remoting";

crates/file_finder/src/file_finder.rs

@@ -648,7 +648,7 @@ impl FileFinderDelegate {
         cx.subscribe(project, |file_finder, _, event, cx| {
             match event {
                 project::Event::WorktreeUpdatedEntries(_, _)
-                | project::Event::WorktreeAdded(_)
+                | project::Event::WorktreeAdded
                 | project::Event::WorktreeRemoved(_) => file_finder
                     .picker
                     .update(cx, |picker, cx| picker.refresh(cx)),

crates/fs/src/fs.rs

@@ -132,7 +132,7 @@ pub trait Fs: Send + Sync {
     async fn is_case_sensitive(&self) -> Result<bool>;
 
     #[cfg(any(test, feature = "test-support"))]
-    fn as_fake(&self) -> Arc<FakeFs> {
+    fn as_fake(&self) -> &FakeFs {
         panic!("called as_fake on a real fs");
     }
 }
@@ -840,7 +840,6 @@ impl Watcher for RealWatcher {
 
 #[cfg(any(test, feature = "test-support"))]
 pub struct FakeFs {
-    this: std::sync::Weak<Self>,
     // Use an unfair lock to ensure tests are deterministic.
     state: Mutex<FakeFsState>,
     executor: gpui::BackgroundExecutor,
@@ -1023,8 +1022,7 @@ impl FakeFs {
     pub fn new(executor: gpui::BackgroundExecutor) -> Arc<Self> {
         let (tx, mut rx) = smol::channel::bounded::<PathBuf>(10);
 
-        let this = Arc::new_cyclic(|this| Self {
-            this: this.clone(),
+        let this = Arc::new(Self {
             executor: executor.clone(),
             state: Mutex::new(FakeFsState {
                 root: Arc::new(Mutex::new(FakeFsEntry::Dir {
@@ -1476,8 +1474,7 @@ struct FakeHandle {
 #[cfg(any(test, feature = "test-support"))]
 impl FileHandle for FakeHandle {
     fn current_path(&self, fs: &Arc<dyn Fs>) -> Result<PathBuf> {
-        let fs = fs.as_fake();
-        let state = fs.state.lock();
+        let state = fs.as_fake().state.lock();
         let Some(target) = state.moves.get(&self.inode) else {
             anyhow::bail!("fake fd not moved")
         };
@@ -1973,8 +1970,8 @@ impl Fs for FakeFs {
     }
 
     #[cfg(any(test, feature = "test-support"))]
-    fn as_fake(&self) -> Arc<FakeFs> {
-        self.this.upgrade().unwrap()
+    fn as_fake(&self) -> &FakeFs {
+        self
     }
 }
 

crates/git/Cargo.toml

@@ -14,6 +14,7 @@ path = "src/git.rs"
 [dependencies]
 anyhow.workspace = true
 async-trait.workspace = true
+clock.workspace = true
 collections.workspace = true
 derive_more.workspace = true
 git2.workspace = true
@@ -21,7 +22,6 @@ gpui.workspace = true
 http_client.workspace = true
 log.workspace = true
 parking_lot.workspace = true
-regex.workspace = true
 rope.workspace = true
 serde.workspace = true
 smol.workspace = true

crates/git/src/diff.rs

@@ -64,37 +64,23 @@ impl sum_tree::Summary for DiffHunkSummary {
 
 #[derive(Debug, Clone)]
 pub struct BufferDiff {
+    last_buffer_version: Option<clock::Global>,
     tree: SumTree<InternalDiffHunk>,
 }
 
 impl BufferDiff {
     pub fn new(buffer: &BufferSnapshot) -> BufferDiff {
         BufferDiff {
+            last_buffer_version: None,
             tree: SumTree::new(buffer),
         }
     }
 
-    pub async fn build(diff_base: &str, buffer: &text::BufferSnapshot) -> Self {
-        let mut tree = SumTree::new(buffer);
-
-        let buffer_text = buffer.as_rope().to_string();
-        let patch = Self::diff(diff_base, &buffer_text);
-
-        if let Some(patch) = patch {
-            let mut divergence = 0;
-            for hunk_index in 0..patch.num_hunks() {
-                let hunk = Self::process_patch_hunk(&patch, hunk_index, buffer, &mut divergence);
-                tree.push(hunk, buffer);
-            }
-        }
-
-        Self { tree }
-    }
-
     pub fn is_empty(&self) -> bool {
         self.tree.is_empty()
     }
 
+    #[cfg(any(test, feature = "test-support"))]
     pub fn hunks_in_row_range<'a>(
         &'a self,
         range: Range<u32>,
@@ -183,11 +169,27 @@ impl BufferDiff {
 
     #[cfg(test)]
     fn clear(&mut self, buffer: &text::BufferSnapshot) {
+        self.last_buffer_version = Some(buffer.version().clone());
         self.tree = SumTree::new(buffer);
     }
 
     pub async fn update(&mut self, diff_base: &Rope, buffer: &text::BufferSnapshot) {
-        *self = Self::build(&diff_base.to_string(), buffer).await;
+        let mut tree = SumTree::new(buffer);
+
+        let diff_base_text = diff_base.to_string();
+        let buffer_text = buffer.as_rope().to_string();
+        let patch = Self::diff(&diff_base_text, &buffer_text);
+
+        if let Some(patch) = patch {
+            let mut divergence = 0;
+            for hunk_index in 0..patch.num_hunks() {
+                let hunk = Self::process_patch_hunk(&patch, hunk_index, buffer, &mut divergence);
+                tree.push(hunk, buffer);
+            }
+        }
+
+        self.tree = tree;
+        self.last_buffer_version = Some(buffer.version().clone());
     }
 
     #[cfg(test)]

crates/git/src/remote.rs

@@ -1,23 +1,17 @@
-use std::sync::LazyLock;
-
 use derive_more::Deref;
-use regex::Regex;
 use url::Url;
 
 /// The URL to a Git remote.
 #[derive(Debug, PartialEq, Eq, Clone, Deref)]
 pub struct RemoteUrl(Url);
 
-static USERNAME_REGEX: LazyLock<Regex> =
-    LazyLock::new(|| Regex::new(r"^[0-9a-zA-Z\-_]+@").expect("Failed to create USERNAME_REGEX"));
-
 impl std::str::FromStr for RemoteUrl {
     type Err = url::ParseError;
 
     fn from_str(input: &str) -> Result<Self, Self::Err> {
-        if USERNAME_REGEX.is_match(input) {
+        if input.starts_with("git@") {
             // Rewrite remote URLs like `git@github.com:user/repo.git` to `ssh://git@github.com/user/repo.git`
-            let ssh_url = format!("ssh://{}", input.replacen(':', "/", 1));
+            let ssh_url = input.replacen(':', "/", 1).replace("git@", "ssh://git@");
             Ok(RemoteUrl(Url::parse(&ssh_url)?))
         } else {
             Ok(RemoteUrl(Url::parse(input)?))
@@ -46,12 +40,6 @@ mod tests {
                 "github.com",
                 "/octocat/zed.git",
             ),
-            (
-                "org-000000@github.com:octocat/zed.git",
-                "ssh",
-                "github.com",
-                "/octocat/zed.git",
-            ),
             (
                 "ssh://git@github.com/octocat/zed.git",
                 "ssh",

crates/gpui/Cargo.toml

@@ -40,6 +40,7 @@ wayland = [
     "filedescriptor",
     "xkbcommon",
     "open",
+    "scap",
 ]
 x11 = [
     "blade-graphics",
@@ -56,6 +57,7 @@ x11 = [
     "x11-clipboard",
     "filedescriptor",
     "open",
+    "scap",
 ]
 
 
@@ -160,6 +162,7 @@ font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "40391b7"
 calloop = { version = "0.13.0" }
 filedescriptor = { version = "0.8.2", optional = true }
 open = { version = "5.2.0", optional = true }
+scap = { workspace = true, optional = true }
 
 # Wayland
 calloop-wayland-source = { version = "0.3.0", optional = true }
@@ -181,7 +184,7 @@ wayland-protocols-plasma = { version = "0.2.0", features = [
 
 # X11
 as-raw-xcb-connection = { version = "1", optional = true }
-x11rb = { version = "0.13.1", features = [
+x11rb = { version = "0.13.0", features = [
     "allow-unsafe-code",
     "xkb",
     "randr",
@@ -198,7 +201,7 @@ xim = { git = "https://github.com/XDeme1/xim-rs", rev = "d50d461764c2213655cd9cf
     "x11rb-xcb",
     "x11rb-client",
 ], optional = true }
-x11-clipboard = { version = "0.9.3", optional = true }
+x11-clipboard = { version = "0.9.2", optional = true }
 
 [target.'cfg(windows)'.dependencies]
 blade-util.workspace = true

crates/gpui/src/elements/img.rs

@@ -8,8 +8,7 @@ use anyhow::{anyhow, Result};
 
 use futures::{AsyncReadExt, Future};
 use image::{
-    codecs::{gif::GifDecoder, webp::WebPDecoder},
-    AnimationDecoder, DynamicImage, Frame, ImageBuffer, ImageError, ImageFormat, Rgba,
+    codecs::gif::GifDecoder, AnimationDecoder, Frame, ImageBuffer, ImageError, ImageFormat,
 };
 use smallvec::SmallVec;
 use std::{
@@ -543,34 +542,6 @@ impl Asset for ImageAssetLoader {
 
                         frames
                     }
-                    ImageFormat::WebP => {
-                        let mut decoder = WebPDecoder::new(Cursor::new(&bytes))?;
-
-                        if decoder.has_animation() {
-                            let _ = decoder.set_background_color(Rgba([0, 0, 0, 0]));
-                            let mut frames = SmallVec::new();
-
-                            for frame in decoder.into_frames() {
-                                let mut frame = frame?;
-                                // Convert from RGBA to BGRA.
-                                for pixel in frame.buffer_mut().chunks_exact_mut(4) {
-                                    pixel.swap(0, 2);
-                                }
-                                frames.push(frame);
-                            }
-
-                            frames
-                        } else {
-                            let mut data = DynamicImage::from_decoder(decoder)?.into_rgba8();
-
-                            // Convert from RGBA to BGRA.
-                            for pixel in data.chunks_exact_mut(4) {
-                                pixel.swap(0, 2);
-                            }
-
-                            SmallVec::from_elem(Frame::new(data), 1)
-                        }
-                    }
                     _ => {
                         let mut data =
                             image::load_from_memory_with_format(&bytes, format)?.into_rgba8();

crates/gpui/src/executor.rs

@@ -1,10 +1,6 @@
 use crate::{AppContext, PlatformDispatcher};
-use async_task::Runnable;
 use futures::channel::mpsc;
 use smol::prelude::*;
-use std::mem::ManuallyDrop;
-use std::panic::Location;
-use std::thread::{self, ThreadId};
 use std::{
     fmt::Debug,
     marker::PhantomData,
@@ -332,9 +328,6 @@ impl BackgroundExecutor {
     /// Depending on other concurrent tasks the elapsed duration may be longer
     /// than requested.
     pub fn timer(&self, duration: Duration) -> Task<()> {
-        if duration.is_zero() {
-            return Task::ready(());
-        }
         let (runnable, task) = async_task::spawn(async move {}, {
             let dispatcher = self.dispatcher.clone();
             move |runnable| dispatcher.dispatch_after(duration, runnable)
@@ -444,19 +437,16 @@ impl ForegroundExecutor {
     }
 
     /// Enqueues the given Task to run on the main thread at some point in the future.
-    #[track_caller]
     pub fn spawn<R>(&self, future: impl Future<Output = R> + 'static) -> Task<R>
     where
         R: 'static,
     {
         let dispatcher = self.dispatcher.clone();
-
-        #[track_caller]
         fn inner<R: 'static>(
             dispatcher: Arc<dyn PlatformDispatcher>,
             future: AnyLocalFuture<R>,
         ) -> Task<R> {
-            let (runnable, task) = spawn_local_with_source_location(future, move |runnable| {
+            let (runnable, task) = async_task::spawn_local(future, move |runnable| {
                 dispatcher.dispatch_on_main_thread(runnable)
             });
             runnable.schedule();
@@ -466,71 +456,6 @@ impl ForegroundExecutor {
     }
 }
 
-/// Variant of `async_task::spawn_local` that includes the source location of the spawn in panics.
-///
-/// Copy-modified from:
-/// https://github.com/smol-rs/async-task/blob/ca9dbe1db9c422fd765847fa91306e30a6bb58a9/src/runnable.rs#L405
-#[track_caller]
-fn spawn_local_with_source_location<Fut, S>(
-    future: Fut,
-    schedule: S,
-) -> (Runnable<()>, async_task::Task<Fut::Output, ()>)
-where
-    Fut: Future + 'static,
-    Fut::Output: 'static,
-    S: async_task::Schedule<()> + Send + Sync + 'static,
-{
-    #[inline]
-    fn thread_id() -> ThreadId {
-        std::thread_local! {
-            static ID: ThreadId = thread::current().id();
-        }
-        ID.try_with(|id| *id)
-            .unwrap_or_else(|_| thread::current().id())
-    }
-
-    struct Checked<F> {
-        id: ThreadId,
-        inner: ManuallyDrop<F>,
-        location: &'static Location<'static>,
-    }
-
-    impl<F> Drop for Checked<F> {
-        fn drop(&mut self) {
-            assert!(
-                self.id == thread_id(),
-                "local task dropped by a thread that didn't spawn it. Task spawned at {}",
-                self.location
-            );
-            unsafe {
-                ManuallyDrop::drop(&mut self.inner);
-            }
-        }
-    }
-
-    impl<F: Future> Future for Checked<F> {
-        type Output = F::Output;
-
-        fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-            assert!(
-                self.id == thread_id(),
-                "local task polled by a thread that didn't spawn it. Task spawned at {}",
-                self.location
-            );
-            unsafe { self.map_unchecked_mut(|c| &mut *c.inner).poll(cx) }
-        }
-    }
-
-    // Wrap the future into one that checks which thread it's on.
-    let future = Checked {
-        id: thread_id(),
-        inner: ManuallyDrop::new(future),
-        location: Location::caller(),
-    };
-
-    unsafe { async_task::spawn_unchecked(future, schedule) }
-}
-
 /// Scope manages a set of tasks that are enqueued and waited on together. See [`BackgroundExecutor::scoped`].
 pub struct Scope<'a> {
     executor: BackgroundExecutor,

crates/gpui/src/geometry.rs

@@ -16,7 +16,7 @@ use std::{
 use crate::{AppContext, DisplayId};
 
 /// An axis along which a measurement can be made.
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
 pub enum Axis {
     /// The y axis, or up and down
     Vertical,
@@ -58,21 +58,7 @@ pub trait Along {
 /// let point = Point { x: 10, y: 20 };
 /// println!("{:?}", point); // Outputs: Point { x: 10, y: 20 }
 /// ```
-#[derive(
-    Refineable,
-    Default,
-    Add,
-    AddAssign,
-    Sub,
-    SubAssign,
-    Copy,
-    Debug,
-    PartialEq,
-    Eq,
-    Serialize,
-    Deserialize,
-    Hash,
-)]
+#[derive(Refineable, Default, Add, AddAssign, Sub, SubAssign, Copy, Debug, PartialEq, Eq, Hash)]
 #[refineable(Debug)]
 #[repr(C)]
 pub struct Point<T: Default + Clone + Debug> {
@@ -708,7 +694,7 @@ impl Size<Length> {
 /// assert_eq!(bounds.origin, origin);
 /// assert_eq!(bounds.size, size);
 /// ```
-#[derive(Refineable, Clone, Default, Debug, Eq, PartialEq, Serialize, Deserialize, Hash)]
+#[derive(Refineable, Clone, Default, Debug, Eq, PartialEq, Hash)]
 #[refineable(Debug)]
 #[repr(C)]
 pub struct Bounds<T: Clone + Default + Debug> {

crates/gpui/src/platform.rs

@@ -237,20 +237,20 @@ pub trait PlatformDisplay: Send + Sync + Debug {
 }
 
 /// A source of on-screen video content that can be captured.
-pub trait ScreenCaptureSource {
+pub trait ScreenCaptureSource: Send {
     /// Returns the video resolution of this source.
-    fn resolution(&self) -> Result<Size<Pixels>>;
+    fn resolution(&self) -> Result<Size<DevicePixels>>;
 
     /// Start capture video from this source, invoking the given callback
     /// with each frame.
     fn stream(
-        &self,
-        frame_callback: Box<dyn Fn(ScreenCaptureFrame)>,
+        &mut self,
+        frame_callback: Box<dyn Fn(ScreenCaptureFrame) + Send>,
     ) -> oneshot::Receiver<Result<Box<dyn ScreenCaptureStream>>>;
 }
 
 /// A video stream captured from a screen.
-pub trait ScreenCaptureStream {}
+pub trait ScreenCaptureStream: Send {}
 
 /// A frame of video captured from a screen.
 pub struct ScreenCaptureFrame(pub PlatformScreenCaptureFrame);

crates/gpui/src/platform/blade/blade_renderer.rs

@@ -431,25 +431,13 @@ impl BladeRenderer {
     }
 
     pub fn update_drawable_size(&mut self, size: Size<DevicePixels>) {
-        self.update_drawable_size_impl(size, false);
-    }
-
-    /// Like `update_drawable_size` but skips the check that the size has changed. This is useful in
-    /// cases like restoring a window from minimization where the size is the same but the
-    /// renderer's swap chain needs to be recreated.
-    #[cfg_attr(any(target_os = "macos", target_os = "linux"), allow(dead_code))]
-    pub fn update_drawable_size_even_if_unchanged(&mut self, size: Size<DevicePixels>) {
-        self.update_drawable_size_impl(size, true);
-    }
-
-    fn update_drawable_size_impl(&mut self, size: Size<DevicePixels>, always_resize: bool) {
         let gpu_size = gpu::Extent {
             width: size.width.0 as u32,
             height: size.height.0 as u32,
             depth: 1,
         };
 
-        if always_resize || gpu_size != self.surface_config.size {
+        if gpu_size != self.surface_config.size {
             self.wait_for_gpu();
             self.surface_config.size = gpu_size;
             self.gpu.resize(self.surface_config);

crates/gpui/src/platform/linux.rs

@@ -21,4 +21,4 @@ pub(crate) use wayland::*;
 #[cfg(feature = "x11")]
 pub(crate) use x11::*;
 
-pub(crate) type PlatformScreenCaptureFrame = ();
+pub type PlatformScreenCaptureFrame = platform::ScapFrame;

crates/gpui/src/platform/linux/headless/client.rs

@@ -3,11 +3,14 @@ use std::rc::Rc;
 
 use calloop::{EventLoop, LoopHandle};
 
+use futures::channel::oneshot;
 use util::ResultExt;
 
 use crate::platform::linux::LinuxClient;
 use crate::platform::{LinuxCommon, PlatformWindow};
-use crate::{AnyWindowHandle, CursorStyle, DisplayId, PlatformDisplay, WindowParams};
+use crate::{
+    AnyWindowHandle, CursorStyle, DisplayId, PlatformDisplay, ScreenCaptureSource, WindowParams,
+};
 
 pub struct HeadlessClientState {
     pub(crate) _loop_handle: LoopHandle<'static, HeadlessClient>,
@@ -59,6 +62,17 @@ impl LinuxClient for HeadlessClient {
         None
     }
 
+    fn screen_capture_sources(
+        &self,
+    ) -> oneshot::Receiver<anyhow::Result<Vec<Box<dyn ScreenCaptureSource>>>> {
+        let (mut tx, rx) = oneshot::channel();
+        tx.send(Err(anyhow::anyhow!(
+            "headless client does not support screen capture."
+        )))
+        .ok();
+        rx
+    }
+
     fn active_window(&self) -> Option<AnyWindowHandle> {
         None
     }

crates/gpui/src/platform/linux/platform.rs

@@ -8,8 +8,9 @@ use std::fs::File;
 use std::io::Read;
 use std::ops::{Deref, DerefMut};
 use std::os::fd::{AsFd, AsRawFd, FromRawFd};
-use std::panic::{AssertUnwindSafe, Location};
+use std::panic::Location;
 use std::rc::Weak;
+use std::sync::atomic::AtomicBool;
 use std::{
     path::{Path, PathBuf},
     process::Command,
@@ -18,12 +19,12 @@ use std::{
     time::Duration,
 };
 
-use anyhow::{anyhow, Context as _};
+use anyhow::anyhow;
 use async_task::Runnable;
 use calloop::channel::Channel;
 use calloop::{EventLoop, LoopHandle, LoopSignal};
 use flume::{Receiver, Sender};
-use futures::{channel::oneshot, future::FutureExt};
+use futures::channel::oneshot;
 use parking_lot::Mutex;
 use util::ResultExt;
 
@@ -32,11 +33,12 @@ use xkbcommon::xkb::{self, Keycode, Keysym, State};
 
 use crate::platform::NoopTextSystem;
 use crate::{
-    px, Action, AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DisplayId,
-    ForegroundExecutor, Keymap, Keystroke, LinuxDispatcher, Menu, MenuItem, Modifiers, OwnedMenu,
-    PathPromptOptions, Pixels, Platform, PlatformDisplay, PlatformInputHandler, PlatformTextSystem,
-    PlatformWindow, Point, PromptLevel, Result, ScreenCaptureSource, SemanticVersion, SharedString,
-    Size, Task, WindowAppearance, WindowOptions, WindowParams,
+    px, size, Action, AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle,
+    DevicePixels, DisplayId, ForegroundExecutor, Keymap, Keystroke, LinuxDispatcher, Menu,
+    MenuItem, Modifiers, OwnedMenu, PathPromptOptions, Pixels, Platform, PlatformDisplay,
+    PlatformInputHandler, PlatformTextSystem, PlatformWindow, Point, PromptLevel, Result,
+    ScreenCaptureSource, ScreenCaptureStream, SemanticVersion, SharedString, Size, Task,
+    WindowAppearance, WindowOptions, WindowParams,
 };
 
 pub(crate) const SCROLL_LINES: f32 = 3.0;
@@ -56,6 +58,9 @@ pub trait LinuxClient {
     fn displays(&self) -> Vec<Rc<dyn PlatformDisplay>>;
     fn primary_display(&self) -> Option<Rc<dyn PlatformDisplay>>;
     fn display(&self, id: DisplayId) -> Option<Rc<dyn PlatformDisplay>>;
+    fn screen_capture_sources(
+        &self,
+    ) -> oneshot::Receiver<Result<Vec<Box<dyn ScreenCaptureSource>>>>;
 
     fn open_window(
         &self,
@@ -245,9 +250,7 @@ impl<P: LinuxClient + 'static> Platform for P {
     fn screen_capture_sources(
         &self,
     ) -> oneshot::Receiver<Result<Vec<Box<dyn ScreenCaptureSource>>>> {
-        let (mut tx, rx) = oneshot::channel();
-        tx.send(Err(anyhow!("screen capture not implemented"))).ok();
-        rx
+        self.screen_capture_sources()
     }
 
     fn active_window(&self) -> Option<AnyWindowHandle> {
@@ -382,14 +385,14 @@ impl<P: LinuxClient + 'static> Platform for P {
     }
 
     fn open_with_system(&self, path: &Path) {
+        let executor = self.background_executor().clone();
         let path = path.to_owned();
-        self.background_executor()
+        executor
             .spawn(async move {
                 let _ = std::process::Command::new("xdg-open")
                     .arg(path)
                     .spawn()
-                    .context("invoking xdg-open")
-                    .log_err();
+                    .expect("Failed to open file with xdg-open");
             })
             .detach();
     }
@@ -489,12 +492,7 @@ impl<P: LinuxClient + 'static> Platform for P {
                     let username = attributes
                         .get("username")
                         .ok_or_else(|| anyhow!("Cannot find username in stored credentials"))?;
-                    // oo7 panics if the retrieved secret can't be decrypted due to
-                    // unexpected padding.
-                    let secret = AssertUnwindSafe(item.secret())
-                        .catch_unwind()
-                        .await
-                        .map_err(|_| anyhow!("oo7 panicked while trying to read credentials"))??;
+                    let secret = item.secret().await?;
 
                     // we lose the zeroizing capabilities at this boundary,
                     // a current limitation GPUI's credentials api
@@ -848,6 +846,70 @@ impl Modifiers {
     }
 }
 
+pub struct ScapCapturer {
+    pub stream_tx: std::sync::mpsc::Sender<(
+        oneshot::Sender<anyhow::Result<Box<dyn crate::ScreenCaptureStream>>>,
+        Box<dyn Fn(crate::ScreenCaptureFrame) + Send>,
+    )>,
+    // TODO: This is incorrect on wayland, as the screen capturer
+    // can change size dynamically while streaming. But right now we
+    // need a set video resolution for Livekit, so let's cache it here.
+    pub size: Size<DevicePixels>,
+}
+
+pub struct ScapStream(pub Arc<AtomicBool>);
+
+impl ScreenCaptureStream for ScapStream {}
+
+impl Drop for ScapStream {
+    fn drop(&mut self) {
+        self.0.store(true, std::sync::atomic::Ordering::SeqCst);
+    }
+}
+
+pub struct ScapFrame(pub scap::frame::Frame);
+
+impl ScreenCaptureSource for ScapCapturer {
+    fn resolution(&self) -> anyhow::Result<Size<DevicePixels>> {
+        Ok(self.size)
+    }
+
+    fn stream(
+        &mut self,
+        frame_callback: Box<dyn Fn(crate::ScreenCaptureFrame) + Send>,
+    ) -> oneshot::Receiver<anyhow::Result<Box<dyn crate::ScreenCaptureStream>>> {
+        let (tx, rx) = oneshot::channel();
+        self.stream_tx.send((tx, frame_callback));
+        rx
+    }
+}
+
+pub fn get_frame_size(frame: &scap::frame::Frame) -> Size<DevicePixels> {
+    match frame {
+        scap::frame::Frame::YUVFrame(frame) => {
+            size(DevicePixels(frame.width), DevicePixels(frame.height))
+        }
+        scap::frame::Frame::RGB(frame) => {
+            size(DevicePixels(frame.width), DevicePixels(frame.height))
+        }
+        scap::frame::Frame::RGBx(frame) => {
+            size(DevicePixels(frame.width), DevicePixels(frame.height))
+        }
+        scap::frame::Frame::XBGR(frame) => {
+            size(DevicePixels(frame.width), DevicePixels(frame.height))
+        }
+        scap::frame::Frame::BGRx(frame) => {
+            size(DevicePixels(frame.width), DevicePixels(frame.height))
+        }
+        scap::frame::Frame::BGR0(frame) => {
+            size(DevicePixels(frame.width), DevicePixels(frame.height))
+        }
+        scap::frame::Frame::BGRA(frame) => {
+            size(DevicePixels(frame.width), DevicePixels(frame.height))
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

crates/gpui/src/platform/linux/wayland/client.rs

@@ -3,6 +3,8 @@ use std::hash::Hash;
 use std::os::fd::{AsRawFd, BorrowedFd};
 use std::path::PathBuf;
 use std::rc::{Rc, Weak};
+use std::sync::atomic::AtomicBool;
+use std::sync::Arc;
 use std::time::{Duration, Instant};
 
 use calloop::timer::{TimeoutAction, Timer};
@@ -11,6 +13,9 @@ use calloop_wayland_source::WaylandSource;
 use collections::HashMap;
 use filedescriptor::Pipe;
 
+use anyhow::anyhow;
+use futures::channel::oneshot;
+
 use http_client::Url;
 use smallvec::SmallVec;
 use util::ResultExt;
@@ -78,16 +83,13 @@ use crate::platform::linux::{
 };
 use crate::platform::PlatformWindow;
 use crate::{
-    point, px, size, Bounds, DevicePixels, FileDropEvent, ForegroundExecutor, MouseExitEvent, Size,
-    DOUBLE_CLICK_INTERVAL, SCROLL_LINES,
+    get_frame_size, point, px, size, AnyWindowHandle, Bounds, CursorStyle, DevicePixels, DisplayId,
+    FileDropEvent, ForegroundExecutor, KeyDownEvent, KeyUpEvent, Keystroke, LinuxCommon, Modifiers,
+    ModifiersChangedEvent, MouseButton, MouseDownEvent, MouseExitEvent, MouseMoveEvent,
+    MouseUpEvent, NavigationDirection, Pixels, PlatformDisplay, PlatformInput, Point, ScaledPixels,
+    ScapCapturer, ScapFrame, ScapStream, ScreenCaptureSource, ScrollDelta, ScrollWheelEvent, Size,
+    TouchPhase, WindowParams, DOUBLE_CLICK_INTERVAL, SCROLL_LINES,
 };
-use crate::{
-    AnyWindowHandle, CursorStyle, DisplayId, KeyDownEvent, KeyUpEvent, Keystroke, Modifiers,
-    ModifiersChangedEvent, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent,
-    NavigationDirection, Pixels, PlatformDisplay, PlatformInput, Point, ScaledPixels, ScrollDelta,
-    ScrollWheelEvent, TouchPhase,
-};
-use crate::{LinuxCommon, WindowParams};
 
 /// Used to convert evdev scancode to xkb scancode
 const MIN_KEYCODE: u32 = 8;
@@ -617,6 +619,76 @@ impl LinuxClient for WaylandClient {
         None
     }
 
+    fn screen_capture_sources(
+        &self,
+    ) -> oneshot::Receiver<anyhow::Result<Vec<Box<dyn ScreenCaptureSource>>>> {
+        let (mut tx, result_rx) = oneshot::channel();
+
+        std::thread::spawn(|| {
+            let (stream_tx, stream_rx) = std::sync::mpsc::channel();
+
+            let screen_capturer = util::maybe!({
+                // TODO: needed?
+                if !scap::has_permission() {
+                    if !scap::request_permission() {
+                        Err(anyhow!("No permissions to share screen"))?;
+                    }
+                }
+
+                let mut capturer = scap::capturer::Capturer::build(scap::capturer::Options {
+                    fps: 60,
+                    show_cursor: true,
+                    show_highlight: true,
+                    output_type: scap::frame::FrameType::YUVFrame,
+                    output_resolution: scap::capturer::Resolution::Captured,
+                    crop_area: None,
+                    target: None,
+                    excluded_targets: None,
+                })?;
+
+                capturer.start_capture();
+                let size = match capturer.get_next_frame() {
+                    Ok(frame) => get_frame_size(&frame),
+                    Err(std::sync::mpsc::RecvError) => Err(anyhow!(
+                        "Failed to get first frame of screenshare to get the size."
+                    ))?,
+                };
+
+                Ok((
+                    capturer,
+                    vec![Box::new(ScapCapturer { stream_tx, size }) as Box<dyn ScreenCaptureSource>],
+                ))
+            });
+
+            match screen_capturer {
+                Err(e) => {
+                    tx.send(Err(e)).ok();
+                }
+                Ok((mut capturer, sources)) => {
+                    tx.send(Ok(sources)).ok();
+
+                    while let Ok((tx, callback)) = stream_rx.recv() {
+                        let cancel_stream = Arc::new(AtomicBool::new(false));
+                        tx.send(Ok(Box::new(ScapStream(cancel_stream.clone()))))
+                            .ok();
+                        while cancel_stream.load(std::sync::atomic::Ordering::SeqCst) {
+                            match capturer.get_next_frame() {
+                                Ok(frame) => callback(crate::ScreenCaptureFrame(ScapFrame(frame))),
+                                Err(std::sync::mpsc::RecvError) => {
+                                    break;
+                                }
+                            }
+                        }
+                    }
+
+                    capturer.stop_capture();
+                }
+            }
+        });
+
+        result_rx
+    }
+
     fn open_window(
         &self,
         handle: AnyWindowHandle,

crates/gpui/src/platform/linux/x11/client.rs

@@ -9,8 +9,8 @@ use std::time::{Duration, Instant};
 use calloop::generic::{FdWrapper, Generic};
 use calloop::{EventLoop, LoopHandle, RegistrationToken};
 
-use anyhow::Context as _;
 use collections::HashMap;
+use futures::channel::oneshot;
 use http_client::Url;
 use smallvec::SmallVec;
 use util::ResultExt;
@@ -40,7 +40,7 @@ use crate::{
     modifiers_from_xinput_info, point, px, AnyWindowHandle, Bounds, ClipboardItem, CursorStyle,
     DisplayId, FileDropEvent, Keystroke, Modifiers, ModifiersChangedEvent, MouseButton, Pixels,
     Platform, PlatformDisplay, PlatformInput, Point, RequestFrameOptions, ScaledPixels,
-    ScrollDelta, Size, TouchPhase, WindowParams, X11Window,
+    ScreenCaptureSource, ScrollDelta, Size, TouchPhase, WindowParams, X11Window,
 };
 
 use super::{
@@ -1251,6 +1251,17 @@ impl LinuxClient for X11Client {
         f(&mut self.0.borrow_mut().common)
     }
 
+    fn screen_capture_sources(
+        &self,
+    ) -> oneshot::Receiver<anyhow::Result<Vec<Box<dyn ScreenCaptureSource>>>> {
+        unimplemented!()
+        /*
+        let state = self.0.borrow();
+        let xcb = state.xcb_connection;
+        for root in xcb.setup().roots {}
+        */
+    }
+
     fn displays(&self) -> Vec<Rc<dyn PlatformDisplay>> {
         let state = self.0.borrow();
         let setup = state.xcb_connection.setup();
@@ -1418,10 +1429,9 @@ impl LinuxClient for X11Client {
                     ..Default::default()
                 },
             )
-            .anyhow()
-            .and_then(|cookie| cookie.check().anyhow())
-            .context("setting cursor style")
-            .log_err();
+            .expect("failed to change window cursor")
+            .check()
+            .unwrap();
     }
 
     fn open_uri(&self, uri: &str) {

crates/gpui/src/platform/mac/platform.rs

@@ -10,7 +10,7 @@ use crate::{
     PlatformTextSystem, PlatformWindow, Result, ScreenCaptureSource, SemanticVersion, Task,
     WindowAppearance, WindowParams,
 };
-use anyhow::{anyhow, Context as _};
+use anyhow::anyhow;
 use block::ConcreteBlock;
 use cocoa::{
     appkit::{
@@ -57,7 +57,6 @@ use std::{
     sync::Arc,
 };
 use strum::IntoEnumIterator;
-use util::ResultExt;
 
 #[allow(non_upper_case_globals)]
 const NSUTF8StringEncoding: NSUInteger = 4;
@@ -780,16 +779,15 @@ impl Platform for MacPlatform {
     }
 
     fn open_with_system(&self, path: &Path) {
-        let path = path.to_owned();
+        let path = path.to_path_buf();
         self.0
             .lock()
             .background_executor
             .spawn(async move {
-                let _ = std::process::Command::new("open")
+                std::process::Command::new("open")
                     .arg(path)
                     .spawn()
-                    .context("invoking open command")
-                    .log_err();
+                    .expect("Failed to open file");
             })
             .detach();
     }