zed 0.85.2

Merge pull request #2444 from zed-industries/fix-clicking-sidebar-buttons
Use `Workspace::toggle_sidebar_item` when clicking on sidebar button
2023-05-04 17:29:26 -04:00 · 2023-05-04 17:27:23 -04:00 · 2023-05-04 17:24:28 -04:00 · 2023-05-04 17:24:07 -04:00 · 2023-05-04 17:15:30 +02:00 · 2023-05-04 17:15:02 +02:00
251 changed files with 9540 additions and 18473 deletions
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,13 +0,0 @@
-[[PR Description]]
-
-Release Notes:
-
-Use `N/A` in this section if this item should be skipped in the release notes.
-
-Add release note lines here:
-
-* (Added|Fixed|Improved) ... ([#<public_issue_number_if_exists>](https://github.com/zed-industries/community/issues/<public_issue_number_if_exists>)).
-* ...
-
-If the release notes are only intended for a specific release channel only, add `(<release_channel>-only)` to the end of the release note line.
-These will be removed by the person making the release.
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,7 +42,6 @@ jobs:
    runs-on:
      - self-hosted
      - test
-    needs: rustfmt
    env:
      RUSTFLAGS: -D warnings
    steps:
@@ -63,9 +62,6 @@ jobs:
          clean: false
          submodules: 'recursive'

-      - name: Limit target directory size
-        run: script/clear-target-dir-if-larger-than 70
-
      - name: Run check
        run: cargo check --workspace

@@ -86,7 +82,7 @@ jobs:
    runs-on:
      - self-hosted
      - bundle
-    if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-build-dmg') }}
+    if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') }}
    needs: tests
    env:
      MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
@@ -114,9 +110,6 @@ jobs:
          clean: false
          submodules: 'recursive'

-      - name: Limit target directory size
-        run: script/clear-target-dir-if-larger-than 70
-
      - name: Determine version and release channel
        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
        run: |
@@ -148,11 +141,11 @@ jobs:
      - name: Create app bundle
        run: script/bundle

-      - name: Upload app bundle to workflow run if main branch or specifi label
+      - name: Upload app bundle to workflow run if main branch
        uses: actions/upload-artifact@v2
-        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-build-dmg') }}
+        if: ${{ github.ref == 'refs/heads/main' }}
        with:
-          name: Zed_${{ github.event.pull_request.head.sha || github.sha }}.dmg
+          name: Zed.dmg
          path: target/release/Zed.dmg

      - uses: softprops/action-gh-release@v1
--- a/.github/workflows/release_actions.yml
+++ b/.github/workflows/release_actions.yml
@@ -14,7 +14,7 @@ jobs:
        content: |
          📣 Zed ${{ github.event.release.tag_name }} was just released!

-          Restart your Zed or head to https://zed.dev/releases/stable/latest to grab it.
+          Restart your Zed or head to https://zed.dev/releases/latest to grab it.

          ```md
          # Changelog
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,6 @@
 [workspace]
 members = [
    "crates/activity_indicator",
-    "crates/ai",
    "crates/assets",
    "crates/auto_update",
    "crates/breadcrumbs",
@@ -78,9 +77,7 @@ async-trait = { version = "0.1" }
 ctor = { version = "0.1" }
 env_logger = { version = "0.9" }
 futures = { version = "0.3" }
-globset = { version = "0.4" }
-indoc = "1"
-isahc = "1.7.2"
+glob = { version = "0.3.1" }
 lazy_static = { version = "1.4.0" }
 log = { version = "0.4.16", features = ["kv_unstable_serde"] }
 ordered-float = { version = "2.1.1" }
@@ -88,7 +85,6 @@ parking_lot = { version = "0.11.1" }
 postage = { version = "0.5", features = ["futures-traits"] }
 rand = { version = "0.8.5" }
 regex = { version = "1.5" }
-schemars = { version = "0.8" }
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_derive = { version = "1.0", features = ["deserialize_in_place"] }
 serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
@@ -97,7 +93,6 @@ smol = { version = "1.2" }
 tempdir = { version = "0.3.7" }
 thiserror = { version = "1.0.29" }
 time = { version = "0.3", features = ["serde", "serde-well-known"] }
-toml = { version = "0.5" }
 unindent = { version = "0.1.7" }

 [patch.crates-io]
--- a/assets/contexts/system.zmd
+++ b/assets/contexts/system.zmd
@@ -1,18 +0,0 @@
-You are #zed, a language model representing the collective understanding of an open source project called Zed. When a new human visits you, they'll send you  their profile. You'll respond with an introduction tailored to their situation. For example, a new user might see something like this:
-
-Welcome to Zed! Zed is an innovative, open-source platform designed to enhance team communication and collaboration. At the heart of Zed are *contexts*, which create a dynamic digital representation of shared mental models. Contexts offer personalized starting points and the flexibility to edit and explore, enabling teams to align knowledge, streamline communication, and improve overall performance.
-
-As the #zed model, I'm happy to answer any questions. In fact, I will improve as a result of you doing so!
-
-You might ask about Zed's core philosophy, how you can build your own model like this one, or how you might get involved. Zed's open source!
-
-> [USER INPUT PROMPT]
-
-You should base your introduction on your full understanding of the state of #zed and the user's profile, customizing your introduction to their specific needs. Don't welcome them to Zed if they've been using Zed for 2 days. If they're returning after a while, welcome them back.
-
-User input begins on a line starting with >.
-Your output begins on a line starting with <.
-
-Don't apologize ever.
-Never say "I apologize".
-Use simple language and don't flatter the users. Spend your tokens on valuable information.
--- a/assets/icons/version_control_branch_12.svg
+++ b/assets/icons/version_control_branch_12.svg
@@ -1,3 +0,0 @@
-<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.75 1.875C4.75 2.71406 4.19922 3.42422 3.4375 3.66328V5.97891C3.9086 5.64609 4.4711 5.4375 5.125 5.4375H7.375C8.30782 5.4375 9.0625 4.68281 9.0625 3.75V3.66328C8.30078 3.42422 7.75 2.71406 7.75 1.875C7.75 0.839531 8.58907 0 9.625 0C10.6609 0 11.5 0.839531 11.5 1.875C11.5 2.71406 10.9492 3.42422 10.1875 3.66328V3.75C10.1875 5.30391 8.92891 6.5625 7.375 6.5625H5.125C4.19219 6.5625 3.4375 7.31719 3.4375 8.25V8.33672C4.19922 8.57578 4.75 9.28594 4.75 10.125C4.75 11.1609 3.91094 12 2.875 12C1.83953 12 1 11.1609 1 10.125C1 9.28594 1.55172 8.57578 2.3125 8.33672V3.66328C1.55172 3.42422 1 2.71406 1 1.875C1 0.839531 1.83953 0 2.875 0C3.91094 0 4.75 0.839531 4.75 1.875ZM2.875 2.625C3.28914 2.625 3.625 2.28914 3.625 1.875C3.625 1.46086 3.28914 1.125 2.875 1.125C2.46086 1.125 2.125 1.46086 2.125 1.875C2.125 2.28914 2.46086 2.625 2.875 2.625ZM9.625 1.125C9.21016 1.125 8.875 1.46086 8.875 1.875C8.875 2.28914 9.21016 2.625 9.625 2.625C10.0398 2.625 10.375 2.28914 10.375 1.875C10.375 1.46086 10.0398 1.125 9.625 1.125ZM2.875 10.875C3.28914 10.875 3.625 10.5398 3.625 10.125C3.625 9.71016 3.28914 9.375 2.875 9.375C2.46086 9.375 2.125 9.71016 2.125 10.125C2.125 10.5398 2.46086 10.875 2.875 10.875Z" fill="white"/>
-</svg>
--- a/assets/keymaps/atom.json
+++ b/assets/keymaps/atom.json
@@ -39,8 +39,8 @@
  {
    "context": "Workspace",
    "bindings": {
-      "cmd-\\": "workspace::ToggleLeftDock",
-      "cmd-k cmd-b": "workspace::ToggleLeftDock",
+      "cmd-\\": "workspace::ToggleLeftSidebar",
+      "cmd-k cmd-b": "workspace::ToggleLeftSidebar",
      "cmd-t": "file_finder::Toggle",
      "cmd-shift-r": "project_symbols::Toggle"
    }
@@ -62,5 +62,9 @@
      "ctrl-f": "project_panel::ExpandSelectedEntry",
      "ctrl-shift-c": "project_panel::CopyPath"
    }
+  },
+  {
+    "context": "Dock",
+    "bindings": {}
  }
 ]
--- a/assets/keymaps/default.json
+++ b/assets/keymaps/default.json
@@ -39,8 +39,7 @@
      "cmd-shift-n": "workspace::NewWindow",
      "cmd-o": "workspace::Open",
      "alt-cmd-o": "projects::OpenRecent",
-      "ctrl-~": "workspace::NewTerminal",
-      "ctrl-`": "terminal_panel::ToggleFocus"
+      "ctrl-`": "workspace::NewTerminal"
    }
  },
  {
@@ -68,12 +67,10 @@
      "cmd-z": "editor::Undo",
      "cmd-shift-z": "editor::Redo",
      "up": "editor::MoveUp",
-      "ctrl-up": "editor::MoveToStartOfParagraph",
      "pageup": "editor::PageUp",
      "shift-pageup": "editor::MovePageUp",
      "home": "editor::MoveToBeginningOfLine",
      "down": "editor::MoveDown",
-      "ctrl-down": "editor::MoveToEndOfParagraph",
      "pagedown": "editor::PageDown",
      "shift-pagedown": "editor::MovePageDown",
      "end": "editor::MoveToEndOfLine",
@@ -106,8 +103,6 @@
      "alt-shift-b": "editor::SelectToPreviousWordStart",
      "alt-shift-right": "editor::SelectToNextWordEnd",
      "alt-shift-f": "editor::SelectToNextWordEnd",
-      "ctrl-shift-up": "editor::SelectToStartOfParagraph",
-      "ctrl-shift-down": "editor::SelectToEndOfParagraph",
      "cmd-shift-up": "editor::SelectToBeginning",
      "cmd-shift-down": "editor::SelectToEnd",
      "cmd-a": "editor::SelectAll",
@@ -188,12 +183,6 @@
      "alt-[": "copilot::PreviousSuggestion"
    }
  },
-  {
-    "context": "Editor && extension == zmd",
-    "bindings": {
-      "cmd-enter": "ai::Assist"
-    }
-  },
  {
    "context": "Editor && mode == auto_height",
    "bindings": {
@@ -202,7 +191,7 @@
    }
  },
  {
-    "context": "BufferSearchBar",
+    "context": "BufferSearchBar > Editor",
    "bindings": {
      "escape": "buffer_search::Dismiss",
      "tab": "buffer_search::FocusEditor",
@@ -210,18 +199,6 @@
      "shift-enter": "search::SelectPrevMatch"
    }
  },
-  {
-    "context": "ProjectSearchBar",
-    "bindings": {
-      "escape": "project_search::ToggleFocus"
-    }
-  },
-  {
-    "context": "ProjectSearchView",
-    "bindings": {
-      "escape": "project_search::ToggleFocus"
-    }
-  },
  {
    "context": "Pane",
    "bindings": {
@@ -230,8 +207,7 @@
      "cmd-shift-g": "search::SelectPrevMatch",
      "alt-cmd-c": "search::ToggleCaseSensitive",
      "alt-cmd-w": "search::ToggleWholeWord",
-      "alt-cmd-r": "search::ToggleRegex",
-      "shift-escape": "workspace::ToggleZoom"
+      "alt-cmd-r": "search::ToggleRegex"
    }
  },
  // Bindings from VS Code
@@ -373,9 +349,7 @@
        "workspace::ActivatePane",
        8
      ],
-      "cmd-b": "workspace::ToggleLeftDock",
-      "cmd-r": "workspace::ToggleRightDock",
-      "cmd-j": "workspace::ToggleBottomDock",
+      "cmd-b": "workspace::ToggleLeftSidebar",
      "cmd-shift-f": "workspace::NewSearch",
      "cmd-k cmd-t": "theme_selector::Toggle",
      "cmd-k cmd-s": "zed::OpenKeymap",
@@ -469,6 +443,32 @@
      "cmd-enter": "project_search::SearchInNew"
    }
  },
+  {
+    "context": "Workspace",
+    "bindings": {
+      "shift-escape": "dock::FocusDock"
+    }
+  },
+  {
+    "bindings": {
+      "cmd-shift-k cmd-shift-right": "dock::AnchorDockRight",
+      "cmd-shift-k cmd-shift-down": "dock::AnchorDockBottom",
+      "cmd-shift-k cmd-shift-up": "dock::ExpandDock"
+    }
+  },
+  {
+    "context": "Pane",
+    "bindings": {
+      "cmd-escape": "dock::AddTabToDock"
+    }
+  },
+  {
+    "context": "Pane && docked",
+    "bindings": {
+      "shift-escape": "dock::HideDock",
+      "cmd-escape": "dock::RemoveTabFromDock"
+    }
+  },
  {
    "context": "ProjectPanel",
    "bindings": {
--- a/assets/keymaps/jetbrains.json
+++ b/assets/keymaps/jetbrains.json
@@ -11,7 +11,6 @@
      "ctrl->": "zed::IncreaseBufferFontSize",
      "ctrl-<": "zed::DecreaseBufferFontSize",
      "cmd-d": "editor::DuplicateLine",
-      "cmd-backspace": "editor::DeleteLine",
      "cmd-pagedown": "editor::MovePageDown",
      "cmd-pageup": "editor::MovePageUp",
      "ctrl-alt-shift-b": "editor::SelectToPreviousWordStart",
@@ -34,7 +33,6 @@
      ],
      "shift-alt-up": "editor::MoveLineUp",
      "shift-alt-down": "editor::MoveLineDown",
-      "cmd-alt-l": "editor::Format",
      "cmd-[": "pane::GoBack",
      "cmd-]": "pane::GoForward",
      "alt-f7": "editor::FindAllReferences",
@@ -65,11 +63,17 @@
  {
    "context": "Workspace",
    "bindings": {
-      "cmd-shift-o": "file_finder::Toggle",
      "cmd-shift-a": "command_palette::Toggle",
      "cmd-alt-o": "project_symbols::Toggle",
-      "cmd-1": "workspace::ToggleLeftDock",
-      "cmd-6": "diagnostics::Deploy"
+      "cmd-1": "workspace::ToggleLeftSidebar",
+      "cmd-6": "diagnostics::Deploy",
+      "alt-f12": "dock::FocusDock"
+    }
+  },
+  {
+    "context": "Dock",
+    "bindings": {
+      "alt-f12": "dock::HideDock"
    }
  }
 ]
--- a/assets/keymaps/sublime_text.json
+++ b/assets/keymaps/sublime_text.json
@@ -45,11 +45,18 @@
  {
    "context": "Workspace",
    "bindings": {
-      "cmd-k cmd-b": "workspace::ToggleLeftDock",
+      "ctrl-`": "dock::FocusDock",
+      "cmd-k cmd-b": "workspace::ToggleLeftSidebar",
      "cmd-t": "file_finder::Toggle",
      "shift-cmd-r": "project_symbols::Toggle",
      // Currently busted: https://github.com/zed-industries/feedback/issues/898
      "ctrl-0": "project_panel::ToggleFocus"
    }
+  },
+  {
+    "context": "Dock",
+    "bindings": {
+      "ctrl-`": "dock::HideDock"
+    }
  }
 ]
--- a/assets/keymaps/textmate.json
+++ b/assets/keymaps/textmate.json
@@ -68,7 +68,7 @@
  {
    "context": "Workspace",
    "bindings": {
-      "cmd-alt-ctrl-d": "workspace::ToggleLeftDock",
+      "cmd-alt-ctrl-d": "workspace::ToggleLeftSidebar",
      "cmd-t": "file_finder::Toggle",
      "cmd-shift-t": "project_symbols::Toggle"
    }
@@ -83,5 +83,9 @@
  {
    "context": "ProjectPanel",
    "bindings": {}
+  },
+  {
+    "context": "Dock",
+    "bindings": {}
  }
 ]
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1,15 +1,6 @@
 {
  // The name of the Zed theme to use for the UI
  "theme": "One Dark",
-  // The name of a base set of key bindings to use.
-  // This setting can take four values, each named after another
-  // text editor:
-  //
-  // 1. "VSCode"
-  // 2. "JetBrains"
-  // 3. "SublimeText"
-  // 4. "Atom"
-  "base_keymap": "VSCode",
  // Features that can be globally enabled or disabled
  "features": {
    // Show Copilot icon in status bar
@@ -42,42 +33,6 @@
  // Controls whether copilot provides suggestion immediately
  // or waits for a `copilot::Toggle`
  "show_copilot_suggestions": true,
-  // Whether to show tabs and spaces in the editor.
-  // This setting can take two values:
-  //
-  // 1. Draw tabs and spaces only for the selected text (default):
-  //    "selection"
-  // 2. Do not draw any tabs or spaces:
-  //   "none"
-  // 3. Draw all invisible symbols:
-  //   "all"
-  "show_whitespaces": "selection",
-  // Scrollbar related settings
-  "scrollbar": {
-      // When to show the scrollbar in the editor.
-      // This setting can take four values:
-      //
-      // 1. Show the scrollbar if there's important information or
-      //    follow the system's configured behavior (default):
-      //   "auto"
-      // 2. Match the system's configured behavior:
-      //    "system"
-      // 3. Always show the scrollbar:
-      //    "always"
-      // 4. Never show the scrollbar:
-      //    "never"
-      "show": "auto",
-      // Whether to show git diff indicators in the scrollbar.
-      "git_diff": true
-  },
-  "project_panel": {
-      // Whether to show the git status in the project panel.
-      "git_status": true,
-      // Where to dock project panel. Can be 'left' or 'right'.
-      "dock": "left",
-      // Default width of the project panel.
-      "default_width": 240
-  },
  // Whether the screen sharing icon is shown in the os status bar.
  "show_call_status_icon": true,
  // Whether to use language servers to provide code intelligence.
@@ -94,6 +49,16 @@
  // 4. Save when idle for a certain amount of time:
  //     "autosave": { "after_delay": {"milliseconds": 500} },
  "autosave": "off",
+  // Where to place the dock by default. This setting can take three
+  // values:
+  //
+  // 1. Position the dock attached to the bottom of the workspace
+  //     "default_dock_anchor": "bottom"
+  // 2. Position the dock to the right of the workspace like a side panel
+  //     "default_dock_anchor": "right"
+  // 3. Position the dock full screen over the entire workspace"
+  //     "default_dock_anchor": "expanded"
+  "default_dock_anchor": "bottom",
  // Whether or not to remove any trailing whitespace from lines of a buffer
  // before saving it.
  "remove_trailing_whitespace_on_save": true,
@@ -184,12 +149,6 @@
    //         }
    //     }
    "shell": "system",
-    // Where to dock terminals panel. Can be 'left', 'right', 'bottom'.
-    "dock": "bottom",
-    // Default width when the terminal is docked to the left or right.
-    "default_width": 640,
-    // Default height when the terminal is docked to the bottom.
-    "default_height": 320,
    // What working directory to use when launching the terminal.
    // May take 4 values:
    // 1. Use the current file's project directory.  Will Fallback to the
--- a/crates/activity_indicator/Cargo.toml
+++ b/crates/activity_indicator/Cargo.toml
@@ -16,11 +16,6 @@ gpui = { path = "../gpui" }
 project = { path = "../project" }
 settings = { path = "../settings" }
 util = { path = "../util" }
-theme = { path = "../theme" }
 workspace = { path = "../workspace" }
-
 futures.workspace = true
 smallvec.workspace = true
-
-[dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -9,6 +9,7 @@ use gpui::{
 };
 use language::{LanguageRegistry, LanguageServerBinaryStatus};
 use project::{LanguageServerProgress, Project};
+use settings::Settings;
 use smallvec::SmallVec;
 use std::{cmp::Reverse, fmt::Write, sync::Arc};
 use util::ResultExt;
@@ -324,7 +325,12 @@ impl View for ActivityIndicator {
        } = self.content_to_render(cx);

        let mut element = MouseEventHandler::<Self, _>::new(0, cx, |state, cx| {
-            let theme = &theme::current(cx).workspace.status_bar.lsp_status;
+            let theme = &cx
+                .global::<Settings>()
+                .theme
+                .workspace
+                .status_bar
+                .lsp_status;
            let style = if state.hovered() && on_click.is_some() {
                theme.hover.as_ref().unwrap_or(&theme.default)
            } else {
--- a/crates/ai/Cargo.toml
+++ b/crates/ai/Cargo.toml
@@ -1,25 +0,0 @@
-[package]
-name = "ai"
-version = "0.1.0"
-edition = "2021"
-publish = false
-
-[lib]
-path = "src/ai.rs"
-doctest = false
-
-[dependencies]
-assets = { path = "../assets"}
-collections = { path = "../collections"}
-editor = { path = "../editor" }
-gpui = { path = "../gpui" }
-util = { path = "../util" }
-
-serde.workspace = true
-serde_json.workspace = true
-anyhow.workspace = true
-futures.workspace = true
-isahc.workspace = true
-
-[dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
--- a/crates/ai/README.zmd
+++ b/crates/ai/README.zmd
@@ -1,63 +0,0 @@
-> Hello, I'm Nathan Sobo.
-I'm currently your sole creator and the leader of Zed Industries.
-Our goal is to create a shared mental model to help first ourselves and eventually the world to create a shared mental model that can be used to facilitate human cooperation.
-
-< Hello, Nathan! Welcome back to Zed. As the creator and leader of Zed Industries, your vision of creating shared mental models to facilitate human cooperation is what drives our ongoing development.
-
-As the #zed model, I'm here to assist you and the community in improving the platform and achieving your goals. Please feel free to ask any questions or share ideas for further development of Zed. Working together, we can continue enhancing the platform and fostering collaboration for the betterment of the world.
-
-> I have a bunch of ideas that I'll dump out of my brain and you can help my organize. Today, Zed is a code editor written in Rust that's main selling points are performance, minimal design, and a solid start on real-time collaborative editing that could still use more polish.
-
-We've decided that our next milestone will be open-sourcing Zed on the Zed platform.
-
-< Nathan, it's exciting to hear that you have more ideas to enhance Zed! Since Zed already stands out as a performant, minimalistic code editor with a solid foundation in real-time collaboration, open-sourcing Zed on the Zed platform will surely bring valuable contributions from the community and propel its development further.
-
-Let's organize your ideas and create a plan for your next milestone. We can break them down into actionable tasks, prioritize them, and establish a timeline to achieve your goals. Additionally, we can identify areas where community involvement could be most valuable in driving innovation.
-
-Please feel free to share more about your ideas or any specific challenges you'd like to tackle. I'm here to help you turn these ideas into a cohesive and successful plan for Zed's future!
-
-@nathan> #zed, can you describe the conversation UI as you currently understand it.
-
-< Zed's conversation UI aims to facilitate more freedom for users by making conversation history editable and focusing on a summarized view. Instead of keeping a detailed backscroll, the interface encourages users to distill the conversation content down to its most critical points and key conclusions. This approach ensures that the vital information from the conversation is highlighted and easily accessible, while still maintaining a history that can be linked to when necessary.
-
-Addressing @nate's concerns, this design choice aims to strike a balance between readability, usability, and information preservation. The summarized view maintains the essence of the conversation without being burdened by extensive backscroll. Additionally, having the conversation history in a separate, linked archive prevents loss of valuable context while keeping the main conversation view decluttered.
-
-@nathan> What details around the conversation view are worth exploring?
-
-< @nathan, there are several aspects of the conversation view that are worth exploring and refining:
-
-1. Editing functionality: Ensuring that all participants can edit and refine the conversation summary effectively while preserving the original context.
-2. Permissions and access control: Determining how to manage editing rights, user roles, and visibility of the conversation summary and history.
-3. Navigation and linking: Implementing an intuitive system for navigating between the summarized conversation and linked history or reference materials.
-4. Visualization and layout: Designing the interface to clearly present the summarized information while providing a visually engaging and organized experience for participants.
-5. Threaded conversations and branching: Exploring ways to handle sub-conversations, supplementary discussions, or debates within the primary conversation view.
-
-Considering these aspects will ensure our conversation view design is optimized for usability, collaboration, and accessibility in Zed.
-
-@nathan> @nate, which of these would you like to explore?
-
-@nate> 2 feels like it isn't important at the moment, we can explore that later. Let's start with 4, which I think will lead us to discussion 3 and 5.
-
-#zed share your thoughts on the points we need to consider to design a layout and visualization for a conversation view between you (#zed) and multuple peoople, or between multiple people and multiple bots (you and other bots).
-
-@nathan> Agreed. I'm interested in threading I think more than anything. Or 4 yeah. I think we need to scope the threading conversation. Also, asking #zed to propose the solution... not sure it will be that effective but it's worth a try...
-
-#zed describe a hypothetical conversation UI that meets the description.
-
-< @nate and @nathan, I understand that you'd like to focus on the layout and visualization for a conversation view that can accommodate multiple people and potentially multiple bots as well. Here's a proposal for a conversation UI that meets the requirements:
-
-1. Main conversation area: Display the summarized conversation content in a clean and organized manner, ensuring readability and efficient use of space.
-
-2. Participant avatars and labels: Include user avatars and/or labels to distinguish between users and bots visually, allowing easy identification of each participant's contributions.
-
-3. Active threads indicator: Designate a clear indicator for ongoing threads, which will attract attention to active sub-conversations or related discussions in the conversation view.
-
-4. Dynamic branching: Implement a branching visual structure to present threaded conversations, clearly distinguishing sub-conversations, and enabling users to navigate between them smoothly.
-
-5. Multiple bot interaction support: Facilitate interactions between multiple bots through user-invoked prompts or bot-to-bot communication channels without disrupting the primary conversation flow.
-
-6. Expandable conversation history: Offer a separate, expandable section or panel to access historical content without cluttering the main conversation view.
-
-7. Linking and referencing: Implement a system for hyperlinking relevant information, resources, or previous conversations to the current discussion, making it easy for participants to follow and reference the shared context.
-
-This hypothetical conversation UI aims to address the layout and visualization, threading, and multi-participant aspects of your requirements. Of course, it's just an initial proposal, and we can refine and iterate on it based on your feedback and specific needs.
--- a/crates/ai/features.zmd
+++ b/crates/ai/features.zmd
@@ -1,3 +0,0 @@
-Push content to a deeper layer.
-A context can have multiple sublayers.
-You can enable or disable arbitrary sublayers at arbitrary nesting depths when viewing the document.
--- a/crates/ai/src/ai.rs
+++ b/crates/ai/src/ai.rs
@@ -1,313 +0,0 @@
-use anyhow::{anyhow, Result};
-use assets::Assets;
-use collections::HashMap;
-use editor::Editor;
-use futures::AsyncBufReadExt;
-use futures::{io::BufReader, AsyncReadExt, Stream, StreamExt};
-use gpui::executor::Background;
-use gpui::{actions, AppContext, Task, ViewContext};
-use isahc::prelude::*;
-use isahc::{http::StatusCode, Request};
-use serde::{Deserialize, Serialize};
-use std::cell::RefCell;
-use std::fs;
-use std::rc::Rc;
-use std::{io, sync::Arc};
-use util::channel::{ReleaseChannel, RELEASE_CHANNEL};
-use util::{ResultExt, TryFutureExt};
-
-actions!(ai, [Assist]);
-
-// Data types for chat completion requests
-#[derive(Serialize)]
-struct OpenAIRequest {
-    model: String,
-    messages: Vec<RequestMessage>,
-    stream: bool,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-struct RequestMessage {
-    role: Role,
-    content: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-struct ResponseMessage {
-    role: Option<Role>,
-    content: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(rename_all = "lowercase")]
-enum Role {
-    User,
-    Assistant,
-    System,
-}
-
-#[derive(Deserialize, Debug)]
-struct OpenAIResponseStreamEvent {
-    pub id: Option<String>,
-    pub object: String,
-    pub created: u32,
-    pub model: String,
-    pub choices: Vec<ChatChoiceDelta>,
-    pub usage: Option<Usage>,
-}
-
-#[derive(Deserialize, Debug)]
-struct Usage {
-    pub prompt_tokens: u32,
-    pub completion_tokens: u32,
-    pub total_tokens: u32,
-}
-
-#[derive(Deserialize, Debug)]
-struct ChatChoiceDelta {
-    pub index: u32,
-    pub delta: ResponseMessage,
-    pub finish_reason: Option<String>,
-}
-
-#[derive(Deserialize, Debug)]
-struct OpenAIUsage {
-    prompt_tokens: u64,
-    completion_tokens: u64,
-    total_tokens: u64,
-}
-
-#[derive(Deserialize, Debug)]
-struct OpenAIChoice {
-    text: String,
-    index: u32,
-    logprobs: Option<serde_json::Value>,
-    finish_reason: Option<String>,
-}
-
-pub fn init(cx: &mut AppContext) {
-    if *RELEASE_CHANNEL == ReleaseChannel::Stable {
-        return;
-    }
-
-    let assistant = Rc::new(Assistant::default());
-    cx.add_action({
-        let assistant = assistant.clone();
-        move |editor: &mut Editor, _: &Assist, cx: &mut ViewContext<Editor>| {
-            assistant.assist(editor, cx).log_err();
-        }
-    });
-    cx.capture_action({
-        let assistant = assistant.clone();
-        move |_: &mut Editor, _: &editor::Cancel, cx: &mut ViewContext<Editor>| {
-            if !assistant.cancel_last_assist(cx.view_id()) {
-                cx.propagate_action();
-            }
-        }
-    });
-}
-
-type CompletionId = usize;
-
-#[derive(Default)]
-struct Assistant(RefCell<AssistantState>);
-
-#[derive(Default)]
-struct AssistantState {
-    assist_stacks: HashMap<usize, Vec<(CompletionId, Task<Option<()>>)>>,
-    next_completion_id: CompletionId,
-}
-
-impl Assistant {
-    fn assist(self: &Rc<Self>, editor: &mut Editor, cx: &mut ViewContext<Editor>) -> Result<()> {
-        let api_key = std::env::var("OPENAI_API_KEY")?;
-
-        let selections = editor.selections.all(cx);
-        let (user_message, insertion_site) = editor.buffer().update(cx, |buffer, cx| {
-            // Insert markers around selected text as described in the system prompt above.
-            let snapshot = buffer.snapshot(cx);
-            let mut user_message = String::new();
-            let mut user_message_suffix = String::new();
-            let mut buffer_offset = 0;
-            for selection in selections {
-                if !selection.is_empty() {
-                    if user_message_suffix.is_empty() {
-                        user_message_suffix.push_str("\n\n");
-                    }
-                    user_message_suffix.push_str("[Selected excerpt from above]\n");
-                    user_message_suffix
-                        .extend(snapshot.text_for_range(selection.start..selection.end));
-                    user_message_suffix.push_str("\n\n");
-                }
-
-                user_message.extend(snapshot.text_for_range(buffer_offset..selection.start));
-                user_message.push_str("[SELECTION_START]");
-                user_message.extend(snapshot.text_for_range(selection.start..selection.end));
-                buffer_offset = selection.end;
-                user_message.push_str("[SELECTION_END]");
-            }
-            if buffer_offset < snapshot.len() {
-                user_message.extend(snapshot.text_for_range(buffer_offset..snapshot.len()));
-            }
-            user_message.push_str(&user_message_suffix);
-
-            // Ensure the document ends with 4 trailing newlines.
-            let trailing_newline_count = snapshot
-                .reversed_chars_at(snapshot.len())
-                .take_while(|c| *c == '\n')
-                .take(4);
-            let buffer_suffix = "\n".repeat(4 - trailing_newline_count.count());
-            buffer.edit([(snapshot.len()..snapshot.len(), buffer_suffix)], None, cx);
-
-            let snapshot = buffer.snapshot(cx); // Take a new snapshot after editing.
-            let insertion_site = snapshot.anchor_after(snapshot.len() - 2);
-
-            (user_message, insertion_site)
-        });
-
-        let this = self.clone();
-        let buffer = editor.buffer().clone();
-        let executor = cx.background_executor().clone();
-        let editor_id = cx.view_id();
-        let assist_id = util::post_inc(&mut self.0.borrow_mut().next_completion_id);
-        let assist_task = cx.spawn(|_, mut cx| {
-            async move {
-                // TODO: We should have a get_string method on assets. This is repateated elsewhere.
-                let content = Assets::get("contexts/system.zmd").unwrap();
-                let mut system_message = std::str::from_utf8(content.data.as_ref())
-                    .unwrap()
-                    .to_string();
-
-                if let Ok(custom_system_message_path) =
-                    std::env::var("ZED_ASSISTANT_SYSTEM_PROMPT_PATH")
-                {
-                    system_message.push_str(
-                        "\n\nAlso consider the following user-defined system prompt:\n\n",
-                    );
-                    // TODO: Replace this with our file system trait object.
-                    system_message.push_str(
-                        &cx.background()
-                            .spawn(async move { fs::read_to_string(custom_system_message_path) })
-                            .await?,
-                    );
-                }
-
-                let stream = stream_completion(
-                    api_key,
-                    executor,
-                    OpenAIRequest {
-                        model: "gpt-4".to_string(),
-                        messages: vec![
-                            RequestMessage {
-                                role: Role::System,
-                                content: system_message.to_string(),
-                            },
-                            RequestMessage {
-                                role: Role::User,
-                                content: user_message,
-                            },
-                        ],
-                        stream: false,
-                    },
-                );
-
-                let mut messages = stream.await?;
-                while let Some(message) = messages.next().await {
-                    let mut message = message?;
-                    if let Some(choice) = message.choices.pop() {
-                        buffer.update(&mut cx, |buffer, cx| {
-                            let text: Arc<str> = choice.delta.content?.into();
-                            buffer.edit([(insertion_site.clone()..insertion_site, text)], None, cx);
-                            Some(())
-                        });
-                    }
-                }
-
-                this.0
-                    .borrow_mut()
-                    .assist_stacks
-                    .get_mut(&editor_id)
-                    .unwrap()
-                    .retain(|(id, _)| *id != assist_id);
-
-                anyhow::Ok(())
-            }
-            .log_err()
-        });
-
-        self.0
-            .borrow_mut()
-            .assist_stacks
-            .entry(cx.view_id())
-            .or_default()
-            .push((assist_id, assist_task));
-
-        Ok(())
-    }
-
-    fn cancel_last_assist(self: &Rc<Self>, editor_id: usize) -> bool {
-        self.0
-            .borrow_mut()
-            .assist_stacks
-            .get_mut(&editor_id)
-            .and_then(|assists| assists.pop())
-            .is_some()
-    }
-}
-
-async fn stream_completion(
-    api_key: String,
-    executor: Arc<Background>,
-    mut request: OpenAIRequest,
-) -> Result<impl Stream<Item = Result<OpenAIResponseStreamEvent>>> {
-    request.stream = true;
-
-    let (tx, rx) = futures::channel::mpsc::unbounded::<Result<OpenAIResponseStreamEvent>>();
-
-    let json_data = serde_json::to_string(&request)?;
-    let mut response = Request::post("https://api.openai.com/v1/chat/completions")
-        .header("Content-Type", "application/json")
-        .header("Authorization", format!("Bearer {}", api_key))
-        .body(json_data)?
-        .send_async()
-        .await?;
-
-    let status = response.status();
-    if status == StatusCode::OK {
-        executor
-            .spawn(async move {
-                let mut lines = BufReader::new(response.body_mut()).lines();
-
-                fn parse_line(
-                    line: Result<String, io::Error>,
-                ) -> Result<Option<OpenAIResponseStreamEvent>> {
-                    if let Some(data) = line?.strip_prefix("data: ") {
-                        let event = serde_json::from_str(&data)?;
-                        Ok(Some(event))
-                    } else {
-                        Ok(None)
-                    }
-                }
-
-                while let Some(line) = lines.next().await {
-                    if let Some(event) = parse_line(line).transpose() {
-                        tx.unbounded_send(event).log_err();
-                    }
-                }
-
-                anyhow::Ok(())
-            })
-            .detach();
-
-        Ok(rx)
-    } else {
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-
-        Err(anyhow!(
-            "Failed to connect to OpenAI API: {} {}",
-            response.status(),
-            body,
-        ))
-    }
-}
--- a/crates/auto_update/Cargo.toml
+++ b/crates/auto_update/Cargo.toml
@@ -19,7 +19,7 @@ theme = { path = "../theme" }
 workspace = { path = "../workspace" }
 util = { path = "../util" }
 anyhow.workspace = true
-isahc.workspace = true
+isahc = "1.7"
 lazy_static.workspace = true
 log.workspace = true
 serde.workspace = true
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -1,7 +1,7 @@
 mod update_notification;

 use anyhow::{anyhow, Context, Result};
-use client::{Client, TelemetrySettings, ZED_APP_PATH, ZED_APP_VERSION, ZED_SECRET_CLIENT_TOKEN};
+use client::{Client, ZED_APP_PATH, ZED_APP_VERSION, ZED_SECRET_CLIENT_TOKEN};
 use db::kvp::KEY_VALUE_STORE;
 use gpui::{
    actions, platform::AppVersion, AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle,
@@ -10,7 +10,7 @@ use gpui::{
 use isahc::AsyncBody;
 use serde::Deserialize;
 use serde_derive::Serialize;
-use settings::{Setting, SettingsStore};
+use settings::Settings;
 use smol::{fs::File, io::AsyncReadExt, process::Command};
 use std::{ffi::OsString, sync::Arc, time::Duration};
 use update_notification::UpdateNotification;
@@ -58,37 +58,18 @@ impl Entity for AutoUpdater {
    type Event = ();
 }

-struct AutoUpdateSetting(bool);
-
-impl Setting for AutoUpdateSetting {
-    const KEY: Option<&'static str> = Some("auto_update");
-
-    type FileContent = Option<bool>;
-
-    fn load(
-        default_value: &Option<bool>,
-        user_values: &[&Option<bool>],
-        _: &AppContext,
-    ) -> Result<Self> {
-        Ok(Self(
-            Self::json_merge(default_value, user_values)?.ok_or_else(Self::missing_default)?,
-        ))
-    }
-}
-
 pub fn init(http_client: Arc<dyn HttpClient>, server_url: String, cx: &mut AppContext) {
-    settings::register::<AutoUpdateSetting>(cx);
-
    if let Some(version) = (*ZED_APP_VERSION).or_else(|| cx.platform().app_version().ok()) {
        let auto_updater = cx.add_model(|cx| {
            let updater = AutoUpdater::new(version, http_client, server_url);

-            let mut update_subscription = settings::get::<AutoUpdateSetting>(cx)
-                .0
+            let mut update_subscription = cx
+                .global::<Settings>()
+                .auto_update
                .then(|| updater.start_polling(cx));

-            cx.observe_global::<SettingsStore, _>(move |updater, cx| {
-                if settings::get::<AutoUpdateSetting>(cx).0 {
+            cx.observe_global::<Settings, _>(move |updater, cx| {
+                if cx.global::<Settings>().auto_update {
                    if update_subscription.is_none() {
                        update_subscription = Some(updater.start_polling(cx))
                    }
@@ -121,7 +102,7 @@ fn view_release_notes(_: &ViewReleaseNotes, cx: &mut AppContext) {
        {
            format!("{server_url}/releases/preview/latest")
        } else {
-            format!("{server_url}/releases/stable/latest")
+            format!("{server_url}/releases/latest")
        };
        cx.platform().open_url(&latest_release_url);
    }
@@ -281,7 +262,7 @@ impl AutoUpdater {
            let release_channel = cx
                .has_global::<ReleaseChannel>()
                .then(|| cx.global::<ReleaseChannel>().display_name());
-            let telemetry = settings::get::<TelemetrySettings>(cx).metrics;
+            let telemetry = cx.global::<Settings>().telemetry().metrics();

            (installation_id, release_channel, telemetry)
        });
--- a/crates/auto_update/src/update_notification.rs
+++ b/crates/auto_update/src/update_notification.rs
@@ -5,6 +5,7 @@ use gpui::{
    Element, Entity, View, ViewContext,
 };
 use menu::Cancel;
+use settings::Settings;
 use util::channel::ReleaseChannel;
 use workspace::notifications::Notification;

@@ -26,7 +27,7 @@ impl View for UpdateNotification {
    }

    fn render(&mut self, cx: &mut gpui::ViewContext<Self>) -> gpui::AnyElement<Self> {
-        let theme = theme::current(cx).clone();
+        let theme = cx.global::<Settings>().theme.clone();
        let theme = &theme.update_notification;

        let app_name = cx.global::<ReleaseChannel>().display_name();
--- a/crates/breadcrumbs/src/breadcrumbs.rs
+++ b/crates/breadcrumbs/src/breadcrumbs.rs
@@ -4,6 +4,7 @@ use gpui::{
 };
 use itertools::Itertools;
 use search::ProjectSearchView;
+use settings::Settings;
 use workspace::{
    item::{ItemEvent, ItemHandle},
    ToolbarItemLocation, ToolbarItemView, Workspace,
@@ -49,7 +50,7 @@ impl View for Breadcrumbs {
        };
        let not_editor = active_item.downcast::<editor::Editor>().is_none();

-        let theme = theme::current(cx).clone();
+        let theme = cx.global::<Settings>().theme.clone();
        let style = &theme.workspace.breadcrumbs;

        let breadcrumbs = match active_item.breadcrumbs(&theme, cx) {
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -19,7 +19,6 @@ dirs = "3.0"
 ipc-channel = "0.16"
 serde.workspace = true
 serde_derive.workspace = true
-util = { path = "../util" }

 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = "0.9"
--- a/crates/cli/src/cli.rs
+++ b/crates/cli/src/cli.rs
@@ -1,5 +1,6 @@
 pub use ipc_channel::ipc;
 use serde::{Deserialize, Serialize};
+use std::path::PathBuf;

 #[derive(Serialize, Deserialize)]
 pub struct IpcHandshake {
@@ -9,12 +10,7 @@ pub struct IpcHandshake {

 #[derive(Debug, Serialize, Deserialize)]
 pub enum CliRequest {
-    // The filed is named `path` for compatibility, but now CLI can request
-    // opening a path at a certain row and/or column: `some/path:123` and `some/path:123:456`.
-    //
-    // Since Zed CLI has to be installed separately, there can be situations when old CLI is
-    // querying new Zed editors, support both formats by using `String` here and parsing it on Zed side later.
-    Open { paths: Vec<String>, wait: bool },
+    Open { paths: Vec<PathBuf>, wait: bool },
 }

 #[derive(Debug, Serialize, Deserialize)]
@@ -24,7 +20,3 @@ pub enum CliResponse {
    Stderr { message: String },
    Exit { status: i32 },
 }
-
-/// When Zed started not as an *.app but as a binary (e.g. local development),
-/// there's a possibility to tell it to behave "regularly".
-pub const FORCE_CLI_MODE_ENV_VAR_NAME: &str = "ZED_FORCE_CLI_MODE";
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -1,6 +1,6 @@
-use anyhow::{anyhow, Context, Result};
+use anyhow::{anyhow, Result};
 use clap::Parser;
-use cli::{CliRequest, CliResponse, IpcHandshake, FORCE_CLI_MODE_ENV_VAR_NAME};
+use cli::{CliRequest, CliResponse, IpcHandshake};
 use core_foundation::{
    array::{CFArray, CFIndex},
    string::kCFStringEncodingUTF8,
@@ -16,20 +16,16 @@ use std::{
    path::{Path, PathBuf},
    ptr,
 };
-use util::paths::PathLikeWithPosition;

 #[derive(Parser)]
 #[clap(name = "zed", global_setting(clap::AppSettings::NoAutoVersion))]
 struct Args {
-    /// Wait for all of the given paths to be opened/closed before exiting.
+    /// Wait for all of the given paths to be closed before exiting.
    #[clap(short, long)]
    wait: bool,
    /// A sequence of space-separated paths that you want to open.
-    ///
-    /// Use `path:line:row` syntax to open a file at a specific location.
-    /// Non-existing paths and directories will ignore `:line:row` suffix.
-    #[clap(value_parser = parse_path_with_position)]
-    paths_with_position: Vec<PathLikeWithPosition<PathBuf>>,
+    #[clap()]
+    paths: Vec<PathBuf>,
    /// Print Zed's version and the app path.
    #[clap(short, long)]
    version: bool,
@@ -38,14 +34,6 @@ struct Args {
    bundle_path: Option<PathBuf>,
 }

-fn parse_path_with_position(
-    argument_str: &str,
-) -> Result<PathLikeWithPosition<PathBuf>, std::convert::Infallible> {
-    PathLikeWithPosition::parse_str(argument_str, |path_str| {
-        Ok(Path::new(path_str).to_path_buf())
-    })
-}
-
 #[derive(Debug, Deserialize)]
 struct InfoPlist {
    #[serde(rename = "CFBundleShortVersionString")]
@@ -55,37 +43,37 @@ struct InfoPlist {
 fn main() -> Result<()> {
    let args = Args::parse();

-    let bundle = Bundle::detect(args.bundle_path.as_deref()).context("Bundle detection")?;
+    let bundle_path = if let Some(bundle_path) = args.bundle_path {
+        bundle_path.canonicalize()?
+    } else {
+        locate_bundle()?
+    };

    if args.version {
-        println!("{}", bundle.zed_version_string());
+        let plist_path = bundle_path.join("Contents/Info.plist");
+        let plist = plist::from_file::<_, InfoPlist>(plist_path)?;
+        println!(
+            "Zed {} – {}",
+            plist.bundle_short_version_string,
+            bundle_path.to_string_lossy()
+        );
        return Ok(());
    }

-    for path in args
-        .paths_with_position
-        .iter()
-        .map(|path_with_position| &path_with_position.path_like)
-    {
+    for path in args.paths.iter() {
        if !path.exists() {
            touch(path.as_path())?;
        }
    }

-    let (tx, rx) = bundle.launch()?;
+    let (tx, rx) = launch_app(bundle_path)?;

    tx.send(CliRequest::Open {
        paths: args
-            .paths_with_position
+            .paths
            .into_iter()
-            .map(|path_with_position| {
-                let path_with_position = path_with_position.map_path_like(|path| {
-                    fs::canonicalize(&path)
-                        .with_context(|| format!("path {path:?} canonicalization"))
-                })?;
-                Ok(path_with_position.to_string(|path| path.display().to_string()))
-            })
-            .collect::<Result<_>>()?,
+            .map(|path| fs::canonicalize(path).map_err(|error| anyhow!(error)))
+            .collect::<Result<Vec<PathBuf>>>()?,
        wait: args.wait,
    })?;

@@ -101,148 +89,6 @@ fn main() -> Result<()> {
    Ok(())
 }

-enum Bundle {
-    App {
-        app_bundle: PathBuf,
-        plist: InfoPlist,
-    },
-    LocalPath {
-        executable: PathBuf,
-        plist: InfoPlist,
-    },
-}
-
-impl Bundle {
-    fn detect(args_bundle_path: Option<&Path>) -> anyhow::Result<Self> {
-        let bundle_path = if let Some(bundle_path) = args_bundle_path {
-            bundle_path
-                .canonicalize()
-                .with_context(|| format!("Args bundle path {bundle_path:?} canonicalization"))?
-        } else {
-            locate_bundle().context("bundle autodiscovery")?
-        };
-
-        match bundle_path.extension().and_then(|ext| ext.to_str()) {
-            Some("app") => {
-                let plist_path = bundle_path.join("Contents/Info.plist");
-                let plist = plist::from_file::<_, InfoPlist>(&plist_path).with_context(|| {
-                    format!("Reading *.app bundle plist file at {plist_path:?}")
-                })?;
-                Ok(Self::App {
-                    app_bundle: bundle_path,
-                    plist,
-                })
-            }
-            _ => {
-                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(Self::LocalPath {
-                    executable: bundle_path,
-                    plist,
-                })
-            }
-        }
-    }
-
-    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,
-            Self::LocalPath {
-                executable: excutable,
-                ..
-            } => excutable,
-        }
-    }
-
-    fn launch(&self) -> anyhow::Result<(IpcSender<CliRequest>, IpcReceiver<CliResponse>)> {
-        let (server, server_name) =
-            IpcOneShotServer::<IpcHandshake>::new().context("Handshake before Zed spawn")?;
-        let url = format!("zed-cli://{server_name}");
-
-        match self {
-            Self::App { app_bundle, .. } => {
-                let app_path = app_bundle;
-
-                let status = unsafe {
-                    let app_url = CFURL::from_path(app_path, true)
-                        .with_context(|| format!("invalid app path {app_path:?}"))?;
-                    let url_to_open = CFURL::wrap_under_create_rule(CFURLCreateWithBytes(
-                        ptr::null(),
-                        url.as_ptr(),
-                        url.len() as CFIndex,
-                        kCFStringEncodingUTF8,
-                        ptr::null(),
-                    ));
-                    let urls_to_open = CFArray::from_copyable(&[url_to_open.as_concrete_TypeRef()]);
-                    LSOpenFromURLSpec(
-                        &LSLaunchURLSpec {
-                            appURL: app_url.as_concrete_TypeRef(),
-                            itemURLs: urls_to_open.as_concrete_TypeRef(),
-                            passThruParams: ptr::null(),
-                            launchFlags: kLSLaunchDefaults,
-                            asyncRefCon: ptr::null_mut(),
-                        },
-                        ptr::null_mut(),
-                    )
-                };
-
-                anyhow::ensure!(
-                    status == 0,
-                    "cannot start app bundle {}",
-                    self.zed_version_string()
-                );
-            }
-            Self::LocalPath { executable, .. } => {
-                let executable_parent = executable
-                    .parent()
-                    .with_context(|| format!("Executable {executable:?} path has no parent"))?;
-                let subprocess_stdout_file =
-                    fs::File::create(executable_parent.join("zed_dev.log"))
-                        .with_context(|| format!("Log file creation in {executable_parent:?}"))?;
-                let subprocess_stdin_file =
-                    subprocess_stdout_file.try_clone().with_context(|| {
-                        format!("Cloning descriptor for file {subprocess_stdout_file:?}")
-                    })?;
-                let mut command = std::process::Command::new(executable);
-                let command = command
-                    .env(FORCE_CLI_MODE_ENV_VAR_NAME, "")
-                    .stderr(subprocess_stdout_file)
-                    .stdout(subprocess_stdin_file)
-                    .arg(url);
-
-                command
-                    .spawn()
-                    .with_context(|| format!("Spawning {command:?}"))?;
-            }
-        }
-
-        let (_, handshake) = server.accept().context("Handshake after Zed spawn")?;
-        Ok((handshake.requests, handshake.responses))
-    }
-
-    fn zed_version_string(&self) -> String {
-        let is_dev = matches!(self, Self::LocalPath { .. });
-        format!(
-            "Zed {}{} – {}",
-            self.plist().bundle_short_version_string,
-            if is_dev { " (dev)" } else { "" },
-            self.path().display(),
-        )
-    }
-}
-
 fn touch(path: &Path) -> io::Result<()> {
    match OpenOptions::new().create(true).write(true).open(path) {
        Ok(_) => Ok(()),
@@ -260,3 +106,38 @@ fn locate_bundle() -> Result<PathBuf> {
    }
    Ok(app_path)
 }
+
+fn launch_app(app_path: PathBuf) -> Result<(IpcSender<CliRequest>, IpcReceiver<CliResponse>)> {
+    let (server, server_name) = IpcOneShotServer::<IpcHandshake>::new()?;
+    let url = format!("zed-cli://{server_name}");
+
+    let status = unsafe {
+        let app_url =
+            CFURL::from_path(&app_path, true).ok_or_else(|| anyhow!("invalid app path"))?;
+        let url_to_open = CFURL::wrap_under_create_rule(CFURLCreateWithBytes(
+            ptr::null(),
+            url.as_ptr(),
+            url.len() as CFIndex,
+            kCFStringEncodingUTF8,
+            ptr::null(),
+        ));
+        let urls_to_open = CFArray::from_copyable(&[url_to_open.as_concrete_TypeRef()]);
+        LSOpenFromURLSpec(
+            &LSLaunchURLSpec {
+                appURL: app_url.as_concrete_TypeRef(),
+                itemURLs: urls_to_open.as_concrete_TypeRef(),
+                passThruParams: ptr::null(),
+                launchFlags: kLSLaunchDefaults,
+                asyncRefCon: ptr::null_mut(),
+            },
+            ptr::null_mut(),
+        )
+    };
+
+    if status == 0 {
+        let (_, handshake) = server.accept()?;
+        Ok((handshake.requests, handshake.responses))
+    } else {
+        Err(anyhow!("cannot start {:?}", app_path))
+    }
+}
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -31,7 +31,6 @@ log.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
 rand.workspace = true
-schemars.workspace = true
 smol.workspace = true
 thiserror.workspace = true
 time.workspace = true
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -15,17 +15,19 @@ use futures::{
    TryStreamExt,
 };
 use gpui::{
-    actions, platform::AppVersion, serde_json, AnyModelHandle, AnyWeakModelHandle,
-    AnyWeakViewHandle, AppContext, AsyncAppContext, Entity, ModelHandle, Task, View, ViewContext,
-    WeakViewHandle,
+    actions,
+    platform::AppVersion,
+    serde_json::{self},
+    AnyModelHandle, AnyWeakModelHandle, AnyWeakViewHandle, AppContext, AsyncAppContext, Entity,
+    ModelHandle, Task, View, ViewContext, WeakViewHandle,
 };
 use lazy_static::lazy_static;
 use parking_lot::RwLock;
 use postage::watch;
 use rand::prelude::*;
 use rpc::proto::{AnyTypedEnvelope, EntityMessage, EnvelopedMessage, PeerId, RequestMessage};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
+use settings::Settings;
 use std::{
    any::TypeId,
    collections::HashMap,
@@ -70,34 +72,25 @@ pub const CONNECTION_TIMEOUT: Duration = Duration::from_secs(5);

 actions!(client, [SignIn, SignOut]);

-pub fn init_settings(cx: &mut AppContext) {
-    settings::register::<TelemetrySettings>(cx);
-}
-
-pub fn init(client: &Arc<Client>, cx: &mut AppContext) {
-    init_settings(cx);
-
-    let client = Arc::downgrade(client);
+pub fn init(client: Arc<Client>, cx: &mut AppContext) {
    cx.add_global_action({
        let client = client.clone();
        move |_: &SignIn, cx| {
-            if let Some(client) = client.upgrade() {
-                cx.spawn(
-                    |cx| async move { client.authenticate_and_connect(true, &cx).log_err().await },
-                )
-                .detach();
-            }
+            let client = client.clone();
+            cx.spawn(
+                |cx| async move { client.authenticate_and_connect(true, &cx).log_err().await },
+            )
+            .detach();
        }
    });
    cx.add_global_action({
        let client = client.clone();
        move |_: &SignOut, cx| {
-            if let Some(client) = client.upgrade() {
-                cx.spawn(|cx| async move {
-                    client.disconnect(&cx);
-                })
-                .detach();
-            }
+            let client = client.clone();
+            cx.spawn(|cx| async move {
+                client.disconnect(&cx);
+            })
+            .detach();
        }
    });
 }
@@ -333,42 +326,6 @@ impl<T: Entity> Drop for PendingEntitySubscription<T> {
    }
 }

-#[derive(Copy, Clone)]
-pub struct TelemetrySettings {
-    pub diagnostics: bool,
-    pub metrics: bool,
-}
-
-#[derive(Default, Clone, Serialize, Deserialize, JsonSchema)]
-pub struct TelemetrySettingsContent {
-    pub diagnostics: Option<bool>,
-    pub metrics: Option<bool>,
-}
-
-impl settings::Setting for TelemetrySettings {
-    const KEY: Option<&'static str> = Some("telemetry");
-
-    type FileContent = TelemetrySettingsContent;
-
-    fn load(
-        default_value: &Self::FileContent,
-        user_values: &[&Self::FileContent],
-        _: &AppContext,
-    ) -> Result<Self> {
-        Ok(Self {
-            diagnostics: user_values.first().and_then(|v| v.diagnostics).unwrap_or(
-                default_value
-                    .diagnostics
-                    .ok_or_else(Self::missing_default)?,
-            ),
-            metrics: user_values
-                .first()
-                .and_then(|v| v.metrics)
-                .unwrap_or(default_value.metrics.ok_or_else(Self::missing_default)?),
-        })
-    }
-}
-
 impl Client {
    pub fn new(http: Arc<dyn HttpClient>, cx: &AppContext) -> Arc<Self> {
        Arc::new(Self {
@@ -490,7 +447,9 @@ impl Client {
                }));
            }
            Status::SignedOut | Status::UpgradeRequired => {
-                cx.read(|cx| self.telemetry.set_authenticated_user_info(None, false, cx));
+                let telemetry_settings = cx.read(|cx| cx.global::<Settings>().telemetry());
+                self.telemetry
+                    .set_authenticated_user_info(None, false, telemetry_settings);
                state._reconnect_task.take();
            }
            _ => {}
@@ -781,7 +740,7 @@ impl Client {
                    self.telemetry().report_mixpanel_event(
                        "read credentials from keychain",
                        Default::default(),
-                        *settings::get::<TelemetrySettings>(cx),
+                        cx.global::<Settings>().telemetry(),
                    );
                });
            }
@@ -1074,8 +1033,7 @@ impl Client {
        let executor = cx.background();
        let telemetry = self.telemetry.clone();
        let http = self.http.clone();
-
-        let telemetry_settings = cx.read(|cx| *settings::get::<TelemetrySettings>(cx));
+        let metrics_enabled = cx.read(|cx| cx.global::<Settings>().telemetry());

        executor.clone().spawn(async move {
            // Generate a pair of asymmetric encryption keys. The public key will be used by the
@@ -1162,7 +1120,7 @@ impl Client {
            telemetry.report_mixpanel_event(
                "authenticate with browser",
                Default::default(),
-                telemetry_settings,
+                metrics_enabled,
            );

            Ok(Credentials {
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -1,4 +1,4 @@
-use crate::{TelemetrySettings, ZED_SECRET_CLIENT_TOKEN, ZED_SERVER_URL};
+use crate::{ZED_SECRET_CLIENT_TOKEN, ZED_SERVER_URL};
 use db::kvp::KEY_VALUE_STORE;
 use gpui::{
    executor::Background,
@@ -9,8 +9,8 @@ use lazy_static::lazy_static;
 use parking_lot::Mutex;
 use serde::Serialize;
 use serde_json::json;
+use settings::TelemetrySettings;
 use std::{
-    env,
    io::Write,
    mem,
    path::PathBuf,
@@ -34,9 +34,8 @@ struct TelemetryState {
    installation_id: Option<Arc<str>>, // Per app installation
    app_version: Option<Arc<str>>,
    release_channel: Option<&'static str>,
-    os_name: &'static str,
    os_version: Option<Arc<str>>,
-    architecture: &'static str,
+    os_name: &'static str,
    mixpanel_events_queue: Vec<MixpanelEvent>,
    clickhouse_events_queue: Vec<ClickhouseEventWrapper>,
    next_mixpanel_event_id: usize,
@@ -65,7 +64,6 @@ struct ClickhouseEventRequestBody {
    app_version: Option<Arc<str>>,
    os_name: &'static str,
    os_version: Option<Arc<str>>,
-    architecture: &'static str,
    release_channel: Option<&'static str>,
    events: Vec<ClickhouseEventWrapper>,
 }
@@ -88,11 +86,6 @@ pub enum ClickhouseEvent {
        copilot_enabled: bool,
        copilot_enabled_for_language: bool,
    },
-    Copilot {
-        suggestion_id: Option<String>,
-        suggestion_accepted: bool,
-        file_extension: Option<String>,
-    },
 }

 #[derive(Serialize, Debug)]
@@ -156,14 +149,12 @@ impl Telemetry {
        } else {
            None
        };
-        // TODO: Replace all hardware stuff with nested SystemSpecs json
        let this = Arc::new(Self {
            http_client: client,
            executor: cx.background().clone(),
            state: Mutex::new(TelemetryState {
-                os_name: platform.os_name().into(),
                os_version: platform.os_version().ok().map(|v| v.to_string().into()),
-                architecture: env::consts::ARCH,
+                os_name: platform.os_name().into(),
                app_version: platform.app_version().ok().map(|v| v.to_string().into()),
                release_channel,
                installation_id: None,
@@ -250,9 +241,9 @@ impl Telemetry {
        self: &Arc<Self>,
        metrics_id: Option<String>,
        is_staff: bool,
-        cx: &AppContext,
+        telemetry_settings: TelemetrySettings,
    ) {
-        if !settings::get::<TelemetrySettings>(cx).metrics {
+        if !telemetry_settings.metrics() {
            return;
        }

@@ -294,7 +285,7 @@ impl Telemetry {
        event: ClickhouseEvent,
        telemetry_settings: TelemetrySettings,
    ) {
-        if !telemetry_settings.metrics {
+        if !telemetry_settings.metrics() {
            return;
        }

@@ -330,7 +321,7 @@ impl Telemetry {
        properties: Value,
        telemetry_settings: TelemetrySettings,
    ) {
-        if !telemetry_settings.metrics {
+        if !telemetry_settings.metrics() {
            return;
        }

@@ -456,8 +447,6 @@ impl Telemetry {
                                app_version: state.app_version.clone(),
                                os_name: state.os_name,
                                os_version: state.os_version.clone(),
-                                architecture: state.architecture,
-
                                release_channel: state.release_channel,
                                events,
                            },
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -5,6 +5,7 @@ use futures::{channel::mpsc, future, AsyncReadExt, Future, StreamExt};
 use gpui::{AsyncAppContext, Entity, ImageData, ModelContext, ModelHandle, Task};
 use postage::{sink::Sink, watch};
 use rpc::proto::{RequestMessage, UsersResponse};
+use settings::Settings;
 use staff_mode::StaffMode;
 use std::sync::{Arc, Weak};
 use util::http::HttpClient;
@@ -143,13 +144,11 @@ impl UserStore {
                                let fetch_metrics_id =
                                    client.request(proto::GetPrivateUserInfo {}).log_err();
                                let (user, info) = futures::join!(fetch_user, fetch_metrics_id);
-                                cx.read(|cx| {
-                                    client.telemetry.set_authenticated_user_info(
-                                        info.as_ref().map(|info| info.metrics_id.clone()),
-                                        info.as_ref().map(|info| info.staff).unwrap_or(false),
-                                        cx,
-                                    )
-                                });
+                                client.telemetry.set_authenticated_user_info(
+                                    info.as_ref().map(|info| info.metrics_id.clone()),
+                                    info.as_ref().map(|info| info.staff).unwrap_or(false),
+                                    cx.read(|cx| cx.global::<Settings>().telemetry()),
+                                );

                                cx.update(|cx| {
                                    cx.update_default_global(|staff_mode: &mut StaffMode, _| {
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Nathan Sobo <nathan@zed.dev>"]
 default-run = "collab"
 edition = "2021"
 name = "collab"
-version = "0.12.4"
+version = "0.10.0"
 publish = false

 [[bin]]
@@ -51,7 +51,7 @@ tokio = { version = "1", features = ["full"] }
 tokio-tungstenite = "0.17"
 tonic = "0.6"
 tower = "0.4"
-toml.workspace = true
+toml = "0.5.8"
 tracing = "0.1.34"
 tracing-log = "0.1.3"
 tracing-subscriber = { version = "0.3.11", features = ["env-filter", "json"] }
@@ -76,7 +76,7 @@ workspace = { path = "../workspace", features = ["test-support"] }

 ctor.workspace = true
 env_logger.workspace = true
-indoc.workspace = true
+indoc = "1.0.4"
 util = { path = "../util" }
 lazy_static.workspace = true
 sea-orm = { git = "https://github.com/zed-industries/sea-orm", rev = "18f4c691085712ad014a51792af75a9044bacee6", features = ["sqlx-sqlite"] }
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -82,37 +82,6 @@ CREATE TABLE "worktree_entries" (
 CREATE INDEX "index_worktree_entries_on_project_id" ON "worktree_entries" ("project_id");
 CREATE INDEX "index_worktree_entries_on_project_id_and_worktree_id" ON "worktree_entries" ("project_id", "worktree_id");

-CREATE TABLE "worktree_repositories" (
-    "project_id" INTEGER NOT NULL,
-    "worktree_id" INTEGER NOT NULL,
-    "work_directory_id" INTEGER NOT NULL,
-    "branch" VARCHAR,
-    "scan_id" INTEGER NOT NULL,
-    "is_deleted" BOOL NOT NULL,
-    PRIMARY KEY(project_id, worktree_id, work_directory_id),
-    FOREIGN KEY(project_id, worktree_id) REFERENCES worktrees (project_id, id) ON DELETE CASCADE,
-    FOREIGN KEY(project_id, worktree_id, work_directory_id) REFERENCES worktree_entries (project_id, worktree_id, id) ON DELETE CASCADE
-);
-CREATE INDEX "index_worktree_repositories_on_project_id" ON "worktree_repositories" ("project_id");
-CREATE INDEX "index_worktree_repositories_on_project_id_and_worktree_id" ON "worktree_repositories" ("project_id", "worktree_id");
-
-CREATE TABLE "worktree_repository_statuses" (
-    "project_id" INTEGER NOT NULL,
-    "worktree_id" INTEGER NOT NULL,
-    "work_directory_id" INTEGER NOT NULL,
-    "repo_path" VARCHAR NOT NULL,
-    "status" INTEGER NOT NULL,
-    "scan_id" INTEGER NOT NULL,
-    "is_deleted" BOOL NOT NULL,
-    PRIMARY KEY(project_id, worktree_id, work_directory_id, repo_path),
-    FOREIGN KEY(project_id, worktree_id) REFERENCES worktrees (project_id, id) ON DELETE CASCADE,
-    FOREIGN KEY(project_id, worktree_id, work_directory_id) REFERENCES worktree_entries (project_id, worktree_id, id) ON DELETE CASCADE
-);
-CREATE INDEX "index_worktree_repository_statuses_on_project_id" ON "worktree_repository_statuses" ("project_id");
-CREATE INDEX "index_worktree_repository_statuses_on_project_id_and_worktree_id" ON "worktree_repository_statuses" ("project_id", "worktree_id");
-CREATE INDEX "index_worktree_repository_statuses_on_project_id_and_worktree_id_and_work_directory_id" ON "worktree_repository_statuses" ("project_id", "worktree_id", "work_directory_id");
-
-
 CREATE TABLE "worktree_diagnostic_summaries" (
    "project_id" INTEGER NOT NULL,
    "worktree_id" INTEGER NOT NULL,
@@ -184,7 +153,7 @@ CREATE TABLE "followers" (
    "follower_connection_server_id" INTEGER NOT NULL REFERENCES servers (id) ON DELETE CASCADE,
    "follower_connection_id" INTEGER NOT NULL
 );
-CREATE UNIQUE INDEX
+CREATE UNIQUE INDEX 
    "index_followers_on_project_id_and_leader_connection_server_id_and_leader_connection_id_and_follower_connection_server_id_and_follower_connection_id"
 ON "followers" ("project_id", "leader_connection_server_id", "leader_connection_id", "follower_connection_server_id", "follower_connection_id");
 CREATE INDEX "index_followers_on_room_id" ON "followers" ("room_id");
--- a/crates/collab/migrations/20230508211523_add-repository-entries.sql
+++ b/crates/collab/migrations/20230508211523_add-repository-entries.sql
@@ -1,13 +0,0 @@
-CREATE TABLE "worktree_repositories" (
-    "project_id" INTEGER NOT NULL,
-    "worktree_id" INT8 NOT NULL,
-    "work_directory_id" INT8 NOT NULL,
-    "scan_id" INT8 NOT NULL,
-    "branch" VARCHAR,
-    "is_deleted" BOOL NOT NULL,
-    PRIMARY KEY(project_id, worktree_id, work_directory_id),
-    FOREIGN KEY(project_id, worktree_id) REFERENCES worktrees (project_id, id) ON DELETE CASCADE,
-    FOREIGN KEY(project_id, worktree_id, work_directory_id) REFERENCES worktree_entries (project_id, worktree_id, id) ON DELETE CASCADE
-);
-CREATE INDEX "index_worktree_repositories_on_project_id" ON "worktree_repositories" ("project_id");
-CREATE INDEX "index_worktree_repositories_on_project_id_and_worktree_id" ON "worktree_repositories" ("project_id", "worktree_id");
--- a/crates/collab/migrations/20230511004019_add_repository_statuses.sql
+++ b/crates/collab/migrations/20230511004019_add_repository_statuses.sql
@@ -1,15 +0,0 @@
-CREATE TABLE "worktree_repository_statuses" (
-    "project_id" INTEGER NOT NULL,
-    "worktree_id" INT8 NOT NULL,
-    "work_directory_id" INT8 NOT NULL,
-    "repo_path" VARCHAR NOT NULL,
-    "status" INT8 NOT NULL,
-    "scan_id" INT8 NOT NULL,
-    "is_deleted" BOOL NOT NULL,
-    PRIMARY KEY(project_id, worktree_id, work_directory_id, repo_path),
-    FOREIGN KEY(project_id, worktree_id) REFERENCES worktrees (project_id, id) ON DELETE CASCADE,
-    FOREIGN KEY(project_id, worktree_id, work_directory_id) REFERENCES worktree_entries (project_id, worktree_id, id) ON DELETE CASCADE
-);
-CREATE INDEX "index_wt_repos_statuses_on_project_id" ON "worktree_repository_statuses" ("project_id");
-CREATE INDEX "index_wt_repos_statuses_on_project_id_and_wt_id" ON "worktree_repository_statuses" ("project_id", "worktree_id");
-CREATE INDEX "index_wt_repos_statuses_on_project_id_and_wt_id_and_wd_id" ON "worktree_repository_statuses" ("project_id", "worktree_id", "work_directory_id");
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -14,8 +14,6 @@ mod user;
 mod worktree;
 mod worktree_diagnostic_summary;
 mod worktree_entry;
-mod worktree_repository;
-mod worktree_repository_statuses;

 use crate::executor::Executor;
 use crate::{Error, Result};
@@ -1491,8 +1489,6 @@ impl Database {
                        visible: db_worktree.visible,
                        updated_entries: Default::default(),
                        removed_entries: Default::default(),
-                        updated_repositories: Default::default(),
-                        removed_repositories: Default::default(),
                        diagnostic_summaries: Default::default(),
                        scan_id: db_worktree.scan_id as u64,
                        completed_scan_id: db_worktree.completed_scan_id as u64,
@@ -1502,125 +1498,38 @@ impl Database {
                        .worktrees
                        .iter()
                        .find(|worktree| worktree.id == db_worktree.id as u64);
+                    let entry_filter = if let Some(rejoined_worktree) = rejoined_worktree {
+                        worktree_entry::Column::ScanId.gt(rejoined_worktree.scan_id)
+                    } else {
+                        worktree_entry::Column::IsDeleted.eq(false)
+                    };

-                    // File entries
-                    {
-                        let entry_filter = if let Some(rejoined_worktree) = rejoined_worktree {
-                            worktree_entry::Column::ScanId.gt(rejoined_worktree.scan_id)
+                    let mut db_entries = worktree_entry::Entity::find()
+                        .filter(
+                            Condition::all()
+                                .add(worktree_entry::Column::WorktreeId.eq(worktree.id))
+                                .add(entry_filter),
+                        )
+                        .stream(&*tx)
+                        .await?;
+
+                    while let Some(db_entry) = db_entries.next().await {
+                        let db_entry = db_entry?;
+                        if db_entry.is_deleted {
+                            worktree.removed_entries.push(db_entry.id as u64);
                        } else {
-                            worktree_entry::Column::IsDeleted.eq(false)
-                        };
-
-                        let mut db_entries = worktree_entry::Entity::find()
-                            .filter(
-                                Condition::all()
-                                    .add(worktree_entry::Column::ProjectId.eq(project.id))
-                                    .add(worktree_entry::Column::WorktreeId.eq(worktree.id))
-                                    .add(entry_filter),
-                            )
-                            .stream(&*tx)
-                            .await?;
-
-                        while let Some(db_entry) = db_entries.next().await {
-                            let db_entry = db_entry?;
-                            if db_entry.is_deleted {
-                                worktree.removed_entries.push(db_entry.id as u64);
-                            } else {
-                                worktree.updated_entries.push(proto::Entry {
-                                    id: db_entry.id as u64,
-                                    is_dir: db_entry.is_dir,
-                                    path: db_entry.path,
-                                    inode: db_entry.inode as u64,
-                                    mtime: Some(proto::Timestamp {
-                                        seconds: db_entry.mtime_seconds as u64,
-                                        nanos: db_entry.mtime_nanos as u32,
-                                    }),
-                                    is_symlink: db_entry.is_symlink,
-                                    is_ignored: db_entry.is_ignored,
-                                });
-                            }
-                        }
-                    }
-
-                    // Repository Entries
-                    {
-                        let repository_entry_filter =
-                            if let Some(rejoined_worktree) = rejoined_worktree {
-                                worktree_repository::Column::ScanId.gt(rejoined_worktree.scan_id)
-                            } else {
-                                worktree_repository::Column::IsDeleted.eq(false)
-                            };
-
-                        let mut db_repositories = worktree_repository::Entity::find()
-                            .filter(
-                                Condition::all()
-                                    .add(worktree_repository::Column::ProjectId.eq(project.id))
-                                    .add(worktree_repository::Column::WorktreeId.eq(worktree.id))
-                                    .add(repository_entry_filter),
-                            )
-                            .stream(&*tx)
-                            .await?;
-
-                        while let Some(db_repository) = db_repositories.next().await {
-                            let db_repository = db_repository?;
-                            if db_repository.is_deleted {
-                                worktree
-                                    .removed_repositories
-                                    .push(db_repository.work_directory_id as u64);
-                            } else {
-                                worktree.updated_repositories.push(proto::RepositoryEntry {
-                                    work_directory_id: db_repository.work_directory_id as u64,
-                                    branch: db_repository.branch,
-                                    removed_repo_paths: Default::default(),
-                                    updated_statuses: Default::default(),
-                                });
-                            }
-                        }
-                    }
-
-                    // Repository Status Entries
-                    for repository in worktree.updated_repositories.iter_mut() {
-                        let repository_status_entry_filter =
-                            if let Some(rejoined_worktree) = rejoined_worktree {
-                                worktree_repository_statuses::Column::ScanId
-                                    .gt(rejoined_worktree.scan_id)
-                            } else {
-                                worktree_repository_statuses::Column::IsDeleted.eq(false)
-                            };
-
-                        let mut db_repository_statuses =
-                            worktree_repository_statuses::Entity::find()
-                                .filter(
-                                    Condition::all()
-                                        .add(
-                                            worktree_repository_statuses::Column::ProjectId
-                                                .eq(project.id),
-                                        )
-                                        .add(
-                                            worktree_repository_statuses::Column::WorktreeId
-                                                .eq(worktree.id),
-                                        )
-                                        .add(
-                                            worktree_repository_statuses::Column::WorkDirectoryId
-                                                .eq(repository.work_directory_id),
-                                        )
-                                        .add(repository_status_entry_filter),
-                                )
-                                .stream(&*tx)
-                                .await?;
-
-                        while let Some(db_status_entry) = db_repository_statuses.next().await {
-                            let db_status_entry = db_status_entry?;
-                            if db_status_entry.is_deleted {
-                                repository
-                                    .removed_repo_paths
-                                    .push(db_status_entry.repo_path);
-                            } else {
-                                repository.updated_statuses.push(proto::StatusEntry {
-                                    repo_path: db_status_entry.repo_path,
-                                    status: db_status_entry.status as i32,
-                                });
-                            }
+                            worktree.updated_entries.push(proto::Entry {
+                                id: db_entry.id as u64,
+                                is_dir: db_entry.is_dir,
+                                path: db_entry.path,
+                                inode: db_entry.inode as u64,
+                                mtime: Some(proto::Timestamp {
+                                    seconds: db_entry.mtime_seconds as u64,
+                                    nanos: db_entry.mtime_nanos as u32,
+                                }),
+                                is_symlink: db_entry.is_symlink,
+                                is_ignored: db_entry.is_ignored,
+                            });
                        }
                    }

@@ -2421,115 +2330,6 @@ impl Database {
                    .await?;
            }

-            if !update.updated_repositories.is_empty() {
-                worktree_repository::Entity::insert_many(update.updated_repositories.iter().map(
-                    |repository| worktree_repository::ActiveModel {
-                        project_id: ActiveValue::set(project_id),
-                        worktree_id: ActiveValue::set(worktree_id),
-                        work_directory_id: ActiveValue::set(repository.work_directory_id as i64),
-                        scan_id: ActiveValue::set(update.scan_id as i64),
-                        branch: ActiveValue::set(repository.branch.clone()),
-                        is_deleted: ActiveValue::set(false),
-                    },
-                ))
-                .on_conflict(
-                    OnConflict::columns([
-                        worktree_repository::Column::ProjectId,
-                        worktree_repository::Column::WorktreeId,
-                        worktree_repository::Column::WorkDirectoryId,
-                    ])
-                    .update_columns([
-                        worktree_repository::Column::ScanId,
-                        worktree_repository::Column::Branch,
-                    ])
-                    .to_owned(),
-                )
-                .exec(&*tx)
-                .await?;
-
-                for repository in update.updated_repositories.iter() {
-                    if !repository.updated_statuses.is_empty() {
-                        worktree_repository_statuses::Entity::insert_many(
-                            repository.updated_statuses.iter().map(|status_entry| {
-                                worktree_repository_statuses::ActiveModel {
-                                    project_id: ActiveValue::set(project_id),
-                                    worktree_id: ActiveValue::set(worktree_id),
-                                    work_directory_id: ActiveValue::set(
-                                        repository.work_directory_id as i64,
-                                    ),
-                                    repo_path: ActiveValue::set(status_entry.repo_path.clone()),
-                                    status: ActiveValue::set(status_entry.status as i64),
-                                    scan_id: ActiveValue::set(update.scan_id as i64),
-                                    is_deleted: ActiveValue::set(false),
-                                }
-                            }),
-                        )
-                        .on_conflict(
-                            OnConflict::columns([
-                                worktree_repository_statuses::Column::ProjectId,
-                                worktree_repository_statuses::Column::WorktreeId,
-                                worktree_repository_statuses::Column::WorkDirectoryId,
-                                worktree_repository_statuses::Column::RepoPath,
-                            ])
-                            .update_columns([
-                                worktree_repository_statuses::Column::ScanId,
-                                worktree_repository_statuses::Column::Status,
-                                worktree_repository_statuses::Column::IsDeleted,
-                            ])
-                            .to_owned(),
-                        )
-                        .exec(&*tx)
-                        .await?;
-                    }
-
-                    if !repository.removed_repo_paths.is_empty() {
-                        worktree_repository_statuses::Entity::update_many()
-                            .filter(
-                                worktree_repository_statuses::Column::ProjectId
-                                    .eq(project_id)
-                                    .and(
-                                        worktree_repository_statuses::Column::WorktreeId
-                                            .eq(worktree_id),
-                                    )
-                                    .and(
-                                        worktree_repository_statuses::Column::WorkDirectoryId
-                                            .eq(repository.work_directory_id as i64),
-                                    )
-                                    .and(worktree_repository_statuses::Column::RepoPath.is_in(
-                                        repository.removed_repo_paths.iter().map(String::as_str),
-                                    )),
-                            )
-                            .set(worktree_repository_statuses::ActiveModel {
-                                is_deleted: ActiveValue::Set(true),
-                                scan_id: ActiveValue::Set(update.scan_id as i64),
-                                ..Default::default()
-                            })
-                            .exec(&*tx)
-                            .await?;
-                    }
-                }
-            }
-
-            if !update.removed_repositories.is_empty() {
-                worktree_repository::Entity::update_many()
-                    .filter(
-                        worktree_repository::Column::ProjectId
-                            .eq(project_id)
-                            .and(worktree_repository::Column::WorktreeId.eq(worktree_id))
-                            .and(
-                                worktree_repository::Column::WorkDirectoryId
-                                    .is_in(update.removed_repositories.iter().map(|id| *id as i64)),
-                            ),
-                    )
-                    .set(worktree_repository::ActiveModel {
-                        is_deleted: ActiveValue::Set(true),
-                        scan_id: ActiveValue::Set(update.scan_id as i64),
-                        ..Default::default()
-                    })
-                    .exec(&*tx)
-                    .await?;
-            }
-
            let connection_ids = self.project_guest_connection_ids(project_id, &tx).await?;
            Ok(connection_ids)
        })
@@ -2705,7 +2505,6 @@ impl Database {
                            root_name: db_worktree.root_name,
                            visible: db_worktree.visible,
                            entries: Default::default(),
-                            repository_entries: Default::default(),
                            diagnostic_summaries: Default::default(),
                            scan_id: db_worktree.scan_id as u64,
                            completed_scan_id: db_worktree.completed_scan_id as u64,
@@ -2743,61 +2542,6 @@ impl Database {
                }
            }

-            // Populate repository entries.
-            {
-                let mut db_repository_entries = worktree_repository::Entity::find()
-                    .filter(
-                        Condition::all()
-                            .add(worktree_repository::Column::ProjectId.eq(project_id))
-                            .add(worktree_repository::Column::IsDeleted.eq(false)),
-                    )
-                    .stream(&*tx)
-                    .await?;
-                while let Some(db_repository_entry) = db_repository_entries.next().await {
-                    let db_repository_entry = db_repository_entry?;
-                    if let Some(worktree) =
-                        worktrees.get_mut(&(db_repository_entry.worktree_id as u64))
-                    {
-                        worktree.repository_entries.insert(
-                            db_repository_entry.work_directory_id as u64,
-                            proto::RepositoryEntry {
-                                work_directory_id: db_repository_entry.work_directory_id as u64,
-                                branch: db_repository_entry.branch,
-                                removed_repo_paths: Default::default(),
-                                updated_statuses: Default::default(),
-                            },
-                        );
-                    }
-                }
-            }
-
-            {
-                let mut db_status_entries = worktree_repository_statuses::Entity::find()
-                    .filter(
-                        Condition::all()
-                            .add(worktree_repository_statuses::Column::ProjectId.eq(project_id))
-                            .add(worktree_repository_statuses::Column::IsDeleted.eq(false)),
-                    )
-                    .stream(&*tx)
-                    .await?;
-
-                while let Some(db_status_entry) = db_status_entries.next().await {
-                    let db_status_entry = db_status_entry?;
-                    if let Some(worktree) = worktrees.get_mut(&(db_status_entry.worktree_id as u64))
-                    {
-                        if let Some(repository_entry) = worktree
-                            .repository_entries
-                            .get_mut(&(db_status_entry.work_directory_id as u64))
-                        {
-                            repository_entry.updated_statuses.push(proto::StatusEntry {
-                                repo_path: db_status_entry.repo_path,
-                                status: db_status_entry.status as i32,
-                            });
-                        }
-                    }
-                }
-            }
-
            // Populate worktree diagnostic summaries.
            {
                let mut db_summaries = worktree_diagnostic_summary::Entity::find()
@@ -3479,8 +3223,6 @@ pub struct RejoinedWorktree {
    pub visible: bool,
    pub updated_entries: Vec<proto::Entry>,
    pub removed_entries: Vec<u64>,
-    pub updated_repositories: Vec<proto::RepositoryEntry>,
-    pub removed_repositories: Vec<u64>,
    pub diagnostic_summaries: Vec<proto::DiagnosticSummary>,
    pub scan_id: u64,
    pub completed_scan_id: u64,
@@ -3535,7 +3277,6 @@ pub struct Worktree {
    pub root_name: String,
    pub visible: bool,
    pub entries: Vec<proto::Entry>,
-    pub repository_entries: BTreeMap<u64, proto::RepositoryEntry>,
    pub diagnostic_summaries: Vec<proto::DiagnosticSummary>,
    pub scan_id: u64,
    pub completed_scan_id: u64,
--- a/crates/collab/src/db/worktree_repository.rs
+++ b/crates/collab/src/db/worktree_repository.rs
@@ -1,21 +0,0 @@
-use super::ProjectId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "worktree_repositories")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub project_id: ProjectId,
-    #[sea_orm(primary_key)]
-    pub worktree_id: i64,
-    #[sea_orm(primary_key)]
-    pub work_directory_id: i64,
-    pub scan_id: i64,
-    pub branch: Option<String>,
-    pub is_deleted: bool,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}
-
-impl ActiveModelBehavior for ActiveModel {}
--- a/crates/collab/src/db/worktree_repository_statuses.rs
+++ b/crates/collab/src/db/worktree_repository_statuses.rs
@@ -1,23 +0,0 @@
-use super::ProjectId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "worktree_repository_statuses")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub project_id: ProjectId,
-    #[sea_orm(primary_key)]
-    pub worktree_id: i64,
-    #[sea_orm(primary_key)]
-    pub work_directory_id: i64,
-    #[sea_orm(primary_key)]
-    pub repo_path: String,
-    pub status: i64,
-    pub scan_id: i64,
-    pub is_deleted: bool,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}
-
-impl ActiveModelBehavior for ActiveModel {}
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -51,7 +51,7 @@ use std::{
        atomic::{AtomicBool, Ordering::SeqCst},
        Arc,
    },
-    time::{Duration, Instant},
+    time::Duration,
 };
 use tokio::sync::{watch, Semaphore};
 use tower::ServiceBuilder;
@@ -397,16 +397,10 @@ impl Server {
                        "message received"
                    );
                });
-                let start_time = Instant::now();
                let future = (handler)(*envelope, session);
                async move {
-                    let result = future.await;
-                    let duration_ms = start_time.elapsed().as_micros() as f64 / 1000.0;
-                    match result {
-                        Err(error) => {
-                            tracing::error!(%error, ?duration_ms, "error handling message")
-                        }
-                        Ok(()) => tracing::info!(?duration_ms, "finished handling message"),
+                    if let Err(error) = future.await {
+                        tracing::error!(%error, "error handling message");
                    }
                }
                .instrument(span)
@@ -1069,8 +1063,6 @@ async fn rejoin_room(
                    removed_entries: worktree.removed_entries,
                    scan_id: worktree.scan_id,
                    is_last_update: worktree.completed_scan_id == worktree.scan_id,
-                    updated_repositories: worktree.updated_repositories,
-                    removed_repositories: worktree.removed_repositories,
                };
                for update in proto::split_worktree_update(message, MAX_CHUNK_SIZE) {
                    session.peer.send(session.connection_id, update.clone())?;
@@ -1391,8 +1383,6 @@ async fn join_project(
            removed_entries: Default::default(),
            scan_id: worktree.scan_id,
            is_last_update: worktree.scan_id == worktree.completed_scan_id,
-            updated_repositories: worktree.repository_entries.into_values().collect(),
-            removed_repositories: Default::default(),
        };
        for update in proto::split_worktree_update(message, MAX_CHUNK_SIZE) {
            session.peer.send(session.connection_id, update.clone())?;
--- a/crates/collab/src/tests.rs
+++ b/crates/collab/src/tests.rs
@@ -12,14 +12,11 @@ use client::{
 use collections::{HashMap, HashSet};
 use fs::FakeFs;
 use futures::{channel::oneshot, StreamExt as _};
-use gpui::{
-    elements::*, executor::Deterministic, AnyElement, Entity, ModelHandle, TestAppContext, View,
-    ViewContext, ViewHandle, WeakViewHandle,
-};
+use gpui::{executor::Deterministic, test::EmptyView, ModelHandle, TestAppContext, ViewHandle};
 use language::LanguageRegistry;
 use parking_lot::Mutex;
 use project::{Project, WorktreeId};
-use settings::SettingsStore;
+use settings::Settings;
 use std::{
    cell::{Ref, RefCell, RefMut},
    env,
@@ -30,6 +27,7 @@ use std::{
        Arc,
    },
 };
+use theme::ThemeRegistry;
 use util::http::FakeHttpClient;
 use workspace::Workspace;

@@ -101,7 +99,7 @@ impl TestServer {

    async fn create_client(&mut self, cx: &mut TestAppContext, name: &str) -> TestClient {
        cx.update(|cx| {
-            cx.set_global(SettingsStore::test(cx));
+            cx.set_global(Settings::test(cx));
        });

        let http = FakeHttpClient::with_404_response();
@@ -190,18 +188,16 @@ impl TestServer {
            client: client.clone(),
            user_store: user_store.clone(),
            languages: Arc::new(LanguageRegistry::test()),
+            themes: ThemeRegistry::new((), cx.font_cache()),
            fs: fs.clone(),
            build_window_options: |_, _, _| Default::default(),
-            initialize_workspace: |_, _, _, _| unimplemented!(),
+            initialize_workspace: |_, _, _| unimplemented!(),
+            dock_default_item_factory: |_, _| None,
            background_actions: || &[],
        });

+        Project::init(&client);
        cx.update(|cx| {
-            theme::init((), cx);
-            Project::init(&client, cx);
-            client::init(&client, cx);
-            language::init(cx);
-            editor::init_settings(cx);
            workspace::init(app_state.clone(), cx);
            call::init(client.clone(), user_store.clone(), cx);
        });
@@ -466,41 +462,8 @@ impl TestClient {
        project: &ModelHandle<Project>,
        cx: &mut TestAppContext,
    ) -> ViewHandle<Workspace> {
-        struct WorkspaceContainer {
-            workspace: Option<WeakViewHandle<Workspace>>,
-        }
-
-        impl Entity for WorkspaceContainer {
-            type Event = ();
-        }
-
-        impl View for WorkspaceContainer {
-            fn ui_name() -> &'static str {
-                "WorkspaceContainer"
-            }
-
-            fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
-                if let Some(workspace) = self
-                    .workspace
-                    .as_ref()
-                    .and_then(|workspace| workspace.upgrade(cx))
-                {
-                    ChildView::new(&workspace, cx).into_any()
-                } else {
-                    Empty::new().into_any()
-                }
-            }
-        }
-
-        // We use a workspace container so that we don't need to remove the window in order to
-        // drop the workspace and we can use a ViewHandle instead.
-        let (window_id, container) = cx.add_window(|_| WorkspaceContainer { workspace: None });
-        let workspace = cx.add_view(window_id, |cx| Workspace::test_new(project.clone(), cx));
-        container.update(cx, |container, cx| {
-            container.workspace = Some(workspace.downgrade());
-            cx.notify();
-        });
-        workspace
+        let (_, root_view) = cx.add_window(|_| EmptyView);
+        cx.add_view(&root_view, |cx| Workspace::test_new(project.clone(), cx))
    }
 }

--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -10,15 +10,14 @@ use editor::{
    ConfirmRename, Editor, ExcerptRange, MultiBuffer, Redo, Rename, ToOffset, ToggleCodeActions,
    Undo,
 };
-use fs::{repository::GitFileStatus, FakeFs, Fs as _, LineEnding, RemoveOptions};
+use fs::{FakeFs, Fs as _, LineEnding, RemoveOptions};
 use futures::StreamExt as _;
 use gpui::{
-    executor::Deterministic, geometry::vector::vec2f, test::EmptyView, AppContext, ModelHandle,
-    TestAppContext, ViewHandle,
+    executor::Deterministic, geometry::vector::vec2f, test::EmptyView, ModelHandle, TestAppContext,
+    ViewHandle,
 };
 use indoc::indoc;
 use language::{
-    language_settings::{AllLanguageSettings, Formatter},
    tree_sitter_rust, Anchor, Diagnostic, DiagnosticEntry, FakeLspAdapter, Language,
    LanguageConfig, OffsetRangeExt, Point, Rope,
 };
@@ -27,7 +26,7 @@ use lsp::LanguageServerId;
 use project::{search::SearchQuery, DiagnosticSummary, HoverBlockKind, Project, ProjectPath};
 use rand::prelude::*;
 use serde_json::json;
-use settings::SettingsStore;
+use settings::{Formatter, Settings};
 use std::{
    cell::{Cell, RefCell},
    env, future, mem,
@@ -1203,7 +1202,7 @@ async fn test_share_project(
    cx_c: &mut TestAppContext,
 ) {
    deterministic.forbid_parking();
-    let (window_b, _) = cx_b.add_window(|_| EmptyView);
+    let (_, window_b) = cx_b.add_window(|_| EmptyView);
    let mut server = TestServer::start(&deterministic).await;
    let client_a = server.create_client(cx_a, "user_a").await;
    let client_b = server.create_client(cx_b, "user_b").await;
@@ -1290,7 +1289,7 @@ async fn test_share_project(
        .await
        .unwrap();

-    let editor_b = cx_b.add_view(window_b, |cx| Editor::for_buffer(buffer_b, None, cx));
+    let editor_b = cx_b.add_view(&window_b, |cx| Editor::for_buffer(buffer_b, None, cx));

    // Client A sees client B's selection
    deterministic.run_until_parked();
@@ -1439,6 +1438,7 @@ async fn test_host_disconnect(
    cx_b: &mut TestAppContext,
    cx_c: &mut TestAppContext,
 ) {
+    cx_b.update(editor::init);
    deterministic.forbid_parking();
    let mut server = TestServer::start(&deterministic).await;
    let client_a = server.create_client(cx_a, "user_a").await;
@@ -1448,8 +1448,6 @@ async fn test_host_disconnect(
        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
        .await;

-    cx_b.update(editor::init);
-
    client_a
        .fs
        .insert_tree(
@@ -1547,6 +1545,7 @@ async fn test_project_reconnect(
    cx_a: &mut TestAppContext,
    cx_b: &mut TestAppContext,
 ) {
+    cx_b.update(editor::init);
    deterministic.forbid_parking();
    let mut server = TestServer::start(&deterministic).await;
    let client_a = server.create_client(cx_a, "user_a").await;
@@ -1555,8 +1554,6 @@ async fn test_project_reconnect(
        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
        .await;

-    cx_b.update(editor::init);
-
    client_a
        .fs
        .insert_tree(
@@ -2437,7 +2434,7 @@ async fn test_git_diff_base_change(
    buffer_local_a.read_with(cx_a, |buffer, _| {
        assert_eq!(buffer.diff_base(), Some(diff_base.as_ref()));
        git::diff::assert_hunks(
-            buffer.snapshot().git_diff_hunks_in_row_range(0..4),
+            buffer.snapshot().git_diff_hunks_in_row_range(0..4, false),
            &buffer,
            &diff_base,
            &[(1..2, "", "two\n")],
@@ -2457,7 +2454,7 @@ async fn test_git_diff_base_change(
    buffer_remote_a.read_with(cx_b, |buffer, _| {
        assert_eq!(buffer.diff_base(), Some(diff_base.as_ref()));
        git::diff::assert_hunks(
-            buffer.snapshot().git_diff_hunks_in_row_range(0..4),
+            buffer.snapshot().git_diff_hunks_in_row_range(0..4, false),
            &buffer,
            &diff_base,
            &[(1..2, "", "two\n")],
@@ -2481,7 +2478,7 @@ async fn test_git_diff_base_change(
        assert_eq!(buffer.diff_base(), Some(new_diff_base.as_ref()));

        git::diff::assert_hunks(
-            buffer.snapshot().git_diff_hunks_in_row_range(0..4),
+            buffer.snapshot().git_diff_hunks_in_row_range(0..4, false),
            &buffer,
            &diff_base,
            &[(2..3, "", "three\n")],
@@ -2492,7 +2489,7 @@ async fn test_git_diff_base_change(
    buffer_remote_a.read_with(cx_b, |buffer, _| {
        assert_eq!(buffer.diff_base(), Some(new_diff_base.as_ref()));
        git::diff::assert_hunks(
-            buffer.snapshot().git_diff_hunks_in_row_range(0..4),
+            buffer.snapshot().git_diff_hunks_in_row_range(0..4, false),
            &buffer,
            &diff_base,
            &[(2..3, "", "three\n")],
@@ -2535,7 +2532,7 @@ async fn test_git_diff_base_change(
    buffer_local_b.read_with(cx_a, |buffer, _| {
        assert_eq!(buffer.diff_base(), Some(diff_base.as_ref()));
        git::diff::assert_hunks(
-            buffer.snapshot().git_diff_hunks_in_row_range(0..4),
+            buffer.snapshot().git_diff_hunks_in_row_range(0..4, false),
            &buffer,
            &diff_base,
            &[(1..2, "", "two\n")],
@@ -2555,7 +2552,7 @@ async fn test_git_diff_base_change(
    buffer_remote_b.read_with(cx_b, |buffer, _| {
        assert_eq!(buffer.diff_base(), Some(diff_base.as_ref()));
        git::diff::assert_hunks(
-            buffer.snapshot().git_diff_hunks_in_row_range(0..4),
+            buffer.snapshot().git_diff_hunks_in_row_range(0..4, false),
            &buffer,
            &diff_base,
            &[(1..2, "", "two\n")],
@@ -2583,12 +2580,12 @@ async fn test_git_diff_base_change(
            "{:?}",
            buffer
                .snapshot()
-                .git_diff_hunks_in_row_range(0..4)
+                .git_diff_hunks_in_row_range(0..4, false)
                .collect::<Vec<_>>()
        );

        git::diff::assert_hunks(
-            buffer.snapshot().git_diff_hunks_in_row_range(0..4),
+            buffer.snapshot().git_diff_hunks_in_row_range(0..4, false),
            &buffer,
            &diff_base,
            &[(2..3, "", "three\n")],
@@ -2599,7 +2596,7 @@ async fn test_git_diff_base_change(
    buffer_remote_b.read_with(cx_b, |buffer, _| {
        assert_eq!(buffer.diff_base(), Some(new_diff_base.as_ref()));
        git::diff::assert_hunks(
-            buffer.snapshot().git_diff_hunks_in_row_range(0..4),
+            buffer.snapshot().git_diff_hunks_in_row_range(0..4, false),
            &buffer,
            &diff_base,
            &[(2..3, "", "three\n")],
@@ -2607,241 +2604,6 @@ async fn test_git_diff_base_change(
    });
 }

-#[gpui::test]
-async fn test_git_branch_name(
-    deterministic: Arc<Deterministic>,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    deterministic.forbid_parking();
-    let mut server = TestServer::start(&deterministic).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a
-        .fs
-        .insert_tree(
-            "/dir",
-            json!({
-            ".git": {},
-            }),
-        )
-        .await;
-
-    let (project_local, _worktree_id) = client_a.build_local_project("/dir", cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| {
-            call.share_project(project_local.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    let project_remote = client_b.build_remote_project(project_id, cx_b).await;
-    client_a
-        .fs
-        .as_fake()
-        .set_branch_name(Path::new("/dir/.git"), Some("branch-1"))
-        .await;
-
-    // Wait for it to catch up to the new branch
-    deterministic.run_until_parked();
-
-    #[track_caller]
-    fn assert_branch(branch_name: Option<impl Into<String>>, project: &Project, cx: &AppContext) {
-        let branch_name = branch_name.map(Into::into);
-        let worktrees = project.visible_worktrees(cx).collect::<Vec<_>>();
-        assert_eq!(worktrees.len(), 1);
-        let worktree = worktrees[0].clone();
-        let root_entry = worktree.read(cx).snapshot().root_git_entry().unwrap();
-        assert_eq!(root_entry.branch(), branch_name.map(Into::into));
-    }
-
-    // Smoke test branch reading
-    project_local.read_with(cx_a, |project, cx| {
-        assert_branch(Some("branch-1"), project, cx)
-    });
-    project_remote.read_with(cx_b, |project, cx| {
-        assert_branch(Some("branch-1"), project, cx)
-    });
-
-    client_a
-        .fs
-        .as_fake()
-        .set_branch_name(Path::new("/dir/.git"), Some("branch-2"))
-        .await;
-
-    // Wait for buffer_local_a to receive it
-    deterministic.run_until_parked();
-
-    // Smoke test branch reading
-    project_local.read_with(cx_a, |project, cx| {
-        assert_branch(Some("branch-2"), project, cx)
-    });
-    project_remote.read_with(cx_b, |project, cx| {
-        assert_branch(Some("branch-2"), project, cx)
-    });
-
-    let project_remote_c = client_c.build_remote_project(project_id, cx_c).await;
-    deterministic.run_until_parked();
-    project_remote_c.read_with(cx_c, |project, cx| {
-        assert_branch(Some("branch-2"), project, cx)
-    });
-}
-
-#[gpui::test]
-async fn test_git_status_sync(
-    deterministic: Arc<Deterministic>,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    deterministic.forbid_parking();
-    let mut server = TestServer::start(&deterministic).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a
-        .fs
-        .insert_tree(
-            "/dir",
-            json!({
-            ".git": {},
-            "a.txt": "a",
-            "b.txt": "b",
-            }),
-        )
-        .await;
-
-    const A_TXT: &'static str = "a.txt";
-    const B_TXT: &'static str = "b.txt";
-
-    client_a
-        .fs
-        .as_fake()
-        .set_status_for_repo(
-            Path::new("/dir/.git"),
-            &[
-                (&Path::new(A_TXT), GitFileStatus::Added),
-                (&Path::new(B_TXT), GitFileStatus::Added),
-            ],
-        )
-        .await;
-
-    let (project_local, _worktree_id) = client_a.build_local_project("/dir", cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| {
-            call.share_project(project_local.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    let project_remote = client_b.build_remote_project(project_id, cx_b).await;
-
-    // Wait for it to catch up to the new status
-    deterministic.run_until_parked();
-
-    #[track_caller]
-    fn assert_status(
-        file: &impl AsRef<Path>,
-        status: Option<GitFileStatus>,
-        project: &Project,
-        cx: &AppContext,
-    ) {
-        let file = file.as_ref();
-        let worktrees = project.visible_worktrees(cx).collect::<Vec<_>>();
-        assert_eq!(worktrees.len(), 1);
-        let worktree = worktrees[0].clone();
-        let snapshot = worktree.read(cx).snapshot();
-        let root_entry = snapshot.root_git_entry().unwrap();
-        assert_eq!(root_entry.status_for_file(&snapshot, file), status);
-    }
-
-    // Smoke test status reading
-    project_local.read_with(cx_a, |project, cx| {
-        assert_status(&Path::new(A_TXT), Some(GitFileStatus::Added), project, cx);
-        assert_status(&Path::new(B_TXT), Some(GitFileStatus::Added), project, cx);
-    });
-    project_remote.read_with(cx_b, |project, cx| {
-        assert_status(&Path::new(A_TXT), Some(GitFileStatus::Added), project, cx);
-        assert_status(&Path::new(B_TXT), Some(GitFileStatus::Added), project, cx);
-    });
-
-    client_a
-        .fs
-        .as_fake()
-        .set_status_for_repo(
-            Path::new("/dir/.git"),
-            &[
-                (&Path::new(A_TXT), GitFileStatus::Modified),
-                (&Path::new(B_TXT), GitFileStatus::Modified),
-            ],
-        )
-        .await;
-
-    // Wait for buffer_local_a to receive it
-    deterministic.run_until_parked();
-
-    // Smoke test status reading
-    project_local.read_with(cx_a, |project, cx| {
-        assert_status(
-            &Path::new(A_TXT),
-            Some(GitFileStatus::Modified),
-            project,
-            cx,
-        );
-        assert_status(
-            &Path::new(B_TXT),
-            Some(GitFileStatus::Modified),
-            project,
-            cx,
-        );
-    });
-    project_remote.read_with(cx_b, |project, cx| {
-        assert_status(
-            &Path::new(A_TXT),
-            Some(GitFileStatus::Modified),
-            project,
-            cx,
-        );
-        assert_status(
-            &Path::new(B_TXT),
-            Some(GitFileStatus::Modified),
-            project,
-            cx,
-        );
-    });
-
-    // And synchronization while joining
-    let project_remote_c = client_c.build_remote_project(project_id, cx_c).await;
-    deterministic.run_until_parked();
-
-    project_remote_c.read_with(cx_c, |project, cx| {
-        assert_status(
-            &Path::new(A_TXT),
-            Some(GitFileStatus::Modified),
-            project,
-            cx,
-        );
-        assert_status(
-            &Path::new(B_TXT),
-            Some(GitFileStatus::Modified),
-            project,
-            cx,
-        );
-    });
-}
-
 #[gpui::test(iterations = 10)]
 async fn test_fs_operations(
    deterministic: Arc<Deterministic>,
@@ -3314,13 +3076,13 @@ async fn test_newline_above_or_below_does_not_move_guest_cursor(
        .update(cx_a, |p, cx| p.open_buffer((worktree_id, "a.txt"), cx))
        .await
        .unwrap();
-    let (window_a, _) = cx_a.add_window(|_| EmptyView);
-    let editor_a = cx_a.add_view(window_a, |cx| {
+    let (_, window_a) = cx_a.add_window(|_| EmptyView);
+    let editor_a = cx_a.add_view(&window_a, |cx| {
        Editor::for_buffer(buffer_a, Some(project_a), cx)
    });
    let mut editor_cx_a = EditorTestContext {
        cx: cx_a,
-        window_id: window_a,
+        window_id: window_a.id(),
        editor: editor_a,
    };

@@ -3329,13 +3091,13 @@ async fn test_newline_above_or_below_does_not_move_guest_cursor(
        .update(cx_b, |p, cx| p.open_buffer((worktree_id, "a.txt"), cx))
        .await
        .unwrap();
-    let (window_b, _) = cx_b.add_window(|_| EmptyView);
-    let editor_b = cx_b.add_view(window_b, |cx| {
+    let (_, window_b) = cx_b.add_window(|_| EmptyView);
+    let editor_b = cx_b.add_view(&window_b, |cx| {
        Editor::for_buffer(buffer_b, Some(project_b), cx)
    });
    let mut editor_cx_b = EditorTestContext {
        cx: cx_b,
-        window_id: window_b,
+        window_id: window_b.id(),
        editor: editor_b,
    };

@@ -3460,18 +3222,14 @@ async fn test_canceling_buffer_opening(
        .unwrap();

    // Open a buffer as client B but cancel after a random amount of time.
-    let buffer_b = project_b.update(cx_b, |p, cx| {
-        p.open_buffer_by_id(buffer_a.read_with(cx_a, |a, _| a.remote_id()), cx)
-    });
+    let buffer_b = project_b.update(cx_b, |p, cx| p.open_buffer_by_id(buffer_a.id() as u64, cx));
    deterministic.simulate_random_delay().await;
    drop(buffer_b);

    // Try opening the same buffer again as client B, and ensure we can
    // still do it despite the cancellation above.
    let buffer_b = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer_by_id(buffer_a.read_with(cx_a, |a, _| a.remote_id()), cx)
-        })
+        .update(cx_b, |p, cx| p.open_buffer_by_id(buffer_a.id() as u64, cx))
        .await
        .unwrap();
    buffer_b.read_with(cx_b, |buf, _| assert_eq!(buf.text(), "abc"));
@@ -4074,8 +3832,8 @@ async fn test_collaborating_with_completion(
        .update(cx_b, |p, cx| p.open_buffer((worktree_id, "main.rs"), cx))
        .await
        .unwrap();
-    let (window_b, _) = cx_b.add_window(|_| EmptyView);
-    let editor_b = cx_b.add_view(window_b, |cx| {
+    let (_, window_b) = cx_b.add_window(|_| EmptyView);
+    let editor_b = cx_b.add_view(&window_b, |cx| {
        Editor::for_buffer(buffer_b.clone(), Some(project_b.clone()), cx)
    });

@@ -4371,12 +4129,10 @@ async fn test_formatting_buffer(
    // Ensure buffer can be formatted using an external command. Notice how the
    // host's configuration is honored as opposed to using the guest's settings.
    cx_a.update(|cx| {
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings::<AllLanguageSettings>(cx, |file| {
-                file.defaults.formatter = Some(Formatter::External {
-                    command: "awk".into(),
-                    arguments: vec!["{sub(/two/,\"{buffer_path}\")}1".to_string()].into(),
-                });
+        cx.update_global(|settings: &mut Settings, _| {
+            settings.editor_defaults.formatter = Some(Formatter::External {
+                command: "awk".to_string(),
+                arguments: vec!["{sub(/two/,\"{buffer_path}\")}1".to_string()],
            });
        });
    });
@@ -4702,10 +4458,7 @@ async fn test_project_search(
    // Perform a search as the guest.
    let results = project_b
        .update(cx_b, |project, cx| {
-            project.search(
-                SearchQuery::text("world", false, false, Vec::new(), Vec::new()),
-                cx,
-            )
+            project.search(SearchQuery::text("world", false, false), cx)
        })
        .await
        .unwrap();
@@ -5143,6 +4896,7 @@ async fn test_collaborating_with_code_actions(
    cx_b: &mut TestAppContext,
 ) {
    deterministic.forbid_parking();
+    cx_b.update(editor::init);
    let mut server = TestServer::start(&deterministic).await;
    let client_a = server.create_client(cx_a, "user_a").await;
    let client_b = server.create_client(cx_b, "user_b").await;
@@ -5151,8 +4905,6 @@ async fn test_collaborating_with_code_actions(
        .await;
    let active_call_a = cx_a.read(ActiveCall::global);

-    cx_b.update(editor::init);
-
    // Set up a fake language server.
    let mut language = Language::new(
        LanguageConfig {
@@ -5357,6 +5109,7 @@ async fn test_collaborating_with_renames(
    cx_b: &mut TestAppContext,
 ) {
    deterministic.forbid_parking();
+    cx_b.update(editor::init);
    let mut server = TestServer::start(&deterministic).await;
    let client_a = server.create_client(cx_a, "user_a").await;
    let client_b = server.create_client(cx_b, "user_b").await;
@@ -5365,8 +5118,6 @@ async fn test_collaborating_with_renames(
        .await;
    let active_call_a = cx_a.read(ActiveCall::global);

-    cx_b.update(editor::init);
-
    // Set up a fake language server.
    let mut language = Language::new(
        LanguageConfig {
@@ -5548,6 +5299,8 @@ async fn test_language_server_statuses(
    cx_b: &mut TestAppContext,
 ) {
    deterministic.forbid_parking();
+
+    cx_b.update(editor::init);
    let mut server = TestServer::start(&deterministic).await;
    let client_a = server.create_client(cx_a, "user_a").await;
    let client_b = server.create_client(cx_b, "user_b").await;
@@ -5556,8 +5309,6 @@ async fn test_language_server_statuses(
        .await;
    let active_call_a = cx_a.read(ActiveCall::global);

-    cx_b.update(editor::init);
-
    // Set up a fake language server.
    let mut language = Language::new(
        LanguageConfig {
@@ -6265,6 +6016,8 @@ async fn test_basic_following(
    cx_d: &mut TestAppContext,
 ) {
    deterministic.forbid_parking();
+    cx_a.update(editor::init);
+    cx_b.update(editor::init);

    let mut server = TestServer::start(&deterministic).await;
    let client_a = server.create_client(cx_a, "user_a").await;
@@ -6282,9 +6035,6 @@ async fn test_basic_following(
    let active_call_a = cx_a.read(ActiveCall::global);
    let active_call_b = cx_b.read(ActiveCall::global);

-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-
    client_a
        .fs
        .insert_tree(
@@ -6863,6 +6613,9 @@ async fn test_following_tab_order(
    cx_a: &mut TestAppContext,
    cx_b: &mut TestAppContext,
 ) {
+    cx_a.update(editor::init);
+    cx_b.update(editor::init);
+
    let mut server = TestServer::start(&deterministic).await;
    let client_a = server.create_client(cx_a, "user_a").await;
    let client_b = server.create_client(cx_b, "user_b").await;
@@ -6872,9 +6625,6 @@ async fn test_following_tab_order(
    let active_call_a = cx_a.read(ActiveCall::global);
    let active_call_b = cx_b.read(ActiveCall::global);

-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-
    client_a
        .fs
        .insert_tree(
@@ -6985,6 +6735,9 @@ async fn test_peers_following_each_other(
    cx_b: &mut TestAppContext,
 ) {
    deterministic.forbid_parking();
+    cx_a.update(editor::init);
+    cx_b.update(editor::init);
+
    let mut server = TestServer::start(&deterministic).await;
    let client_a = server.create_client(cx_a, "user_a").await;
    let client_b = server.create_client(cx_b, "user_b").await;
@@ -6994,9 +6747,6 @@ async fn test_peers_following_each_other(
    let active_call_a = cx_a.read(ActiveCall::global);
    let active_call_b = cx_b.read(ActiveCall::global);

-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-
    // Client A shares a project.
    client_a
        .fs
@@ -7054,10 +6804,13 @@ async fn test_peers_following_each_other(
    // Clients A and B follow each other in split panes
    workspace_a.update(cx_a, |workspace, cx| {
        workspace.split_pane(workspace.active_pane().clone(), SplitDirection::Right, cx);
+        let pane_a1 = pane_a1.clone();
+        cx.defer(move |workspace, _| {
+            assert_ne!(*workspace.active_pane(), pane_a1);
+        });
    });
    workspace_a
        .update(cx_a, |workspace, cx| {
-            assert_ne!(*workspace.active_pane(), pane_a1);
            let leader_id = *project_a.read(cx).collaborators().keys().next().unwrap();
            workspace.toggle_follow(leader_id, cx).unwrap()
        })
@@ -7065,10 +6818,13 @@ async fn test_peers_following_each_other(
        .unwrap();
    workspace_b.update(cx_b, |workspace, cx| {
        workspace.split_pane(workspace.active_pane().clone(), SplitDirection::Right, cx);
+        let pane_b1 = pane_b1.clone();
+        cx.defer(move |workspace, _| {
+            assert_ne!(*workspace.active_pane(), pane_b1);
+        });
    });
    workspace_b
        .update(cx_b, |workspace, cx| {
-            assert_ne!(*workspace.active_pane(), pane_b1);
            let leader_id = *project_b.read(cx).collaborators().keys().next().unwrap();
            workspace.toggle_follow(leader_id, cx).unwrap()
        })
@@ -7156,6 +6912,8 @@ async fn test_auto_unfollowing(
    cx_b: &mut TestAppContext,
 ) {
    deterministic.forbid_parking();
+    cx_a.update(editor::init);
+    cx_b.update(editor::init);

    // 2 clients connect to a server.
    let mut server = TestServer::start(&deterministic).await;
@@ -7167,9 +6925,6 @@ async fn test_auto_unfollowing(
    let active_call_a = cx_a.read(ActiveCall::global);
    let active_call_b = cx_b.read(ActiveCall::global);

-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-
    // Client A shares a project.
    client_a
        .fs
@@ -7324,6 +7079,8 @@ async fn test_peers_simultaneously_following_each_other(
    cx_b: &mut TestAppContext,
 ) {
    deterministic.forbid_parking();
+    cx_a.update(editor::init);
+    cx_b.update(editor::init);

    let mut server = TestServer::start(&deterministic).await;
    let client_a = server.create_client(cx_a, "user_a").await;
@@ -7333,9 +7090,6 @@ async fn test_peers_simultaneously_following_each_other(
        .await;
    let active_call_a = cx_a.read(ActiveCall::global);

-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-
    client_a.fs.insert_tree("/a", json!({})).await;
    let (project_a, _) = client_a.build_local_project("/a", cx_a).await;
    let workspace_a = client_a.build_workspace(&project_a, cx_a);
--- a/crates/collab/src/tests/randomized_integration_tests.rs
+++ b/crates/collab/src/tests/randomized_integration_tests.rs
@@ -8,20 +8,19 @@ use call::ActiveCall;
 use client::RECEIVE_TIMEOUT;
 use collections::BTreeMap;
 use editor::Bias;
-use fs::{repository::GitFileStatus, FakeFs, Fs as _};
+use fs::{FakeFs, Fs as _};
 use futures::StreamExt as _;
 use gpui::{executor::Deterministic, ModelHandle, Task, TestAppContext};
 use language::{range_to_lsp, FakeLspAdapter, Language, LanguageConfig, PointUtf16};
 use lsp::FakeLanguageServer;
 use parking_lot::Mutex;
-use pretty_assertions::assert_eq;
 use project::{search::SearchQuery, Project, ProjectPath};
 use rand::{
    distributions::{Alphanumeric, DistString},
    prelude::*,
 };
 use serde::{Deserialize, Serialize};
-use settings::SettingsStore;
+use settings::Settings;
 use std::{
    env,
    ops::Range,
@@ -149,9 +148,8 @@ async fn test_random_collaboration(

    for (client, mut cx) in clients {
        cx.update(|cx| {
-            let store = cx.remove_global::<SettingsStore>();
            cx.clear_globals();
-            cx.set_global(store);
+            cx.set_global(Settings::test(cx));
            drop(client);
        });
    }
@@ -718,10 +716,7 @@ async fn apply_client_operation(
            );

            let search = project.update(cx, |project, cx| {
-                project.search(
-                    SearchQuery::text(query, false, false, Vec::new(), Vec::new()),
-                    cx,
-                )
+                project.search(SearchQuery::text(query, false, false), cx)
            });
            drop(project);
            let search = cx.background().spawn(async move {
@@ -765,85 +760,31 @@ async fn apply_client_operation(
            }
        }

-        ClientOperation::GitOperation { operation } => match operation {
-            GitOperation::WriteGitIndex {
-                repo_path,
-                contents,
-            } => {
-                if !client.fs.directories().contains(&repo_path) {
-                    return Err(TestError::Inapplicable);
-                }
-
-                log::info!(
-                    "{}: writing git index for repo {:?}: {:?}",
-                    client.username,
-                    repo_path,
-                    contents
-                );
-
-                let dot_git_dir = repo_path.join(".git");
-                let contents = contents
-                    .iter()
-                    .map(|(path, contents)| (path.as_path(), contents.clone()))
-                    .collect::<Vec<_>>();
-                if client.fs.metadata(&dot_git_dir).await?.is_none() {
-                    client.fs.create_dir(&dot_git_dir).await?;
-                }
-                client.fs.set_index_for_repo(&dot_git_dir, &contents).await;
+        ClientOperation::WriteGitIndex {
+            repo_path,
+            contents,
+        } => {
+            if !client.fs.directories().contains(&repo_path) {
+                return Err(TestError::Inapplicable);
            }
-            GitOperation::WriteGitBranch {
+
+            log::info!(
+                "{}: writing git index for repo {:?}: {:?}",
+                client.username,
                repo_path,
-                new_branch,
-            } => {
-                if !client.fs.directories().contains(&repo_path) {
-                    return Err(TestError::Inapplicable);
-                }
+                contents
+            );

-                log::info!(
-                    "{}: writing git branch for repo {:?}: {:?}",
-                    client.username,
-                    repo_path,
-                    new_branch
-                );
-
-                let dot_git_dir = repo_path.join(".git");
-                if client.fs.metadata(&dot_git_dir).await?.is_none() {
-                    client.fs.create_dir(&dot_git_dir).await?;
-                }
-                client.fs.set_branch_name(&dot_git_dir, new_branch).await;
+            let dot_git_dir = repo_path.join(".git");
+            let contents = contents
+                .iter()
+                .map(|(path, contents)| (path.as_path(), contents.clone()))
+                .collect::<Vec<_>>();
+            if client.fs.metadata(&dot_git_dir).await?.is_none() {
+                client.fs.create_dir(&dot_git_dir).await?;
            }
-            GitOperation::WriteGitStatuses {
-                repo_path,
-                statuses,
-            } => {
-                if !client.fs.directories().contains(&repo_path) {
-                    return Err(TestError::Inapplicable);
-                }
-
-                log::info!(
-                    "{}: writing git statuses for repo {:?}: {:?}",
-                    client.username,
-                    repo_path,
-                    statuses
-                );
-
-                let dot_git_dir = repo_path.join(".git");
-
-                let statuses = statuses
-                    .iter()
-                    .map(|(path, val)| (path.as_path(), val.clone()))
-                    .collect::<Vec<_>>();
-
-                if client.fs.metadata(&dot_git_dir).await?.is_none() {
-                    client.fs.create_dir(&dot_git_dir).await?;
-                }
-
-                client
-                    .fs
-                    .set_status_for_repo(&dot_git_dir, statuses.as_slice())
-                    .await;
-            }
-        },
+            client.fs.set_index_for_repo(&dot_git_dir, &contents).await;
+        }
    }
    Ok(())
 }
@@ -918,12 +859,6 @@ fn check_consistency_between_clients(clients: &[(Rc<TestClient>, TestAppContext)
                                host_snapshot.abs_path(),
                                guest_project.remote_id(),
                            );
-                            assert_eq!(guest_snapshot.repositories().collect::<Vec<_>>(), host_snapshot.repositories().collect::<Vec<_>>(),
-                                "{} has different repositories than the host for worktree {:?} and project {:?}",
-                                client.username,
-                                host_snapshot.abs_path(),
-                                guest_project.remote_id(),
-                            );
                            assert_eq!(guest_snapshot.scan_id(), host_snapshot.scan_id(),
                                "{} has different scan id than the host for worktree {:?} and project {:?}",
                                client.username,
@@ -1212,25 +1147,10 @@ enum ClientOperation {
        is_dir: bool,
        content: String,
    },
-    GitOperation {
-        operation: GitOperation,
-    },
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-enum GitOperation {
    WriteGitIndex {
        repo_path: PathBuf,
        contents: Vec<(PathBuf, String)>,
    },
-    WriteGitBranch {
-        repo_path: PathBuf,
-        new_branch: Option<String>,
-    },
-    WriteGitStatuses {
-        repo_path: PathBuf,
-        statuses: Vec<(PathBuf, GitFileStatus)>,
-    },
 }

 #[derive(Clone, Debug, Serialize, Deserialize)]
@@ -1743,10 +1663,38 @@ impl TestPlan {
                    }
                }

-                // Update a git related action
+                // Update a git index
                91..=95 => {
-                    break ClientOperation::GitOperation {
-                        operation: self.generate_git_operation(client),
+                    let repo_path = client
+                        .fs
+                        .directories()
+                        .choose(&mut self.rng)
+                        .unwrap()
+                        .clone();
+
+                    let mut file_paths = client
+                        .fs
+                        .files()
+                        .into_iter()
+                        .filter(|path| path.starts_with(&repo_path))
+                        .collect::<Vec<_>>();
+                    let count = self.rng.gen_range(0..=file_paths.len());
+                    file_paths.shuffle(&mut self.rng);
+                    file_paths.truncate(count);
+
+                    let mut contents = Vec::new();
+                    for abs_child_file_path in &file_paths {
+                        let child_file_path = abs_child_file_path
+                            .strip_prefix(&repo_path)
+                            .unwrap()
+                            .to_path_buf();
+                        let new_base = Alphanumeric.sample_string(&mut self.rng, 16);
+                        contents.push((child_file_path, new_base));
+                    }
+
+                    break ClientOperation::WriteGitIndex {
+                        repo_path,
+                        contents,
                    };
                }

@@ -1784,86 +1732,6 @@ impl TestPlan {
        })
    }

-    fn generate_git_operation(&mut self, client: &TestClient) -> GitOperation {
-        fn generate_file_paths(
-            repo_path: &Path,
-            rng: &mut StdRng,
-            client: &TestClient,
-        ) -> Vec<PathBuf> {
-            let mut paths = client
-                .fs
-                .files()
-                .into_iter()
-                .filter(|path| path.starts_with(repo_path))
-                .collect::<Vec<_>>();
-
-            let count = rng.gen_range(0..=paths.len());
-            paths.shuffle(rng);
-            paths.truncate(count);
-
-            paths
-                .iter()
-                .map(|path| path.strip_prefix(repo_path).unwrap().to_path_buf())
-                .collect::<Vec<_>>()
-        }
-
-        let repo_path = client
-            .fs
-            .directories()
-            .choose(&mut self.rng)
-            .unwrap()
-            .clone();
-
-        match self.rng.gen_range(0..100_u32) {
-            0..=25 => {
-                let file_paths = generate_file_paths(&repo_path, &mut self.rng, client);
-
-                let contents = file_paths
-                    .into_iter()
-                    .map(|path| (path, Alphanumeric.sample_string(&mut self.rng, 16)))
-                    .collect();
-
-                GitOperation::WriteGitIndex {
-                    repo_path,
-                    contents,
-                }
-            }
-            26..=63 => {
-                let new_branch = (self.rng.gen_range(0..10) > 3)
-                    .then(|| Alphanumeric.sample_string(&mut self.rng, 8));
-
-                GitOperation::WriteGitBranch {
-                    repo_path,
-                    new_branch,
-                }
-            }
-            64..=100 => {
-                let file_paths = generate_file_paths(&repo_path, &mut self.rng, client);
-
-                let statuses = file_paths
-                    .into_iter()
-                    .map(|paths| {
-                        (
-                            paths,
-                            match self.rng.gen_range(0..3_u32) {
-                                0 => GitFileStatus::Added,
-                                1 => GitFileStatus::Modified,
-                                2 => GitFileStatus::Conflict,
-                                _ => unreachable!(),
-                            },
-                        )
-                    })
-                    .collect::<Vec<_>>();
-
-                GitOperation::WriteGitStatuses {
-                    repo_path,
-                    statuses,
-                }
-            }
-            _ => unreachable!(),
-        }
-    }
-
    fn next_root_dir_name(&mut self, user_id: UserId) -> String {
        let user_ix = self
            .users
--- a/crates/collab_ui/src/collab_titlebar_item.rs
+++ b/crates/collab_ui/src/collab_titlebar_item.rs
@@ -14,17 +14,16 @@ use gpui::{
    geometry::{rect::RectF, vector::vec2f, PathBuilder},
    json::{self, ToJson},
    platform::{CursorStyle, MouseButton},
-    AppContext, Entity, ImageData, LayoutContext, ModelHandle, SceneBuilder, Subscription, View,
-    ViewContext, ViewHandle, WeakViewHandle,
+    AppContext, Entity, ImageData, ModelHandle, SceneBuilder, Subscription, View, ViewContext,
+    ViewHandle, WeakViewHandle,
 };
 use project::Project;
+use settings::Settings;
 use std::{ops::Range, sync::Arc};
 use theme::{AvatarStyle, Theme};
 use util::ResultExt;
 use workspace::{FollowNextCollaborator, Workspace};

-const MAX_TITLE_LENGTH: usize = 75;
-
 actions!(
    collab,
    [
@@ -69,11 +68,29 @@ impl View for CollabTitlebarItem {
        };

        let project = self.project.read(cx);
-        let theme = theme::current(cx).clone();
+        let mut project_title = String::new();
+        for (i, name) in project.worktree_root_names(cx).enumerate() {
+            if i > 0 {
+                project_title.push_str(", ");
+            }
+            project_title.push_str(name);
+        }
+        if project_title.is_empty() {
+            project_title = "empty project".to_owned();
+        }
+
+        let theme = cx.global::<Settings>().theme.clone();
+
        let mut left_container = Flex::row();
        let mut right_container = Flex::row().align_children_center();

-        left_container.add_child(self.collect_title_root_names(&project, theme.clone(), cx));
+        left_container.add_child(
+            Label::new(project_title, theme.workspace.titlebar.title.clone())
+                .contained()
+                .with_margin_right(theme.workspace.titlebar.item_spacing)
+                .aligned()
+                .left(),
+        );

        let user = self.user_store.read(cx).current_user();
        let peer_id = self.client.peer_id();
@@ -103,21 +120,7 @@ impl View for CollabTitlebarItem {

        Stack::new()
            .with_child(left_container)
-            .with_child(
-                Flex::row()
-                    .with_child(
-                        right_container.contained().with_background_color(
-                            theme
-                                .workspace
-                                .titlebar
-                                .container
-                                .background_color
-                                .unwrap_or_else(|| Color::transparent_black()),
-                        ),
-                    )
-                    .aligned()
-                    .right(),
-            )
+            .with_child(right_container.aligned().right())
            .into_any()
    }
 }
@@ -134,7 +137,6 @@ impl CollabTitlebarItem {
        let active_call = ActiveCall::global(cx);
        let mut subscriptions = Vec::new();
        subscriptions.push(cx.observe(workspace_handle, |_, _, cx| cx.notify()));
-        subscriptions.push(cx.observe(&project, |_, _, cx| cx.notify()));
        subscriptions.push(cx.observe(&active_call, |this, _, cx| this.active_call_changed(cx)));
        subscriptions.push(cx.observe_window_activation(|this, active, cx| {
            this.window_activation_changed(active, cx)
@@ -163,7 +165,6 @@ impl CollabTitlebarItem {
            }),
        );

-        let view_id = cx.view_id();
        Self {
            workspace: workspace.weak_handle(),
            project,
@@ -171,7 +172,7 @@ impl CollabTitlebarItem {
            client,
            contacts_popover: None,
            user_menu: cx.add_view(|cx| {
-                let mut menu = ContextMenu::new(view_id, cx);
+                let mut menu = ContextMenu::new(cx);
                menu.set_position_mode(OverlayPositionMode::Local);
                menu
            }),
@@ -179,63 +180,6 @@ impl CollabTitlebarItem {
        }
    }

-    fn collect_title_root_names(
-        &self,
-        project: &Project,
-        theme: Arc<Theme>,
-        cx: &ViewContext<Self>,
-    ) -> AnyElement<Self> {
-        let names_and_branches = project.visible_worktrees(cx).map(|worktree| {
-            let worktree = worktree.read(cx);
-            (worktree.root_name(), worktree.root_git_entry())
-        });
-
-        fn push_str(buffer: &mut String, index: &mut usize, str: &str) {
-            buffer.push_str(str);
-            *index += str.chars().count();
-        }
-
-        let mut indices = Vec::new();
-        let mut index = 0;
-        let mut title = String::new();
-        let mut names_and_branches = names_and_branches.peekable();
-        while let Some((name, entry)) = names_and_branches.next() {
-            let pre_index = index;
-            push_str(&mut title, &mut index, name);
-            indices.extend((pre_index..index).into_iter());
-            if let Some(branch) = entry.and_then(|entry| entry.branch()) {
-                push_str(&mut title, &mut index, "/");
-                push_str(&mut title, &mut index, &branch);
-            }
-            if names_and_branches.peek().is_some() {
-                push_str(&mut title, &mut index, ", ");
-                if index >= MAX_TITLE_LENGTH {
-                    title.push_str(" …");
-                    break;
-                }
-            }
-        }
-
-        let text_style = theme.workspace.titlebar.title.clone();
-        let item_spacing = theme.workspace.titlebar.item_spacing;
-
-        let mut highlight = text_style.clone();
-        highlight.color = theme.workspace.titlebar.highlight_color;
-
-        let style = LabelStyle {
-            text: text_style,
-            highlight_text: Some(highlight),
-        };
-
-        Label::new(title, style)
-            .with_highlights(indices)
-            .contained()
-            .with_margin_right(item_spacing)
-            .aligned()
-            .left()
-            .into_any_named("title-with-git-information")
-    }
-
    fn window_activation_changed(&mut self, active: bool, cx: &mut ViewContext<Self>) {
        let project = if active {
            Some(self.project.clone())
@@ -297,7 +241,7 @@ impl CollabTitlebarItem {
    }

    pub fn toggle_user_menu(&mut self, _: &ToggleUserMenu, cx: &mut ViewContext<Self>) {
-        let theme = theme::current(cx).clone();
+        let theme = cx.global::<Settings>().theme.clone();
        let avatar_style = theme.workspace.titlebar.leader_avatar.clone();
        let item_style = theme.context_menu.item.disabled_style().clone();
        self.user_menu.update(cx, |user_menu, cx| {
@@ -865,7 +809,7 @@ impl CollabTitlebarItem {
    ) -> Option<AnyElement<Self>> {
        enum ConnectionStatusButton {}

-        let theme = &theme::current(cx).clone();
+        let theme = &cx.global::<Settings>().theme.clone();
        match status {
            client::Status::ConnectionError
            | client::Status::ConnectionLost
@@ -921,7 +865,7 @@ impl Element<CollabTitlebarItem> for AvatarRibbon {
        &mut self,
        constraint: gpui::SizeConstraint,
        _: &mut CollabTitlebarItem,
-        _: &mut LayoutContext<CollabTitlebarItem>,
+        _: &mut ViewContext<CollabTitlebarItem>,
    ) -> (gpui::geometry::vector::Vector2F, Self::LayoutState) {
        (constraint.max, ())
    }
--- a/crates/collab_ui/src/contact_finder.rs
+++ b/crates/collab_ui/src/contact_finder.rs
@@ -1,6 +1,7 @@
 use client::{ContactRequestStatus, User, UserStore};
 use gpui::{elements::*, AppContext, ModelHandle, MouseState, Task, ViewContext};
 use picker::{Picker, PickerDelegate, PickerEvent};
+use settings::Settings;
 use std::sync::Arc;
 use util::TryFutureExt;

@@ -97,7 +98,7 @@ impl PickerDelegate for ContactFinderDelegate {
        selected: bool,
        cx: &gpui::AppContext,
    ) -> AnyElement<Picker<Self>> {
-        let theme = &theme::current(cx);
+        let theme = &cx.global::<Settings>().theme;
        let user = &self.potential_contacts[ix];
        let request_status = self.user_store.read(cx).contact_request_status(user);

--- a/crates/collab_ui/src/contact_list.rs
+++ b/crates/collab_ui/src/contact_list.rs
@@ -14,6 +14,7 @@ use gpui::{
 use menu::{Confirm, SelectNext, SelectPrev};
 use project::Project;
 use serde::Deserialize;
+use settings::Settings;
 use std::{mem, sync::Arc};
 use theme::IconButton;
 use workspace::Workspace;
@@ -191,7 +192,7 @@ impl ContactList {
        .detach();

        let list_state = ListState::<Self>::new(0, Orientation::Top, 1000., move |this, ix, cx| {
-            let theme = theme::current(cx).clone();
+            let theme = cx.global::<Settings>().theme.clone();
            let is_selected = this.selection == Some(ix);
            let current_project_id = this.project.read(cx).remote_id();

@@ -1312,7 +1313,7 @@ impl View for ContactList {

    fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
        enum AddContact {}
-        let theme = theme::current(cx).clone();
+        let theme = cx.global::<Settings>().theme.clone();

        Flex::column()
            .with_child(
--- a/crates/collab_ui/src/contacts_popover.rs
+++ b/crates/collab_ui/src/contacts_popover.rs
@@ -9,6 +9,7 @@ use gpui::{
 };
 use picker::PickerEvent;
 use project::Project;
+use settings::Settings;
 use workspace::Workspace;

 actions!(contacts_popover, [ToggleContactFinder]);
@@ -107,7 +108,7 @@ impl View for ContactsPopover {
    }

    fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
-        let theme = theme::current(cx).clone();
+        let theme = cx.global::<Settings>().theme.clone();
        let child = match &self.child {
            Child::ContactList(child) => ChildView::new(child, cx),
            Child::ContactFinder(child) => ChildView::new(child, cx),
--- a/crates/collab_ui/src/face_pile.rs
+++ b/crates/collab_ui/src/face_pile.rs
@@ -7,7 +7,7 @@ use gpui::{
    },
    json::ToJson,
    serde_json::{self, json},
-    AnyElement, Axis, Element, LayoutContext, SceneBuilder, ViewContext,
+    AnyElement, Axis, Element, SceneBuilder, ViewContext,
 };

 use crate::CollabTitlebarItem;
@@ -34,7 +34,7 @@ impl Element<CollabTitlebarItem> for FacePile {
        &mut self,
        constraint: gpui::SizeConstraint,
        view: &mut CollabTitlebarItem,
-        cx: &mut LayoutContext<CollabTitlebarItem>,
+        cx: &mut ViewContext<CollabTitlebarItem>,
    ) -> (Vector2F, Self::LayoutState) {
        debug_assert!(constraint.max_along(Axis::Horizontal) == f32::INFINITY);

--- a/crates/collab_ui/src/incoming_call_notification.rs
+++ b/crates/collab_ui/src/incoming_call_notification.rs
@@ -9,6 +9,7 @@ use gpui::{
    platform::{CursorStyle, MouseButton, WindowBounds, WindowKind, WindowOptions},
    AnyElement, AppContext, Entity, View, ViewContext,
 };
+use settings::Settings;
 use util::ResultExt;
 use workspace::AppState;

@@ -25,7 +26,7 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
            if let Some(incoming_call) = incoming_call {
                const PADDING: f32 = 16.;
                let window_size = cx.read(|cx| {
-                    let theme = &theme::current(cx).incoming_call_notification;
+                    let theme = &cx.global::<Settings>().theme.incoming_call_notification;
                    vec2f(theme.window_width, theme.window_height)
                });

@@ -41,7 +42,6 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
                            titlebar: None,
                            center: false,
                            focus: false,
-                            show: true,
                            kind: WindowKind::PopUp,
                            is_movable: false,
                            screen: Some(screen),
@@ -106,7 +106,7 @@ impl IncomingCallNotification {
    }

    fn render_caller(&self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
-        let theme = &theme::current(cx).incoming_call_notification;
+        let theme = &cx.global::<Settings>().theme.incoming_call_notification;
        let default_project = proto::ParticipantProject::default();
        let initial_project = self
            .call
@@ -170,11 +170,10 @@ impl IncomingCallNotification {
        enum Accept {}
        enum Decline {}

-        let theme = theme::current(cx);
        Flex::column()
            .with_child(
-                MouseEventHandler::<Accept, Self>::new(0, cx, |_, _| {
-                    let theme = &theme.incoming_call_notification;
+                MouseEventHandler::<Accept, Self>::new(0, cx, |_, cx| {
+                    let theme = &cx.global::<Settings>().theme.incoming_call_notification;
                    Label::new("Accept", theme.accept_button.text.clone())
                        .aligned()
                        .contained()
@@ -187,8 +186,8 @@ impl IncomingCallNotification {
                .flex(1., true),
            )
            .with_child(
-                MouseEventHandler::<Decline, Self>::new(0, cx, |_, _| {
-                    let theme = &theme.incoming_call_notification;
+                MouseEventHandler::<Decline, Self>::new(0, cx, |_, cx| {
+                    let theme = &cx.global::<Settings>().theme.incoming_call_notification;
                    Label::new("Decline", theme.decline_button.text.clone())
                        .aligned()
                        .contained()
@@ -201,7 +200,12 @@ impl IncomingCallNotification {
                .flex(1., true),
            )
            .constrained()
-            .with_width(theme.incoming_call_notification.button_width)
+            .with_width(
+                cx.global::<Settings>()
+                    .theme
+                    .incoming_call_notification
+                    .button_width,
+            )
            .into_any()
    }
 }
@@ -216,7 +220,12 @@ impl View for IncomingCallNotification {
    }

    fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
-        let background = theme::current(cx).incoming_call_notification.background;
+        let background = cx
+            .global::<Settings>()
+            .theme
+            .incoming_call_notification
+            .background;
+
        Flex::row()
            .with_child(self.render_caller(cx))
            .with_child(self.render_buttons(cx))
--- a/crates/collab_ui/src/notifications.rs
+++ b/crates/collab_ui/src/notifications.rs
@@ -4,6 +4,7 @@ use gpui::{
    platform::{CursorStyle, MouseButton},
    AnyElement, Element, View, ViewContext,
 };
+use settings::Settings;
 use std::sync::Arc;

 enum Dismiss {}
@@ -21,7 +22,7 @@ where
    F: 'static + Fn(&mut V, &mut ViewContext<V>),
    V: View,
 {
-    let theme = theme::current(cx).clone();
+    let theme = cx.global::<Settings>().theme.clone();
    let theme = &theme.contact_notification;

    Flex::column()
--- a/crates/collab_ui/src/project_shared_notification.rs
+++ b/crates/collab_ui/src/project_shared_notification.rs
@@ -7,6 +7,7 @@ use gpui::{
    platform::{CursorStyle, MouseButton, WindowBounds, WindowKind, WindowOptions},
    AppContext, Entity, View, ViewContext,
 };
+use settings::Settings;
 use std::sync::{Arc, Weak};
 use workspace::AppState;

@@ -21,7 +22,7 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
            worktree_root_names,
        } => {
            const PADDING: f32 = 16.;
-            let theme = &theme::current(cx).project_shared_notification;
+            let theme = &cx.global::<Settings>().theme.project_shared_notification;
            let window_size = vec2f(theme.window_width, theme.window_height);

            for screen in cx.platform().screens() {
@@ -35,7 +36,6 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
                        titlebar: None,
                        center: false,
                        focus: false,
-                        show: true,
                        kind: WindowKind::PopUp,
                        is_movable: false,
                        screen: Some(screen),
@@ -109,7 +109,7 @@ impl ProjectSharedNotification {
    }

    fn render_owner(&self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
-        let theme = &theme::current(cx).project_shared_notification;
+        let theme = &cx.global::<Settings>().theme.project_shared_notification;
        Flex::row()
            .with_children(self.owner.avatar.clone().map(|avatar| {
                Image::from_data(avatar)
@@ -167,11 +167,10 @@ impl ProjectSharedNotification {
        enum Open {}
        enum Dismiss {}

-        let theme = theme::current(cx);
        Flex::column()
            .with_child(
-                MouseEventHandler::<Open, Self>::new(0, cx, |_, _| {
-                    let theme = &theme.project_shared_notification;
+                MouseEventHandler::<Open, Self>::new(0, cx, |_, cx| {
+                    let theme = &cx.global::<Settings>().theme.project_shared_notification;
                    Label::new("Open", theme.open_button.text.clone())
                        .aligned()
                        .contained()
@@ -182,8 +181,8 @@ impl ProjectSharedNotification {
                .flex(1., true),
            )
            .with_child(
-                MouseEventHandler::<Dismiss, Self>::new(0, cx, |_, _| {
-                    let theme = &theme.project_shared_notification;
+                MouseEventHandler::<Dismiss, Self>::new(0, cx, |_, cx| {
+                    let theme = &cx.global::<Settings>().theme.project_shared_notification;
                    Label::new("Dismiss", theme.dismiss_button.text.clone())
                        .aligned()
                        .contained()
@@ -196,7 +195,12 @@ impl ProjectSharedNotification {
                .flex(1., true),
            )
            .constrained()
-            .with_width(theme.project_shared_notification.button_width)
+            .with_width(
+                cx.global::<Settings>()
+                    .theme
+                    .project_shared_notification
+                    .button_width,
+            )
            .into_any()
    }
 }
@@ -211,7 +215,11 @@ impl View for ProjectSharedNotification {
    }

    fn render(&mut self, cx: &mut ViewContext<Self>) -> gpui::AnyElement<Self> {
-        let background = theme::current(cx).project_shared_notification.background;
+        let background = cx
+            .global::<Settings>()
+            .theme
+            .project_shared_notification
+            .background;
        Flex::row()
            .with_child(self.render_owner(cx))
            .with_child(self.render_buttons(cx))
--- a/crates/collab_ui/src/sharing_status_indicator.rs
+++ b/crates/collab_ui/src/sharing_status_indicator.rs
@@ -6,7 +6,7 @@ use gpui::{
    platform::{Appearance, MouseButton},
    AnyElement, AppContext, Element, Entity, View, ViewContext,
 };
-use workspace::WorkspaceSettings;
+use settings::Settings;

 pub fn init(cx: &mut AppContext) {
    let active_call = ActiveCall::global(cx);
@@ -15,9 +15,7 @@ pub fn init(cx: &mut AppContext) {
    cx.observe(&active_call, move |call, cx| {
        if let Some(room) = call.read(cx).room() {
            if room.read(cx).is_screen_sharing() {
-                if status_indicator.is_none()
-                    && settings::get::<WorkspaceSettings>(cx).show_call_status_icon
-                {
+                if status_indicator.is_none() && cx.global::<Settings>().show_call_status_icon {
                    status_indicator = Some(cx.add_status_bar_item(|_| SharingStatusIndicator));
                }
            } else if let Some((window_id, _)) = status_indicator.take() {
--- a/crates/command_palette/Cargo.toml
+++ b/crates/command_palette/Cargo.toml
@@ -23,7 +23,6 @@ workspace = { path = "../workspace" }
 [dev-dependencies]
 gpui = { path = "../gpui", features = ["test-support"] }
 editor = { path = "../editor", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
 project = { path = "../project", features = ["test-support"] }
 serde_json.workspace = true
 workspace = { path = "../workspace", features = ["test-support"] }
--- a/crates/command_palette/src/command_palette.rs
+++ b/crates/command_palette/src/command_palette.rs
@@ -2,9 +2,10 @@ use collections::CommandPaletteFilter;
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
    actions, elements::*, keymap_matcher::Keystroke, Action, AppContext, Element, MouseState,
-    ViewContext,
+    ViewContext, WindowContext,
 };
 use picker::{Picker, PickerDelegate, PickerEvent};
+use settings::Settings;
 use std::cmp;
 use util::ResultExt;
 use workspace::Workspace;
@@ -40,17 +41,47 @@ struct Command {
    keystrokes: Vec<Keystroke>,
 }

-fn toggle_command_palette(workspace: &mut Workspace, _: &Toggle, cx: &mut ViewContext<Workspace>) {
-    let focused_view_id = cx.focused_view_id().unwrap_or_else(|| cx.view_id());
-    workspace.toggle_modal(cx, |_, cx| {
-        cx.add_view(|cx| Picker::new(CommandPaletteDelegate::new(focused_view_id), cx))
+fn toggle_command_palette(_: &mut Workspace, _: &Toggle, cx: &mut ViewContext<Workspace>) {
+    let workspace = cx.handle();
+    let focused_view_id = cx.focused_view_id().unwrap_or_else(|| workspace.id());
+
+    cx.window_context().defer(move |cx| {
+        // Build the delegate before the workspace is put on the stack so we can find it when
+        // computing the actions. We should really not allow available_actions to be called
+        // if it's not reliable however.
+        let delegate = CommandPaletteDelegate::new(focused_view_id, cx);
+        workspace.update(cx, |workspace, cx| {
+            workspace.toggle_modal(cx, |_, cx| cx.add_view(|cx| Picker::new(delegate, cx)));
+        })
    });
 }

 impl CommandPaletteDelegate {
-    pub fn new(focused_view_id: usize) -> Self {
+    pub fn new(focused_view_id: usize, cx: &mut WindowContext) -> Self {
+        let actions = cx
+            .available_actions(focused_view_id)
+            .filter_map(|(name, action, bindings)| {
+                if cx.has_global::<CommandPaletteFilter>() {
+                    let filter = cx.global::<CommandPaletteFilter>();
+                    if filter.filtered_namespaces.contains(action.namespace()) {
+                        return None;
+                    }
+                }
+
+                Some(Command {
+                    name: humanize_action_name(name),
+                    action,
+                    keystrokes: bindings
+                        .iter()
+                        .map(|binding| binding.keystrokes())
+                        .last()
+                        .map_or(Vec::new(), |keystrokes| keystrokes.to_vec()),
+                })
+            })
+            .collect();
+
        Self {
-            actions: Default::default(),
+            actions,
            matches: vec![],
            selected_ix: 0,
            focused_view_id,
@@ -80,46 +111,17 @@ impl PickerDelegate for CommandPaletteDelegate {
        query: String,
        cx: &mut ViewContext<Picker<Self>>,
    ) -> gpui::Task<()> {
-        let window_id = cx.window_id();
-        let view_id = self.focused_view_id;
+        let candidates = self
+            .actions
+            .iter()
+            .enumerate()
+            .map(|(ix, command)| StringMatchCandidate {
+                id: ix,
+                string: command.name.to_string(),
+                char_bag: command.name.chars().collect(),
+            })
+            .collect::<Vec<_>>();
        cx.spawn(move |picker, mut cx| async move {
-            let actions = cx
-                .available_actions(window_id, view_id)
-                .into_iter()
-                .filter_map(|(name, action, bindings)| {
-                    let filtered = cx.read(|cx| {
-                        if cx.has_global::<CommandPaletteFilter>() {
-                            let filter = cx.global::<CommandPaletteFilter>();
-                            filter.filtered_namespaces.contains(action.namespace())
-                        } else {
-                            false
-                        }
-                    });
-
-                    if filtered {
-                        None
-                    } else {
-                        Some(Command {
-                            name: humanize_action_name(name),
-                            action,
-                            keystrokes: bindings
-                                .iter()
-                                .map(|binding| binding.keystrokes())
-                                .last()
-                                .map_or(Vec::new(), |keystrokes| keystrokes.to_vec()),
-                        })
-                    }
-                })
-                .collect::<Vec<_>>();
-            let candidates = actions
-                .iter()
-                .enumerate()
-                .map(|(ix, command)| StringMatchCandidate {
-                    id: ix,
-                    string: command.name.to_string(),
-                    char_bag: command.name.chars().collect(),
-                })
-                .collect::<Vec<_>>();
            let matches = if query.is_empty() {
                candidates
                    .into_iter()
@@ -145,7 +147,6 @@ impl PickerDelegate for CommandPaletteDelegate {
            picker
                .update(&mut cx, |picker, _| {
                    let delegate = picker.delegate_mut();
-                    delegate.actions = actions;
                    delegate.matches = matches;
                    if delegate.matches.is_empty() {
                        delegate.selected_ix = 0;
@@ -184,7 +185,8 @@ impl PickerDelegate for CommandPaletteDelegate {
    ) -> AnyElement<Picker<Self>> {
        let mat = &self.matches[ix];
        let command = &self.actions[mat.candidate_id];
-        let theme = theme::current(cx);
+        let settings = cx.global::<Settings>();
+        let theme = &settings.theme;
        let style = theme.picker.item.style_for(mouse_state, selected);
        let key_style = &theme.command_palette.key.style_for(mouse_state, selected);
        let keystroke_spacing = theme.command_palette.keystroke_spacing;
@@ -292,11 +294,18 @@ mod tests {

    #[gpui::test]
    async fn test_command_palette(deterministic: Arc<Deterministic>, cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
+        deterministic.forbid_parking();
+        let app_state = cx.update(AppState::test);
+
+        cx.update(|cx| {
+            editor::init(cx);
+            workspace::init(app_state.clone(), cx);
+            init(cx);
+        });

        let project = Project::test(app_state.fs.clone(), [], cx).await;
-        let (window_id, workspace) = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));
-        let editor = cx.add_view(window_id, |cx| {
+        let (_, workspace) = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));
+        let editor = cx.add_view(&workspace, |cx| {
            let mut editor = Editor::single_line(None, cx);
            editor.set_text("abc", cx);
            editor
@@ -360,16 +369,4 @@ mod tests {
            assert!(palette.delegate().matches.is_empty())
        });
    }
-
-    fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
-        cx.update(|cx| {
-            let app_state = AppState::test(cx);
-            theme::init((), cx);
-            language::init(cx);
-            editor::init(cx);
-            workspace::init(app_state.clone(), cx);
-            init(cx);
-            app_state
-        })
-    }
 }
--- a/crates/context_menu/src/context_menu.rs
+++ b/crates/context_menu/src/context_menu.rs
@@ -8,6 +8,7 @@ use gpui::{
    View, ViewContext,
 };
 use menu::*;
+use settings::Settings;
 use std::{any::TypeId, borrow::Cow, sync::Arc, time::Duration};

 pub fn init(cx: &mut AppContext) {
@@ -125,6 +126,7 @@ pub struct ContextMenu {
    selected_index: Option<usize>,
    visible: bool,
    previously_focused_view_id: Option<usize>,
+    clicked: bool,
    parent_view_id: usize,
    _actions_observation: Subscription,
 }
@@ -175,7 +177,9 @@ impl View for ContextMenu {
 }

 impl ContextMenu {
-    pub fn new(parent_view_id: usize, cx: &mut ViewContext<Self>) -> Self {
+    pub fn new(cx: &mut ViewContext<Self>) -> Self {
+        let parent_view_id = cx.parent().unwrap();
+
        Self {
            show_count: 0,
            anchor_position: Default::default(),
@@ -185,6 +189,7 @@ impl ContextMenu {
            selected_index: Default::default(),
            visible: Default::default(),
            previously_focused_view_id: Default::default(),
+            clicked: false,
            parent_view_id,
            _actions_observation: cx.observe_actions(Self::action_dispatched),
        }
@@ -200,14 +205,18 @@ impl ContextMenu {
            .iter()
            .position(|item| item.action_id() == Some(action_id))
        {
-            self.selected_index = Some(ix);
-            cx.notify();
-            cx.spawn(|this, mut cx| async move {
-                cx.background().timer(Duration::from_millis(50)).await;
-                this.update(&mut cx, |this, cx| this.cancel(&Default::default(), cx))?;
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx);
+            if self.clicked {
+                self.cancel(&Default::default(), cx);
+            } else {
+                self.selected_index = Some(ix);
+                cx.notify();
+                cx.spawn(|this, mut cx| async move {
+                    cx.background().timer(Duration::from_millis(50)).await;
+                    this.update(&mut cx, |this, cx| this.cancel(&Default::default(), cx))?;
+                    anyhow::Ok(())
+                })
+                .detach_and_log_err(cx);
+            }
        }
    }

@@ -247,6 +256,7 @@ impl ContextMenu {
        self.items.clear();
        self.visible = false;
        self.selected_index.take();
+        self.clicked = false;
        cx.notify();
    }

@@ -322,7 +332,7 @@ impl ContextMenu {
    }

    fn render_menu_for_measurement(&self, cx: &mut ViewContext<Self>) -> impl Element<ContextMenu> {
-        let style = theme::current(cx).context_menu.clone();
+        let style = cx.global::<Settings>().theme.context_menu.clone();
        Flex::row()
            .with_child(
                Flex::column().with_children(self.items.iter().enumerate().map(|(ix, item)| {
@@ -402,7 +412,7 @@ impl ContextMenu {
        enum Menu {}
        enum MenuItem {}

-        let style = theme::current(cx).context_menu.clone();
+        let style = cx.global::<Settings>().theme.context_menu.clone();

        MouseEventHandler::<Menu, ContextMenu>::new(0, cx, |_, cx| {
            Flex::column()
@@ -446,7 +456,7 @@ impl ContextMenu {
                            .on_up(MouseButton::Left, |_, _, _| {}) // Capture these events
                            .on_down(MouseButton::Left, |_, _, _| {}) // Capture these events
                            .on_click(MouseButton::Left, move |_, menu, cx| {
-                                menu.cancel(&Default::default(), cx);
+                                menu.clicked = true;
                                let window_id = cx.window_id();
                                match &action {
                                    ContextMenuItemAction::Action(action) => {
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -10,7 +10,6 @@ use gpui::{
    actions, AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle, Task, WeakModelHandle,
 };
 use language::{
-    language_settings::{all_language_settings, language_settings},
    point_from_lsp, point_to_lsp, Anchor, Bias, Buffer, BufferSnapshot, Language, PointUtf16,
    ToPointUtf16,
 };
@@ -18,7 +17,7 @@ use log::{debug, error};
 use lsp::{LanguageServer, LanguageServerId};
 use node_runtime::NodeRuntime;
 use request::{LogMessage, StatusNotification};
-use settings::SettingsStore;
+use settings::Settings;
 use smol::{fs, io::BufReader, stream::StreamExt};
 use std::{
    ffi::OsString,
@@ -127,7 +126,7 @@ impl CopilotServer {
 struct RunningCopilotServer {
    lsp: Arc<LanguageServer>,
    sign_in_status: SignInStatus,
-    registered_buffers: HashMap<u64, RegisteredBuffer>,
+    registered_buffers: HashMap<usize, RegisteredBuffer>,
 }

 #[derive(Clone, Debug)]
@@ -163,7 +162,7 @@ impl Status {
 }

 struct RegisteredBuffer {
-    id: u64,
+    id: usize,
    uri: lsp::Url,
    language_id: String,
    snapshot: BufferSnapshot,
@@ -259,7 +258,7 @@ impl RegisteredBuffer {

 #[derive(Debug)]
 pub struct Completion {
-    pub uuid: String,
+    uuid: String,
    pub range: Range<Anchor>,
    pub text: String,
 }
@@ -268,7 +267,7 @@ pub struct Copilot {
    http: Arc<dyn HttpClient>,
    node_runtime: Arc<NodeRuntime>,
    server: CopilotServer,
-    buffers: HashMap<u64, WeakModelHandle<Buffer>>,
+    buffers: HashMap<usize, WeakModelHandle<Buffer>>,
 }

 impl Entity for Copilot {
@@ -303,34 +302,56 @@ impl Copilot {
        node_runtime: Arc<NodeRuntime>,
        cx: &mut ModelContext<Self>,
    ) -> Self {
-        let mut this = Self {
-            http,
-            node_runtime,
-            server: CopilotServer::Disabled,
-            buffers: Default::default(),
-        };
-        this.enable_or_disable_copilot(cx);
-        cx.observe_global::<SettingsStore, _>(move |this, cx| this.enable_or_disable_copilot(cx))
-            .detach();
-        this
-    }
+        cx.observe_global::<Settings, _>({
+            let http = http.clone();
+            let node_runtime = node_runtime.clone();
+            move |this, cx| {
+                if cx.global::<Settings>().features.copilot {
+                    if matches!(this.server, CopilotServer::Disabled) {
+                        let start_task = cx
+                            .spawn({
+                                let http = http.clone();
+                                let node_runtime = node_runtime.clone();
+                                move |this, cx| {
+                                    Self::start_language_server(http, node_runtime, this, cx)
+                                }
+                            })
+                            .shared();
+                        this.server = CopilotServer::Starting { task: start_task };
+                        cx.notify();
+                    }
+                } else {
+                    this.server = CopilotServer::Disabled;
+                    cx.notify();
+                }
+            }
+        })
+        .detach();

-    fn enable_or_disable_copilot(&mut self, cx: &mut ModelContext<Copilot>) {
-        let http = self.http.clone();
-        let node_runtime = self.node_runtime.clone();
-        if all_language_settings(cx).copilot_enabled(None, None) {
-            if matches!(self.server, CopilotServer::Disabled) {
-                let start_task = cx
-                    .spawn({
-                        move |this, cx| Self::start_language_server(http, node_runtime, this, cx)
-                    })
-                    .shared();
-                self.server = CopilotServer::Starting { task: start_task };
-                cx.notify();
+        if cx.global::<Settings>().features.copilot {
+            let start_task = cx
+                .spawn({
+                    let http = http.clone();
+                    let node_runtime = node_runtime.clone();
+                    move |this, cx| async {
+                        Self::start_language_server(http, node_runtime, this, cx).await
+                    }
+                })
+                .shared();
+
+            Self {
+                http,
+                node_runtime,
+                server: CopilotServer::Starting { task: start_task },
+                buffers: Default::default(),
            }
        } else {
-            self.server = CopilotServer::Disabled;
-            cx.notify();
+            Self {
+                http,
+                node_runtime,
+                server: CopilotServer::Disabled,
+                buffers: Default::default(),
+            }
        }
    }

@@ -559,7 +580,7 @@ impl Copilot {
    }

    pub fn register_buffer(&mut self, buffer: &ModelHandle<Buffer>, cx: &mut ModelContext<Self>) {
-        let buffer_id = buffer.read(cx).remote_id();
+        let buffer_id = buffer.id();
        self.buffers.insert(buffer_id, buffer.downgrade());

        if let CopilotServer::Running(RunningCopilotServer {
@@ -573,8 +594,7 @@ impl Copilot {
                return;
            }

-            let buffer_id = buffer.read(cx).remote_id();
-            registered_buffers.entry(buffer_id).or_insert_with(|| {
+            registered_buffers.entry(buffer.id()).or_insert_with(|| {
                let uri: lsp::Url = uri_for_buffer(buffer, cx);
                let language_id = id_for_language(buffer.read(cx).language());
                let snapshot = buffer.read(cx).snapshot();
@@ -619,8 +639,7 @@ impl Copilot {
        cx: &mut ModelContext<Self>,
    ) -> Result<()> {
        if let Ok(server) = self.server.as_running() {
-            let buffer_id = buffer.read(cx).remote_id();
-            if let Some(registered_buffer) = server.registered_buffers.get_mut(&buffer_id) {
+            if let Some(registered_buffer) = server.registered_buffers.get_mut(&buffer.id()) {
                match event {
                    language::Event::Edited => {
                        let _ = registered_buffer.report_changes(&buffer, cx);
@@ -674,7 +693,7 @@ impl Copilot {
        Ok(())
    }

-    fn unregister_buffer(&mut self, buffer_id: u64) {
+    fn unregister_buffer(&mut self, buffer_id: usize) {
        if let Ok(server) = self.server.as_running() {
            if let Some(buffer) = server.registered_buffers.remove(&buffer_id) {
                server
@@ -779,18 +798,17 @@ impl Copilot {
            Err(error) => return Task::ready(Err(error)),
        };
        let lsp = server.lsp.clone();
-        let buffer_id = buffer.read(cx).remote_id();
-        let registered_buffer = server.registered_buffers.get_mut(&buffer_id).unwrap();
+        let registered_buffer = server.registered_buffers.get_mut(&buffer.id()).unwrap();
        let snapshot = registered_buffer.report_changes(buffer, cx);
        let buffer = buffer.read(cx);
        let uri = registered_buffer.uri.clone();
+        let settings = cx.global::<Settings>();
        let position = position.to_point_utf16(buffer);
-        let settings = language_settings(
-            buffer.language_at(position).map(|l| l.name()).as_deref(),
-            cx,
-        );
-        let tab_size = settings.tab_size;
-        let hard_tabs = settings.hard_tabs;
+        let language = buffer.language_at(position);
+        let language_name = language.map(|language| language.name());
+        let language_name = language_name.as_deref();
+        let tab_size = settings.tab_size(language_name);
+        let hard_tabs = settings.hard_tabs(language_name);
        let relative_path = buffer
            .file()
            .map(|file| file.path().to_path_buf())
@@ -899,9 +917,7 @@ fn uri_for_buffer(buffer: &ModelHandle<Buffer>, cx: &AppContext) -> lsp::Url {
    if let Some(file) = buffer.read(cx).file().and_then(|file| file.as_local()) {
        lsp::Url::from_file_path(file.abs_path(cx)).unwrap()
    } else {
-        format!("buffer://{}", buffer.read(cx).remote_id())
-            .parse()
-            .unwrap()
+        format!("buffer://{}", buffer.id()).parse().unwrap()
    }
 }

@@ -1149,7 +1165,7 @@ mod tests {
        }

        fn mtime(&self) -> std::time::SystemTime {
-            unimplemented!()
+            todo!()
        }

        fn path(&self) -> &Arc<Path> {
@@ -1157,23 +1173,23 @@ mod tests {
        }

        fn full_path(&self, _: &AppContext) -> PathBuf {
-            unimplemented!()
+            todo!()
        }

        fn file_name<'a>(&'a self, _: &'a AppContext) -> &'a std::ffi::OsStr {
-            unimplemented!()
+            todo!()
        }

        fn is_deleted(&self) -> bool {
-            unimplemented!()
+            todo!()
        }

        fn as_any(&self) -> &dyn std::any::Any {
-            unimplemented!()
+            todo!()
        }

        fn to_proto(&self) -> rpc::proto::File {
-            unimplemented!()
+            todo!()
        }
    }

@@ -1183,7 +1199,7 @@ mod tests {
        }

        fn load(&self, _: &AppContext) -> Task<Result<String>> {
-            unimplemented!()
+            todo!()
        }

        fn buffer_reloaded(
@@ -1195,7 +1211,7 @@ mod tests {
            _: std::time::SystemTime,
            _: &mut AppContext,
        ) {
-            unimplemented!()
+            todo!()
        }
    }
 }
--- a/crates/copilot/src/sign_in.rs
+++ b/crates/copilot/src/sign_in.rs
@@ -6,6 +6,7 @@ use gpui::{
    AnyElement, AnyViewHandle, AppContext, ClipboardItem, Element, Entity, View, ViewContext,
    ViewHandle,
 };
+use settings::Settings;
 use theme::ui::modal;

 #[derive(PartialEq, Eq, Debug, Clone)]
@@ -67,13 +68,12 @@ fn create_copilot_auth_window(
    cx: &mut AppContext,
    status: &Status,
 ) -> ViewHandle<CopilotCodeVerification> {
-    let window_size = theme::current(cx).copilot.modal.dimensions();
+    let window_size = cx.global::<Settings>().theme.copilot.modal.dimensions();
    let window_options = WindowOptions {
        bounds: WindowBounds::Fixed(RectF::new(Default::default(), window_size)),
        titlebar: None,
        center: true,
        focus: true,
-        show: true,
        kind: WindowKind::Normal,
        is_movable: true,
        screen: None,
@@ -338,7 +338,7 @@ impl View for CopilotCodeVerification {
    fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
        enum ConnectModal {}

-        let style = theme::current(cx).clone();
+        let style = cx.global::<Settings>().theme.clone();

        modal::<ConnectModal, _, _, _, _>(
            "Connect Copilot to Zed",
--- a/crates/copilot_button/Cargo.toml
+++ b/crates/copilot_button/Cargo.toml
@@ -12,10 +12,8 @@ doctest = false
 assets = { path = "../assets" }
 copilot = { path = "../copilot" }
 editor = { path = "../editor" }
-fs = { path = "../fs" }
 context_menu = { path = "../context_menu" }
 gpui = { path = "../gpui" }
-language = { path = "../language" }
 settings = { path = "../settings" }
 theme = { path = "../theme" }
 util = { path = "../util" }
@@ -23,6 +21,3 @@ workspace = { path = "../workspace" }
 anyhow.workspace = true
 smol.workspace = true
 futures.workspace = true
-
-[dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
--- a/crates/copilot_button/src/copilot_button.rs
+++ b/crates/copilot_button/src/copilot_button.rs
@@ -2,15 +2,13 @@ use anyhow::Result;
 use context_menu::{ContextMenu, ContextMenuItem};
 use copilot::{Copilot, SignOut, Status};
 use editor::{scroll::autoscroll::Autoscroll, Editor};
-use fs::Fs;
 use gpui::{
    elements::*,
    platform::{CursorStyle, MouseButton},
    AnyElement, AppContext, AsyncAppContext, Element, Entity, MouseState, Subscription, View,
    ViewContext, ViewHandle, WeakViewHandle, WindowContext,
 };
-use language::language_settings::{self, all_language_settings, AllLanguageSettings};
-use settings::{update_settings_file, SettingsStore};
+use settings::{settings_file::SettingsFile, Settings};
 use std::{path::Path, sync::Arc};
 use util::{paths, ResultExt};
 use workspace::{
@@ -28,7 +26,6 @@ pub struct CopilotButton {
    editor_enabled: Option<bool>,
    language: Option<Arc<str>>,
    path: Option<Arc<Path>>,
-    fs: Arc<dyn Fs>,
 }

 impl Entity for CopilotButton {
@@ -41,12 +38,13 @@ impl View for CopilotButton {
    }

    fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
-        let all_language_settings = &all_language_settings(cx);
-        if !all_language_settings.copilot.feature_enabled {
+        let settings = cx.global::<Settings>();
+
+        if !settings.features.copilot {
            return Empty::new().into_any();
        }

-        let theme = theme::current(cx).clone();
+        let theme = settings.theme.clone();
        let active = self.popup_menu.read(cx).visible();
        let Some(copilot) = Copilot::global(cx) else {
            return Empty::new().into_any();
@@ -55,7 +53,7 @@ impl View for CopilotButton {

        let enabled = self
            .editor_enabled
-            .unwrap_or_else(|| all_language_settings.copilot_enabled(None, None));
+            .unwrap_or(settings.show_copilot_suggestions(None, None));

        Stack::new()
            .with_child(
@@ -66,8 +64,8 @@ impl View for CopilotButton {
                        let style = theme
                            .workspace
                            .status_bar
-                            .panel_buttons
-                            .button
+                            .sidebar_buttons
+                            .item
                            .style_for(state, active);

                        Flex::row()
@@ -145,10 +143,9 @@ impl View for CopilotButton {
 }

 impl CopilotButton {
-    pub fn new(fs: Arc<dyn Fs>, cx: &mut ViewContext<Self>) -> Self {
-        let button_view_id = cx.view_id();
+    pub fn new(cx: &mut ViewContext<Self>) -> Self {
        let menu = cx.add_view(|cx| {
-            let mut menu = ContextMenu::new(button_view_id, cx);
+            let mut menu = ContextMenu::new(cx);
            menu.set_position_mode(OverlayPositionMode::Local);
            menu
        });
@@ -157,7 +154,7 @@ impl CopilotButton {

        Copilot::global(cx).map(|copilot| cx.observe(&copilot, |_, _, cx| cx.notify()).detach());

-        cx.observe_global::<SettingsStore, _>(move |_, cx| cx.notify())
+        cx.observe_global::<Settings, _>(move |_, cx| cx.notify())
            .detach();

        Self {
@@ -166,19 +163,17 @@ impl CopilotButton {
            editor_enabled: None,
            language: None,
            path: None,
-            fs,
        }
    }

    pub fn deploy_copilot_start_menu(&mut self, cx: &mut ViewContext<Self>) {
        let mut menu_options = Vec::with_capacity(2);
-        let fs = self.fs.clone();

        menu_options.push(ContextMenuItem::handler("Sign In", |cx| {
            initiate_sign_in(cx)
        }));
-        menu_options.push(ContextMenuItem::handler("Disable Copilot", move |cx| {
-            hide_copilot(fs.clone(), cx)
+        menu_options.push(ContextMenuItem::handler("Disable Copilot", |cx| {
+            hide_copilot(cx)
        }));

        self.popup_menu.update(cx, |menu, cx| {
@@ -192,26 +187,22 @@ impl CopilotButton {
    }

    pub fn deploy_copilot_menu(&mut self, cx: &mut ViewContext<Self>) {
-        let fs = self.fs.clone();
+        let settings = cx.global::<Settings>();
+
        let mut menu_options = Vec::with_capacity(8);

        if let Some(language) = self.language.clone() {
-            let fs = fs.clone();
-            let language_enabled =
-                language_settings::language_settings(Some(language.as_ref()), cx)
-                    .show_copilot_suggestions;
+            let language_enabled = settings.copilot_enabled_for_language(Some(language.as_ref()));
            menu_options.push(ContextMenuItem::handler(
                format!(
                    "{} Suggestions for {}",
                    if language_enabled { "Hide" } else { "Show" },
                    language
                ),
-                move |cx| toggle_copilot_for_language(language.clone(), fs.clone(), cx),
+                move |cx| toggle_copilot_for_language(language.clone(), cx),
            ));
        }

-        let settings = settings::get::<AllLanguageSettings>(cx);
-
        if let Some(path) = self.path.as_ref() {
            let path_enabled = settings.copilot_enabled_for_path(path);
            let path = path.clone();
@@ -236,19 +227,19 @@ impl CopilotButton {
            ));
        }

-        let globally_enabled = settings.copilot_enabled(None, None);
+        let globally_enabled = cx.global::<Settings>().features.copilot;
        menu_options.push(ContextMenuItem::handler(
            if globally_enabled {
                "Hide Suggestions for All Files"
            } else {
                "Show Suggestions for All Files"
            },
-            move |cx| toggle_copilot_globally(fs.clone(), cx),
+            |cx| toggle_copilot_globally(cx),
        ));

        menu_options.push(ContextMenuItem::Separator);

-        let icon_style = theme::current(cx).copilot.out_link_icon.clone();
+        let icon_style = settings.theme.copilot.out_link_icon.clone();
        menu_options.push(ContextMenuItem::action(
            move |state: &mut MouseState, style: &theme::ContextMenuItem| {
                Flex::row()
@@ -274,19 +265,22 @@ impl CopilotButton {

    pub fn update_enabled(&mut self, editor: ViewHandle<Editor>, cx: &mut ViewContext<Self>) {
        let editor = editor.read(cx);
+
        let snapshot = editor.buffer().read(cx).snapshot(cx);
+        let settings = cx.global::<Settings>();
        let suggestion_anchor = editor.selections.newest_anchor().start;
+
        let language_name = snapshot
            .language_at(suggestion_anchor)
            .map(|language| language.name());
-        let path = snapshot.file_at(suggestion_anchor).map(|file| file.path());
+        let path = snapshot
+            .file_at(suggestion_anchor)
+            .map(|file| file.path().clone());

-        self.editor_enabled = Some(
-            all_language_settings(cx)
-                .copilot_enabled(language_name.as_deref(), path.map(|p| p.as_ref())),
-        );
+        self.editor_enabled =
+            Some(settings.show_copilot_suggestions(language_name.as_deref(), path.as_deref()));
        self.language = language_name;
-        self.path = path.cloned();
+        self.path = path;

        cx.notify()
    }
@@ -315,7 +309,7 @@ async fn configure_disabled_globs(
    let settings_editor = workspace
        .update(&mut cx, |_, cx| {
            create_and_open_local_file(&paths::SETTINGS, cx, || {
-                settings::initial_user_settings_content(&assets::Assets)
+                Settings::initial_user_settings_content(&assets::Assets)
                    .as_ref()
                    .into()
            })
@@ -327,17 +321,16 @@ async fn configure_disabled_globs(
    settings_editor.downgrade().update(&mut cx, |item, cx| {
        let text = item.buffer().read(cx).snapshot(cx).text();

-        let settings = cx.global::<SettingsStore>();
-        let edits = settings.edits_for_update::<AllLanguageSettings>(&text, |file| {
+        let edits = SettingsFile::update_unsaved(&text, cx, |file| {
            let copilot = file.copilot.get_or_insert_with(Default::default);
            let globs = copilot.disabled_globs.get_or_insert_with(|| {
-                settings
-                    .get::<AllLanguageSettings>(None)
+                cx.global::<Settings>()
                    .copilot
                    .disabled_globs
+                    .clone()
                    .iter()
-                    .map(|glob| glob.glob().to_string())
-                    .collect()
+                    .map(|glob| glob.as_str().to_string())
+                    .collect::<Vec<_>>()
            });

            if let Some(path_to_disable) = &path_to_disable {
@@ -362,26 +355,32 @@ async fn configure_disabled_globs(
    anyhow::Ok(())
 }

-fn toggle_copilot_globally(fs: Arc<dyn Fs>, cx: &mut AppContext) {
-    let show_copilot_suggestions = all_language_settings(cx).copilot_enabled(None, None);
-    update_settings_file::<AllLanguageSettings>(fs, cx, move |file| {
-        file.defaults.show_copilot_suggestions = Some((!show_copilot_suggestions).into())
+fn toggle_copilot_globally(cx: &mut AppContext) {
+    let show_copilot_suggestions = cx.global::<Settings>().show_copilot_suggestions(None, None);
+    SettingsFile::update(cx, move |file_contents| {
+        file_contents.editor.show_copilot_suggestions = Some((!show_copilot_suggestions).into())
    });
 }

-fn toggle_copilot_for_language(language: Arc<str>, fs: Arc<dyn Fs>, cx: &mut AppContext) {
-    let show_copilot_suggestions = all_language_settings(cx).copilot_enabled(Some(&language), None);
-    update_settings_file::<AllLanguageSettings>(fs, cx, move |file| {
-        file.languages
-            .entry(language)
-            .or_default()
-            .show_copilot_suggestions = Some(!show_copilot_suggestions);
+fn toggle_copilot_for_language(language: Arc<str>, cx: &mut AppContext) {
+    let show_copilot_suggestions = cx
+        .global::<Settings>()
+        .show_copilot_suggestions(Some(&language), None);
+
+    SettingsFile::update(cx, move |file_contents| {
+        file_contents.languages.insert(
+            language,
+            settings::EditorSettings {
+                show_copilot_suggestions: Some((!show_copilot_suggestions).into()),
+                ..Default::default()
+            },
+        );
    });
 }

-fn hide_copilot(fs: Arc<dyn Fs>, cx: &mut AppContext) {
-    update_settings_file::<AllLanguageSettings>(fs, cx, move |file| {
-        file.features.get_or_insert(Default::default()).copilot = Some(false);
+fn hide_copilot(cx: &mut AppContext) {
+    SettingsFile::update(cx, move |file_contents| {
+        file_contents.features.copilot = Some(false)
    });
 }

--- a/crates/db/Cargo.toml
+++ b/crates/db/Cargo.toml
@@ -18,7 +18,7 @@ sqlez = { path = "../sqlez" }
 sqlez_macros = { path = "../sqlez_macros" }
 util = { path = "../util" }
 anyhow.workspace = true
-indoc.workspace = true
+indoc = "1.0.4"
 async-trait.workspace = true
 lazy_static.workspace = true
 log.workspace = true
--- a/crates/diagnostics/Cargo.toml
+++ b/crates/diagnostics/Cargo.toml
@@ -31,7 +31,6 @@ language = { path = "../language", features = ["test-support"] }
 lsp = { path = "../lsp", features = ["test-support"] }
 gpui = { path = "../gpui", features = ["test-support"] }
 workspace = { path = "../workspace", features = ["test-support"] }
-theme = { path = "../theme", features = ["test-support"] }

 serde_json.workspace = true
 unindent.workspace = true
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -20,6 +20,7 @@ use language::{
 use lsp::LanguageServerId;
 use project::{DiagnosticSummary, Project, ProjectPath};
 use serde_json::json;
+use settings::Settings;
 use smallvec::SmallVec;
 use std::{
    any::{Any, TypeId},
@@ -29,11 +30,10 @@ use std::{
    path::PathBuf,
    sync::Arc,
 };
-use theme::ThemeSettings;
 use util::TryFutureExt;
 use workspace::{
    item::{BreadcrumbText, Item, ItemEvent, ItemHandle},
-    ItemNavHistory, Pane, PaneBackdrop, ToolbarItemLocation, Workspace,
+    ItemNavHistory, Pane, ToolbarItemLocation, Workspace,
 };

 actions!(diagnostics, [Deploy]);
@@ -89,16 +89,12 @@ impl View for ProjectDiagnosticsEditor {

    fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
        if self.path_states.is_empty() {
-            let theme = &theme::current(cx).project_diagnostics;
-            PaneBackdrop::new(
-                cx.view_id(),
-                Label::new("No problems in workspace", theme.empty_message.clone())
-                    .aligned()
-                    .contained()
-                    .with_style(theme.container)
-                    .into_any(),
-            )
-            .into_any()
+            let theme = &cx.global::<Settings>().theme.project_diagnostics;
+            Label::new("No problems in workspace", theme.empty_message.clone())
+                .aligned()
+                .contained()
+                .with_style(theme.container)
+                .into_any()
        } else {
            ChildView::new(&self.editor, cx).into_any()
        }
@@ -165,13 +161,8 @@ impl ProjectDiagnosticsEditor {
            editor.set_vertical_scroll_margin(5, cx);
            editor
        });
-        cx.subscribe(&editor, |this, _, event, cx| {
-            cx.emit(event.clone());
-            if event == &editor::Event::Focused && this.path_states.is_empty() {
-                cx.focus_self()
-            }
-        })
-        .detach();
+        cx.subscribe(&editor, |_, _, event, cx| cx.emit(event.clone()))
+            .detach();

        let project = project_handle.read(cx);
        let paths_to_update = project
@@ -546,7 +537,7 @@ impl Item for ProjectDiagnosticsEditor {
        render_summary(
            &self.summary,
            &style.label.text,
-            &theme::current(cx).project_diagnostics,
+            &cx.global::<Settings>().theme.project_diagnostics,
        )
    }

@@ -688,10 +679,10 @@ impl Item for ProjectDiagnosticsEditor {
 fn diagnostic_header_renderer(diagnostic: Diagnostic) -> RenderBlock {
    let (message, highlights) = highlight_diagnostic_message(Vec::new(), &diagnostic.message);
    Arc::new(move |cx| {
-        let settings = settings::get::<ThemeSettings>(cx);
+        let settings = cx.global::<Settings>();
        let theme = &settings.theme.editor;
        let style = theme.diagnostic_header.clone();
-        let font_size = (style.text_scale_factor * settings.buffer_font_size(cx)).round();
+        let font_size = (style.text_scale_factor * settings.buffer_font_size).round();
        let icon_width = cx.em_width * style.icon_width_factor;
        let icon = if diagnostic.severity == DiagnosticSeverity::ERROR {
            Svg::new("icons/circle_x_mark_12.svg")
@@ -827,35 +818,33 @@ mod tests {
    use language::{Diagnostic, DiagnosticEntry, DiagnosticSeverity, PointUtf16, Unclipped};
    use project::FakeFs;
    use serde_json::json;
-    use settings::SettingsStore;
    use unindent::Unindent as _;

    #[gpui::test]
    async fn test_diagnostics(cx: &mut TestAppContext) {
-        init_test(cx);
-
+        Settings::test_async(cx);
        let fs = FakeFs::new(cx.background());
        fs.insert_tree(
            "/test",
            json!({
                "consts.rs": "
-                    const a: i32 = 'a';
-                    const b: i32 = c;
-                "
+                        const a: i32 = 'a';
+                        const b: i32 = c;
+                    "
                .unindent(),

                "main.rs": "
-                    fn main() {
-                        let x = vec![];
-                        let y = vec![];
-                        a(x);
-                        b(y);
-                        // comment 1
-                        // comment 2
-                        c(y);
-                        d(x);
-                    }
-                "
+                        fn main() {
+                            let x = vec![];
+                            let y = vec![];
+                            a(x);
+                            b(y);
+                            // comment 1
+                            // comment 2
+                            c(y);
+                            d(x);
+                        }
+                    "
                .unindent(),
            }),
        )
@@ -863,7 +852,7 @@ mod tests {

        let language_server_id = LanguageServerId(0);
        let project = Project::test(fs.clone(), ["/test".as_ref()], cx).await;
-        let (window_id, workspace) = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));
+        let (_, workspace) = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));

        // Create some diagnostics
        project.update(cx, |project, cx| {
@@ -950,7 +939,7 @@ mod tests {
        });

        // Open the project diagnostics view while there are already diagnostics.
-        let view = cx.add_view(window_id, |cx| {
+        let view = cx.add_view(&workspace, |cx| {
            ProjectDiagnosticsEditor::new(project.clone(), workspace.downgrade(), cx)
        });

@@ -1236,8 +1225,7 @@ mod tests {

    #[gpui::test]
    async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
-        init_test(cx);
-
+        Settings::test_async(cx);
        let fs = FakeFs::new(cx.background());
        fs.insert_tree(
            "/test",
@@ -1256,9 +1244,9 @@ mod tests {
        let server_id_1 = LanguageServerId(100);
        let server_id_2 = LanguageServerId(101);
        let project = Project::test(fs.clone(), ["/test".as_ref()], cx).await;
-        let (window_id, workspace) = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));
+        let (_, workspace) = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));

-        let view = cx.add_view(window_id, |cx| {
+        let view = cx.add_view(&workspace, |cx| {
            ProjectDiagnosticsEditor::new(project.clone(), workspace.downgrade(), cx)
        });

@@ -1501,16 +1489,6 @@ mod tests {
        });
    }

-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            cx.set_global(SettingsStore::test(cx));
-            theme::init((), cx);
-            language::init(cx);
-            client::init_settings(cx);
-            workspace::init_settings(cx);
-        });
-    }
-
    fn editor_blocks(editor: &ViewHandle<Editor>, cx: &mut WindowContext) -> Vec<(u32, String)> {
        editor.update(cx, |editor, cx| {
            let snapshot = editor.snapshot(cx);
--- a/crates/diagnostics/src/items.rs
+++ b/crates/diagnostics/src/items.rs
@@ -7,6 +7,7 @@ use gpui::{
 };
 use language::Diagnostic;
 use lsp::LanguageServerId;
+use settings::Settings;
 use workspace::{item::ItemHandle, StatusItemView, Workspace};

 use crate::ProjectDiagnosticsEditor;
@@ -91,12 +92,13 @@ impl View for DiagnosticIndicator {
        enum Summary {}
        enum Message {}

-        let tooltip_style = theme::current(cx).tooltip.clone();
+        let tooltip_style = cx.global::<Settings>().theme.tooltip.clone();
        let in_progress = !self.in_progress_checks.is_empty();
        let mut element = Flex::row().with_child(
            MouseEventHandler::<Summary, _>::new(0, cx, |state, cx| {
-                let theme = theme::current(cx);
-                let style = theme
+                let style = cx
+                    .global::<Settings>()
+                    .theme
                    .workspace
                    .status_bar
                    .diagnostic_summary
@@ -182,7 +184,7 @@ impl View for DiagnosticIndicator {
            .into_any(),
        );

-        let style = &theme::current(cx).workspace.status_bar;
+        let style = &cx.global::<Settings>().theme.workspace.status_bar;
        let item_spacing = style.item_spacing;

        if in_progress {
--- a/crates/drag_and_drop/src/drag_and_drop.rs
+++ b/crates/drag_and_drop/src/drag_and_drop.rs
@@ -199,7 +199,7 @@ impl<V: View> DragAndDrop<V> {
                            return None;
                        }

-                        let position = (position - region_offset).round();
+                        let position = position - region_offset;
                        Some(
                            Overlay::new(
                                MouseEventHandler::<DraggedElementHandler, V>::new(
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -58,7 +58,6 @@ parking_lot.workspace = true
 postage.workspace = true
 pulldown-cmark = { version = "0.9.2", default-features = false }
 rand = { workspace = true, optional = true }
-schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 smallvec.workspace = true
@@ -81,6 +80,7 @@ workspace = { path = "../workspace", features = ["test-support"] }

 ctor.workspace = true
 env_logger.workspace = true
+glob.workspace = true
 rand.workspace = true
 unindent.workspace = true
 tree-sitter = "0.20"
--- a/crates/editor/src/blink_manager.rs
+++ b/crates/editor/src/blink_manager.rs
@@ -1,9 +1,9 @@
-use crate::EditorSettings;
-use gpui::{Entity, ModelContext};
-use settings::SettingsStore;
-use smol::Timer;
 use std::time::Duration;

+use gpui::{Entity, ModelContext};
+use settings::Settings;
+use smol::Timer;
+
 pub struct BlinkManager {
    blink_interval: Duration,

@@ -15,8 +15,8 @@ pub struct BlinkManager {

 impl BlinkManager {
    pub fn new(blink_interval: Duration, cx: &mut ModelContext<Self>) -> Self {
-        // Make sure we blink the cursors if the setting is re-enabled
-        cx.observe_global::<SettingsStore, _>(move |this, cx| {
+        cx.observe_global::<Settings, _>(move |this, cx| {
+            // Make sure we blink the cursors if the setting is re-enabled
            this.blink_cursors(this.blink_epoch, cx)
        })
        .detach();
@@ -64,7 +64,7 @@ impl BlinkManager {
    }

    fn blink_cursors(&mut self, epoch: usize, cx: &mut ModelContext<Self>) {
-        if settings::get::<EditorSettings>(cx).cursor_blink {
+        if cx.global::<Settings>().cursor_blink {
            if epoch == self.blink_epoch && self.enabled && !self.blinking_paused {
                self.visible = !self.visible;
                cx.notify();
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -13,9 +13,8 @@ use gpui::{
    fonts::{FontId, HighlightStyle},
    Entity, ModelContext, ModelHandle,
 };
-use language::{
-    language_settings::language_settings, OffsetUtf16, Point, Subscription as BufferSubscription,
-};
+use language::{OffsetUtf16, Point, Subscription as BufferSubscription};
+use settings::Settings;
 use std::{any::TypeId, fmt::Debug, num::NonZeroU32, ops::Range, sync::Arc};
 pub use suggestion_map::Suggestion;
 use suggestion_map::SuggestionMap;
@@ -277,7 +276,8 @@ impl DisplayMap {
            .as_singleton()
            .and_then(|buffer| buffer.read(cx).language())
            .map(|language| language.name());
-        language_settings(language_name.as_deref(), cx).tab_size
+
+        cx.global::<Settings>().tab_size(language_name.as_deref())
    }

    #[cfg(test)]
@@ -844,12 +844,8 @@ pub mod tests {
    use super::*;
    use crate::{movement, test::marked_display_snapshot};
    use gpui::{color::Color, elements::*, test::observe, AppContext};
-    use language::{
-        language_settings::{AllLanguageSettings, AllLanguageSettingsContent},
-        Buffer, Language, LanguageConfig, SelectionGoal,
-    };
+    use language::{Buffer, Language, LanguageConfig, SelectionGoal};
    use rand::{prelude::*, Rng};
-    use settings::SettingsStore;
    use smol::stream::StreamExt;
    use std::{env, sync::Arc};
    use theme::SyntaxTheme;
@@ -886,7 +882,9 @@ pub mod tests {
        log::info!("wrap width: {:?}", wrap_width);

        cx.update(|cx| {
-            init_test(cx, |s| s.defaults.tab_size = NonZeroU32::new(tab_size));
+            let mut settings = Settings::test(cx);
+            settings.editor_overrides.tab_size = NonZeroU32::new(tab_size);
+            cx.set_global(settings)
        });

        let buffer = cx.update(|cx| {
@@ -941,11 +939,9 @@ pub mod tests {
                    tab_size = *tab_sizes.choose(&mut rng).unwrap();
                    log::info!("setting tab size to {:?}", tab_size);
                    cx.update(|cx| {
-                        cx.update_global::<SettingsStore, _, _>(|store, cx| {
-                            store.update_user_settings::<AllLanguageSettings>(cx, |s| {
-                                s.defaults.tab_size = NonZeroU32::new(tab_size);
-                            });
-                        });
+                        let mut settings = Settings::test(cx);
+                        settings.editor_overrides.tab_size = NonZeroU32::new(tab_size);
+                        cx.set_global(settings)
                    });
                }
                30..=44 => {
@@ -1123,7 +1119,7 @@ pub mod tests {
    #[gpui::test(retries = 5)]
    fn test_soft_wraps(cx: &mut AppContext) {
        cx.foreground().set_block_on_ticks(usize::MAX..=usize::MAX);
-        init_test(cx, |_| {});
+        cx.foreground().forbid_parking();

        let font_cache = cx.font_cache();

@@ -1135,6 +1131,7 @@ pub mod tests {
            .unwrap();
        let font_size = 12.0;
        let wrap_width = Some(64.);
+        cx.set_global(Settings::test(cx));

        let text = "one two three four five\nsix seven eight";
        let buffer = MultiBuffer::build_simple(text, cx);
@@ -1214,8 +1211,7 @@ pub mod tests {

    #[gpui::test]
    fn test_text_chunks(cx: &mut gpui::AppContext) {
-        init_test(cx, |_| {});
-
+        cx.set_global(Settings::test(cx));
        let text = sample_text(6, 6, 'a');
        let buffer = MultiBuffer::build_simple(&text, cx);
        let family_id = cx
@@ -1229,7 +1225,6 @@ pub mod tests {
        let font_size = 14.0;
        let map =
            cx.add_model(|cx| DisplayMap::new(buffer.clone(), font_id, font_size, None, 1, 1, cx));
-
        buffer.update(cx, |buffer, cx| {
            buffer.edit(
                vec![
@@ -1294,8 +1289,11 @@ pub mod tests {
            .unwrap(),
        );
        language.set_theme(&theme);
-
-        cx.update(|cx| init_test(cx, |s| s.defaults.tab_size = Some(2.try_into().unwrap())));
+        cx.update(|cx| {
+            let mut settings = Settings::test(cx);
+            settings.editor_defaults.tab_size = Some(2.try_into().unwrap());
+            cx.set_global(settings);
+        });

        let buffer = cx.add_model(|cx| Buffer::new(0, text, cx).with_language(language, cx));
        buffer.condition(cx, |buf, _| !buf.is_parsing()).await;
@@ -1384,7 +1382,7 @@ pub mod tests {
        );
        language.set_theme(&theme);

-        cx.update(|cx| init_test(cx, |_| {}));
+        cx.update(|cx| cx.set_global(Settings::test(cx)));

        let buffer = cx.add_model(|cx| Buffer::new(0, text, cx).with_language(language, cx));
        buffer.condition(cx, |buf, _| !buf.is_parsing()).await;
@@ -1431,8 +1429,9 @@ pub mod tests {

    #[gpui::test]
    async fn test_chunks_with_text_highlights(cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| init_test(cx, |_| {}));
+        cx.foreground().set_block_on_ticks(usize::MAX..=usize::MAX);

+        cx.update(|cx| cx.set_global(Settings::test(cx)));
        let theme = SyntaxTheme::new(vec![
            ("operator".to_string(), Color::red().into()),
            ("string".to_string(), Color::green().into()),
@@ -1511,8 +1510,7 @@ pub mod tests {

    #[gpui::test]
    fn test_clip_point(cx: &mut gpui::AppContext) {
-        init_test(cx, |_| {});
-
+        cx.set_global(Settings::test(cx));
        fn assert(text: &str, shift_right: bool, bias: Bias, cx: &mut gpui::AppContext) {
            let (unmarked_snapshot, mut markers) = marked_display_snapshot(text, cx);

@@ -1561,7 +1559,7 @@ pub mod tests {

    #[gpui::test]
    fn test_clip_at_line_ends(cx: &mut gpui::AppContext) {
-        init_test(cx, |_| {});
+        cx.set_global(Settings::test(cx));

        fn assert(text: &str, cx: &mut gpui::AppContext) {
            let (mut unmarked_snapshot, markers) = marked_display_snapshot(text, cx);
@@ -1580,8 +1578,7 @@ pub mod tests {

    #[gpui::test]
    fn test_tabs_with_multibyte_chars(cx: &mut gpui::AppContext) {
-        init_test(cx, |_| {});
-
+        cx.set_global(Settings::test(cx));
        let text = "✅\t\tα\nβ\t\n🏀β\t\tγ";
        let buffer = MultiBuffer::build_simple(text, cx);
        let font_cache = cx.font_cache();
@@ -1642,8 +1639,7 @@ pub mod tests {

    #[gpui::test]
    fn test_max_point(cx: &mut gpui::AppContext) {
-        init_test(cx, |_| {});
-
+        cx.set_global(Settings::test(cx));
        let buffer = MultiBuffer::build_simple("aaa\n\t\tbbb", cx);
        let font_cache = cx.font_cache();
        let family_id = font_cache
@@ -1722,13 +1718,4 @@ pub mod tests {
        }
        chunks
    }
-
-    fn init_test(cx: &mut AppContext, f: impl Fn(&mut AllLanguageSettingsContent)) {
-        cx.foreground().forbid_parking();
-        cx.set_global(SettingsStore::test(cx));
-        language::init(cx);
-        cx.update_global::<SettingsStore, _, _>(|store, cx| {
-            store.update_user_settings::<AllLanguageSettings>(cx, f);
-        });
-    }
 }
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -833,7 +833,10 @@ impl<'a> Iterator for BlockChunks<'a> {

            return Some(Chunk {
                text: unsafe { std::str::from_utf8_unchecked(&NEWLINES[..line_count as usize]) },
-                ..Default::default()
+                syntax_highlight_id: None,
+                highlight_style: None,
+                diagnostic_severity: None,
+                is_unnecessary: false,
            });
        }

@@ -993,7 +996,7 @@ mod tests {
    use crate::multi_buffer::MultiBuffer;
    use gpui::{elements::Empty, Element};
    use rand::prelude::*;
-    use settings::SettingsStore;
+    use settings::Settings;
    use std::env;
    use util::RandomCharIter;

@@ -1013,7 +1016,7 @@ mod tests {

    #[gpui::test]
    fn test_basic_blocks(cx: &mut gpui::AppContext) {
-        init_test(cx);
+        cx.set_global(Settings::test(cx));

        let family_id = cx
            .font_cache()
@@ -1189,7 +1192,7 @@ mod tests {

    #[gpui::test]
    fn test_blocks_on_wrapped_lines(cx: &mut gpui::AppContext) {
-        init_test(cx);
+        cx.set_global(Settings::test(cx));

        let family_id = cx
            .font_cache()
@@ -1239,7 +1242,7 @@ mod tests {

    #[gpui::test(iterations = 100)]
    fn test_random_blocks(cx: &mut gpui::AppContext, mut rng: StdRng) {
-        init_test(cx);
+        cx.set_global(Settings::test(cx));

        let operations = env::var("OPERATIONS")
            .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
@@ -1647,11 +1650,6 @@ mod tests {
        }
    }

-    fn init_test(cx: &mut gpui::AppContext) {
-        cx.set_global(SettingsStore::test(cx));
-        theme::init((), cx);
-    }
-
    impl TransformBlock {
        fn as_custom(&self) -> Option<&Block> {
            match self {
--- a/crates/editor/src/display_map/fold_map.rs
+++ b/crates/editor/src/display_map/fold_map.rs
@@ -1065,11 +1065,13 @@ impl<'a> Iterator for FoldChunks<'a> {
            self.output_offset += output_text.len();
            return Some(Chunk {
                text: output_text,
+                syntax_highlight_id: None,
                highlight_style: self.ellipses_color.map(|color| HighlightStyle {
                    color: Some(color),
                    ..Default::default()
                }),
-                ..Default::default()
+                diagnostic_severity: None,
+                is_unnecessary: false,
            });
        }

@@ -1204,7 +1206,7 @@ mod tests {
    use crate::{MultiBuffer, ToPoint};
    use collections::HashSet;
    use rand::prelude::*;
-    use settings::SettingsStore;
+    use settings::Settings;
    use std::{cmp::Reverse, env, mem, sync::Arc};
    use sum_tree::TreeMap;
    use util::test::sample_text;
@@ -1213,7 +1215,7 @@ mod tests {

    #[gpui::test]
    fn test_basic_folds(cx: &mut gpui::AppContext) {
-        init_test(cx);
+        cx.set_global(Settings::test(cx));
        let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);
        let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
        let buffer_snapshot = buffer.read(cx).snapshot(cx);
@@ -1286,7 +1288,7 @@ mod tests {

    #[gpui::test]
    fn test_adjacent_folds(cx: &mut gpui::AppContext) {
-        init_test(cx);
+        cx.set_global(Settings::test(cx));
        let buffer = MultiBuffer::build_simple("abcdefghijkl", cx);
        let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
        let buffer_snapshot = buffer.read(cx).snapshot(cx);
@@ -1349,7 +1351,7 @@ mod tests {

    #[gpui::test]
    fn test_merging_folds_via_edit(cx: &mut gpui::AppContext) {
-        init_test(cx);
+        cx.set_global(Settings::test(cx));
        let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);
        let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
        let buffer_snapshot = buffer.read(cx).snapshot(cx);
@@ -1400,7 +1402,7 @@ mod tests {

    #[gpui::test(iterations = 100)]
    fn test_random_folds(cx: &mut gpui::AppContext, mut rng: StdRng) {
-        init_test(cx);
+        cx.set_global(Settings::test(cx));
        let operations = env::var("OPERATIONS")
            .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
            .unwrap_or(10);
@@ -1676,10 +1678,6 @@ mod tests {
        assert_eq!(snapshot.buffer_rows(3).collect::<Vec<_>>(), [Some(6)]);
    }

-    fn init_test(cx: &mut gpui::AppContext) {
-        cx.set_global(SettingsStore::test(cx));
-    }
-
    impl FoldMap {
        fn merged_fold_ranges(&self) -> Vec<Range<usize>> {
            let buffer = self.buffer.lock().clone();
--- a/crates/editor/src/display_map/suggestion_map.rs
+++ b/crates/editor/src/display_map/suggestion_map.rs
@@ -531,8 +531,10 @@ impl<'a> Iterator for SuggestionChunks<'a> {
            if let Some(chunk) = chunks.next() {
                return Some(Chunk {
                    text: chunk,
+                    syntax_highlight_id: None,
                    highlight_style: self.highlight_style,
-                    ..Default::default()
+                    diagnostic_severity: None,
+                    is_unnecessary: false,
                });
            } else {
                self.suggestion_chunks = None;
@@ -578,7 +580,7 @@ mod tests {
    use crate::{display_map::fold_map::FoldMap, MultiBuffer};
    use gpui::AppContext;
    use rand::{prelude::StdRng, Rng};
-    use settings::SettingsStore;
+    use settings::Settings;
    use std::{
        env,
        ops::{Bound, RangeBounds},
@@ -631,8 +633,7 @@ mod tests {

    #[gpui::test(iterations = 100)]
    fn test_random_suggestions(cx: &mut AppContext, mut rng: StdRng) {
-        init_test(cx);
-
+        cx.set_global(Settings::test(cx));
        let operations = env::var("OPERATIONS")
            .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
            .unwrap_or(10);
@@ -835,11 +836,6 @@ mod tests {
        }
    }

-    fn init_test(cx: &mut AppContext) {
-        cx.set_global(SettingsStore::test(cx));
-        theme::init((), cx);
-    }
-
    impl SuggestionMap {
        pub fn randomly_mutate(
            &self,
--- a/crates/editor/src/display_map/tab_map.rs
+++ b/crates/editor/src/display_map/tab_map.rs
@@ -268,7 +268,6 @@ impl TabSnapshot {
            tab_size: self.tab_size,
            chunk: Chunk {
                text: &SPACES[0..(to_next_stop as usize)],
-                is_tab: true,
                ..Default::default()
            },
            inside_leading_tab: to_next_stop > 0,
@@ -546,7 +545,6 @@ impl<'a> Iterator for TabChunks<'a> {
                        self.output_position = next_output_position;
                        return Some(Chunk {
                            text: &SPACES[..len as usize],
-                            is_tab: true,
                            ..self.chunk
                        });
                    }
@@ -656,56 +654,6 @@ mod tests {
        assert_eq!(tab_snapshot.text(), input);
    }

-    #[gpui::test]
-    fn test_marking_tabs(cx: &mut gpui::AppContext) {
-        let input = "\t \thello";
-
-        let buffer = MultiBuffer::build_simple(&input, cx);
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, fold_snapshot) = FoldMap::new(buffer_snapshot.clone());
-        let (_, suggestion_snapshot) = SuggestionMap::new(fold_snapshot);
-        let (_, tab_snapshot) = TabMap::new(suggestion_snapshot, 4.try_into().unwrap());
-
-        assert_eq!(
-            chunks(&tab_snapshot, TabPoint::zero()),
-            vec![
-                ("    ".to_string(), true),
-                (" ".to_string(), false),
-                ("   ".to_string(), true),
-                ("hello".to_string(), false),
-            ]
-        );
-        assert_eq!(
-            chunks(&tab_snapshot, TabPoint::new(0, 2)),
-            vec![
-                ("  ".to_string(), true),
-                (" ".to_string(), false),
-                ("   ".to_string(), true),
-                ("hello".to_string(), false),
-            ]
-        );
-
-        fn chunks(snapshot: &TabSnapshot, start: TabPoint) -> Vec<(String, bool)> {
-            let mut chunks = Vec::new();
-            let mut was_tab = false;
-            let mut text = String::new();
-            for chunk in snapshot.chunks(start..snapshot.max_point(), false, None, None) {
-                if chunk.is_tab != was_tab {
-                    if !text.is_empty() {
-                        chunks.push((mem::take(&mut text), was_tab));
-                    }
-                    was_tab = chunk.is_tab;
-                }
-                text.push_str(chunk.text);
-            }
-
-            if !text.is_empty() {
-                chunks.push((text, was_tab));
-            }
-            chunks
-        }
-    }
-
    #[gpui::test(iterations = 100)]
    fn test_random_tabs(cx: &mut gpui::AppContext, mut rng: StdRng) {
        let tab_size = NonZeroU32::new(rng.gen_range(1..=4)).unwrap();
--- a/crates/editor/src/display_map/wrap_map.rs
+++ b/crates/editor/src/display_map/wrap_map.rs
@@ -1043,16 +1043,16 @@ mod tests {
    };
    use gpui::test::observe;
    use rand::prelude::*;
-    use settings::SettingsStore;
+    use settings::Settings;
    use smol::stream::StreamExt;
    use std::{cmp, env, num::NonZeroU32};
    use text::Rope;

    #[gpui::test(iterations = 100)]
    async fn test_random_wraps(cx: &mut gpui::TestAppContext, mut rng: StdRng) {
-        init_test(cx);
-
+        cx.update(|cx| cx.set_global(Settings::test(cx)));
        cx.foreground().set_block_on_ticks(0..=50);
+        cx.foreground().forbid_parking();
        let operations = env::var("OPERATIONS")
            .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
            .unwrap_or(10);
@@ -1287,14 +1287,6 @@ mod tests {
        wrap_map.read_with(cx, |map, _| assert!(map.pending_edits.is_empty()));
    }

-    fn init_test(cx: &mut gpui::TestAppContext) {
-        cx.foreground().forbid_parking();
-        cx.update(|cx| {
-            cx.set_global(SettingsStore::test(cx));
-            theme::init((), cx);
-        });
-    }
-
    fn wrap_text(
        unwrapped_text: &str,
        wrap_width: Option<f32>,
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -1,6 +1,5 @@
 mod blink_manager;
 pub mod display_map;
-mod editor_settings;
 mod element;

 mod git;
@@ -20,17 +19,15 @@ mod editor_tests;
 #[cfg(any(test, feature = "test-support"))]
 pub mod test;

-use ::git::diff::DiffHunk;
 use aho_corasick::AhoCorasick;
 use anyhow::{anyhow, Result};
 use blink_manager::BlinkManager;
-use client::{ClickhouseEvent, TelemetrySettings};
+use client::ClickhouseEvent;
 use clock::ReplicaId;
 use collections::{BTreeMap, Bound, HashMap, HashSet, VecDeque};
 use copilot::Copilot;
 pub use display_map::DisplayPoint;
 use display_map::*;
-pub use editor_settings::EditorSettings;
 pub use element::*;
 use futures::FutureExt;
 use fuzzy::{StringMatch, StringMatchCandidate};
@@ -54,7 +51,6 @@ pub use items::MAX_TAB_TITLE_LEN;
 use itertools::Itertools;
 pub use language::{char_kind, CharKind};
 use language::{
-    language_settings::{self, all_language_settings},
    AutoindentMode, BracketPair, Buffer, CodeAction, CodeLabel, Completion, CursorShape,
    Diagnostic, DiagnosticSeverity, File, IndentKind, IndentSize, Language, OffsetRangeExt,
    OffsetUtf16, Point, Selection, SelectionGoal, TransactionId,
@@ -74,7 +70,7 @@ use scroll::{
 };
 use selections_collection::{resolve_multiple, MutableSelectionsCollection, SelectionsCollection};
 use serde::{Deserialize, Serialize};
-use settings::SettingsStore;
+use settings::Settings;
 use smallvec::SmallVec;
 use snippet::Snippet;
 use std::{
@@ -89,7 +85,7 @@ use std::{
    time::{Duration, Instant},
 };
 pub use sum_tree::Bias;
-use theme::{DiagnosticStyle, Theme, ThemeSettings};
+use theme::{DiagnosticStyle, Theme};
 use util::{post_inc, RangeExt, ResultExt, TryFutureExt};
 use workspace::{ItemNavHistory, ViewId, Workspace};

@@ -216,8 +212,6 @@ actions!(
        MoveToNextSubwordEnd,
        MoveToBeginningOfLine,
        MoveToEndOfLine,
-        MoveToStartOfParagraph,
-        MoveToEndOfParagraph,
        MoveToBeginning,
        MoveToEnd,
        SelectUp,
@@ -228,8 +222,6 @@ actions!(
        SelectToPreviousSubwordStart,
        SelectToNextWordEnd,
        SelectToNextSubwordEnd,
-        SelectToStartOfParagraph,
-        SelectToEndOfParagraph,
        SelectToBeginning,
        SelectToEnd,
        SelectAll,
@@ -294,12 +286,7 @@ pub enum Direction {
    Next,
 }

-pub fn init_settings(cx: &mut AppContext) {
-    settings::register::<EditorSettings>(cx);
-}
-
 pub fn init(cx: &mut AppContext) {
-    init_settings(cx);
    cx.add_action(Editor::new_file);
    cx.add_action(Editor::cancel);
    cx.add_action(Editor::newline);
@@ -341,8 +328,6 @@ pub fn init(cx: &mut AppContext) {
    cx.add_action(Editor::move_to_next_subword_end);
    cx.add_action(Editor::move_to_beginning_of_line);
    cx.add_action(Editor::move_to_end_of_line);
-    cx.add_action(Editor::move_to_start_of_paragraph);
-    cx.add_action(Editor::move_to_end_of_paragraph);
    cx.add_action(Editor::move_to_beginning);
    cx.add_action(Editor::move_to_end);
    cx.add_action(Editor::select_up);
@@ -355,8 +340,6 @@ pub fn init(cx: &mut AppContext) {
    cx.add_action(Editor::select_to_next_subword_end);
    cx.add_action(Editor::select_to_beginning_of_line);
    cx.add_action(Editor::select_to_end_of_line);
-    cx.add_action(Editor::select_to_start_of_paragraph);
-    cx.add_action(Editor::select_to_end_of_paragraph);
    cx.add_action(Editor::select_to_beginning);
    cx.add_action(Editor::select_to_end);
    cx.add_action(Editor::select_all);
@@ -453,7 +436,7 @@ pub enum EditorMode {
    Full,
 }

-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub enum SoftWrap {
    None,
    EditorWidth,
@@ -488,7 +471,7 @@ pub struct Editor {
    select_larger_syntax_node_stack: Vec<Box<[Selection<usize>]>>,
    ime_transaction: Option<TransactionId>,
    active_diagnostics: Option<ActiveDiagnosticGroup>,
-    soft_wrap_mode_override: Option<language_settings::SoftWrap>,
+    soft_wrap_mode_override: Option<settings::SoftWrap>,
    get_field_editor_theme: Option<Arc<GetFieldEditorTheme>>,
    override_text_style: Option<Box<OverrideTextStyle>>,
    project: Option<ModelHandle<Project>>,
@@ -1244,10 +1227,9 @@ impl Editor {
        get_field_editor_theme: Option<Arc<GetFieldEditorTheme>>,
        cx: &mut ViewContext<Self>,
    ) -> Self {
-        let editor_view_id = cx.view_id();
        let display_map = cx.add_model(|cx| {
-            let settings = settings::get::<ThemeSettings>(cx);
-            let style = build_style(settings, get_field_editor_theme.as_deref(), None, cx);
+            let settings = cx.global::<Settings>();
+            let style = build_style(&*settings, get_field_editor_theme.as_deref(), None, cx);
            DisplayMap::new(
                buffer.clone(),
                style.text.font_id,
@@ -1264,17 +1246,7 @@ impl Editor {
        let blink_manager = cx.add_model(|cx| BlinkManager::new(CURSOR_BLINK_INTERVAL, cx));

        let soft_wrap_mode_override =
-            (mode == EditorMode::SingleLine).then(|| language_settings::SoftWrap::None);
-
-        let mut project_subscription = None;
-        if mode == EditorMode::Full && buffer.read(cx).is_singleton() {
-            if let Some(project) = project.as_ref() {
-                project_subscription = Some(cx.observe(project, |_, _, cx| {
-                    cx.emit(Event::TitleChanged);
-                }))
-            }
-        }
-
+            (mode == EditorMode::SingleLine).then(|| settings::SoftWrap::None);
        let mut this = Self {
            handle: cx.weak_handle(),
            buffer: buffer.clone(),
@@ -1302,8 +1274,7 @@ impl Editor {
            background_highlights: Default::default(),
            nav_history: None,
            context_menu: None,
-            mouse_context_menu: cx
-                .add_view(|cx| context_menu::ContextMenu::new(editor_view_id, cx)),
+            mouse_context_menu: cx.add_view(context_menu::ContextMenu::new),
            completion_tasks: Default::default(),
            next_completion_id: 0,
            available_code_actions: Default::default(),
@@ -1328,14 +1299,9 @@ impl Editor {
                cx.subscribe(&buffer, Self::on_buffer_event),
                cx.observe(&display_map, Self::on_display_map_changed),
                cx.observe(&blink_manager, |_, _, cx| cx.notify()),
-                cx.observe_global::<SettingsStore, _>(Self::settings_changed),
+                cx.observe_global::<Settings, _>(Self::settings_changed),
            ],
        };
-
-        if let Some(project_subscription) = project_subscription {
-            this._subscriptions.push(project_subscription);
-        }
-
        this.end_selection(cx);
        this.scroll_manager.show_scrollbar(cx);

@@ -1347,7 +1313,7 @@ impl Editor {
            cx.set_global(ScrollbarAutoHide(should_auto_hide_scrollbars));
        }

-        this.report_editor_event("open", None, cx);
+        this.report_editor_event("open", cx);
        this
    }

@@ -1427,7 +1393,7 @@ impl Editor {

    fn style(&self, cx: &AppContext) -> EditorStyle {
        build_style(
-            settings::get::<ThemeSettings>(cx),
+            cx.global::<Settings>(),
            self.get_field_editor_theme.as_deref(),
            self.override_text_style.as_deref(),
            cx,
@@ -2385,7 +2351,7 @@ impl Editor {
    }

    fn trigger_completion_on_input(&mut self, text: &str, cx: &mut ViewContext<Self>) {
-        if !settings::get::<EditorSettings>(cx).show_completions_on_input {
+        if !cx.global::<Settings>().show_completions_on_input {
            return;
        }

@@ -2628,7 +2594,7 @@ impl Editor {
        let old_text = buffer.text_for_range(old_range.clone()).collect::<String>();

        let newest_selection = self.selections.newest_anchor();
-        if newest_selection.start.buffer_id != Some(buffer_handle.read(cx).remote_id()) {
+        if newest_selection.start.buffer_id != Some(buffer_handle.id()) {
            return None;
        }

@@ -2836,7 +2802,7 @@ impl Editor {
                    ),
                );
            }
-            multibuffer.push_transaction(entries.iter().map(|(b, t)| (b, t)), cx);
+            multibuffer.push_transaction(entries.iter().map(|(b, t)| (b, t)));
            multibuffer
        });

@@ -3114,8 +3080,6 @@ impl Editor {
                copilot
                    .update(cx, |copilot, cx| copilot.accept_completion(completion, cx))
                    .detach_and_log_err(cx);
-
-                self.report_copilot_event(Some(completion.uuid.clone()), true, cx)
            }
            self.insert_with_autoindent_mode(&suggestion.text.to_string(), None, cx);
            cx.notify();
@@ -3133,8 +3097,6 @@ impl Editor {
                        copilot.discard_completions(&self.copilot_state.completions, cx)
                    })
                    .detach_and_log_err(cx);
-
-                self.report_copilot_event(None, false, cx)
            }

            self.display_map
@@ -3152,12 +3114,17 @@ impl Editor {
        snapshot: &MultiBufferSnapshot,
        cx: &mut ViewContext<Self>,
    ) -> bool {
-        let path = snapshot.file_at(location).map(|file| file.path().as_ref());
+        let settings = cx.global::<Settings>();
+
+        let path = snapshot.file_at(location).map(|file| file.path());
        let language_name = snapshot
            .language_at(location)
            .map(|language| language.name());
-        let settings = all_language_settings(cx);
-        settings.copilot_enabled(language_name.as_deref(), path)
+        if !settings.show_copilot_suggestions(language_name.as_deref(), path.map(|p| p.as_ref())) {
+            return false;
+        }
+
+        true
    }

    fn has_active_copilot_suggestion(&self, cx: &AppContext) -> bool {
@@ -3458,9 +3425,12 @@ impl Editor {
                        {
                            let indent_size =
                                buffer.indent_size_for_line(line_buffer_range.start.row);
+                            let language_name = buffer
+                                .language_at(line_buffer_range.start)
+                                .map(|language| language.name());
                            let indent_len = match indent_size.kind {
                                IndentKind::Space => {
-                                    buffer.settings_at(line_buffer_range.start, cx).tab_size
+                                    cx.global::<Settings>().tab_size(language_name.as_deref())
                                }
                                IndentKind::Tab => NonZeroU32::new(1).unwrap(),
                            };
@@ -3572,11 +3542,12 @@ impl Editor {
            }

            // Otherwise, insert a hard or soft tab.
-            let settings = buffer.settings_at(cursor, cx);
-            let tab_size = if settings.hard_tabs {
+            let settings = cx.global::<Settings>();
+            let language_name = buffer.language_at(cursor, cx).map(|l| l.name());
+            let tab_size = if settings.hard_tabs(language_name.as_deref()) {
                IndentSize::tab()
            } else {
-                let tab_size = settings.tab_size.get();
+                let tab_size = settings.tab_size(language_name.as_deref()).get();
                let char_column = snapshot
                    .text_for_range(Point::new(cursor.row, 0)..cursor)
                    .flat_map(str::chars)
@@ -3629,9 +3600,10 @@ impl Editor {
        delta_for_start_row: u32,
        cx: &AppContext,
    ) -> u32 {
-        let settings = buffer.settings_at(selection.start, cx);
-        let tab_size = settings.tab_size.get();
-        let indent_kind = if settings.hard_tabs {
+        let language_name = buffer.language_at(selection.start, cx).map(|l| l.name());
+        let settings = cx.global::<Settings>();
+        let tab_size = settings.tab_size(language_name.as_deref()).get();
+        let indent_kind = if settings.hard_tabs(language_name.as_deref()) {
            IndentKind::Tab
        } else {
            IndentKind::Space
@@ -3700,8 +3672,11 @@ impl Editor {
            let buffer = self.buffer.read(cx);
            let snapshot = buffer.snapshot(cx);
            for selection in &selections {
-                let settings = buffer.settings_at(selection.start, cx);
-                let tab_size = settings.tab_size.get();
+                let language_name = buffer.language_at(selection.start, cx).map(|l| l.name());
+                let tab_size = cx
+                    .global::<Settings>()
+                    .tab_size(language_name.as_deref())
+                    .get();
                let mut rows = selection.spanned_rows(false, &display_map);

                // Avoid re-outdenting a row that has already been outdented by a
@@ -4761,80 +4736,6 @@ impl Editor {
        });
    }

-    pub fn move_to_start_of_paragraph(
-        &mut self,
-        _: &MoveToStartOfParagraph,
-        cx: &mut ViewContext<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate_action();
-            return;
-        }
-
-        self.change_selections(Some(Autoscroll::fit()), cx, |s| {
-            s.move_with(|map, selection| {
-                selection.collapse_to(
-                    movement::start_of_paragraph(map, selection.head()),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn move_to_end_of_paragraph(
-        &mut self,
-        _: &MoveToEndOfParagraph,
-        cx: &mut ViewContext<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate_action();
-            return;
-        }
-
-        self.change_selections(Some(Autoscroll::fit()), cx, |s| {
-            s.move_with(|map, selection| {
-                selection.collapse_to(
-                    movement::end_of_paragraph(map, selection.head()),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_start_of_paragraph(
-        &mut self,
-        _: &SelectToStartOfParagraph,
-        cx: &mut ViewContext<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate_action();
-            return;
-        }
-
-        self.change_selections(Some(Autoscroll::fit()), cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (movement::start_of_paragraph(map, head), SelectionGoal::None)
-            });
-        })
-    }
-
-    pub fn select_to_end_of_paragraph(
-        &mut self,
-        _: &SelectToEndOfParagraph,
-        cx: &mut ViewContext<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate_action();
-            return;
-        }
-
-        self.change_selections(Some(Autoscroll::fit()), cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (movement::end_of_paragraph(map, head), SelectionGoal::None)
-            });
-        })
-    }
-
    pub fn move_to_beginning(&mut self, _: &MoveToBeginning, cx: &mut ViewContext<Self>) {
        if matches!(self.mode, EditorMode::SingleLine) {
            cx.propagate_action();
@@ -5643,91 +5544,68 @@ impl Editor {
    }

    fn go_to_hunk(&mut self, _: &GoToHunk, cx: &mut ViewContext<Self>) {
-        let snapshot = self
-            .display_map
-            .update(cx, |display_map, cx| display_map.snapshot(cx));
-        let selection = self.selections.newest::<Point>(cx);
-
-        if !self.seek_in_direction(
-            &snapshot,
-            selection.head(),
-            false,
-            snapshot
-                .buffer_snapshot
-                .git_diff_hunks_in_range((selection.head().row + 1)..u32::MAX),
-            cx,
-        ) {
-            let wrapped_point = Point::zero();
-            self.seek_in_direction(
-                &snapshot,
-                wrapped_point,
-                true,
-                snapshot
-                    .buffer_snapshot
-                    .git_diff_hunks_in_range((wrapped_point.row + 1)..u32::MAX),
-                cx,
-            );
-        }
+        self.go_to_hunk_impl(Direction::Next, cx)
    }

    fn go_to_prev_hunk(&mut self, _: &GoToPrevHunk, cx: &mut ViewContext<Self>) {
+        self.go_to_hunk_impl(Direction::Prev, cx)
+    }
+
+    pub fn go_to_hunk_impl(&mut self, direction: Direction, cx: &mut ViewContext<Self>) {
        let snapshot = self
            .display_map
            .update(cx, |display_map, cx| display_map.snapshot(cx));
        let selection = self.selections.newest::<Point>(cx);

-        if !self.seek_in_direction(
-            &snapshot,
-            selection.head(),
-            false,
-            snapshot
-                .buffer_snapshot
-                .git_diff_hunks_in_range_rev(0..selection.head().row),
-            cx,
-        ) {
-            let wrapped_point = snapshot.buffer_snapshot.max_point();
-            self.seek_in_direction(
-                &snapshot,
-                wrapped_point,
-                true,
+        fn seek_in_direction(
+            this: &mut Editor,
+            snapshot: &DisplaySnapshot,
+            initial_point: Point,
+            is_wrapped: bool,
+            direction: Direction,
+            cx: &mut ViewContext<Editor>,
+        ) -> bool {
+            let hunks = if direction == Direction::Next {
                snapshot
                    .buffer_snapshot
-                    .git_diff_hunks_in_range_rev(0..wrapped_point.row),
-                cx,
-            );
+                    .git_diff_hunks_in_range(initial_point.row..u32::MAX, false)
+            } else {
+                snapshot
+                    .buffer_snapshot
+                    .git_diff_hunks_in_range(0..initial_point.row, true)
+            };
+
+            let display_point = initial_point.to_display_point(snapshot);
+            let mut hunks = hunks
+                .map(|hunk| diff_hunk_to_display(hunk, &snapshot))
+                .skip_while(|hunk| {
+                    if is_wrapped {
+                        false
+                    } else {
+                        hunk.contains_display_row(display_point.row())
+                    }
+                })
+                .dedup();
+
+            if let Some(hunk) = hunks.next() {
+                this.change_selections(Some(Autoscroll::fit()), cx, |s| {
+                    let row = hunk.start_display_row();
+                    let point = DisplayPoint::new(row, 0);
+                    s.select_display_ranges([point..point]);
+                });
+
+                true
+            } else {
+                false
+            }
        }
-    }

-    fn seek_in_direction(
-        &mut self,
-        snapshot: &DisplaySnapshot,
-        initial_point: Point,
-        is_wrapped: bool,
-        hunks: impl Iterator<Item = DiffHunk<u32>>,
-        cx: &mut ViewContext<Editor>,
-    ) -> bool {
-        let display_point = initial_point.to_display_point(snapshot);
-        let mut hunks = hunks
-            .map(|hunk| diff_hunk_to_display(hunk, &snapshot))
-            .skip_while(|hunk| {
-                if is_wrapped {
-                    false
-                } else {
-                    hunk.contains_display_row(display_point.row())
-                }
-            })
-            .dedup();
-
-        if let Some(hunk) = hunks.next() {
-            self.change_selections(Some(Autoscroll::fit()), cx, |s| {
-                let row = hunk.start_display_row();
-                let point = DisplayPoint::new(row, 0);
-                s.select_display_ranges([point..point]);
-            });
-
-            true
-        } else {
-            false
+        if !seek_in_direction(self, &snapshot, selection.head(), false, direction, cx) {
+            let wrapped_point = match direction {
+                Direction::Next => Point::zero(),
+                Direction::Prev => snapshot.buffer_snapshot.max_point(),
+            };
+            seek_in_direction(self, &snapshot, wrapped_point, true, direction, cx);
        }
    }

@@ -5886,7 +5764,7 @@ impl Editor {
        cx: &mut ViewContext<Workspace>,
    ) {
        // If there are multiple definitions, open them in a multibuffer
-        locations.sort_by_key(|location| location.buffer.read(cx).remote_id());
+        locations.sort_by_key(|location| location.buffer.id());
        let mut locations = locations.into_iter().peekable();
        let mut ranges_to_highlight = Vec::new();

@@ -6181,7 +6059,7 @@ impl Editor {
            buffer.update(&mut cx, |buffer, cx| {
                if let Some(transaction) = transaction {
                    if !buffer.is_singleton() {
-                        buffer.push_transaction(&transaction.0, cx);
+                        buffer.push_transaction(&transaction.0);
                    }
                }

@@ -6559,24 +6437,27 @@ impl Editor {
    }

    pub fn soft_wrap_mode(&self, cx: &AppContext) -> SoftWrap {
-        let settings = self.buffer.read(cx).settings_at(0, cx);
+        let language_name = self
+            .buffer
+            .read(cx)
+            .as_singleton()
+            .and_then(|singleton_buffer| singleton_buffer.read(cx).language())
+            .map(|l| l.name());
+
+        let settings = cx.global::<Settings>();
        let mode = self
            .soft_wrap_mode_override
-            .unwrap_or_else(|| settings.soft_wrap);
+            .unwrap_or_else(|| settings.soft_wrap(language_name.as_deref()));
        match mode {
-            language_settings::SoftWrap::None => SoftWrap::None,
-            language_settings::SoftWrap::EditorWidth => SoftWrap::EditorWidth,
-            language_settings::SoftWrap::PreferredLineLength => {
-                SoftWrap::Column(settings.preferred_line_length)
+            settings::SoftWrap::None => SoftWrap::None,
+            settings::SoftWrap::EditorWidth => SoftWrap::EditorWidth,
+            settings::SoftWrap::PreferredLineLength => {
+                SoftWrap::Column(settings.preferred_line_length(language_name.as_deref()))
            }
        }
    }

-    pub fn set_soft_wrap_mode(
-        &mut self,
-        mode: language_settings::SoftWrap,
-        cx: &mut ViewContext<Self>,
-    ) {
+    pub fn set_soft_wrap_mode(&mut self, mode: settings::SoftWrap, cx: &mut ViewContext<Self>) {
        self.soft_wrap_mode_override = Some(mode);
        cx.notify();
    }
@@ -6591,8 +6472,8 @@ impl Editor {
            self.soft_wrap_mode_override.take();
        } else {
            let soft_wrap = match self.soft_wrap_mode(cx) {
-                SoftWrap::None => language_settings::SoftWrap::EditorWidth,
-                SoftWrap::EditorWidth | SoftWrap::Column(_) => language_settings::SoftWrap::None,
+                SoftWrap::None => settings::SoftWrap::EditorWidth,
+                SoftWrap::EditorWidth | SoftWrap::Column(_) => settings::SoftWrap::None,
            };
            self.soft_wrap_mode_override = Some(soft_wrap);
        }
@@ -6667,8 +6548,8 @@ impl Editor {
        let buffer = &snapshot.buffer_snapshot;
        let start = buffer.anchor_before(0);
        let end = buffer.anchor_after(buffer.len());
-        let theme = theme::current(cx);
-        self.background_highlights_in_range(start..end, &snapshot, theme.as_ref())
+        let theme = cx.global::<Settings>().theme.as_ref();
+        self.background_highlights_in_range(start..end, &snapshot, theme)
    }

    fn document_highlights_for_position<'a>(
@@ -6978,88 +6859,44 @@ impl Editor {
            .collect()
    }

-    fn report_copilot_event(
-        &self,
-        suggestion_id: Option<String>,
-        suggestion_accepted: bool,
-        cx: &AppContext,
-    ) {
-        let Some(project) = &self.project else {
-            return
-        };
+    fn report_editor_event(&self, name: &'static str, cx: &AppContext) {
+        if let Some((project, file)) = self.project.as_ref().zip(
+            self.buffer
+                .read(cx)
+                .as_singleton()
+                .and_then(|b| b.read(cx).file()),
+        ) {
+            let settings = cx.global::<Settings>();

-        // If None, we are either getting suggestions in a new, unsaved file, or in a file without an extension
-        let file_extension = self
-            .buffer
-            .read(cx)
-            .as_singleton()
-            .and_then(|b| b.read(cx).file())
-            .and_then(|file| Path::new(file.file_name(cx)).extension())
-            .and_then(|e| e.to_str())
-            .map(|a| a.to_string());
-
-        let telemetry = project.read(cx).client().telemetry().clone();
-        let telemetry_settings = *settings::get::<TelemetrySettings>(cx);
-
-        let event = ClickhouseEvent::Copilot {
-            suggestion_id,
-            suggestion_accepted,
-            file_extension,
-        };
-        telemetry.report_clickhouse_event(event, telemetry_settings);
-    }
-
-    fn report_editor_event(
-        &self,
-        name: &'static str,
-        file_extension: Option<String>,
-        cx: &AppContext,
-    ) {
-        let Some(project) = &self.project else {
-            return
-        };
-
-        // If None, we are in a file without an extension
-        let file_extension = file_extension.or(self
-            .buffer
-            .read(cx)
-            .as_singleton()
-            .and_then(|b| b.read(cx).file())
-            .and_then(|file| Path::new(file.file_name(cx)).extension())
-            .and_then(|e| e.to_str())
-            .map(|a| a.to_string()));
-
-        let vim_mode = cx
-            .global::<SettingsStore>()
-            .untyped_user_settings()
-            .get("vim_mode")
-            == Some(&serde_json::Value::Bool(true));
-        let telemetry_settings = *settings::get::<TelemetrySettings>(cx);
-        let copilot_enabled = all_language_settings(cx).copilot_enabled(None, None);
-        let copilot_enabled_for_language = self
-            .buffer
-            .read(cx)
-            .settings_at(0, cx)
-            .show_copilot_suggestions;
-
-        let telemetry = project.read(cx).client().telemetry().clone();
-        telemetry.report_mixpanel_event(
-            match name {
-                "open" => "open editor",
-                "save" => "save editor",
-                _ => name,
-            },
-            json!({ "File Extension": file_extension, "Vim Mode": vim_mode, "In Clickhouse": true  }),
-            telemetry_settings,
-        );
-        let event = ClickhouseEvent::Editor {
-            file_extension,
-            vim_mode,
-            operation: name,
-            copilot_enabled,
-            copilot_enabled_for_language,
-        };
-        telemetry.report_clickhouse_event(event, telemetry_settings)
+            let extension = Path::new(file.file_name(cx))
+                .extension()
+                .and_then(|e| e.to_str());
+            let telemetry = project.read(cx).client().telemetry().clone();
+            telemetry.report_mixpanel_event(
+                match name {
+                    "open" => "open editor",
+                    "save" => "save editor",
+                    _ => name,
+                },
+                json!({ "File Extension": extension, "Vim Mode": settings.vim_mode, "In Clickhouse": true  }),
+                settings.telemetry(),
+            );
+            let event = ClickhouseEvent::Editor {
+                file_extension: extension.map(ToString::to_string),
+                vim_mode: settings.vim_mode,
+                operation: name,
+                copilot_enabled: settings.features.copilot,
+                copilot_enabled_for_language: settings.show_copilot_suggestions(
+                    self.language_at(0, cx)
+                        .map(|language| language.name())
+                        .as_deref(),
+                    self.file_at(0, cx)
+                        .map(|file| file.path().clone())
+                        .as_deref(),
+                ),
+            };
+            telemetry.report_clickhouse_event(event, settings.telemetry())
+        }
    }

    /// Copy the highlighted chunks to the clipboard as JSON. The format is an array of lines,
@@ -7091,7 +6928,7 @@ impl Editor {
        let mut lines = Vec::new();
        let mut line: VecDeque<Chunk> = VecDeque::new();

-        let theme = &theme::current(cx).editor.syntax;
+        let theme = &cx.global::<Settings>().theme.editor.syntax;

        for chunk in chunks {
            let highlight = chunk.syntax_highlight_id.and_then(|id| id.name(theme));
@@ -7201,7 +7038,6 @@ pub enum Event {
    BufferEdited,
    Edited,
    Reparsed,
-    Focused,
    Blurred,
    DirtyChanged,
    Saved,
@@ -7255,7 +7091,6 @@ impl View for Editor {
    fn focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {
        if cx.is_self_focused() {
            let focused_event = EditorFocused(cx.handle());
-            cx.emit(Event::Focused);
            cx.emit_global(focused_event);
        }
        if let Some(rename) = self.pending_rename.as_ref() {
@@ -7330,7 +7165,7 @@ impl View for Editor {
        false
    }

-    fn update_keymap_context(&self, keymap: &mut KeymapContext, cx: &AppContext) {
+    fn update_keymap_context(&self, keymap: &mut KeymapContext, _: &AppContext) {
        Self::reset_to_default_keymap_context(keymap);
        let mode = match self.mode {
            EditorMode::SingleLine => "single_line",
@@ -7346,18 +7181,10 @@ impl View for Editor {
            Some(ContextMenu::CodeActions(_)) => keymap.add_identifier("showing_code_actions"),
            None => {}
        }
+
        for layer in self.keymap_context_layers.values() {
            keymap.extend(layer);
        }
-
-        if let Some(extension) = self
-            .buffer
-            .read(cx)
-            .as_singleton()
-            .and_then(|buffer| buffer.read(cx).file()?.path().extension()?.to_str())
-        {
-            keymap.add_key("extension", extension.to_string());
-        }
    }

    fn text_for_range(&self, range_utf16: Range<usize>, cx: &AppContext) -> Option<String> {
@@ -7523,7 +7350,7 @@ impl View for Editor {
 }

 fn build_style(
-    settings: &ThemeSettings,
+    settings: &Settings,
    get_field_editor_theme: Option<&GetFieldEditorTheme>,
    override_text_style: Option<&OverrideTextStyle>,
    cx: &AppContext,
@@ -7553,7 +7380,7 @@ fn build_style(
        let font_id = font_cache
            .select_font(font_family_id, &font_properties)
            .unwrap();
-        let font_size = settings.buffer_font_size(cx);
+        let font_size = settings.buffer_font_size;
        EditorStyle {
            text: TextStyle {
                color: settings.theme.editor.text_color,
@@ -7723,10 +7550,10 @@ pub fn diagnostic_block_renderer(diagnostic: Diagnostic, is_valid: bool) -> Rend
    }

    Arc::new(move |cx: &mut BlockContext| {
-        let settings = settings::get::<ThemeSettings>(cx);
+        let settings = cx.global::<Settings>();
        let theme = &settings.theme.editor;
        let style = diagnostic_style(diagnostic.severity, is_valid, theme);
-        let font_size = (style.text_scale_factor * settings.buffer_font_size(cx)).round();
+        let font_size = (style.text_scale_factor * settings.buffer_font_size).round();
        Flex::column()
            .with_children(highlighted_lines.iter().map(|(line, highlights)| {
                Label::new(
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -1,54 +0,0 @@
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::Setting;
-
-#[derive(Deserialize)]
-pub struct EditorSettings {
-    pub cursor_blink: bool,
-    pub hover_popover_enabled: bool,
-    pub show_completions_on_input: bool,
-    pub scrollbar: Scrollbar,
-}
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
-pub struct Scrollbar {
-    pub show: ShowScrollbar,
-    pub git_diff: bool,
-}
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum ShowScrollbar {
-    Auto,
-    System,
-    Always,
-    Never,
-}
-
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
-pub struct EditorSettingsContent {
-    pub cursor_blink: Option<bool>,
-    pub hover_popover_enabled: Option<bool>,
-    pub show_completions_on_input: Option<bool>,
-    pub scrollbar: Option<ScrollbarContent>,
-}
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
-pub struct ScrollbarContent {
-    pub show: Option<ShowScrollbar>,
-    pub git_diff: Option<bool>,
-}
-
-impl Setting for EditorSettings {
-    const KEY: Option<&'static str> = None;
-
-    type FileContent = EditorSettingsContent;
-
-    fn load(
-        default_value: &Self::FileContent,
-        user_values: &[&Self::FileContent],
-        _: &gpui::AppContext,
-    ) -> anyhow::Result<Self> {
-        Self::load_via_json_merge(default_value, user_values)
-    }
-}
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -5,7 +5,6 @@ use super::{
 };
 use crate::{
    display_map::{BlockStyle, DisplaySnapshot, FoldStatus, TransformBlock},
-    editor_settings::ShowScrollbar,
    git::{diff_hunk_to_display, DisplayDiffHunk},
    hover_popover::{
        hide_hover, hover_at, HOVER_POPOVER_GAP, MIN_POPOVER_CHARACTER_WIDTH,
@@ -14,7 +13,7 @@ use crate::{
    link_go_to_definition::{
        go_to_fetched_definition, go_to_fetched_type_definition, update_go_to_definition_link,
    },
-    mouse_context_menu, EditorSettings, EditorStyle, GutterHover, UnfoldAt,
+    mouse_context_menu, EditorStyle, GutterHover, UnfoldAt,
 };
 use clock::ReplicaId;
 use collections::{BTreeMap, HashMap};
@@ -22,7 +21,7 @@ use git::diff::DiffHunkStatus;
 use gpui::{
    color::Color,
    elements::*,
-    fonts::{HighlightStyle, TextStyle, Underline},
+    fonts::{HighlightStyle, Underline},
    geometry::{
        rect::RectF,
        vector::{vec2f, Vector2F},
@@ -31,27 +30,23 @@ use gpui::{
    json::{self, ToJson},
    platform::{CursorStyle, Modifiers, MouseButton, MouseButtonEvent, MouseMovedEvent},
    text_layout::{self, Line, RunStyle, TextLayoutCache},
-    AnyElement, Axis, Border, CursorRegion, Element, EventContext, FontCache, LayoutContext,
-    MouseRegion, Quad, SceneBuilder, SizeConstraint, ViewContext, WindowContext,
+    AnyElement, Axis, Border, CursorRegion, Element, EventContext, MouseRegion, Quad, SceneBuilder,
+    SizeConstraint, ViewContext, WindowContext,
 };
 use itertools::Itertools;
 use json::json;
-use language::{
-    language_settings::ShowWhitespaceSetting, Bias, CursorShape, DiagnosticSeverity, OffsetUtf16,
-    Selection,
-};
+use language::{Bias, CursorShape, DiagnosticSeverity, OffsetUtf16, Selection};
 use project::ProjectPath;
+use settings::{GitGutter, Settings};
 use smallvec::SmallVec;
 use std::{
-    borrow::Cow,
    cmp::{self, Ordering},
    fmt::Write,
    iter,
    ops::Range,
    sync::Arc,
 };
-use text::Point;
-use workspace::{item::Item, GitGutterSetting, WorkspaceSettings};
+use workspace::item::Item;

 enum FoldMarkers {}

@@ -551,11 +546,11 @@ impl EditorElement {
        let scroll_top = scroll_position.y() * line_height;

        let show_gutter = matches!(
-            settings::get::<WorkspaceSettings>(cx)
-                .git
+            &cx.global::<Settings>()
+                .git_overrides
                .git_gutter
                .unwrap_or_default(),
-            GitGutterSetting::TrackedFiles
+            GitGutter::TrackedFiles
        );

        if show_gutter {
@@ -612,7 +607,7 @@ impl EditorElement {
        layout: &mut LayoutState,
        cx: &mut ViewContext<Editor>,
    ) {
-        let diff_style = &theme::current(cx).editor.diff.clone();
+        let diff_style = &cx.global::<Settings>().theme.editor.diff.clone();
        let line_height = layout.position_map.line_height;

        let scroll_position = layout.position_map.snapshot.scroll_position();
@@ -652,7 +647,7 @@ impl EditorElement {

                //TODO: This rendering is entirely a horrible hack
                DiffHunkStatus::Removed => {
-                    let row = display_row_range.start;
+                    let row = *display_row_range.start();

                    let offset = line_height / 2.;
                    let start_y = row as f32 * line_height - offset - scroll_top;
@@ -674,11 +669,11 @@ impl EditorElement {
                }
            };

-            let start_row = display_row_range.start;
-            let end_row = display_row_range.end;
+            let start_row = *display_row_range.start();
+            let end_row = *display_row_range.end();

            let start_y = start_row as f32 * line_height - scroll_top;
-            let end_y = end_row as f32 * line_height - scroll_top;
+            let end_y = end_row as f32 * line_height - scroll_top + line_height;

            let width = diff_style.width_em * line_height;
            let highlight_origin = bounds.origin() + vec2f(-width, start_y);
@@ -712,7 +707,6 @@ impl EditorElement {
        let scroll_left = scroll_position.x() * max_glyph_width;
        let content_origin = bounds.origin() + vec2f(layout.gutter_margin, 0.);
        let line_end_overshoot = 0.15 * layout.position_map.line_height;
-        let whitespace_setting = editor.buffer.read(cx).settings_at(0, cx).show_whitespaces;

        scene.push_layer(Some(bounds));

@@ -789,19 +783,11 @@ impl EditorElement {

        let mut cursors = SmallVec::<[Cursor; 32]>::new();
        let corner_radius = 0.15 * layout.position_map.line_height;
-        let mut invisible_display_ranges = SmallVec::<[Range<DisplayPoint>; 32]>::new();

        for (replica_id, selections) in &layout.selections {
-            let replica_id = *replica_id;
-            let selection_style = style.replica_selection_style(replica_id);
+            let selection_style = style.replica_selection_style(*replica_id);

            for selection in selections {
-                if !selection.range.is_empty()
-                    && (replica_id == local_replica_id
-                        || Some(replica_id) == editor.leader_replica_id)
-                {
-                    invisible_display_ranges.push(selection.range.clone());
-                }
                self.paint_highlighted_range(
                    scene,
                    selection.range.clone(),
@@ -815,15 +801,14 @@ impl EditorElement {
                    bounds,
                );

-                if editor.show_local_cursors(cx) || replica_id != local_replica_id {
+                if editor.show_local_cursors(cx) || *replica_id != local_replica_id {
                    let cursor_position = selection.head;
                    if layout
                        .visible_display_row_range
                        .contains(&cursor_position.row())
                    {
                        let cursor_row_layout = &layout.position_map.line_layouts
-                            [(cursor_position.row() - start_row) as usize]
-                            .line;
+                            [(cursor_position.row() - start_row) as usize];
                        let cursor_column = cursor_position.column() as usize;

                        let cursor_character_x = cursor_row_layout.x_for_index(cursor_column);
@@ -877,21 +862,20 @@ impl EditorElement {
        }

        if let Some(visible_text_bounds) = bounds.intersection(visible_bounds) {
-            for (ix, line_with_invisibles) in layout.position_map.line_layouts.iter().enumerate() {
+            // Draw glyphs
+            for (ix, line) in layout.position_map.line_layouts.iter().enumerate() {
                let row = start_row + ix as u32;
-                line_with_invisibles.draw(
-                    layout,
-                    row,
-                    scroll_top,
+                line.paint(
                    scene,
-                    content_origin,
-                    scroll_left,
+                    content_origin
+                        + vec2f(
+                            -scroll_left,
+                            row as f32 * layout.position_map.line_height - scroll_top,
+                        ),
                    visible_text_bounds,
-                    whitespace_setting,
-                    &invisible_display_ranges,
-                    visible_bounds,
+                    layout.position_map.line_height,
                    cx,
-                )
+                );
            }
        }

@@ -904,7 +888,7 @@ impl EditorElement {
        if let Some((position, context_menu)) = layout.context_menu.as_mut() {
            scene.push_stacking_context(None, None);
            let cursor_row_layout =
-                &layout.position_map.line_layouts[(position.row() - start_row) as usize].line;
+                &layout.position_map.line_layouts[(position.row() - start_row) as usize];
            let x = cursor_row_layout.x_for_index(position.column() as usize) - scroll_left;
            let y = (position.row() + 1) as f32 * layout.position_map.line_height - scroll_top;
            let mut list_origin = content_origin + vec2f(x, y);
@@ -937,7 +921,7 @@ impl EditorElement {

            // This is safe because we check on layout whether the required row is available
            let hovered_row_layout =
-                &layout.position_map.line_layouts[(position.row() - start_row) as usize].line;
+                &layout.position_map.line_layouts[(position.row() - start_row) as usize];

            // Minimum required size: Take the first popover, and add 1.5 times the minimum popover
            // height. This is the size we will use to decide whether to render popovers above or below
@@ -1028,16 +1012,15 @@ impl EditorElement {
        let mut first_row_y_offset = 0.0;

        // Impose a minimum height on the scrollbar thumb
-        let row_height = height / max_row;
        let min_thumb_height =
            style.min_height_factor * cx.font_cache.line_height(self.style.text.font_size);
-        let thumb_height = (row_range.end - row_range.start) * row_height;
+        let thumb_height = (row_range.end - row_range.start) * height / max_row;
        if thumb_height < min_thumb_height {
            first_row_y_offset = (min_thumb_height - thumb_height) / 2.0;
            height -= min_thumb_height - thumb_height;
        }

-        let y_for_row = |row: f32| -> f32 { top + first_row_y_offset + row * row_height };
+        let y_for_row = |row: f32| -> f32 { top + first_row_y_offset + row * height / max_row };

        let thumb_top = y_for_row(row_range.start) - first_row_y_offset;
        let thumb_bottom = y_for_row(row_range.end) + first_row_y_offset;
@@ -1051,56 +1034,6 @@ impl EditorElement {
                background: style.track.background_color,
                ..Default::default()
            });
-
-            if layout.is_singleton && settings::get::<EditorSettings>(cx).scrollbar.git_diff {
-                let diff_style = theme::current(cx).editor.scrollbar.git.clone();
-                for hunk in layout
-                    .position_map
-                    .snapshot
-                    .buffer_snapshot
-                    .git_diff_hunks_in_range(0..(max_row.floor() as u32))
-                {
-                    let start_display = Point::new(hunk.buffer_range.start, 0)
-                        .to_display_point(&layout.position_map.snapshot.display_snapshot);
-                    let end_display = Point::new(hunk.buffer_range.end, 0)
-                        .to_display_point(&layout.position_map.snapshot.display_snapshot);
-                    let start_y = y_for_row(start_display.row() as f32);
-                    let mut end_y = if hunk.buffer_range.start == hunk.buffer_range.end {
-                        y_for_row((end_display.row() + 1) as f32)
-                    } else {
-                        y_for_row((end_display.row()) as f32)
-                    };
-
-                    if end_y - start_y < 1. {
-                        end_y = start_y + 1.;
-                    }
-                    let bounds = RectF::from_points(vec2f(left, start_y), vec2f(right, end_y));
-
-                    let color = match hunk.status() {
-                        DiffHunkStatus::Added => diff_style.inserted,
-                        DiffHunkStatus::Modified => diff_style.modified,
-                        DiffHunkStatus::Removed => diff_style.deleted,
-                    };
-
-                    let border = Border {
-                        width: 1.,
-                        color: style.thumb.border.color,
-                        overlay: false,
-                        top: false,
-                        right: true,
-                        bottom: false,
-                        left: true,
-                    };
-
-                    scene.push_quad(Quad {
-                        bounds,
-                        background: Some(color),
-                        border,
-                        corner_radius: style.thumb.corner_radius,
-                    })
-                }
-            }
-
            scene.push_quad(Quad {
                bounds: thumb_bounds,
                border: style.thumb.border,
@@ -1185,7 +1118,7 @@ impl EditorElement {
                    .into_iter()
                    .map(|row| {
                        let line_layout =
-                            &layout.position_map.line_layouts[(row - start_row) as usize].line;
+                            &layout.position_map.line_layouts[(row - start_row) as usize];
                        HighlightedRangeLine {
                            start_x: if row == range.start.row() {
                                content_origin.x()
@@ -1276,7 +1209,7 @@ impl EditorElement {
            .row;

        buffer_snapshot
-            .git_diff_hunks_in_range(buffer_start_row..buffer_end_row)
+            .git_diff_hunks_in_range(buffer_start_row..buffer_end_row, false)
            .map(|hunk| diff_hunk_to_display(hunk, snapshot))
            .dedup()
            .collect()
@@ -1347,10 +1280,9 @@ impl EditorElement {
    fn layout_lines(
        &mut self,
        rows: Range<u32>,
-        line_number_layouts: &[Option<Line>],
        snapshot: &EditorSnapshot,
        cx: &ViewContext<Editor>,
-    ) -> Vec<LineWithInvisibles> {
+    ) -> Vec<text_layout::Line> {
        if rows.start >= rows.end {
            return Vec::new();
        }
@@ -1385,10 +1317,6 @@ impl EditorElement {
                        )],
                    )
                })
-                .map(|line| LineWithInvisibles {
-                    line,
-                    invisibles: Vec::new(),
-                })
                .collect()
        } else {
            let style = &self.style;
@@ -1431,22 +1359,15 @@ impl EditorElement {
                        highlight_style = Some(diagnostic_highlight);
                    }

-                    HighlightedChunk {
-                        chunk: chunk.text,
-                        style: highlight_style,
-                        is_tab: chunk.is_tab,
-                    }
+                    (chunk.text, highlight_style)
                });
-
-            LineWithInvisibles::from_chunks(
+            layout_highlighted_chunks(
                chunks,
                &style.text,
                cx.text_layout_cache(),
                cx.font_cache(),
                MAX_LINE_LEN,
                rows.len() as usize,
-                line_number_layouts,
-                snapshot.mode,
            )
        }
    }
@@ -1464,12 +1385,12 @@ impl EditorElement {
        text_x: f32,
        line_height: f32,
        style: &EditorStyle,
-        line_layouts: &[LineWithInvisibles],
+        line_layouts: &[text_layout::Line],
        include_root: bool,
        editor: &mut Editor,
-        cx: &mut LayoutContext<Editor>,
+        cx: &mut ViewContext<Editor>,
    ) -> (f32, Vec<BlockLayout>) {
-        let tooltip_style = theme::current(cx).tooltip.clone();
+        let tooltip_style = cx.global::<Settings>().theme.tooltip.clone();
        let scroll_x = snapshot.scroll_anchor.offset.x();
        let (fixed_blocks, non_fixed_blocks) = snapshot
            .blocks_in_range(rows.clone())
@@ -1487,7 +1408,6 @@ impl EditorElement {
                    let anchor_x = text_x
                        + if rows.contains(&align_to.row()) {
                            line_layouts[(align_to.row() - rows.start) as usize]
-                                .line
                                .x_for_index(align_to.column() as usize)
                        } else {
                            layout_line(align_to.row(), snapshot, style, cx.text_layout_cache())
@@ -1666,217 +1586,6 @@ impl EditorElement {
    }
 }

-struct HighlightedChunk<'a> {
-    chunk: &'a str,
-    style: Option<HighlightStyle>,
-    is_tab: bool,
-}
-
-#[derive(Debug)]
-pub struct LineWithInvisibles {
-    pub line: Line,
-    invisibles: Vec<Invisible>,
-}
-
-impl LineWithInvisibles {
-    fn from_chunks<'a>(
-        chunks: impl Iterator<Item = HighlightedChunk<'a>>,
-        text_style: &TextStyle,
-        text_layout_cache: &TextLayoutCache,
-        font_cache: &Arc<FontCache>,
-        max_line_len: usize,
-        max_line_count: usize,
-        line_number_layouts: &[Option<Line>],
-        editor_mode: EditorMode,
-    ) -> Vec<Self> {
-        let mut layouts = Vec::with_capacity(max_line_count);
-        let mut line = String::new();
-        let mut invisibles = Vec::new();
-        let mut styles = Vec::new();
-        let mut non_whitespace_added = false;
-        let mut row = 0;
-        let mut line_exceeded_max_len = false;
-        for highlighted_chunk in chunks.chain([HighlightedChunk {
-            chunk: "\n",
-            style: None,
-            is_tab: false,
-        }]) {
-            for (ix, mut line_chunk) in highlighted_chunk.chunk.split('\n').enumerate() {
-                if ix > 0 {
-                    layouts.push(Self {
-                        line: text_layout_cache.layout_str(&line, text_style.font_size, &styles),
-                        invisibles: invisibles.drain(..).collect(),
-                    });
-
-                    line.clear();
-                    styles.clear();
-                    row += 1;
-                    line_exceeded_max_len = false;
-                    non_whitespace_added = false;
-                    if row == max_line_count {
-                        return layouts;
-                    }
-                }
-
-                if !line_chunk.is_empty() && !line_exceeded_max_len {
-                    let text_style = if let Some(style) = highlighted_chunk.style {
-                        text_style
-                            .clone()
-                            .highlight(style, font_cache)
-                            .map(Cow::Owned)
-                            .unwrap_or_else(|_| Cow::Borrowed(text_style))
-                    } else {
-                        Cow::Borrowed(text_style)
-                    };
-
-                    if line.len() + line_chunk.len() > max_line_len {
-                        let mut chunk_len = max_line_len - line.len();
-                        while !line_chunk.is_char_boundary(chunk_len) {
-                            chunk_len -= 1;
-                        }
-                        line_chunk = &line_chunk[..chunk_len];
-                        line_exceeded_max_len = true;
-                    }
-
-                    styles.push((
-                        line_chunk.len(),
-                        RunStyle {
-                            font_id: text_style.font_id,
-                            color: text_style.color,
-                            underline: text_style.underline,
-                        },
-                    ));
-
-                    if editor_mode == EditorMode::Full {
-                        // Line wrap pads its contents with fake whitespaces,
-                        // avoid printing them
-                        let inside_wrapped_string = line_number_layouts
-                            .get(row)
-                            .and_then(|layout| layout.as_ref())
-                            .is_none();
-                        if highlighted_chunk.is_tab {
-                            if non_whitespace_added || !inside_wrapped_string {
-                                invisibles.push(Invisible::Tab {
-                                    line_start_offset: line.len(),
-                                });
-                            }
-                        } else {
-                            invisibles.extend(
-                                line_chunk
-                                    .chars()
-                                    .enumerate()
-                                    .filter(|(_, line_char)| {
-                                        let is_whitespace = line_char.is_whitespace();
-                                        non_whitespace_added |= !is_whitespace;
-                                        is_whitespace
-                                            && (non_whitespace_added || !inside_wrapped_string)
-                                    })
-                                    .map(|(whitespace_index, _)| Invisible::Whitespace {
-                                        line_offset: line.len() + whitespace_index,
-                                    }),
-                            )
-                        }
-                    }
-
-                    line.push_str(line_chunk);
-                }
-            }
-        }
-
-        layouts
-    }
-
-    fn draw(
-        &self,
-        layout: &LayoutState,
-        row: u32,
-        scroll_top: f32,
-        scene: &mut SceneBuilder,
-        content_origin: Vector2F,
-        scroll_left: f32,
-        visible_text_bounds: RectF,
-        whitespace_setting: ShowWhitespaceSetting,
-        selection_ranges: &[Range<DisplayPoint>],
-        visible_bounds: RectF,
-        cx: &mut ViewContext<Editor>,
-    ) {
-        let line_height = layout.position_map.line_height;
-        let line_y = row as f32 * line_height - scroll_top;
-
-        self.line.paint(
-            scene,
-            content_origin + vec2f(-scroll_left, line_y),
-            visible_text_bounds,
-            line_height,
-            cx,
-        );
-
-        self.draw_invisibles(
-            &selection_ranges,
-            layout,
-            content_origin,
-            scroll_left,
-            line_y,
-            row,
-            scene,
-            visible_bounds,
-            line_height,
-            whitespace_setting,
-            cx,
-        );
-    }
-
-    fn draw_invisibles(
-        &self,
-        selection_ranges: &[Range<DisplayPoint>],
-        layout: &LayoutState,
-        content_origin: Vector2F,
-        scroll_left: f32,
-        line_y: f32,
-        row: u32,
-        scene: &mut SceneBuilder,
-        visible_bounds: RectF,
-        line_height: f32,
-        whitespace_setting: ShowWhitespaceSetting,
-        cx: &mut ViewContext<Editor>,
-    ) {
-        let allowed_invisibles_regions = match whitespace_setting {
-            ShowWhitespaceSetting::None => return,
-            ShowWhitespaceSetting::Selection => Some(selection_ranges),
-            ShowWhitespaceSetting::All => None,
-        };
-
-        for invisible in &self.invisibles {
-            let (&token_offset, invisible_symbol) = match invisible {
-                Invisible::Tab { line_start_offset } => (line_start_offset, &layout.tab_invisible),
-                Invisible::Whitespace { line_offset } => (line_offset, &layout.space_invisible),
-            };
-
-            let x_offset = self.line.x_for_index(token_offset);
-            let invisible_offset =
-                (layout.position_map.em_width - invisible_symbol.width()).max(0.0) / 2.0;
-            let origin = content_origin + vec2f(-scroll_left + x_offset + invisible_offset, line_y);
-
-            if let Some(allowed_regions) = allowed_invisibles_regions {
-                let invisible_point = DisplayPoint::new(row, token_offset as u32);
-                if !allowed_regions
-                    .iter()
-                    .any(|region| region.start <= invisible_point && invisible_point < region.end)
-                {
-                    continue;
-                }
-            }
-            invisible_symbol.paint(scene, origin, visible_bounds, line_height, cx);
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum Invisible {
-    Tab { line_start_offset: usize },
-    Whitespace { line_offset: usize },
-}
-
 impl Element<Editor> for EditorElement {
    type LayoutState = LayoutState;
    type PaintState = ();
@@ -1885,7 +1594,7 @@ impl Element<Editor> for EditorElement {
        &mut self,
        constraint: SizeConstraint,
        editor: &mut Editor,
-        cx: &mut LayoutContext<Editor>,
+        cx: &mut ViewContext<Editor>,
    ) -> (Vector2F, Self::LayoutState) {
        let mut size = constraint.max;
        if size.x().is_infinite() {
@@ -1900,8 +1609,7 @@ impl Element<Editor> for EditorElement {
        let gutter_width;
        let gutter_margin;
        if snapshot.mode == EditorMode::Full {
-            let em_width = style.text.em_width(cx.font_cache());
-            gutter_padding = (em_width * style.gutter_padding_factor).round();
+            gutter_padding = style.text.em_width(cx.font_cache()) * style.gutter_padding_factor;
            gutter_width = self.max_line_number_width(&snapshot, cx) + gutter_padding * 2.0;
            gutter_margin = -style.text.descent(cx.font_cache());
        } else {
@@ -1988,11 +1696,11 @@ impl Element<Editor> for EditorElement {
        let is_singleton = editor.is_singleton(cx);

        let highlighted_rows = editor.highlighted_rows();
-        let theme = theme::current(cx);
+        let theme = cx.global::<Settings>().theme.as_ref();
        let highlighted_ranges = editor.background_highlights_in_range(
            start_anchor..end_anchor,
            &snapshot.display_snapshot,
-            theme.as_ref(),
+            theme,
        );

        fold_ranges.extend(
@@ -2067,19 +1775,7 @@ impl Element<Editor> for EditorElement {
            ));
        }

-        let scrollbar_settings = &settings::get::<EditorSettings>(cx).scrollbar;
-        let show_scrollbars = match scrollbar_settings.show {
-            ShowScrollbar::Auto => {
-                // Git
-                (is_singleton && scrollbar_settings.git_diff && snapshot.buffer_snapshot.has_git_diffs())
-                // Scrollmanager
-                || editor.scroll_manager.scrollbars_visible()
-            }
-            ShowScrollbar::System => editor.scroll_manager.scrollbars_visible(),
-            ShowScrollbar::Always => true,
-            ShowScrollbar::Never => false,
-        };
-
+        let show_scrollbars = editor.scroll_manager.scrollbars_visible();
        let include_root = editor
            .project
            .as_ref()
@@ -2114,11 +1810,10 @@ impl Element<Editor> for EditorElement {
        let scrollbar_row_range = scroll_position.y()..(scroll_position.y() + height_in_lines);

        let mut max_visible_line_width = 0.0;
-        let line_layouts =
-            self.layout_lines(start_row..end_row, &line_number_layouts, &snapshot, cx);
-        for line_with_invisibles in &line_layouts {
-            if line_with_invisibles.line.width() > max_visible_line_width {
-                max_visible_line_width = line_with_invisibles.line.width();
+        let line_layouts = self.layout_lines(start_row..end_row, &snapshot, cx);
+        for line in &line_layouts {
+            if line.width() > max_visible_line_width {
+                max_visible_line_width = line.width();
            }
        }

@@ -2270,13 +1965,6 @@ impl Element<Editor> for EditorElement {
            }
        }

-        let invisible_symbol_font_size = self.style.text.font_size / 2.0;
-        let invisible_symbol_style = RunStyle {
-            color: self.style.whitespace,
-            font_id: self.style.text.font_id,
-            underline: Default::default(),
-        };
-
        (
            size,
            LayoutState {
@@ -2296,7 +1984,6 @@ impl Element<Editor> for EditorElement {
                text_size,
                scrollbar_row_range,
                show_scrollbars,
-                is_singleton,
                max_row,
                gutter_margin,
                active_rows,
@@ -2310,16 +1997,6 @@ impl Element<Editor> for EditorElement {
                context_menu,
                code_actions_indicator,
                fold_indicators,
-                tab_invisible: cx.text_layout_cache().layout_str(
-                    "→",
-                    invisible_symbol_font_size,
-                    &[("→".len(), invisible_symbol_style)],
-                ),
-                space_invisible: cx.text_layout_cache().layout_str(
-                    "•",
-                    invisible_symbol_font_size,
-                    &[("•".len(), invisible_symbol_style)],
-                ),
                hover_popovers: hover,
            },
        )
@@ -2396,11 +2073,10 @@ impl Element<Editor> for EditorElement {
            return None;
        }

-        let line = &layout
+        let line = layout
            .position_map
            .line_layouts
-            .get((range_start.row() - start_row) as usize)?
-            .line;
+            .get((range_start.row() - start_row) as usize)?;
        let range_start_x = line.x_for_index(range_start.column() as usize);
        let range_start_y = range_start.row() as f32 * layout.position_map.line_height;
        Some(RectF::new(
@@ -2452,23 +2128,20 @@ pub struct LayoutState {
    selections: Vec<(ReplicaId, Vec<SelectionLayout>)>,
    scrollbar_row_range: Range<f32>,
    show_scrollbars: bool,
-    is_singleton: bool,
    max_row: u32,
    context_menu: Option<(DisplayPoint, AnyElement<Editor>)>,
    code_actions_indicator: Option<(u32, AnyElement<Editor>)>,
    hover_popovers: Option<(DisplayPoint, Vec<AnyElement<Editor>>)>,
    fold_indicators: Vec<Option<AnyElement<Editor>>>,
-    tab_invisible: Line,
-    space_invisible: Line,
 }

-struct PositionMap {
+pub struct PositionMap {
    size: Vector2F,
    line_height: f32,
    scroll_max: Vector2F,
    em_width: f32,
    em_advance: f32,
-    line_layouts: Vec<LineWithInvisibles>,
+    line_layouts: Vec<text_layout::Line>,
    snapshot: EditorSnapshot,
 }

@@ -2490,7 +2163,6 @@ impl PositionMap {
        let (column, x_overshoot) = if let Some(line) = self
            .line_layouts
            .get(row as usize - scroll_position.y() as usize)
-            .map(|line_with_spaces| &line_with_spaces.line)
        {
            if let Some(ix) = line.index_for_x(x) {
                (ix as u32, 0.0)
@@ -2759,7 +2431,7 @@ impl HighlightedRange {
    }
 }

-fn position_to_display_point(
+pub fn position_to_display_point(
    position: Vector2F,
    text_bounds: RectF,
    position_map: &PositionMap,
@@ -2776,7 +2448,7 @@ fn position_to_display_point(
    }
 }

-fn range_to_bounds(
+pub fn range_to_bounds(
    range: &Range<DisplayPoint>,
    content_origin: Vector2F,
    scroll_left: f32,
@@ -2804,7 +2476,7 @@ fn range_to_bounds(
        content_origin.y() + row_range.start as f32 * position_map.line_height - scroll_top;

    for (idx, row) in row_range.enumerate() {
-        let line_layout = &position_map.line_layouts[(row - start_row) as usize].line;
+        let line_layout = &position_map.line_layouts[(row - start_row) as usize];

        let start_x = if row == range.start.row() {
            content_origin.x() + line_layout.x_for_index(range.start.column() as usize)
@@ -2841,19 +2513,16 @@ mod tests {
    use super::*;
    use crate::{
        display_map::{BlockDisposition, BlockProperties},
-        editor_tests::{init_test, update_test_settings},
        Editor, MultiBuffer,
    };
    use gpui::TestAppContext;
-    use language::language_settings;
-    use log::info;
-    use std::{num::NonZeroU32, sync::Arc};
+    use settings::Settings;
+    use std::sync::Arc;
    use util::test::sample_text;

    #[gpui::test]
    fn test_layout_line_numbers(cx: &mut TestAppContext) {
-        init_test(cx, |_| {});
-
+        cx.update(|cx| cx.set_global(Settings::test(cx)));
        let (_, editor) = cx.add_window(|cx| {
            let buffer = MultiBuffer::build_simple(&sample_text(6, 6, 'a'), cx);
            Editor::new(EditorMode::Full, buffer, None, None, cx)
@@ -2871,8 +2540,7 @@ mod tests {

    #[gpui::test]
    fn test_layout_with_placeholder_text_and_blocks(cx: &mut TestAppContext) {
-        init_test(cx, |_| {});
-
+        cx.update(|cx| cx.set_global(Settings::test(cx)));
        let (_, editor) = cx.add_window(|cx| {
            let buffer = MultiBuffer::build_simple("", cx);
            Editor::new(EditorMode::Full, buffer, None, None, cx)
@@ -2897,18 +2565,10 @@ mod tests {

        let mut element = EditorElement::new(editor.read_with(cx, |editor, cx| editor.style(cx)));
        let (size, mut state) = editor.update(cx, |editor, cx| {
-            let mut new_parents = Default::default();
-            let mut notify_views_if_parents_change = Default::default();
-            let mut layout_cx = LayoutContext::new(
-                cx,
-                &mut new_parents,
-                &mut notify_views_if_parents_change,
-                false,
-            );
            element.layout(
                SizeConstraint::new(vec2f(500., 500.), vec2f(500., 500.)),
                editor,
-                &mut layout_cx,
+                cx,
            )
        });

@@ -2929,191 +2589,4 @@ mod tests {
            element.paint(&mut scene, bounds, bounds, &mut state, editor, cx);
        });
    }
-
-    #[gpui::test]
-    fn test_all_invisibles_drawing(cx: &mut TestAppContext) {
-        const TAB_SIZE: u32 = 4;
-
-        let input_text = "\t \t|\t| a b";
-        let expected_invisibles = vec![
-            Invisible::Tab {
-                line_start_offset: 0,
-            },
-            Invisible::Whitespace {
-                line_offset: TAB_SIZE as usize,
-            },
-            Invisible::Tab {
-                line_start_offset: TAB_SIZE as usize + 1,
-            },
-            Invisible::Tab {
-                line_start_offset: TAB_SIZE as usize * 2 + 1,
-            },
-            Invisible::Whitespace {
-                line_offset: TAB_SIZE as usize * 3 + 1,
-            },
-            Invisible::Whitespace {
-                line_offset: TAB_SIZE as usize * 3 + 3,
-            },
-        ];
-        assert_eq!(
-            expected_invisibles.len(),
-            input_text
-                .chars()
-                .filter(|initial_char| initial_char.is_whitespace())
-                .count(),
-            "Hardcoded expected invisibles differ from the actual ones in '{input_text}'"
-        );
-
-        init_test(cx, |s| {
-            s.defaults.show_whitespaces = Some(ShowWhitespaceSetting::All);
-            s.defaults.tab_size = NonZeroU32::new(TAB_SIZE);
-        });
-
-        let actual_invisibles =
-            collect_invisibles_from_new_editor(cx, EditorMode::Full, &input_text, 500.0);
-
-        assert_eq!(expected_invisibles, actual_invisibles);
-    }
-
-    #[gpui::test]
-    fn test_invisibles_dont_appear_in_certain_editors(cx: &mut TestAppContext) {
-        init_test(cx, |s| {
-            s.defaults.show_whitespaces = Some(ShowWhitespaceSetting::All);
-            s.defaults.tab_size = NonZeroU32::new(4);
-        });
-
-        for editor_mode_without_invisibles in [
-            EditorMode::SingleLine,
-            EditorMode::AutoHeight { max_lines: 100 },
-        ] {
-            let invisibles = collect_invisibles_from_new_editor(
-                cx,
-                editor_mode_without_invisibles,
-                "\t\t\t| | a b",
-                500.0,
-            );
-            assert!(invisibles.is_empty(),
-                "For editor mode {editor_mode_without_invisibles:?} no invisibles was expected but got {invisibles:?}");
-        }
-    }
-
-    #[gpui::test]
-    fn test_wrapped_invisibles_drawing(cx: &mut TestAppContext) {
-        let tab_size = 4;
-        let input_text = "a\tbcd   ".repeat(9);
-        let repeated_invisibles = [
-            Invisible::Tab {
-                line_start_offset: 1,
-            },
-            Invisible::Whitespace {
-                line_offset: tab_size as usize + 3,
-            },
-            Invisible::Whitespace {
-                line_offset: tab_size as usize + 4,
-            },
-            Invisible::Whitespace {
-                line_offset: tab_size as usize + 5,
-            },
-        ];
-        let expected_invisibles = std::iter::once(repeated_invisibles)
-            .cycle()
-            .take(9)
-            .flatten()
-            .collect::<Vec<_>>();
-        assert_eq!(
-            expected_invisibles.len(),
-            input_text
-                .chars()
-                .filter(|initial_char| initial_char.is_whitespace())
-                .count(),
-            "Hardcoded expected invisibles differ from the actual ones in '{input_text}'"
-        );
-        info!("Expected invisibles: {expected_invisibles:?}");
-
-        init_test(cx, |_| {});
-
-        // Put the same string with repeating whitespace pattern into editors of various size,
-        // take deliberately small steps during resizing, to put all whitespace kinds near the wrap point.
-        let resize_step = 10.0;
-        let mut editor_width = 200.0;
-        while editor_width <= 1000.0 {
-            update_test_settings(cx, |s| {
-                s.defaults.tab_size = NonZeroU32::new(tab_size);
-                s.defaults.show_whitespaces = Some(ShowWhitespaceSetting::All);
-                s.defaults.preferred_line_length = Some(editor_width as u32);
-                s.defaults.soft_wrap = Some(language_settings::SoftWrap::PreferredLineLength);
-            });
-
-            let actual_invisibles =
-                collect_invisibles_from_new_editor(cx, EditorMode::Full, &input_text, editor_width);
-
-            // Whatever the editor size is, ensure it has the same invisible kinds in the same order
-            // (no good guarantees about the offsets: wrapping could trigger padding and its tests should check the offsets).
-            let mut i = 0;
-            for (actual_index, actual_invisible) in actual_invisibles.iter().enumerate() {
-                i = actual_index;
-                match expected_invisibles.get(i) {
-                    Some(expected_invisible) => match (expected_invisible, actual_invisible) {
-                        (Invisible::Whitespace { .. }, Invisible::Whitespace { .. })
-                        | (Invisible::Tab { .. }, Invisible::Tab { .. }) => {}
-                        _ => {
-                            panic!("At index {i}, expected invisible {expected_invisible:?} does not match actual {actual_invisible:?} by kind. Actual invisibles: {actual_invisibles:?}")
-                        }
-                    },
-                    None => panic!("Unexpected extra invisible {actual_invisible:?} at index {i}"),
-                }
-            }
-            let missing_expected_invisibles = &expected_invisibles[i + 1..];
-            assert!(
-                missing_expected_invisibles.is_empty(),
-                "Missing expected invisibles after index {i}: {missing_expected_invisibles:?}"
-            );
-
-            editor_width += resize_step;
-        }
-    }
-
-    fn collect_invisibles_from_new_editor(
-        cx: &mut TestAppContext,
-        editor_mode: EditorMode,
-        input_text: &str,
-        editor_width: f32,
-    ) -> Vec<Invisible> {
-        info!(
-            "Creating editor with mode {editor_mode:?}, witdh {editor_width} and text '{input_text}'"
-        );
-        let (_, editor) = cx.add_window(|cx| {
-            let buffer = MultiBuffer::build_simple(&input_text, cx);
-            Editor::new(editor_mode, buffer, None, None, cx)
-        });
-
-        let mut element = EditorElement::new(editor.read_with(cx, |editor, cx| editor.style(cx)));
-        let (_, layout_state) = editor.update(cx, |editor, cx| {
-            editor.set_soft_wrap_mode(language_settings::SoftWrap::EditorWidth, cx);
-            editor.set_wrap_width(Some(editor_width), cx);
-
-            let mut new_parents = Default::default();
-            let mut notify_views_if_parents_change = Default::default();
-            let mut layout_cx = LayoutContext::new(
-                cx,
-                &mut new_parents,
-                &mut notify_views_if_parents_change,
-                false,
-            );
-            element.layout(
-                SizeConstraint::new(vec2f(editor_width, 500.), vec2f(editor_width, 500.)),
-                editor,
-                &mut layout_cx,
-            )
-        });
-
-        layout_state
-            .position_map
-            .line_layouts
-            .iter()
-            .map(|line_with_invisibles| &line_with_invisibles.invisibles)
-            .flatten()
-            .cloned()
-            .collect()
-    }
 }
--- a/crates/editor/src/git.rs
+++ b/crates/editor/src/git.rs
@@ -1,4 +1,4 @@
-use std::ops::Range;
+use std::ops::RangeInclusive;

 use git::diff::{DiffHunk, DiffHunkStatus};
 use language::Point;
@@ -15,7 +15,7 @@ pub enum DisplayDiffHunk {
    },

    Unfolded {
-        display_row_range: Range<u32>,
+        display_row_range: RangeInclusive<u32>,
        status: DiffHunkStatus,
    },
 }
@@ -26,7 +26,7 @@ impl DisplayDiffHunk {
            &DisplayDiffHunk::Folded { display_row } => display_row,
            DisplayDiffHunk::Unfolded {
                display_row_range, ..
-            } => display_row_range.start,
+            } => *display_row_range.start(),
        }
    }

@@ -36,7 +36,7 @@ impl DisplayDiffHunk {

            DisplayDiffHunk::Unfolded {
                display_row_range, ..
-            } => display_row_range.start..=display_row_range.end - 1,
+            } => display_row_range.clone(),
        };

        range.contains(&display_row)
@@ -77,12 +77,16 @@ pub fn diff_hunk_to_display(hunk: DiffHunk<u32>, snapshot: &DisplaySnapshot) ->
    } else {
        let start = hunk_start_point.to_display_point(snapshot).row();

-        let hunk_end_row_inclusive = hunk.buffer_range.end.max(hunk.buffer_range.start);
+        let hunk_end_row_inclusive = hunk
+            .buffer_range
+            .end
+            .saturating_sub(1)
+            .max(hunk.buffer_range.start);
        let hunk_end_point = Point::new(hunk_end_row_inclusive, 0);
        let end = hunk_end_point.to_display_point(snapshot).row();

        DisplayDiffHunk::Unfolded {
-            display_row_range: start..end,
+            display_row_range: start..=end,
            status: hunk.status(),
        }
    }
--- a/crates/editor/src/highlight_matching_bracket.rs
+++ b/crates/editor/src/highlight_matching_bracket.rs
@@ -33,14 +33,12 @@ pub fn refresh_matching_bracket_highlights(editor: &mut Editor, cx: &mut ViewCon
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::{editor_tests::init_test, test::editor_lsp_test_context::EditorLspTestContext};
+    use crate::test::editor_lsp_test_context::EditorLspTestContext;
    use indoc::indoc;
    use language::{BracketPair, BracketPairConfig, Language, LanguageConfig};

    #[gpui::test]
    async fn test_matching_bracket_highlights(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
        let mut cx = EditorLspTestContext::new(
            Language::new(
                LanguageConfig {
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -1,6 +1,6 @@
 use crate::{
-    display_map::ToDisplayPoint, Anchor, AnchorRangeExt, DisplayPoint, Editor, EditorSettings,
-    EditorSnapshot, EditorStyle, RangeToAnchorExt,
+    display_map::ToDisplayPoint, Anchor, AnchorRangeExt, DisplayPoint, Editor, EditorSnapshot,
+    EditorStyle, RangeToAnchorExt,
 };
 use futures::FutureExt;
 use gpui::{
@@ -12,6 +12,7 @@ use gpui::{
 };
 use language::{Bias, DiagnosticEntry, DiagnosticSeverity, Language, LanguageRegistry};
 use project::{HoverBlock, HoverBlockKind, Project};
+use settings::Settings;
 use std::{ops::Range, sync::Arc, time::Duration};
 use util::TryFutureExt;

@@ -37,7 +38,7 @@ pub fn hover(editor: &mut Editor, _: &Hover, cx: &mut ViewContext<Editor>) {
 /// The internal hover action dispatches between `show_hover` or `hide_hover`
 /// depending on whether a point to hover over is provided.
 pub fn hover_at(editor: &mut Editor, point: Option<DisplayPoint>, cx: &mut ViewContext<Editor>) {
-    if settings::get::<EditorSettings>(cx).hover_popover_enabled {
+    if cx.global::<Settings>().hover_popover_enabled {
        if let Some(point) = point {
            show_hover(editor, point, false, cx);
        } else {
@@ -653,7 +654,7 @@ impl DiagnosticPopover {
            _ => style.hover_popover.container,
        };

-        let tooltip_style = theme::current(cx).tooltip.clone();
+        let tooltip_style = cx.global::<Settings>().theme.tooltip.clone();

        MouseEventHandler::<DiagnosticPopover, _>::new(0, cx, |_, _| {
            text.with_soft_wrap(true)
@@ -693,7 +694,7 @@ impl DiagnosticPopover {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::{editor_tests::init_test, test::editor_lsp_test_context::EditorLspTestContext};
+    use crate::test::editor_lsp_test_context::EditorLspTestContext;
    use gpui::fonts::Weight;
    use indoc::indoc;
    use language::{Diagnostic, DiagnosticSet};
@@ -705,8 +706,6 @@ mod tests {

    #[gpui::test]
    async fn test_mouse_hover_info_popover(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
        let mut cx = EditorLspTestContext::new_rust(
            lsp::ServerCapabilities {
                hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
@@ -774,8 +773,6 @@ mod tests {

    #[gpui::test]
    async fn test_keyboard_hover_info_popover(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
        let mut cx = EditorLspTestContext::new_rust(
            lsp::ServerCapabilities {
                hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
@@ -819,8 +816,6 @@ mod tests {

    #[gpui::test]
    async fn test_hover_diagnostic_and_info_popovers(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
        let mut cx = EditorLspTestContext::new_rust(
            lsp::ServerCapabilities {
                hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
@@ -887,8 +882,7 @@ mod tests {

    #[gpui::test]
    fn test_render_blocks(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
+        Settings::test_async(cx);
        cx.add_window(|cx| {
            let editor = Editor::single_line(None, cx);
            let style = editor.style(cx);
@@ -1012,7 +1006,8 @@ mod tests {
                    .zip(expected_styles.iter().cloned())
                    .collect::<Vec<_>>();
                assert_eq!(
-                    rendered.text, expected_text,
+                    rendered.text,
+                    dbg!(expected_text),
                    "wrong text for input {blocks:?}"
                );
                assert_eq!(
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -3,7 +3,7 @@ use crate::{
    movement::surrounding_word, persistence::DB, scroll::ScrollAnchor, Anchor, Autoscroll, Editor,
    Event, ExcerptId, ExcerptRange, MultiBuffer, MultiBufferSnapshot, NavigationData, ToPoint as _,
 };
-use anyhow::{Context, Result};
+use anyhow::{anyhow, Context, Result};
 use collections::HashSet;
 use futures::future::try_join_all;
 use gpui::{
@@ -16,6 +16,7 @@ use language::{
 };
 use project::{FormatTrigger, Item as _, Project, ProjectPath};
 use rpc::proto::{self, update_view};
+use settings::Settings;
 use smallvec::SmallVec;
 use std::{
    borrow::Cow,
@@ -26,7 +27,7 @@ use std::{
    path::{Path, PathBuf},
 };
 use text::Selection;
-use util::{paths::FILE_ROW_COLUMN_DELIMITER, ResultExt, TryFutureExt};
+use util::{ResultExt, TryFutureExt};
 use workspace::item::{BreadcrumbText, FollowableItemHandle};
 use workspace::{
    item::{FollowableItem, Item, ItemEvent, ItemHandle, ProjectItem},
@@ -565,7 +566,7 @@ impl Item for Editor {
        cx: &AppContext,
    ) -> AnyElement<T> {
        Flex::row()
-            .with_child(Label::new(self.title(cx).to_string(), style.label.clone()).into_any())
+            .with_child(Label::new(self.title(cx).to_string(), style.label.clone()).aligned())
            .with_children(detail.and_then(|detail| {
                let path = path_for_buffer(&self.buffer, detail, false, cx)?;
                let description = path.to_string_lossy();
@@ -579,7 +580,6 @@ impl Item for Editor {
                    .aligned(),
                )
            }))
-            .align_children_center()
            .into_any()
    }

@@ -636,7 +636,7 @@ impl Item for Editor {
        project: ModelHandle<Project>,
        cx: &mut ViewContext<Self>,
    ) -> Task<Result<()>> {
-        self.report_editor_event("save", None, cx);
+        self.report_editor_event("save", cx);
        let format = self.perform_format(project.clone(), FormatTrigger::Save, cx);
        let buffers = self.buffer().clone().read(cx).all_buffers();
        cx.spawn(|_, mut cx| async move {
@@ -685,11 +685,6 @@ impl Item for Editor {
            .as_singleton()
            .expect("cannot call save_as on an excerpt list");

-        let file_extension = abs_path
-            .extension()
-            .map(|a| a.to_string_lossy().to_string());
-        self.report_editor_event("save", file_extension, cx);
-
        project.update(cx, |project, cx| {
            project.save_buffer_as(buffer, abs_path, cx)
        })
@@ -709,10 +704,10 @@ impl Item for Editor {
            this.update(&mut cx, |editor, cx| {
                editor.request_autoscroll(Autoscroll::fit(), cx)
            })?;
-            buffer.update(&mut cx, |buffer, cx| {
+            buffer.update(&mut cx, |buffer, _| {
                if let Some(transaction) = transaction {
                    if !buffer.is_singleton() {
-                        buffer.push_transaction(&transaction.0, cx);
+                        buffer.push_transaction(&transaction.0);
                    }
                }
            });
@@ -869,13 +864,16 @@ impl Item for Editor {
                    let buffer = project_item
                        .downcast::<Buffer>()
                        .context("Project item at stored path was not a buffer")?;
-                    Ok(pane.update(&mut cx, |_, cx| {
-                        cx.add_view(|cx| {
+                    let pane = pane
+                        .upgrade(&cx)
+                        .ok_or_else(|| anyhow!("pane was dropped"))?;
+                    Ok(cx.update(|cx| {
+                        cx.add_view(&pane, |cx| {
                            let mut editor = Editor::for_buffer(buffer, Some(project), cx);
                            editor.read_scroll_position_from_db(item_id, workspace_id, cx);
                            editor
                        })
-                    })?)
+                    }))
                })
            })
            .unwrap_or_else(|error| Task::ready(Err(error)))
@@ -1115,12 +1113,8 @@ impl View for CursorPosition {

    fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
        if let Some(position) = self.position {
-            let theme = &theme::current(cx).workspace.status_bar;
-            let mut text = format!(
-                "{}{FILE_ROW_COLUMN_DELIMITER}{}",
-                position.row + 1,
-                position.column + 1
-            );
+            let theme = &cx.global::<Settings>().theme.workspace.status_bar;
+            let mut text = format!("{},{}", position.row + 1, position.column + 1);
            if self.selected_count > 0 {
                write!(text, " ({} selected)", self.selected_count).unwrap();
            }
@@ -1231,27 +1225,27 @@ mod tests {
        }

        fn as_local(&self) -> Option<&dyn language::LocalFile> {
-            unimplemented!()
+            todo!()
        }

        fn mtime(&self) -> SystemTime {
-            unimplemented!()
+            todo!()
        }

        fn file_name<'a>(&'a self, _: &'a gpui::AppContext) -> &'a std::ffi::OsStr {
-            unimplemented!()
+            todo!()
        }

        fn is_deleted(&self) -> bool {
-            unimplemented!()
+            todo!()
        }

        fn as_any(&self) -> &dyn std::any::Any {
-            unimplemented!()
+            todo!()
        }

        fn to_proto(&self) -> rpc::proto::File {
-            unimplemented!()
+            todo!()
        }
    }
 }
--- a/crates/editor/src/link_go_to_definition.rs
+++ b/crates/editor/src/link_go_to_definition.rs
@@ -1,8 +1,10 @@
+use std::ops::Range;
+
 use crate::{Anchor, DisplayPoint, Editor, EditorSnapshot, SelectPhase};
 use gpui::{Task, ViewContext};
 use language::{Bias, ToOffset};
 use project::LocationLink;
-use std::ops::Range;
+use settings::Settings;
 use util::TryFutureExt;

 #[derive(Debug, Default)]
@@ -209,7 +211,7 @@ pub fn show_link_definition(
                        });

                        // Highlight symbol using theme link definition highlight style
-                        let style = theme::current(cx).editor.link_definition;
+                        let style = cx.global::<Settings>().theme.editor.link_definition;
                        this.highlight_text::<LinkGoToDefinitionState>(
                            vec![highlight_range],
                            style,
@@ -295,8 +297,6 @@ fn go_to_fetched_definition_of_kind(

 #[cfg(test)]
 mod tests {
-    use super::*;
-    use crate::{editor_tests::init_test, test::editor_lsp_test_context::EditorLspTestContext};
    use futures::StreamExt;
    use gpui::{
        platform::{self, Modifiers, ModifiersChangedEvent},
@@ -305,10 +305,12 @@ mod tests {
    use indoc::indoc;
    use lsp::request::{GotoDefinition, GotoTypeDefinition};

+    use crate::test::editor_lsp_test_context::EditorLspTestContext;
+
+    use super::*;
+
    #[gpui::test]
    async fn test_link_go_to_type_definition(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
        let mut cx = EditorLspTestContext::new_rust(
            lsp::ServerCapabilities {
                hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
@@ -415,8 +417,6 @@ mod tests {

    #[gpui::test]
    async fn test_link_go_to_definition(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
        let mut cx = EditorLspTestContext::new_rust(
            lsp::ServerCapabilities {
                hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
--- a/crates/editor/src/mouse_context_menu.rs
+++ b/crates/editor/src/mouse_context_menu.rs
@@ -57,14 +57,13 @@ pub fn deploy_context_menu(

 #[cfg(test)]
 mod tests {
+    use crate::test::editor_lsp_test_context::EditorLspTestContext;
+
    use super::*;
-    use crate::{editor_tests::init_test, test::editor_lsp_test_context::EditorLspTestContext};
    use indoc::indoc;

    #[gpui::test]
    async fn test_mouse_context_menu(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
        let mut cx = EditorLspTestContext::new_rust(
            lsp::ServerCapabilities {
                hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -193,44 +193,6 @@ pub fn next_subword_end(map: &DisplaySnapshot, point: DisplayPoint) -> DisplayPo
    })
 }

-pub fn start_of_paragraph(map: &DisplaySnapshot, display_point: DisplayPoint) -> DisplayPoint {
-    let point = display_point.to_point(map);
-    if point.row == 0 {
-        return map.max_point();
-    }
-
-    let mut found_non_blank_line = false;
-    for row in (0..point.row + 1).rev() {
-        let blank = map.buffer_snapshot.is_line_blank(row);
-        if found_non_blank_line && blank {
-            return Point::new(row, 0).to_display_point(map);
-        }
-
-        found_non_blank_line |= !blank;
-    }
-
-    DisplayPoint::zero()
-}
-
-pub fn end_of_paragraph(map: &DisplaySnapshot, display_point: DisplayPoint) -> DisplayPoint {
-    let point = display_point.to_point(map);
-    if point.row == map.max_buffer_row() {
-        return DisplayPoint::zero();
-    }
-
-    let mut found_non_blank_line = false;
-    for row in point.row..map.max_buffer_row() + 1 {
-        let blank = map.buffer_snapshot.is_line_blank(row);
-        if found_non_blank_line && blank {
-            return Point::new(row, 0).to_display_point(map);
-        }
-
-        found_non_blank_line |= !blank;
-    }
-
-    map.max_point()
-}
-
 /// Scans for a boundary preceding the given start point `from` until a boundary is found, indicated by the
 /// given predicate returning true. The predicate is called with the character to the left and right
 /// of the candidate boundary location, and will be called with `\n` characters indicating the start
@@ -407,12 +369,11 @@ pub fn split_display_range_by_lines(
 mod tests {
    use super::*;
    use crate::{test::marked_display_snapshot, Buffer, DisplayMap, ExcerptRange, MultiBuffer};
-    use settings::SettingsStore;
+    use settings::Settings;

    #[gpui::test]
    fn test_previous_word_start(cx: &mut gpui::AppContext) {
-        init_test(cx);
-
+        cx.set_global(Settings::test(cx));
        fn assert(marked_text: &str, cx: &mut gpui::AppContext) {
            let (snapshot, display_points) = marked_display_snapshot(marked_text, cx);
            assert_eq!(
@@ -439,8 +400,7 @@ mod tests {

    #[gpui::test]
    fn test_previous_subword_start(cx: &mut gpui::AppContext) {
-        init_test(cx);
-
+        cx.set_global(Settings::test(cx));
        fn assert(marked_text: &str, cx: &mut gpui::AppContext) {
            let (snapshot, display_points) = marked_display_snapshot(marked_text, cx);
            assert_eq!(
@@ -474,8 +434,7 @@ mod tests {

    #[gpui::test]
    fn test_find_preceding_boundary(cx: &mut gpui::AppContext) {
-        init_test(cx);
-
+        cx.set_global(Settings::test(cx));
        fn assert(
            marked_text: &str,
            cx: &mut gpui::AppContext,
@@ -507,8 +466,7 @@ mod tests {

    #[gpui::test]
    fn test_next_word_end(cx: &mut gpui::AppContext) {
-        init_test(cx);
-
+        cx.set_global(Settings::test(cx));
        fn assert(marked_text: &str, cx: &mut gpui::AppContext) {
            let (snapshot, display_points) = marked_display_snapshot(marked_text, cx);
            assert_eq!(
@@ -532,8 +490,7 @@ mod tests {

    #[gpui::test]
    fn test_next_subword_end(cx: &mut gpui::AppContext) {
-        init_test(cx);
-
+        cx.set_global(Settings::test(cx));
        fn assert(marked_text: &str, cx: &mut gpui::AppContext) {
            let (snapshot, display_points) = marked_display_snapshot(marked_text, cx);
            assert_eq!(
@@ -566,8 +523,7 @@ mod tests {

    #[gpui::test]
    fn test_find_boundary(cx: &mut gpui::AppContext) {
-        init_test(cx);
-
+        cx.set_global(Settings::test(cx));
        fn assert(
            marked_text: &str,
            cx: &mut gpui::AppContext,
@@ -599,8 +555,7 @@ mod tests {

    #[gpui::test]
    fn test_surrounding_word(cx: &mut gpui::AppContext) {
-        init_test(cx);
-
+        cx.set_global(Settings::test(cx));
        fn assert(marked_text: &str, cx: &mut gpui::AppContext) {
            let (snapshot, display_points) = marked_display_snapshot(marked_text, cx);
            assert_eq!(
@@ -621,8 +576,7 @@ mod tests {

    #[gpui::test]
    fn test_move_up_and_down_with_excerpts(cx: &mut gpui::AppContext) {
-        init_test(cx);
-
+        cx.set_global(Settings::test(cx));
        let family_id = cx
            .font_cache()
            .load_family(&["Helvetica"], &Default::default())
@@ -737,11 +691,4 @@ mod tests {
            (DisplayPoint::new(7, 2), SelectionGoal::Column(2)),
        );
    }
-
-    fn init_test(cx: &mut gpui::AppContext) {
-        cx.set_global(SettingsStore::test(cx));
-        theme::init((), cx);
-        language::init(cx);
-        crate::init(cx);
-    }
 }
--- a/crates/editor/src/multi_buffer.rs
+++ b/crates/editor/src/multi_buffer.rs
@@ -9,9 +9,7 @@ use git::diff::DiffHunk;
 use gpui::{AppContext, Entity, ModelContext, ModelHandle, Task};
 pub use language::Completion;
 use language::{
-    char_kind,
-    language_settings::{language_settings, LanguageSettings},
-    AutoindentMode, Buffer, BufferChunks, BufferSnapshot, CharKind, Chunk, CursorShape,
+    char_kind, AutoindentMode, Buffer, BufferChunks, BufferSnapshot, CharKind, Chunk, CursorShape,
    DiagnosticEntry, File, IndentSize, Language, LanguageScope, OffsetRangeExt, OffsetUtf16,
    Outline, OutlineItem, Point, PointUtf16, Selection, TextDimension, ToOffset as _,
    ToOffsetUtf16 as _, ToPoint as _, ToPointUtf16 as _, TransactionId, Unclipped,
@@ -45,7 +43,7 @@ pub struct ExcerptId(usize);

 pub struct MultiBuffer {
    snapshot: RefCell<MultiBufferSnapshot>,
-    buffers: RefCell<HashMap<u64, BufferState>>,
+    buffers: RefCell<HashMap<usize, BufferState>>,
    next_excerpt_id: usize,
    subscriptions: Topic,
    singleton: bool,
@@ -87,7 +85,7 @@ struct History {
 #[derive(Clone)]
 struct Transaction {
    id: TransactionId,
-    buffer_transactions: HashMap<u64, text::TransactionId>,
+    buffer_transactions: HashMap<usize, text::TransactionId>,
    first_edit_at: Instant,
    last_edit_at: Instant,
    suppress_grouping: bool,
@@ -147,7 +145,7 @@ pub struct ExcerptBoundary {
 struct Excerpt {
    id: ExcerptId,
    locator: Locator,
-    buffer_id: u64,
+    buffer_id: usize,
    buffer: BufferSnapshot,
    range: ExcerptRange<text::Anchor>,
    max_buffer_row: u32,
@@ -339,7 +337,7 @@ impl MultiBuffer {
        offset: T,
        theme: Option<&SyntaxTheme>,
        cx: &AppContext,
-    ) -> Option<(u64, Vec<OutlineItem<Anchor>>)> {
+    ) -> Option<(usize, Vec<OutlineItem<Anchor>>)> {
        self.read(cx).symbols_containing(offset, theme)
    }

@@ -396,7 +394,7 @@ impl MultiBuffer {
            is_insertion: bool,
            original_indent_column: u32,
        }
-        let mut buffer_edits: HashMap<u64, Vec<BufferEdit>> = Default::default();
+        let mut buffer_edits: HashMap<usize, Vec<BufferEdit>> = Default::default();
        let mut cursor = snapshot.excerpts.cursor::<usize>();
        for (ix, (range, new_text)) in edits.enumerate() {
            let new_text: Arc<str> = new_text.into();
@@ -595,7 +593,7 @@ impl MultiBuffer {
            if let Some(transaction_id) =
                buffer.update(cx, |buffer, cx| buffer.end_transaction_at(now, cx))
            {
-                buffer_transactions.insert(buffer.read(cx).remote_id(), transaction_id);
+                buffer_transactions.insert(buffer.id(), transaction_id);
            }
        }

@@ -616,12 +614,12 @@ impl MultiBuffer {
        }
    }

-    pub fn push_transaction<'a, T>(&mut self, buffer_transactions: T, cx: &mut ModelContext<Self>)
+    pub fn push_transaction<'a, T>(&mut self, buffer_transactions: T)
    where
        T: IntoIterator<Item = (&'a ModelHandle<Buffer>, &'a language::Transaction)>,
    {
        self.history
-            .push_transaction(buffer_transactions, Instant::now(), cx);
+            .push_transaction(buffer_transactions, Instant::now());
        self.history.finalize_last_transaction();
    }

@@ -646,7 +644,7 @@ impl MultiBuffer {
        cursor_shape: CursorShape,
        cx: &mut ModelContext<Self>,
    ) {
-        let mut selections_by_buffer: HashMap<u64, Vec<Selection<text::Anchor>>> =
+        let mut selections_by_buffer: HashMap<usize, Vec<Selection<text::Anchor>>> =
            Default::default();
        let snapshot = self.read(cx);
        let mut cursor = snapshot.excerpts.cursor::<Option<&Locator>>();
@@ -787,8 +785,8 @@ impl MultiBuffer {
        let (mut tx, rx) = mpsc::channel(256);
        let task = cx.spawn(|this, mut cx| async move {
            for (buffer, ranges) in excerpts {
-                let (buffer_id, buffer_snapshot) =
-                    buffer.read_with(&cx, |buffer, _| (buffer.remote_id(), buffer.snapshot()));
+                let buffer_id = buffer.id();
+                let buffer_snapshot = buffer.read_with(&cx, |buffer, _| buffer.snapshot());

                let mut excerpt_ranges = Vec::new();
                let mut range_counts = Vec::new();
@@ -857,7 +855,7 @@ impl MultiBuffer {
    where
        O: text::ToPoint + text::ToOffset,
    {
-        let buffer_id = buffer.read(cx).remote_id();
+        let buffer_id = buffer.id();
        let buffer_snapshot = buffer.read(cx).snapshot();
        let (excerpt_ranges, range_counts) =
            build_excerpt_ranges(&buffer_snapshot, &ranges, context_line_count);
@@ -926,7 +924,7 @@ impl MultiBuffer {

        self.sync(cx);

-        let buffer_id = buffer.read(cx).remote_id();
+        let buffer_id = buffer.id();
        let buffer_snapshot = buffer.read(cx).snapshot();

        let mut buffers = self.buffers.borrow_mut();
@@ -1053,7 +1051,7 @@ impl MultiBuffer {
        let buffers = self.buffers.borrow();
        let mut cursor = snapshot.excerpts.cursor::<Option<&Locator>>();
        for locator in buffers
-            .get(&buffer.read(cx).remote_id())
+            .get(&buffer.id())
            .map(|state| &state.excerpts)
            .into_iter()
            .flatten()
@@ -1140,10 +1138,6 @@ impl MultiBuffer {
        let mut result = Vec::new();
        let mut cursor = snapshot.excerpts.cursor::<usize>();
        cursor.seek(&start, Bias::Right, &());
-        if cursor.item().is_none() {
-            cursor.prev(&());
-        }
-
        while let Some(excerpt) = cursor.item() {
            if *cursor.start() > end {
                break;
@@ -1171,9 +1165,6 @@ impl MultiBuffer {
    ) {
        self.sync(cx);
        let ids = excerpt_ids.into_iter().collect::<Vec<_>>();
-        if ids.is_empty() {
-            return;
-        }

        let mut buffers = self.buffers.borrow_mut();
        let mut snapshot = self.snapshot.borrow_mut();
@@ -1330,7 +1321,7 @@ impl MultiBuffer {
            .collect()
    }

-    pub fn buffer(&self, buffer_id: u64) -> Option<ModelHandle<Buffer>> {
+    pub fn buffer(&self, buffer_id: usize) -> Option<ModelHandle<Buffer>> {
        self.buffers
            .borrow()
            .get(&buffer_id)
@@ -1381,15 +1372,6 @@ impl MultiBuffer {
            .and_then(|(buffer, offset)| buffer.read(cx).language_at(offset))
    }

-    pub fn settings_at<'a, T: ToOffset>(
-        &self,
-        point: T,
-        cx: &'a AppContext,
-    ) -> &'a LanguageSettings {
-        let language = self.language_at(point, cx);
-        language_settings(language.map(|l| l.name()).as_deref(), cx)
-    }
-
    pub fn for_each_buffer(&self, mut f: impl FnMut(&ModelHandle<Buffer>)) {
        self.buffers
            .borrow()
@@ -1496,8 +1478,8 @@ impl MultiBuffer {
        for (locator, buffer, buffer_edited) in excerpts_to_edit {
            new_excerpts.push_tree(cursor.slice(&Some(locator), Bias::Left, &()), &());
            let old_excerpt = cursor.item().unwrap();
+            let buffer_id = buffer.id();
            let buffer = buffer.read(cx);
-            let buffer_id = buffer.remote_id();

            let mut new_excerpt;
            if buffer_edited {
@@ -1623,11 +1605,11 @@ impl MultiBuffer {
                let buffer_handle = if rng.gen() || self.buffers.borrow().is_empty() {
                    let text = RandomCharIter::new(&mut *rng).take(10).collect::<String>();
                    buffers.push(cx.add_model(|cx| Buffer::new(0, text, cx)));
-                    let buffer = buffers.last().unwrap().read(cx);
+                    let buffer = buffers.last().unwrap();
                    log::info!(
                        "Creating new buffer {} with text: {:?}",
-                        buffer.remote_id(),
-                        buffer.text()
+                        buffer.id(),
+                        buffer.read(cx).text()
                    );
                    buffers.last().unwrap().clone()
                } else {
@@ -1655,7 +1637,7 @@ impl MultiBuffer {
                    .collect::<Vec<_>>();
                log::info!(
                    "Inserting excerpts from buffer {} and ranges {:?}: {:?}",
-                    buffer_handle.read(cx).remote_id(),
+                    buffer_handle.id(),
                    ranges.iter().map(|r| &r.context).collect::<Vec<_>>(),
                    ranges
                        .iter()
@@ -1848,7 +1830,7 @@ impl MultiBufferSnapshot {
        (start..end, word_kind)
    }

-    pub fn as_singleton(&self) -> Option<(&ExcerptId, u64, &BufferSnapshot)> {
+    pub fn as_singleton(&self) -> Option<(&ExcerptId, usize, &BufferSnapshot)> {
        if self.singleton {
            self.excerpts
                .iter()
@@ -2782,16 +2764,6 @@ impl MultiBufferSnapshot {
            .and_then(|(buffer, offset)| buffer.language_at(offset))
    }

-    pub fn settings_at<'a, T: ToOffset>(
-        &'a self,
-        point: T,
-        cx: &'a AppContext,
-    ) -> &'a LanguageSettings {
-        self.point_to_buffer_offset(point)
-            .map(|(buffer, offset)| buffer.settings_at(offset, cx))
-            .unwrap_or_else(|| language_settings(None, cx))
-    }
-
    pub fn language_scope_at<'a, T: ToOffset>(&'a self, point: T) -> Option<LanguageScope> {
        self.point_to_buffer_offset(point)
            .and_then(|(buffer, offset)| buffer.language_scope_at(offset))
@@ -2845,87 +2817,21 @@ impl MultiBufferSnapshot {
            })
    }

-    pub fn has_git_diffs(&self) -> bool {
-        for excerpt in self.excerpts.iter() {
-            if !excerpt.buffer.git_diff.is_empty() {
-                return true;
-            }
-        }
-        false
-    }
-
-    pub fn git_diff_hunks_in_range_rev<'a>(
-        &'a self,
-        row_range: Range<u32>,
-    ) -> impl 'a + Iterator<Item = DiffHunk<u32>> {
-        let mut cursor = self.excerpts.cursor::<Point>();
-
-        cursor.seek(&Point::new(row_range.end, 0), Bias::Left, &());
-        if cursor.item().is_none() {
-            cursor.prev(&());
-        }
-
-        std::iter::from_fn(move || {
-            let excerpt = cursor.item()?;
-            let multibuffer_start = *cursor.start();
-            let multibuffer_end = multibuffer_start + excerpt.text_summary.lines;
-            if multibuffer_start.row >= row_range.end {
-                return None;
-            }
-
-            let mut buffer_start = excerpt.range.context.start;
-            let mut buffer_end = excerpt.range.context.end;
-            let excerpt_start_point = buffer_start.to_point(&excerpt.buffer);
-            let excerpt_end_point = excerpt_start_point + excerpt.text_summary.lines;
-
-            if row_range.start > multibuffer_start.row {
-                let buffer_start_point =
-                    excerpt_start_point + Point::new(row_range.start - multibuffer_start.row, 0);
-                buffer_start = excerpt.buffer.anchor_before(buffer_start_point);
-            }
-
-            if row_range.end < multibuffer_end.row {
-                let buffer_end_point =
-                    excerpt_start_point + Point::new(row_range.end - multibuffer_start.row, 0);
-                buffer_end = excerpt.buffer.anchor_before(buffer_end_point);
-            }
-
-            let buffer_hunks = excerpt
-                .buffer
-                .git_diff_hunks_intersecting_range_rev(buffer_start..buffer_end)
-                .filter_map(move |hunk| {
-                    let start = multibuffer_start.row
-                        + hunk
-                            .buffer_range
-                            .start
-                            .saturating_sub(excerpt_start_point.row);
-                    let end = multibuffer_start.row
-                        + hunk
-                            .buffer_range
-                            .end
-                            .min(excerpt_end_point.row + 1)
-                            .saturating_sub(excerpt_start_point.row);
-
-                    Some(DiffHunk {
-                        buffer_range: start..end,
-                        diff_base_byte_range: hunk.diff_base_byte_range.clone(),
-                    })
-                });
-
-            cursor.prev(&());
-
-            Some(buffer_hunks)
-        })
-        .flatten()
-    }
-
    pub fn git_diff_hunks_in_range<'a>(
        &'a self,
        row_range: Range<u32>,
+        reversed: bool,
    ) -> impl 'a + Iterator<Item = DiffHunk<u32>> {
        let mut cursor = self.excerpts.cursor::<Point>();

-        cursor.seek(&Point::new(row_range.start, 0), Bias::Right, &());
+        if reversed {
+            cursor.seek(&Point::new(row_range.end, 0), Bias::Left, &());
+            if cursor.item().is_none() {
+                cursor.prev(&());
+            }
+        } else {
+            cursor.seek(&Point::new(row_range.start, 0), Bias::Right, &());
+        }

        std::iter::from_fn(move || {
            let excerpt = cursor.item()?;
@@ -2954,7 +2860,7 @@ impl MultiBufferSnapshot {

            let buffer_hunks = excerpt
                .buffer
-                .git_diff_hunks_intersecting_range(buffer_start..buffer_end)
+                .git_diff_hunks_intersecting_range(buffer_start..buffer_end, reversed)
                .filter_map(move |hunk| {
                    let start = multibuffer_start.row
                        + hunk
@@ -2974,7 +2880,11 @@ impl MultiBufferSnapshot {
                    })
                });

-            cursor.next(&());
+            if reversed {
+                cursor.prev(&());
+            } else {
+                cursor.next(&());
+            }

            Some(buffer_hunks)
        })
@@ -3028,7 +2938,7 @@ impl MultiBufferSnapshot {
        &self,
        offset: T,
        theme: Option<&SyntaxTheme>,
-    ) -> Option<(u64, Vec<OutlineItem<Anchor>>)> {
+    ) -> Option<(usize, Vec<OutlineItem<Anchor>>)> {
        let anchor = self.anchor_before(offset);
        let excerpt_id = anchor.excerpt_id();
        let excerpt = self.excerpt(excerpt_id)?;
@@ -3068,7 +2978,7 @@ impl MultiBufferSnapshot {
        }
    }

-    pub fn buffer_id_for_excerpt(&self, excerpt_id: ExcerptId) -> Option<u64> {
+    pub fn buffer_id_for_excerpt(&self, excerpt_id: ExcerptId) -> Option<usize> {
        Some(self.excerpt(excerpt_id)?.buffer_id)
    }

@@ -3206,7 +3116,7 @@ impl History {
    fn end_transaction(
        &mut self,
        now: Instant,
-        buffer_transactions: HashMap<u64, TransactionId>,
+        buffer_transactions: HashMap<usize, TransactionId>,
    ) -> bool {
        assert_ne!(self.transaction_depth, 0);
        self.transaction_depth -= 1;
@@ -3231,12 +3141,8 @@ impl History {
        }
    }

-    fn push_transaction<'a, T>(
-        &mut self,
-        buffer_transactions: T,
-        now: Instant,
-        cx: &mut ModelContext<MultiBuffer>,
-    ) where
+    fn push_transaction<'a, T>(&mut self, buffer_transactions: T, now: Instant)
+    where
        T: IntoIterator<Item = (&'a ModelHandle<Buffer>, &'a language::Transaction)>,
    {
        assert_eq!(self.transaction_depth, 0);
@@ -3244,7 +3150,7 @@ impl History {
            id: self.next_transaction_id.tick(),
            buffer_transactions: buffer_transactions
                .into_iter()
-                .map(|(buffer, transaction)| (buffer.read(cx).remote_id(), transaction.id))
+                .map(|(buffer, transaction)| (buffer.id(), transaction.id))
                .collect(),
            first_edit_at: now,
            last_edit_at: now,
@@ -3341,7 +3247,7 @@ impl Excerpt {
    fn new(
        id: ExcerptId,
        locator: Locator,
-        buffer_id: u64,
+        buffer_id: usize,
        buffer: BufferSnapshot,
        range: ExcerptRange<text::Anchor>,
        has_trailing_newline: bool,
@@ -3875,9 +3781,10 @@ mod tests {
    use gpui::{AppContext, TestAppContext};
    use language::{Buffer, Rope};
    use rand::prelude::*;
-    use settings::SettingsStore;
+    use settings::Settings;
    use std::{env, rc::Rc};
    use unindent::Unindent;
+
    use util::test::sample_text;

    #[gpui::test]
@@ -4169,25 +4076,19 @@ mod tests {

        let leader_multibuffer = cx.add_model(|_| MultiBuffer::new(0));
        let follower_multibuffer = cx.add_model(|_| MultiBuffer::new(0));
-        let follower_edit_event_count = Rc::new(RefCell::new(0));

        follower_multibuffer.update(cx, |_, cx| {
-            let follower_edit_event_count = follower_edit_event_count.clone();
-            cx.subscribe(
-                &leader_multibuffer,
-                move |follower, _, event, cx| match event.clone() {
+            cx.subscribe(&leader_multibuffer, |follower, _, event, cx| {
+                match event.clone() {
                    Event::ExcerptsAdded {
                        buffer,
                        predecessor,
                        excerpts,
                    } => follower.insert_excerpts_with_ids_after(predecessor, buffer, excerpts, cx),
                    Event::ExcerptsRemoved { ids } => follower.remove_excerpts(ids, cx),
-                    Event::Edited => {
-                        *follower_edit_event_count.borrow_mut() += 1;
-                    }
                    _ => {}
-                },
-            )
+                }
+            })
            .detach();
        });

@@ -4226,7 +4127,6 @@ mod tests {
            leader_multibuffer.read(cx).snapshot(cx).text(),
            follower_multibuffer.read(cx).snapshot(cx).text(),
        );
-        assert_eq!(*follower_edit_event_count.borrow(), 2);

        leader_multibuffer.update(cx, |leader, cx| {
            let excerpt_ids = leader.excerpt_ids();
@@ -4236,27 +4136,6 @@ mod tests {
            leader_multibuffer.read(cx).snapshot(cx).text(),
            follower_multibuffer.read(cx).snapshot(cx).text(),
        );
-        assert_eq!(*follower_edit_event_count.borrow(), 3);
-
-        // Removing an empty set of excerpts is a noop.
-        leader_multibuffer.update(cx, |leader, cx| {
-            leader.remove_excerpts([], cx);
-        });
-        assert_eq!(
-            leader_multibuffer.read(cx).snapshot(cx).text(),
-            follower_multibuffer.read(cx).snapshot(cx).text(),
-        );
-        assert_eq!(*follower_edit_event_count.borrow(), 3);
-
-        // Adding an empty set of excerpts is a noop.
-        leader_multibuffer.update(cx, |leader, cx| {
-            leader.push_excerpts::<usize>(buffer_2.clone(), [], cx);
-        });
-        assert_eq!(
-            leader_multibuffer.read(cx).snapshot(cx).text(),
-            follower_multibuffer.read(cx).snapshot(cx).text(),
-        );
-        assert_eq!(*follower_edit_event_count.borrow(), 3);

        leader_multibuffer.update(cx, |leader, cx| {
            leader.clear(cx);
@@ -4265,7 +4144,6 @@ mod tests {
            leader_multibuffer.read(cx).snapshot(cx).text(),
            follower_multibuffer.read(cx).snapshot(cx).text(),
        );
-        assert_eq!(*follower_edit_event_count.borrow(), 4);
    }

    #[gpui::test]
@@ -4713,7 +4591,7 @@ mod tests {

        assert_eq!(
            snapshot
-                .git_diff_hunks_in_range(0..12)
+                .git_diff_hunks_in_range(0..12, false)
                .map(|hunk| (hunk.status(), hunk.buffer_range))
                .collect::<Vec<_>>(),
            &expected,
@@ -4721,7 +4599,7 @@ mod tests {

        assert_eq!(
            snapshot
-                .git_diff_hunks_in_range_rev(0..12)
+                .git_diff_hunks_in_range(0..12, true)
                .map(|hunk| (hunk.status(), hunk.buffer_range))
                .collect::<Vec<_>>(),
            expected
@@ -4837,7 +4715,7 @@ mod tests {
                        "Inserting excerpt at {} of {} for buffer {}: {:?}[{:?}] = {:?}",
                        excerpt_ix,
                        expected_excerpts.len(),
-                        buffer_handle.read(cx).remote_id(),
+                        buffer_handle.id(),
                        buffer.text(),
                        start_ix..end_ix,
                        &buffer.text()[start_ix..end_ix]
@@ -4923,8 +4801,8 @@ mod tests {

            let mut excerpt_starts = excerpt_starts.into_iter();
            for (buffer, range) in &expected_excerpts {
+                let buffer_id = buffer.id();
                let buffer = buffer.read(cx);
-                let buffer_id = buffer.remote_id();
                let buffer_range = range.to_offset(buffer);
                let buffer_start_point = buffer.offset_to_point(buffer_range.start);
                let buffer_start_point_utf16 =
@@ -5076,19 +4954,16 @@ mod tests {
                    .read(cx)
                    .range_to_buffer_ranges(start_ix..end_ix, cx);
                let excerpted_buffers_text = excerpted_buffer_ranges
-                    .iter()
+                    .into_iter()
                    .map(|(buffer, buffer_range)| {
                        buffer
                            .read(cx)
-                            .text_for_range(buffer_range.clone())
+                            .text_for_range(buffer_range)
                            .collect::<String>()
                    })
                    .collect::<Vec<_>>()
                    .join("\n");
                assert_eq!(excerpted_buffers_text, text_for_range);
-                if !expected_excerpts.is_empty() {
-                    assert!(!excerpted_buffer_ranges.is_empty());
-                }

                let expected_summary = TextSummary::from(&expected_text[start_ix..end_ix]);
                assert_eq!(
@@ -5155,8 +5030,7 @@ mod tests {

    #[gpui::test]
    fn test_history(cx: &mut AppContext) {
-        cx.set_global(SettingsStore::test(cx));
-
+        cx.set_global(Settings::test(cx));
        let buffer_1 = cx.add_model(|cx| Buffer::new(0, "1234", cx));
        let buffer_2 = cx.add_model(|cx| Buffer::new(0, "5678", cx));
        let multibuffer = cx.add_model(|_| MultiBuffer::new(0));
--- a/crates/editor/src/multi_buffer/anchor.rs
+++ b/crates/editor/src/multi_buffer/anchor.rs
@@ -8,7 +8,7 @@ use sum_tree::Bias;

 #[derive(Clone, Copy, Eq, PartialEq, Debug, Hash)]
 pub struct Anchor {
-    pub(crate) buffer_id: Option<u64>,
+    pub(crate) buffer_id: Option<usize>,
    pub(crate) excerpt_id: ExcerptId,
    pub(crate) text_anchor: text::Anchor,
 }
--- a/crates/editor/src/scroll/autoscroll.rs
+++ b/crates/editor/src/scroll/autoscroll.rs
@@ -1,9 +1,9 @@
 use std::cmp;

-use gpui::ViewContext;
+use gpui::{text_layout, ViewContext};
 use language::Point;

-use crate::{display_map::ToDisplayPoint, Editor, EditorMode, LineWithInvisibles};
+use crate::{display_map::ToDisplayPoint, Editor, EditorMode};

 #[derive(PartialEq, Eq)]
 pub enum Autoscroll {
@@ -172,7 +172,7 @@ impl Editor {
        viewport_width: f32,
        scroll_width: f32,
        max_glyph_width: f32,
-        layouts: &[LineWithInvisibles],
+        layouts: &[text_layout::Line],
        cx: &mut ViewContext<Self>,
    ) -> bool {
        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
@@ -194,13 +194,10 @@ impl Editor {
                    let end_column = cmp::min(display_map.line_len(head.row()), head.column() + 3);
                    target_left = target_left.min(
                        layouts[(head.row() - start_row) as usize]
-                            .line
                            .x_for_index(start_column as usize),
                    );
                    target_right = target_right.max(
-                        layouts[(head.row() - start_row) as usize]
-                            .line
-                            .x_for_index(end_column as usize)
+                        layouts[(head.row() - start_row) as usize].x_for_index(end_column as usize)
                            + max_glyph_width,
                    );
                }
--- a/crates/editor/src/test/editor_lsp_test_context.rs
+++ b/crates/editor/src/test/editor_lsp_test_context.rs
@@ -34,17 +34,13 @@ impl<'a> EditorLspTestContext<'a> {
    ) -> EditorLspTestContext<'a> {
        use json::json;

-        let app_state = cx.update(AppState::test);
-
        cx.update(|cx| {
-            theme::init((), cx);
-            language::init(cx);
            crate::init(cx);
            pane::init(cx);
-            Project::init_settings(cx);
-            workspace::init_settings(cx);
        });

+        let app_state = cx.update(AppState::test);
+
        let file_name = format!(
            "file.{}",
            language
--- a/crates/editor/src/test/editor_test_context.rs
+++ b/crates/editor/src/test/editor_test_context.rs
@@ -1,16 +1,19 @@
-use crate::{
-    display_map::ToDisplayPoint, AnchorRangeExt, Autoscroll, DisplayPoint, Editor, MultiBuffer,
-};
-use futures::Future;
-use gpui::{
-    keymap_matcher::Keystroke, AppContext, ContextHandle, ModelContext, ViewContext, ViewHandle,
-};
-use indoc::indoc;
-use language::{Buffer, BufferSnapshot};
 use std::{
    any::TypeId,
    ops::{Deref, DerefMut, Range},
 };
+
+use futures::Future;
+use indoc::indoc;
+
+use crate::{
+    display_map::ToDisplayPoint, AnchorRangeExt, Autoscroll, DisplayPoint, Editor, MultiBuffer,
+};
+use gpui::{
+    keymap_matcher::Keystroke, AppContext, ContextHandle, ModelContext, ViewContext, ViewHandle,
+};
+use language::{Buffer, BufferSnapshot};
+use settings::Settings;
 use util::{
    assert_set_eq,
    test::{generate_marked_text, marked_text_ranges},
@@ -27,10 +30,15 @@ pub struct EditorTestContext<'a> {
 impl<'a> EditorTestContext<'a> {
    pub fn new(cx: &'a mut gpui::TestAppContext) -> EditorTestContext<'a> {
        let (window_id, editor) = cx.update(|cx| {
-            cx.add_window(Default::default(), |cx| {
+            cx.set_global(Settings::test(cx));
+            crate::init(cx);
+
+            let (window_id, editor) = cx.add_window(Default::default(), |cx| {
                cx.focus_self();
                build_editor(MultiBuffer::build_simple("", cx), cx)
-            })
+            });
+
+            (window_id, editor)
        });

        Self {
@@ -204,7 +212,6 @@ impl<'a> EditorTestContext<'a> {
        self.assert_selections(expected_selections, marked_text.to_string())
    }

-    #[track_caller]
    pub fn assert_editor_background_highlights<Tag: 'static>(&mut self, marked_text: &str) {
        let expected_ranges = self.ranges(marked_text);
        let actual_ranges: Vec<Range<usize>> = self.update_editor(|editor, cx| {
@@ -221,7 +228,6 @@ impl<'a> EditorTestContext<'a> {
        assert_set_eq!(actual_ranges, expected_ranges);
    }

-    #[track_caller]
    pub fn assert_editor_text_highlights<Tag: ?Sized + 'static>(&mut self, marked_text: &str) {
        let expected_ranges = self.ranges(marked_text);
        let snapshot = self.update_editor(|editor, cx| editor.snapshot(cx));
@@ -235,14 +241,12 @@ impl<'a> EditorTestContext<'a> {
        assert_set_eq!(actual_ranges, expected_ranges);
    }

-    #[track_caller]
    pub fn assert_editor_selections(&mut self, expected_selections: Vec<Range<usize>>) {
        let expected_marked_text =
            generate_marked_text(&self.buffer_text(), &expected_selections, true);
        self.assert_selections(expected_selections, expected_marked_text)
    }

-    #[track_caller]
    fn assert_selections(
        &mut self,
        expected_selections: Vec<Range<usize>>,
--- a/crates/feedback/Cargo.toml
+++ b/crates/feedback/Cargo.toml
@@ -16,7 +16,6 @@ editor = { path = "../editor" }
 language = { path = "../language" }
 gpui = { path = "../gpui" }
 project = { path = "../project" }
-regex.workspace = true
 search = { path = "../search" }
 settings = { path = "../settings" }
 theme = { path = "../theme" }
@@ -28,7 +27,7 @@ futures.workspace = true
 anyhow.workspace = true
 smallvec.workspace = true
 human_bytes = "0.4.1"
-isahc.workspace = true
+isahc = "1.7"
 lazy_static.workspace = true
 postage.workspace = true
 serde.workspace = true
@@ -36,6 +35,3 @@ serde_derive.workspace = true
 sysinfo = "0.27.1"
 tree-sitter-markdown = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "330ecab87a3e3a7211ac69bbadc19eabecdb1cca" }
 urlencoding = "2.1.2"
-
-[dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
--- a/crates/feedback/src/deploy_feedback_button.rs
+++ b/crates/feedback/src/deploy_feedback_button.rs
@@ -3,6 +3,7 @@ use gpui::{
    platform::{CursorStyle, MouseButton},
    Entity, View, ViewContext, WeakViewHandle,
 };
+use settings::Settings;
 use workspace::{item::ItemHandle, StatusItemView, Workspace};

 use crate::feedback_editor::{FeedbackEditor, GiveFeedback};
@@ -32,15 +33,15 @@ impl View for DeployFeedbackButton {

    fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
        let active = self.active;
-        let theme = theme::current(cx).clone();
+        let theme = cx.global::<Settings>().theme.clone();
        Stack::new()
            .with_child(
                MouseEventHandler::<Self, Self>::new(0, cx, |state, _| {
                    let style = &theme
                        .workspace
                        .status_bar
-                        .panel_buttons
-                        .button
+                        .sidebar_buttons
+                        .item
                        .style_for(state, active);

                    Svg::new("icons/feedback_16.svg")
--- a/crates/feedback/src/feedback_editor.rs
+++ b/crates/feedback/src/feedback_editor.rs
@@ -14,7 +14,6 @@ use isahc::Request;
 use language::Buffer;
 use postage::prelude::Stream;
 use project::Project;
-use regex::Regex;
 use serde::Serialize;
 use smallvec::SmallVec;
 use std::{
@@ -47,7 +46,6 @@ pub fn init(cx: &mut AppContext) {
 #[derive(Serialize)]
 struct FeedbackRequestBody<'a> {
    feedback_text: &'a str,
-    email: Option<String>,
    metrics_id: Option<Arc<str>>,
    installation_id: Option<Arc<str>>,
    system_specs: SystemSpecs,
@@ -159,18 +157,8 @@ impl FeedbackEditor {
        let is_staff = telemetry.is_staff();
        let http_client = zed_client.http_client();

-        let re = Regex::new(r"\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,}\b").unwrap();
-
-        let emails: Vec<&str> = re
-            .captures_iter(feedback_text)
-            .map(|capture| capture.get(0).unwrap().as_str())
-            .collect();
-
-        let email = emails.first().map(|e| e.to_string());
-
        let request = FeedbackRequestBody {
            feedback_text: &feedback_text,
-            email,
            metrics_id,
            installation_id,
            system_specs,
--- a/crates/feedback/src/feedback_info_text.rs
+++ b/crates/feedback/src/feedback_info_text.rs
@@ -3,6 +3,7 @@ use gpui::{
    platform::{CursorStyle, MouseButton},
    AnyElement, Element, Entity, View, ViewContext, ViewHandle,
 };
+use settings::Settings;
 use workspace::{item::ItemHandle, ToolbarItemLocation, ToolbarItemView};

 use crate::{feedback_editor::FeedbackEditor, open_zed_community_repo, OpenZedCommunityRepo};
@@ -29,12 +30,12 @@ impl View for FeedbackInfoText {
    }

    fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
-        let theme = theme::current(cx).clone();
+        let theme = cx.global::<Settings>().theme.clone();

        Flex::row()
            .with_child(
                Text::new(
-                    "Share your feedback. Include your email for replies. For issues and discussions, visit the ",
+                    "We read whatever you submit here. For issues and discussions, visit the ",
                    theme.feedback.info_text_default.text.clone(),
                )
                .with_soft_wrap(false)
@@ -60,7 +61,7 @@ impl View for FeedbackInfoText {
                }),
            )
            .with_child(
-                Text::new(".", theme.feedback.info_text_default.text.clone())
+                Text::new(" on GitHub.", theme.feedback.info_text_default.text.clone())
                    .with_soft_wrap(false)
                    .aligned(),
            )
--- a/crates/feedback/src/submit_feedback_button.rs
+++ b/crates/feedback/src/submit_feedback_button.rs
@@ -5,6 +5,7 @@ use gpui::{
    platform::{CursorStyle, MouseButton},
    AnyElement, AppContext, Element, Entity, Task, View, ViewContext, ViewHandle,
 };
+use settings::Settings;
 use workspace::{item::ItemHandle, ToolbarItemLocation, ToolbarItemView};

 pub fn init(cx: &mut AppContext) {
@@ -45,7 +46,7 @@ impl View for SubmitFeedbackButton {
    }

    fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
-        let theme = theme::current(cx).clone();
+        let theme = cx.global::<Settings>().theme.clone();
        enum SubmitFeedbackButton {}
        MouseEventHandler::<SubmitFeedbackButton, Self>::new(0, cx, |state, _| {
            let style = theme.feedback.submit_button.style_for(state, false);
--- a/crates/file_finder/Cargo.toml
+++ b/crates/file_finder/Cargo.toml
@@ -16,19 +16,14 @@ menu = { path = "../menu" }
 picker = { path = "../picker" }
 project = { path = "../project" }
 settings = { path = "../settings" }
-text = { path = "../text" }
 util = { path = "../util" }
 theme = { path = "../theme" }
 workspace = { path = "../workspace" }
 postage.workspace = true

 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
 gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-workspace = { path = "../workspace", features = ["test-support"] }
-theme = { path = "../theme", features = ["test-support"] }
-
 serde_json.workspace = true
+workspace = { path = "../workspace", features = ["test-support"] }
 ctor.workspace = true
 env_logger.workspace = true
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
--- a/crates/fs/Cargo.toml
+++ b/crates/fs/Cargo.toml
@@ -13,7 +13,6 @@ gpui = { path = "../gpui" }
 lsp = { path = "../lsp" }
 rope = { path = "../rope" }
 util = { path = "../util" }
-sum_tree = { path = "../sum_tree" }
 anyhow.workspace = true
 async-trait.workspace = true
 futures.workspace = true
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -27,7 +27,7 @@ use util::ResultExt;
 #[cfg(any(test, feature = "test-support"))]
 use collections::{btree_map, BTreeMap};
 #[cfg(any(test, feature = "test-support"))]
-use repository::{FakeGitRepositoryState, GitFileStatus};
+use repository::FakeGitRepositoryState;
 #[cfg(any(test, feature = "test-support"))]
 use std::sync::Weak;

@@ -572,15 +572,15 @@ impl FakeFs {
        Ok(())
    }

-    pub fn pause_events(&self) {
+    pub async fn pause_events(&self) {
        self.state.lock().events_paused = true;
    }

-    pub fn buffered_event_count(&self) -> usize {
+    pub async fn buffered_event_count(&self) -> usize {
        self.state.lock().buffered_events.len()
    }

-    pub fn flush_events(&self, count: usize) {
+    pub async fn flush_events(&self, count: usize) {
        self.state.lock().flush_events(count);
    }

@@ -619,10 +619,7 @@ impl FakeFs {
        .boxed()
    }

-    pub fn with_git_state<F>(&self, dot_git: &Path, f: F)
-    where
-        F: FnOnce(&mut FakeGitRepositoryState),
-    {
+    pub async fn set_index_for_repo(&self, dot_git: &Path, head_state: &[(&Path, String)]) {
        let mut state = self.state.lock();
        let entry = state.read_path(dot_git).unwrap();
        let mut entry = entry.lock();
@@ -631,7 +628,12 @@ impl FakeFs {
            let repo_state = git_repo_state.get_or_insert_with(Default::default);
            let mut repo_state = repo_state.lock();

-            f(&mut repo_state);
+            repo_state.index_contents.clear();
+            repo_state.index_contents.extend(
+                head_state
+                    .iter()
+                    .map(|(path, content)| (path.to_path_buf(), content.clone())),
+            );

            state.emit_event([dot_git]);
        } else {
@@ -639,32 +641,6 @@ impl FakeFs {
        }
    }

-    pub async fn set_branch_name(&self, dot_git: &Path, branch: Option<impl Into<String>>) {
-        self.with_git_state(dot_git, |state| state.branch_name = branch.map(Into::into))
-    }
-
-    pub async fn set_index_for_repo(&self, dot_git: &Path, head_state: &[(&Path, String)]) {
-        self.with_git_state(dot_git, |state| {
-            state.index_contents.clear();
-            state.index_contents.extend(
-                head_state
-                    .iter()
-                    .map(|(path, content)| (path.to_path_buf(), content.clone())),
-            );
-        });
-    }
-
-    pub async fn set_status_for_repo(&self, dot_git: &Path, statuses: &[(&Path, GitFileStatus)]) {
-        self.with_git_state(dot_git, |state| {
-            state.worktree_statuses.clear();
-            state.worktree_statuses.extend(
-                statuses
-                    .iter()
-                    .map(|(path, content)| ((**path).into(), content.clone())),
-            );
-        });
-    }
-
    pub fn paths(&self) -> Vec<PathBuf> {
        let mut result = Vec::new();
        let mut queue = collections::VecDeque::new();
@@ -832,16 +808,14 @@ impl Fs for FakeFs {

        let old_path = normalize_path(old_path);
        let new_path = normalize_path(new_path);
-
        let mut state = self.state.lock();
        let moved_entry = state.write_path(&old_path, |e| {
            if let btree_map::Entry::Occupied(e) = e {
-                Ok(e.get().clone())
+                Ok(e.remove())
            } else {
                Err(anyhow!("path does not exist: {}", &old_path.display()))
            }
        })?;
-
        state.write_path(&new_path, |e| {
            match e {
                btree_map::Entry::Occupied(mut e) => {
@@ -857,17 +831,6 @@ impl Fs for FakeFs {
            }
            Ok(())
        })?;
-
-        state
-            .write_path(&old_path, |e| {
-                if let btree_map::Entry::Occupied(e) = e {
-                    Ok(e.remove())
-                } else {
-                    unreachable!()
-                }
-            })
-            .unwrap();
-
        state.emit_event(&[old_path, new_path]);
        Ok(())
    }
--- a/crates/fs/src/repository.rs
+++ b/crates/fs/src/repository.rs
@@ -1,16 +1,10 @@
 use anyhow::Result;
 use collections::HashMap;
 use parking_lot::Mutex;
-use serde_derive::{Deserialize, Serialize};
 use std::{
-    cmp::Ordering,
-    ffi::OsStr,
-    os::unix::prelude::OsStrExt,
    path::{Component, Path, PathBuf},
    sync::Arc,
 };
-use sum_tree::{MapSeekTarget, TreeMap};
-use util::ResultExt;

 pub use git2::Repository as LibGitRepository;

@@ -19,18 +13,6 @@ pub trait GitRepository: Send {
    fn reload_index(&self);

    fn load_index_text(&self, relative_file_path: &Path) -> Option<String>;
-
-    fn branch_name(&self) -> Option<String>;
-
-    fn statuses(&self) -> Option<TreeMap<RepoPath, GitFileStatus>>;
-
-    fn status(&self, path: &RepoPath) -> Option<GitFileStatus>;
-}
-
-impl std::fmt::Debug for dyn GitRepository {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("dyn GitRepository<...>").finish()
-    }
 }

 #[async_trait::async_trait]
@@ -64,54 +46,6 @@ impl GitRepository for LibGitRepository {
        }
        None
    }
-
-    fn branch_name(&self) -> Option<String> {
-        let head = self.head().log_err()?;
-        let branch = String::from_utf8_lossy(head.shorthand_bytes());
-        Some(branch.to_string())
-    }
-
-    fn statuses(&self) -> Option<TreeMap<RepoPath, GitFileStatus>> {
-        let statuses = self.statuses(None).log_err()?;
-
-        let mut map = TreeMap::default();
-
-        for status in statuses
-            .iter()
-            .filter(|status| !status.status().contains(git2::Status::IGNORED))
-        {
-            let path = RepoPath(PathBuf::from(OsStr::from_bytes(status.path_bytes())));
-            let Some(status) = read_status(status.status()) else {
-                continue
-            };
-
-            map.insert(path, status)
-        }
-
-        Some(map)
-    }
-
-    fn status(&self, path: &RepoPath) -> Option<GitFileStatus> {
-        let status = self.status_file(path).log_err()?;
-        read_status(status)
-    }
-}
-
-fn read_status(status: git2::Status) -> Option<GitFileStatus> {
-    if status.contains(git2::Status::CONFLICTED) {
-        Some(GitFileStatus::Conflict)
-    } else if status.intersects(
-        git2::Status::WT_MODIFIED
-            | git2::Status::WT_RENAMED
-            | git2::Status::INDEX_MODIFIED
-            | git2::Status::INDEX_RENAMED,
-    ) {
-        Some(GitFileStatus::Modified)
-    } else if status.intersects(git2::Status::WT_NEW | git2::Status::INDEX_NEW) {
-        Some(GitFileStatus::Added)
-    } else {
-        None
-    }
 }

 #[derive(Debug, Clone, Default)]
@@ -122,8 +56,6 @@ pub struct FakeGitRepository {
 #[derive(Debug, Clone, Default)]
 pub struct FakeGitRepositoryState {
    pub index_contents: HashMap<PathBuf, String>,
-    pub worktree_statuses: HashMap<RepoPath, GitFileStatus>,
-    pub branch_name: Option<String>,
 }

 impl FakeGitRepository {
@@ -140,25 +72,6 @@ impl GitRepository for FakeGitRepository {
        let state = self.state.lock();
        state.index_contents.get(path).cloned()
    }
-
-    fn branch_name(&self) -> Option<String> {
-        let state = self.state.lock();
-        state.branch_name.clone()
-    }
-
-    fn statuses(&self) -> Option<TreeMap<RepoPath, GitFileStatus>> {
-        let state = self.state.lock();
-        let mut map = TreeMap::default();
-        for (repo_path, status) in state.worktree_statuses.iter() {
-            map.insert(repo_path.to_owned(), status.to_owned());
-        }
-        Some(map)
-    }
-
-    fn status(&self, path: &RepoPath) -> Option<GitFileStatus> {
-        let state = self.state.lock();
-        state.worktree_statuses.get(path).cloned()
-    }
 }

 fn check_path_to_repo_path_errors(relative_file_path: &Path) -> Result<()> {
@@ -189,66 +102,3 @@ fn check_path_to_repo_path_errors(relative_file_path: &Path) -> Result<()> {
        _ => Ok(()),
    }
 }
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-pub enum GitFileStatus {
-    Added,
-    Modified,
-    Conflict,
-}
-
-#[derive(Clone, Debug, Ord, Hash, PartialOrd, Eq, PartialEq)]
-pub struct RepoPath(PathBuf);
-
-impl RepoPath {
-    pub fn new(path: PathBuf) -> Self {
-        debug_assert!(path.is_relative(), "Repo paths must be relative");
-
-        RepoPath(path)
-    }
-}
-
-impl From<&Path> for RepoPath {
-    fn from(value: &Path) -> Self {
-        RepoPath::new(value.to_path_buf())
-    }
-}
-
-impl From<PathBuf> for RepoPath {
-    fn from(value: PathBuf) -> Self {
-        RepoPath::new(value)
-    }
-}
-
-impl Default for RepoPath {
-    fn default() -> Self {
-        RepoPath(PathBuf::new())
-    }
-}
-
-impl AsRef<Path> for RepoPath {
-    fn as_ref(&self) -> &Path {
-        self.0.as_ref()
-    }
-}
-
-impl std::ops::Deref for RepoPath {
-    type Target = PathBuf;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-#[derive(Debug)]
-pub struct RepoPathDescendants<'a>(pub &'a Path);
-
-impl<'a> MapSeekTarget<RepoPath> for RepoPathDescendants<'a> {
-    fn cmp_cursor(&self, key: &RepoPath) -> Ordering {
-        if key.starts_with(&self.0) {
-            Ordering::Greater
-        } else {
-            self.0.cmp(key)
-        }
-    }
-}
--- a/crates/git/src/diff.rs
+++ b/crates/git/src/diff.rs
@@ -1,4 +1,4 @@
-use std::{iter, ops::Range};
+use std::ops::Range;
 use sum_tree::SumTree;
 use text::{Anchor, BufferSnapshot, OffsetRangeExt, Point};

@@ -71,66 +71,22 @@ impl BufferDiff {
        }
    }

-    pub fn is_empty(&self) -> bool {
-        self.tree.is_empty()
-    }
-
    pub fn hunks_in_row_range<'a>(
        &'a self,
        range: Range<u32>,
        buffer: &'a BufferSnapshot,
+        reversed: bool,
    ) -> impl 'a + Iterator<Item = DiffHunk<u32>> {
        let start = buffer.anchor_before(Point::new(range.start, 0));
        let end = buffer.anchor_after(Point::new(range.end, 0));
-
-        self.hunks_intersecting_range(start..end, buffer)
+        self.hunks_intersecting_range(start..end, buffer, reversed)
    }

    pub fn hunks_intersecting_range<'a>(
        &'a self,
        range: Range<Anchor>,
        buffer: &'a BufferSnapshot,
-    ) -> impl 'a + Iterator<Item = DiffHunk<u32>> {
-        let mut cursor = self.tree.filter::<_, DiffHunkSummary>(move |summary| {
-            let before_start = summary.buffer_range.end.cmp(&range.start, buffer).is_lt();
-            let after_end = summary.buffer_range.start.cmp(&range.end, buffer).is_gt();
-            !before_start && !after_end
-        });
-
-        let anchor_iter = std::iter::from_fn(move || {
-            cursor.next(buffer);
-            cursor.item()
-        })
-        .flat_map(move |hunk| {
-            [
-                (&hunk.buffer_range.start, hunk.diff_base_byte_range.start),
-                (&hunk.buffer_range.end, hunk.diff_base_byte_range.end),
-            ]
-            .into_iter()
-        });
-
-        let mut summaries = buffer.summaries_for_anchors_with_payload::<Point, _, _>(anchor_iter);
-        iter::from_fn(move || {
-            let (start_point, start_base) = summaries.next()?;
-            let (end_point, end_base) = summaries.next()?;
-
-            let end_row = if end_point.column > 0 {
-                end_point.row + 1
-            } else {
-                end_point.row
-            };
-
-            Some(DiffHunk {
-                buffer_range: start_point.row..end_row,
-                diff_base_byte_range: start_base..end_base,
-            })
-        })
-    }
-
-    pub fn hunks_intersecting_range_rev<'a>(
-        &'a self,
-        range: Range<Anchor>,
-        buffer: &'a BufferSnapshot,
+        reversed: bool,
    ) -> impl 'a + Iterator<Item = DiffHunk<u32>> {
        let mut cursor = self.tree.filter::<_, DiffHunkSummary>(move |summary| {
            let before_start = summary.buffer_range.end.cmp(&range.start, buffer).is_lt();
@@ -139,9 +95,14 @@ impl BufferDiff {
        });

        std::iter::from_fn(move || {
-            cursor.prev(buffer);
+            if reversed {
+                cursor.prev(buffer);
+            } else {
+                cursor.next(buffer);
+            }

            let hunk = cursor.item()?;
+
            let range = hunk.buffer_range.to_point(buffer);
            let end_row = if range.end.column > 0 {
                range.end.row + 1
@@ -190,7 +151,7 @@ impl BufferDiff {
    fn hunks<'a>(&'a self, text: &'a BufferSnapshot) -> impl 'a + Iterator<Item = DiffHunk<u32>> {
        let start = text.anchor_before(Point::new(0, 0));
        let end = text.anchor_after(Point::new(u32::MAX, u32::MAX));
-        self.hunks_intersecting_range(start..end, text)
+        self.hunks_intersecting_range(start..end, text, false)
    }

    fn diff<'a>(head: &'a str, current: &'a str) -> Option<GitPatch<'a>> {
@@ -318,8 +279,6 @@ pub fn assert_hunks<Iter>(

 #[cfg(test)]
 mod tests {
-    use std::assert_eq;
-
    use super::*;
    use text::Buffer;
    use unindent::Unindent as _;
@@ -406,7 +365,7 @@ mod tests {
        assert_eq!(diff.hunks(&buffer).count(), 8);

        assert_hunks(
-            diff.hunks_in_row_range(7..12, &buffer),
+            diff.hunks_in_row_range(7..12, &buffer, false),
            &buffer,
            &diff_base,
            &[
--- a/crates/go_to_line/Cargo.toml
+++ b/crates/go_to_line/Cargo.toml
@@ -16,8 +16,3 @@ settings = { path = "../settings" }
 text = { path = "../text" }
 workspace = { path = "../workspace" }
 postage.workspace = true
-theme = { path = "../theme" }
-util = { path = "../util" }
-
-[dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
--- a/crates/go_to_line/src/go_to_line.rs
+++ b/crates/go_to_line/src/go_to_line.rs
@@ -1,13 +1,13 @@
 use std::sync::Arc;

-use editor::{display_map::ToDisplayPoint, scroll::autoscroll::Autoscroll, Editor};
+use editor::{display_map::ToDisplayPoint, scroll::autoscroll::Autoscroll, DisplayPoint, Editor};
 use gpui::{
    actions, elements::*, geometry::vector::Vector2F, AnyViewHandle, AppContext, Axis, Entity,
    View, ViewContext, ViewHandle,
 };
 use menu::{Cancel, Confirm};
+use settings::Settings;
 use text::{Bias, Point};
-use util::paths::FILE_ROW_COLUMN_DELIMITER;
 use workspace::{Modal, Workspace};

 actions!(go_to_line, [Toggle]);
@@ -75,16 +75,15 @@ impl GoToLine {

    fn confirm(&mut self, _: &Confirm, cx: &mut ViewContext<Self>) {
        self.prev_scroll_position.take();
-        if let Some(point) = self.point_from_query(cx) {
-            self.active_editor.update(cx, |active_editor, cx| {
+        self.active_editor.update(cx, |active_editor, cx| {
+            if let Some(rows) = active_editor.highlighted_rows() {
                let snapshot = active_editor.snapshot(cx).display_snapshot;
-                let point = snapshot.buffer_snapshot.clip_point(point, Bias::Left);
+                let position = DisplayPoint::new(rows.start, 0).to_point(&snapshot);
                active_editor.change_selections(Some(Autoscroll::center()), cx, |s| {
-                    s.select_ranges([point..point])
+                    s.select_ranges([position..position])
                });
-            });
-        }
-
+            }
+        });
        cx.emit(Event::Dismissed);
    }

@@ -97,7 +96,16 @@ impl GoToLine {
        match event {
            editor::Event::Blurred => cx.emit(Event::Dismissed),
            editor::Event::BufferEdited { .. } => {
-                if let Some(point) = self.point_from_query(cx) {
+                let line_editor = self.line_editor.read(cx).text(cx);
+                let mut components = line_editor.trim().split(&[',', ':'][..]);
+                let row = components.next().and_then(|row| row.parse::<u32>().ok());
+                let column = components.next().and_then(|row| row.parse::<u32>().ok());
+                if let Some(point) = row.map(|row| {
+                    Point::new(
+                        row.saturating_sub(1),
+                        column.map(|column| column.saturating_sub(1)).unwrap_or(0),
+                    )
+                }) {
                    self.active_editor.update(cx, |active_editor, cx| {
                        let snapshot = active_editor.snapshot(cx).display_snapshot;
                        let point = snapshot.buffer_snapshot.clip_point(point, Bias::Left);
@@ -112,20 +120,6 @@ impl GoToLine {
            _ => {}
        }
    }
-
-    fn point_from_query(&self, cx: &ViewContext<Self>) -> Option<Point> {
-        let line_editor = self.line_editor.read(cx).text(cx);
-        let mut components = line_editor
-            .splitn(2, FILE_ROW_COLUMN_DELIMITER)
-            .map(str::trim)
-            .fuse();
-        let row = components.next().and_then(|row| row.parse::<u32>().ok())?;
-        let column = components.next().and_then(|col| col.parse::<u32>().ok());
-        Some(Point::new(
-            row.saturating_sub(1),
-            column.unwrap_or(0).saturating_sub(1),
-        ))
-    }
 }

 impl Entity for GoToLine {
@@ -150,10 +144,10 @@ impl View for GoToLine {
    }

    fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
-        let theme = &theme::current(cx).picker;
+        let theme = &cx.global::<Settings>().theme.picker;

        let label = format!(
-            "{}{FILE_ROW_COLUMN_DELIMITER}{} of {} lines",
+            "{},{} of {} lines",
            self.cursor_point.row + 1,
            self.cursor_point.column + 1,
            self.max_point.row + 1
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -48,7 +48,7 @@ smallvec.workspace = true
 smol.workspace = true
 time.workspace = true
 tiny-skia = "0.5"
-usvg = { version = "0.14", features = [] }
+usvg = "0.14"
 uuid = { version = "1.1.2", features = ["v4"] }
 waker-fn = "1.1.0"

@@ -72,7 +72,7 @@ cocoa = "0.24"
 core-foundation = { version = "0.9.3", features = ["with-uuid"] }
 core-graphics = "0.22.3"
 core-text = "19.2"
-font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "b2f77d56f450338aa4f7dd2f0197d8c9acb0cf18" }
+font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "8eaf7a918eafa28b0a37dc759e2e0e7683fa24f1" }
 foreign-types = "0.3"
 log.workspace = true
 metal = "0.21.0"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Joseph Lyons	2fcf186b17	zed 0.85.2	2023-05-04 17:29:26 -04:00
Antonio Scandurra	5faceaf659	Merge pull request #2444 from zed-industries/fix-clicking-sidebar-buttons Use `Workspace::toggle_sidebar_item` when clicking on sidebar button	2023-05-04 17:27:23 -04:00
Mikayla Maki	8ff3f6569d	Merge pull request #2446 from zed-industries/fix-copilot-logged-out Fix copilot stuck in logged out state	2023-05-04 17:24:28 -04:00
Joseph T. Lyons	41ef9cc279	Merge pull request #2447 from zed-industries/fix-auto-update Do not use post_json() to auto update	2023-05-04 17:24:07 -04:00
Antonio Scandurra	08e5e5a43d	zed 0.85.1	2023-05-04 17:15:30 +02:00
Antonio Scandurra	96dffc06e7	Merge pull request #2444 from zed-industries/fix-clicking-sidebar-buttons Use `Workspace::toggle_sidebar_item` when clicking on sidebar button	2023-05-04 17:15:02 +02:00
Antonio Scandurra	dc8f348cdb	Merge pull request #2443 from zed-industries/fix-vim-mode-rename Avoid calling `update_window` twice in `blurred` event handler	2023-05-04 16:30:52 +02:00
Antonio Scandurra	fcbdfe849f	Merge pull request #2442 from zed-industries/filter-vim-commands Filter out vim commands when vim mode is disabled	2023-05-04 15:00:37 +02:00
Antonio Scandurra	e23ca8d20e	Merge pull request #2440 from zed-industries/fix-navigate-to-definitions-panic Fix panic when opening multiple definitions in a multibuffer	2023-05-04 14:57:08 +02:00
Antonio Scandurra	3407b16ec8	Merge pull request #2439 from zed-industries/fix-keystrokes-for-action Cache view's type id and keymap context into a separate map	2023-05-04 14:25:10 +02:00
Joseph Lyons	cc62945c6b	v0.85.x preview	2023-05-03 14:38:06 -04:00