chore: Make terminal_view own the TerminalSlashCommand

This reduces 'touch crates/editor/src/editor.rs && cargo +nightly build' from 8.9s to 8.5s. That same scenario used to take 8s less than a week ago. :)
This commit is contained in:
Piotr Osiewicz 2025-05-21 10:20:54 +02:00
parent 77c2aecf93
commit a3513fb2b2
10 changed files with 27 additions and 22 deletions

3
Cargo.lock generated
View file

@ -611,7 +611,6 @@ dependencies = [
"serde_json", "serde_json",
"settings", "settings",
"smol", "smol",
"terminal_view",
"text", "text",
"toml 0.8.20", "toml 0.8.20",
"ui", "ui",
@ -5016,6 +5015,7 @@ dependencies = [
"shellexpand 2.1.2", "shellexpand 2.1.2",
"smol", "smol",
"telemetry", "telemetry",
"terminal_view",
"toml 0.8.20", "toml 0.8.20",
"unindent", "unindent",
"util", "util",
@ -15616,6 +15616,7 @@ name = "terminal_view"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"assistant_slash_command",
"async-recursion 1.1.1", "async-recursion 1.1.1",
"breadcrumbs", "breadcrumbs",
"client", "client",

View file

@ -217,7 +217,6 @@ fn register_slash_commands(cx: &mut App) {
slash_command_registry.register_command(assistant_slash_commands::PromptSlashCommand, true); slash_command_registry.register_command(assistant_slash_commands::PromptSlashCommand, true);
slash_command_registry.register_command(assistant_slash_commands::SelectionCommand, true); slash_command_registry.register_command(assistant_slash_commands::SelectionCommand, true);
slash_command_registry.register_command(assistant_slash_commands::DefaultSlashCommand, false); slash_command_registry.register_command(assistant_slash_commands::DefaultSlashCommand, false);
slash_command_registry.register_command(assistant_slash_commands::TerminalSlashCommand, true);
slash_command_registry.register_command(assistant_slash_commands::NowSlashCommand, false); slash_command_registry.register_command(assistant_slash_commands::NowSlashCommand, false);
slash_command_registry slash_command_registry
.register_command(assistant_slash_commands::DiagnosticsSlashCommand, true); .register_command(assistant_slash_commands::DiagnosticsSlashCommand, true);

View file

@ -9,6 +9,7 @@ use anyhow::Result;
use futures::StreamExt; use futures::StreamExt;
use futures::stream::{self, BoxStream}; use futures::stream::{self, BoxStream};
use gpui::{App, SharedString, Task, WeakEntity, Window}; use gpui::{App, SharedString, Task, WeakEntity, Window};
use language::HighlightId;
use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate, OffsetRangeExt}; use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate, OffsetRangeExt};
pub use language_model::Role; pub use language_model::Role;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -16,6 +17,7 @@ use std::{
ops::Range, ops::Range,
sync::{Arc, atomic::AtomicBool}, sync::{Arc, atomic::AtomicBool},
}; };
use ui::ActiveTheme;
use workspace::{Workspace, ui::IconName}; use workspace::{Workspace, ui::IconName};
pub fn init(cx: &mut App) { pub fn init(cx: &mut App) {
@ -325,6 +327,18 @@ impl SlashCommandLine {
} }
} }
pub fn create_label_for_command(command_name: &str, arguments: &[&str], cx: &App) -> CodeLabel {
let mut label = CodeLabel::default();
label.push_str(command_name, None);
label.push_str(" ", None);
label.push_str(
&arguments.join(" "),
cx.theme().syntax().highlight_id("comment").map(HighlightId),
);
label.filter_range = 0..command_name.len();
label
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use pretty_assertions::assert_eq; use pretty_assertions::assert_eq;

View file

@ -35,7 +35,6 @@ rope.workspace = true
serde.workspace = true serde.workspace = true
serde_json.workspace = true serde_json.workspace = true
smol.workspace = true smol.workspace = true
terminal_view.workspace = true
text.workspace = true text.workspace = true
toml.workspace = true toml.workspace = true
ui.workspace = true ui.workspace = true

View file

@ -12,11 +12,6 @@ mod selection_command;
mod streaming_example_command; mod streaming_example_command;
mod symbols_command; mod symbols_command;
mod tab_command; mod tab_command;
mod terminal_command;
use gpui::App;
use language::{CodeLabel, HighlightId};
use ui::ActiveTheme as _;
pub use crate::cargo_workspace_command::*; pub use crate::cargo_workspace_command::*;
pub use crate::context_server_command::*; pub use crate::context_server_command::*;
@ -32,16 +27,5 @@ pub use crate::selection_command::*;
pub use crate::streaming_example_command::*; pub use crate::streaming_example_command::*;
pub use crate::symbols_command::*; pub use crate::symbols_command::*;
pub use crate::tab_command::*; pub use crate::tab_command::*;
pub use crate::terminal_command::*;
pub fn create_label_for_command(command_name: &str, arguments: &[&str], cx: &App) -> CodeLabel { use assistant_slash_command::create_label_for_command;
let mut label = CodeLabel::default();
label.push_str(command_name, None);
label.push_str(" ", None);
label.push_str(
&arguments.join(" "),
cx.theme().syntax().highlight_id("comment").map(HighlightId),
);
label.filter_range = 0..command_name.len();
label
}

View file

@ -61,6 +61,7 @@ settings.workspace = true
shellexpand.workspace = true shellexpand.workspace = true
smol.workspace = true smol.workspace = true
telemetry.workspace = true telemetry.workspace = true
terminal_view.workspace = true
toml.workspace = true toml.workspace = true
unindent.workspace = true unindent.workspace = true
util.workspace = true util.workspace = true

View file

@ -424,6 +424,7 @@ pub fn init(cx: &mut App) -> Arc<AgentAppState> {
language_models::init(user_store.clone(), client.clone(), fs.clone(), cx); language_models::init(user_store.clone(), client.clone(), fs.clone(), cx);
languages::init(languages.clone(), node_runtime.clone(), cx); languages::init(languages.clone(), node_runtime.clone(), cx);
prompt_store::init(cx); prompt_store::init(cx);
terminal_view::init(cx);
let stdout_is_a_pty = false; let stdout_is_a_pty = false;
let prompt_builder = PromptBuilder::load(fs.clone(), stdout_is_a_pty, cx); let prompt_builder = PromptBuilder::load(fs.clone(), stdout_is_a_pty, cx);
agent::init( agent::init(

View file

@ -18,6 +18,7 @@ doctest = false
[dependencies] [dependencies]
anyhow.workspace = true anyhow.workspace = true
async-recursion.workspace = true async-recursion.workspace = true
assistant_slash_command.workspace = true
breadcrumbs.workspace = true breadcrumbs.workspace = true
collections.workspace = true collections.workspace = true
db.workspace = true db.workspace = true

View file

@ -1,6 +1,7 @@
use std::sync::Arc; use std::sync::Arc;
use std::sync::atomic::AtomicBool; use std::sync::atomic::AtomicBool;
use crate::{TerminalView, terminal_panel::TerminalPanel};
use anyhow::Result; use anyhow::Result;
use assistant_slash_command::{ use assistant_slash_command::{
ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection, ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
@ -8,11 +9,10 @@ use assistant_slash_command::{
}; };
use gpui::{App, Entity, Task, WeakEntity}; use gpui::{App, Entity, Task, WeakEntity};
use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate}; use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate};
use terminal_view::{TerminalView, terminal_panel::TerminalPanel};
use ui::prelude::*; use ui::prelude::*;
use workspace::{Workspace, dock::Panel}; use workspace::{Workspace, dock::Panel};
use super::create_label_for_command; use assistant_slash_command::create_label_for_command;
pub struct TerminalSlashCommand; pub struct TerminalSlashCommand;

View file

@ -2,8 +2,10 @@ mod persistence;
pub mod terminal_element; pub mod terminal_element;
pub mod terminal_panel; pub mod terminal_panel;
pub mod terminal_scrollbar; pub mod terminal_scrollbar;
mod terminal_slash_command;
pub mod terminal_tab_tooltip; pub mod terminal_tab_tooltip;
use assistant_slash_command::SlashCommandRegistry;
use editor::{Editor, EditorSettings, actions::SelectAll, scroll::ScrollbarAutoHide}; use editor::{Editor, EditorSettings, actions::SelectAll, scroll::ScrollbarAutoHide};
use gpui::{ use gpui::{
AnyElement, App, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, KeyContext, AnyElement, App, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, KeyContext,
@ -29,6 +31,7 @@ use terminal::{
use terminal_element::{TerminalElement, is_blank}; use terminal_element::{TerminalElement, is_blank};
use terminal_panel::TerminalPanel; use terminal_panel::TerminalPanel;
use terminal_scrollbar::TerminalScrollHandle; use terminal_scrollbar::TerminalScrollHandle;
use terminal_slash_command::TerminalSlashCommand;
use terminal_tab_tooltip::TerminalTooltip; use terminal_tab_tooltip::TerminalTooltip;
use ui::{ use ui::{
ContextMenu, Icon, IconName, Label, Scrollbar, ScrollbarState, Tooltip, h_flex, prelude::*, ContextMenu, Icon, IconName, Label, Scrollbar, ScrollbarState, Tooltip, h_flex, prelude::*,
@ -78,6 +81,7 @@ actions!(terminal, [RerunTask]);
impl_actions!(terminal, [SendText, SendKeystroke]); impl_actions!(terminal, [SendText, SendKeystroke]);
pub fn init(cx: &mut App) { pub fn init(cx: &mut App) {
assistant_slash_command::init(cx);
terminal_panel::init(cx); terminal_panel::init(cx);
terminal::init(cx); terminal::init(cx);
@ -87,6 +91,7 @@ pub fn init(cx: &mut App) {
workspace.register_action(TerminalView::deploy); workspace.register_action(TerminalView::deploy);
}) })
.detach(); .detach();
SlashCommandRegistry::global(cx).register_command(TerminalSlashCommand, true);
} }
pub struct BlockProperties { pub struct BlockProperties {