Add 'include' field to extension manifest, for copying files when packaging

.github/ISSUE_TEMPLATE/0_feature_request.yml

@@ -19,7 +19,7 @@ body:
     id: environment
     attributes:
       label: Environment
-      description: Run the `copy system specs into clipboard` command palette action and paste the output in the field below. If you are unable to run the command, please include your Zed version and release channel, operating system and version, RAM amount, and architecture.
+      description: Run the `copy system specs into clipboard` command palette action and paste the output in the field below.
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/1_bug_report.yml

@@ -21,7 +21,7 @@ body:
     id: environment
     attributes:
       label: Environment
-      description: Run the `copy system specs into clipboard` command palette action and paste the output in the field below. If you are unable to run the command, please include your Zed version and release channel, operating system and version, RAM amount, and architecture.
+      description: Run the `copy system specs into clipboard` command palette action and paste the output in the field below.
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/2_crash_report.yml

@@ -20,7 +20,7 @@ body:
     id: environment
     attributes:
       label: Environment
-      description: Run the `copy system specs into clipboard` command palette action and paste the output in the field below. If you are unable to run the command, please include your Zed version and release channel, operating system and version, RAM amount, and architecture.
+      description: Run the `copy system specs into clipboard` command palette action and paste the output in the field below.
     validations:
       required: true
   - type: textarea

Cargo.toml

@@ -1,17 +1,24 @@
 [workspace]
 resolver = "2"
 members = [
+    "crates/activity_indicator",
     "crates/anthropic",
     "crates/assets",
+    "crates/assistant",
+    "crates/assistant_slash_command",
     "crates/assistant_tool",
     "crates/audio",
+    "crates/auto_update",
+    "crates/breadcrumbs",
     "crates/call",
     "crates/channel",
     "crates/cli",
     "crates/client",
     "crates/clock",
     "crates/collab",
+    "crates/collab_ui",
     "crates/collections",
+    "crates/command_palette",
     "crates/command_palette_hooks",
     "crates/context_servers",
     "crates/copilot",
@@ -24,8 +31,10 @@ members = [
     "crates/extension_api",
     "crates/extension_cli",
     "crates/extension_host",
+    "crates/extensions_ui",
     "crates/feature_flags",
     "crates/feedback",
+    "crates/file_finder",
     "crates/file_icons",
     "crates/fs",
     "crates/fsevent",
@@ -40,9 +49,13 @@ members = [
     "crates/http_client",
     "crates/image_viewer",
     "crates/indexed_docs",
+    "crates/inline_completion_button",
     "crates/install_cli",
     "crates/journal",
     "crates/language",
+    "crates/language_model",
+    "crates/language_selector",
+    "crates/language_tools",
     "crates/languages",
     "crates/live_kit_client",
     "crates/live_kit_server",
@@ -57,26 +70,35 @@ members = [
     "crates/ollama",
     "crates/open_ai",
     "crates/outline",
+    "crates/outline_panel",
     "crates/paths",
     "crates/picker",
     "crates/prettier",
     "crates/project",
+    "crates/project_panel",
+    "crates/project_symbols",
     "crates/proto",
+    "crates/quick_action_bar",
+    "crates/recent_projects",
     "crates/refineable",
     "crates/refineable/derive_refineable",
     "crates/release_channel",
     "crates/remote",
     "crates/remote_server",
+    "crates/repl",
     "crates/reqwest_client",
     "crates/rich_text",
     "crates/rope",
     "crates/rpc",
     "crates/search",
+    "crates/semantic_index",
     "crates/semantic_version",
     "crates/session",
     "crates/settings",
+    "crates/settings_ui",
     "crates/snippet",
     "crates/snippet_provider",
+    "crates/snippets_ui",
     "crates/sqlez",
     "crates/sqlez_macros",
     "crates/story",
@@ -84,24 +106,31 @@ members = [
     "crates/sum_tree",
     "crates/supermaven",
     "crates/supermaven_api",
+    "crates/tab_switcher",
     "crates/task",
     "crates/tasks_ui",
     "crates/telemetry_events",
     "crates/terminal",
+    "crates/terminal_view",
     "crates/text",
     "crates/theme",
     "crates/theme_importer",
+    "crates/theme_selector",
     "crates/time_format",
+    "crates/title_bar",
+    "crates/toolchain_selector",
     "crates/ui",
     "crates/ui_input",
     "crates/ui_macros",
     "crates/reqwest_client",
     "crates/util",
+    "crates/vcs_menu",
+    "crates/vim",
+    "crates/welcome",
     "crates/workspace",
     "crates/worktree",
     "crates/zed",
     "crates/zed_actions",
-    "crates/zed_common",
 
     #
     # Extensions
@@ -148,18 +177,25 @@ default-members = ["crates/zed"]
 # Workspace member crates
 #
 
+activity_indicator = { path = "crates/activity_indicator" }
 ai = { path = "crates/ai" }
 anthropic = { path = "crates/anthropic" }
 assets = { path = "crates/assets" }
+assistant = { path = "crates/assistant" }
+assistant_slash_command = { path = "crates/assistant_slash_command" }
 assistant_tool = { path = "crates/assistant_tool" }
 audio = { path = "crates/audio" }
+auto_update = { path = "crates/auto_update" }
+breadcrumbs = { path = "crates/breadcrumbs" }
 call = { path = "crates/call" }
 channel = { path = "crates/channel" }
 cli = { path = "crates/cli" }
 client = { path = "crates/client" }
 clock = { path = "crates/clock" }
 collab = { path = "crates/collab" }
+collab_ui = { path = "crates/collab_ui" }
 collections = { path = "crates/collections" }
+command_palette = { path = "crates/command_palette" }
 command_palette_hooks = { path = "crates/command_palette_hooks" }
 context_servers = { path = "crates/context_servers" }
 copilot = { path = "crates/copilot" }
@@ -168,8 +204,10 @@ diagnostics = { path = "crates/diagnostics" }
 editor = { path = "crates/editor" }
 extension = { path = "crates/extension" }
 extension_host = { path = "crates/extension_host" }
+extensions_ui = { path = "crates/extensions_ui" }
 feature_flags = { path = "crates/feature_flags" }
 feedback = { path = "crates/feedback" }
+file_finder = { path = "crates/file_finder" }
 file_icons = { path = "crates/file_icons" }
 fs = { path = "crates/fs" }
 fsevent = { path = "crates/fsevent" }
@@ -184,9 +222,13 @@ html_to_markdown = { path = "crates/html_to_markdown" }
 http_client = { path = "crates/http_client" }
 image_viewer = { path = "crates/image_viewer" }
 indexed_docs = { path = "crates/indexed_docs" }
+inline_completion_button = { path = "crates/inline_completion_button" }
 install_cli = { path = "crates/install_cli" }
 journal = { path = "crates/journal" }
 language = { path = "crates/language" }
+language_model = { path = "crates/language_model" }
+language_selector = { path = "crates/language_selector" }
+language_tools = { path = "crates/language_tools" }
 languages = { path = "crates/languages" }
 live_kit_client = { path = "crates/live_kit_client" }
 live_kit_server = { path = "crates/live_kit_server" }
@@ -201,27 +243,36 @@ notifications = { path = "crates/notifications" }
 ollama = { path = "crates/ollama" }
 open_ai = { path = "crates/open_ai" }
 outline = { path = "crates/outline" }
+outline_panel = { path = "crates/outline_panel" }
 paths = { path = "crates/paths" }
 picker = { path = "crates/picker" }
 plugin = { path = "crates/plugin" }
 plugin_macros = { path = "crates/plugin_macros" }
 prettier = { path = "crates/prettier" }
 project = { path = "crates/project" }
+project_panel = { path = "crates/project_panel" }
+project_symbols = { path = "crates/project_symbols" }
 proto = { path = "crates/proto" }
+quick_action_bar = { path = "crates/quick_action_bar" }
+recent_projects = { path = "crates/recent_projects" }
 refineable = { path = "crates/refineable" }
 release_channel = { path = "crates/release_channel" }
 remote = { path = "crates/remote" }
 remote_server = { path = "crates/remote_server" }
+repl = { path = "crates/repl" }
 reqwest_client = { path = "crates/reqwest_client" }
 rich_text = { path = "crates/rich_text" }
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
 search = { path = "crates/search" }
+semantic_index = { path = "crates/semantic_index" }
 semantic_version = { path = "crates/semantic_version" }
 session = { path = "crates/session" }
 settings = { path = "crates/settings" }
+settings_ui = { path = "crates/settings_ui" }
 snippet = { path = "crates/snippet" }
 snippet_provider = { path = "crates/snippet_provider" }
+snippets_ui = { path = "crates/snippets_ui" }
 sqlez = { path = "crates/sqlez" }
 sqlez_macros = { path = "crates/sqlez_macros" }
 story = { path = "crates/story" }
@@ -229,23 +280,30 @@ storybook = { path = "crates/storybook" }
 sum_tree = { path = "crates/sum_tree" }
 supermaven = { path = "crates/supermaven" }
 supermaven_api = { path = "crates/supermaven_api" }
+tab_switcher = { path = "crates/tab_switcher" }
 task = { path = "crates/task" }
 tasks_ui = { path = "crates/tasks_ui" }
 telemetry_events = { path = "crates/telemetry_events" }
 terminal = { path = "crates/terminal" }
+terminal_view = { path = "crates/terminal_view" }
 text = { path = "crates/text" }
 theme = { path = "crates/theme" }
 theme_importer = { path = "crates/theme_importer" }
+theme_selector = { path = "crates/theme_selector" }
 time_format = { path = "crates/time_format" }
+title_bar = { path = "crates/title_bar" }
+toolchain_selector = { path = "crates/toolchain_selector" }
 ui = { path = "crates/ui" }
 ui_input = { path = "crates/ui_input" }
 ui_macros = { path = "crates/ui_macros" }
 util = { path = "crates/util" }
+vcs_menu = { path = "crates/vcs_menu" }
+vim = { path = "crates/vim" }
+welcome = { path = "crates/welcome" }
 workspace = { path = "crates/workspace" }
 worktree = { path = "crates/worktree" }
 zed = { path = "crates/zed" }
 zed_actions = { path = "crates/zed_actions" }
-zed_common = { path = "crates/zed_common" }
 
 #
 # External crates

assets/settings/default.json

@@ -193,9 +193,6 @@
   // Controls whether inline completions are shown immediately (true)
   // or manually by triggering `editor::ShowInlineCompletion` (false).
   "show_inline_completions": true,
-  // Controls whether inline completions are shown in a given language scope.
-  // Example: ["string", "comment"]
-  "inline_completions_disabled_in": [],
   // Whether to show tabs and spaces in the editor.
   // This setting can take three values:
   //

crates/activity_indicator/Cargo.toml

@@ -0,0 +1,30 @@
+[package]
+name = "activity_indicator"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/activity_indicator.rs"
+doctest = false
+
+[dependencies]
+anyhow.workspace = true
+auto_update.workspace = true
+editor.workspace = true
+extension_host.workspace = true
+futures.workspace = true
+gpui.workspace = true
+language.workspace = true
+project.workspace = true
+smallvec.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
+
+[dev-dependencies]
+editor = { workspace = true, features = ["test-support"] }

crates/activity_indicator/LICENSE-GPL

@@ -0,0 +1 @@
+../../LICENSE-GPL

crates/activity_indicator/src/activity_indicator.rs

@@ -1,4 +1,4 @@
-use crate::auto_update::{AutoUpdateStatus, AutoUpdater, DismissErrorMessage};
+use auto_update::{AutoUpdateStatus, AutoUpdater, DismissErrorMessage};
 use editor::Editor;
 use extension_host::ExtensionStore;
 use futures::StreamExt;
@@ -7,8 +7,9 @@ use gpui::{
     InteractiveElement as _, Model, ParentElement as _, Render, SharedString,
     StatefulInteractiveElement, Styled, Transformation, View, ViewContext, VisualContext as _,
 };
-use language::{LanguageRegistry, LanguageServerBinaryStatus, LanguageServerId};
-use lsp::LanguageServerName;
+use language::{
+    LanguageRegistry, LanguageServerBinaryStatus, LanguageServerId, LanguageServerName,
+};
 use project::{EnvironmentErrorMessage, LanguageServerProgress, Project, WorktreeId};
 use smallvec::SmallVec;
 use std::{cmp::Reverse, fmt::Write, sync::Arc, time::Duration};

crates/assistant/Cargo.toml

@@ -0,0 +1,106 @@
+[package]
+name = "assistant"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/assistant.rs"
+doctest = false
+
+[features]
+test-support = [
+    "editor/test-support",
+    "language/test-support",
+    "project/test-support",
+    "text/test-support",
+]
+
+[dependencies]
+anthropic = { workspace = true, features = ["schemars"] }
+anyhow.workspace = true
+assets.workspace = true
+assistant_slash_command.workspace = true
+assistant_tool.workspace = true
+async-watch.workspace = true
+cargo_toml.workspace = true
+chrono.workspace = true
+client.workspace = true
+clock.workspace = true
+collections.workspace = true
+command_palette_hooks.workspace = true
+context_servers.workspace = true
+db.workspace = true
+editor.workspace = true
+feature_flags.workspace = true
+fs.workspace = true
+futures.workspace = true
+fuzzy.workspace = true
+globset.workspace = true
+gpui.workspace = true
+handlebars.workspace = true
+heed.workspace = true
+html_to_markdown.workspace = true
+http_client.workspace = true
+indexed_docs.workspace = true
+indoc.workspace = true
+language.workspace = true
+language_model.workspace = true
+log.workspace = true
+lsp.workspace = true
+markdown.workspace = true
+menu.workspace = true
+multi_buffer.workspace = true
+ollama = { workspace = true, features = ["schemars"] }
+open_ai = { workspace = true, features = ["schemars"] }
+ordered-float.workspace = true
+parking_lot.workspace = true
+paths.workspace = true
+picker.workspace = true
+project.workspace = true
+proto.workspace = true
+regex.workspace = true
+release_channel.workspace = true
+rope.workspace = true
+rpc.workspace = true
+schemars.workspace = true
+search.workspace = true
+semantic_index.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+settings.workspace = true
+similar.workspace = true
+smallvec.workspace = true
+smol.workspace = true
+strum.workspace = true
+telemetry_events.workspace = true
+terminal.workspace = true
+terminal_view.workspace = true
+text.workspace = true
+theme.workspace = true
+toml.workspace = true
+ui.workspace = true
+util.workspace = true
+uuid.workspace = true
+workspace.workspace = true
+zed_actions.workspace = true
+
+[dev-dependencies]
+ctor.workspace = true
+editor = { workspace = true, features = ["test-support"] }
+env_logger.workspace = true
+language = { workspace = true, features = ["test-support"] }
+language_model = { workspace = true, features = ["test-support"] }
+languages = { workspace = true, features = ["test-support"] }
+log.workspace = true
+pretty_assertions.workspace = true
+project = { workspace = true, features = ["test-support"] }
+rand.workspace = true
+serde_json_lenient.workspace = true
+text = { workspace = true, features = ["test-support"] }
+tree-sitter-md.workspace = true
+unindent.workspace = true

crates/assistant/LICENSE-GPL

@@ -0,0 +1 @@
+../../LICENSE-GPL

crates/assistant/src/assistant.rs

@@ -18,15 +18,11 @@ mod terminal_inline_assistant;
 mod tool_working_set;
 mod tools;
 
-pub use crate::assistant::slash_command_working_set::{SlashCommandId, SlashCommandWorkingSet};
-pub use crate::assistant::tool_working_set::{ToolId, ToolWorkingSet};
-use crate::assistant_slash_command::SlashCommandRegistry;
-use crate::language_model::{
-    LanguageModelId, LanguageModelProviderId, LanguageModelRegistry, LanguageModelResponseMessage,
-};
-use crate::semantic_index::{CloudEmbeddingProvider, SemanticDb};
+pub use crate::slash_command_working_set::{SlashCommandId, SlashCommandWorkingSet};
+pub use crate::tool_working_set::{ToolId, ToolWorkingSet};
 pub use assistant_panel::{AssistantPanel, AssistantPanelEvent};
 use assistant_settings::AssistantSettings;
+use assistant_slash_command::SlashCommandRegistry;
 use assistant_tool::ToolRegistry;
 use client::{proto, Client};
 use command_palette_hooks::CommandPaletteFilter;
@@ -38,10 +34,14 @@ use gpui::impl_actions;
 use gpui::{actions, AppContext, Global, SharedString, UpdateGlobal};
 use indexed_docs::IndexedDocsRegistry;
 pub(crate) use inline_assistant::*;
+use language_model::{
+    LanguageModelId, LanguageModelProviderId, LanguageModelRegistry, LanguageModelResponseMessage,
+};
 pub(crate) use model_selector::*;
 pub use patch::*;
 pub use prompts::PromptBuilder;
 use prompts::PromptLoadingParams;
+use semantic_index::{CloudEmbeddingProvider, SemanticDb};
 use serde::{Deserialize, Serialize};
 use settings::{update_settings_file, Settings, SettingsStore};
 use slash_command::search_command::SearchSlashCommandFeatureFlag;
@@ -55,8 +55,8 @@ use std::sync::Arc;
 pub(crate) use streaming_diff::*;
 use util::ResultExt;
 
-use crate::assistant::slash_command::streaming_example_command;
-use crate::assistant::slash_command_settings::SlashCommandSettings;
+use crate::slash_command::streaming_example_command;
+use crate::slash_command_settings::SlashCommandSettings;
 
 actions!(
     assistant,
@@ -236,7 +236,7 @@ pub fn init(
     context_store::init(&client.clone().into());
     prompt_library::init(cx);
     init_language_model_settings(cx);
-    crate::assistant_slash_command::init(cx);
+    assistant_slash_command::init(cx);
     assistant_tool::init(cx);
     assistant_panel::init(cx);
     context_servers::init(cx);
@@ -293,10 +293,10 @@ fn init_language_model_settings(cx: &mut AppContext) {
         .detach();
     cx.subscribe(
         &LanguageModelRegistry::global(cx),
-        |_, event: &crate::language_model::Event, cx| match event {
-            crate::language_model::Event::ProviderStateChanged
-            | crate::language_model::Event::AddedProvider(_)
-            | crate::language_model::Event::RemovedProvider(_) => {
+        |_, event: &language_model::Event, cx| match event {
+            language_model::Event::ProviderStateChanged
+            | language_model::Event::AddedProvider(_)
+            | language_model::Event::RemovedProvider(_) => {
                 update_active_language_model_from_settings(cx);
             }
             _ => {}

crates/assistant/src/assistant_panel.rs

@@ -1,7 +1,7 @@
-use crate::assistant::slash_command::file_command::codeblock_fence_for_path;
-use crate::assistant::slash_command_working_set::SlashCommandWorkingSet;
-use crate::assistant::ToolWorkingSet;
-use crate::assistant::{
+use crate::slash_command::file_command::codeblock_fence_for_path;
+use crate::slash_command_working_set::SlashCommandWorkingSet;
+use crate::ToolWorkingSet;
+use crate::{
     assistant_settings::{AssistantDockPosition, AssistantSettings},
     humanize_token_count,
     prompt_library::open_prompt_library,
@@ -21,14 +21,8 @@ use crate::assistant::{
     ParsedSlashCommand, PendingSlashCommandStatus, QuoteSelection, RemoteContextMetadata,
     RequestType, SavedContextMetadata, Split, ToggleFocus, ToggleModelSelector,
 };
-use crate::assistant_slash_command::{SlashCommand, SlashCommandOutputSection};
-use crate::language_model::{
-    provider::cloud::PROVIDER_ID, LanguageModelProvider, LanguageModelProviderId,
-    LanguageModelRegistry, Role,
-};
-use crate::language_model::{LanguageModelImage, LanguageModelToolUse};
-use crate::terminal_view::{terminal_panel::TerminalPanel, TerminalView};
 use anyhow::Result;
+use assistant_slash_command::{SlashCommand, SlashCommandOutputSection};
 use client::{proto, zed_urls, Client, Status};
 use collections::{hash_map, BTreeSet, HashMap, HashSet};
 use editor::{
@@ -56,6 +50,11 @@ use indexed_docs::IndexedDocsStore;
 use language::{
     language_settings::SoftWrap, BufferSnapshot, LanguageRegistry, LspAdapterDelegate, ToOffset,
 };
+use language_model::{
+    provider::cloud::PROVIDER_ID, LanguageModelProvider, LanguageModelProviderId,
+    LanguageModelRegistry, Role,
+};
+use language_model::{LanguageModelImage, LanguageModelToolUse};
 use multi_buffer::MultiBufferRow;
 use picker::{Picker, PickerDelegate};
 use project::lsp_store::LocalLspAdapterDelegate;
@@ -74,6 +73,7 @@ use std::{
     sync::Arc,
     time::Duration,
 };
+use terminal_view::{terminal_panel::TerminalPanel, TerminalView};
 use text::SelectionGoal;
 use ui::{
     prelude::*,
@@ -447,7 +447,7 @@ impl AssistantPanel {
                     );
                 let _pane = cx.view().clone();
                 let right_children = h_flex()
-                    .gap(DynamicSpacing::Base02.rems(cx))
+                    .gap(Spacing::XSmall.rems(cx))
                     .child(
                         IconButton::new("new-chat", IconName::Plus)
                             .on_click(
@@ -503,16 +503,16 @@ impl AssistantPanel {
             cx.subscribe(&context_store, Self::handle_context_store_event),
             cx.subscribe(
                 &LanguageModelRegistry::global(cx),
-                |this, _, event: &crate::language_model::Event, cx| match event {
-                    crate::language_model::Event::ActiveModelChanged => {
+                |this, _, event: &language_model::Event, cx| match event {
+                    language_model::Event::ActiveModelChanged => {
                         this.completion_provider_changed(cx);
                     }
-                    crate::language_model::Event::ProviderStateChanged => {
+                    language_model::Event::ProviderStateChanged => {
                         this.ensure_authenticated(cx);
                         cx.notify()
                     }
-                    crate::language_model::Event::AddedProvider(_)
-                    | crate::language_model::Event::RemovedProvider(_) => {
+                    language_model::Event::AddedProvider(_)
+                    | language_model::Event::RemovedProvider(_) => {
                         this.ensure_authenticated(cx);
                     }
                 },
@@ -4752,14 +4752,14 @@ impl ConfigurationView {
 
         let registry_subscription = cx.subscribe(
             &LanguageModelRegistry::global(cx),
-            |this, _, event: &crate::language_model::Event, cx| match event {
-                crate::language_model::Event::AddedProvider(provider_id) => {
+            |this, _, event: &language_model::Event, cx| match event {
+                language_model::Event::AddedProvider(provider_id) => {
                     let provider = LanguageModelRegistry::read_global(cx).provider(provider_id);
                     if let Some(provider) = provider {
                         this.add_configuration_view(&provider, cx);
                     }
                 }
-                crate::language_model::Event::RemovedProvider(provider_id) => {
+                language_model::Event::RemovedProvider(provider_id) => {
                     this.remove_configuration_view(provider_id);
                 }
                 _ => {}
@@ -4838,7 +4838,7 @@ impl ConfigurationView {
             )
             .child(
                 div()
-                    .p(DynamicSpacing::Base08.rems(cx))
+                    .p(Spacing::Large.rems(cx))
                     .bg(cx.theme().colors().surface_background)
                     .border_1()
                     .border_color(cx.theme().colors().border_variant)
@@ -4872,7 +4872,7 @@ impl Render for ConfigurationView {
             .overflow_y_scroll()
             .child(
                 v_flex()
-                    .p(DynamicSpacing::Base16.rems(cx))
+                    .p(Spacing::XXLarge.rems(cx))
                     .border_b_1()
                     .border_color(cx.theme().colors().border)
                     .gap_1()
@@ -4886,7 +4886,7 @@ impl Render for ConfigurationView {
             )
             .child(
                 v_flex()
-                    .p(DynamicSpacing::Base16.rems(cx))
+                    .p(Spacing::XXLarge.rems(cx))
                     .mt_1()
                     .gap_6()
                     .flex_1()

crates/assistant/src/assistant_settings.rs

@@ -1,17 +1,17 @@
 use std::sync::Arc;
 
-use crate::language_model::provider::open_ai;
-use crate::language_model::settings::{
-    AnthropicSettingsContent, AnthropicSettingsContentV1, OllamaSettingsContent,
-    OpenAiSettingsContent, OpenAiSettingsContentV1, VersionedAnthropicSettingsContent,
-    VersionedOpenAiSettingsContent,
-};
-use crate::language_model::{settings::AllLanguageModelSettings, CloudModel, LanguageModel};
 use ::open_ai::Model as OpenAiModel;
 use anthropic::Model as AnthropicModel;
 use feature_flags::FeatureFlagAppExt;
 use fs::Fs;
 use gpui::{AppContext, Pixels};
+use language_model::provider::open_ai;
+use language_model::settings::{
+    AnthropicSettingsContent, AnthropicSettingsContentV1, OllamaSettingsContent,
+    OpenAiSettingsContent, OpenAiSettingsContentV1, VersionedAnthropicSettingsContent,
+    VersionedOpenAiSettingsContent,
+};
+use language_model::{settings::AllLanguageModelSettings, CloudModel, LanguageModel};
 use ollama::Model as OllamaModel;
 use schemars::{schema::Schema, JsonSchema};
 use serde::{Deserialize, Serialize};

crates/assistant/src/context.rs

@@ -1,17 +1,17 @@
 #[cfg(test)]
 mod context_tests;
 
-use crate::assistant::slash_command_working_set::SlashCommandWorkingSet;
-use crate::assistant::ToolWorkingSet;
-use crate::assistant::{
+use crate::slash_command_working_set::SlashCommandWorkingSet;
+use crate::ToolWorkingSet;
+use crate::{
     prompts::PromptBuilder,
     slash_command::{file_command::FileCommandMetadata, SlashCommandLine},
     AssistantEdit, AssistantPatch, AssistantPatchStatus, MessageId, MessageStatus,
 };
-use crate::assistant_slash_command::{
+use anyhow::{anyhow, Context as _, Result};
+use assistant_slash_command::{
     SlashCommandContent, SlashCommandEvent, SlashCommandOutputSection, SlashCommandResult,
 };
-use anyhow::{anyhow, Context as _, Result};
 use client::{self, proto, telemetry::Telemetry};
 use clock::ReplicaId;
 use collections::{HashMap, HashSet};
@@ -23,7 +23,8 @@ use gpui::{
     Subscription, Task,
 };
 
-use crate::language_model::{
+use language::{AnchorRangeExt, Bias, Buffer, LanguageRegistry, OffsetRangeExt, Point, ToOffset};
+use language_model::{
     logging::report_assistant_event,
     provider::cloud::{MaxMonthlySpendReachedError, PaymentRequiredError},
     LanguageModel, LanguageModelCacheConfiguration, LanguageModelCompletionEvent,
@@ -31,7 +32,6 @@ use crate::language_model::{
     LanguageModelRequestTool, LanguageModelToolResult, LanguageModelToolUse, MessageContent, Role,
     StopReason,
 };
-use language::{AnchorRangeExt, Bias, Buffer, LanguageRegistry, OffsetRangeExt, Point, ToOffset};
 use open_ai::Model as OpenAiModel;
 use paths::contexts_dir;
 use project::Project;
@@ -728,7 +728,7 @@ impl Context {
                 .filter_map(|section| {
                     if section.is_valid(buffer) {
                         let range = section.range.to_offset(buffer);
-                        Some(crate::assistant_slash_command::SlashCommandOutputSection {
+                        Some(assistant_slash_command::SlashCommandOutputSection {
                             range,
                             icon: section.icon,
                             label: section.label.clone(),
@@ -1654,7 +1654,7 @@ impl Context {
                     range: patch_start..patch_start,
                     title: String::new().into(),
                     edits: Default::default(),
-                    status: crate::assistant::AssistantPatchStatus::Pending,
+                    status: crate::AssistantPatchStatus::Pending,
                 };
 
                 while let Some(tag) = tags.next() {
@@ -2503,17 +2503,17 @@ impl Context {
                             if let Some(image) = image.clone().now_or_never().flatten() {
                                 request_message
                                     .content
-                                    .push(crate::language_model::MessageContent::Image(image));
+                                    .push(language_model::MessageContent::Image(image));
                             }
                         }
                         Content::ToolUse { tool_use, .. } => {
-                            request_message.content.push(
-                                crate::language_model::MessageContent::ToolUse(tool_use.clone()),
-                            );
+                            request_message
+                                .content
+                                .push(language_model::MessageContent::ToolUse(tool_use.clone()));
                         }
                         Content::ToolResult { tool_use_id, .. } => {
                             request_message.content.push(
-                                crate::language_model::MessageContent::ToolResult(
+                                language_model::MessageContent::ToolResult(
                                     LanguageModelToolResult {
                                         tool_use_id: tool_use_id.to_string(),
                                         is_error: false,
@@ -3239,7 +3239,7 @@ pub struct SavedContext {
     pub messages: Vec<SavedMessage>,
     pub summary: String,
     pub slash_command_output_sections:
-        Vec<crate::assistant_slash_command::SlashCommandOutputSection<usize>>,
+        Vec<assistant_slash_command::SlashCommandOutputSection<usize>>,
 }
 
 impl SavedContext {
@@ -3380,8 +3380,7 @@ struct SavedContextV0_3_0 {
     messages: Vec<SavedMessagePreV0_4_0>,
     message_metadata: HashMap<SavedMessageIdPreV0_4_0, SavedMessageMetadataPreV0_4_0>,
     summary: String,
-    slash_command_output_sections:
-        Vec<crate::assistant_slash_command::SlashCommandOutputSection<usize>>,
+    slash_command_output_sections: Vec<assistant_slash_command::SlashCommandOutputSection<usize>>,
 }
 
 impl SavedContextV0_3_0 {

crates/assistant/src/context/context_tests.rs

@@ -1,17 +1,16 @@
 use super::{AssistantEdit, MessageCacheMetadata};
-use crate::assistant::slash_command_working_set::SlashCommandWorkingSet;
-use crate::assistant::ToolWorkingSet;
-use crate::assistant::{
+use crate::slash_command_working_set::SlashCommandWorkingSet;
+use crate::ToolWorkingSet;
+use crate::{
     assistant_panel, prompt_library, slash_command::file_command, AssistantEditKind, CacheStatus,
     Context, ContextEvent, ContextId, ContextOperation, InvokedSlashCommandId, MessageId,
     MessageStatus, PromptBuilder,
 };
-use crate::assistant_slash_command::{
+use anyhow::Result;
+use assistant_slash_command::{
     ArgumentCompletion, SlashCommand, SlashCommandContent, SlashCommandEvent, SlashCommandOutput,
     SlashCommandOutputSection, SlashCommandRegistry, SlashCommandResult,
 };
-use crate::language_model::{LanguageModelCacheConfiguration, LanguageModelRegistry, Role};
-use anyhow::Result;
 use collections::{HashMap, HashSet};
 use fs::FakeFs;
 use futures::{
@@ -20,6 +19,7 @@ use futures::{
 };
 use gpui::{AppContext, Model, SharedString, Task, TestAppContext, WeakView};
 use language::{Buffer, BufferSnapshot, LanguageRegistry, LspAdapterDelegate};
+use language_model::{LanguageModelCacheConfiguration, LanguageModelRegistry, Role};
 use parking_lot::Mutex;
 use pretty_assertions::assert_eq;
 use project::Project;
@@ -399,7 +399,7 @@ async fn test_slash_commands(cx: &mut TestAppContext) {
             "src": {
                 "lib.rs": "fn one() -> usize { 1 }",
                 "main.rs": "
-                    use crate::assistant::one;
+                    use crate::one;
                     fn main() { one(); }
                 ".unindent(),
             }

crates/assistant/src/context_store.rs

@@ -1,9 +1,9 @@
-use crate::assistant::slash_command::context_server_command;
-use crate::assistant::{
+use crate::slash_command::context_server_command;
+use crate::{
     prompts::PromptBuilder, slash_command_working_set::SlashCommandWorkingSet, Context,
     ContextEvent, ContextId, ContextOperation, ContextVersion, SavedContext, SavedContextMetadata,
 };
-use crate::assistant::{tools, SlashCommandId, ToolId, ToolWorkingSet};
+use crate::{tools, SlashCommandId, ToolId, ToolWorkingSet};
 use anyhow::{anyhow, Context as _, Result};
 use client::{proto, telemetry::Telemetry, Client, TypedEnvelope};
 use clock::ReplicaId;

crates/assistant/src/inline_assistant.rs

@@ -1,13 +1,8 @@
-use crate::assistant::{
+use crate::{
     assistant_settings::AssistantSettings, humanize_token_count, prompts::PromptBuilder,
     AssistantPanel, AssistantPanelEvent, CharOperation, CycleNextInlineAssist,
     CyclePreviousInlineAssist, LineDiff, LineOperation, ModelSelector, RequestType, StreamingDiff,
 };
-use crate::language_model::{
-    logging::report_assistant_event, LanguageModel, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, LanguageModelTextStream, Role,
-};
-use crate::terminal_view::terminal_panel::TerminalPanel;
 use anyhow::{anyhow, Context as _, Result};
 use client::{telemetry::Telemetry, ErrorExt};
 use collections::{hash_map, HashMap, HashSet, VecDeque};
@@ -34,6 +29,10 @@ use gpui::{
     TextStyle, UpdateGlobal, View, ViewContext, WeakView, WindowContext,
 };
 use language::{Buffer, IndentKind, Point, Selection, TransactionId};
+use language_model::{
+    logging::report_assistant_event, LanguageModel, LanguageModelRegistry, LanguageModelRequest,
+    LanguageModelRequestMessage, LanguageModelTextStream, Role,
+};
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
 use project::{CodeAction, ProjectTransaction};
@@ -51,6 +50,7 @@ use std::{
     time::{Duration, Instant},
 };
 use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
+use terminal_view::terminal_panel::TerminalPanel;
 use text::{OffsetRangeExt, ToPoint as _};
 use theme::ThemeSettings;
 use ui::{
@@ -1682,7 +1682,7 @@ impl PromptEditor {
     }
 
     fn placeholder_text(codegen: &Codegen, cx: &WindowContext) -> String {
-        let context_keybinding = text_for_action(&crate::assistant::ToggleFocus, cx)
+        let context_keybinding = text_for_action(&crate::ToggleFocus, cx)
             .map(|keybinding| format!(" • {keybinding} for context"))
             .unwrap_or_default();
 
@@ -2562,7 +2562,6 @@ pub struct CodegenAlternative {
     line_operations: Vec<LineOperation>,
     request: Option<LanguageModelRequest>,
     elapsed_time: Option<f64>,
-    completion: Option<String>,
     message_id: Option<String>,
 }
 
@@ -2638,7 +2637,6 @@ impl CodegenAlternative {
             range,
             request: None,
             elapsed_time: None,
-            completion: None,
         }
     }
 
@@ -2851,9 +2849,6 @@ impl CodegenAlternative {
         self.diff = Diff::default();
         self.status = CodegenStatus::Pending;
         let mut edit_start = self.range.start.to_offset(&snapshot);
-        let completion = Arc::new(Mutex::new(String::new()));
-        let completion_clone = completion.clone();
-
         self.generation = cx.spawn(|codegen, mut cx| {
             async move {
                 let stream = stream.await;
@@ -2885,7 +2880,6 @@ impl CodegenAlternative {
                                         response_latency = Some(request_start.elapsed());
                                     }
                                     let chunk = chunk?;
-                                    completion_clone.lock().push_str(&chunk);
 
                                     let mut lines = chunk.split('\n').peekable();
                                     while let Some(line) = lines.next() {
@@ -3055,7 +3049,6 @@ impl CodegenAlternative {
                             this.status = CodegenStatus::Done;
                         }
                         this.elapsed_time = Some(elapsed_time);
-                        this.completion = Some(completion.lock().clone());
                         cx.emit(CodegenEvent::Finished);
                         cx.notify();
                     })
@@ -3549,7 +3542,6 @@ fn merge_ranges(ranges: &mut Vec<Range<Anchor>>, buffer: &MultiBufferSnapshot) {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::language_model::LanguageModelRegistry;
     use futures::stream::{self};
     use gpui::{Context, TestAppContext};
     use indoc::indoc;
@@ -3557,6 +3549,7 @@ mod tests {
         language_settings, tree_sitter_rust, Buffer, Language, LanguageConfig, LanguageMatcher,
         Point,
     };
+    use language_model::LanguageModelRegistry;
     use rand::prelude::*;
     use serde::Serialize;
     use settings::SettingsStore;
@@ -3570,7 +3563,7 @@ mod tests {
     #[gpui::test(iterations = 10)]
     async fn test_transform_autoindent(cx: &mut TestAppContext, mut rng: StdRng) {
         cx.set_global(cx.update(SettingsStore::test));
-        cx.update(crate::language_model::LanguageModelRegistry::test);
+        cx.update(language_model::LanguageModelRegistry::test);
         cx.update(language_settings::init);
 
         let text = indoc! {"

crates/assistant/src/model_selector.rs

@@ -1,12 +1,12 @@
 use feature_flags::ZedPro;
 
-use crate::language_model::{LanguageModel, LanguageModelAvailability, LanguageModelRegistry};
+use language_model::{LanguageModel, LanguageModelAvailability, LanguageModelRegistry};
 use proto::Plan;
 use workspace::ShowConfiguration;
 
 use std::sync::Arc;
 
-use crate::assistant::assistant_settings::AssistantSettings;
+use crate::assistant_settings::AssistantSettings;
 use fs::Fs;
 use gpui::{Action, AnyElement, DismissEvent, SharedString, Task};
 use picker::{Picker, PickerDelegate};

crates/assistant/src/prompt_library.rs

@@ -1,10 +1,5 @@
-use crate::assistant::SlashCommandWorkingSet;
-use crate::assistant::{
-    slash_command::SlashCommandCompletionProvider, AssistantPanel, InlineAssistant,
-};
-use crate::language_model::{
-    LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage, Role,
-};
+use crate::SlashCommandWorkingSet;
+use crate::{slash_command::SlashCommandCompletionProvider, AssistantPanel, InlineAssistant};
 use anyhow::{anyhow, Result};
 use chrono::{DateTime, Utc};
 use collections::{HashMap, HashSet};
@@ -24,6 +19,9 @@ use heed::{
     Database, RoTxn,
 };
 use language::{language_settings::SoftWrap, Buffer, LanguageRegistry};
+use language_model::{
+    LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage, Role,
+};
 use parking_lot::RwLock;
 use picker::{Picker, PickerDelegate};
 use release_channel::ReleaseChannel;
@@ -832,7 +830,7 @@ impl PromptLibrary {
             .overflow_x_hidden()
             .child(
                 h_flex()
-                    .p(DynamicSpacing::Base04.rems(cx))
+                    .p(Spacing::Small.rems(cx))
                     .h_9()
                     .w_full()
                     .flex_none()
@@ -873,17 +871,17 @@ impl PromptLibrary {
                         .size_full()
                         .relative()
                         .overflow_hidden()
-                        .pl(DynamicSpacing::Base16.rems(cx))
-                        .pt(DynamicSpacing::Base08.rems(cx))
+                        .pl(Spacing::XXLarge.rems(cx))
+                        .pt(Spacing::Large.rems(cx))
                         .on_click(cx.listener(move |_, _, cx| {
                             cx.focus(&focus_handle);
                         }))
                         .child(
                             h_flex()
                                 .group("active-editor-header")
-                                .pr(DynamicSpacing::Base16.rems(cx))
-                                .pt(DynamicSpacing::Base02.rems(cx))
-                                .pb(DynamicSpacing::Base08.rems(cx))
+                                .pr(Spacing::XXLarge.rems(cx))
+                                .pt(Spacing::XSmall.rems(cx))
+                                .pb(Spacing::Large.rems(cx))
                                 .justify_between()
                                 .child(
                                     h_flex().gap_1().child(
@@ -945,13 +943,13 @@ impl PromptLibrary {
                                         .child(
                                             h_flex()
                                                 .h_full()
-                                                .gap(DynamicSpacing::Base16.rems(cx))
+                                                .gap(Spacing::XXLarge.rems(cx))
                                                 .child(div()),
                                         )
                                         .child(
                                             h_flex()
                                                 .h_full()
-                                                .gap(DynamicSpacing::Base16.rems(cx))
+                                                .gap(Spacing::XXLarge.rems(cx))
                                                 .children(prompt_editor.token_count.map(
                                                     |token_count| {
                                                         let token_count: SharedString =

crates/assistant/src/prompts.rs

@@ -149,7 +149,7 @@ impl PromptBuilder {
                             if file_path.to_string_lossy().ends_with(".hbs") {
                                 if let Ok(content) = params.fs.load(&file_path).await {
                                     let file_name = file_path.file_stem().unwrap().to_string_lossy();
-                                    log::debug!("Registering prompt template override: {}", file_name);
+                                    log::info!("Registering prompt template override: {}", file_name);
                                     handlebars.lock().register_template_string(&file_name, content).log_err();
                                 }
                             }
@@ -194,7 +194,7 @@ impl PromptBuilder {
         for path in Assets.list("prompts")? {
             if let Some(id) = path.split('/').last().and_then(|s| s.strip_suffix(".hbs")) {
                 if let Some(prompt) = Assets.load(path.as_ref()).log_err().flatten() {
-                    log::debug!("Registering built-in prompt template: {}", id);
+                    log::info!("Registering built-in prompt template: {}", id);
                     let prompt = String::from_utf8_lossy(prompt.as_ref());
                     handlebars.register_template_string(id, LineEnding::normalize_cow(prompt))?
                 }

crates/assistant/src/slash_command.rs

@@ -1,8 +1,8 @@
-use crate::assistant::assistant_panel::ContextEditor;
-use crate::assistant::SlashCommandWorkingSet;
-use crate::assistant_slash_command::AfterCompletion;
-pub use crate::assistant_slash_command::{SlashCommand, SlashCommandOutput, SlashCommandRegistry};
+use crate::assistant_panel::ContextEditor;
+use crate::SlashCommandWorkingSet;
 use anyhow::Result;
+use assistant_slash_command::AfterCompletion;
+pub use assistant_slash_command::{SlashCommand, SlashCommandOutput, SlashCommandRegistry};
 use editor::{CompletionProvider, Editor};
 use fuzzy::{match_strings, StringMatchCandidate};
 use gpui::{AppContext, Model, Task, ViewContext, WeakView, WindowContext};

crates/assistant/src/slash_command/auto_command.rs

@@ -1,24 +1,24 @@
-use crate::assistant_slash_command::{
+use anyhow::{anyhow, Result};
+use assistant_slash_command::{
     ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
     SlashCommandResult,
 };
-use crate::language_model::{
-    LanguageModelCompletionEvent, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, Role,
-};
-use crate::semantic_index::{FileSummary, SemanticDb};
-use anyhow::{anyhow, Result};
 use feature_flags::FeatureFlag;
 use futures::StreamExt;
 use gpui::{AppContext, AsyncAppContext, Task, WeakView};
 use language::{CodeLabel, LspAdapterDelegate};
+use language_model::{
+    LanguageModelCompletionEvent, LanguageModelRegistry, LanguageModelRequest,
+    LanguageModelRequestMessage, Role,
+};
+use semantic_index::{FileSummary, SemanticDb};
 use smol::channel;
 use std::sync::{atomic::AtomicBool, Arc};
 use ui::{prelude::*, BorrowAppContext, WindowContext};
 use util::ResultExt;
 use workspace::Workspace;
 
-use crate::assistant::slash_command::create_label_for_command;
+use crate::slash_command::create_label_for_command;
 
 pub struct AutoSlashCommandFeatureFlag;
 

crates/assistant/src/slash_command/cargo_workspace_command.rs

@@ -1,8 +1,8 @@
-use crate::assistant_slash_command::{
+use anyhow::{anyhow, Context, Result};
+use assistant_slash_command::{
     ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
     SlashCommandResult,
 };
-use anyhow::{anyhow, Context, Result};
 use fs::Fs;
 use gpui::{AppContext, Model, Task, WeakView};
 use language::{BufferSnapshot, LspAdapterDelegate};

crates/assistant/src/slash_command/context_server_command.rs

@@ -1,8 +1,8 @@
-use crate::assistant_slash_command::{
+use anyhow::{anyhow, Result};
+use assistant_slash_command::{
     AfterCompletion, ArgumentCompletion, SlashCommand, SlashCommandOutput,
     SlashCommandOutputSection, SlashCommandResult,
 };
-use anyhow::{anyhow, Result};
 use collections::HashMap;
 use context_servers::{
     manager::{ContextServer, ContextServerManager},
@@ -16,7 +16,7 @@ use text::LineEnding;
 use ui::{IconName, SharedString};
 use workspace::Workspace;
 
-use crate::assistant::slash_command::create_label_for_command;
+use crate::slash_command::create_label_for_command;
 
 pub struct ContextServerSlashCommand {
     server_manager: Model<ContextServerManager>,

crates/assistant/src/slash_command/default_command.rs

@@ -1,9 +1,9 @@
-use crate::assistant::prompt_library::PromptStore;
-use crate::assistant_slash_command::{
+use crate::prompt_library::PromptStore;
+use anyhow::{anyhow, Result};
+use assistant_slash_command::{
     ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
     SlashCommandResult,
 };
-use anyhow::{anyhow, Result};
 use gpui::{Task, WeakView};
 use language::{BufferSnapshot, LspAdapterDelegate};
 use std::{

crates/assistant/src/slash_command/delta_command.rs

@@ -1,9 +1,9 @@
-use crate::assistant::slash_command::file_command::{FileCommandMetadata, FileSlashCommand};
-use crate::assistant_slash_command::{
+use crate::slash_command::file_command::{FileCommandMetadata, FileSlashCommand};
+use anyhow::{anyhow, Result};
+use assistant_slash_command::{
     ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
     SlashCommandResult,
 };
-use anyhow::{anyhow, Result};
 use collections::HashSet;
 use futures::future;
 use gpui::{Task, WeakView, WindowContext};

crates/assistant/src/slash_command/diagnostics_command.rs

@@ -1,8 +1,8 @@
-use crate::assistant_slash_command::{
+use anyhow::{anyhow, Result};
+use assistant_slash_command::{
     ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
     SlashCommandResult,
 };
-use anyhow::{anyhow, Result};
 use fuzzy::{PathMatch, StringMatchCandidate};
 use gpui::{AppContext, Model, Task, View, WeakView};
 use language::{
@@ -21,7 +21,7 @@ use util::paths::PathMatcher;
 use util::ResultExt;
 use workspace::Workspace;
 
-use crate::assistant::slash_command::create_label_for_command;
+use crate::slash_command::create_label_for_command;
 
 pub(crate) struct DiagnosticsSlashCommand;
 
@@ -160,7 +160,7 @@ impl SlashCommand for DiagnosticsSlashCommand {
                 .map(|completion| ArgumentCompletion {
                     label: completion.clone().into(),
                     new_text: completion,
-                    after_completion: crate::assistant_slash_command::AfterCompletion::Run,
+                    after_completion: assistant_slash_command::AfterCompletion::Run,
                     replace_previous_arguments: false,
                 })
                 .collect())

crates/assistant/src/slash_command/docs_command.rs

@@ -3,11 +3,11 @@ use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 use std::time::Duration;
 
-use crate::assistant_slash_command::{
+use anyhow::{anyhow, bail, Result};
+use assistant_slash_command::{
     ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
     SlashCommandResult,
 };
-use anyhow::{anyhow, bail, Result};
 use gpui::{AppContext, BackgroundExecutor, Model, Task, WeakView};
 use indexed_docs::{
     DocsDotRsProvider, IndexedDocsRegistry, IndexedDocsStore, LocalRustdocProvider, PackageName,
@@ -182,7 +182,7 @@ impl SlashCommand for DocsSlashCommand {
                     .map(|item| ArgumentCompletion {
                         label: item.clone().into(),
                         new_text: item.to_string(),
-                        after_completion: crate::assistant_slash_command::AfterCompletion::Run,
+                        after_completion: assistant_slash_command::AfterCompletion::Run,
                         replace_previous_arguments: false,
                     })
                     .collect()

crates/assistant/src/slash_command/fetch_command.rs

@@ -3,11 +3,11 @@ use std::rc::Rc;
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 
-use crate::assistant_slash_command::{
+use anyhow::{anyhow, bail, Context, Result};
+use assistant_slash_command::{
     ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
     SlashCommandResult,
 };
-use anyhow::{anyhow, bail, Context, Result};
 use futures::AsyncReadExt;
 use gpui::{Task, WeakView};
 use html_to_markdown::{convert_html_to_markdown, markdown, TagHandler};

crates/assistant/src/slash_command/file_command.rs

@@ -1,8 +1,8 @@
-use crate::assistant_slash_command::{
+use anyhow::{anyhow, Context as _, Result};
+use assistant_slash_command::{
     AfterCompletion, ArgumentCompletion, SlashCommand, SlashCommandContent, SlashCommandEvent,
     SlashCommandOutput, SlashCommandOutputSection, SlashCommandResult,
 };
-use anyhow::{anyhow, Context as _, Result};
 use futures::channel::mpsc;
 use futures::Stream;
 use fuzzy::PathMatch;
@@ -552,8 +552,7 @@ pub fn append_buffer_to_output(
 
 #[cfg(test)]
 mod test {
-    use crate::assistant::slash_command::file_command::collect_files;
-    use crate::assistant_slash_command::SlashCommandOutput;
+    use assistant_slash_command::SlashCommandOutput;
     use fs::FakeFs;
     use gpui::TestAppContext;
     use pretty_assertions::assert_eq;
@@ -562,6 +561,8 @@ mod test {
     use settings::SettingsStore;
     use smol::stream::StreamExt;
 
+    use crate::slash_command::file_command::collect_files;
+
     pub fn init_test(cx: &mut gpui::TestAppContext) {
         if std::env::var("RUST_LOG").is_ok() {
             env_logger::try_init().ok();

crates/assistant/src/slash_command/now_command.rs

@@ -1,11 +1,11 @@
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 
-use crate::assistant_slash_command::{
+use anyhow::Result;
+use assistant_slash_command::{
     ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
     SlashCommandResult,
 };
-use anyhow::Result;
 use chrono::Local;
 use gpui::{Task, WeakView};
 use language::{BufferSnapshot, LspAdapterDelegate};

crates/assistant/src/slash_command/project_command.rs

@@ -2,17 +2,15 @@ use super::{
     create_label_for_command, search_command::add_search_result_section, SlashCommand,
     SlashCommandOutput,
 };
-use crate::assistant::PromptBuilder;
-use crate::assistant_slash_command::{
-    ArgumentCompletion, SlashCommandOutputSection, SlashCommandResult,
-};
-use crate::language_model::{LanguageModelRegistry, LanguageModelTool};
-use crate::semantic_index::SemanticDb;
+use crate::PromptBuilder;
 use anyhow::{anyhow, Result};
+use assistant_slash_command::{ArgumentCompletion, SlashCommandOutputSection, SlashCommandResult};
 use feature_flags::FeatureFlag;
 use gpui::{AppContext, Task, WeakView, WindowContext};
 use language::{Anchor, CodeLabel, LspAdapterDelegate};
+use language_model::{LanguageModelRegistry, LanguageModelTool};
 use schemars::JsonSchema;
+use semantic_index::SemanticDb;
 use serde::Deserialize;
 
 pub struct ProjectSlashCommandFeatureFlag;
@@ -107,10 +105,10 @@ impl SlashCommand for ProjectSlashCommand {
 
             let search_queries = current_model
                 .use_tool::<SearchQueries>(
-                    crate::language_model::LanguageModelRequest {
-                        messages: vec![crate::language_model::LanguageModelRequestMessage {
-                            role: crate::language_model::Role::User,
-                            content: vec![crate::language_model::MessageContent::Text(prompt)],
+                    language_model::LanguageModelRequest {
+                        messages: vec![language_model::LanguageModelRequestMessage {
+                            role: language_model::Role::User,
+                            content: vec![language_model::MessageContent::Text(prompt)],
                             cache: false,
                         }],
                         tools: vec![],

crates/assistant/src/slash_command/prompt_command.rs

@@ -1,9 +1,9 @@
-use crate::assistant::prompt_library::PromptStore;
-use crate::assistant_slash_command::{
+use crate::prompt_library::PromptStore;
+use anyhow::{anyhow, Context, Result};
+use assistant_slash_command::{
     ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
     SlashCommandResult,
 };
-use anyhow::{anyhow, Context, Result};
 use gpui::{Task, WeakView};
 use language::{BufferSnapshot, LspAdapterDelegate};
 use std::sync::{atomic::AtomicBool, Arc};

crates/assistant/src/slash_command/search_command.rs

@@ -1,12 +1,12 @@
-use crate::assistant_slash_command::{
+use anyhow::Result;
+use assistant_slash_command::{
     ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
     SlashCommandResult,
 };
-use crate::semantic_index::{LoadedSearchResult, SemanticDb};
-use anyhow::Result;
 use feature_flags::FeatureFlag;
 use gpui::{AppContext, Task, WeakView};
 use language::{CodeLabel, LspAdapterDelegate};
+use semantic_index::{LoadedSearchResult, SemanticDb};
 use std::{
     fmt::Write,
     sync::{atomic::AtomicBool, Arc},
@@ -14,10 +14,8 @@ use std::{
 use ui::{prelude::*, IconName};
 use workspace::Workspace;
 
-use crate::assistant::slash_command::create_label_for_command;
-use crate::assistant::slash_command::file_command::{
-    build_entry_output_section, codeblock_fence_for_path,
-};
+use crate::slash_command::create_label_for_command;
+use crate::slash_command::file_command::{build_entry_output_section, codeblock_fence_for_path};
 
 pub(crate) struct SearchSlashCommandFeatureFlag;
 

crates/assistant/src/slash_command/selection_command.rs

@@ -1,9 +1,9 @@
-use crate::assistant::assistant_panel::selections_creases;
-use crate::assistant_slash_command::{
+use crate::assistant_panel::selections_creases;
+use anyhow::{anyhow, Result};
+use assistant_slash_command::{
     ArgumentCompletion, SlashCommand, SlashCommandContent, SlashCommandEvent,
     SlashCommandOutputSection, SlashCommandResult,
 };
-use anyhow::{anyhow, Result};
 use futures::StreamExt;
 use gpui::{AppContext, Task, WeakView};
 use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate};

crates/assistant/src/slash_command/streaming_example_command.rs

@@ -2,11 +2,11 @@ use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 use std::time::Duration;
 
-use crate::assistant_slash_command::{
+use anyhow::Result;
+use assistant_slash_command::{
     ArgumentCompletion, SlashCommand, SlashCommandContent, SlashCommandEvent,
     SlashCommandOutputSection, SlashCommandResult,
 };
-use anyhow::Result;
 use feature_flags::FeatureFlag;
 use futures::channel::mpsc;
 use gpui::{Task, WeakView};

crates/assistant/src/slash_command/symbols_command.rs

@@ -1,8 +1,8 @@
-use crate::assistant_slash_command::{
+use anyhow::{anyhow, Context as _, Result};
+use assistant_slash_command::{
     ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
     SlashCommandResult,
 };
-use anyhow::{anyhow, Context as _, Result};
 use editor::Editor;
 use gpui::{Task, WeakView};
 use language::{BufferSnapshot, LspAdapterDelegate};

crates/assistant/src/slash_command/tab_command.rs

@@ -1,8 +1,8 @@
-use crate::assistant_slash_command::{
+use anyhow::{Context, Result};
+use assistant_slash_command::{
     ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
     SlashCommandResult,
 };
-use anyhow::{Context, Result};
 use collections::{HashMap, HashSet};
 use editor::Editor;
 use futures::future::join_all;
@@ -16,7 +16,7 @@ use ui::{prelude::*, ActiveTheme, WindowContext};
 use util::ResultExt;
 use workspace::Workspace;
 
-use crate::assistant::slash_command::file_command::append_buffer_to_output;
+use crate::slash_command::file_command::append_buffer_to_output;
 
 pub(crate) struct TabSlashCommand;
 

crates/assistant/src/slash_command/terminal_command.rs

@@ -1,18 +1,18 @@
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 
-use crate::assistant_slash_command::{
+use anyhow::Result;
+use assistant_slash_command::{
     ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
     SlashCommandResult,
 };
-use crate::terminal_view::{terminal_panel::TerminalPanel, TerminalView};
-use anyhow::Result;
 use gpui::{AppContext, Task, View, WeakView};
 use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate};
+use terminal_view::{terminal_panel::TerminalPanel, TerminalView};
 use ui::prelude::*;
 use workspace::{dock::Panel, Workspace};
 
-use crate::assistant::DEFAULT_CONTEXT_LINES;
+use crate::DEFAULT_CONTEXT_LINES;
 
 use super::create_label_for_command;
 

crates/assistant/src/slash_command_picker.rs

@@ -4,8 +4,8 @@ use gpui::{AnyElement, DismissEvent, SharedString, Task, WeakView};
 use picker::{Picker, PickerDelegate, PickerEditorPosition};
 use ui::{prelude::*, ListItem, ListItemSpacing, PopoverMenu, PopoverTrigger};
 
-use crate::assistant::assistant_panel::ContextEditor;
-use crate::assistant::SlashCommandWorkingSet;
+use crate::assistant_panel::ContextEditor;
+use crate::SlashCommandWorkingSet;
 
 #[derive(IntoElement)]
 pub(super) struct SlashCommandSelector<T: PopoverTrigger> {

crates/assistant/src/slash_command_working_set.rs

@@ -1,4 +1,4 @@
-use crate::assistant_slash_command::{SlashCommand, SlashCommandRegistry};
+use assistant_slash_command::{SlashCommand, SlashCommandRegistry};
 use collections::HashMap;
 use gpui::AppContext;
 use parking_lot::Mutex;

crates/assistant/src/terminal_inline_assistant.rs

@@ -1,12 +1,7 @@
-use crate::assistant::{
+use crate::{
     humanize_token_count, prompts::PromptBuilder, AssistantPanel, AssistantPanelEvent,
     ModelSelector, RequestType, DEFAULT_CONTEXT_LINES,
 };
-use crate::language_model::{
-    logging::report_assistant_event, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, Role,
-};
-use crate::terminal_view::TerminalView;
 use anyhow::{Context as _, Result};
 use client::telemetry::Telemetry;
 use collections::{HashMap, VecDeque};
@@ -21,6 +16,10 @@ use gpui::{
     Subscription, Task, TextStyle, UpdateGlobal, View, WeakView,
 };
 use language::Buffer;
+use language_model::{
+    logging::report_assistant_event, LanguageModelRegistry, LanguageModelRequest,
+    LanguageModelRequestMessage, Role,
+};
 use settings::Settings;
 use std::{
     cmp,
@@ -29,6 +28,7 @@ use std::{
 };
 use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use terminal::Terminal;
+use terminal_view::TerminalView;
 use theme::ThemeSettings;
 use ui::{prelude::*, IconButtonShape, Tooltip};
 use util::ResultExt;
@@ -111,7 +111,7 @@ impl TerminalInlineAssistant {
             )
         });
         let prompt_editor_render = prompt_editor.clone();
-        let block = crate::terminal_view::BlockProperties {
+        let block = terminal_view::BlockProperties {
             height: 2,
             render: Box::new(move |_| prompt_editor_render.clone().into_any_element()),
         };
@@ -377,7 +377,7 @@ impl TerminalInlineAssistant {
                     .terminal
                     .update(cx, |terminal, cx| {
                         terminal.clear_block_below_cursor(cx);
-                        let block = crate::terminal_view::BlockProperties {
+                        let block = terminal_view::BlockProperties {
                             height,
                             render: Box::new(move |_| prompt_editor.clone().into_any_element()),
                         };

crates/assistant_slash_command/Cargo.toml

@@ -0,0 +1,30 @@
+[package]
+name = "assistant_slash_command"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/assistant_slash_command.rs"
+
+[dependencies]
+anyhow.workspace = true
+collections.workspace = true
+derive_more.workspace = true
+futures.workspace = true
+gpui.workspace = true
+language.workspace = true
+language_model.workspace = true
+parking_lot.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+workspace.workspace = true
+
+[dev-dependencies]
+gpui = { workspace = true, features = ["test-support"] }
+pretty_assertions.workspace = true
+workspace = { workspace = true, features = ["test-support"] }

crates/assistant_slash_command/LICENSE-GPL

@@ -0,0 +1 @@
+../../LICENSE-GPL

crates/assistant_slash_command/src/assistant_slash_command.rs

@@ -1,11 +1,11 @@
 mod slash_command_registry;
 
-pub use crate::language_model::Role;
 use anyhow::Result;
 use futures::stream::{self, BoxStream};
 use futures::StreamExt;
 use gpui::{AnyElement, AppContext, ElementId, SharedString, Task, WeakView, WindowContext};
 use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate, OffsetRangeExt};
+pub use language_model::Role;
 use serde::{Deserialize, Serialize};
 pub use slash_command_registry::*;
 use std::{

crates/assistant_slash_command/src/slash_command_registry.rs

@@ -6,7 +6,7 @@ use gpui::Global;
 use gpui::{AppContext, ReadGlobal};
 use parking_lot::RwLock;
 
-use crate::assistant_slash_command::SlashCommand;
+use crate::SlashCommand;
 
 #[derive(Default, Deref, DerefMut)]
 struct GlobalSlashCommandRegistry(Arc<SlashCommandRegistry>);

crates/auto_update/Cargo.toml

@@ -0,0 +1,36 @@
+[package]
+name = "auto_update"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/auto_update.rs"
+doctest = false
+
+[dependencies]
+anyhow.workspace = true
+client.workspace = true
+db.workspace = true
+editor.workspace = true
+gpui.workspace = true
+http_client.workspace = true
+log.workspace = true
+markdown_preview.workspace = true
+menu.workspace = true
+paths.workspace = true
+release_channel.workspace = true
+schemars.workspace = true
+serde.workspace = true
+serde_derive.workspace = true
+serde_json.workspace = true
+settings.workspace = true
+smol.workspace = true
+tempfile.workspace = true
+util.workspace = true
+which.workspace = true
+workspace.workspace = true

crates/auto_update/LICENSE-GPL

@@ -0,0 +1 @@
+../../LICENSE-GPL

crates/auto_update/src/update_notification.rs

@@ -48,7 +48,7 @@ impl Render for UpdateNotification {
                     .on_click(cx.listener(|this, _, cx| {
                         this.workspace
                             .update(cx, |workspace, cx| {
-                                crate::auto_update::view_release_notes_locally(workspace, cx);
+                                crate::view_release_notes_locally(workspace, cx);
                             })
                             .log_err();
                         this.dismiss(&menu::Cancel, cx)

crates/breadcrumbs/Cargo.toml

@@ -0,0 +1,27 @@
+[package]
+name = "breadcrumbs"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/breadcrumbs.rs"
+doctest = false
+
+[dependencies]
+editor.workspace = true
+gpui.workspace = true
+itertools.workspace = true
+outline.workspace = true
+theme.workspace = true
+ui.workspace = true
+workspace.workspace = true
+
+[dev-dependencies]
+editor = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }

crates/breadcrumbs/LICENSE-GPL

@@ -0,0 +1 @@
+../../LICENSE-GPL

crates/cli/Cargo.toml

@@ -29,7 +29,7 @@ serde.workspace = true
 util.workspace = true
 tempfile.workspace = true
 
-[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
+[target.'cfg(target_os = "linux")'.dependencies]
 exec.workspace =  true
 fork.workspace = true
 

crates/cli/src/main.rs

@@ -1,7 +1,4 @@
-#![cfg_attr(
-    any(target_os = "linux", target_os = "freebsd", target_os = "windows"),
-    allow(dead_code)
-)]
+#![cfg_attr(any(target_os = "linux", target_os = "windows"), allow(dead_code))]
 
 use anyhow::{Context, Result};
 use clap::Parser;
@@ -91,7 +88,7 @@ fn parse_path_with_position(argument_str: &str) -> anyhow::Result<String> {
 
 fn main() -> Result<()> {
     // Exit flatpak sandbox if needed
-    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
+    #[cfg(target_os = "linux")]
     {
         flatpak::try_restart_to_host();
         flatpak::ld_extra_libs();
@@ -109,7 +106,7 @@ fn main() -> Result<()> {
     }
     let args = Args::parse();
 
-    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
+    #[cfg(target_os = "linux")]
     let args = flatpak::set_bin_if_no_escape(args);
 
     let app = Detect::detect(args.zed.as_deref()).context("Bundle detection")?;
@@ -223,7 +220,7 @@ fn main() -> Result<()> {
     Ok(())
 }
 
-#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+#[cfg(target_os = "linux")]
 mod linux {
     use std::{
         env,
@@ -347,7 +344,7 @@ mod linux {
     }
 }
 
-#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+#[cfg(target_os = "linux")]
 mod flatpak {
     use std::ffi::OsString;
     use std::path::PathBuf;

crates/client/src/client.rs

@@ -889,7 +889,7 @@ impl Client {
         cx: &AsyncAppContext,
     ) -> Result<()> {
         let executor = cx.background_executor();
-        log::debug!("add connection to peer");
+        log::info!("add connection to peer");
         let (connection_id, handle_io, mut incoming) = self.peer.add_connection(conn, {
             let executor = executor.clone();
             move |duration| executor.timer(duration)
@@ -897,12 +897,12 @@ impl Client {
         let handle_io = executor.spawn(handle_io);
 
         let peer_id = async {
-            log::debug!("waiting for server hello");
+            log::info!("waiting for server hello");
             let message = incoming
                 .next()
                 .await
                 .ok_or_else(|| anyhow!("no hello message received"))?;
-            log::debug!("got server hello");
+            log::info!("got server hello");
             let hello_message_type_name = message.payload_type_name().to_string();
             let hello = message
                 .into_any()
@@ -928,7 +928,7 @@ impl Client {
             }
         };
 
-        log::debug!(
+        log::info!(
             "set status to connected (connection id: {:?}, peer id: {:?})",
             connection_id,
             peer_id

crates/client/src/telemetry.rs

@@ -100,7 +100,7 @@ pub fn os_name() -> String {
     {
         "macOS".to_string()
     }
-    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
+    #[cfg(target_os = "linux")]
     {
         format!("Linux {}", gpui::guess_compositor())
     }
@@ -129,7 +129,7 @@ pub fn os_version() -> String {
             .to_string()
         }
     }
-    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
+    #[cfg(target_os = "linux")]
     {
         use std::path::Path;
 

crates/collab/Cargo.toml

@@ -77,15 +77,18 @@ util.workspace = true
 uuid.workspace = true
 
 [dev-dependencies]
+assistant = { workspace = true, features = ["test-support"] }
 async-trait.workspace = true
 audio.workspace = true
 call = { workspace = true, features = ["test-support"] }
 channel.workspace = true
 client = { workspace = true, features = ["test-support"] }
+collab_ui = { workspace = true, features = ["test-support"] }
 collections = { workspace = true, features = ["test-support"] }
 ctor.workspace = true
 editor = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
+file_finder.workspace = true
 fs = { workspace = true, features = ["test-support"] }
 git = { workspace = true, features = ["test-support"] }
 git_hosting_providers.workspace = true
@@ -93,6 +96,7 @@ gpui = { workspace = true, features = ["test-support"] }
 hyper.workspace = true
 indoc.workspace = true
 language = { workspace = true, features = ["test-support"] }
+language_model = { workspace = true, features = ["test-support"] }
 live_kit_client = { workspace = true, features = ["test-support"] }
 lsp = { workspace = true, features = ["test-support"] }
 menu.workspace = true
@@ -101,6 +105,7 @@ node_runtime.workspace = true
 notifications = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true
 project = { workspace = true, features = ["test-support"] }
+recent_projects = { workspace = true }
 release_channel.workspace = true
 remote = { workspace = true, features = ["test-support"] }
 remote_server.workspace = true
@@ -115,7 +120,6 @@ unindent.workspace = true
 util.workspace = true
 workspace = { workspace = true, features = ["test-support"] }
 worktree = { workspace = true, features = ["test-support"] }
-zed_common = { workspace = true, features = ["test-support"] }
 
 [package.metadata.cargo-machete]
 ignored = ["async-stripe"]

crates/collab/src/tests/channel_buffer_tests.rs

@@ -5,6 +5,7 @@ use crate::{
 use call::ActiveCall;
 use channel::ACKNOWLEDGE_DEBOUNCE_INTERVAL;
 use client::{Collaborator, ParticipantIndex, UserId};
+use collab_ui::channel_view::ChannelView;
 use collections::HashMap;
 use editor::{Anchor, Editor, ToOffset};
 use futures::future;
@@ -12,7 +13,6 @@ use gpui::{BackgroundExecutor, Model, TestAppContext, ViewContext};
 use rpc::{proto::PeerId, RECEIVE_TIMEOUT};
 use serde_json::json;
 use std::ops::Range;
-use zed_common::collab_ui::channel_view::ChannelView;
 
 #[gpui::test]
 async fn test_core_channel_buffers(

crates/collab/src/tests/channel_message_tests.rs

@@ -1,9 +1,9 @@
 use crate::{rpc::RECONNECT_TIMEOUT, tests::TestServer};
 use channel::{ChannelChat, ChannelMessageId, MessageParams};
+use collab_ui::chat_panel::ChatPanel;
 use gpui::{BackgroundExecutor, Model, TestAppContext};
 use rpc::Notification;
 use workspace::dock::Panel;
-use zed_common::collab_ui::chat_panel::ChatPanel;
 
 #[gpui::test]
 async fn test_basic_channel_messages(
@@ -351,7 +351,7 @@ async fn test_channel_message_changes(
 
     // Opening the chat should clear the changed flag.
     cx_b.update(|cx| {
-        zed_common::collab_ui::init(&client_b.app_state, cx);
+        collab_ui::init(&client_b.app_state, cx);
     });
     let project_b = client_b.build_empty_local_project(cx_b);
     let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);

crates/collab/src/tests/editor_tests.rs

@@ -25,6 +25,7 @@ use project::{
     project_settings::{InlineBlameSettings, ProjectSettings},
     SERVER_PROGRESS_THROTTLE_TIMEOUT,
 };
+use recent_projects::disconnected_overlay::DisconnectedOverlay;
 use rpc::RECEIVE_TIMEOUT;
 use serde_json::json;
 use settings::SettingsStore;
@@ -38,7 +39,6 @@ use std::{
 };
 use text::Point;
 use workspace::{CloseIntent, Workspace};
-use zed_common::recent_projects::disconnected_overlay::DisconnectedOverlay;
 
 #[gpui::test(iterations = 10)]
 async fn test_host_disconnect(
@@ -55,7 +55,7 @@ async fn test_host_disconnect(
         .await;
 
     cx_b.update(editor::init);
-    cx_b.update(zed_common::recent_projects::init);
+    cx_b.update(recent_projects::init);
 
     client_a
         .fs()

crates/collab/src/tests/following_tests.rs

@@ -2,6 +2,10 @@
 use crate::{rpc::RECONNECT_TIMEOUT, tests::TestServer};
 use call::{ActiveCall, ParticipantLocation};
 use client::ChannelId;
+use collab_ui::{
+    channel_view::ChannelView,
+    notifications::project_shared_notification::ProjectSharedNotification,
+};
 use editor::{Editor, ExcerptRange, MultiBuffer};
 use gpui::{
     point, BackgroundExecutor, BorrowAppContext, Context, Entity, SharedString, TestAppContext,
@@ -19,10 +23,6 @@ use workspace::{
     shared_screen::SharedScreen,
     SplitDirection, Workspace,
 };
-use zed_common::collab_ui::{
-    channel_view::ChannelView,
-    notifications::project_shared_notification::ProjectSharedNotification,
-};
 
 use super::TestClient;
 
@@ -1861,9 +1861,9 @@ async fn test_following_to_channel_notes_without_a_shared_project(
     cx_a.update(editor::init);
     cx_b.update(editor::init);
     cx_c.update(editor::init);
-    cx_a.update(zed_common::collab_ui::channel_view::init);
-    cx_b.update(zed_common::collab_ui::channel_view::init);
-    cx_c.update(zed_common::collab_ui::channel_view::init);
+    cx_a.update(collab_ui::channel_view::init);
+    cx_b.update(collab_ui::channel_view::init);
+    cx_c.update(collab_ui::channel_view::init);
 
     let channel_1_id = server
         .make_channel(

crates/collab/src/tests/integration_tests.rs

@@ -6,6 +6,7 @@ use crate::{
     },
 };
 use anyhow::{anyhow, Result};
+use assistant::{ContextStore, PromptBuilder, SlashCommandWorkingSet, ToolWorkingSet};
 use call::{room, ActiveCall, ParticipantLocation, Room};
 use client::{User, RECEIVE_TIMEOUT};
 use collections::{HashMap, HashSet};
@@ -47,7 +48,6 @@ use std::{
 };
 use unindent::Unindent as _;
 use workspace::Pane;
-use zed_common::assistant::{ContextStore, PromptBuilder, SlashCommandWorkingSet, ToolWorkingSet};
 
 #[ctor::ctor]
 fn init_logger() {
@@ -5130,10 +5130,11 @@ async fn test_lsp_hover(
         });
         let new_server_name = new_server.server.name();
         assert!(
-            !servers_with_hover_requests.contains_key(&new_server_name),
+            !servers_with_hover_requests.contains_key(new_server_name),
             "Unexpected: initialized server with the same name twice. Name: `{new_server_name}`"
         );
-        match new_server_name.as_ref() {
+        let new_server_name = new_server_name.to_string();
+        match new_server_name.as_str() {
             "CrabLang-ls" => {
                 servers_with_hover_requests.insert(
                     new_server_name.clone(),

crates/collab/src/tests/test_server.rs

@@ -12,6 +12,7 @@ use client::{
     UserStore,
 };
 use clock::FakeSystemClock;
+use collab_ui::channel_view::ChannelView;
 use collections::{HashMap, HashSet};
 use fs::FakeFs;
 use futures::{channel::oneshot, StreamExt as _};
@@ -43,7 +44,6 @@ use std::{
     },
 };
 use workspace::{Workspace, WorkspaceStore};
-use zed_common::collab_ui::channel_view::ChannelView;
 
 pub struct TestServer {
     pub app_state: Arc<AppState>,
@@ -293,12 +293,12 @@ impl TestServer {
             call::init(client.clone(), user_store.clone(), cx);
             channel::init(&client, user_store.clone(), cx);
             notifications::init(client.clone(), user_store, cx);
-            zed_common::collab_ui::init(&app_state, cx);
-            zed_common::file_finder::init(cx);
+            collab_ui::init(&app_state, cx);
+            file_finder::init(cx);
             menu::init();
             settings::KeymapFile::load_asset(os_keymap, cx).unwrap();
-            zed_common::language_model::LanguageModelRegistry::test(cx);
-            zed_common::assistant::context_store::init(&client.clone().into());
+            language_model::LanguageModelRegistry::test(cx);
+            assistant::context_store::init(&client.clone().into());
         });
 
         client

crates/collab_ui/Cargo.toml

@@ -0,0 +1,83 @@
+[package]
+name = "collab_ui"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/collab_ui.rs"
+doctest = false
+
+[features]
+default = []
+stories = ["dep:story"]
+test-support = [
+    "call/test-support",
+    "client/test-support",
+    "collections/test-support",
+    "editor/test-support",
+    "gpui/test-support",
+    "project/test-support",
+    "settings/test-support",
+    "util/test-support",
+    "workspace/test-support",
+    "http_client/test-support",
+]
+
+[dependencies]
+anyhow.workspace = true
+call.workspace = true
+channel.workspace = true
+chrono.workspace = true
+client.workspace = true
+collections.workspace = true
+db.workspace = true
+editor.workspace = true
+emojis.workspace = true
+futures.workspace = true
+fuzzy.workspace = true
+gpui.workspace = true
+language.workspace = true
+menu.workspace = true
+notifications.workspace = true
+parking_lot.workspace = true
+picker.workspace = true
+project.workspace = true
+release_channel.workspace = true
+rich_text.workspace = true
+rpc.workspace = true
+schemars.workspace = true
+serde.workspace = true
+serde_derive.workspace = true
+serde_json.workspace = true
+settings.workspace = true
+smallvec.workspace = true
+story = { workspace = true, optional = true }
+theme.workspace = true
+time_format.workspace = true
+time.workspace = true
+title_bar.workspace = true
+ui.workspace = true
+util.workspace = true
+vcs_menu.workspace = true
+workspace.workspace = true
+
+[dev-dependencies]
+call = { workspace = true, features = ["test-support"] }
+client = { workspace = true, features = ["test-support"] }
+collections = { workspace = true, features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+notifications = { workspace = true, features = ["test-support"] }
+pretty_assertions.workspace = true
+project = { workspace = true, features = ["test-support"] }
+rpc = { workspace = true, features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
+tree-sitter-md.workspace = true
+util = { workspace = true, features = ["test-support"] }
+http_client = { workspace = true, features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }

crates/collab_ui/LICENSE-GPL

@@ -0,0 +1 @@
+../../LICENSE-GPL

crates/collab_ui/src/chat_panel.rs

@@ -1,4 +1,4 @@
-use crate::collab_ui::{collab_panel, ChatPanelSettings};
+use crate::{collab_panel, ChatPanelSettings};
 use anyhow::Result;
 use call::{room, ActiveCall};
 use channel::{ChannelChat, ChannelChatEvent, ChannelMessage, ChannelMessageId, ChannelStore};

crates/collab_ui/src/chat_panel/message_editor.rs

@@ -19,7 +19,7 @@ use std::{ops::Range, sync::Arc, sync::LazyLock, time::Duration};
 use theme::ThemeSettings;
 use ui::{prelude::*, TextSize};
 
-use crate::collab_ui::panel_settings::MessageEditorSettings;
+use crate::panel_settings::MessageEditorSettings;
 
 const MENTIONS_DEBOUNCE_INTERVAL: Duration = Duration::from_millis(50);
 

crates/collab_ui/src/collab_panel.rs

@@ -2,9 +2,7 @@ mod channel_modal;
 mod contact_finder;
 
 use self::channel_modal::ChannelModal;
-use crate::collab_ui::{
-    channel_view::ChannelView, chat_panel::ChatPanel, CollaborationPanelSettings,
-};
+use crate::{channel_view::ChannelView, chat_panel::ChatPanel, CollaborationPanelSettings};
 use call::ActiveCall;
 use channel::{Channel, ChannelEvent, ChannelStore};
 use client::{ChannelId, Client, Contact, User, UserStore};

crates/collab_ui/src/collab_ui.rs

@@ -32,8 +32,8 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
     collab_panel::init(cx);
     notification_panel::init(cx);
     notifications::init(app_state, cx);
-    crate::title_bar::init(cx);
-    crate::vcs_menu::init(cx);
+    title_bar::init(cx);
+    vcs_menu::init(cx);
 }
 
 fn notification_window_options(

crates/collab_ui/src/notification_panel.rs

@@ -1,4 +1,4 @@
-use crate::collab_ui::{chat_panel::ChatPanel, NotificationPanelSettings};
+use crate::{chat_panel::ChatPanel, NotificationPanelSettings};
 use anyhow::Result;
 use channel::ChannelStore;
 use client::{ChannelId, Client, Notification, User, UserStore};

crates/collab_ui/src/notifications/incoming_call_notification.rs

@@ -1,5 +1,5 @@
-use crate::collab_ui::notification_window_options;
-use crate::collab_ui::notifications::collab_notification::CollabNotification;
+use crate::notification_window_options;
+use crate::notifications::collab_notification::CollabNotification;
 use call::{ActiveCall, IncomingCall};
 use futures::StreamExt;
 use gpui::{prelude::*, AppContext, WindowHandle};

crates/collab_ui/src/notifications/project_shared_notification.rs

@@ -1,5 +1,5 @@
-use crate::collab_ui::notification_window_options;
-use crate::collab_ui::notifications::collab_notification::CollabNotification;
+use crate::notification_window_options;
+use crate::notifications::collab_notification::CollabNotification;
 use call::{room, ActiveCall};
 use client::User;
 use collections::HashMap;

crates/collab_ui/src/notifications/stories/collab_notification.rs

@@ -2,7 +2,7 @@ use gpui::prelude::*;
 use story::{Story, StoryItem, StorySection};
 use ui::prelude::*;
 
-use crate::collab_ui::notifications::collab_notification::CollabNotification;
+use crate::notifications::collab_notification::CollabNotification;
 
 pub struct CollabNotificationStory;
 

crates/command_palette/Cargo.toml

@@ -0,0 +1,41 @@
+[package]
+name = "command_palette"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/command_palette.rs"
+doctest = false
+
+[dependencies]
+client.workspace = true
+collections.workspace = true
+command_palette_hooks.workspace = true
+fuzzy.workspace = true
+gpui.workspace = true
+picker.workspace = true
+postage.workspace = true
+serde.workspace = true
+settings.workspace = true
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
+zed_actions.workspace = true
+
+[dev-dependencies]
+ctor.workspace = true
+editor = { workspace = true, features = ["test-support"] }
+env_logger.workspace = true
+go_to_line.workspace = true
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
+menu.workspace = true
+project = { workspace = true, features = ["test-support"] }
+serde_json.workspace = true
+workspace = { workspace = true, features = ["test-support"] }

crates/command_palette/LICENSE-GPL

@@ -0,0 +1 @@
+../../LICENSE-GPL

crates/copilot/src/copilot.rs

@@ -21,7 +21,7 @@ use language::{
     point_from_lsp, point_to_lsp, Anchor, Bias, Buffer, BufferSnapshot, Language, PointUtf16,
     ToPointUtf16,
 };
-use lsp::{LanguageServer, LanguageServerBinary, LanguageServerId, LanguageServerName};
+use lsp::{LanguageServer, LanguageServerBinary, LanguageServerId};
 use node_runtime::NodeRuntime;
 use parking_lot::Mutex;
 use request::StatusNotification;
@@ -446,11 +446,9 @@ impl Copilot {
                 Path::new("/")
             };
 
-            let server_name = LanguageServerName("copilot".into());
             let server = LanguageServer::new(
                 Arc::new(Mutex::new(None)),
                 new_server_id,
-                server_name,
                 binary,
                 root_path,
                 None,
@@ -1274,9 +1272,5 @@ mod tests {
         fn load(&self, _: &AppContext) -> Task<Result<String>> {
             unimplemented!()
         }
-
-        fn load_bytes(&self, _cx: &AppContext) -> Task<Result<Vec<u8>>> {
-            unimplemented!()
-        }
     }
 }

crates/editor/src/editor.rs

@@ -96,7 +96,9 @@ use language::{
     CursorShape, Diagnostic, Documentation, IndentKind, IndentSize, Language, OffsetRangeExt,
     Point, Selection, SelectionGoal, TransactionId,
 };
-use language::{point_to_lsp, BufferRow, CharClassifier, Runnable, RunnableRange};
+use language::{
+    point_to_lsp, BufferRow, CharClassifier, LanguageServerName, Runnable, RunnableRange,
+};
 use linked_editing_ranges::refresh_linked_ranges;
 pub use proposed_changes_editor::{
     ProposedChangeLocation, ProposedChangesEditor, ProposedChangesEditorToolbar,
@@ -109,7 +111,7 @@ use hover_links::{find_file, HoverLink, HoveredLinkState, InlayHighlight};
 pub use lsp::CompletionContext;
 use lsp::{
     CompletionItemKind, CompletionTriggerKind, DiagnosticSeverity, InsertTextFormat,
-    LanguageServerId, LanguageServerName,
+    LanguageServerId,
 };
 use mouse_context_menu::MouseContextMenu;
 use movement::TextLayoutDetails;
@@ -126,7 +128,7 @@ use project::{
     lsp_store::{FormatTarget, FormatTrigger},
     project_settings::{GitGutterSetting, ProjectSettings},
     CodeAction, Completion, CompletionIntent, DocumentHighlight, InlayHint, Item, Location,
-    LocationLink, Project, ProjectTransaction, TaskSourceKind,
+    LocationLink, Project, ProjectPath, ProjectTransaction, TaskSourceKind,
 };
 use rand::prelude::*;
 use rpc::{proto::*, ErrorExt};
@@ -1746,15 +1748,6 @@ pub(crate) struct FocusedBlock {
     focus_handle: WeakFocusHandle,
 }
 
-#[derive(Clone)]
-struct JumpData {
-    excerpt_id: ExcerptId,
-    position: Point,
-    anchor: text::Anchor,
-    path: Option<project::ProjectPath>,
-    line_offset_from_top: u32,
-}
-
 impl Editor {
     pub fn single_line(cx: &mut ViewContext<Self>) -> Self {
         let buffer = cx.new_model(|cx| Buffer::local("", cx));
@@ -2510,10 +2503,6 @@ impl Editor {
             return false;
         }
 
-        if self.inline_completions_disabled_in_scope(buffer, buffer_position, cx) {
-            return false;
-        }
-
         if let Some(provider) = self.inline_completion_provider() {
             if let Some(show_inline_completions) = self.show_inline_completions_override {
                 show_inline_completions
@@ -2525,27 +2514,6 @@ impl Editor {
         }
     }
 
-    fn inline_completions_disabled_in_scope(
-        &self,
-        buffer: &Model<Buffer>,
-        buffer_position: language::Anchor,
-        cx: &AppContext,
-    ) -> bool {
-        let snapshot = buffer.read(cx).snapshot();
-        let settings = snapshot.settings_at(buffer_position, cx);
-
-        let Some(scope) = snapshot.language_scope_at(buffer_position) else {
-            return false;
-        };
-
-        scope.override_name().map_or(false, |scope_name| {
-            settings
-                .inline_completions_disabled_in
-                .iter()
-                .any(|s| s == scope_name)
-        })
-    }
-
     pub fn set_use_modal_editing(&mut self, to: bool) {
         self.use_modal_editing = to;
     }
@@ -2564,7 +2532,7 @@ impl Editor {
         cx.invalidate_character_coordinates();
 
         // Copy selections to primary selection buffer
-        #[cfg(any(target_os = "linux", target_os = "freebsd"))]
+        #[cfg(target_os = "linux")]
         if local {
             let selections = self.selections.all::<usize>(cx);
             let buffer_handle = self.buffer.read(cx).read(cx);
@@ -8814,9 +8782,6 @@ impl Editor {
     }
 
     pub fn toggle_comments(&mut self, action: &ToggleComments, cx: &mut ViewContext<Self>) {
-        if self.read_only(cx) {
-            return;
-        }
         let text_layout_details = &self.text_layout_details(cx);
         self.transact(cx, |this, cx| {
             let mut selections = this.selections.all::<MultiBufferPoint>(cx);
@@ -9226,18 +9191,18 @@ impl Editor {
             self.clear_tasks();
             return Task::ready(());
         }
-        let project = self.project.as_ref().map(Model::downgrade);
+        let project = self.project.clone();
         cx.spawn(|this, mut cx| async move {
-            cx.background_executor().timer(UPDATE_DEBOUNCE).await;
-            let Some(project) = project.and_then(|p| p.upgrade()) else {
-                return;
-            };
             let Ok(display_snapshot) = this.update(&mut cx, |this, cx| {
                 this.display_map.update(cx, |map, cx| map.snapshot(cx))
             }) else {
                 return;
             };
 
+            let Some(project) = project else {
+                return;
+            };
+
             let hide_runnables = project
                 .update(&mut cx, |project, cx| {
                     // Do not display any test indicators in non-dev server remote projects.
@@ -12616,85 +12581,49 @@ impl Editor {
     }
 
     pub fn open_excerpts_in_split(&mut self, _: &OpenExcerptsSplit, cx: &mut ViewContext<Self>) {
-        self.open_excerpts_common(None, true, cx)
+        self.open_excerpts_common(true, cx)
     }
 
     pub fn open_excerpts(&mut self, _: &OpenExcerpts, cx: &mut ViewContext<Self>) {
-        self.open_excerpts_common(None, false, cx)
+        self.open_excerpts_common(false, cx)
     }
 
-    fn open_excerpts_common(
-        &mut self,
-        jump_data: Option<JumpData>,
-        split: bool,
-        cx: &mut ViewContext<Self>,
-    ) {
+    fn open_excerpts_common(&mut self, split: bool, cx: &mut ViewContext<Self>) {
+        let selections = self.selections.all::<usize>(cx);
+        let buffer = self.buffer.read(cx);
+        if buffer.is_singleton() {
+            cx.propagate();
+            return;
+        }
+
         let Some(workspace) = self.workspace() else {
             cx.propagate();
             return;
         };
 
-        if self.buffer.read(cx).is_singleton() {
-            cx.propagate();
-            return;
-        }
-
         let mut new_selections_by_buffer = HashMap::default();
-        match &jump_data {
-            Some(jump_data) => {
-                let multi_buffer_snapshot = self.buffer.read(cx).snapshot(cx);
-                if let Some(buffer) = multi_buffer_snapshot
-                    .buffer_id_for_excerpt(jump_data.excerpt_id)
-                    .and_then(|buffer_id| self.buffer.read(cx).buffer(buffer_id))
-                {
-                    let buffer_snapshot = buffer.read(cx).snapshot();
-                    let jump_to_point = if buffer_snapshot.can_resolve(&jump_data.anchor) {
-                        language::ToPoint::to_point(&jump_data.anchor, &buffer_snapshot)
-                    } else {
-                        buffer_snapshot.clip_point(jump_data.position, Bias::Left)
-                    };
-                    let jump_to_offset = buffer_snapshot.point_to_offset(jump_to_point);
-                    new_selections_by_buffer.insert(
-                        buffer,
-                        (
-                            vec![jump_to_offset..jump_to_offset],
-                            Some(jump_data.line_offset_from_top),
-                        ),
-                    );
+        for selection in selections {
+            for (mut buffer_handle, mut range, _) in
+                buffer.range_to_buffer_ranges(selection.range(), cx)
+            {
+                // When editing branch buffers, jump to the corresponding location
+                // in their base buffer.
+                let buffer = buffer_handle.read(cx);
+                if let Some(base_buffer) = buffer.diff_base_buffer() {
+                    range = buffer.range_to_version(range, &base_buffer.read(cx).version());
+                    buffer_handle = base_buffer;
                 }
-            }
-            None => {
-                let selections = self.selections.all::<usize>(cx);
-                let buffer = self.buffer.read(cx);
-                for selection in selections {
-                    for (mut buffer_handle, mut range, _) in
-                        buffer.range_to_buffer_ranges(selection.range(), cx)
-                    {
-                        // When editing branch buffers, jump to the corresponding location
-                        // in their base buffer.
-                        let buffer = buffer_handle.read(cx);
-                        if let Some(base_buffer) = buffer.diff_base_buffer() {
-                            range = buffer.range_to_version(range, &base_buffer.read(cx).version());
-                            buffer_handle = base_buffer;
-                        }
 
-                        if selection.reversed {
-                            mem::swap(&mut range.start, &mut range.end);
-                        }
-                        new_selections_by_buffer
-                            .entry(buffer_handle)
-                            .or_insert((Vec::new(), None))
-                            .0
-                            .push(range)
-                    }
+                if selection.reversed {
+                    mem::swap(&mut range.start, &mut range.end);
                 }
+                new_selections_by_buffer
+                    .entry(buffer_handle)
+                    .or_insert(Vec::new())
+                    .push(range)
             }
         }
 
-        if new_selections_by_buffer.is_empty() {
-            return;
-        }
-
         // We defer the pane interaction because we ourselves are a workspace item
         // and activating a new item causes the pane to call a method on us reentrantly,
         // which panics if we're on the stack.
@@ -12706,25 +12635,73 @@ impl Editor {
                     workspace.active_pane().clone()
                 };
 
-                for (buffer, (ranges, scroll_offset)) in new_selections_by_buffer {
+                for (buffer, ranges) in new_selections_by_buffer {
                     let editor =
                         workspace.open_project_item::<Self>(pane.clone(), buffer, true, true, cx);
                     editor.update(cx, |editor, cx| {
-                        let autoscroll = match scroll_offset {
-                            Some(scroll_offset) => Autoscroll::top_relative(scroll_offset as usize),
-                            None => Autoscroll::newest(),
-                        };
-                        let nav_history = editor.nav_history.take();
-                        editor.change_selections(Some(autoscroll), cx, |s| {
+                        editor.change_selections(Some(Autoscroll::newest()), cx, |s| {
                             s.select_ranges(ranges);
                         });
-                        editor.nav_history = nav_history;
                     });
                 }
             })
         });
     }
 
+    fn jump(
+        &mut self,
+        path: ProjectPath,
+        position: Point,
+        anchor: language::Anchor,
+        offset_from_top: u32,
+        cx: &mut ViewContext<Self>,
+    ) {
+        let workspace = self.workspace();
+        cx.spawn(|_, mut cx| async move {
+            let workspace = workspace.ok_or_else(|| anyhow!("cannot jump without workspace"))?;
+            let editor = workspace.update(&mut cx, |workspace, cx| {
+                // Reset the preview item id before opening the new item
+                workspace.active_pane().update(cx, |pane, cx| {
+                    pane.set_preview_item_id(None, cx);
+                });
+                workspace.open_path_preview(path, None, true, true, cx)
+            })?;
+            let editor = editor
+                .await?
+                .downcast::<Editor>()
+                .ok_or_else(|| anyhow!("opened item was not an editor"))?
+                .downgrade();
+            editor.update(&mut cx, |editor, cx| {
+                let buffer = editor
+                    .buffer()
+                    .read(cx)
+                    .as_singleton()
+                    .ok_or_else(|| anyhow!("cannot jump in a multi-buffer"))?;
+                let buffer = buffer.read(cx);
+                let cursor = if buffer.can_resolve(&anchor) {
+                    language::ToPoint::to_point(&anchor, buffer)
+                } else {
+                    buffer.clip_point(position, Bias::Left)
+                };
+
+                let nav_history = editor.nav_history.take();
+                editor.change_selections(
+                    Some(Autoscroll::top_relative(offset_from_top as usize)),
+                    cx,
+                    |s| {
+                        s.select_ranges([cursor..cursor]);
+                    },
+                );
+                editor.nav_history = nav_history;
+
+                anyhow::Ok(())
+            })??;
+
+            anyhow::Ok(())
+        })
+        .detach_and_log_err(cx);
+    }
+
     fn marked_text_ranges(&self, cx: &AppContext) -> Option<Vec<Range<OffsetUtf16>>> {
         let snapshot = self.buffer.read(cx).read(cx);
         let (_, ranges) = self.text_highlights::<InputComposition>(cx)?;
@@ -13774,7 +13751,10 @@ impl CompletionProvider for Model<Project> {
             return true;
         }
 
-        buffer.completion_triggers().contains(text)
+        buffer
+            .completion_triggers()
+            .iter()
+            .any(|string| string == text)
     }
 }
 
@@ -14950,5 +14930,3 @@ fn check_multiline_range(buffer: &Buffer, range: Range<usize>) -> Range<usize> {
         range.start..range.start
     }
 }
-
-const UPDATE_DEBOUNCE: Duration = Duration::from_millis(50);

crates/editor/src/editor_tests.rs

@@ -4163,48 +4163,21 @@ async fn test_rewrap(cx: &mut TestAppContext) {
 
     let mut cx = EditorTestContext::new(cx).await;
 
-    let language_with_c_comments = Arc::new(Language::new(
-        LanguageConfig {
-            line_comments: vec!["// ".into()],
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-    let language_with_pound_comments = Arc::new(Language::new(
-        LanguageConfig {
-            line_comments: vec!["# ".into()],
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-    let markdown_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "Markdown".into(),
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-    let language_with_doc_comments = Arc::new(Language::new(
-        LanguageConfig {
-            line_comments: vec!["// ".into(), "/// ".into()],
-            ..LanguageConfig::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
+    {
+        let language = Arc::new(Language::new(
+            LanguageConfig {
+                line_comments: vec!["// ".into()],
+                ..LanguageConfig::default()
+            },
+            None,
+        ));
+        cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
 
-    let plaintext_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "Plain Text".into(),
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-
-    assert_rewrap(
-        indoc! {"
+        let unwrapped_text = indoc! {"
             // ˇLorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus auctor, eu lacinia sapien scelerisque. Vivamus sit amet neque et quam tincidunt hendrerit. Praesent semper egestas tellus id dignissim. Pellentesque odio lectus, iaculis ac volutpat et, blandit quis urna. Sed vestibulum nisi sit amet nisl venenatis tempus. Donec molestie blandit quam, et porta nunc laoreet in. Integer sit amet scelerisque nisi. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras egestas porta metus, eu viverra ipsum efficitur quis. Donec luctus eros turpis, id vulputate turpis porttitor id. Aliquam id accumsan eros.
-        "},
-        indoc! {"
+        "};
+
+        let wrapped_text = indoc! {"
             // Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit
             // purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus
             // auctor, eu lacinia sapien scelerisque. Vivamus sit amet neque et quam
@@ -4215,17 +4188,29 @@ async fn test_rewrap(cx: &mut TestAppContext) {
             // dolor sit amet, consectetur adipiscing elit. Cras egestas porta metus, eu
             // viverra ipsum efficitur quis. Donec luctus eros turpis, id vulputate turpis
             // porttitor id. Aliquam id accumsan eros.ˇ
-        "},
-        language_with_c_comments.clone(),
-        &mut cx,
-    );
+        "};
+
+        cx.set_state(unwrapped_text);
+        cx.update_editor(|e, cx| e.rewrap(&Rewrap, cx));
+        cx.assert_editor_state(wrapped_text);
+    }
 
     // Test that rewrapping works inside of a selection
-    assert_rewrap(
-        indoc! {"
+    {
+        let language = Arc::new(Language::new(
+            LanguageConfig {
+                line_comments: vec!["// ".into()],
+                ..LanguageConfig::default()
+            },
+            None,
+        ));
+        cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
+
+        let unwrapped_text = indoc! {"
             «// Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus auctor, eu lacinia sapien scelerisque. Vivamus sit amet neque et quam tincidunt hendrerit. Praesent semper egestas tellus id dignissim. Pellentesque odio lectus, iaculis ac volutpat et, blandit quis urna. Sed vestibulum nisi sit amet nisl venenatis tempus. Donec molestie blandit quam, et porta nunc laoreet in. Integer sit amet scelerisque nisi. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras egestas porta metus, eu viverra ipsum efficitur quis. Donec luctus eros turpis, id vulputate turpis porttitor id. Aliquam id accumsan eros.ˇ»
-        "},
-        indoc! {"
+        "};
+
+        let wrapped_text = indoc! {"
             // Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit
             // purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus
             // auctor, eu lacinia sapien scelerisque. Vivamus sit amet neque et quam
@@ -4236,20 +4221,32 @@ async fn test_rewrap(cx: &mut TestAppContext) {
             // dolor sit amet, consectetur adipiscing elit. Cras egestas porta metus, eu
             // viverra ipsum efficitur quis. Donec luctus eros turpis, id vulputate turpis
             // porttitor id. Aliquam id accumsan eros.ˇ
-        "},
-        language_with_c_comments.clone(),
-        &mut cx,
-    );
+        "};
+
+        cx.set_state(unwrapped_text);
+        cx.update_editor(|e, cx| e.rewrap(&Rewrap, cx));
+        cx.assert_editor_state(wrapped_text);
+    }
 
     // Test that cursors that expand to the same region are collapsed.
-    assert_rewrap(
-        indoc! {"
+    {
+        let language = Arc::new(Language::new(
+            LanguageConfig {
+                line_comments: vec!["// ".into()],
+                ..LanguageConfig::default()
+            },
+            None,
+        ));
+        cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
+
+        let unwrapped_text = indoc! {"
             // ˇLorem ipsum dolor sit amet, consectetur adipiscing elit.
             // ˇVivamus mollis elit purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus auctor, eu lacinia sapien scelerisque.
             // ˇVivamus sit amet neque et quam tincidunt hendrerit. Praesent semper egestas tellus id dignissim. Pellentesque odio lectus, iaculis ac volutpat et,
             // ˇblandit quis urna. Sed vestibulum nisi sit amet nisl venenatis tempus. Donec molestie blandit quam, et porta nunc laoreet in. Integer sit amet scelerisque nisi. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras egestas porta metus, eu viverra ipsum efficitur quis. Donec luctus eros turpis, id vulputate turpis porttitor id. Aliquam id accumsan eros.
-        "},
-        indoc! {"
+        "};
+
+        let wrapped_text = indoc! {"
             // Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit
             // purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus
             // auctor, eu lacinia sapien scelerisque. Vivamus sit amet neque et quam
@@ -4260,21 +4257,33 @@ async fn test_rewrap(cx: &mut TestAppContext) {
             // dolor sit amet, consectetur adipiscing elit. Cras egestas porta metus, eu
             // viverra ipsum efficitur quis. Donec luctus eros turpis, id vulputate turpis
             // porttitor id. Aliquam id accumsan eros.ˇ
-        "},
-        language_with_c_comments.clone(),
-        &mut cx,
-    );
+        "};
+
+        cx.set_state(unwrapped_text);
+        cx.update_editor(|e, cx| e.rewrap(&Rewrap, cx));
+        cx.assert_editor_state(wrapped_text);
+    }
 
     // Test that non-contiguous selections are treated separately.
-    assert_rewrap(
-        indoc! {"
+    {
+        let language = Arc::new(Language::new(
+            LanguageConfig {
+                line_comments: vec!["// ".into()],
+                ..LanguageConfig::default()
+            },
+            None,
+        ));
+        cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
+
+        let unwrapped_text = indoc! {"
             // ˇLorem ipsum dolor sit amet, consectetur adipiscing elit.
             // ˇVivamus mollis elit purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus auctor, eu lacinia sapien scelerisque.
             //
             // ˇVivamus sit amet neque et quam tincidunt hendrerit. Praesent semper egestas tellus id dignissim. Pellentesque odio lectus, iaculis ac volutpat et,
             // ˇblandit quis urna. Sed vestibulum nisi sit amet nisl venenatis tempus. Donec molestie blandit quam, et porta nunc laoreet in. Integer sit amet scelerisque nisi. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras egestas porta metus, eu viverra ipsum efficitur quis. Donec luctus eros turpis, id vulputate turpis porttitor id. Aliquam id accumsan eros.
-        "},
-        indoc! {"
+        "};
+
+        let wrapped_text = indoc! {"
             // Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit
             // purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus
             // auctor, eu lacinia sapien scelerisque.ˇ
@@ -4286,17 +4295,29 @@ async fn test_rewrap(cx: &mut TestAppContext) {
             // nisi. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras egestas
             // porta metus, eu viverra ipsum efficitur quis. Donec luctus eros turpis, id
             // vulputate turpis porttitor id. Aliquam id accumsan eros.ˇ
-        "},
-        language_with_c_comments.clone(),
-        &mut cx,
-    );
+        "};
+
+        cx.set_state(unwrapped_text);
+        cx.update_editor(|e, cx| e.rewrap(&Rewrap, cx));
+        cx.assert_editor_state(wrapped_text);
+    }
 
     // Test that different comment prefixes are supported.
-    assert_rewrap(
-        indoc! {"
+    {
+        let language = Arc::new(Language::new(
+            LanguageConfig {
+                line_comments: vec!["# ".into()],
+                ..LanguageConfig::default()
+            },
+            None,
+        ));
+        cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
+
+        let unwrapped_text = indoc! {"
             # ˇLorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus auctor, eu lacinia sapien scelerisque. Vivamus sit amet neque et quam tincidunt hendrerit. Praesent semper egestas tellus id dignissim. Pellentesque odio lectus, iaculis ac volutpat et, blandit quis urna. Sed vestibulum nisi sit amet nisl venenatis tempus. Donec molestie blandit quam, et porta nunc laoreet in. Integer sit amet scelerisque nisi. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras egestas porta metus, eu viverra ipsum efficitur quis. Donec luctus eros turpis, id vulputate turpis porttitor id. Aliquam id accumsan eros.
-        "},
-        indoc! {"
+        "};
+
+        let wrapped_text = indoc! {"
             # Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit
             # purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus auctor,
             # eu lacinia sapien scelerisque. Vivamus sit amet neque et quam tincidunt
@@ -4307,39 +4328,63 @@ async fn test_rewrap(cx: &mut TestAppContext) {
             # adipiscing elit. Cras egestas porta metus, eu viverra ipsum efficitur quis.
             # Donec luctus eros turpis, id vulputate turpis porttitor id. Aliquam id
             # accumsan eros.ˇ
-        "},
-        language_with_pound_comments.clone(),
-        &mut cx,
-    );
+        "};
+
+        cx.set_state(unwrapped_text);
+        cx.update_editor(|e, cx| e.rewrap(&Rewrap, cx));
+        cx.assert_editor_state(wrapped_text);
+    }
 
     // Test that rewrapping is ignored outside of comments in most languages.
-    assert_rewrap(
-        indoc! {"
+    {
+        let language = Arc::new(Language::new(
+            LanguageConfig {
+                line_comments: vec!["// ".into(), "/// ".into()],
+                ..LanguageConfig::default()
+            },
+            Some(tree_sitter_rust::LANGUAGE.into()),
+        ));
+        cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
+
+        let unwrapped_text = indoc! {"
             /// Adds two numbers.
             /// Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit purus, a ornare lacus gravida vitae.ˇ
             fn add(a: u32, b: u32) -> u32 {
                 a + b + a + b + a + b + a + b + a + b + a + b + a + b + a + b + a + b + a + b + a + b + a + b + a + b + a + b + a + b + a + bˇ
             }
-        "},
-        indoc! {"
+        "};
+
+        let wrapped_text = indoc! {"
             /// Adds two numbers. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
             /// Vivamus mollis elit purus, a ornare lacus gravida vitae.ˇ
             fn add(a: u32, b: u32) -> u32 {
                 a + b + a + b + a + b + a + b + a + b + a + b + a + b + a + b + a + b + a + b + a + b + a + b + a + b + a + b + a + b + a + bˇ
             }
-        "},
-        language_with_doc_comments.clone(),
-        &mut cx,
-    );
+        "};
+
+        cx.set_state(unwrapped_text);
+        cx.update_editor(|e, cx| e.rewrap(&Rewrap, cx));
+        cx.assert_editor_state(wrapped_text);
+    }
 
     // Test that rewrapping works in Markdown and Plain Text languages.
-    assert_rewrap(
-        indoc! {"
+    {
+        let markdown_language = Arc::new(Language::new(
+            LanguageConfig {
+                name: "Markdown".into(),
+                ..LanguageConfig::default()
+            },
+            None,
+        ));
+        cx.update_buffer(|buffer, cx| buffer.set_language(Some(markdown_language), cx));
+
+        let unwrapped_text = indoc! {"
             # Hello
 
             Lorem ipsum dolor sit amet, ˇconsectetur adipiscing elit. Vivamus mollis elit purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus auctor, eu lacinia sapien scelerisque. Vivamus sit amet neque et quam tincidunt hendrerit. Praesent semper egestas tellus id dignissim. Pellentesque odio lectus, iaculis ac volutpat et, blandit quis urna. Sed vestibulum nisi sit amet nisl venenatis tempus. Donec molestie blandit quam, et porta nunc laoreet in. Integer sit amet scelerisque nisi.
-        "},
-        indoc! {"
+        "};
+
+        let wrapped_text = indoc! {"
             # Hello
 
             Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit
@@ -4349,16 +4394,26 @@ async fn test_rewrap(cx: &mut TestAppContext) {
             lectus, iaculis ac volutpat et, blandit quis urna. Sed vestibulum nisi sit amet
             nisl venenatis tempus. Donec molestie blandit quam, et porta nunc laoreet in.
             Integer sit amet scelerisque nisi.ˇ
-        "},
-        markdown_language,
-        &mut cx,
-    );
+        "};
 
-    assert_rewrap(
-        indoc! {"
+        cx.set_state(unwrapped_text);
+        cx.update_editor(|e, cx| e.rewrap(&Rewrap, cx));
+        cx.assert_editor_state(wrapped_text);
+
+        let plaintext_language = Arc::new(Language::new(
+            LanguageConfig {
+                name: "Plain Text".into(),
+                ..LanguageConfig::default()
+            },
+            None,
+        ));
+        cx.update_buffer(|buffer, cx| buffer.set_language(Some(plaintext_language), cx));
+
+        let unwrapped_text = indoc! {"
             Lorem ipsum dolor sit amet, ˇconsectetur adipiscing elit. Vivamus mollis elit purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus auctor, eu lacinia sapien scelerisque. Vivamus sit amet neque et quam tincidunt hendrerit. Praesent semper egestas tellus id dignissim. Pellentesque odio lectus, iaculis ac volutpat et, blandit quis urna. Sed vestibulum nisi sit amet nisl venenatis tempus. Donec molestie blandit quam, et porta nunc laoreet in. Integer sit amet scelerisque nisi.
-        "},
-        indoc! {"
+        "};
+
+        let wrapped_text = indoc! {"
             Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit
             purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus auctor,
             eu lacinia sapien scelerisque. Vivamus sit amet neque et quam tincidunt
@@ -4366,14 +4421,25 @@ async fn test_rewrap(cx: &mut TestAppContext) {
             lectus, iaculis ac volutpat et, blandit quis urna. Sed vestibulum nisi sit amet
             nisl venenatis tempus. Donec molestie blandit quam, et porta nunc laoreet in.
             Integer sit amet scelerisque nisi.ˇ
-        "},
-        plaintext_language,
-        &mut cx,
-    );
+        "};
+
+        cx.set_state(unwrapped_text);
+        cx.update_editor(|e, cx| e.rewrap(&Rewrap, cx));
+        cx.assert_editor_state(wrapped_text);
+    }
 
     // Test rewrapping unaligned comments in a selection.
-    assert_rewrap(
-        indoc! {"
+    {
+        let language = Arc::new(Language::new(
+            LanguageConfig {
+                line_comments: vec!["// ".into(), "/// ".into()],
+                ..LanguageConfig::default()
+            },
+            Some(tree_sitter_rust::LANGUAGE.into()),
+        ));
+        cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
+
+        let unwrapped_text = indoc! {"
             fn foo() {
                 if true {
             «        // Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit purus, a ornare lacus gravida vitae.
@@ -4383,8 +4449,9 @@ async fn test_rewrap(cx: &mut TestAppContext) {
                     //
                 }
             }
-        "},
-        indoc! {"
+        "};
+
+        let wrapped_text = indoc! {"
             fn foo() {
                 if true {
                     // Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus
@@ -4395,13 +4462,13 @@ async fn test_rewrap(cx: &mut TestAppContext) {
                     //
                 }
             }
-        "},
-        language_with_doc_comments.clone(),
-        &mut cx,
-    );
+        "};
 
-    assert_rewrap(
-        indoc! {"
+        cx.set_state(unwrapped_text);
+        cx.update_editor(|e, cx| e.rewrap(&Rewrap, cx));
+        cx.assert_editor_state(wrapped_text);
+
+        let unwrapped_text = indoc! {"
             fn foo() {
                 if true {
             «ˇ        // Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit purus, a ornare lacus gravida vitae.
@@ -4412,8 +4479,9 @@ async fn test_rewrap(cx: &mut TestAppContext) {
                 }
 
             }
-        "},
-        indoc! {"
+        "};
+
+        let wrapped_text = indoc! {"
             fn foo() {
                 if true {
                     // Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus
@@ -4425,19 +4493,8 @@ async fn test_rewrap(cx: &mut TestAppContext) {
                 }
 
             }
-        "},
-        language_with_doc_comments.clone(),
-        &mut cx,
-    );
+        "};
 
-    #[track_caller]
-    fn assert_rewrap(
-        unwrapped_text: &str,
-        wrapped_text: &str,
-        language: Arc<Language>,
-        cx: &mut EditorTestContext,
-    ) {
-        cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
         cx.set_state(unwrapped_text);
         cx.update_editor(|e, cx| e.rewrap(&Rewrap, cx));
         cx.assert_editor_state(wrapped_text);

crates/editor/src/element.rs

@@ -19,14 +19,15 @@ use crate::{
     BlockId, CodeActionsMenu, CursorShape, CustomBlockId, DisplayPoint, DisplayRow,
     DocumentHighlightRead, DocumentHighlightWrite, Editor, EditorMode, EditorSettings,
     EditorSnapshot, EditorStyle, ExpandExcerpts, FocusedBlock, GutterDimensions, HalfPageDown,
-    HalfPageUp, HandleInput, HoveredCursor, HoveredHunk, JumpData, LineDown, LineUp, OpenExcerpts,
-    PageDown, PageUp, Point, RowExt, RowRangeExt, SelectPhase, Selection, SoftWrap, ToPoint,
+    HalfPageUp, HandleInput, HoveredCursor, HoveredHunk, LineDown, LineUp, OpenExcerpts, PageDown,
+    PageUp, Point, RowExt, RowRangeExt, SelectPhase, Selection, SoftWrap, ToPoint,
     CURSORS_VISIBLE_FOR, FILE_HEADER_HEIGHT, GIT_BLAME_MAX_AUTHOR_CHARS_DISPLAYED, MAX_LINE_LEN,
     MULTI_BUFFER_EXCERPT_HEADER_HEIGHT,
 };
 use client::ParticipantIndex;
 use collections::{BTreeMap, HashMap, HashSet};
 use git::{blame::BlameEntry, diff::DiffHunkStatus, Oid};
+use gpui::Subscription;
 use gpui::{
     anchored, deferred, div, fill, outline, point, px, quad, relative, size, svg,
     transparent_black, Action, AnchorCorner, AnyElement, AvailableSpace, Bounds, ClipboardItem,
@@ -37,7 +38,6 @@ use gpui::{
     StatefulInteractiveElement, Style, Styled, TextRun, TextStyle, TextStyleRefinement, View,
     ViewContext, WeakView, WindowContext,
 };
-use gpui::{ClickEvent, Subscription};
 use itertools::Itertools;
 use language::{
     language_settings::{
@@ -650,14 +650,12 @@ impl EditorElement {
             cx.stop_propagation();
         } else if end_selection && pending_nonempty_selections {
             cx.stop_propagation();
-        } else if cfg!(any(target_os = "linux", target_os = "freebsd"))
-            && event.button == MouseButton::Middle
-        {
+        } else if cfg!(target_os = "linux") && event.button == MouseButton::Middle {
             if !text_hitbox.is_hovered(cx) || editor.read_only(cx) {
                 return;
             }
 
-            #[cfg(any(target_os = "linux", target_os = "freebsd"))]
+            #[cfg(target_os = "linux")]
             if EditorSettings::get_global(cx).middle_click_paste {
                 if let Some(text) = cx.read_from_primary().and_then(|item| item.text()) {
                     let point_for_position =
@@ -2135,6 +2133,14 @@ impl EditorElement {
                 height,
                 ..
             } => {
+                #[derive(Clone)]
+                struct JumpData {
+                    position: Point,
+                    anchor: text::Anchor,
+                    path: ProjectPath,
+                    line_offset_from_top: u32,
+                }
+
                 let icon_offset = gutter_dimensions.width
                     - (gutter_dimensions.left_padding + gutter_dimensions.margin);
 
@@ -2163,12 +2169,11 @@ impl EditorElement {
                 if let Some(next_excerpt) = next_excerpt {
                     let buffer = &next_excerpt.buffer;
                     let range = &next_excerpt.range;
-                    let jump_data = {
-                        let jump_path =
-                            project::File::from_dyn(buffer.file()).map(|file| ProjectPath {
-                                worktree_id: file.worktree_id(cx),
-                                path: file.path.clone(),
-                            });
+                    let jump_data = project::File::from_dyn(buffer.file()).map(|file| {
+                        let jump_path = ProjectPath {
+                            worktree_id: file.worktree_id(cx),
+                            path: file.path.clone(),
+                        };
                         let jump_anchor = range
                             .primary
                             .as_ref()
@@ -2183,20 +2188,21 @@ impl EditorElement {
                                 language::ToPoint::to_point(&jump_anchor, buffer).row;
                             jump_position.row - excerpt_start_row
                         };
+
                         let line_offset_from_top =
                             block_row_start.0 + *height + offset_from_excerpt_start
                                 - snapshot
                                     .scroll_anchor
                                     .scroll_position(&snapshot.display_snapshot)
                                     .y as u32;
+
                         JumpData {
-                            excerpt_id: next_excerpt.id,
+                            position: jump_position,
                             anchor: jump_anchor,
-                            position: language::ToPoint::to_point(&jump_anchor, buffer),
                             path: jump_path,
                             line_offset_from_top,
                         }
-                    };
+                    });
 
                     if *starts_new_buffer {
                         let include_root = self
@@ -2251,23 +2257,31 @@ impl EditorElement {
                                                     }),
                                             ),
                                         )
-                                        .child(Icon::new(IconName::ArrowUpRight))
-                                        .cursor_pointer()
-                                        .tooltip(|cx| {
-                                            Tooltip::for_action("Jump to File", &OpenExcerpts, cx)
-                                        })
-                                        .on_mouse_down(MouseButton::Left, |_, cx| {
-                                            cx.stop_propagation()
-                                        })
-                                        .on_click(cx.listener_for(&self.editor, {
-                                            move |editor, e: &ClickEvent, cx| {
-                                                editor.open_excerpts_common(
-                                                    Some(jump_data.clone()),
-                                                    e.down.modifiers.secondary(),
-                                                    cx,
-                                                );
-                                            }
-                                        })),
+                                        .when_some(jump_data, |el, jump_data| {
+                                            el.child(Icon::new(IconName::ArrowUpRight))
+                                                .cursor_pointer()
+                                                .tooltip(|cx| {
+                                                    Tooltip::for_action(
+                                                        "Jump to File",
+                                                        &OpenExcerpts,
+                                                        cx,
+                                                    )
+                                                })
+                                                .on_mouse_down(MouseButton::Left, |_, cx| {
+                                                    cx.stop_propagation()
+                                                })
+                                                .on_click(cx.listener_for(&self.editor, {
+                                                    move |editor, _, cx| {
+                                                        editor.jump(
+                                                            jump_data.path.clone(),
+                                                            jump_data.position,
+                                                            jump_data.anchor,
+                                                            jump_data.line_offset_from_top,
+                                                            cx,
+                                                        );
+                                                    }
+                                                }))
+                                        }),
                                 ),
                         );
                         if *show_excerpt_controls {
@@ -2286,7 +2300,6 @@ impl EditorElement {
                             );
                         }
                     } else {
-                        let editor = self.editor.clone();
                         result = result.child(
                             h_flex()
                                 .id("excerpt header block")
@@ -2307,52 +2320,33 @@ impl EditorElement {
                                         }),
                                 )
                                 .cursor_pointer()
-                                .on_click({
-                                    let jump_data = jump_data.clone();
-                                    cx.listener_for(&self.editor, {
-                                        let jump_data = jump_data.clone();
-                                        move |editor, e: &ClickEvent, cx| {
+                                .when_some(jump_data.clone(), |this, jump_data| {
+                                    this.on_click(cx.listener_for(&self.editor, {
+                                        let path = jump_data.path.clone();
+                                        move |editor, _, cx| {
                                             cx.stop_propagation();
-                                            editor.open_excerpts_common(
-                                                Some(jump_data.clone()),
-                                                e.down.modifiers.secondary(),
+
+                                            editor.jump(
+                                                path.clone(),
+                                                jump_data.position,
+                                                jump_data.anchor,
+                                                jump_data.line_offset_from_top,
                                                 cx,
                                             );
                                         }
+                                    }))
+                                    .tooltip(move |cx| {
+                                        Tooltip::for_action(
+                                            format!(
+                                                "Jump to {}:L{}",
+                                                jump_data.path.path.display(),
+                                                jump_data.position.row + 1
+                                            ),
+                                            &OpenExcerpts,
+                                            cx,
+                                        )
                                     })
                                 })
-                                .tooltip({
-                                    let jump_data = jump_data.clone();
-                                    move |cx| {
-                                        let jump_message = format!(
-                                            "Jump to {}:L{}",
-                                            match &jump_data.path {
-                                                Some(project_path) =>
-                                                    project_path.path.display().to_string(),
-                                                None => {
-                                                    let editor = editor.read(cx);
-                                                    editor
-                                                        .file_at(jump_data.position, cx)
-                                                        .map(|file| {
-                                                            file.full_path(cx).display().to_string()
-                                                        })
-                                                        .or_else(|| {
-                                                            Some(
-                                                                editor
-                                                                    .tab_description(0, cx)?
-                                                                    .to_string(),
-                                                            )
-                                                        })
-                                                        .unwrap_or_else(|| {
-                                                            "Unknown buffer".to_string()
-                                                        })
-                                                }
-                                            },
-                                            jump_data.position.row + 1
-                                        );
-                                        Tooltip::for_action(jump_message, &OpenExcerpts, cx)
-                                    }
-                                })
                                 .child(
                                     h_flex()
                                         .w(icon_offset)

crates/evals/Cargo.toml

@@ -30,9 +30,9 @@ languages.workspace = true
 node_runtime.workspace = true
 open_ai.workspace = true
 project.workspace = true
-reqwest_client.workspace = true
+semantic_index.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 smol.workspace = true
-zed_common.workspace = true
+reqwest_client.workspace = true

crates/evals/src/eval.rs

@@ -13,6 +13,9 @@ use node_runtime::NodeRuntime;
 use open_ai::OpenAiEmbeddingModel;
 use project::Project;
 use reqwest_client::ReqwestClient;
+use semantic_index::{
+    EmbeddingProvider, OpenAiEmbeddingProvider, ProjectIndex, SemanticDb, Status,
+};
 use serde::{Deserialize, Serialize};
 use settings::SettingsStore;
 use smol::channel::bounded;
@@ -30,9 +33,6 @@ use std::{
         Arc,
     },
 };
-use zed_common::semantic_index::{
-    EmbeddingProvider, OpenAiEmbeddingProvider, ProjectIndex, SemanticDb, Status,
-};
 
 const CODESEARCH_NET_DIR: &'static str = "target/datasets/code-search-net";
 const EVAL_REPOS_DIR: &'static str = "target/datasets/eval-repos";