Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 77dadfe

Browse files
chore: Make terminal_view own the TerminalSlashCommand (#31070)
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. :) I'm measuring with nightly rustc, because it's compile times are better than those of stable thanks to rust-lang/rust#138522 main (8.2s total): ![image](https://github.com/user-attachments/assets/767a2ac4-7bba-4147-bd16-9b09eed5b433) [cargo-timing.html.zip](https://github.com/user-attachments/files/20364175/cargo-timing.html.zip) #22be776 (7.5s total): [cargo-timing-20250521T085303.892834Z.html.zip](https://github.com/user-attachments/files/20364391/cargo-timing-20250521T085303.892834Z.html.zip) ![image](https://github.com/user-attachments/assets/c4476df9-cb6e-4403-b0db-de00521f1fd0) Release Notes: - N/A
1 parent 0023b37 commit 77dadfe

File tree

22 files changed

+42
-92
lines changed

22 files changed

+42
-92
lines changed

‎Cargo.lock‎

Lines changed: 5 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ members = [
8080
"crates/language",
8181
"crates/language_extension",
8282
"crates/language_model",
83-
"crates/language_model_selector",
8483
"crates/language_models",
8584
"crates/language_selector",
8685
"crates/language_tools",
@@ -287,7 +286,6 @@ journal = { path = "crates/journal" }
287286
language = { path = "crates/language" }
288287
language_extension = { path = "crates/language_extension" }
289288
language_model = { path = "crates/language_model" }
290-
language_model_selector = { path = "crates/language_model_selector" }
291289
language_models = { path = "crates/language_models" }
292290
language_selector = { path = "crates/language_selector" }
293291
language_tools = { path = "crates/language_tools" }

‎crates/agent/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ itertools.workspace = true
5252
jsonschema.workspace = true
5353
language.workspace = true
5454
language_model.workspace = true
55-
language_model_selector.workspace = true
5655
log.workspace = true
5756
lsp.workspace = true
5857
markdown.workspace = true

‎crates/agent/src/agent.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ fn register_slash_commands(cx: &mut App) {
217217
slash_command_registry.register_command(assistant_slash_commands::PromptSlashCommand, true);
218218
slash_command_registry.register_command(assistant_slash_commands::SelectionCommand, true);
219219
slash_command_registry.register_command(assistant_slash_commands::DefaultSlashCommand, false);
220-
slash_command_registry.register_command(assistant_slash_commands::TerminalSlashCommand, true);
221220
slash_command_registry.register_command(assistant_slash_commands::NowSlashCommand, false);
222221
slash_command_registry
223222
.register_command(assistant_slash_commands::DiagnosticsSlashCommand, true);

‎crates/agent/src/agent_model_selector.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ use fs::Fs;
33
use gpui::{Entity, FocusHandle, SharedString};
44

55
use crate::Thread;
6-
use language_model::{ConfiguredModel, LanguageModelRegistry};
7-
use language_model_selector::{
6+
use assistant_context_editor::language_model_selector::{
87
LanguageModelSelector, LanguageModelSelectorPopoverMenu, ToggleModelSelector,
98
};
9+
use language_model::{ConfiguredModel, LanguageModelRegistry};
1010
use settings::update_settings_file;
1111
use std::sync::Arc;
1212
use ui::{PopoverMenuHandle, Tooltip, prelude::*};

‎crates/agent/src/agent_panel.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ use assistant_settings::{AssistantDockPosition, AssistantSettings};
1717
use assistant_slash_command::SlashCommandWorkingSet;
1818
use assistant_tool::ToolWorkingSet;
1919

20+
use assistant_context_editor::language_model_selector::ToggleModelSelector;
2021
use client::{UserStore, zed_urls};
2122
use editor::{Anchor, AnchorRangeExt as _, Editor, EditorEvent, MultiBuffer};
2223
use fs::Fs;
@@ -30,7 +31,6 @@ use language::LanguageRegistry;
3031
use language_model::{
3132
LanguageModelProviderTosView, LanguageModelRegistry, RequestUsage, ZED_CLOUD_PROVIDER_ID,
3233
};
33-
use language_model_selector::ToggleModelSelector;
3434
use project::{Project, ProjectPath, Worktree};
3535
use prompt_store::{PromptBuilder, PromptStore, UserPromptId};
3636
use proto::Plan;

‎crates/agent/src/inline_prompt_editor.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use crate::terminal_codegen::TerminalCodegen;
99
use crate::thread_store::{TextThreadStore, ThreadStore};
1010
use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist};
1111
use crate::{RemoveAllContext, ToggleContextPicker};
12+
use assistant_context_editor::language_model_selector::ToggleModelSelector;
1213
use client::ErrorExt;
1314
use collections::VecDeque;
1415
use db::kvp::Dismissable;
@@ -24,7 +25,6 @@ use gpui::{
2425
Focusable, FontWeight, Subscription, TextStyle, WeakEntity, Window, anchored, deferred, point,
2526
};
2627
use language_model::{LanguageModel, LanguageModelRegistry};
27-
use language_model_selector::ToggleModelSelector;
2828
use parking_lot::Mutex;
2929
use settings::Settings;
3030
use std::cmp;

‎crates/agent/src/message_editor.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use crate::ui::{
88
AnimatedLabel, MaxModeTooltip,
99
preview::{AgentPreview, UsageCallout},
1010
};
11+
use assistant_context_editor::language_model_selector::ToggleModelSelector;
1112
use assistant_settings::{AssistantSettings, CompletionMode};
1213
use buffer_diff::BufferDiff;
1314
use client::UserStore;
@@ -30,7 +31,6 @@ use language_model::{
3031
ConfiguredModel, LanguageModelRequestMessage, MessageContent, RequestUsage,
3132
ZED_CLOUD_PROVIDER_ID,
3233
};
33-
use language_model_selector::ToggleModelSelector;
3434
use multi_buffer;
3535
use project::Project;
3636
use prompt_store::PromptStore;

‎crates/assistant_context_editor/Cargo.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,24 @@ clock.workspace = true
2222
collections.workspace = true
2323
context_server.workspace = true
2424
editor.workspace = true
25+
feature_flags.workspace = true
2526
fs.workspace = true
2627
futures.workspace = true
2728
fuzzy.workspace = true
2829
gpui.workspace = true
2930
indexed_docs.workspace = true
3031
language.workspace = true
3132
language_model.workspace = true
32-
language_model_selector.workspace = true
3333
log.workspace = true
3434
multi_buffer.workspace = true
3535
open_ai.workspace = true
36+
ordered-float.workspace = true
3637
parking_lot.workspace = true
3738
paths.workspace = true
3839
picker.workspace = true
3940
project.workspace = true
4041
prompt_store.workspace = true
42+
proto.workspace = true
4143
regex.workspace = true
4244
rope.workspace = true
4345
rpc.workspace = true

‎crates/assistant_context_editor/src/assistant_context_editor.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ mod context;
22
mod context_editor;
33
mod context_history;
44
mod context_store;
5+
pub mod language_model_selector;
56
mod slash_command;
67
mod slash_command_picker;
78

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /