zed 0.97.6

Piotr/optimize search selections with a limit (#2831 )
/cc @nathansobo @maxbrunsfeld Release Notes: - Fixed scrollbar selections causing noticeable slowdowns with large quantities of selections.
2023-08-08 12:35:38 -07:00 · 2023-08-08 12:34:37 -07:00 · 2023-08-08 12:34:28 -07:00 · 2023-08-02 13:50:08 -04:00 · 2023-08-02 12:52:33 -04:00 · 2023-08-02 12:51:34 -04:00
51 changed files with 587 additions and 2539 deletions
--- a/.zed/settings.json
+++ b/.zed/settings.json
@@ -1,5 +0,0 @@
-{
-    "JSON": {
-        "tab_size": 4
-    }
-}
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -111,7 +111,7 @@ tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", re
 tree-sitter-c = "0.20.1"
 tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev="f44509141e7e483323d2ec178f2d2e6c0fc041c1" }
 tree-sitter-css = { git = "https://github.com/tree-sitter/tree-sitter-css", rev = "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51" }
-tree-sitter-elixir = { git = "https://github.com/elixir-lang/tree-sitter-elixir", rev = "a2861e88a730287a60c11ea9299c033c7d076e30" }
+tree-sitter-elixir = { git = "https://github.com/elixir-lang/tree-sitter-elixir", rev = "4ba9dab6e2602960d95b2b625f3386c27e08084e" }
 tree-sitter-elm = { git = "https://github.com/elm-tooling/tree-sitter-elm", rev = "692c50c0b961364c40299e73c1306aecb5d20f40"}
 tree-sitter-embedded-template = "0.20.0"
 tree-sitter-glsl = { git = "https://github.com/theHamsta/tree-sitter-glsl", rev = "2a56fb7bc8bb03a1892b4741279dd0a8758b7fb3" }
@@ -131,7 +131,6 @@ tree-sitter-svelte = { git = "https://github.com/Himujjal/tree-sitter-svelte", r
 tree-sitter-racket = { git = "https://github.com/zed-industries/tree-sitter-racket", rev = "eb010cf2c674c6fd9a6316a84e28ef90190fe51a"}
 tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "f545a41f57502e1b5ddf2a6668896c1b0620f930"}
 tree-sitter-lua = "0.0.14"
-tree-sitter-nix = { git = "https://github.com/nix-community/tree-sitter-nix", rev = "66e3e9ce9180ae08fc57372061006ef83f0abde7" }

 [patch.crates-io]
 tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "1c65ca24bc9a734ab70115188f465e12eecf224e" }
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.2

-FROM rust:1.71-bullseye as builder
+FROM rust:1.70-bullseye as builder
 WORKDIR app
 COPY . .

--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -1,179 +1,159 @@
 {
-    "suffixes": {
-        "aac": "audio",
-        "accdb": "storage",
-        "bak": "backup",
-        "bash": "terminal",
-        "bash_aliases": "terminal",
-        "bash_logout": "terminal",
-        "bash_profile": "terminal",
-        "bashrc": "terminal",
-        "bmp": "image",
-        "c": "code",
-        "cc": "code",
-        "conf": "settings",
-        "cpp": "code",
-        "css": "code",
-        "csv": "storage",
-        "dat": "storage",
-        "db": "storage",
-        "dbf": "storage",
-        "dll": "storage",
-        "doc": "document",
-        "docx": "document",
-        "eslintrc": "eslint",
-        "eslintrc.js": "eslint",
-        "eslintrc.json": "eslint",
-        "fmp": "storage",
-        "fp7": "storage",
-        "flac": "audio",
-        "fish": "terminal",
-        "frm": "storage",
-        "gdb": "storage",
-        "gitattributes": "vcs",
-        "gitignore": "vcs",
-        "gitmodules": "vcs",
-        "gif": "image",
-        "go": "code",
-        "h": "code",
-        "handlebars": "code",
-        "hbs": "template",
-        "htm": "template",
-        "html": "template",
-        "ib": "storage",
-        "ico": "image",
-        "ini": "settings",
-        "java": "code",
-        "jpeg": "image",
-        "jpg": "image",
-        "js": "code",
-        "json": "storage",
-        "ldf": "storage",
-        "lock": "lock",
-        "log": "log",
-        "mdb": "storage",
-        "md": "document",
-        "mdf": "storage",
-        "mdx": "document",
-        "mp3": "audio",
-        "mp4": "video",
-        "myd": "storage",
-        "myi": "storage",
-        "ods": "document",
-        "odp": "document",
-        "odt": "document",
-        "ogg": "video",
-        "pdb": "storage",
-        "pdf": "document",
-        "php": "code",
-        "png": "image",
-        "ppt": "document",
-        "pptx": "document",
-        "prettierignore": "prettier",
-        "prettierrc": "prettier",
-        "profile": "terminal",
-        "ps1": "terminal",
-        "psd": "image",
-        "py": "code",
-        "rb": "code",
-        "rkt": "code",
-        "rs": "rust",
-        "rtf": "document",
-        "sav": "storage",
-        "scm": "code",
-        "sh": "terminal",
-        "sqlite": "storage",
-        "sdf": "storage",
-        "svelte": "template",
-        "svg": "image",
-        "swift": "code",
-        "ts": "typescript",
-        "tsx": "code",
-        "tiff": "image",
-        "toml": "toml",
-        "tsv": "storage",
-        "txt": "document",
-        "wav": "audio",
-        "webm": "video",
-        "xls": "document",
-        "xlsx": "document",
-        "xml": "template",
-        "yaml": "settings",
-        "yml": "settings",
-        "zlogin": "terminal",
-        "zsh": "terminal",
-        "zsh_aliases": "terminal",
-        "zshenv": "terminal",
-        "zsh_histfile": "terminal",
-        "zsh_profile": "terminal",
-        "zshrc": "terminal"
+  "suffixes": {
+    "aac": "audio",
+    "bash": "terminal",
+    "bmp": "image",
+    "c": "code",
+    "conf": "settings",
+    "cpp": "code",
+    "cc": "code",
+    "css": "code",
+    "doc": "document",
+    "docx": "document",
+    "eslintrc": "eslint",
+    "eslintrc.js": "eslint",
+    "eslintrc.json": "eslint",
+    "flac": "audio",
+    "fish": "terminal",
+    "gitattributes": "vcs",
+    "gitignore": "vcs",
+    "gitmodules": "vcs",
+    "gif": "image",
+    "go": "code",
+    "h": "code",
+    "handlebars": "code",
+    "hbs": "template",
+    "htm": "template",
+    "html": "template",
+    "svelte": "template",
+    "hpp": "code",
+    "ico": "image",
+    "ini": "settings",
+    "java": "code",
+    "jpeg": "image",
+    "jpg": "image",
+    "js": "code",
+    "json": "storage",
+    "lock": "lock",
+    "log": "log",
+    "md": "document",
+    "mdx": "document",
+    "mp3": "audio",
+    "mp4": "video",
+    "ods": "document",
+    "odp": "document",
+    "odt": "document",
+    "ogg": "video",
+    "pdf": "document",
+    "php": "code",
+    "png": "image",
+    "ppt": "document",
+    "pptx": "document",
+    "prettierrc": "prettier",
+    "prettierignore": "prettier",
+    "ps1": "terminal",
+    "psd": "image",
+    "py": "code",
+    "rb": "code",
+    "rkt": "code",
+    "rs": "rust",
+    "rtf": "document",
+    "scm": "code",
+    "sh": "terminal",
+    "bashrc": "terminal",
+    "bash_profile": "terminal",
+    "bash_aliases": "terminal",
+    "bash_logout": "terminal",
+    "profile": "terminal",
+    "zshrc": "terminal",
+    "zshenv": "terminal",
+    "zsh_profile": "terminal",
+    "zsh_aliases": "terminal",
+    "zsh_histfile": "terminal",
+    "zlogin": "terminal",
+    "sql": "code",
+    "svg": "image",
+    "swift": "code",
+    "tiff": "image",
+    "toml": "toml",
+    "ts": "typescript",
+    "tsx": "code",
+    "txt": "document",
+    "wav": "audio",
+    "webm": "video",
+    "xls": "document",
+    "xlsx": "document",
+    "xml": "template",
+    "yaml": "settings",
+    "yml": "settings",
+    "zsh": "terminal"
+  },
+  "types": {
+    "audio": {
+      "icon": "icons/file_icons/audio.svg"
    },
-    "types": {
-        "audio": {
-            "icon": "icons/file_icons/audio.svg"
-        },
-        "code": {
-            "icon": "icons/file_icons/code.svg"
-        },
-        "collapsed_chevron": {
-            "icon": "icons/file_icons/chevron_right.svg"
-        },
-        "collapsed_folder": {
-            "icon": "icons/file_icons/folder.svg"
-        },
-        "default": {
-            "icon": "icons/file_icons/file.svg"
-        },
-        "document": {
-            "icon": "icons/file_icons/book.svg"
-        },
-        "eslint": {
-            "icon": "icons/file_icons/eslint.svg"
-        },
-        "expanded_chevron": {
-            "icon": "icons/file_icons/chevron_down.svg"
-        },
-        "expanded_folder": {
-            "icon": "icons/file_icons/folder_open.svg"
-        },
-        "image": {
-            "icon": "icons/file_icons/image.svg"
-        },
-        "lock": {
-            "icon": "icons/file_icons/lock.svg"
-        },
-        "log": {
-            "icon": "icons/file_icons/info.svg"
-        },
-        "prettier": {
-            "icon": "icons/file_icons/prettier.svg"
-        },
-        "rust": {
-            "icon": "icons/file_icons/rust.svg"
-        },
-        "settings": {
-            "icon": "icons/file_icons/settings.svg"
-        },
-        "storage": {
-            "icon": "icons/file_icons/database.svg"
-        },
-        "template": {
-            "icon": "icons/file_icons/html.svg"
-        },
-        "terminal": {
-            "icon": "icons/file_icons/terminal.svg"
-        },
-        "toml": {
-            "icon": "icons/file_icons/toml.svg"
-        },
-        "typescript": {
-            "icon": "icons/file_icons/typescript.svg"
-        },
-        "vcs": {
-            "icon": "icons/file_icons/git.svg"
-        },
-        "video": {
-            "icon": "icons/file_icons/video.svg"
-        }
+    "code": {
+      "icon": "icons/file_icons/code.svg"
+    },
+    "collapsed_chevron": {
+      "icon": "icons/file_icons/chevron_right.svg"
+    },
+    "collapsed_folder": {
+      "icon": "icons/file_icons/folder.svg"
+    },
+    "default": {
+      "icon": "icons/file_icons/file.svg"
+    },
+    "document": {
+      "icon": "icons/file_icons/book.svg"
+    },
+    "eslint": {
+      "icon": "icons/file_icons/eslint.svg"
+    },
+    "expanded_chevron": {
+      "icon": "icons/file_icons/chevron_down.svg"
+    },
+    "expanded_folder": {
+      "icon": "icons/file_icons/folder_open.svg"
+    },
+    "image": {
+      "icon": "icons/file_icons/image.svg"
+    },
+    "lock": {
+      "icon": "icons/file_icons/lock.svg"
+    },
+    "log": {
+      "icon": "icons/file_icons/info.svg"
+    },
+    "prettier": {
+      "icon": "icons/file_icons/prettier.svg"
+    },
+    "rust": {
+      "icon": "icons/file_icons/rust.svg"
+    },
+    "settings": {
+      "icon": "icons/file_icons/settings.svg"
+    },
+    "storage": {
+      "icon": "icons/file_icons/database.svg"
+    },
+    "template": {
+      "icon": "icons/file_icons/html.svg"
+    },
+    "terminal": {
+      "icon": "icons/file_icons/terminal.svg"
+    },
+    "toml": {
+      "icon": "icons/file_icons/toml.svg"
+    },
+    "typescript": {
+      "icon": "icons/file_icons/typescript.svg"
+    },
+    "vcs": {
+      "icon": "icons/file_icons/git.svg"
+    },
+    "video": {
+      "icon": "icons/file_icons/video.svg"
    }
+  }
 }
--- a/assets/keymaps/default.json
+++ b/assets/keymaps/default.json
@@ -22,7 +22,6 @@
      "alt-cmd-right": "pane::ActivateNextItem",
      "cmd-w": "pane::CloseActiveItem",
      "alt-cmd-t": "pane::CloseInactiveItems",
-      "ctrl-alt-cmd-w": "workspace::CloseInactiveTabsAndPanes",
      "cmd-k u": "pane::CloseCleanItems",
      "cmd-k cmd-w": "pane::CloseAllItems",
      "cmd-shift-w": "workspace::CloseWindow",
@@ -227,26 +226,12 @@
      "alt-enter": "search::SelectAllMatches"
    }
  },
-  {
-    "context": "BufferSearchBar > Editor",
-    "bindings": {
-      "up": "search::PreviousHistoryQuery",
-      "down": "search::NextHistoryQuery"
-    }
-  },
  {
    "context": "ProjectSearchBar",
    "bindings": {
      "escape": "project_search::ToggleFocus"
    }
  },
-  {
-    "context": "ProjectSearchBar > Editor",
-    "bindings": {
-      "up": "search::PreviousHistoryQuery",
-      "down": "search::NextHistoryQuery"
-    }
-  },
  {
    "context": "ProjectSearchView",
    "bindings": {
@@ -426,6 +411,7 @@
      "cmd-k cmd-t": "theme_selector::Toggle",
      "cmd-k cmd-s": "zed::OpenKeymap",
      "cmd-t": "project_symbols::Toggle",
+      "cmd-ctrl-t": "semantic_search::Toggle",
      "cmd-p": "file_finder::Toggle",
      "cmd-shift-p": "command_palette::Toggle",
      "cmd-shift-m": "diagnostics::Deploy",
--- a/crates/collab/src/tests/randomized_integration_tests.rs
+++ b/crates/collab/src/tests/randomized_integration_tests.rs
@@ -183,7 +183,7 @@ async fn apply_server_operation(
            let username;
            {
                let mut plan = plan.lock();
-                let user = plan.user(user_id);
+                let mut user = plan.user(user_id);
                if user.online {
                    return false;
                }
--- a/crates/collab_ui/src/collab_titlebar_item.rs
+++ b/crates/collab_ui/src/collab_titlebar_item.rs
@@ -374,7 +374,7 @@ impl CollabTitlebarItem {
                        "Share Feedback",
                        feedback::feedback_editor::GiveFeedback,
                    ),
-                    ContextMenuItem::action("Sign Out", SignOut),
+                    ContextMenuItem::action("Sign out", SignOut),
                ]
            } else {
                vec![
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -338,9 +338,9 @@ impl Copilot {
        let (server, fake_server) =
            LanguageServer::fake("copilot".into(), Default::default(), cx.to_async());
        let http = util::http::FakeHttpClient::create(|_| async { unreachable!() });
-        let this = cx.add_model(|_| Self {
+        let this = cx.add_model(|cx| Self {
            http: http.clone(),
-            node_runtime: NodeRuntime::instance(http),
+            node_runtime: NodeRuntime::instance(http, cx.background().clone()),
            server: CopilotServer::Running(RunningCopilotServer {
                lsp: Arc::new(server),
                sign_in_status: SignInStatus::Authorized,
--- a/crates/editor/src/display_map/inlay_map.rs
+++ b/crates/editor/src/display_map/inlay_map.rs
@@ -397,7 +397,7 @@ impl InlayMap {
        buffer_snapshot: MultiBufferSnapshot,
        mut buffer_edits: Vec<text::Edit<usize>>,
    ) -> (InlaySnapshot, Vec<InlayEdit>) {
-        let snapshot = &mut self.snapshot;
+        let mut snapshot = &mut self.snapshot;

        if buffer_edits.is_empty() {
            if snapshot.buffer.trailing_excerpt_update_count()
@@ -572,6 +572,7 @@ impl InlayMap {
            })
            .collect();
        let buffer_snapshot = snapshot.buffer.clone();
+        drop(snapshot);
        let (snapshot, edits) = self.sync(buffer_snapshot, buffer_edits);
        (snapshot, edits)
    }
@@ -634,6 +635,7 @@ impl InlayMap {
        }
        log::info!("removing inlays: {:?}", to_remove);

+        drop(snapshot);
        let (snapshot, edits) = self.splice(to_remove, to_insert);
        (snapshot, edits)
    }
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -4221,7 +4221,7 @@ impl Editor {
        _: &SortLinesCaseSensitive,
        cx: &mut ViewContext<Self>,
    ) {
-        self.manipulate_lines(cx, |lines| lines.sort())
+        self.manipulate_lines(cx, |text| text.sort())
    }

    pub fn sort_lines_case_insensitive(
@@ -4229,7 +4229,7 @@ impl Editor {
        _: &SortLinesCaseInsensitive,
        cx: &mut ViewContext<Self>,
    ) {
-        self.manipulate_lines(cx, |lines| lines.sort_by_key(|line| line.to_lowercase()))
+        self.manipulate_lines(cx, |text| text.sort_by_key(|line| line.to_lowercase()))
    }

    pub fn reverse_lines(&mut self, _: &ReverseLines, cx: &mut ViewContext<Self>) {
@@ -4267,19 +4267,19 @@ impl Editor {
            let text = buffer
                .text_for_range(start_point..end_point)
                .collect::<String>();
-            let mut lines = text.split("\n").collect_vec();
+            let mut text = text.split("\n").collect_vec();

-            let lines_len = lines.len();
-            callback(&mut lines);
+            let text_len = text.len();
+            callback(&mut text);

            // This is a current limitation with selections.
            // If we wanted to support removing or adding lines, we'd need to fix the logic associated with selections.
            debug_assert!(
-                lines.len() == lines_len,
+                text.len() == text_len,
                "callback should not change the number of lines"
            );

-            edits.push((start_point..end_point, lines.join("\n")));
+            edits.push((start_point..end_point, text.join("\n")));
            let start_anchor = buffer.anchor_after(start_point);
            let end_anchor = buffer.anchor_before(end_point);

--- a/crates/editor/src/inlay_hint_cache.rs
+++ b/crates/editor/src/inlay_hint_cache.rs
@@ -571,6 +571,7 @@ fn new_update_task(
                    if let Some(buffer) =
                        refresh_multi_buffer.buffer(pending_refresh_query.buffer_id)
                    {
+                        drop(refresh_multi_buffer);
                        editor.inlay_hint_cache.update_tasks.insert(
                            pending_refresh_query.excerpt_id,
                            UpdateTask {
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -1128,12 +1128,6 @@ impl AppContext {
        self.keystroke_matcher.clear_bindings();
    }

-    pub fn binding_for_action(&self, action: &dyn Action) -> Option<&Binding> {
-        self.keystroke_matcher
-            .bindings_for_action(action.id())
-            .find(|binding| binding.action().eq(action))
-    }
-
    pub fn default_global<T: 'static + Default>(&mut self) -> &T {
        let type_id = TypeId::of::<T>();
        self.update(|this| {
--- a/crates/live_kit_client/build.rs
+++ b/crates/live_kit_client/build.rs
@@ -58,14 +58,11 @@ fn build_bridge(swift_target: &SwiftTarget) {
        "cargo:rerun-if-changed={}/Package.resolved",
        SWIFT_PACKAGE_NAME
    );
-
    let swift_package_root = swift_package_root();
-    let swift_target_folder = swift_target_folder();
    if !Command::new("swift")
        .arg("build")
        .args(["--configuration", &env::var("PROFILE").unwrap()])
        .args(["--triple", &swift_target.target.triple])
-        .args(["--build-path".into(), swift_target_folder])
        .current_dir(&swift_package_root)
        .status()
        .unwrap()
@@ -131,12 +128,6 @@ fn swift_package_root() -> PathBuf {
    env::current_dir().unwrap().join(SWIFT_PACKAGE_NAME)
 }

-fn swift_target_folder() -> PathBuf {
-    env::current_dir()
-        .unwrap()
-        .join(format!("../../target/{SWIFT_PACKAGE_NAME}"))
-}
-
 fn copy_dir(source: &Path, destination: &Path) {
    assert!(
        Command::new("rm")
@@ -164,7 +155,8 @@ fn copy_dir(source: &Path, destination: &Path) {

 impl SwiftTarget {
    fn out_dir_path(&self) -> PathBuf {
-        swift_target_folder()
+        swift_package_root()
+            .join(".build")
            .join(&self.target.unversioned_triple)
            .join(env::var("PROFILE").unwrap())
    }
--- a/crates/node_runtime/src/node_runtime.rs
+++ b/crates/node_runtime/src/node_runtime.rs
@@ -1,6 +1,9 @@
 use anyhow::{anyhow, bail, Context, Result};
 use async_compression::futures::bufread::GzipDecoder;
 use async_tar::Archive;
+use futures::lock::Mutex;
+use futures::{future::Shared, FutureExt};
+use gpui::{executor::Background, Task};
 use serde::Deserialize;
 use smol::{fs, io::BufReader, process::Command};
 use std::process::{Output, Stdio};
@@ -30,12 +33,20 @@ pub struct NpmInfoDistTags {

 pub struct NodeRuntime {
    http: Arc<dyn HttpClient>,
+    background: Arc<Background>,
+    installation_path: Mutex<Option<Shared<Task<Result<PathBuf, Arc<anyhow::Error>>>>>>,
 }

 impl NodeRuntime {
-    pub fn instance(http: Arc<dyn HttpClient>) -> Arc<NodeRuntime> {
+    pub fn instance(http: Arc<dyn HttpClient>, background: Arc<Background>) -> Arc<NodeRuntime> {
        RUNTIME_INSTANCE
-            .get_or_init(|| Arc::new(NodeRuntime { http }))
+            .get_or_init(|| {
+                Arc::new(NodeRuntime {
+                    http,
+                    background,
+                    installation_path: Mutex::new(None),
+                })
+            })
            .clone()
    }

@@ -50,9 +61,7 @@ impl NodeRuntime {
        subcommand: &str,
        args: &[&str],
    ) -> Result<Output> {
-        let attempt = || async move {
-            let installation_path = self.install_if_needed().await?;
-
+        let attempt = |installation_path: PathBuf| async move {
            let mut env_path = installation_path.join("bin").into_os_string();
            if let Some(existing_path) = std::env::var_os("PATH") {
                if !existing_path.is_empty() {
@@ -83,9 +92,10 @@ impl NodeRuntime {
            command.output().await.map_err(|e| anyhow!("{e}"))
        };

-        let mut output = attempt().await;
+        let installation_path = self.install_if_needed().await?;
+        let mut output = attempt(installation_path.clone()).await;
        if output.is_err() {
-            output = attempt().await;
+            output = attempt(installation_path).await;
            if output.is_err() {
                return Err(anyhow!(
                    "failed to launch npm subcommand {subcommand} subcommand"
@@ -157,8 +167,23 @@ impl NodeRuntime {
    }

    async fn install_if_needed(&self) -> Result<PathBuf> {
-        log::info!("Node runtime install_if_needed");
+        let task = self
+            .installation_path
+            .lock()
+            .await
+            .get_or_insert_with(|| {
+                let http = self.http.clone();
+                self.background
+                    .spawn(async move { Self::install(http).await.map_err(Arc::new) })
+                    .shared()
+            })
+            .clone();

+        task.await.map_err(|e| anyhow!("{}", e))
+    }
+
+    async fn install(http: Arc<dyn HttpClient>) -> Result<PathBuf> {
+        log::info!("installing Node runtime");
        let arch = match consts::ARCH {
            "x86_64" => "x64",
            "aarch64" => "arm64",
@@ -189,8 +214,7 @@ impl NodeRuntime {

            let file_name = format!("node-{VERSION}-darwin-{arch}.tar.gz");
            let url = format!("https://nodejs.org/dist/{VERSION}/{file_name}");
-            let mut response = self
-                .http
+            let mut response = http
                .get(&url, Default::default(), true)
                .await
                .context("error downloading Node binary tarball")?;
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -1,6 +1,7 @@
-use crate::{search::PathMatcher, worktree::WorktreeHandle, Event, *};
+use crate::{worktree::WorktreeHandle, Event, *};
 use fs::{FakeFs, LineEnding, RealFs};
 use futures::{future, StreamExt};
+use globset::Glob;
 use gpui::{executor::Deterministic, test::subscribe, AppContext};
 use language::{
    language_settings::{AllLanguageSettings, LanguageSettingsContent},
@@ -3640,7 +3641,7 @@ async fn test_search_with_inclusions(cx: &mut gpui::TestAppContext) {
                search_query,
                false,
                true,
-                vec![PathMatcher::new("*.odd").unwrap()],
+                vec![Glob::new("*.odd").unwrap().compile_matcher()],
                Vec::new()
            ),
            cx
@@ -3658,7 +3659,7 @@ async fn test_search_with_inclusions(cx: &mut gpui::TestAppContext) {
                search_query,
                false,
                true,
-                vec![PathMatcher::new("*.rs").unwrap()],
+                vec![Glob::new("*.rs").unwrap().compile_matcher()],
                Vec::new()
            ),
            cx
@@ -3680,8 +3681,8 @@ async fn test_search_with_inclusions(cx: &mut gpui::TestAppContext) {
                false,
                true,
                vec![
-                    PathMatcher::new("*.ts").unwrap(),
-                    PathMatcher::new("*.odd").unwrap(),
+                    Glob::new("*.ts").unwrap().compile_matcher(),
+                    Glob::new("*.odd").unwrap().compile_matcher(),
                ],
                Vec::new()
            ),
@@ -3704,9 +3705,9 @@ async fn test_search_with_inclusions(cx: &mut gpui::TestAppContext) {
                false,
                true,
                vec![
-                    PathMatcher::new("*.rs").unwrap(),
-                    PathMatcher::new("*.ts").unwrap(),
-                    PathMatcher::new("*.odd").unwrap(),
+                    Glob::new("*.rs").unwrap().compile_matcher(),
+                    Glob::new("*.ts").unwrap().compile_matcher(),
+                    Glob::new("*.odd").unwrap().compile_matcher(),
                ],
                Vec::new()
            ),
@@ -3751,7 +3752,7 @@ async fn test_search_with_exclusions(cx: &mut gpui::TestAppContext) {
                false,
                true,
                Vec::new(),
-                vec![PathMatcher::new("*.odd").unwrap()],
+                vec![Glob::new("*.odd").unwrap().compile_matcher()],
            ),
            cx
        )
@@ -3774,7 +3775,7 @@ async fn test_search_with_exclusions(cx: &mut gpui::TestAppContext) {
                false,
                true,
                Vec::new(),
-                vec![PathMatcher::new("*.rs").unwrap()],
+                vec![Glob::new("*.rs").unwrap().compile_matcher()],
            ),
            cx
        )
@@ -3796,8 +3797,8 @@ async fn test_search_with_exclusions(cx: &mut gpui::TestAppContext) {
                true,
                Vec::new(),
                vec![
-                    PathMatcher::new("*.ts").unwrap(),
-                    PathMatcher::new("*.odd").unwrap(),
+                    Glob::new("*.ts").unwrap().compile_matcher(),
+                    Glob::new("*.odd").unwrap().compile_matcher(),
                ],
            ),
            cx
@@ -3820,9 +3821,9 @@ async fn test_search_with_exclusions(cx: &mut gpui::TestAppContext) {
                true,
                Vec::new(),
                vec![
-                    PathMatcher::new("*.rs").unwrap(),
-                    PathMatcher::new("*.ts").unwrap(),
-                    PathMatcher::new("*.odd").unwrap(),
+                    Glob::new("*.rs").unwrap().compile_matcher(),
+                    Glob::new("*.ts").unwrap().compile_matcher(),
+                    Glob::new("*.odd").unwrap().compile_matcher(),
                ],
            ),
            cx
@@ -3859,8 +3860,8 @@ async fn test_search_with_exclusions_and_inclusions(cx: &mut gpui::TestAppContex
                search_query,
                false,
                true,
-                vec![PathMatcher::new("*.odd").unwrap()],
-                vec![PathMatcher::new("*.odd").unwrap()],
+                vec![Glob::new("*.odd").unwrap().compile_matcher()],
+                vec![Glob::new("*.odd").unwrap().compile_matcher()],
            ),
            cx
        )
@@ -3877,8 +3878,8 @@ async fn test_search_with_exclusions_and_inclusions(cx: &mut gpui::TestAppContex
                search_query,
                false,
                true,
-                vec![PathMatcher::new("*.ts").unwrap()],
-                vec![PathMatcher::new("*.ts").unwrap()],
+                vec![Glob::new("*.ts").unwrap().compile_matcher()],
+                vec![Glob::new("*.ts").unwrap().compile_matcher()],
            ),
            cx
        )
@@ -3896,12 +3897,12 @@ async fn test_search_with_exclusions_and_inclusions(cx: &mut gpui::TestAppContex
                false,
                true,
                vec![
-                    PathMatcher::new("*.ts").unwrap(),
-                    PathMatcher::new("*.odd").unwrap()
+                    Glob::new("*.ts").unwrap().compile_matcher(),
+                    Glob::new("*.odd").unwrap().compile_matcher()
                ],
                vec![
-                    PathMatcher::new("*.ts").unwrap(),
-                    PathMatcher::new("*.odd").unwrap()
+                    Glob::new("*.ts").unwrap().compile_matcher(),
+                    Glob::new("*.odd").unwrap().compile_matcher()
                ],
            ),
            cx
@@ -3920,12 +3921,12 @@ async fn test_search_with_exclusions_and_inclusions(cx: &mut gpui::TestAppContex
                false,
                true,
                vec![
-                    PathMatcher::new("*.ts").unwrap(),
-                    PathMatcher::new("*.odd").unwrap()
+                    Glob::new("*.ts").unwrap().compile_matcher(),
+                    Glob::new("*.odd").unwrap().compile_matcher()
                ],
                vec![
-                    PathMatcher::new("*.rs").unwrap(),
-                    PathMatcher::new("*.odd").unwrap()
+                    Glob::new("*.rs").unwrap().compile_matcher(),
+                    Glob::new("*.odd").unwrap().compile_matcher()
                ],
            ),
            cx
--- a/crates/project/src/search.rs
+++ b/crates/project/src/search.rs
@@ -1,5 +1,5 @@
 use aho_corasick::{AhoCorasick, AhoCorasickBuilder};
-use anyhow::{Context, Result};
+use anyhow::Result;
 use client::proto;
 use globset::{Glob, GlobMatcher};
 use itertools::Itertools;
@@ -9,7 +9,7 @@ use smol::future::yield_now;
 use std::{
    io::{BufRead, BufReader, Read},
    ops::Range,
-    path::{Path, PathBuf},
+    path::Path,
    sync::Arc,
 };

@@ -20,8 +20,8 @@ pub enum SearchQuery {
        query: Arc<str>,
        whole_word: bool,
        case_sensitive: bool,
-        files_to_include: Vec<PathMatcher>,
-        files_to_exclude: Vec<PathMatcher>,
+        files_to_include: Vec<GlobMatcher>,
+        files_to_exclude: Vec<GlobMatcher>,
    },
    Regex {
        regex: Regex,
@@ -29,43 +29,18 @@ pub enum SearchQuery {
        multiline: bool,
        whole_word: bool,
        case_sensitive: bool,
-        files_to_include: Vec<PathMatcher>,
-        files_to_exclude: Vec<PathMatcher>,
+        files_to_include: Vec<GlobMatcher>,
+        files_to_exclude: Vec<GlobMatcher>,
    },
 }

-#[derive(Clone, Debug)]
-pub struct PathMatcher {
-    maybe_path: PathBuf,
-    glob: GlobMatcher,
-}
-
-impl std::fmt::Display for PathMatcher {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.maybe_path.to_string_lossy().fmt(f)
-    }
-}
-
-impl PathMatcher {
-    pub fn new(maybe_glob: &str) -> Result<Self, globset::Error> {
-        Ok(PathMatcher {
-            glob: Glob::new(&maybe_glob)?.compile_matcher(),
-            maybe_path: PathBuf::from(maybe_glob),
-        })
-    }
-
-    pub fn is_match<P: AsRef<Path>>(&self, other: P) -> bool {
-        other.as_ref().starts_with(&self.maybe_path) || self.glob.is_match(other)
-    }
-}
-
 impl SearchQuery {
    pub fn text(
        query: impl ToString,
        whole_word: bool,
        case_sensitive: bool,
-        files_to_include: Vec<PathMatcher>,
-        files_to_exclude: Vec<PathMatcher>,
+        files_to_include: Vec<GlobMatcher>,
+        files_to_exclude: Vec<GlobMatcher>,
    ) -> Self {
        let query = query.to_string();
        let search = AhoCorasickBuilder::new()
@@ -86,8 +61,8 @@ impl SearchQuery {
        query: impl ToString,
        whole_word: bool,
        case_sensitive: bool,
-        files_to_include: Vec<PathMatcher>,
-        files_to_exclude: Vec<PathMatcher>,
+        files_to_include: Vec<GlobMatcher>,
+        files_to_exclude: Vec<GlobMatcher>,
    ) -> Result<Self> {
        let mut query = query.to_string();
        let initial_query = Arc::from(query.as_str());
@@ -121,16 +96,16 @@ impl SearchQuery {
                message.query,
                message.whole_word,
                message.case_sensitive,
-                deserialize_path_matches(&message.files_to_include)?,
-                deserialize_path_matches(&message.files_to_exclude)?,
+                deserialize_globs(&message.files_to_include)?,
+                deserialize_globs(&message.files_to_exclude)?,
            )
        } else {
            Ok(Self::text(
                message.query,
                message.whole_word,
                message.case_sensitive,
-                deserialize_path_matches(&message.files_to_include)?,
-                deserialize_path_matches(&message.files_to_exclude)?,
+                deserialize_globs(&message.files_to_include)?,
+                deserialize_globs(&message.files_to_exclude)?,
            ))
        }
    }
@@ -145,12 +120,12 @@ impl SearchQuery {
            files_to_include: self
                .files_to_include()
                .iter()
-                .map(|matcher| matcher.to_string())
+                .map(|g| g.glob().to_string())
                .join(","),
            files_to_exclude: self
                .files_to_exclude()
                .iter()
-                .map(|matcher| matcher.to_string())
+                .map(|g| g.glob().to_string())
                .join(","),
        }
    }
@@ -291,7 +266,7 @@ impl SearchQuery {
        matches!(self, Self::Regex { .. })
    }

-    pub fn files_to_include(&self) -> &[PathMatcher] {
+    pub fn files_to_include(&self) -> &[GlobMatcher] {
        match self {
            Self::Text {
                files_to_include, ..
@@ -302,7 +277,7 @@ impl SearchQuery {
        }
    }

-    pub fn files_to_exclude(&self) -> &[PathMatcher] {
+    pub fn files_to_exclude(&self) -> &[GlobMatcher] {
        match self {
            Self::Text {
                files_to_exclude, ..
@@ -331,63 +306,11 @@ impl SearchQuery {
    }
 }

-fn deserialize_path_matches(glob_set: &str) -> anyhow::Result<Vec<PathMatcher>> {
+fn deserialize_globs(glob_set: &str) -> Result<Vec<GlobMatcher>> {
    glob_set
        .split(',')
        .map(str::trim)
        .filter(|glob_str| !glob_str.is_empty())
-        .map(|glob_str| {
-            PathMatcher::new(glob_str)
-                .with_context(|| format!("deserializing path match glob {glob_str}"))
-        })
+        .map(|glob_str| Ok(Glob::new(glob_str)?.compile_matcher()))
        .collect()
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn path_matcher_creation_for_valid_paths() {
-        for valid_path in [
-            "file",
-            "Cargo.toml",
-            ".DS_Store",
-            "~/dir/another_dir/",
-            "./dir/file",
-            "dir/[a-z].txt",
-            "../dir/filé",
-        ] {
-            let path_matcher = PathMatcher::new(valid_path).unwrap_or_else(|e| {
-                panic!("Valid path {valid_path} should be accepted, but got: {e}")
-            });
-            assert!(
-                path_matcher.is_match(valid_path),
-                "Path matcher for valid path {valid_path} should match itself"
-            )
-        }
-    }
-
-    #[test]
-    fn path_matcher_creation_for_globs() {
-        for invalid_glob in ["dir/[].txt", "dir/[a-z.txt", "dir/{file"] {
-            match PathMatcher::new(invalid_glob) {
-                Ok(_) => panic!("Invalid glob {invalid_glob} should not be accepted"),
-                Err(_expected) => {}
-            }
-        }
-
-        for valid_glob in [
-            "dir/?ile",
-            "dir/*.txt",
-            "dir/**/file",
-            "dir/[a-z].txt",
-            "{dir,file}",
-        ] {
-            match PathMatcher::new(valid_glob) {
-                Ok(_expected) => {}
-                Err(e) => panic!("Valid glob {valid_glob} should be accepted, but got: {e}"),
-            }
-        }
-    }
-}
--- a/crates/project/src/worktree.rs
+++ b/crates/project/src/worktree.rs
@@ -2369,7 +2369,7 @@ impl BackgroundScannerState {
        }

        // Remove any git repositories whose .git entry no longer exists.
-        let snapshot = &mut self.snapshot;
+        let mut snapshot = &mut self.snapshot;
        let mut repositories = mem::take(&mut snapshot.git_repositories);
        let mut repository_entries = mem::take(&mut snapshot.repository_entries);
        repositories.retain(|work_directory_id, _| {
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -115,7 +115,6 @@ actions!(
    [
        ExpandSelectedEntry,
        CollapseSelectedEntry,
-        CollapseAllEntries,
        NewDirectory,
        NewFile,
        Copy,
@@ -141,7 +140,6 @@ pub fn init(assets: impl AssetSource, cx: &mut AppContext) {
    file_associations::init(assets, cx);
    cx.add_action(ProjectPanel::expand_selected_entry);
    cx.add_action(ProjectPanel::collapse_selected_entry);
-    cx.add_action(ProjectPanel::collapse_all_entries);
    cx.add_action(ProjectPanel::select_prev);
    cx.add_action(ProjectPanel::select_next);
    cx.add_action(ProjectPanel::new_file);
@@ -432,7 +430,7 @@ impl ProjectPanel {
            menu_entries.push(ContextMenuItem::action("Reveal in Finder", RevealInFinder));
            if entry.is_dir() {
                menu_entries.push(ContextMenuItem::action(
-                    "Search Inside",
+                    "Search inside",
                    NewSearchInDirectory,
                ));
            }
@@ -516,12 +514,6 @@ impl ProjectPanel {
        }
    }

-    pub fn collapse_all_entries(&mut self, _: &CollapseAllEntries, cx: &mut ViewContext<Self>) {
-        self.expanded_dir_ids.clear();
-        self.update_visible_entries(None, cx);
-        cx.notify();
-    }
-
    fn toggle_expanded(&mut self, entry_id: ProjectEntryId, cx: &mut ViewContext<Self>) {
        if let Some(worktree_id) = self.project.read(cx).worktree_id_for_entry(entry_id, cx) {
            if let Some(expanded_dir_ids) = self.expanded_dir_ids.get_mut(&worktree_id) {
@@ -2686,63 +2678,6 @@ mod tests {
        );
    }

-    #[gpui::test]
-    async fn test_collapse_all_entries(cx: &mut gpui::TestAppContext) {
-        init_test_with_editor(cx);
-
-        let fs = FakeFs::new(cx.background());
-        fs.insert_tree(
-            "/project_root",
-            json!({
-                "dir_1": {
-                    "nested_dir": {
-                        "file_a.py": "# File contents",
-                        "file_b.py": "# File contents",
-                        "file_c.py": "# File contents",
-                    },
-                    "file_1.py": "# File contents",
-                    "file_2.py": "# File contents",
-                    "file_3.py": "# File contents",
-                },
-                "dir_2": {
-                    "file_1.py": "# File contents",
-                    "file_2.py": "# File contents",
-                    "file_3.py": "# File contents",
-                }
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), ["/project_root".as_ref()], cx).await;
-        let (_, workspace) = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));
-        let panel = workspace.update(cx, |workspace, cx| ProjectPanel::new(workspace, cx));
-
-        panel.update(cx, |panel, cx| {
-            panel.collapse_all_entries(&CollapseAllEntries, cx)
-        });
-        cx.foreground().run_until_parked();
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..10, cx),
-            &["v project_root", "    > dir_1", "    > dir_2",]
-        );
-
-        // Open dir_1 and make sure nested_dir was collapsed when running collapse_all_entries
-        toggle_expand_dir(&panel, "project_root/dir_1", cx);
-        cx.foreground().run_until_parked();
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..10, cx),
-            &[
-                "v project_root",
-                "    v dir_1  <== selected",
-                "        > nested_dir",
-                "          file_1.py",
-                "          file_2.py",
-                "          file_3.py",
-                "    > dir_2",
-            ]
-        );
-    }
-
    fn toggle_expand_dir(
        panel: &ViewHandle<ProjectPanel>,
        path: impl AsRef<Path>,
@@ -2943,4 +2878,3 @@ mod tests {
        });
    }
 }
-// TODO - a workspace command?
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -1,6 +1,6 @@
 use crate::{
-    NextHistoryQuery, PreviousHistoryQuery, SearchHistory, SearchOptions, SelectAllMatches,
-    SelectNextMatch, SelectPrevMatch, ToggleCaseSensitive, ToggleRegex, ToggleWholeWord,
+    SearchOptions, SelectAllMatches, SelectNextMatch, SelectPrevMatch, ToggleCaseSensitive,
+    ToggleRegex, ToggleWholeWord,
 };
 use collections::HashMap;
 use editor::Editor;
@@ -46,8 +46,6 @@ pub fn init(cx: &mut AppContext) {
    cx.add_action(BufferSearchBar::select_prev_match_on_pane);
    cx.add_action(BufferSearchBar::select_all_matches_on_pane);
    cx.add_action(BufferSearchBar::handle_editor_cancel);
-    cx.add_action(BufferSearchBar::next_history_query);
-    cx.add_action(BufferSearchBar::previous_history_query);
    add_toggle_option_action::<ToggleCaseSensitive>(SearchOptions::CASE_SENSITIVE, cx);
    add_toggle_option_action::<ToggleWholeWord>(SearchOptions::WHOLE_WORD, cx);
    add_toggle_option_action::<ToggleRegex>(SearchOptions::REGEX, cx);
@@ -67,7 +65,7 @@ fn add_toggle_option_action<A: Action>(option: SearchOptions, cx: &mut AppContex
 }

 pub struct BufferSearchBar {
-    query_editor: ViewHandle<Editor>,
+    pub query_editor: ViewHandle<Editor>,
    active_searchable_item: Option<Box<dyn SearchableItemHandle>>,
    active_match_index: Option<usize>,
    active_searchable_item_subscription: Option<Subscription>,
@@ -78,7 +76,6 @@ pub struct BufferSearchBar {
    default_options: SearchOptions,
    query_contains_error: bool,
    dismissed: bool,
-    search_history: SearchHistory,
 }

 impl Entity for BufferSearchBar {
@@ -109,48 +106,6 @@ impl View for BufferSearchBar {
            .map(|active_searchable_item| active_searchable_item.supported_options())
            .unwrap_or_default();

-        let previous_query_keystrokes =
-            cx.binding_for_action(&PreviousHistoryQuery {})
-                .map(|binding| {
-                    binding
-                        .keystrokes()
-                        .iter()
-                        .map(|k| k.to_string())
-                        .collect::<Vec<_>>()
-                });
-        let next_query_keystrokes = cx.binding_for_action(&NextHistoryQuery {}).map(|binding| {
-            binding
-                .keystrokes()
-                .iter()
-                .map(|k| k.to_string())
-                .collect::<Vec<_>>()
-        });
-        let new_placeholder_text = match (previous_query_keystrokes, next_query_keystrokes) {
-            (Some(previous_query_keystrokes), Some(next_query_keystrokes)) => {
-                format!(
-                    "Search ({}/{} for previous/next query)",
-                    previous_query_keystrokes.join(" "),
-                    next_query_keystrokes.join(" ")
-                )
-            }
-            (None, Some(next_query_keystrokes)) => {
-                format!(
-                    "Search ({} for next query)",
-                    next_query_keystrokes.join(" ")
-                )
-            }
-            (Some(previous_query_keystrokes), None) => {
-                format!(
-                    "Search ({} for previous query)",
-                    previous_query_keystrokes.join(" ")
-                )
-            }
-            (None, None) => String::new(),
-        };
-        self.query_editor.update(cx, |editor, cx| {
-            editor.set_placeholder_text(new_placeholder_text, cx);
-        });
-
        Flex::row()
            .with_child(
                Flex::row()
@@ -303,7 +258,6 @@ impl BufferSearchBar {
            pending_search: None,
            query_contains_error: false,
            dismissed: true,
-            search_history: SearchHistory::default(),
        }
    }

@@ -387,7 +341,7 @@ impl BufferSearchBar {
        cx: &mut ViewContext<Self>,
    ) -> oneshot::Receiver<()> {
        let options = options.unwrap_or(self.default_options);
-        if query != self.query(cx) || self.search_options != options {
+        if query != self.query_editor.read(cx).text(cx) || self.search_options != options {
            self.query_editor.update(cx, |query_editor, cx| {
                query_editor.buffer().update(cx, |query_buffer, cx| {
                    let len = query_buffer.len(cx);
@@ -720,7 +674,7 @@ impl BufferSearchBar {

    fn update_matches(&mut self, cx: &mut ViewContext<Self>) -> oneshot::Receiver<()> {
        let (done_tx, done_rx) = oneshot::channel();
-        let query = self.query(cx);
+        let query = self.query_editor.read(cx).text(cx);
        self.pending_search.take();
        if let Some(active_searchable_item) = self.active_searchable_item.as_ref() {
            if query.is_empty() {
@@ -753,7 +707,6 @@ impl BufferSearchBar {
                    )
                };

-                let query_text = query.as_str().to_string();
                let matches = active_searchable_item.find_matches(query, cx);

                let active_searchable_item = active_searchable_item.downgrade();
@@ -767,7 +720,6 @@ impl BufferSearchBar {
                                .insert(active_searchable_item.downgrade(), matches);

                            this.update_match_index(cx);
-                            this.search_history.add(query_text);
                            if !this.dismissed {
                                let matches = this
                                    .searchable_items_with_matches
@@ -801,28 +753,6 @@ impl BufferSearchBar {
            cx.notify();
        }
    }
-
-    fn next_history_query(&mut self, _: &NextHistoryQuery, cx: &mut ViewContext<Self>) {
-        if let Some(new_query) = self.search_history.next().map(str::to_string) {
-            let _ = self.search(&new_query, Some(self.search_options), cx);
-        } else {
-            self.search_history.reset_selection();
-            let _ = self.search("", Some(self.search_options), cx);
-        }
-    }
-
-    fn previous_history_query(&mut self, _: &PreviousHistoryQuery, cx: &mut ViewContext<Self>) {
-        if self.query(cx).is_empty() {
-            if let Some(new_query) = self.search_history.current().map(str::to_string) {
-                let _ = self.search(&new_query, Some(self.search_options), cx);
-                return;
-            }
-        }
-
-        if let Some(new_query) = self.search_history.previous().map(str::to_string) {
-            let _ = self.search(&new_query, Some(self.search_options), cx);
-        }
-    }
 }

 #[cfg(test)]
@@ -1403,154 +1333,4 @@ mod tests {
            );
        });
    }
-
-    #[gpui::test]
-    async fn test_search_query_history(cx: &mut TestAppContext) {
-        crate::project_search::tests::init_test(cx);
-
-        let buffer_text = r#"
-        A regular expression (shortened as regex or regexp;[1] also referred to as
-        rational expression[2][3]) is a sequence of characters that specifies a search
-        pattern in text. Usually such patterns are used by string-searching algorithms
-        for "find" or "find and replace" operations on strings, or for input validation.
-        "#
-        .unindent();
-        let buffer = cx.add_model(|cx| Buffer::new(0, buffer_text, cx));
-        let (window_id, _root_view) = cx.add_window(|_| EmptyView);
-
-        let editor = cx.add_view(window_id, |cx| Editor::for_buffer(buffer.clone(), None, cx));
-
-        let search_bar = cx.add_view(window_id, |cx| {
-            let mut search_bar = BufferSearchBar::new(cx);
-            search_bar.set_active_pane_item(Some(&editor), cx);
-            search_bar.show(cx);
-            search_bar
-        });
-
-        // Add 3 search items into the history.
-        search_bar
-            .update(cx, |search_bar, cx| search_bar.search("a", None, cx))
-            .await
-            .unwrap();
-        search_bar
-            .update(cx, |search_bar, cx| search_bar.search("b", None, cx))
-            .await
-            .unwrap();
-        search_bar
-            .update(cx, |search_bar, cx| {
-                search_bar.search("c", Some(SearchOptions::CASE_SENSITIVE), cx)
-            })
-            .await
-            .unwrap();
-        // Ensure that the latest search is active.
-        search_bar.read_with(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "c");
-            assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        // Next history query after the latest should set the query to the empty string.
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.next_history_query(&NextHistoryQuery, cx);
-        });
-        search_bar.read_with(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "");
-            assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.next_history_query(&NextHistoryQuery, cx);
-        });
-        search_bar.read_with(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "");
-            assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        // First previous query for empty current query should set the query to the latest.
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.previous_history_query(&PreviousHistoryQuery, cx);
-        });
-        search_bar.read_with(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "c");
-            assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        // Further previous items should go over the history in reverse order.
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.previous_history_query(&PreviousHistoryQuery, cx);
-        });
-        search_bar.read_with(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "b");
-            assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        // Previous items should never go behind the first history item.
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.previous_history_query(&PreviousHistoryQuery, cx);
-        });
-        search_bar.read_with(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "a");
-            assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.previous_history_query(&PreviousHistoryQuery, cx);
-        });
-        search_bar.read_with(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "a");
-            assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        // Next items should go over the history in the original order.
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.next_history_query(&NextHistoryQuery, cx);
-        });
-        search_bar.read_with(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "b");
-            assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        search_bar
-            .update(cx, |search_bar, cx| search_bar.search("ba", None, cx))
-            .await
-            .unwrap();
-        search_bar.read_with(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "ba");
-            assert_eq!(search_bar.search_options, SearchOptions::NONE);
-        });
-
-        // New search input should add another entry to history and move the selection to the end of the history.
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.previous_history_query(&PreviousHistoryQuery, cx);
-        });
-        search_bar.read_with(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "c");
-            assert_eq!(search_bar.search_options, SearchOptions::NONE);
-        });
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.previous_history_query(&PreviousHistoryQuery, cx);
-        });
-        search_bar.read_with(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "b");
-            assert_eq!(search_bar.search_options, SearchOptions::NONE);
-        });
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.next_history_query(&NextHistoryQuery, cx);
-        });
-        search_bar.read_with(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "c");
-            assert_eq!(search_bar.search_options, SearchOptions::NONE);
-        });
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.next_history_query(&NextHistoryQuery, cx);
-        });
-        search_bar.read_with(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "ba");
-            assert_eq!(search_bar.search_options, SearchOptions::NONE);
-        });
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.next_history_query(&NextHistoryQuery, cx);
-        });
-        search_bar.read_with(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "");
-            assert_eq!(search_bar.search_options, SearchOptions::NONE);
-        });
-    }
 }
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -1,14 +1,15 @@
 use crate::{
-    NextHistoryQuery, PreviousHistoryQuery, SearchHistory, SearchOptions, SelectNextMatch,
-    SelectPrevMatch, ToggleCaseSensitive, ToggleRegex, ToggleWholeWord,
+    SearchOptions, SelectNextMatch, SelectPrevMatch, ToggleCaseSensitive, ToggleRegex,
+    ToggleWholeWord,
 };
-use anyhow::Context;
+use anyhow::Result;
 use collections::HashMap;
 use editor::{
    items::active_match_index, scroll::autoscroll::Autoscroll, Anchor, Editor, MultiBuffer,
    SelectAll, MAX_TAB_TITLE_LEN,
 };
 use futures::StreamExt;
+use globset::{Glob, GlobMatcher};
 use gpui::{
    actions,
    elements::*,
@@ -18,10 +19,7 @@ use gpui::{
 };
 use menu::Confirm;
 use postage::stream::Stream;
-use project::{
-    search::{PathMatcher, SearchQuery},
-    Entry, Project,
-};
+use project::{search::SearchQuery, Entry, Project};
 use semantic_index::SemanticIndex;
 use smallvec::SmallVec;
 use std::{
@@ -56,8 +54,6 @@ pub fn init(cx: &mut AppContext) {
    cx.add_action(ProjectSearchBar::search_in_new);
    cx.add_action(ProjectSearchBar::select_next_match);
    cx.add_action(ProjectSearchBar::select_prev_match);
-    cx.add_action(ProjectSearchBar::next_history_query);
-    cx.add_action(ProjectSearchBar::previous_history_query);
    cx.capture_action(ProjectSearchBar::tab);
    cx.capture_action(ProjectSearchBar::tab_previous);
    add_toggle_option_action::<ToggleCaseSensitive>(SearchOptions::CASE_SENSITIVE, cx);
@@ -85,7 +81,6 @@ struct ProjectSearch {
    match_ranges: Vec<Range<Anchor>>,
    active_query: Option<SearchQuery>,
    search_id: usize,
-    search_history: SearchHistory,
 }

 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -134,7 +129,6 @@ impl ProjectSearch {
            match_ranges: Default::default(),
            active_query: None,
            search_id: 0,
-            search_history: SearchHistory::default(),
        }
    }

@@ -148,7 +142,6 @@ impl ProjectSearch {
            match_ranges: self.match_ranges.clone(),
            active_query: self.active_query.clone(),
            search_id: self.search_id,
-            search_history: self.search_history.clone(),
        })
    }

@@ -157,7 +150,6 @@ impl ProjectSearch {
            .project
            .update(cx, |project, cx| project.search(query.clone(), cx));
        self.search_id += 1;
-        self.search_history.add(query.as_str().to_string());
        self.active_query = Some(query);
        self.match_ranges.clear();
        self.pending_search = Some(cx.spawn_weak(|this, mut cx| async move {
@@ -193,22 +185,27 @@ impl ProjectSearch {
        cx.notify();
    }

-    fn semantic_search(&mut self, query: SearchQuery, cx: &mut ModelContext<Self>) {
+    fn semantic_search(
+        &mut self,
+        query: String,
+        include_files: Vec<GlobMatcher>,
+        exclude_files: Vec<GlobMatcher>,
+        cx: &mut ModelContext<Self>,
+    ) {
        let search = SemanticIndex::global(cx).map(|index| {
            index.update(cx, |semantic_index, cx| {
                semantic_index.search_project(
                    self.project.clone(),
-                    query.as_str().to_owned(),
+                    query.clone(),
                    10,
-                    query.files_to_include().to_vec(),
-                    query.files_to_exclude().to_vec(),
+                    include_files,
+                    exclude_files,
                    cx,
                )
            })
        });
        self.search_id += 1;
        self.match_ranges.clear();
-        self.search_history.add(query.as_str().to_string());
        self.pending_search = Some(cx.spawn(|this, mut cx| async move {
            let results = search?.await.log_err()?;

@@ -285,49 +282,6 @@ impl View for ProjectSearchView {
                Cow::Borrowed("No results")
            };

-            let previous_query_keystrokes =
-                cx.binding_for_action(&PreviousHistoryQuery {})
-                    .map(|binding| {
-                        binding
-                            .keystrokes()
-                            .iter()
-                            .map(|k| k.to_string())
-                            .collect::<Vec<_>>()
-                    });
-            let next_query_keystrokes =
-                cx.binding_for_action(&NextHistoryQuery {}).map(|binding| {
-                    binding
-                        .keystrokes()
-                        .iter()
-                        .map(|k| k.to_string())
-                        .collect::<Vec<_>>()
-                });
-            let new_placeholder_text = match (previous_query_keystrokes, next_query_keystrokes) {
-                (Some(previous_query_keystrokes), Some(next_query_keystrokes)) => {
-                    format!(
-                        "Search ({}/{} for previous/next query)",
-                        previous_query_keystrokes.join(" "),
-                        next_query_keystrokes.join(" ")
-                    )
-                }
-                (None, Some(next_query_keystrokes)) => {
-                    format!(
-                        "Search ({} for next query)",
-                        next_query_keystrokes.join(" ")
-                    )
-                }
-                (Some(previous_query_keystrokes), None) => {
-                    format!(
-                        "Search ({} for previous query)",
-                        previous_query_keystrokes.join(" ")
-                    )
-                }
-                (None, None) => String::new(),
-            };
-            self.query_editor.update(cx, |editor, cx| {
-                editor.set_placeholder_text(new_placeholder_text, cx);
-            });
-
            MouseEventHandler::<Status, _>::new(0, cx, |_, _| {
                Label::new(text, theme.search.results_status.clone())
                    .aligned()
@@ -636,7 +590,8 @@ impl ProjectSearchView {
        if !dir_entry.is_dir() {
            return;
        }
-        let Some(filter_str) = dir_entry.path.to_str() else { return; };
+        let filter_path = dir_entry.path.join("**");
+        let Some(filter_str) = filter_path.to_str() else { return; };

        let model = cx.add_model(|cx| ProjectSearch::new(workspace.project().clone(), cx));
        let search = cx.add_view(|cx| ProjectSearchView::new(model, cx));
@@ -707,10 +662,16 @@ impl ProjectSearchView {
            if semantic.outstanding_file_count > 0 {
                return;
            }
-            if let Some(query) = self.build_search_query(cx) {
-                self.model
-                    .update(cx, |model, cx| model.semantic_search(query, cx));
+
+            let query = self.query_editor.read(cx).text(cx);
+            if let Some((included_files, exclude_files)) =
+                self.get_included_and_excluded_globsets(cx)
+            {
+                self.model.update(cx, |model, cx| {
+                    model.semantic_search(query, included_files, exclude_files, cx)
+                });
            }
+            return;
        }

        if let Some(query) = self.build_search_query(cx) {
@@ -718,10 +679,12 @@ impl ProjectSearchView {
        }
    }

-    fn build_search_query(&mut self, cx: &mut ViewContext<Self>) -> Option<SearchQuery> {
-        let text = self.query_editor.read(cx).text(cx);
+    fn get_included_and_excluded_globsets(
+        &mut self,
+        cx: &mut ViewContext<Self>,
+    ) -> Option<(Vec<GlobMatcher>, Vec<GlobMatcher>)> {
        let included_files =
-            match Self::parse_path_matches(&self.included_files_editor.read(cx).text(cx)) {
+            match Self::load_glob_set(&self.included_files_editor.read(cx).text(cx)) {
                Ok(included_files) => {
                    self.panels_with_errors.remove(&InputPanel::Include);
                    included_files
@@ -733,7 +696,37 @@ impl ProjectSearchView {
                }
            };
        let excluded_files =
-            match Self::parse_path_matches(&self.excluded_files_editor.read(cx).text(cx)) {
+            match Self::load_glob_set(&self.excluded_files_editor.read(cx).text(cx)) {
+                Ok(excluded_files) => {
+                    self.panels_with_errors.remove(&InputPanel::Exclude);
+                    excluded_files
+                }
+                Err(_e) => {
+                    self.panels_with_errors.insert(InputPanel::Exclude);
+                    cx.notify();
+                    return None;
+                }
+            };
+
+        Some((included_files, excluded_files))
+    }
+
+    fn build_search_query(&mut self, cx: &mut ViewContext<Self>) -> Option<SearchQuery> {
+        let text = self.query_editor.read(cx).text(cx);
+        let included_files =
+            match Self::load_glob_set(&self.included_files_editor.read(cx).text(cx)) {
+                Ok(included_files) => {
+                    self.panels_with_errors.remove(&InputPanel::Include);
+                    included_files
+                }
+                Err(_e) => {
+                    self.panels_with_errors.insert(InputPanel::Include);
+                    cx.notify();
+                    return None;
+                }
+            };
+        let excluded_files =
+            match Self::load_glob_set(&self.excluded_files_editor.read(cx).text(cx)) {
                Ok(excluded_files) => {
                    self.panels_with_errors.remove(&InputPanel::Exclude);
                    excluded_files
@@ -773,14 +766,11 @@ impl ProjectSearchView {
        }
    }

-    fn parse_path_matches(text: &str) -> anyhow::Result<Vec<PathMatcher>> {
+    fn load_glob_set(text: &str) -> Result<Vec<GlobMatcher>> {
        text.split(',')
            .map(str::trim)
-            .filter(|maybe_glob_str| !maybe_glob_str.is_empty())
-            .map(|maybe_glob_str| {
-                PathMatcher::new(maybe_glob_str)
-                    .with_context(|| format!("parsing {maybe_glob_str} as path matcher"))
-            })
+            .filter(|glob_str| !glob_str.is_empty())
+            .map(|glob_str| anyhow::Ok(Glob::new(glob_str)?.compile_matcher()))
            .collect()
    }

@@ -1202,47 +1192,6 @@ impl ProjectSearchBar {
            false
        }
    }
-
-    fn next_history_query(&mut self, _: &NextHistoryQuery, cx: &mut ViewContext<Self>) {
-        if let Some(search_view) = self.active_project_search.as_ref() {
-            search_view.update(cx, |search_view, cx| {
-                let new_query = search_view.model.update(cx, |model, _| {
-                    if let Some(new_query) = model.search_history.next().map(str::to_string) {
-                        new_query
-                    } else {
-                        model.search_history.reset_selection();
-                        String::new()
-                    }
-                });
-                search_view.set_query(&new_query, cx);
-            });
-        }
-    }
-
-    fn previous_history_query(&mut self, _: &PreviousHistoryQuery, cx: &mut ViewContext<Self>) {
-        if let Some(search_view) = self.active_project_search.as_ref() {
-            search_view.update(cx, |search_view, cx| {
-                if search_view.query_editor.read(cx).text(cx).is_empty() {
-                    if let Some(new_query) = search_view
-                        .model
-                        .read(cx)
-                        .search_history
-                        .current()
-                        .map(str::to_string)
-                    {
-                        search_view.set_query(&new_query, cx);
-                        return;
-                    }
-                }
-
-                if let Some(new_query) = search_view.model.update(cx, |model, _| {
-                    model.search_history.previous().map(str::to_string)
-                }) {
-                    search_view.set_query(&new_query, cx);
-                }
-            });
-        }
-    }
 }

 impl Entity for ProjectSearchBar {
@@ -1424,7 +1373,6 @@ pub mod tests {
    use editor::DisplayPoint;
    use gpui::{color::Color, executor::Deterministic, TestAppContext};
    use project::FakeFs;
-    use semantic_index::semantic_index_settings::SemanticIndexSettings;
    use serde_json::json;
    use settings::SettingsStore;
    use std::sync::Arc;
@@ -1826,7 +1774,7 @@ pub mod tests {
            search_view.included_files_editor.update(cx, |editor, cx| {
                assert_eq!(
                    editor.display_text(cx),
-                    a_dir_entry.path.to_str().unwrap(),
+                    a_dir_entry.path.join("**").display().to_string(),
                    "New search in directory should have included dir entry path"
                );
            });
@@ -1850,192 +1798,6 @@ pub mod tests {
        });
    }

-    #[gpui::test]
-    async fn test_search_query_history(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background());
-        fs.insert_tree(
-            "/dir",
-            json!({
-                "one.rs": "const ONE: usize = 1;",
-                "two.rs": "const TWO: usize = one::ONE + one::ONE;",
-                "three.rs": "const THREE: usize = one::ONE + two::TWO;",
-                "four.rs": "const FOUR: usize = one::ONE + three::THREE;",
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), ["/dir".as_ref()], cx).await;
-        let (window_id, workspace) = cx.add_window(|cx| Workspace::test_new(project, cx));
-        workspace.update(cx, |workspace, cx| {
-            ProjectSearchView::deploy(workspace, &workspace::NewSearch, cx)
-        });
-
-        let search_view = cx.read(|cx| {
-            workspace
-                .read(cx)
-                .active_pane()
-                .read(cx)
-                .active_item()
-                .and_then(|item| item.downcast::<ProjectSearchView>())
-                .expect("Search view expected to appear after new search event trigger")
-        });
-
-        let search_bar = cx.add_view(window_id, |cx| {
-            let mut search_bar = ProjectSearchBar::new();
-            search_bar.set_active_pane_item(Some(&search_view), cx);
-            // search_bar.show(cx);
-            search_bar
-        });
-
-        // Add 3 search items into the history + another unsubmitted one.
-        search_view.update(cx, |search_view, cx| {
-            search_view.search_options = SearchOptions::CASE_SENSITIVE;
-            search_view
-                .query_editor
-                .update(cx, |query_editor, cx| query_editor.set_text("ONE", cx));
-            search_view.search(cx);
-        });
-        cx.foreground().run_until_parked();
-        search_view.update(cx, |search_view, cx| {
-            search_view
-                .query_editor
-                .update(cx, |query_editor, cx| query_editor.set_text("TWO", cx));
-            search_view.search(cx);
-        });
-        cx.foreground().run_until_parked();
-        search_view.update(cx, |search_view, cx| {
-            search_view
-                .query_editor
-                .update(cx, |query_editor, cx| query_editor.set_text("THREE", cx));
-            search_view.search(cx);
-        });
-        cx.foreground().run_until_parked();
-        search_view.update(cx, |search_view, cx| {
-            search_view.query_editor.update(cx, |query_editor, cx| {
-                query_editor.set_text("JUST_TEXT_INPUT", cx)
-            });
-        });
-        cx.foreground().run_until_parked();
-
-        // Ensure that the latest input with search settings is active.
-        search_view.update(cx, |search_view, cx| {
-            assert_eq!(
-                search_view.query_editor.read(cx).text(cx),
-                "JUST_TEXT_INPUT"
-            );
-            assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        // Next history query after the latest should set the query to the empty string.
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.next_history_query(&NextHistoryQuery, cx);
-        });
-        search_view.update(cx, |search_view, cx| {
-            assert_eq!(search_view.query_editor.read(cx).text(cx), "");
-            assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.next_history_query(&NextHistoryQuery, cx);
-        });
-        search_view.update(cx, |search_view, cx| {
-            assert_eq!(search_view.query_editor.read(cx).text(cx), "");
-            assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        // First previous query for empty current query should set the query to the latest submitted one.
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.previous_history_query(&PreviousHistoryQuery, cx);
-        });
-        search_view.update(cx, |search_view, cx| {
-            assert_eq!(search_view.query_editor.read(cx).text(cx), "THREE");
-            assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        // Further previous items should go over the history in reverse order.
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.previous_history_query(&PreviousHistoryQuery, cx);
-        });
-        search_view.update(cx, |search_view, cx| {
-            assert_eq!(search_view.query_editor.read(cx).text(cx), "TWO");
-            assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        // Previous items should never go behind the first history item.
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.previous_history_query(&PreviousHistoryQuery, cx);
-        });
-        search_view.update(cx, |search_view, cx| {
-            assert_eq!(search_view.query_editor.read(cx).text(cx), "ONE");
-            assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.previous_history_query(&PreviousHistoryQuery, cx);
-        });
-        search_view.update(cx, |search_view, cx| {
-            assert_eq!(search_view.query_editor.read(cx).text(cx), "ONE");
-            assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        // Next items should go over the history in the original order.
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.next_history_query(&NextHistoryQuery, cx);
-        });
-        search_view.update(cx, |search_view, cx| {
-            assert_eq!(search_view.query_editor.read(cx).text(cx), "TWO");
-            assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        search_view.update(cx, |search_view, cx| {
-            search_view
-                .query_editor
-                .update(cx, |query_editor, cx| query_editor.set_text("TWO_NEW", cx));
-            search_view.search(cx);
-        });
-        cx.foreground().run_until_parked();
-        search_view.update(cx, |search_view, cx| {
-            assert_eq!(search_view.query_editor.read(cx).text(cx), "TWO_NEW");
-            assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        // New search input should add another entry to history and move the selection to the end of the history.
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.previous_history_query(&PreviousHistoryQuery, cx);
-        });
-        search_view.update(cx, |search_view, cx| {
-            assert_eq!(search_view.query_editor.read(cx).text(cx), "THREE");
-            assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.previous_history_query(&PreviousHistoryQuery, cx);
-        });
-        search_view.update(cx, |search_view, cx| {
-            assert_eq!(search_view.query_editor.read(cx).text(cx), "TWO");
-            assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.next_history_query(&NextHistoryQuery, cx);
-        });
-        search_view.update(cx, |search_view, cx| {
-            assert_eq!(search_view.query_editor.read(cx).text(cx), "THREE");
-            assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.next_history_query(&NextHistoryQuery, cx);
-        });
-        search_view.update(cx, |search_view, cx| {
-            assert_eq!(search_view.query_editor.read(cx).text(cx), "TWO_NEW");
-            assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-        search_bar.update(cx, |search_bar, cx| {
-            search_bar.next_history_query(&NextHistoryQuery, cx);
-        });
-        search_view.update(cx, |search_view, cx| {
-            assert_eq!(search_view.query_editor.read(cx).text(cx), "");
-            assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-    }
-
    pub fn init_test(cx: &mut TestAppContext) {
        cx.foreground().forbid_parking();
        let fonts = cx.font_cache();
@@ -2045,7 +1807,6 @@ pub mod tests {
        cx.update(|cx| {
            cx.set_global(SettingsStore::test(cx));
            cx.set_global(ActiveSearches::default());
-            settings::register::<SemanticIndexSettings>(cx);

            theme::init((), cx);
            cx.update_global::<SettingsStore, _, _>(|store, _| {
--- a/crates/search/src/search.rs
+++ b/crates/search/src/search.rs
@@ -3,7 +3,6 @@ pub use buffer_search::BufferSearchBar;
 use gpui::{actions, Action, AppContext};
 use project::search::SearchQuery;
 pub use project_search::{ProjectSearchBar, ProjectSearchView};
-use smallvec::SmallVec;

 pub mod buffer_search;
 pub mod project_search;
@@ -22,8 +21,6 @@ actions!(
        SelectNextMatch,
        SelectPrevMatch,
        SelectAllMatches,
-        NextHistoryQuery,
-        PreviousHistoryQuery,
    ]
 );

@@ -68,187 +65,3 @@ impl SearchOptions {
        options
    }
 }
-
-const SEARCH_HISTORY_LIMIT: usize = 20;
-
-#[derive(Default, Debug, Clone)]
-pub struct SearchHistory {
-    history: SmallVec<[String; SEARCH_HISTORY_LIMIT]>,
-    selected: Option<usize>,
-}
-
-impl SearchHistory {
-    pub fn add(&mut self, search_string: String) {
-        if let Some(i) = self.selected {
-            if search_string == self.history[i] {
-                return;
-            }
-        }
-
-        if let Some(previously_searched) = self.history.last_mut() {
-            if search_string.find(previously_searched.as_str()).is_some() {
-                *previously_searched = search_string;
-                self.selected = Some(self.history.len() - 1);
-                return;
-            }
-        }
-
-        self.history.push(search_string);
-        if self.history.len() > SEARCH_HISTORY_LIMIT {
-            self.history.remove(0);
-        }
-        self.selected = Some(self.history.len() - 1);
-    }
-
-    pub fn next(&mut self) -> Option<&str> {
-        let history_size = self.history.len();
-        if history_size == 0 {
-            return None;
-        }
-
-        let selected = self.selected?;
-        if selected == history_size - 1 {
-            return None;
-        }
-        let next_index = selected + 1;
-        self.selected = Some(next_index);
-        Some(&self.history[next_index])
-    }
-
-    pub fn current(&self) -> Option<&str> {
-        Some(&self.history[self.selected?])
-    }
-
-    pub fn previous(&mut self) -> Option<&str> {
-        let history_size = self.history.len();
-        if history_size == 0 {
-            return None;
-        }
-
-        let prev_index = match self.selected {
-            Some(selected_index) => {
-                if selected_index == 0 {
-                    return None;
-                } else {
-                    selected_index - 1
-                }
-            }
-            None => history_size - 1,
-        };
-
-        self.selected = Some(prev_index);
-        Some(&self.history[prev_index])
-    }
-
-    pub fn reset_selection(&mut self) {
-        self.selected = None;
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_add() {
-        let mut search_history = SearchHistory::default();
-        assert_eq!(
-            search_history.current(),
-            None,
-            "No current selection should be set fo the default search history"
-        );
-
-        search_history.add("rust".to_string());
-        assert_eq!(
-            search_history.current(),
-            Some("rust"),
-            "Newly added item should be selected"
-        );
-
-        // check if duplicates are not added
-        search_history.add("rust".to_string());
-        assert_eq!(
-            search_history.history.len(),
-            1,
-            "Should not add a duplicate"
-        );
-        assert_eq!(search_history.current(), Some("rust"));
-
-        // check if new string containing the previous string replaces it
-        search_history.add("rustlang".to_string());
-        assert_eq!(
-            search_history.history.len(),
-            1,
-            "Should replace previous item if it's a substring"
-        );
-        assert_eq!(search_history.current(), Some("rustlang"));
-
-        // push enough items to test SEARCH_HISTORY_LIMIT
-        for i in 0..SEARCH_HISTORY_LIMIT * 2 {
-            search_history.add(format!("item{i}"));
-        }
-        assert!(search_history.history.len() <= SEARCH_HISTORY_LIMIT);
-    }
-
-    #[test]
-    fn test_next_and_previous() {
-        let mut search_history = SearchHistory::default();
-        assert_eq!(
-            search_history.next(),
-            None,
-            "Default search history should not have a next item"
-        );
-
-        search_history.add("Rust".to_string());
-        assert_eq!(search_history.next(), None);
-        search_history.add("JavaScript".to_string());
-        assert_eq!(search_history.next(), None);
-        search_history.add("TypeScript".to_string());
-        assert_eq!(search_history.next(), None);
-
-        assert_eq!(search_history.current(), Some("TypeScript"));
-
-        assert_eq!(search_history.previous(), Some("JavaScript"));
-        assert_eq!(search_history.current(), Some("JavaScript"));
-
-        assert_eq!(search_history.previous(), Some("Rust"));
-        assert_eq!(search_history.current(), Some("Rust"));
-
-        assert_eq!(search_history.previous(), None);
-        assert_eq!(search_history.current(), Some("Rust"));
-
-        assert_eq!(search_history.next(), Some("JavaScript"));
-        assert_eq!(search_history.current(), Some("JavaScript"));
-
-        assert_eq!(search_history.next(), Some("TypeScript"));
-        assert_eq!(search_history.current(), Some("TypeScript"));
-
-        assert_eq!(search_history.next(), None);
-        assert_eq!(search_history.current(), Some("TypeScript"));
-    }
-
-    #[test]
-    fn test_reset_selection() {
-        let mut search_history = SearchHistory::default();
-        search_history.add("Rust".to_string());
-        search_history.add("JavaScript".to_string());
-        search_history.add("TypeScript".to_string());
-
-        assert_eq!(search_history.current(), Some("TypeScript"));
-        search_history.reset_selection();
-        assert_eq!(search_history.current(), None);
-        assert_eq!(
-            search_history.previous(),
-            Some("TypeScript"),
-            "Should start from the end after reset on previous item query"
-        );
-
-        search_history.previous();
-        assert_eq!(search_history.current(), Some("JavaScript"));
-        search_history.previous();
-        assert_eq!(search_history.current(), Some("Rust"));
-
-        search_history.reset_selection();
-        assert_eq!(search_history.current(), None);
-    }
-}
--- a/crates/semantic_index/Cargo.toml
+++ b/crates/semantic_index/Cargo.toml
@@ -54,12 +54,9 @@ tempdir.workspace = true
 ctor.workspace = true
 env_logger.workspace = true

-tree-sitter-typescript.workspace = true
-tree-sitter-json.workspace = true
-tree-sitter-rust.workspace = true
-tree-sitter-toml.workspace = true
-tree-sitter-cpp.workspace = true
-tree-sitter-elixir.workspace = true
-tree-sitter-lua.workspace = true
-tree-sitter-ruby.workspace = true
-tree-sitter-php.workspace = true
+tree-sitter-typescript = "*"
+tree-sitter-json = "*"
+tree-sitter-rust = "*"
+tree-sitter-toml = "*"
+tree-sitter-cpp = "*"
+tree-sitter-elixir = "*"
--- a/crates/semantic_index/src/db.rs
+++ b/crates/semantic_index/src/db.rs
@@ -1,6 +1,7 @@
 use crate::{parsing::Document, SEMANTIC_INDEX_VERSION};
 use anyhow::{anyhow, Context, Result};
-use project::{search::PathMatcher, Fs};
+use globset::GlobMatcher;
+use project::Fs;
 use rpc::proto::Timestamp;
 use rusqlite::{
    params,
@@ -266,32 +267,41 @@ impl VectorDatabase {

    pub fn top_k_search(
        &self,
+        worktree_ids: &[i64],
        query_embedding: &Vec<f32>,
        limit: usize,
-        file_ids: &[i64],
-    ) -> Result<Vec<(i64, f32)>> {
+        include_globs: Vec<GlobMatcher>,
+        exclude_globs: Vec<GlobMatcher>,
+    ) -> Result<Vec<(i64, PathBuf, Range<usize>)>> {
        let mut results = Vec::<(i64, f32)>::with_capacity(limit + 1);
-        self.for_each_document(file_ids, |id, embedding| {
-            let similarity = dot(&embedding, &query_embedding);
-            let ix = match results
-                .binary_search_by(|(_, s)| similarity.partial_cmp(&s).unwrap_or(Ordering::Equal))
-            {
-                Ok(ix) => ix,
-                Err(ix) => ix,
-            };
-            results.insert(ix, (id, similarity));
-            results.truncate(limit);
-        })?;
+        self.for_each_document(
+            &worktree_ids,
+            include_globs,
+            exclude_globs,
+            |id, embedding| {
+                let similarity = dot(&embedding, &query_embedding);
+                let ix = match results.binary_search_by(|(_, s)| {
+                    similarity.partial_cmp(&s).unwrap_or(Ordering::Equal)
+                }) {
+                    Ok(ix) => ix,
+                    Err(ix) => ix,
+                };
+                results.insert(ix, (id, similarity));
+                results.truncate(limit);
+            },
+        )?;

-        Ok(results)
+        let ids = results.into_iter().map(|(id, _)| id).collect::<Vec<_>>();
+        self.get_documents_by_ids(&ids)
    }

-    pub fn retrieve_included_file_ids(
+    fn for_each_document(
        &self,
        worktree_ids: &[i64],
-        includes: &[PathMatcher],
-        excludes: &[PathMatcher],
-    ) -> Result<Vec<i64>> {
+        include_globs: Vec<GlobMatcher>,
+        exclude_globs: Vec<GlobMatcher>,
+        mut f: impl FnMut(i64, Vec<f32>),
+    ) -> Result<()> {
        let mut file_query = self.db.prepare(
            "
            SELECT
@@ -305,22 +315,21 @@ impl VectorDatabase {

        let mut file_ids = Vec::<i64>::new();
        let mut rows = file_query.query([ids_to_sql(worktree_ids)])?;
-
        while let Some(row) = rows.next()? {
            let file_id = row.get(0)?;
            let relative_path = row.get_ref(1)?.as_str()?;
-            let included =
-                includes.is_empty() || includes.iter().any(|glob| glob.is_match(relative_path));
-            let excluded = excludes.iter().any(|glob| glob.is_match(relative_path));
+            let included = include_globs.is_empty()
+                || include_globs
+                    .iter()
+                    .any(|glob| glob.is_match(relative_path));
+            let excluded = exclude_globs
+                .iter()
+                .any(|glob| glob.is_match(relative_path));
            if included && !excluded {
                file_ids.push(file_id);
            }
        }

-        Ok(file_ids)
-    }
-
-    fn for_each_document(&self, file_ids: &[i64], mut f: impl FnMut(i64, Vec<f32>)) -> Result<()> {
        let mut query_statement = self.db.prepare(
            "
            SELECT
@@ -341,7 +350,7 @@ impl VectorDatabase {
        Ok(())
    }

-    pub fn get_documents_by_ids(&self, ids: &[i64]) -> Result<Vec<(i64, PathBuf, Range<usize>)>> {
+    fn get_documents_by_ids(&self, ids: &[i64]) -> Result<Vec<(i64, PathBuf, Range<usize>)>> {
        let mut statement = self.db.prepare(
            "
                SELECT
--- a/crates/semantic_index/src/parsing.rs
+++ b/crates/semantic_index/src/parsing.rs
@@ -21,9 +21,7 @@ const CODE_CONTEXT_TEMPLATE: &str =
    "The below code snippet is from file '<path>'\n\n```<language>\n<item>\n```";
 const ENTIRE_FILE_TEMPLATE: &str =
    "The below snippet is from file '<path>'\n\n```<language>\n<item>\n```";
-const MARKDOWN_CONTEXT_TEMPLATE: &str = "The below file contents is from file '<path>'\n\n<item>";
-pub const PARSEABLE_ENTIRE_FILE_TYPES: &[&str] =
-    &["TOML", "YAML", "CSS", "HEEX", "ERB", "SVELTE", "HTML"];
+pub const PARSEABLE_ENTIRE_FILE_TYPES: &[&str] = &["TOML", "YAML", "CSS"];

 pub struct CodeContextRetriever {
    pub parser: Parser,
@@ -61,7 +59,7 @@ impl CodeContextRetriever {
        let document_span = ENTIRE_FILE_TEMPLATE
            .replace("<path>", relative_path.to_string_lossy().as_ref())
            .replace("<language>", language_name.as_ref())
-            .replace("<item>", &content);
+            .replace("item", &content);

        Ok(vec![Document {
            range: 0..content.len(),
@@ -71,19 +69,6 @@ impl CodeContextRetriever {
        }])
    }

-    fn parse_markdown_file(&self, relative_path: &Path, content: &str) -> Result<Vec<Document>> {
-        let document_span = MARKDOWN_CONTEXT_TEMPLATE
-            .replace("<path>", relative_path.to_string_lossy().as_ref())
-            .replace("<item>", &content);
-
-        Ok(vec![Document {
-            range: 0..content.len(),
-            content: document_span,
-            embedding: Vec::new(),
-            name: "Markdown".to_string(),
-        }])
-    }
-
    fn get_matches_in_file(
        &mut self,
        content: &str,
@@ -150,8 +135,6 @@ impl CodeContextRetriever {

        if PARSEABLE_ENTIRE_FILE_TYPES.contains(&language_name.as_ref()) {
            return self.parse_entire_file(relative_path, language_name, &content);
-        } else if &language_name.to_string() == &"Markdown".to_string() {
-            return self.parse_markdown_file(relative_path, &content);
        }

        let mut documents = self.parse_file(content, language)?;
@@ -217,12 +200,7 @@ impl CodeContextRetriever {

            let mut document_content = String::new();
            for context_range in &context_match.context_ranges {
-                add_content_from_range(
-                    &mut document_content,
-                    content,
-                    context_range.clone(),
-                    context_match.start_col,
-                );
+                document_content.push_str(&content[context_range.clone()]);
                document_content.push_str("\n");
            }

--- a/crates/semantic_index/src/semantic_index.rs
+++ b/crates/semantic_index/src/semantic_index.rs
@@ -11,15 +11,15 @@ use anyhow::{anyhow, Result};
 use db::VectorDatabase;
 use embedding::{EmbeddingProvider, OpenAIEmbeddings};
 use futures::{channel::oneshot, Future};
+use globset::GlobMatcher;
 use gpui::{AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle, Task, WeakModelHandle};
 use language::{Anchor, Buffer, Language, LanguageRegistry};
 use parking_lot::Mutex;
 use parsing::{CodeContextRetriever, Document, PARSEABLE_ENTIRE_FILE_TYPES};
 use postage::watch;
-use project::{search::PathMatcher, Fs, Project, WorktreeId};
+use project::{Fs, Project, WorktreeId};
 use smol::channel;
 use std::{
-    cmp::Ordering,
    collections::HashMap,
    mem,
    ops::Range,
@@ -612,7 +612,6 @@ impl SemanticIndex {
                                .await
                            {
                                if !PARSEABLE_ENTIRE_FILE_TYPES.contains(&language.name().as_ref())
-                                    && &language.name().as_ref() != &"Markdown"
                                    && language
                                        .grammar()
                                        .and_then(|grammar| grammar.embedding_config.as_ref())
@@ -682,8 +681,8 @@ impl SemanticIndex {
        project: ModelHandle<Project>,
        phrase: String,
        limit: usize,
-        includes: Vec<PathMatcher>,
-        excludes: Vec<PathMatcher>,
+        include_globs: Vec<GlobMatcher>,
+        exclude_globs: Vec<GlobMatcher>,
        cx: &mut ModelContext<Self>,
    ) -> Task<Result<Vec<SearchResult>>> {
        let project_state = if let Some(state) = self.projects.get(&project.downgrade()) {
@@ -705,66 +704,27 @@ impl SemanticIndex {
        let database_url = self.database_url.clone();
        let fs = self.fs.clone();
        cx.spawn(|this, mut cx| async move {
-            let database = VectorDatabase::new(fs.clone(), database_url.clone()).await?;
+            let documents = cx
+                .background()
+                .spawn(async move {
+                    let database = VectorDatabase::new(fs, database_url).await?;

-            let phrase_embedding = embedding_provider
-                .embed_batch(vec![&phrase])
-                .await?
-                .into_iter()
-                .next()
-                .unwrap();
+                    let phrase_embedding = embedding_provider
+                        .embed_batch(vec![&phrase])
+                        .await?
+                        .into_iter()
+                        .next()
+                        .unwrap();

-            let file_ids =
-                database.retrieve_included_file_ids(&worktree_db_ids, &includes, &excludes)?;
-
-            let batch_n = cx.background().num_cpus();
-            let ids_len = file_ids.clone().len();
-            let batch_size = if ids_len <= batch_n {
-                ids_len
-            } else {
-                ids_len / batch_n
-            };
-
-            let mut result_tasks = Vec::new();
-            for batch in file_ids.chunks(batch_size) {
-                let batch = batch.into_iter().map(|v| *v).collect::<Vec<i64>>();
-                let limit = limit.clone();
-                let fs = fs.clone();
-                let database_url = database_url.clone();
-                let phrase_embedding = phrase_embedding.clone();
-                let task = cx.background().spawn(async move {
-                    let database = VectorDatabase::new(fs, database_url).await.log_err();
-                    if database.is_none() {
-                        return Err(anyhow!("failed to acquire database connection"));
-                    } else {
-                        database
-                            .unwrap()
-                            .top_k_search(&phrase_embedding, limit, batch.as_slice())
-                    }
-                });
-                result_tasks.push(task);
-            }
-
-            let batch_results = futures::future::join_all(result_tasks).await;
-
-            let mut results = Vec::new();
-            for batch_result in batch_results {
-                if batch_result.is_ok() {
-                    for (id, similarity) in batch_result.unwrap() {
-                        let ix = match results.binary_search_by(|(_, s)| {
-                            similarity.partial_cmp(&s).unwrap_or(Ordering::Equal)
-                        }) {
-                            Ok(ix) => ix,
-                            Err(ix) => ix,
-                        };
-                        results.insert(ix, (id, similarity));
-                        results.truncate(limit);
-                    }
-                }
-            }
-
-            let ids = results.into_iter().map(|(id, _)| id).collect::<Vec<i64>>();
-            let documents = database.get_documents_by_ids(ids.as_slice())?;
+                    database.top_k_search(
+                        &worktree_db_ids,
+                        &phrase_embedding,
+                        limit,
+                        include_globs,
+                        exclude_globs,
+                    )
+                })
+                .await?;

            let mut tasks = Vec::new();
            let mut ranges = Vec::new();
--- a/crates/semantic_index/src/semantic_index_tests.rs
+++ b/crates/semantic_index/src/semantic_index_tests.rs
@@ -7,10 +7,11 @@ use crate::{
 };
 use anyhow::Result;
 use async_trait::async_trait;
+use globset::Glob;
 use gpui::{Task, TestAppContext};
 use language::{Language, LanguageConfig, LanguageRegistry, ToOffset};
 use pretty_assertions::assert_eq;
-use project::{project_settings::ProjectSettings, search::PathMatcher, FakeFs, Fs, Project};
+use project::{project_settings::ProjectSettings, FakeFs, Fs, Project};
 use rand::{rngs::StdRng, Rng};
 use serde_json::json;
 use settings::SettingsStore;
@@ -120,8 +121,8 @@ async fn test_semantic_index(cx: &mut TestAppContext) {
    );

    // Test Include Files Functonality
-    let include_files = vec![PathMatcher::new("*.rs").unwrap()];
-    let exclude_files = vec![PathMatcher::new("*.rs").unwrap()];
+    let include_files = vec![Glob::new("*.rs").unwrap().compile_matcher()];
+    let exclude_files = vec![Glob::new("*.rs").unwrap().compile_matcher()];
    let rust_only_search_results = store
        .update(cx, |store, cx| {
            store.search_project(
@@ -485,79 +486,6 @@ async fn test_code_context_retrieval_javascript() {
    )
 }

-#[gpui::test]
-async fn test_code_context_retrieval_lua() {
-    let language = lua_lang();
-    let mut retriever = CodeContextRetriever::new();
-
-    let text = r#"
-        -- Creates a new class
-        -- @param baseclass The Baseclass of this class, or nil.
-        -- @return A new class reference.
-        function classes.class(baseclass)
-            -- Create the class definition and metatable.
-            local classdef = {}
-            -- Find the super class, either Object or user-defined.
-            baseclass = baseclass or classes.Object
-            -- If this class definition does not know of a function, it will 'look up' to the Baseclass via the __index of the metatable.
-            setmetatable(classdef, { __index = baseclass })
-            -- All class instances have a reference to the class object.
-            classdef.class = classdef
-            --- Recursivly allocates the inheritance tree of the instance.
-            -- @param mastertable The 'root' of the inheritance tree.
-            -- @return Returns the instance with the allocated inheritance tree.
-            function classdef.alloc(mastertable)
-                -- All class instances have a reference to a superclass object.
-                local instance = { super = baseclass.alloc(mastertable) }
-                -- Any functions this instance does not know of will 'look up' to the superclass definition.
-                setmetatable(instance, { __index = classdef, __newindex = mastertable })
-                return instance
-            end
-        end
-        "#.unindent();
-
-    let documents = retriever.parse_file(&text, language.clone()).unwrap();
-
-    assert_documents_eq(
-        &documents,
-        &[
-            (r#"
-                -- Creates a new class
-                -- @param baseclass The Baseclass of this class, or nil.
-                -- @return A new class reference.
-                function classes.class(baseclass)
-                    -- Create the class definition and metatable.
-                    local classdef = {}
-                    -- Find the super class, either Object or user-defined.
-                    baseclass = baseclass or classes.Object
-                    -- If this class definition does not know of a function, it will 'look up' to the Baseclass via the __index of the metatable.
-                    setmetatable(classdef, { __index = baseclass })
-                    -- All class instances have a reference to the class object.
-                    classdef.class = classdef
-                    --- Recursivly allocates the inheritance tree of the instance.
-                    -- @param mastertable The 'root' of the inheritance tree.
-                    -- @return Returns the instance with the allocated inheritance tree.
-                    function classdef.alloc(mastertable)
-                        --[ ... ]--
-                        --[ ... ]--
-                    end
-                end"#.unindent(),
-            114),
-            (r#"
-            --- Recursivly allocates the inheritance tree of the instance.
-            -- @param mastertable The 'root' of the inheritance tree.
-            -- @return Returns the instance with the allocated inheritance tree.
-            function classdef.alloc(mastertable)
-                -- All class instances have a reference to a superclass object.
-                local instance = { super = baseclass.alloc(mastertable) }
-                -- Any functions this instance does not know of will 'look up' to the superclass definition.
-                setmetatable(instance, { __index = classdef, __newindex = mastertable })
-                return instance
-            end"#.unindent(), 809),
-        ]
-    );
-}
-
 #[gpui::test]
 async fn test_code_context_retrieval_elixir() {
    let language = elixir_lang();
@@ -826,346 +754,6 @@ async fn test_code_context_retrieval_cpp() {
    );
 }

-#[gpui::test]
-async fn test_code_context_retrieval_ruby() {
-    let language = ruby_lang();
-    let mut retriever = CodeContextRetriever::new();
-
-    let text = r#"
-        # This concern is inspired by "sudo mode" on GitHub. It
-        # is a way to re-authenticate a user before allowing them
-        # to see or perform an action.
-        #
-        # Add `before_action :require_challenge!` to actions you
-        # want to protect.
-        #
-        # The user will be shown a page to enter the challenge (which
-        # is either the password, or just the username when no
-        # password exists). Upon passing, there is a grace period
-        # during which no challenge will be asked from the user.
-        #
-        # Accessing challenge-protected resources during the grace
-        # period will refresh the grace period.
-        module ChallengableConcern
-            extend ActiveSupport::Concern
-
-            CHALLENGE_TIMEOUT = 1.hour.freeze
-
-            def require_challenge!
-                return if skip_challenge?
-
-                if challenge_passed_recently?
-                    session[:challenge_passed_at] = Time.now.utc
-                    return
-                end
-
-                @challenge = Form::Challenge.new(return_to: request.url)
-
-                if params.key?(:form_challenge)
-                    if challenge_passed?
-                        session[:challenge_passed_at] = Time.now.utc
-                    else
-                        flash.now[:alert] = I18n.t('challenge.invalid_password')
-                        render_challenge
-                    end
-                else
-                    render_challenge
-                end
-            end
-
-            def challenge_passed?
-                current_user.valid_password?(challenge_params[:current_password])
-            end
-        end
-
-        class Animal
-            include Comparable
-
-            attr_reader :legs
-
-            def initialize(name, legs)
-                @name, @legs = name, legs
-            end
-
-            def <=>(other)
-                legs <=> other.legs
-            end
-        end
-
-        # Singleton method for car object
-        def car.wheels
-            puts "There are four wheels"
-        end"#
-        .unindent();
-
-    let documents = retriever.parse_file(&text, language.clone()).unwrap();
-
-    assert_documents_eq(
-        &documents,
-        &[
-            (
-                r#"
-        # This concern is inspired by "sudo mode" on GitHub. It
-        # is a way to re-authenticate a user before allowing them
-        # to see or perform an action.
-        #
-        # Add `before_action :require_challenge!` to actions you
-        # want to protect.
-        #
-        # The user will be shown a page to enter the challenge (which
-        # is either the password, or just the username when no
-        # password exists). Upon passing, there is a grace period
-        # during which no challenge will be asked from the user.
-        #
-        # Accessing challenge-protected resources during the grace
-        # period will refresh the grace period.
-        module ChallengableConcern
-            extend ActiveSupport::Concern
-
-            CHALLENGE_TIMEOUT = 1.hour.freeze
-
-            def require_challenge!
-                # ...
-            end
-
-            def challenge_passed?
-                # ...
-            end
-        end"#
-                    .unindent(),
-                558,
-            ),
-            (
-                r#"
-            def require_challenge!
-                return if skip_challenge?
-
-                if challenge_passed_recently?
-                    session[:challenge_passed_at] = Time.now.utc
-                    return
-                end
-
-                @challenge = Form::Challenge.new(return_to: request.url)
-
-                if params.key?(:form_challenge)
-                    if challenge_passed?
-                        session[:challenge_passed_at] = Time.now.utc
-                    else
-                        flash.now[:alert] = I18n.t('challenge.invalid_password')
-                        render_challenge
-                    end
-                else
-                    render_challenge
-                end
-            end"#
-                    .unindent(),
-                663,
-            ),
-            (
-                r#"
-                def challenge_passed?
-                    current_user.valid_password?(challenge_params[:current_password])
-                end"#
-                    .unindent(),
-                1254,
-            ),
-            (
-                r#"
-                class Animal
-                    include Comparable
-
-                    attr_reader :legs
-
-                    def initialize(name, legs)
-                        # ...
-                    end
-
-                    def <=>(other)
-                        # ...
-                    end
-                end"#
-                    .unindent(),
-                1363,
-            ),
-            (
-                r#"
-                def initialize(name, legs)
-                    @name, @legs = name, legs
-                end"#
-                    .unindent(),
-                1427,
-            ),
-            (
-                r#"
-                def <=>(other)
-                    legs <=> other.legs
-                end"#
-                    .unindent(),
-                1501,
-            ),
-            (
-                r#"
-                # Singleton method for car object
-                def car.wheels
-                    puts "There are four wheels"
-                end"#
-                    .unindent(),
-                1591,
-            ),
-        ],
-    );
-}
-
-#[gpui::test]
-async fn test_code_context_retrieval_php() {
-    let language = php_lang();
-    let mut retriever = CodeContextRetriever::new();
-
-    let text = r#"
-        <?php
-
-        namespace LevelUp\Experience\Concerns;
-
-        /*
-        This is a multiple-lines comment block
-        that spans over multiple
-        lines
-        */
-        function functionName() {
-            echo "Hello world!";
-        }
-
-        trait HasAchievements
-        {
-            /**
-            * @throws \Exception
-            */
-            public function grantAchievement(Achievement $achievement, $progress = null): void
-            {
-                if ($progress > 100) {
-                    throw new Exception(message: 'Progress cannot be greater than 100');
-                }
-
-                if ($this->achievements()->find($achievement->id)) {
-                    throw new Exception(message: 'User already has this Achievement');
-                }
-
-                $this->achievements()->attach($achievement, [
-                    'progress' => $progress ?? null,
-                ]);
-
-                $this->when(value: ($progress === null) || ($progress === 100), callback: fn (): ?array => event(new AchievementAwarded(achievement: $achievement, user: $this)));
-            }
-
-            public function achievements(): BelongsToMany
-            {
-                return $this->belongsToMany(related: Achievement::class)
-                ->withPivot(columns: 'progress')
-                ->where('is_secret', false)
-                ->using(AchievementUser::class);
-            }
-        }
-
-        interface Multiplier
-        {
-            public function qualifies(array $data): bool;
-
-            public function setMultiplier(): int;
-        }
-
-        enum AuditType: string
-        {
-            case Add = 'add';
-            case Remove = 'remove';
-            case Reset = 'reset';
-            case LevelUp = 'level_up';
-        }
-
-        ?>"#
-    .unindent();
-
-    let documents = retriever.parse_file(&text, language.clone()).unwrap();
-
-    assert_documents_eq(
-        &documents,
-        &[
-            (
-                r#"
-        /*
-        This is a multiple-lines comment block
-        that spans over multiple
-        lines
-        */
-        function functionName() {
-            echo "Hello world!";
-        }"#
-                .unindent(),
-                123,
-            ),
-            (
-                r#"
-        trait HasAchievements
-        {
-            /**
-            * @throws \Exception
-            */
-            public function grantAchievement(Achievement $achievement, $progress = null): void
-            {/* ... */}
-
-            public function achievements(): BelongsToMany
-            {/* ... */}
-        }"#
-                .unindent(),
-                177,
-            ),
-            (r#"
-            /**
-            * @throws \Exception
-            */
-            public function grantAchievement(Achievement $achievement, $progress = null): void
-            {
-                if ($progress > 100) {
-                    throw new Exception(message: 'Progress cannot be greater than 100');
-                }
-
-                if ($this->achievements()->find($achievement->id)) {
-                    throw new Exception(message: 'User already has this Achievement');
-                }
-
-                $this->achievements()->attach($achievement, [
-                    'progress' => $progress ?? null,
-                ]);
-
-                $this->when(value: ($progress === null) || ($progress === 100), callback: fn (): ?array => event(new AchievementAwarded(achievement: $achievement, user: $this)));
-            }"#.unindent(), 245),
-            (r#"
-                public function achievements(): BelongsToMany
-                {
-                    return $this->belongsToMany(related: Achievement::class)
-                    ->withPivot(columns: 'progress')
-                    ->where('is_secret', false)
-                    ->using(AchievementUser::class);
-                }"#.unindent(), 902),
-            (r#"
-                interface Multiplier
-                {
-                    public function qualifies(array $data): bool;
-
-                    public function setMultiplier(): int;
-                }"#.unindent(),
-                1146),
-            (r#"
-                enum AuditType: string
-                {
-                    case Add = 'add';
-                    case Remove = 'remove';
-                    case Reset = 'reset';
-                    case LevelUp = 'level_up';
-                }"#.unindent(), 1265)
-        ],
-    );
-}
-
 #[gpui::test]
 fn test_dot_product(mut rng: StdRng) {
    assert_eq!(dot(&[1., 0., 0., 0., 0.], &[0., 1., 0., 0., 0.]), 0.);
@@ -1496,131 +1084,6 @@ fn cpp_lang() -> Arc<Language> {
    )
 }

-fn lua_lang() -> Arc<Language> {
-    Arc::new(
-        Language::new(
-            LanguageConfig {
-                name: "Lua".into(),
-                path_suffixes: vec!["lua".into()],
-                collapsed_placeholder: "--[ ... ]--".to_string(),
-                ..Default::default()
-            },
-            Some(tree_sitter_lua::language()),
-        )
-        .with_embedding_query(
-            r#"
-            (
-                (comment)* @context
-                .
-                (function_declaration
-                    "function" @name
-                    name: (_) @name
-                    (comment)* @collapse
-                    body: (block) @collapse
-                ) @item
-            )
-        "#,
-        )
-        .unwrap(),
-    )
-}
-
-fn php_lang() -> Arc<Language> {
-    Arc::new(
-        Language::new(
-            LanguageConfig {
-                name: "PHP".into(),
-                path_suffixes: vec!["php".into()],
-                collapsed_placeholder: "/* ... */".into(),
-                ..Default::default()
-            },
-            Some(tree_sitter_php::language()),
-        )
-        .with_embedding_query(
-            r#"
-            (
-                (comment)* @context
-                .
-                [
-                    (function_definition
-                        "function" @name
-                        name: (_) @name
-                        body: (_
-                            "{" @keep
-                            "}" @keep) @collapse
-                        )
-
-                    (trait_declaration
-                        "trait" @name
-                        name: (_) @name)
-
-                    (method_declaration
-                        "function" @name
-                        name: (_) @name
-                        body: (_
-                            "{" @keep
-                            "}" @keep) @collapse
-                        )
-
-                    (interface_declaration
-                        "interface" @name
-                        name: (_) @name
-                        )
-
-                    (enum_declaration
-                        "enum" @name
-                        name: (_) @name
-                        )
-
-                ] @item
-            )
-            "#,
-        )
-        .unwrap(),
-    )
-}
-
-fn ruby_lang() -> Arc<Language> {
-    Arc::new(
-        Language::new(
-            LanguageConfig {
-                name: "Ruby".into(),
-                path_suffixes: vec!["rb".into()],
-                collapsed_placeholder: "# ...".to_string(),
-                ..Default::default()
-            },
-            Some(tree_sitter_ruby::language()),
-        )
-        .with_embedding_query(
-            r#"
-            (
-                (comment)* @context
-                .
-                [
-                (module
-                    "module" @name
-                    name: (_) @name)
-                (method
-                    "def" @name
-                    name: (_) @name
-                    body: (body_statement) @collapse)
-                (class
-                    "class" @name
-                    name: (_) @name)
-                (singleton_method
-                    "def" @name
-                    object: (_) @name
-                    "." @name
-                    name: (_) @name
-                    body: (body_statement) @collapse)
-                ] @item
-            )
-            "#,
-        )
-        .unwrap(),
-    )
-}
-
 fn elixir_lang() -> Arc<Language> {
    Arc::new(
        Language::new(
--- a/crates/sum_tree/src/cursor.rs
+++ b/crates/sum_tree/src/cursor.rs
@@ -202,7 +202,7 @@ where
                self.position = D::default();
            }

-            let entry = self.stack.last_mut().unwrap();
+            let mut entry = self.stack.last_mut().unwrap();
            if !descending {
                if entry.index == 0 {
                    self.stack.pop();
--- a/crates/terminal/Cargo.toml
+++ b/crates/terminal/Cargo.toml
@@ -16,7 +16,7 @@ db = { path = "../db" }
 theme = { path = "../theme" }
 util = { path = "../util" }

-alacritty_terminal = { git = "https://github.com/alacritty/alacritty", rev = "7b9f32300ee0a249c0872302c97635b460e45ba5" }
+alacritty_terminal = { git = "https://github.com/zed-industries/alacritty", rev = "a51dbe25d67e84d6ed4261e640d3954fbdd9be45" }
 procinfo = { git = "https://github.com/zed-industries/wezterm", rev = "5cd757e5f2eb039ed0c6bb6512223e69d5efc64d", default-features = false }
 smallvec.workspace = true
 smol.workspace = true
--- a/crates/terminal/src/mappings/colors.rs
+++ b/crates/terminal/src/mappings/colors.rs
@@ -114,7 +114,11 @@ fn rgb_for_index(i: &u8) -> (u8, u8, u8) {

 //Convenience method to convert from a GPUI color to an alacritty Rgb
 pub fn to_alac_rgb(color: Color) -> AlacRgb {
-    AlacRgb::new(color.r, color.g, color.g)
+    AlacRgb {
+        r: color.r,
+        g: color.g,
+        b: color.g,
+    }
 }

 #[cfg(test)]
--- a/crates/vim/src/normal/search.rs
+++ b/crates/vim/src/normal/search.rs
@@ -93,7 +93,7 @@ fn search_submit(workspace: &mut Workspace, _: &SearchSubmit, cx: &mut ViewConte
        pane.update(cx, |pane, cx| {
            if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() {
                search_bar.update(cx, |search_bar, cx| {
-                    let state = &mut vim.state.search;
+                    let mut state = &mut vim.state.search;
                    let mut count = state.count;

                    // in the case that the query has changed, the search bar
@@ -222,7 +222,7 @@ mod test {
        });

        search_bar.read_with(cx.cx, |bar, cx| {
-            assert_eq!(bar.query(cx), "cc");
+            assert_eq!(bar.query_editor.read(cx).text(cx), "cc");
        });

        deterministic.run_until_parked();
--- a/crates/vim/src/test.rs
+++ b/crates/vim/src/test.rs
@@ -99,7 +99,7 @@ async fn test_buffer_search(cx: &mut gpui::TestAppContext) {
    });

    search_bar.read_with(cx.cx, |bar, cx| {
-        assert_eq!(bar.query(cx), "");
+        assert_eq!(bar.query_editor.read(cx).text(cx), "");
    })
 }

@@ -175,7 +175,7 @@ async fn test_selection_on_search(cx: &mut gpui::TestAppContext) {
    });

    search_bar.read_with(cx.cx, |bar, cx| {
-        assert_eq!(bar.query(cx), "cc");
+        assert_eq!(bar.query_editor.read(cx).text(cx), "cc");
    });

    // wait for the query editor change event to fire.
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -746,10 +746,6 @@ impl Pane {
        _: &CloseAllItems,
        cx: &mut ViewContext<Self>,
    ) -> Option<Task<Result<()>>> {
-        if self.items.is_empty() {
-            return None;
-        }
-
        Some(self.close_items(cx, move |_| true))
    }

--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -122,7 +122,6 @@ actions!(
        NewFile,
        NewWindow,
        CloseWindow,
-        CloseInactiveTabsAndPanes,
        AddFolderToProject,
        Unfollow,
        Save,
@@ -241,7 +240,6 @@ pub fn init(app_state: Arc<AppState>, cx: &mut AppContext) {

    cx.add_async_action(Workspace::follow_next_collaborator);
    cx.add_async_action(Workspace::close);
-    cx.add_async_action(Workspace::close_inactive_items_and_panes);
    cx.add_global_action(Workspace::close_global);
    cx.add_global_action(restart);
    cx.add_async_action(Workspace::save_all);
@@ -1673,45 +1671,6 @@ impl Workspace {
        }
    }

-    pub fn close_inactive_items_and_panes(
-        &mut self,
-        _: &CloseInactiveTabsAndPanes,
-        cx: &mut ViewContext<Self>,
-    ) -> Option<Task<Result<()>>> {
-        let current_pane = self.active_pane();
-
-        let mut tasks = Vec::new();
-
-        if let Some(current_pane_close) = current_pane.update(cx, |pane, cx| {
-            pane.close_inactive_items(&CloseInactiveItems, cx)
-        }) {
-            tasks.push(current_pane_close);
-        };
-
-        for pane in self.panes() {
-            if pane.id() == current_pane.id() {
-                continue;
-            }
-
-            if let Some(close_pane_items) = pane.update(cx, |pane: &mut Pane, cx| {
-                pane.close_all_items(&CloseAllItems, cx)
-            }) {
-                tasks.push(close_pane_items)
-            }
-        }
-
-        if tasks.is_empty() {
-            None
-        } else {
-            Some(cx.spawn(|_, _| async move {
-                for task in tasks {
-                    task.await?
-                }
-                Ok(())
-            }))
-        }
-    }
-
    pub fn toggle_dock(&mut self, dock_side: DockPosition, cx: &mut ViewContext<Self>) {
        let dock = match dock_side {
            DockPosition::Left => &self.left_dock,
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Nathan Sobo <nathansobo@gmail.com>"]
 description = "The fast, collaborative code editor."
 edition = "2021"
 name = "zed"
-version = "0.98.2"
+version = "0.97.6"
 publish = false

 [lib]
@@ -128,7 +128,6 @@ tree-sitter-svelte.workspace = true
 tree-sitter-racket.workspace = true
 tree-sitter-yaml.workspace = true
 tree-sitter-lua.workspace = true
-tree-sitter-nix.workspace = true

 url = "2.2"
 urlencoding = "2.1.2"
--- a/crates/zed/RELEASE_CHANNEL
+++ b/crates/zed/RELEASE_CHANNEL
@@ -1 +1 @@
-preview
+stable
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -152,10 +152,8 @@ pub fn init(languages: Arc<LanguageRegistry>, node_runtime: Arc<NodeRuntime>) {
        tree_sitter_php::language(),
        vec![Arc::new(php::IntelephenseLspAdapter::new(node_runtime))],
    );
-
    language("elm", tree_sitter_elm::language(), vec![]);
    language("glsl", tree_sitter_glsl::language(), vec![]);
-    language("nix", tree_sitter_nix::language(), vec![]);
 }

 #[cfg(any(test, feature = "test-support"))]
--- a/crates/zed/src/languages/lua/config.toml
+++ b/crates/zed/src/languages/lua/config.toml
@@ -7,4 +7,3 @@ brackets = [
    { start = "[", end = "]", close = true, newline = true },
    { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] },
 ]
-collapsed_placeholder = "--[ ... ]--"
--- a/crates/zed/src/languages/lua/embedding.scm
+++ b/crates/zed/src/languages/lua/embedding.scm
@@ -1,10 +0,0 @@
-(
-    (comment)* @context
-    .
-    (function_declaration
-        "function" @name
-        name: (_) @name
-        (comment)* @collapse
-        body: (block) @collapse
-    ) @item
-)
--- a/crates/zed/src/languages/nix/config.toml
+++ b/crates/zed/src/languages/nix/config.toml
@@ -1,11 +0,0 @@
-name = "Nix"
-path_suffixes = ["nix"]
-line_comment = "# "
-block_comment = ["/* ", " */"]
-autoclose_before = ";:.,=}])>` \n\t\""
-brackets = [
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "(", end = ")", close = true, newline = true },
-    { start = "<", end = ">", close = true, newline = true },
-]
--- a/crates/zed/src/languages/nix/highlights.scm
+++ b/crates/zed/src/languages/nix/highlights.scm
@@ -1,95 +0,0 @@
-(comment) @comment
-
-[
-  "if"
-  "then"
-  "else"
-  "let"
-  "inherit"
-  "in"
-  "rec"
-  "with"
-  "assert"
-  "or"
-] @keyword
-
-[
- (string_expression)
- (indented_string_expression)
-] @string
-
-[
-  (path_expression)
-  (hpath_expression)
-  (spath_expression)
-] @string.special.path
-
-(uri_expression) @link_uri
-
-[
-  (integer_expression)
-  (float_expression)
-] @number
-
-(interpolation
-  "${" @punctuation.special
-  "}" @punctuation.special) @embedded
-
-(escape_sequence) @escape
-(dollar_escape) @escape
-
-(function_expression
-  universal: (identifier) @parameter
-)
-
-(formal
-  name: (identifier) @parameter
-  "?"? @punctuation.delimiter)
-
-(select_expression
-  attrpath: (attrpath (identifier)) @property)
-
-(apply_expression
-  function: [
-    (variable_expression (identifier)) @function
-    (select_expression
-      attrpath: (attrpath
-        attr: (identifier) @function .))])
-
-(unary_expression
-  operator: _ @operator)
-
-(binary_expression
-  operator: _ @operator)
-
-(variable_expression (identifier) @variable)
-
-(binding
-  attrpath: (attrpath (identifier)) @property)
-
-"=" @operator
-
-[
-  ";"
-  "."
-  ","
-] @punctuation.delimiter
-
-[
-  "("
-  ")"
-  "["
-  "]"
-  "{"
-  "}"
-] @punctuation.bracket
-
-(identifier) @variable
-
-((identifier) @function.builtin
-  (#match? @function.builtin "^(__add|__addErrorContext|__all|__any|__appendContext|__attrNames|__attrValues|__bitAnd|__bitOr|__bitXor|__catAttrs|__compareVersions|__concatLists|__concatMap|__concatStringsSep|__deepSeq|__div|__elem|__elemAt|__fetchurl|__filter|__filterSource|__findFile|__foldl'|__fromJSON|__functionArgs|__genList|__genericClosure|__getAttr|__getContext|__getEnv|__hasAttr|__hasContext|__hashFile|__hashString|__head|__intersectAttrs|__isAttrs|__isBool|__isFloat|__isFunction|__isInt|__isList|__isPath|__isString|__langVersion|__length|__lessThan|__listToAttrs|__mapAttrs|__match|__mul|__parseDrvName|__partition|__path|__pathExists|__readDir|__readFile|__replaceStrings|__seq|__sort|__split|__splitVersion|__storePath|__stringLength|__sub|__substring|__tail|__toFile|__toJSON|__toPath|__toXML|__trace|__tryEval|__typeOf|__unsafeDiscardOutputDependency|__unsafeDiscardStringContext|__unsafeGetAttrPos|__valueSize|abort|baseNameOf|derivation|derivationStrict|dirOf|fetchGit|fetchMercurial|fetchTarball|fromTOML|import|isNull|map|placeholder|removeAttrs|scopedImport|throw|toString)$")
-  (#is-not? local))
-
-((identifier) @variable.builtin
- (#match? @variable.builtin "^(__currentSystem|__currentTime|__nixPath|__nixVersion|__storeDir|builtins|false|null|true)$")
- (#is-not? local))
--- a/crates/zed/src/languages/php/config.toml
+++ b/crates/zed/src/languages/php/config.toml
@@ -9,4 +9,3 @@ brackets = [
    { start = "(", end = ")", close = true, newline = true },
    { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] },
 ]
-collapsed_placeholder = "/* ... */"
--- a/crates/zed/src/languages/php/embedding.scm
+++ b/crates/zed/src/languages/php/embedding.scm
@@ -1,36 +0,0 @@
-(
-    (comment)* @context
-    .
-    [
-        (function_definition
-            "function" @name
-            name: (_) @name
-            body: (_
-                "{" @keep
-                "}" @keep) @collapse
-            )
-
-        (trait_declaration
-            "trait" @name
-            name: (_) @name)
-
-        (method_declaration
-            "function" @name
-            name: (_) @name
-            body: (_
-                "{" @keep
-                "}" @keep) @collapse
-            )
-
-        (interface_declaration
-            "interface" @name
-            name: (_) @name
-            )
-
-        (enum_declaration
-            "enum" @name
-            name: (_) @name
-            )
-
-        ] @item
-    )
--- a/crates/zed/src/languages/php/outline.scm
+++ b/crates/zed/src/languages/php/outline.scm
@@ -8,6 +8,8 @@
    name: (_) @name
    ) @item

+
+
 (method_declaration
    "function" @context
    name: (_) @name
@@ -22,8 +24,3 @@
    "enum" @context
    name: (_) @name
    ) @item
-
-(trait_declaration
-    "trait" @context
-    name: (_) @name
-    ) @item
--- a/crates/zed/src/languages/ruby/config.toml
+++ b/crates/zed/src/languages/ruby/config.toml
@@ -10,4 +10,3 @@ brackets = [
  { start = "\"", end = "\"", close = true, newline = false, not_in = ["comment", "string"] },
  { start = "'", end = "'", close = true, newline = false, not_in = ["comment", "string"] },
 ]
-collapsed_placeholder = "# ..."
--- a/crates/zed/src/languages/ruby/embedding.scm
+++ b/crates/zed/src/languages/ruby/embedding.scm
@@ -1,22 +0,0 @@
-(
-    (comment)* @context
-    .
-    [
-        (module
-            "module" @name
-            name: (_) @name)
-        (method
-            "def" @name
-            name: (_) @name
-            body: (body_statement) @collapse)
-        (class
-            "class" @name
-            name: (_) @name)
-        (singleton_method
-            "def" @name
-            object: (_) @name
-            "." @name
-            name: (_) @name
-            body: (body_statement) @collapse)
-        ] @item
-    )
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -45,7 +45,6 @@ use std::{
 use sum_tree::Bias;
 use terminal_view::{get_working_directory, TerminalSettings, TerminalView};
 use util::{
-    channel::ReleaseChannel,
    http::{self, HttpClient},
    paths::PathLikeWithPosition,
 };
@@ -137,7 +136,7 @@ fn main() {
        languages.set_executor(cx.background().clone());
        languages.set_language_server_download_dir(paths::LANGUAGES_DIR.clone());
        let languages = Arc::new(languages);
-        let node_runtime = NodeRuntime::instance(http.clone());
+        let node_runtime = NodeRuntime::instance(http.clone(), cx.background().to_owned());

        languages::init(languages.clone(), node_runtime.clone());
        let user_store = cx.add_model(|cx| UserStore::new(client.clone(), http.clone(), cx));
@@ -416,41 +415,22 @@ fn init_panic_hook(app: &App, installation_id: Option<String>) {
    panic::set_hook(Box::new(move |info| {
        let prior_panic_count = PANIC_COUNT.fetch_add(1, Ordering::SeqCst);
        if prior_panic_count > 0 {
-            // Give the panic-ing thread time to write the panic file
-            loop {
-                std::thread::yield_now();
-            }
-        }
-
-        let thread = thread::current();
-        let thread_name = thread.name().unwrap_or("<unnamed>");
-
-        let payload = info
-            .payload()
-            .downcast_ref::<&str>()
-            .map(|s| s.to_string())
-            .or_else(|| info.payload().downcast_ref::<String>().map(|s| s.clone()))
-            .unwrap_or_else(|| "Box<Any>".to_string());
-
-        if *util::channel::RELEASE_CHANNEL == ReleaseChannel::Dev {
-            let location = info.location().unwrap();
-            let backtrace = Backtrace::new();
-            eprintln!(
-                "Thread {:?} panicked with {:?} at {}:{}:{}\n{:?}",
-                thread_name,
-                payload,
-                location.file(),
-                location.line(),
-                location.column(),
-                backtrace,
-            );
-            std::process::exit(-1);
+            std::panic::resume_unwind(Box::new(()));
        }

        let app_version = ZED_APP_VERSION
            .or_else(|| platform.app_version().ok())
            .map_or("dev".to_string(), |v| v.to_string());

+        let thread = thread::current();
+        let thread = thread.name().unwrap_or("<unnamed>");
+
+        let payload = info.payload();
+        let payload = None
+            .or_else(|| payload.downcast_ref::<&str>().map(|s| s.to_string()))
+            .or_else(|| payload.downcast_ref::<String>().map(|s| s.clone()))
+            .unwrap_or_else(|| "Box<Any>".to_string());
+
        let backtrace = Backtrace::new();
        let mut backtrace = backtrace
            .frames()
@@ -467,7 +447,7 @@ fn init_panic_hook(app: &App, installation_id: Option<String>) {
        }

        let panic_data = Panic {
-            thread: thread_name.into(),
+            thread: thread.into(),
            payload: payload.into(),
            location_data: info.location().map(|location| LocationData {
                file: location.file().into(),
@@ -737,7 +717,7 @@ async fn watch_languages(_: Arc<dyn Fs>, _: Arc<LanguageRegistry>) -> Option<()>
 }

 #[cfg(not(debug_assertions))]
-fn watch_file_types(_fs: Arc<dyn Fs>, _cx: &mut AppContext) {}
+fn watch_file_types(fs: Arc<dyn Fs>, cx: &mut AppContext) {}

 fn connect_to_cli(
    server_name: &str,
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -545,6 +545,7 @@ pub fn handle_keymap_file_changes(
                            reload_keymaps(cx, &keymap_content);
                        }
                    })
+                    .detach();
                }));
            }
        }
@@ -2363,7 +2364,7 @@ mod tests {
        languages.set_executor(cx.background().clone());
        let languages = Arc::new(languages);
        let http = FakeHttpClient::with_404_response();
-        let node_runtime = NodeRuntime::instance(http);
+        let node_runtime = NodeRuntime::instance(http, cx.background().to_owned());
        languages::init(languages.clone(), node_runtime);
        for name in languages.language_names() {
            languages.language_for_name(&name);
--- a/docs/theme/generating-theme-types.md
+++ b/docs/theme/generating-theme-types.md
@@ -1,29 +0,0 @@
-[⬅ Back to Index](../index.md)
-
-# Generating Theme Types
-
-
-## How to generate theme types:
-
-Run a script
-
-```bash
-./script/build-theme-types
-```
-
-Types are generated in `styles/src/types/zed.ts`
-
-
-## How it works:
-
-1. Rust types
-
-    The `crates/theme` contains theme types.
-    Crate `schemars` used to generate a JSON schema from the theme structs.
-    Every struct that represent theme type has a `#[derive(JsonSchema)]` attribute.
-
-    Task lotaked at `crates/xtask/src/main.rs` generates a JSON schema from the theme structs.
-
-2. TypeScript types
-
-    Script `npm run build-types` from `styles` package generates TypeScript types from the JSON schema and saves them to `styles/src/types/zed.ts`.
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.71"
+channel = "1.70"
 components = [ "rustfmt" ]
 targets = [ "x86_64-apple-darwin", "aarch64-apple-darwin", "wasm32-wasi" ]
--- a/styles/src/style_tree/status_bar.ts
+++ b/styles/src/style_tree/status_bar.ts
@@ -44,7 +44,7 @@ export default function status_bar(): any {
                icon_spacing: 4,
                icon_width: 14,
                height: 18,
-                message: text(layer, "sans", { size: "xs" }),
+                message: text(layer, "sans"),
                icon_color: foreground(layer),
            },
            state: {
Author	SHA1	Message	Date
Max Brunsfeld	c1c67a5025	zed 0.97.6	2023-08-08 12:35:38 -07:00
Piotr Osiewicz	cbaf7cc972	Piotr/optimize search selections with a limit (#2831 ) /cc @nathansobo @maxbrunsfeld Release Notes: - Fixed scrollbar selections causing noticeable slowdowns with large quantities of selections.	2023-08-08 12:34:37 -07:00
Max Brunsfeld	c24c4063e3	Make LspAdapter::process_diagnostics synchronous (#2829 ) When editing rust code, the project diagnostics view sometimes fails to update, so that you have to close the view and re-open it to see the correct state. This PR fixes one possible cause of that problem. There was an async step in between receiving diagnostics from the language server and updating the diagnostics, due to an async call to `LspAdapter::process_diagnostics`. This could cause the following sequence of events to happen: 1. Rust-analyzer sends us new diagnostics for a file `a.rs` 2. We call `process_diagnostics` with those diagnostics 3. Rust-analyzer sends us a `WorkDoneProgress` message, indicating that the "flycheck" (aka `cargo check`) process has completed 4. We update the project diagnostics view due to this message. 5. The `process_diagnostics` call for `a.rs` completes 6. 💥 We have the new diagnostics for `a.rs`, but do not update the project diagnostics view again. This PR fixes this bug by simply making `process_diagnostics` synchronous. There is no I/O or expensive computation happening in that method. If we need to make it asynchronous in the future, we need to introduce a queue that ensures that `publishDiagnostics` and `workDoneProgress` messages are processed serially. Release Notes: - Fixed a bug where the project diagnostics view would sometimes fail to update properly when using Rust-analyzer.	2023-08-08 12:34:28 -07:00
Joseph T. Lyons	707da9bbbf	v0.97.x stable	2023-08-02 13:50:08 -04:00
Mikayla Maki	c826010008	Halve opacity on wrap guides (#2815 ) Wrap guides are a little too bright as is	2023-08-02 12:52:33 -04:00
Mikayla Maki	e928e1db4e	disable wrap guides in the assitant panel (#2814 ) Wrap guides do not look correct in the assistant due to it's current header styling. Disable them in that context now. Release Notes: - Fix a visual bug displaying when enabling wrap guides in the assistant.	2023-08-02 12:51:34 -04:00
Joseph T. Lyons	f5b1962b0e	zed 0.97.5	2023-07-28 18:13:24 -04:00
Mikayla Maki	0b13c6bc84	Make wrap guides respect scroll position (#2810 ) Release Notes: - Fixed a visual bug when scrolling with wrap guides active	2023-07-28 18:11:23 -04:00
Joseph T. Lyons	75365249cc	Update release action to choose between preview and stable URL in Discord announcements This is what ChatGPT told me, so we'll see.	2023-07-28 15:12:46 -04:00
Conrad Irwin	1c2f5162bc	Don't highlight project search matches either (#2807 ) @JosephTLyons this is probably worth merging alongside #2803 - vim: Fix a bug where focusing project search results unexpectedly entered visual mode	2023-07-28 14:31:22 -04:00
Conrad Irwin	209c68c85e	Fix jumping to definition in a new file (#2803 ) This is broken because vim currently sets settings only on the active editor. Fix this by correcting the range on the currently active editor. It would be nice (at some point) to refactor how vim sets settings, but that's for another day. Release Notes: - vim: Fix bug when jumping to definition in new file accidentally entered visual mode.	2023-07-28 14:30:58 -04:00
Mikayla Maki	023a617b30	zed 0.97.4	2023-07-27 16:36:49 -07:00
Mikayla Maki	286d302273	Make mode indicator follow vim enabled state (#2802 ) There was a minor visual bug introduced in https://github.com/zed-industries/zed/pull/2801, this PR corrects it. Release Notes: - N/A	2023-07-27 16:32:28 -07:00
Julia	4091a2004e	Avoid panic by accessing view handle by global in wrong window View handles are window specific but this global will be doing things in all windows, that would cause a panic when it attempted to update a status bar mode indicator in a background window Co-Authored-By: Mikayla Maki <mikayla@zed.dev>	2023-07-27 16:32:20 -07:00
Joseph T. Lyons	9d4a2bfb58	Publish preview releases to discord (#2800 ) Release Notes: - N/A	2023-07-27 15:26:36 -04:00
Joseph T. Lyons	33e58d47ac	zed 0.97.3	2023-07-27 14:30:24 -04:00
Mikayla Maki	056282f59b	Downgrade our dependency on treesitter-cpp (#2799 ) Our dependency on `tree-sitter-cpp` got upgraded to an incompatible version despite semver 'guarantees'. This pins the dependency onto the commit of version 0.20.0 Release Notes: - Restored language detection for C++ (preview-only)	2023-07-27 14:21:16 -04:00
Antonio Scandurra	553b9601d1	zed 0.97.2	2023-07-27 14:47:09 +02:00
Antonio Scandurra	a166f0b56a	Maintain cursor stack's position correctly when ascending the tree (#2795 ) This fixes a bug that could cause the cursor to incorrectly report its start when using `slice` or `seek_forward`, and then calling `prev`. We didn't notice this because we were not testing those three methods together. I suppose this could explain some of the panics we've observed because we do use `slice`/`seek_forward` followed by `prev` calls in production.	2023-07-27 14:45:38 +02:00
Joseph T. Lyons	badc2ec0e9	zed 0.97.1	2023-07-26 18:57:44 -04:00
Mikayla Maki	9c3c719ce0	Downgrade tree sitter elm to 5.6.4 (#2794 ) The tree sitter elm parser contains a c symbol which collides with other linked symbols. This PR downgrades the tree sitter elm parser to a version which doesn't have this problem. Release Notes: - Fixed crash when parsing elm files	2023-07-26 18:55:24 -04:00
Mikayla Maki	3594b5e2a8	Block extra drag events in original drag handlers (#2793 ) In https://github.com/zed-industries/zed/pull/2790 I added an extra drag event on mouse_up which signaled the end of a drag event, as mouse_up event themselves wouldn't reliably fire if users moved their mouse too quickly. This broke the assumptions of the terminal element. This PR adds filters to all current on_drag handlers which removes this new event. Release Notes: - Fixed a bug causing terminal links to never open (preview only) - Fixed a bug in terminal link detection causing it to miss files with a `-` in it	2023-07-26 18:20:50 -04:00
Joseph T. Lyons	99d0ed4a76	v0.97.x preview	2023-07-26 13:27:34 -04:00