Detailed changes
@@ -226,9 +226,9 @@ dependencies = [
[[package]]
name = "agent-client-protocol"
-version = "0.9.0"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2ffe7d502c1e451aafc5aff655000f84d09c9af681354ac0012527009b1af13"
+checksum = "d3e527d7dfe0f334313d42d1d9318f0a79665f6f21c440d0798f230a77a7ed6c"
dependencies = [
"agent-client-protocol-schema",
"anyhow",
@@ -243,9 +243,9 @@ dependencies = [
[[package]]
name = "agent-client-protocol-schema"
-version = "0.10.0"
+version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8af81cc2d5c3f9c04f73db452efd058333735ba9d51c2cf7ef33c9fee038e7e6"
+checksum = "6903a00e8ac822f9bacac59a1932754d7387c72ebb7c9c7439ad021505591da4"
dependencies = [
"anyhow",
"derive_more 2.0.1",
@@ -793,7 +793,7 @@ dependencies = [
"url",
"wayland-backend",
"wayland-client",
- "wayland-protocols 0.32.9",
+ "wayland-protocols",
"zbus",
]
@@ -7379,7 +7379,7 @@ dependencies = [
"wayland-backend",
"wayland-client",
"wayland-cursor",
- "wayland-protocols 0.31.2",
+ "wayland-protocols",
"wayland-protocols-plasma",
"wayland-protocols-wlr",
"windows 0.61.3",
@@ -12656,6 +12656,8 @@ dependencies = [
"paths",
"rope",
"serde",
+ "strum 0.27.2",
+ "tempfile",
"text",
"util",
"uuid",
@@ -18894,18 +18896,6 @@ dependencies = [
"xcursor",
]
-[[package]]
-name = "wayland-protocols"
-version = "0.31.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4"
-dependencies = [
- "bitflags 2.9.4",
- "wayland-backend",
- "wayland-client",
- "wayland-scanner",
-]
-
[[package]]
name = "wayland-protocols"
version = "0.32.9"
@@ -18920,14 +18910,14 @@ dependencies = [
[[package]]
name = "wayland-protocols-plasma"
-version = "0.2.0"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479"
+checksum = "a07a14257c077ab3279987c4f8bb987851bf57081b93710381daea94f2c2c032"
dependencies = [
"bitflags 2.9.4",
"wayland-backend",
"wayland-client",
- "wayland-protocols 0.31.2",
+ "wayland-protocols",
"wayland-scanner",
]
@@ -18940,7 +18930,7 @@ dependencies = [
"bitflags 2.9.4",
"wayland-backend",
"wayland-client",
- "wayland-protocols 0.32.9",
+ "wayland-protocols",
"wayland-scanner",
]
@@ -428,7 +428,7 @@ ztracing_macro = { path = "crates/ztracing_macro" }
# External crates
#
-agent-client-protocol = { version = "=0.9.0", features = ["unstable"] }
+agent-client-protocol = { version = "=0.9.2", features = ["unstable"] }
aho-corasick = "1.1"
alacritty_terminal = "0.25.1-rc1"
any_vec = "0.14"
@@ -20,7 +20,6 @@ Other platforms are not yet available:
- [Building Zed for macOS](./docs/src/development/macos.md)
- [Building Zed for Linux](./docs/src/development/linux.md)
- [Building Zed for Windows](./docs/src/development/windows.md)
-- [Running Collaboration Locally](./docs/src/development/local-collaboration.md)
### Contributing
@@ -227,6 +227,7 @@
"ctrl-g": "search::SelectNextMatch",
"ctrl-shift-g": "search::SelectPreviousMatch",
"ctrl-k l": "agent::OpenRulesLibrary",
+ "ctrl-shift-v": "agent::PasteRaw",
},
},
{
@@ -293,6 +294,7 @@
"shift-ctrl-r": "agent::OpenAgentDiff",
"ctrl-shift-y": "agent::KeepAll",
"ctrl-shift-n": "agent::RejectAll",
+ "ctrl-shift-v": "agent::PasteRaw",
},
},
{
@@ -304,6 +306,7 @@
"shift-ctrl-r": "agent::OpenAgentDiff",
"ctrl-shift-y": "agent::KeepAll",
"ctrl-shift-n": "agent::RejectAll",
+ "ctrl-shift-v": "agent::PasteRaw",
},
},
{
@@ -267,6 +267,7 @@
"cmd-shift-g": "search::SelectPreviousMatch",
"cmd-k l": "agent::OpenRulesLibrary",
"alt-tab": "agent::CycleFavoriteModels",
+ "cmd-shift-v": "agent::PasteRaw",
},
},
{
@@ -335,6 +336,7 @@
"shift-ctrl-r": "agent::OpenAgentDiff",
"cmd-shift-y": "agent::KeepAll",
"cmd-shift-n": "agent::RejectAll",
+ "cmd-shift-v": "agent::PasteRaw",
},
},
{
@@ -347,6 +349,7 @@
"shift-ctrl-r": "agent::OpenAgentDiff",
"cmd-shift-y": "agent::KeepAll",
"cmd-shift-n": "agent::RejectAll",
+ "cmd-shift-v": "agent::PasteRaw",
},
},
{
@@ -227,6 +227,7 @@
"ctrl-g": "search::SelectNextMatch",
"ctrl-shift-g": "search::SelectPreviousMatch",
"ctrl-k l": "agent::OpenRulesLibrary",
+ "ctrl-shift-v": "agent::PasteRaw",
},
},
{
@@ -296,6 +297,7 @@
"ctrl-shift-r": "agent::OpenAgentDiff",
"ctrl-shift-y": "agent::KeepAll",
"ctrl-shift-n": "agent::RejectAll",
+ "ctrl-shift-v": "agent::PasteRaw",
},
},
{
@@ -308,6 +310,7 @@
"ctrl-shift-r": "agent::OpenAgentDiff",
"ctrl-shift-y": "agent::KeepAll",
"ctrl-shift-n": "agent::RejectAll",
+ "ctrl-shift-v": "agent::PasteRaw",
},
},
{
@@ -1321,6 +1321,14 @@
"hidden_files": ["**/.*"],
// Git gutter behavior configuration.
"git": {
+ // Global switch to enable or disable all git integration features.
+ // If set to true, disables all git integration features.
+ // If set to false, individual git integration features below will be independently enabled or disabled.
+ "disable_git": false,
+ // Whether to enable git status tracking.
+ "enable_status": true,
+ // Whether to enable git diff display.
+ "enable_diff": true,
// Control whether the git gutter is shown. May take 2 values:
// 1. Show the gutter
// "git_gutter": "tracked_files"
@@ -30,7 +30,7 @@ use futures::{StreamExt, future};
use gpui::{
App, AppContext, AsyncApp, Context, Entity, SharedString, Subscription, Task, WeakEntity,
};
-use language_model::{LanguageModel, LanguageModelProvider, LanguageModelRegistry};
+use language_model::{IconOrSvg, LanguageModel, LanguageModelProvider, LanguageModelRegistry};
use project::{Project, ProjectItem, ProjectPath, Worktree};
use prompt_store::{
ProjectContext, PromptStore, RULES_FILE_NAMES, RulesFileContext, UserRulesContext,
@@ -169,7 +169,7 @@ impl LanguageModels {
fn authenticate_all_language_model_providers(cx: &mut App) -> Task<()> {
let authenticate_all_providers = LanguageModelRegistry::global(cx)
.read(cx)
- .providers()
+ .visible_providers()
.iter()
.map(|provider| (provider.id(), provider.name(), provider.authenticate(cx)))
.collect::<Vec<_>>();
@@ -431,7 +431,7 @@ impl NativeAgent {
.into_iter()
.flat_map(|(contents, prompt_metadata)| match contents {
Ok(contents) => Some(UserRulesContext {
- uuid: prompt_metadata.id.user_id()?,
+ uuid: prompt_metadata.id.as_user()?,
title: prompt_metadata.title.map(|title| title.to_string()),
contents,
}),
@@ -34,7 +34,7 @@ use theme::ThemeSettings;
use ui::prelude::*;
use util::{ResultExt, debug_panic};
use workspace::{CollaboratorId, Workspace};
-use zed_actions::agent::Chat;
+use zed_actions::agent::{Chat, PasteRaw};
pub struct MessageEditor {
mention_set: Entity<MentionSet>,
@@ -543,6 +543,9 @@ impl MessageEditor {
}
fn paste(&mut self, _: &Paste, window: &mut Window, cx: &mut Context<Self>) {
+ let Some(workspace) = self.workspace.upgrade() else {
+ return;
+ };
let editor_clipboard_selections = cx
.read_from_clipboard()
.and_then(|item| item.entries().first().cloned())
@@ -553,133 +556,127 @@ impl MessageEditor {
_ => None,
});
- let has_file_context = editor_clipboard_selections
- .as_ref()
- .is_some_and(|selections| {
- selections
- .iter()
- .any(|sel| sel.file_path.is_some() && sel.line_range.is_some())
- });
+ // Insert creases for pasted clipboard selections that:
+ // 1. Contain exactly one selection
+ // 2. Have an associated file path
+ // 3. Span multiple lines (not single-line selections)
+ // 4. Belong to a file that exists in the current project
+ let should_insert_creases = util::maybe!({
+ let selections = editor_clipboard_selections.as_ref()?;
+ if selections.len() > 1 {
+ return Some(false);
+ }
+ let selection = selections.first()?;
+ let file_path = selection.file_path.as_ref()?;
+ let line_range = selection.line_range.as_ref()?;
- if has_file_context {
- if let Some((workspace, selections)) =
- self.workspace.upgrade().zip(editor_clipboard_selections)
- {
- let Some(first_selection) = selections.first() else {
- return;
- };
- if let Some(file_path) = &first_selection.file_path {
- // In case someone pastes selections from another window
- // with a different project, we don't want to insert the
- // crease (containing the absolute path) since the agent
- // cannot access files outside the project.
- let is_in_project = workspace
- .read(cx)
- .project()
- .read(cx)
- .project_path_for_absolute_path(file_path, cx)
- .is_some();
- if !is_in_project {
- return;
- }
- }
+ if line_range.start() == line_range.end() {
+ return Some(false);
+ }
- cx.stop_propagation();
- let insertion_target = self
- .editor
+ Some(
+ workspace
.read(cx)
- .selections
- .newest_anchor()
- .start
- .text_anchor;
-
- let project = workspace.read(cx).project().clone();
- for selection in selections {
- if let (Some(file_path), Some(line_range)) =
- (selection.file_path, selection.line_range)
- {
- let crease_text =
- acp_thread::selection_name(Some(file_path.as_ref()), &line_range);
+ .project()
+ .read(cx)
+ .project_path_for_absolute_path(file_path, cx)
+ .is_some(),
+ )
+ })
+ .unwrap_or(false);
- let mention_uri = MentionUri::Selection {
- abs_path: Some(file_path.clone()),
- line_range: line_range.clone(),
- };
+ if should_insert_creases && let Some(selections) = editor_clipboard_selections {
+ cx.stop_propagation();
+ let insertion_target = self
+ .editor
+ .read(cx)
+ .selections
+ .newest_anchor()
+ .start
+ .text_anchor;
+
+ let project = workspace.read(cx).project().clone();
+ for selection in selections {
+ if let (Some(file_path), Some(line_range)) =
+ (selection.file_path, selection.line_range)
+ {
+ let crease_text =
+ acp_thread::selection_name(Some(file_path.as_ref()), &line_range);
- let mention_text = mention_uri.as_link().to_string();
- let (excerpt_id, text_anchor, content_len) =
- self.editor.update(cx, |editor, cx| {
- let buffer = editor.buffer().read(cx);
- let snapshot = buffer.snapshot(cx);
- let (excerpt_id, _, buffer_snapshot) =
- snapshot.as_singleton().unwrap();
- let text_anchor = insertion_target.bias_left(&buffer_snapshot);
-
- editor.insert(&mention_text, window, cx);
- editor.insert(" ", window, cx);
-
- (*excerpt_id, text_anchor, mention_text.len())
- });
-
- let Some((crease_id, tx)) = insert_crease_for_mention(
- excerpt_id,
- text_anchor,
- content_len,
- crease_text.into(),
- mention_uri.icon_path(cx),
- None,
- self.editor.clone(),
- window,
- cx,
- ) else {
- continue;
- };
- drop(tx);
-
- let mention_task = cx
- .spawn({
- let project = project.clone();
- async move |_, cx| {
- let project_path = project
- .update(cx, |project, cx| {
- project.project_path_for_absolute_path(&file_path, cx)
- })
- .map_err(|e| e.to_string())?
- .ok_or_else(|| "project path not found".to_string())?;
-
- let buffer = project
- .update(cx, |project, cx| {
- project.open_buffer(project_path, cx)
- })
- .map_err(|e| e.to_string())?
- .await
- .map_err(|e| e.to_string())?;
-
- buffer
- .update(cx, |buffer, cx| {
- let start = Point::new(*line_range.start(), 0)
- .min(buffer.max_point());
- let end = Point::new(*line_range.end() + 1, 0)
- .min(buffer.max_point());
- let content =
- buffer.text_for_range(start..end).collect();
- Mention::Text {
- content,
- tracked_buffers: vec![cx.entity()],
- }
- })
- .map_err(|e| e.to_string())
- }
- })
- .shared();
+ let mention_uri = MentionUri::Selection {
+ abs_path: Some(file_path.clone()),
+ line_range: line_range.clone(),
+ };
+
+ let mention_text = mention_uri.as_link().to_string();
+ let (excerpt_id, text_anchor, content_len) =
+ self.editor.update(cx, |editor, cx| {
+ let buffer = editor.buffer().read(cx);
+ let snapshot = buffer.snapshot(cx);
+ let (excerpt_id, _, buffer_snapshot) = snapshot.as_singleton().unwrap();
+ let text_anchor = insertion_target.bias_left(&buffer_snapshot);
+
+ editor.insert(&mention_text, window, cx);
+ editor.insert(" ", window, cx);
- self.mention_set.update(cx, |mention_set, _cx| {
- mention_set.insert_mention(crease_id, mention_uri.clone(), mention_task)
+ (*excerpt_id, text_anchor, mention_text.len())
});
- }
+
+ let Some((crease_id, tx)) = insert_crease_for_mention(
+ excerpt_id,
+ text_anchor,
+ content_len,
+ crease_text.into(),
+ mention_uri.icon_path(cx),
+ None,
+ self.editor.clone(),
+ window,
+ cx,
+ ) else {
+ continue;
+ };
+ drop(tx);
+
+ let mention_task = cx
+ .spawn({
+ let project = project.clone();
+ async move |_, cx| {
+ let project_path = project
+ .update(cx, |project, cx| {
+ project.project_path_for_absolute_path(&file_path, cx)
+ })
+ .map_err(|e| e.to_string())?
+ .ok_or_else(|| "project path not found".to_string())?;
+
+ let buffer = project
+ .update(cx, |project, cx| project.open_buffer(project_path, cx))
+ .map_err(|e| e.to_string())?
+ .await
+ .map_err(|e| e.to_string())?;
+
+ buffer
+ .update(cx, |buffer, cx| {
+ let start = Point::new(*line_range.start(), 0)
+ .min(buffer.max_point());
+ let end = Point::new(*line_range.end() + 1, 0)
+ .min(buffer.max_point());
+ let content = buffer.text_for_range(start..end).collect();
+ Mention::Text {
+ content,
+ tracked_buffers: vec![cx.entity()],
+ }
+ })
+ .map_err(|e| e.to_string())
+ }
+ })
+ .shared();
+
+ self.mention_set.update(cx, |mention_set, _cx| {
+ mention_set.insert_mention(crease_id, mention_uri.clone(), mention_task)
+ });
}
- return;
}
+ return;
}
if self.prompt_capabilities.borrow().image
@@ -690,6 +687,13 @@ impl MessageEditor {
}
}
+ fn paste_raw(&mut self, _: &PasteRaw, window: &mut Window, cx: &mut Context<Self>) {
+ let editor = self.editor.clone();
+ window.defer(cx, move |window, cx| {
+ editor.update(cx, |editor, cx| editor.paste(&Paste, window, cx));
+ });
+ }
+
pub fn insert_dragged_files(
&mut self,
paths: Vec<project::ProjectPath>,
@@ -967,6 +971,7 @@ impl Render for MessageEditor {
.on_action(cx.listener(Self::chat))
.on_action(cx.listener(Self::chat_with_follow))
.on_action(cx.listener(Self::cancel))
+ .on_action(cx.listener(Self::paste_raw))
.capture_action(cx.listener(Self::paste))
.flex_1()
.child({
@@ -1,7 +1,7 @@
use crate::acp::AcpThreadView;
use crate::{AgentPanel, RemoveHistory, RemoveSelectedThread};
use agent::{HistoryEntry, HistoryStore};
-use chrono::{Datelike as _, Local, NaiveDate, TimeDelta};
+use chrono::{Datelike as _, Local, NaiveDate, TimeDelta, Utc};
use editor::{Editor, EditorEvent};
use fuzzy::StringMatchCandidate;
use gpui::{
@@ -402,7 +402,22 @@ impl AcpThreadHistory {
let selected = ix == self.selected_index;
let hovered = Some(ix) == self.hovered_index;
let timestamp = entry.updated_at().timestamp();
- let thread_timestamp = format.format_timestamp(timestamp, self.local_timezone);
+
+ let display_text = match format {
+ EntryTimeFormat::DateAndTime => {
+ let entry_time = entry.updated_at();
+ let now = Utc::now();
+ let duration = now.signed_duration_since(entry_time);
+ let days = duration.num_days();
+
+ format!("{}d", days)
+ }
+ EntryTimeFormat::TimeOnly => format.format_timestamp(timestamp, self.local_timezone),
+ };
+
+ let title = entry.title().clone();
+ let full_date =
+ EntryTimeFormat::DateAndTime.format_timestamp(timestamp, self.local_timezone);
h_flex()
.w_full()
@@ -423,11 +438,14 @@ impl AcpThreadHistory {
.truncate(),
)
.child(
- Label::new(thread_timestamp)
+ Label::new(display_text)
.color(Color::Muted)
.size(LabelSize::XSmall),
),
)
+ .tooltip(move |_, cx| {
+ Tooltip::with_meta(title.clone(), None, full_date.clone(), cx)
+ })
.on_hover(cx.listener(move |this, is_hovered, _window, cx| {
if *is_hovered {
this.hovered_index = Some(ix);
@@ -338,7 +338,13 @@ impl AcpThreadView {
let prompt_capabilities = Rc::new(RefCell::new(acp::PromptCapabilities::default()));
let available_commands = Rc::new(RefCell::new(vec![]));
- let placeholder = placeholder_text(agent.name().as_ref(), false);
+ let agent_server_store = project.read(cx).agent_server_store().clone();
+ let agent_display_name = agent_server_store
+ .read(cx)
+ .agent_display_name(&ExternalAgentServerName(agent.name()))
+ .unwrap_or_else(|| agent.name());
+
+ let placeholder = placeholder_text(agent_display_name.as_ref(), false);
let message_editor = cx.new(|cx| {
let mut editor = MessageEditor::new(
@@ -377,7 +383,6 @@ impl AcpThreadView {
)
});
- let agent_server_store = project.read(cx).agent_server_store().clone();
let subscriptions = [
cx.observe_global_in::<SettingsStore>(window, Self::agent_ui_font_size_changed),
cx.observe_global_in::<AgentFontSize>(window, Self::agent_ui_font_size_changed),
@@ -1498,7 +1503,13 @@ impl AcpThreadView {
let has_commands = !available_commands.is_empty();
self.available_commands.replace(available_commands);
- let new_placeholder = placeholder_text(self.agent.name().as_ref(), has_commands);
+ let agent_display_name = self
+ .agent_server_store
+ .read(cx)
+ .agent_display_name(&ExternalAgentServerName(self.agent.name()))
+ .unwrap_or_else(|| self.agent.name());
+
+ let new_placeholder = placeholder_text(agent_display_name.as_ref(), has_commands);
self.message_editor.update(cx, |editor, cx| {
editor.set_placeholder_text(&new_placeholder, window, cx);
@@ -2113,6 +2124,7 @@ impl AcpThreadView {
chunks,
indented: _,
}) => {
+ let mut is_blank = true;
let is_last = entry_ix + 1 == total_entries;
let style = default_markdown_style(false, false, window, cx);
@@ -2122,36 +2134,55 @@ impl AcpThreadView {
.children(chunks.iter().enumerate().filter_map(
|(chunk_ix, chunk)| match chunk {
AssistantMessageChunk::Message { block } => {
- block.markdown().map(|md| {
- self.render_markdown(md.clone(), style.clone())
- .into_any_element()
+ block.markdown().and_then(|md| {
+ let this_is_blank = md.read(cx).source().trim().is_empty();
+ is_blank = is_blank && this_is_blank;
+ if this_is_blank {
+ return None;
+ }
+
+ Some(
+ self.render_markdown(md.clone(), style.clone())
+ .into_any_element(),
+ )
})
}
AssistantMessageChunk::Thought { block } => {
- block.markdown().map(|md| {
- self.render_thinking_block(
- entry_ix,
- chunk_ix,
- md.clone(),
- window,
- cx,
+ block.markdown().and_then(|md| {
+ let this_is_blank = md.read(cx).source().trim().is_empty();
+ is_blank = is_blank && this_is_blank;
+ if this_is_blank {
+ return None;
+ }
+
+ Some(
+ self.render_thinking_block(
+ entry_ix,
+ chunk_ix,
+ md.clone(),
+ window,
+ cx,
+ )
+ .into_any_element(),
)
- .into_any_element()
})
}
},
))
.into_any();
- v_flex()
- .px_5()
- .py_1p5()
- .when(is_first_indented, |this| this.pt_0p5())
- .when(is_last, |this| this.pb_4())
- .w_full()
- .text_ui(cx)
- .child(message_body)
- .into_any()
+ if is_blank {
+ Empty.into_any()
+ } else {
+ v_flex()
+ .px_5()
+ .py_1p5()
+ .when(is_last, |this| this.pb_4())
+ .w_full()
+ .text_ui(cx)
+ .child(message_body)
+ .into_any()
+ }
}
AgentThreadEntry::ToolCall(tool_call) => {
let has_terminals = tool_call.terminals().next().is_some();
@@ -2183,7 +2214,7 @@ impl AcpThreadView {
div()
.relative()
.w_full()
- .pl(rems_from_px(20.0))
+ .pl_5()
.bg(cx.theme().colors().panel_background.opacity(0.2))
.child(
div()
@@ -2447,25 +2478,25 @@ impl AcpThreadView {
| ToolCallStatus::Completed
| ToolCallStatus::Failed
| ToolCallStatus::Canceled => v_flex()
- .mt_1p5()
- .w_full()
- .child(
- v_flex()
- .ml(rems(0.4))
- .px_3p5()
- .pb_1()
- .gap_1()
- .border_l_1()
- .border_color(self.tool_card_border_color(cx))
- .child(input_output_header("Raw Input".into()))
- .children(tool_call.raw_input_markdown.clone().map(|input| {
- self.render_markdown(
- input,
- default_markdown_style(false, false, window, cx),
- )
- }))
- .child(input_output_header("Output:".into())),
- )
+ .when(!is_edit && !is_terminal_tool, |this| {
+ this.mt_1p5().w_full().child(
+ v_flex()
+ .ml(rems(0.4))
+ .px_3p5()
+ .pb_1()
+ .gap_1()
+ .border_l_1()
+ .border_color(self.tool_card_border_color(cx))
+ .child(input_output_header("Raw Input:".into()))
+ .children(tool_call.raw_input_markdown.clone().map(|input| {
+ self.render_markdown(
+ input,
+ default_markdown_style(false, false, window, cx),
+ )
+ }))
+ .child(input_output_header("Output:".into())),
+ )
+ })
.children(tool_call.content.iter().enumerate().map(
|(content_ix, content)| {
div().child(self.render_tool_call_content(
@@ -2751,18 +2782,19 @@ impl AcpThreadView {
v_flex()
.gap_2()
- .when(!card_layout, |this| {
- this.ml(rems(0.4))
- .px_3p5()
- .border_l_1()
- .border_color(self.tool_card_border_color(cx))
- })
- .when(card_layout, |this| {
- this.px_2().pb_2().when(context_ix > 0, |this| {
- this.border_t_1()
- .pt_2()
+ .map(|this| {
+ if card_layout {
+ this.when(context_ix > 0, |this| {
+ this.pt_2()
+ .border_t_1()
+ .border_color(self.tool_card_border_color(cx))
+ })
+ } else {
+ this.ml(rems(0.4))
+ .px_3p5()
+ .border_l_1()
.border_color(self.tool_card_border_color(cx))
- })
+ }
})
.text_xs()
.text_color(cx.theme().colors().text_muted)
@@ -22,7 +22,8 @@ use gpui::{
};
use language::LanguageRegistry;
use language_model::{
- LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID,
+ IconOrSvg, LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry,
+ ZED_CLOUD_PROVIDER_ID,
};
use language_models::AllLanguageModelSettings;
use notifications::status_toast::{StatusToast, ToastIcon};
@@ -261,10 +262,9 @@ impl AgentConfiguration {
.w_full()
.gap_1p5()
.child(
- if let Some(icon_path) = provider.icon_path() {
- Icon::from_external_svg(icon_path)
- } else {
- Icon::new(provider.icon())
+ match provider.icon() {
+ IconOrSvg::Svg(path) => Icon::from_external_svg(path),
+ IconOrSvg::Icon(name) => Icon::new(name),
}
.size(IconSize::Small)
.color(Color::Muted),
@@ -4,6 +4,7 @@ use crate::{
};
use fs::Fs;
use gpui::{Entity, FocusHandle, SharedString};
+use language_model::IconOrSvg;
use picker::popover_menu::PickerPopoverMenu;
use settings::update_settings_file;
use std::sync::Arc;
@@ -90,8 +91,7 @@ impl Render for AgentModelSelector {
.map(|model| model.model.name().0)
.unwrap_or_else(|| SharedString::from("Select a Model"));
- let provider_icon_path = model.as_ref().and_then(|model| model.provider.icon_path());
- let provider_icon_name = model.as_ref().map(|model| model.provider.icon());
+ let provider_icon = model.as_ref().map(|model| model.provider.icon());
let color = if self.menu_handle.is_deployed() {
Color::Accent
} else {
@@ -103,18 +103,16 @@ impl Render for AgentModelSelector {
PickerPopoverMenu::new(
self.selector.clone(),
ButtonLike::new("active-model")
- .when_some(provider_icon_path.clone(), |this, icon_path| {
+ .when_some(provider_icon, |this, icon| {
this.child(
- Icon::from_external_svg(icon_path)
- .color(color)
- .size(IconSize::XSmall),
+ match icon {
+ IconOrSvg::Svg(path) => Icon::from_external_svg(path),
+ IconOrSvg::Icon(name) => Icon::new(name),
+ }
+ .color(color)
+ .size(IconSize::XSmall),
)
})
- .when(provider_icon_path.is_none(), |this| {
- this.when_some(provider_icon_name, |this, icon| {
- this.child(Icon::new(icon).color(color).size(IconSize::XSmall))
- })
- })
.selected_style(ButtonStyle::Tinted(TintColor::Accent))
.child(
Label::new(model_name)
@@ -1586,7 +1586,7 @@ pub(crate) fn search_rules(
None
} else {
Some(RulesContextEntry {
- prompt_id: metadata.id.user_id()?,
+ prompt_id: metadata.id.as_user()?,
title: metadata.title?,
})
}
@@ -6,8 +6,8 @@ use futures::{StreamExt, channel::mpsc};
use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
use gpui::{Action, AnyElement, App, BackgroundExecutor, DismissEvent, FocusHandle, Task};
use language_model::{
- AuthenticateError, ConfiguredModel, LanguageModel, LanguageModelId, LanguageModelProvider,
- LanguageModelProviderId, LanguageModelRegistry,
+ AuthenticateError, ConfiguredModel, IconOrSvg, LanguageModel, LanguageModelId,
+ LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry,
};
use ordered_float::OrderedFloat;
use picker::{Picker, PickerDelegate};
@@ -90,26 +90,10 @@ fn all_models(cx: &App) -> GroupedModels {
type FavoritesIndex = HashMap<LanguageModelProviderId, HashSet<LanguageModelId>>;
-#[derive(Clone)]
-enum ProviderIcon {
- Name(IconName),
- Path(SharedString),
-}
-
-impl ProviderIcon {
- fn from_provider(provider: &dyn LanguageModelProvider) -> Self {
- if let Some(path) = provider.icon_path() {
- Self::Path(path)
- } else {
- Self::Name(provider.icon())
- }
- }
-}
-
#[derive(Clone)]
struct ModelInfo {
model: Arc<dyn LanguageModel>,
- icon: ProviderIcon,
+ icon: IconOrSvg,
is_favorite: bool,
}
@@ -125,7 +109,7 @@ impl ModelInfo {
Self {
model,
- icon: ProviderIcon::from_provider(provider),
+ icon: provider.icon(),
is_favorite,
}
}
@@ -236,7 +220,7 @@ impl LanguageModelPickerDelegate {
fn authenticate_all_providers(cx: &mut App) -> Task<()> {
let authenticate_all_providers = LanguageModelRegistry::global(cx)
.read(cx)
- .providers()
+ .visible_providers()
.iter()
.map(|provider| (provider.id(), provider.name(), provider.authenticate(cx)))
.collect::<Vec<_>>();
@@ -600,8 +584,8 @@ impl PickerDelegate for LanguageModelPickerDelegate {
Some(
ModelSelectorListItem::new(ix, model_info.model.name().0)
.map(|this| match &model_info.icon {
- ProviderIcon::Name(icon_name) => this.icon(*icon_name),
- ProviderIcon::Path(icon_path) => this.icon_path(icon_path.clone()),
+ IconOrSvg::Icon(icon_name) => this.icon(*icon_name),
+ IconOrSvg::Svg(icon_path) => this.icon_path(icon_path.clone()),
})
.is_selected(is_selected)
.is_focused(selected)
@@ -738,7 +722,7 @@ mod tests {
.any(|(fav_provider, fav_name)| *fav_provider == provider && *fav_name == name);
ModelInfo {
model: Arc::new(TestLanguageModel::new(name, provider)),
- icon: ProviderIcon::Name(IconName::Ai),
+ icon: IconOrSvg::Icon(IconName::Ai),
is_favorite,
}
})
@@ -33,7 +33,8 @@ use language::{
language_settings::{SoftWrap, all_language_settings},
};
use language_model::{
- ConfigurationError, LanguageModelExt, LanguageModelImage, LanguageModelRegistry, Role,
+ ConfigurationError, IconOrSvg, LanguageModelExt, LanguageModelImage, LanguageModelRegistry,
+ Role,
};
use multi_buffer::MultiBufferRow;
use picker::{Picker, popover_menu::PickerPopoverMenu};
@@ -71,7 +72,7 @@ use workspace::{
pane,
searchable::{SearchEvent, SearchableItem},
};
-use zed_actions::agent::{AddSelectionToThread, ToggleModelSelector};
+use zed_actions::agent::{AddSelectionToThread, PasteRaw, ToggleModelSelector};
use crate::CycleFavoriteModels;
@@ -1698,6 +1699,9 @@ impl TextThreadEditor {
window: &mut Window,
cx: &mut Context<Self>,
) {
+ let Some(workspace) = self.workspace.upgrade() else {
+ return;
+ };
let editor_clipboard_selections = cx
.read_from_clipboard()
.and_then(|item| item.entries().first().cloned())
@@ -1708,84 +1712,101 @@ impl TextThreadEditor {
_ => None,
});
- let has_file_context = editor_clipboard_selections
- .as_ref()
- .is_some_and(|selections| {
- selections
- .iter()
- .any(|sel| sel.file_path.is_some() && sel.line_range.is_some())
- });
-
- if has_file_context {
- if let Some(clipboard_item) = cx.read_from_clipboard() {
- if let Some(ClipboardEntry::String(clipboard_text)) =
- clipboard_item.entries().first()
- {
- if let Some(selections) = editor_clipboard_selections {
- cx.stop_propagation();
-
- let text = clipboard_text.text();
- self.editor.update(cx, |editor, cx| {
- let mut current_offset = 0;
- let weak_editor = cx.entity().downgrade();
-
- for selection in selections {
- if let (Some(file_path), Some(line_range)) =
- (selection.file_path, selection.line_range)
- {
- let selected_text =
- &text[current_offset..current_offset + selection.len];
- let fence = assistant_slash_commands::codeblock_fence_for_path(
- file_path.to_str(),
- Some(line_range.clone()),
- );
- let formatted_text = format!("{fence}{selected_text}\n```");
-
- let insert_point = editor
- .selections
- .newest::<Point>(&editor.display_snapshot(cx))
- .head();
- let start_row = MultiBufferRow(insert_point.row);
-
- editor.insert(&formatted_text, window, cx);
+ // Insert creases for pasted clipboard selections that:
+ // 1. Contain exactly one selection
+ // 2. Have an associated file path
+ // 3. Span multiple lines (not single-line selections)
+ // 4. Belong to a file that exists in the current project
+ let should_insert_creases = util::maybe!({
+ let selections = editor_clipboard_selections.as_ref()?;
+ if selections.len() > 1 {
+ return Some(false);
+ }
+ let selection = selections.first()?;
+ let file_path = selection.file_path.as_ref()?;
+ let line_range = selection.line_range.as_ref()?;
- let snapshot = editor.buffer().read(cx).snapshot(cx);
- let anchor_before = snapshot.anchor_after(insert_point);
- let anchor_after = editor
- .selections
- .newest_anchor()
- .head()
- .bias_left(&snapshot);
+ if line_range.start() == line_range.end() {
+ return Some(false);
+ }
- editor.insert("\n", window, cx);
+ Some(
+ workspace
+ .read(cx)
+ .project()
+ .read(cx)
+ .project_path_for_absolute_path(file_path, cx)
+ .is_some(),
+ )
+ })
+ .unwrap_or(false);
- let crease_text = acp_thread::selection_name(
- Some(file_path.as_ref()),
- &line_range,
- );
+ if should_insert_creases && let Some(clipboard_item) = cx.read_from_clipboard() {
+ if let Some(ClipboardEntry::String(clipboard_text)) = clipboard_item.entries().first() {
+ if let Some(selections) = editor_clipboard_selections {
+ cx.stop_propagation();
- let fold_placeholder = quote_selection_fold_placeholder(
- crease_text,
- weak_editor.clone(),
- );
- let crease = Crease::inline(
- anchor_before..anchor_after,
- fold_placeholder,
- render_quote_selection_output_toggle,
- |_, _, _, _| Empty.into_any(),
- );
- editor.insert_creases(vec![crease], cx);
- editor.fold_at(start_row, window, cx);
+ let text = clipboard_text.text();
+ self.editor.update(cx, |editor, cx| {
+ let mut current_offset = 0;
+ let weak_editor = cx.entity().downgrade();
- current_offset += selection.len;
- if !selection.is_entire_line && current_offset < text.len() {
- current_offset += 1;
- }
+ for selection in selections {
+ if let (Some(file_path), Some(line_range)) =
+ (selection.file_path, selection.line_range)
+ {
+ let selected_text =
+ &text[current_offset..current_offset + selection.len];
+ let fence = assistant_slash_commands::codeblock_fence_for_path(
+ file_path.to_str(),
+ Some(line_range.clone()),
+ );
+ let formatted_text = format!("{fence}{selected_text}\n```");
+
+ let insert_point = editor
+ .selections
+ .newest::<Point>(&editor.display_snapshot(cx))
+ .head();
+ let start_row = MultiBufferRow(insert_point.row);
+
+ editor.insert(&formatted_text, window, cx);
+
+ let snapshot = editor.buffer().read(cx).snapshot(cx);
+ let anchor_before = snapshot.anchor_after(insert_point);
+ let anchor_after = editor
+ .selections
+ .newest_anchor()
+ .head()
+ .bias_left(&snapshot);
+
+ editor.insert("\n", window, cx);
+
+ let crease_text = acp_thread::selection_name(
+ Some(file_path.as_ref()),
+ &line_range,
+ );
+
+ let fold_placeholder = quote_selection_fold_placeholder(
+ crease_text,
+ weak_editor.clone(),
+ );
+ let crease = Crease::inline(
+ anchor_before..anchor_after,
+ fold_placeholder,
+ render_quote_selection_output_toggle,
+ |_, _, _, _| Empty.into_any(),
+ );
+ editor.insert_creases(vec![crease], cx);
+ editor.fold_at(start_row, window, cx);
+
+ current_offset += selection.len;
+ if !selection.is_entire_line && current_offset < text.len() {
+ current_offset += 1;
}
}
- });
- return;
- }
+ }
+ });
+ return;
}
}
}
@@ -1944,6 +1965,12 @@ impl TextThreadEditor {
}
}
+ fn paste_raw(&mut self, _: &PasteRaw, window: &mut Window, cx: &mut Context<Self>) {
+ self.editor.update(cx, |editor, cx| {
+ editor.paste(&editor::actions::Paste, window, cx);
+ });
+ }
+
fn update_image_blocks(&mut self, cx: &mut Context<Self>) {
self.editor.update(cx, |editor, cx| {
let buffer = editor.buffer().read(cx).snapshot(cx);
@@ -2205,11 +2232,10 @@ impl TextThreadEditor {
.default_model()
.map(|default| default.provider);
- let provider_icon_path = active_provider.as_ref().and_then(|p| p.icon_path());
- let provider_icon_name = match &active_provider {
- Some(provider) => provider.icon(),
- None => IconName::Ai,
- };
+ let provider_icon = active_provider
+ .as_ref()
+ .map(|p| p.icon())
+ .unwrap_or(IconOrSvg::Icon(IconName::Ai));
let focus_handle = self.editor().focus_handle(cx);
@@ -2219,10 +2245,9 @@ impl TextThreadEditor {
(Color::Muted, IconName::ChevronDown)
};
- let provider_icon_element = if let Some(icon_path) = provider_icon_path {
- Icon::from_external_svg(icon_path)
- } else {
- Icon::new(provider_icon_name)
+ let provider_icon_element = match provider_icon {
+ IconOrSvg::Svg(path) => Icon::from_external_svg(path),
+ IconOrSvg::Icon(name) => Icon::new(name),
}
.color(color)
.size(IconSize::XSmall);
@@ -2636,6 +2661,7 @@ impl Render for TextThreadEditor {
.capture_action(cx.listener(TextThreadEditor::copy))
.capture_action(cx.listener(TextThreadEditor::cut))
.capture_action(cx.listener(TextThreadEditor::paste))
+ .on_action(cx.listener(TextThreadEditor::paste_raw))
.capture_action(cx.listener(TextThreadEditor::cycle_message_role))
.capture_action(cx.listener(TextThreadEditor::confirm_command))
.on_action(cx.listener(TextThreadEditor::assist))
@@ -114,14 +114,14 @@ impl RenderOnce for ModelSelectorListItem {
.w_full()
.gap_1p5()
.when_some(self.icon, |this, icon| {
- this.child(match icon {
- ModelIcon::Name(icon_name) => Icon::new(icon_name)
- .color(model_icon_color)
- .size(IconSize::Small),
- ModelIcon::Path(icon_path) => Icon::from_external_svg(icon_path)
- .color(model_icon_color)
- .size(IconSize::Small),
- })
+ this.child(
+ match icon {
+ ModelIcon::Name(icon_name) => Icon::new(icon_name),
+ ModelIcon::Path(icon_path) => Icon::from_external_svg(icon_path),
+ }
+ .color(model_icon_color)
+ .size(IconSize::Small),
+ )
})
.child(Label::new(self.title).truncate()),
)
@@ -1,5 +1,5 @@
use agent::{HistoryEntry, HistoryStore};
-use chrono::{Datelike as _, Local, NaiveDate, TimeDelta};
+use chrono::{Datelike as _, Local, NaiveDate, TimeDelta, Utc};
use editor::{Editor, EditorEvent};
use fuzzy::StringMatchCandidate;
use gpui::{
@@ -411,7 +411,22 @@ impl AcpThreadHistory {
let selected = ix == self.selected_index;
let hovered = Some(ix) == self.hovered_index;
let timestamp = entry.updated_at().timestamp();
- let thread_timestamp = format.format_timestamp(timestamp, self.local_timezone);
+
+ let display_text = match format {
+ EntryTimeFormat::DateAndTime => {
+ let entry_time = entry.updated_at();
+ let now = Utc::now();
+ let duration = now.signed_duration_since(entry_time);
+ let days = duration.num_days();
+
+ format!("{}d", days)
+ }
+ EntryTimeFormat::TimeOnly => format.format_timestamp(timestamp, self.local_timezone),
+ };
+
+ let title = entry.title().clone();
+ let full_date =
+ EntryTimeFormat::DateAndTime.format_timestamp(timestamp, self.local_timezone);
h_flex()
.w_full()
@@ -432,11 +447,14 @@ impl AcpThreadHistory {
.truncate(),
)
.child(
- Label::new(thread_timestamp)
+ Label::new(display_text)
.color(Color::Muted)
.size(LabelSize::XSmall),
),
)
+ .tooltip(move |_, cx| {
+ Tooltip::with_meta(title.clone(), None, full_date.clone(), cx)
+ })
.on_hover(cx.listener(move |this, is_hovered, _window, cx| {
if *is_hovered {
this.hovered_index = Some(ix);
@@ -1,25 +1,9 @@
use gpui::{Action, IntoElement, ParentElement, RenderOnce, point};
-use language_model::{LanguageModelProvider, LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID};
+use language_model::{IconOrSvg, LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID};
use ui::{Divider, List, ListBulletItem, prelude::*};
-#[derive(Clone)]
-enum ProviderIcon {
- Name(IconName),
- Path(SharedString),
-}
-
-impl ProviderIcon {
- fn from_provider(provider: &dyn LanguageModelProvider) -> Self {
- if let Some(path) = provider.icon_path() {
- Self::Path(path)
- } else {
- Self::Name(provider.icon())
- }
- }
-}
-
pub struct ApiKeysWithProviders {
- configured_providers: Vec<(ProviderIcon, SharedString)>,
+ configured_providers: Vec<(IconOrSvg, SharedString)>,
}
impl ApiKeysWithProviders {
@@ -43,19 +27,14 @@ impl ApiKeysWithProviders {
}
}
- fn compute_configured_providers(cx: &App) -> Vec<(ProviderIcon, SharedString)> {
+ fn compute_configured_providers(cx: &App) -> Vec<(IconOrSvg, SharedString)> {
LanguageModelRegistry::read_global(cx)
.visible_providers()
.iter()
.filter(|provider| {
provider.is_authenticated(cx) && provider.id() != ZED_CLOUD_PROVIDER_ID
})
- .map(|provider| {
- (
- ProviderIcon::from_provider(provider.as_ref()),
- provider.name().0,
- )
- })
+ .map(|provider| (provider.icon(), provider.name().0))
.collect()
}
}
@@ -71,8 +50,8 @@ impl Render for ApiKeysWithProviders {
.gap_1p5()
.child(
match icon {
- ProviderIcon::Name(icon_name) => Icon::new(icon_name),
- ProviderIcon::Path(icon_path) => Icon::from_external_svg(icon_path),
+ IconOrSvg::Icon(icon_name) => Icon::new(icon_name),
+ IconOrSvg::Svg(icon_path) => Icon::from_external_svg(icon_path),
}
.size(IconSize::XSmall)
.color(Color::Muted),
@@ -51,6 +51,8 @@ pub const MENU_ASIDE_MIN_WIDTH: Pixels = px(260.);
pub const MENU_ASIDE_MAX_WIDTH: Pixels = px(500.);
pub const COMPLETION_MENU_MIN_WIDTH: Pixels = px(280.);
pub const COMPLETION_MENU_MAX_WIDTH: Pixels = px(540.);
+pub const CODE_ACTION_MENU_MIN_WIDTH: Pixels = px(220.);
+pub const CODE_ACTION_MENU_MAX_WIDTH: Pixels = px(540.);
// Constants for the markdown cache. The purpose of this cache is to reduce flickering due to
// documentation not yet being parsed.
@@ -179,7 +181,7 @@ impl CodeContextMenu {
) -> Option<AnyElement> {
match self {
CodeContextMenu::Completions(menu) => menu.render_aside(max_size, window, cx),
- CodeContextMenu::CodeActions(_) => None,
+ CodeContextMenu::CodeActions(menu) => menu.render_aside(max_size, window, cx),
}
}
@@ -1419,26 +1421,6 @@ pub enum CodeActionsItem {
}
impl CodeActionsItem {
- fn as_task(&self) -> Option<&ResolvedTask> {
- let Self::Task(_, task) = self else {
- return None;
- };
- Some(task)
- }
-
- fn as_code_action(&self) -> Option<&CodeAction> {
- let Self::CodeAction { action, .. } = self else {
- return None;
- };
- Some(action)
- }
- fn as_debug_scenario(&self) -> Option<&DebugScenario> {
- let Self::DebugScenario(scenario) = self else {
- return None;
- };
- Some(scenario)
- }
-
pub fn label(&self) -> String {
match self {
Self::CodeAction { action, .. } => action.lsp_action.title().to_owned(),
@@ -1446,6 +1428,14 @@ impl CodeActionsItem {
Self::DebugScenario(scenario) => scenario.label.to_string(),
}
}
+
+ pub fn menu_label(&self) -> String {
+ match self {
+ Self::CodeAction { action, .. } => action.lsp_action.title().replace("\n", ""),
+ Self::Task(_, task) => task.resolved_label.replace("\n", ""),
+ Self::DebugScenario(scenario) => format!("debug: {}", scenario.label),
+ }
+ }
}
pub struct CodeActionsMenu {
@@ -1555,60 +1545,33 @@ impl CodeActionsMenu {
let item_ix = range.start + ix;
let selected = item_ix == selected_item;
let colors = cx.theme().colors();
- div().min_w(px(220.)).max_w(px(540.)).child(
- ListItem::new(item_ix)
- .inset(true)
- .toggle_state(selected)
- .when_some(action.as_code_action(), |this, action| {
- this.child(
- h_flex()
- .overflow_hidden()
- .when(is_quick_action_bar, |this| this.text_ui(cx))
- .child(
- // TASK: It would be good to make lsp_action.title a SharedString to avoid allocating here.
- action.lsp_action.title().replace("\n", ""),
- )
- .when(selected, |this| {
- this.text_color(colors.text_accent)
- }),
- )
- })
- .when_some(action.as_task(), |this, task| {
- this.child(
- h_flex()
- .overflow_hidden()
- .when(is_quick_action_bar, |this| this.text_ui(cx))
- .child(task.resolved_label.replace("\n", ""))
- .when(selected, |this| {
- this.text_color(colors.text_accent)
- }),
- )
- })
- .when_some(action.as_debug_scenario(), |this, scenario| {
- this.child(
- h_flex()
- .overflow_hidden()
- .when(is_quick_action_bar, |this| this.text_ui(cx))
- .child("debug: ")
- .child(scenario.label.clone())
- .when(selected, |this| {
- this.text_color(colors.text_accent)
- }),
- )
- })
- .on_click(cx.listener(move |editor, _, window, cx| {
- cx.stop_propagation();
- if let Some(task) = editor.confirm_code_action(
- &ConfirmCodeAction {
- item_ix: Some(item_ix),
- },
- window,
- cx,
- ) {
- task.detach_and_log_err(cx)
- }
- })),
- )
+
+ ListItem::new(item_ix)
+ .inset(true)
+ .toggle_state(selected)
+ .overflow_x()
+ .child(
+ div()
+ .min_w(CODE_ACTION_MENU_MIN_WIDTH)
+ .max_w(CODE_ACTION_MENU_MAX_WIDTH)
+ .overflow_hidden()
+ .text_ellipsis()
+ .when(is_quick_action_bar, |this| this.text_ui(cx))
+ .when(selected, |this| this.text_color(colors.text_accent))
+ .child(action.menu_label()),
+ )
+ .on_click(cx.listener(move |editor, _, window, cx| {
+ cx.stop_propagation();
+ if let Some(task) = editor.confirm_code_action(
+ &ConfirmCodeAction {
+ item_ix: Some(item_ix),
+ },
+ window,
+ cx,
+ ) {
+ task.detach_and_log_err(cx)
+ }
+ }))
})
.collect()
}),
@@ -1635,4 +1598,42 @@ impl CodeActionsMenu {
Popover::new().child(list).into_any_element()
}
+
+ fn render_aside(
+ &mut self,
+ max_size: Size<Pixels>,
+ window: &mut Window,
+ _cx: &mut Context<Editor>,
+ ) -> Option<AnyElement> {
+ let Some(action) = self.actions.get(self.selected_item) else {
+ return None;
+ };
+
+ let label = action.menu_label();
+ let text_system = window.text_system();
+ let mut line_wrapper = text_system.line_wrapper(
+ window.text_style().font(),
+ window.text_style().font_size.to_pixels(window.rem_size()),
+ );
+ let is_truncated =
+ line_wrapper.should_truncate_line(&label, CODE_ACTION_MENU_MAX_WIDTH, "…");
+
+ if is_truncated.is_none() {
+ return None;
+ }
+
+ Some(
+ Popover::new()
+ .child(
+ div()
+ .child(label)
+ .id("code_actions_menu_extended")
+ .px(MENU_ASIDE_X_PADDING / 2.)
+ .max_w(max_size.width)
+ .max_h(max_size.height)
+ .occlude(),
+ )
+ .into_any_element(),
+ )
+ }
}
@@ -215,7 +215,8 @@ impl Settings for EditorSettings {
},
scrollbar: Scrollbar {
show: scrollbar.show.map(Into::into).unwrap(),
- git_diff: scrollbar.git_diff.unwrap(),
+ git_diff: scrollbar.git_diff.unwrap()
+ && content.git.unwrap().enabled.unwrap().is_git_diff_enabled(),
selected_text: scrollbar.selected_text.unwrap(),
selected_symbol: scrollbar.selected_symbol.unwrap(),
search_results: scrollbar.search_results.unwrap(),
@@ -20880,6 +20880,36 @@ async fn test_toggling_adjacent_diff_hunks(cx: &mut TestAppContext) {
.to_string(),
);
+ cx.update_editor(|editor, window, cx| {
+ editor.move_up(&MoveUp, window, cx);
+ editor.toggle_selected_diff_hunks(&Default::default(), window, cx);
+ });
+ cx.assert_state_with_diff(
+ indoc! { "
+ ˇone
+ - two
+ three
+ five
+ "}
+ .to_string(),
+ );
+
+ cx.update_editor(|editor, window, cx| {
+ editor.move_down(&MoveDown, window, cx);
+ editor.move_down(&MoveDown, window, cx);
+ editor.toggle_selected_diff_hunks(&Default::default(), window, cx);
+ });
+ cx.assert_state_with_diff(
+ indoc! { "
+ one
+ - two
+ ˇthree
+ - four
+ five
+ "}
+ .to_string(),
+ );
+
cx.set_state(indoc! { "
one
ˇTWO
@@ -20919,6 +20949,66 @@ async fn test_toggling_adjacent_diff_hunks(cx: &mut TestAppContext) {
);
}
+#[gpui::test]
+async fn test_toggling_adjacent_diff_hunks_2(
+ executor: BackgroundExecutor,
+ cx: &mut TestAppContext,
+) {
+ init_test(cx, |_| {});
+
+ let mut cx = EditorTestContext::new(cx).await;
+
+ let diff_base = r#"
+ lineA
+ lineB
+ lineC
+ lineD
+ "#
+ .unindent();
+
+ cx.set_state(
+ &r#"
+ ˇlineA1
+ lineB
+ lineD
+ "#
+ .unindent(),
+ );
+ cx.set_head_text(&diff_base);
+ executor.run_until_parked();
+
+ cx.update_editor(|editor, window, cx| {
+ editor.toggle_selected_diff_hunks(&ToggleSelectedDiffHunks, window, cx);
+ });
+ executor.run_until_parked();
+ cx.assert_state_with_diff(
+ r#"
+ - lineA
+ + ˇlineA1
+ lineB
+ lineD
+ "#
+ .unindent(),
+ );
+
+ cx.update_editor(|editor, window, cx| {
+ editor.move_down(&MoveDown, window, cx);
+ editor.move_right(&MoveRight, window, cx);
+ editor.toggle_selected_diff_hunks(&ToggleSelectedDiffHunks, window, cx);
+ });
+ executor.run_until_parked();
+ cx.assert_state_with_diff(
+ r#"
+ - lineA
+ + lineA1
+ lˇineB
+ - lineC
+ lineD
+ "#
+ .unindent(),
+ );
+}
+
#[gpui::test]
async fn test_edits_around_expanded_deletion_hunks(
executor: BackgroundExecutor,
@@ -1 +1 @@
-LICENSE-GPL
+../../LICENSE-GPL
@@ -19,6 +19,9 @@ impl Global for GlobalExtensionHostProxy {}
///
/// This object implements each of the individual proxy types so that their
/// methods can be called directly on it.
+/// Registration function for language model providers.
+pub type LanguageModelProviderRegistration = Box<dyn FnOnce(&mut App) + Send>;
+
#[derive(Default)]
pub struct ExtensionHostProxy {
theme_proxy: RwLock<Option<Arc<dyn ExtensionThemeProxy>>>,
@@ -500,3 +503,37 @@ impl ExtensionDebugAdapterProviderProxy for ExtensionHostProxy {
proxy.unregister_debug_locator(locator_name)
}
}
+
+pub trait ExtensionLanguageModelProviderProxy: Send + Sync + 'static {
+ fn register_language_model_provider(
+ &self,
+ provider_id: Arc<str>,
+ register_fn: LanguageModelProviderRegistration,
+ cx: &mut App,
+ );
+
+ fn unregister_language_model_provider(&self, provider_id: Arc<str>, cx: &mut App);
+}
+
+impl ExtensionLanguageModelProviderProxy for ExtensionHostProxy {
+ fn register_language_model_provider(
+ &self,
+ provider_id: Arc<str>,
+ register_fn: LanguageModelProviderRegistration,
+ cx: &mut App,
+ ) {
+ let Some(proxy) = self.language_model_provider_proxy.read().clone() else {
+ return;
+ };
+
+ proxy.register_language_model_provider(provider_id, register_fn, cx)
+ }
+
+ fn unregister_language_model_provider(&self, provider_id: Arc<str>, cx: &mut App) {
+ let Some(proxy) = self.language_model_provider_proxy.read().clone() else {
+ return;
+ };
+
+ proxy.unregister_language_model_provider(provider_id, cx)
+ }
+}
@@ -58,7 +58,7 @@ use project::{
git_store::{GitStoreEvent, Repository, RepositoryEvent, RepositoryId, pending_op},
project_settings::{GitPathStyle, ProjectSettings},
};
-use prompt_store::{PromptId, PromptStore, RULES_FILE_NAMES};
+use prompt_store::{BuiltInPrompt, PromptId, PromptStore, RULES_FILE_NAMES};
use serde::{Deserialize, Serialize};
use settings::{Settings, SettingsStore, StatusStyle};
use std::future::Future;
@@ -2579,25 +2579,26 @@ impl GitPanel {
is_using_legacy_zed_pro: bool,
cx: &mut AsyncApp,
) -> String {
- const DEFAULT_PROMPT: &str = include_str!("commit_message_prompt.txt");
-
// Remove this once we stop supporting legacy Zed Pro
// In legacy Zed Pro, Git commit summary generation did not count as a
// prompt. If the user changes the prompt, our classification will fail,
// meaning that users will be charged for generating commit messages.
if is_using_legacy_zed_pro {
- return DEFAULT_PROMPT.to_string();
+ return BuiltInPrompt::CommitMessage.default_content().to_string();
}
let load = async {
let store = cx.update(|cx| PromptStore::global(cx)).ok()?.await.ok()?;
store
- .update(cx, |s, cx| s.load(PromptId::CommitMessage, cx))
+ .update(cx, |s, cx| {
+ s.load(PromptId::BuiltIn(BuiltInPrompt::CommitMessage), cx)
+ })
.ok()?
.await
.ok()
};
- load.await.unwrap_or_else(|| DEFAULT_PROMPT.to_string())
+ load.await
+ .unwrap_or_else(|| BuiltInPrompt::CommitMessage.default_content().to_string())
}
/// Generates a commit message using an LLM.
@@ -198,14 +198,14 @@ wayland-backend = { version = "0.3.3", features = [
"client_system",
"dlopen",
], optional = true }
-wayland-client = { version = "0.31.2", optional = true }
-wayland-cursor = { version = "0.31.1", optional = true }
-wayland-protocols = { version = "0.31.2", features = [
+wayland-client = { version = "0.31.11", optional = true }
+wayland-cursor = { version = "0.31.11", optional = true }
+wayland-protocols = { version = "0.32.9", features = [
"client",
"staging",
"unstable",
], optional = true }
-wayland-protocols-plasma = { version = "0.2.0", features = [
+wayland-protocols-plasma = { version = "0.3.9", features = [
"client",
], optional = true }
wayland-protocols-wlr = { version = "0.3.9", features = [
@@ -5,6 +5,7 @@ use gpui::{
struct SubWindow {
custom_titlebar: bool,
+ is_dialog: bool,
}
fn button(text: &str, on_click: impl Fn(&mut Window, &mut App) + 'static) -> impl IntoElement {
@@ -23,7 +24,10 @@ fn button(text: &str, on_click: impl Fn(&mut Window, &mut App) + 'static) -> imp
}
impl Render for SubWindow {
- fn render(&mut self, _window: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
+ fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+ let window_bounds =
+ WindowBounds::Windowed(Bounds::centered(None, size(px(250.0), px(200.0)), cx));
+
div()
.flex()
.flex_col()
@@ -52,8 +56,28 @@ impl Render for SubWindow {
.child(
div()
.p_8()
+ .flex()
+ .flex_col()
.gap_2()
.child("SubWindow")
+ .when(self.is_dialog, |div| {
+ div.child(button("Open Nested Dialog", move |_, cx| {
+ cx.open_window(
+ WindowOptions {
+ window_bounds: Some(window_bounds),
+ kind: WindowKind::Dialog,
+ ..Default::default()
+ },
+ |_, cx| {
+ cx.new(|_| SubWindow {
+ custom_titlebar: false,
+ is_dialog: true,
+ })
+ },
+ )
+ .unwrap();
+ }))
+ })
.child(button("Close", |window, _| {
window.remove_window();
})),
@@ -86,6 +110,7 @@ impl Render for WindowDemo {
|_, cx| {
cx.new(|_| SubWindow {
custom_titlebar: false,
+ is_dialog: false,
})
},
)
@@ -101,6 +126,39 @@ impl Render for WindowDemo {
|_, cx| {
cx.new(|_| SubWindow {
custom_titlebar: false,
+ is_dialog: false,
+ })
+ },
+ )
+ .unwrap();
+ }))
+ .child(button("Floating", move |_, cx| {
+ cx.open_window(
+ WindowOptions {
+ window_bounds: Some(window_bounds),
+ kind: WindowKind::Floating,
+ ..Default::default()
+ },
+ |_, cx| {
+ cx.new(|_| SubWindow {
+ custom_titlebar: false,
+ is_dialog: false,
+ })
+ },
+ )
+ .unwrap();
+ }))
+ .child(button("Dialog", move |_, cx| {
+ cx.open_window(
+ WindowOptions {
+ window_bounds: Some(window_bounds),
+ kind: WindowKind::Dialog,
+ ..Default::default()
+ },
+ |_, cx| {
+ cx.new(|_| SubWindow {
+ custom_titlebar: false,
+ is_dialog: true,
})
},
)
@@ -116,6 +174,7 @@ impl Render for WindowDemo {
|_, cx| {
cx.new(|_| SubWindow {
custom_titlebar: true,
+ is_dialog: false,
})
},
)
@@ -131,6 +190,7 @@ impl Render for WindowDemo {
|_, cx| {
cx.new(|_| SubWindow {
custom_titlebar: false,
+ is_dialog: false,
})
},
)
@@ -147,6 +207,7 @@ impl Render for WindowDemo {
|_, cx| {
cx.new(|_| SubWindow {
custom_titlebar: false,
+ is_dialog: false,
})
},
)
@@ -162,6 +223,7 @@ impl Render for WindowDemo {
|_, cx| {
cx.new(|_| SubWindow {
custom_titlebar: false,
+ is_dialog: false,
})
},
)
@@ -177,6 +239,7 @@ impl Render for WindowDemo {
|_, cx| {
cx.new(|_| SubWindow {
custom_titlebar: false,
+ is_dialog: false,
})
},
)
@@ -316,6 +316,7 @@ impl SystemWindowTabController {
.find_map(|(group, tabs)| tabs.iter().find(|tab| tab.id == id).map(|_| group));
let current_group = current_group?;
+ // TODO: `.keys()` returns arbitrary order, what does "next" mean?
let mut group_ids: Vec<_> = controller.tab_groups.keys().collect();
let idx = group_ids.iter().position(|g| *g == current_group)?;
let next_idx = (idx + 1) % group_ids.len();
@@ -340,6 +341,7 @@ impl SystemWindowTabController {
.find_map(|(group, tabs)| tabs.iter().find(|tab| tab.id == id).map(|_| group));
let current_group = current_group?;
+ // TODO: `.keys()` returns arbitrary order, what does "previous" mean?
let mut group_ids: Vec<_> = controller.tab_groups.keys().collect();
let idx = group_ids.iter().position(|g| *g == current_group)?;
let prev_idx = if idx == 0 {
@@ -361,12 +363,9 @@ impl SystemWindowTabController {
/// Get all tabs in the same window.
pub fn tabs(&self, id: WindowId) -> Option<&Vec<SystemWindowTab>> {
- let tab_group = self
- .tab_groups
- .iter()
- .find_map(|(group, tabs)| tabs.iter().find(|tab| tab.id == id).map(|_| *group))?;
-
- self.tab_groups.get(&tab_group)
+ self.tab_groups
+ .values()
+ .find(|tabs| tabs.iter().any(|tab| tab.id == id))
}
/// Initialize the visibility of the system window tab controller.
@@ -441,7 +440,7 @@ impl SystemWindowTabController {
/// Insert a tab into a tab group.
pub fn add_tab(cx: &mut App, id: WindowId, tabs: Vec<SystemWindowTab>) {
let mut controller = cx.global_mut::<SystemWindowTabController>();
- let Some(tab) = tabs.clone().into_iter().find(|tab| tab.id == id) else {
+ let Some(tab) = tabs.iter().find(|tab| tab.id == id).cloned() else {
return;
};
@@ -504,16 +503,14 @@ impl SystemWindowTabController {
return;
};
+ let initial_tabs_len = initial_tabs.len();
let mut all_tabs = initial_tabs.clone();
- for tabs in controller.tab_groups.values() {
- all_tabs.extend(
- tabs.iter()
- .filter(|tab| !initial_tabs.contains(tab))
- .cloned(),
- );
+
+ for (_, mut tabs) in controller.tab_groups.drain() {
+ tabs.retain(|tab| !all_tabs[..initial_tabs_len].contains(tab));
+ all_tabs.extend(tabs);
}
- controller.tab_groups.clear();
controller.tab_groups.insert(0, all_tabs);
}
@@ -1348,6 +1348,10 @@ pub enum WindowKind {
/// docks, notifications or wallpapers.
#[cfg(all(target_os = "linux", feature = "wayland"))]
LayerShell(layer_shell::LayerShellOptions),
+
+ /// A window that appears on top of its parent window and blocks interaction with it
+ /// until the modal window is closed
+ Dialog,
}
/// The appearance of the window, as defined by the operating system.
@@ -36,12 +36,6 @@ use wayland_client::{
wl_shm_pool, wl_surface,
},
};
-use wayland_protocols::wp::cursor_shape::v1::client::{
- wp_cursor_shape_device_v1, wp_cursor_shape_manager_v1,
-};
-use wayland_protocols::wp::fractional_scale::v1::client::{
- wp_fractional_scale_manager_v1, wp_fractional_scale_v1,
-};
use wayland_protocols::wp::primary_selection::zv1::client::zwp_primary_selection_offer_v1::{
self, ZwpPrimarySelectionOfferV1,
};
@@ -61,6 +55,14 @@ use wayland_protocols::xdg::decoration::zv1::client::{
zxdg_decoration_manager_v1, zxdg_toplevel_decoration_v1,
};
use wayland_protocols::xdg::shell::client::{xdg_surface, xdg_toplevel, xdg_wm_base};
+use wayland_protocols::{
+ wp::cursor_shape::v1::client::{wp_cursor_shape_device_v1, wp_cursor_shape_manager_v1},
+ xdg::dialog::v1::client::xdg_wm_dialog_v1::{self, XdgWmDialogV1},
+};
+use wayland_protocols::{
+ wp::fractional_scale::v1::client::{wp_fractional_scale_manager_v1, wp_fractional_scale_v1},
+ xdg::dialog::v1::client::xdg_dialog_v1::XdgDialogV1,
+};
use wayland_protocols_plasma::blur::client::{org_kde_kwin_blur, org_kde_kwin_blur_manager};
use wayland_protocols_wlr::layer_shell::v1::client::{zwlr_layer_shell_v1, zwlr_layer_surface_v1};
use xkbcommon::xkb::ffi::XKB_KEYMAP_FORMAT_TEXT_V1;
@@ -122,6 +124,7 @@ pub struct Globals {
pub layer_shell: Option<zwlr_layer_shell_v1::ZwlrLayerShellV1>,
pub blur_manager: Option<org_kde_kwin_blur_manager::OrgKdeKwinBlurManager>,
pub text_input_manager: Option<zwp_text_input_manager_v3::ZwpTextInputManagerV3>,
+ pub dialog: Option<xdg_wm_dialog_v1::XdgWmDialogV1>,
pub executor: ForegroundExecutor,
}
@@ -132,6 +135,7 @@ impl Globals {
qh: QueueHandle<WaylandClientStatePtr>,
seat: wl_seat::WlSeat,
) -> Self {
+ let dialog_v = XdgWmDialogV1::interface().version;
Globals {
activation: globals.bind(&qh, 1..=1, ()).ok(),
compositor: globals
@@ -160,6 +164,7 @@ impl Globals {
layer_shell: globals.bind(&qh, 1..=5, ()).ok(),
blur_manager: globals.bind(&qh, 1..=1, ()).ok(),
text_input_manager: globals.bind(&qh, 1..=1, ()).ok(),
+ dialog: globals.bind(&qh, dialog_v..=dialog_v, ()).ok(),
executor,
qh,
}
@@ -729,10 +734,7 @@ impl LinuxClient for WaylandClient {
) -> anyhow::Result<Box<dyn PlatformWindow>> {
let mut state = self.0.borrow_mut();
- let parent = state
- .keyboard_focused_window
- .as_ref()
- .and_then(|w| w.toplevel());
+ let parent = state.keyboard_focused_window.clone();
let (window, surface_id) = WaylandWindow::new(
handle,
@@ -751,7 +753,12 @@ impl LinuxClient for WaylandClient {
fn set_cursor_style(&self, style: CursorStyle) {
let mut state = self.0.borrow_mut();
- let need_update = state.cursor_style != Some(style);
+ let need_update = state.cursor_style != Some(style)
+ && (state.mouse_focused_window.is_none()
+ || state
+ .mouse_focused_window
+ .as_ref()
+ .is_some_and(|w| !w.is_blocked()));
if need_update {
let serial = state.serial_tracker.get(SerialKind::MouseEnter);
@@ -1011,7 +1018,7 @@ impl Dispatch<WlCallback, ObjectId> for WaylandClientStatePtr {
}
}
-fn get_window(
+pub(crate) fn get_window(
mut state: &mut RefMut<WaylandClientState>,
surface_id: &ObjectId,
) -> Option<WaylandWindowStatePtr> {
@@ -1654,6 +1661,30 @@ impl Dispatch<wl_pointer::WlPointer, ()> for WaylandClientStatePtr {
state.mouse_location = Some(point(px(surface_x as f32), px(surface_y as f32)));
if let Some(window) = state.mouse_focused_window.clone() {
+ if window.is_blocked() {
+ let default_style = CursorStyle::Arrow;
+ if state.cursor_style != Some(default_style) {
+ let serial = state.serial_tracker.get(SerialKind::MouseEnter);
+ state.cursor_style = Some(default_style);
+
+ if let Some(cursor_shape_device) = &state.cursor_shape_device {
+ cursor_shape_device.set_shape(serial, default_style.to_shape());
+ } else {
+ // cursor-shape-v1 isn't supported, set the cursor using a surface.
+ let wl_pointer = state
+ .wl_pointer
+ .clone()
+ .expect("window is focused by pointer");
+ let scale = window.primary_output_scale();
+ state.cursor.set_icon(
+ &wl_pointer,
+ serial,
+ default_style.to_icon_names(),
+ scale,
+ );
+ }
+ }
+ }
if state
.keyboard_focused_window
.as_ref()
@@ -2225,3 +2256,27 @@ impl Dispatch<zwp_primary_selection_source_v1::ZwpPrimarySelectionSourceV1, ()>
}
}
}
+
+impl Dispatch<XdgWmDialogV1, ()> for WaylandClientStatePtr {
+ fn event(
+ _: &mut Self,
+ _: &XdgWmDialogV1,
+ _: <XdgWmDialogV1 as Proxy>::Event,
+ _: &(),
+ _: &Connection,
+ _: &QueueHandle<Self>,
+ ) {
+ }
+}
+
+impl Dispatch<XdgDialogV1, ()> for WaylandClientStatePtr {
+ fn event(
+ _state: &mut Self,
+ _proxy: &XdgDialogV1,
+ _event: <XdgDialogV1 as Proxy>::Event,
+ _data: &(),
+ _conn: &Connection,
+ _qhandle: &QueueHandle<Self>,
+ ) {
+ }
+}
@@ -7,7 +7,7 @@ use std::{
};
use blade_graphics as gpu;
-use collections::HashMap;
+use collections::{FxHashSet, HashMap};
use futures::channel::oneshot::Receiver;
use raw_window_handle as rwh;
@@ -20,7 +20,7 @@ use wayland_protocols::xdg::shell::client::xdg_surface;
use wayland_protocols::xdg::shell::client::xdg_toplevel::{self};
use wayland_protocols::{
wp::fractional_scale::v1::client::wp_fractional_scale_v1,
- xdg::shell::client::xdg_toplevel::XdgToplevel,
+ xdg::dialog::v1::client::xdg_dialog_v1::XdgDialogV1,
};
use wayland_protocols_plasma::blur::client::org_kde_kwin_blur;
use wayland_protocols_wlr::layer_shell::v1::client::zwlr_layer_surface_v1;
@@ -29,7 +29,7 @@ use crate::{
AnyWindowHandle, Bounds, Decorations, Globals, GpuSpecs, Modifiers, Output, Pixels,
PlatformDisplay, PlatformInput, Point, PromptButton, PromptLevel, RequestFrameOptions,
ResizeEdge, Size, Tiling, WaylandClientStatePtr, WindowAppearance, WindowBackgroundAppearance,
- WindowBounds, WindowControlArea, WindowControls, WindowDecorations, WindowParams,
+ WindowBounds, WindowControlArea, WindowControls, WindowDecorations, WindowParams, get_window,
layer_shell::LayerShellNotSupportedError, px, size,
};
use crate::{
@@ -87,6 +87,8 @@ struct InProgressConfigure {
pub struct WaylandWindowState {
surface_state: WaylandSurfaceState,
acknowledged_first_configure: bool,
+ parent: Option<WaylandWindowStatePtr>,
+ children: FxHashSet<ObjectId>,
pub surface: wl_surface::WlSurface,
app_id: Option<String>,
appearance: WindowAppearance,
@@ -126,7 +128,7 @@ impl WaylandSurfaceState {
surface: &wl_surface::WlSurface,
globals: &Globals,
params: &WindowParams,
- parent: Option<XdgToplevel>,
+ parent: Option<WaylandWindowStatePtr>,
) -> anyhow::Result<Self> {
// For layer_shell windows, create a layer surface instead of an xdg surface
if let WindowKind::LayerShell(options) = ¶ms.kind {
@@ -178,10 +180,28 @@ impl WaylandSurfaceState {
.get_xdg_surface(&surface, &globals.qh, surface.id());
let toplevel = xdg_surface.get_toplevel(&globals.qh, surface.id());
- if params.kind == WindowKind::Floating {
- toplevel.set_parent(parent.as_ref());
+ let xdg_parent = parent.as_ref().and_then(|w| w.toplevel());
+
+ if params.kind == WindowKind::Floating || params.kind == WindowKind::Dialog {
+ toplevel.set_parent(xdg_parent.as_ref());
}
+ let dialog = if params.kind == WindowKind::Dialog {
+ let dialog = globals.dialog.as_ref().map(|dialog| {
+ let xdg_dialog = dialog.get_xdg_dialog(&toplevel, &globals.qh, ());
+ xdg_dialog.set_modal();
+ xdg_dialog
+ });
+
+ if let Some(parent) = parent.as_ref() {
+ parent.add_child(surface.id());
+ }
+
+ dialog
+ } else {
+ None
+ };
+
if let Some(size) = params.window_min_size {
toplevel.set_min_size(size.width.0 as i32, size.height.0 as i32);
}
@@ -198,6 +218,7 @@ impl WaylandSurfaceState {
xdg_surface,
toplevel,
decoration,
+ dialog,
}))
}
}
@@ -206,6 +227,7 @@ pub struct WaylandXdgSurfaceState {
xdg_surface: xdg_surface::XdgSurface,
toplevel: xdg_toplevel::XdgToplevel,
decoration: Option<zxdg_toplevel_decoration_v1::ZxdgToplevelDecorationV1>,
+ dialog: Option<XdgDialogV1>,
}
pub struct WaylandLayerSurfaceState {
@@ -258,7 +280,13 @@ impl WaylandSurfaceState {
xdg_surface,
toplevel,
decoration: _decoration,
+ dialog,
}) => {
+ // drop the dialog before toplevel so compositor can explicitly unapply it's effects
+ if let Some(dialog) = dialog {
+ dialog.destroy();
+ }
+
// The role object (toplevel) must always be destroyed before the xdg_surface.
// See https://wayland.app/protocols/xdg-shell#xdg_surface:request:destroy
toplevel.destroy();
@@ -288,6 +316,7 @@ impl WaylandWindowState {
globals: Globals,
gpu_context: &BladeContext,
options: WindowParams,
+ parent: Option<WaylandWindowStatePtr>,
) -> anyhow::Result<Self> {
let renderer = {
let raw_window = RawWindow {
@@ -319,6 +348,8 @@ impl WaylandWindowState {
Ok(Self {
surface_state,
acknowledged_first_configure: false,
+ parent,
+ children: FxHashSet::default(),
surface,
app_id: None,
blur: None,
@@ -391,6 +422,10 @@ impl Drop for WaylandWindow {
fn drop(&mut self) {
let mut state = self.0.state.borrow_mut();
let surface_id = state.surface.id();
+ if let Some(parent) = state.parent.as_ref() {
+ parent.state.borrow_mut().children.remove(&surface_id);
+ }
+
let client = state.client.clone();
state.renderer.destroy();
@@ -448,10 +483,10 @@ impl WaylandWindow {
client: WaylandClientStatePtr,
params: WindowParams,
appearance: WindowAppearance,
- parent: Option<XdgToplevel>,
+ parent: Option<WaylandWindowStatePtr>,
) -> anyhow::Result<(Self, ObjectId)> {
let surface = globals.compositor.create_surface(&globals.qh, ());
- let surface_state = WaylandSurfaceState::new(&surface, &globals, ¶ms, parent)?;
+ let surface_state = WaylandSurfaceState::new(&surface, &globals, ¶ms, parent.clone())?;
if let Some(fractional_scale_manager) = globals.fractional_scale_manager.as_ref() {
fractional_scale_manager.get_fractional_scale(&surface, &globals.qh, surface.id());
@@ -473,6 +508,7 @@ impl WaylandWindow {
globals,
gpu_context,
params,
+ parent,
)?)),
callbacks: Rc::new(RefCell::new(Callbacks::default())),
});
@@ -501,6 +537,16 @@ impl WaylandWindowStatePtr {
Rc::ptr_eq(&self.state, &other.state)
}
+ pub fn add_child(&self, child: ObjectId) {
+ let mut state = self.state.borrow_mut();
+ state.children.insert(child);
+ }
+
+ pub fn is_blocked(&self) -> bool {
+ let state = self.state.borrow();
+ !state.children.is_empty()
+ }
+
pub fn frame(&self) {
let mut state = self.state.borrow_mut();
state.surface.frame(&state.globals.qh, state.surface.id());
@@ -818,6 +864,9 @@ impl WaylandWindowStatePtr {
}
pub fn handle_ime(&self, ime: ImeInput) {
+ if self.is_blocked() {
+ return;
+ }
let mut state = self.state.borrow_mut();
if let Some(mut input_handler) = state.input_handler.take() {
drop(state);
@@ -894,6 +943,21 @@ impl WaylandWindowStatePtr {
}
pub fn close(&self) {
+ let state = self.state.borrow();
+ let client = state.client.get_client();
+ #[allow(clippy::mutable_key_type)]
+ let children = state.children.clone();
+ drop(state);
+
+ for child in children {
+ let mut client_state = client.borrow_mut();
+ let window = get_window(&mut client_state, &child);
+ drop(client_state);
+
+ if let Some(child) = window {
+ child.close();
+ }
+ }
let mut callbacks = self.callbacks.borrow_mut();
if let Some(fun) = callbacks.close.take() {
fun()
@@ -901,6 +965,9 @@ impl WaylandWindowStatePtr {
}
pub fn handle_input(&self, input: PlatformInput) {
+ if self.is_blocked() {
+ return;
+ }
if let Some(ref mut fun) = self.callbacks.borrow_mut().input
&& !fun(input.clone()).propagate
{
@@ -222,7 +222,7 @@ pub struct X11ClientState {
pub struct X11ClientStatePtr(pub Weak<RefCell<X11ClientState>>);
impl X11ClientStatePtr {
- fn get_client(&self) -> Option<X11Client> {
+ pub fn get_client(&self) -> Option<X11Client> {
self.0.upgrade().map(X11Client)
}
@@ -752,7 +752,7 @@ impl X11Client {
}
}
- fn get_window(&self, win: xproto::Window) -> Option<X11WindowStatePtr> {
+ pub(crate) fn get_window(&self, win: xproto::Window) -> Option<X11WindowStatePtr> {
let state = self.0.borrow();
state
.windows
@@ -789,12 +789,12 @@ impl X11Client {
let [atom, arg1, arg2, arg3, arg4] = event.data.as_data32();
let mut state = self.0.borrow_mut();
- if atom == state.atoms.WM_DELETE_WINDOW {
+ if atom == state.atoms.WM_DELETE_WINDOW && window.should_close() {
// window "x" button clicked by user
- if window.should_close() {
- // Rest of the close logic is handled in drop_window()
- window.close();
- }
+ // Rest of the close logic is handled in drop_window()
+ drop(state);
+ window.close();
+ state = self.0.borrow_mut();
} else if atom == state.atoms._NET_WM_SYNC_REQUEST {
window.state.borrow_mut().last_sync_counter =
Some(x11rb::protocol::sync::Int64 {
@@ -1216,6 +1216,33 @@ impl X11Client {
Event::XinputMotion(event) => {
let window = self.get_window(event.event)?;
let mut state = self.0.borrow_mut();
+ if window.is_blocked() {
+ // We want to set the cursor to the default arrow
+ // when the window is blocked
+ let style = CursorStyle::Arrow;
+
+ let current_style = state
+ .cursor_styles
+ .get(&window.x_window)
+ .unwrap_or(&CursorStyle::Arrow);
+ if *current_style != style
+ && let Some(cursor) = state.get_cursor_icon(style)
+ {
+ state.cursor_styles.insert(window.x_window, style);
+ check_reply(
+ || "Failed to set cursor style",
+ state.xcb_connection.change_window_attributes(
+ window.x_window,
+ &ChangeWindowAttributesAux {
+ cursor: Some(cursor),
+ ..Default::default()
+ },
+ ),
+ )
+ .log_err();
+ state.xcb_connection.flush().log_err();
+ };
+ }
let pressed_button = pressed_button_from_mask(event.button_mask[0]);
let position = point(
px(event.event_x as f32 / u16::MAX as f32 / state.scale_factor),
@@ -1489,7 +1516,7 @@ impl LinuxClient for X11Client {
let parent_window = state
.keyboard_focused_window
.and_then(|focused_window| state.windows.get(&focused_window))
- .map(|window| window.window.x_window);
+ .map(|w| w.window.clone());
let x_window = state
.xcb_connection
.generate_id()
@@ -1544,7 +1571,15 @@ impl LinuxClient for X11Client {
.cursor_styles
.get(&focused_window)
.unwrap_or(&CursorStyle::Arrow);
- if *current_style == style {
+
+ let window = state
+ .mouse_focused_window
+ .and_then(|w| state.windows.get(&w));
+
+ let should_change = *current_style != style
+ && (window.is_none() || window.is_some_and(|w| !w.is_blocked()));
+
+ if !should_change {
return;
}
@@ -11,6 +11,7 @@ use crate::{
};
use blade_graphics as gpu;
+use collections::FxHashSet;
use raw_window_handle as rwh;
use util::{ResultExt, maybe};
use x11rb::{
@@ -74,6 +75,7 @@ x11rb::atom_manager! {
_NET_WM_WINDOW_TYPE,
_NET_WM_WINDOW_TYPE_NOTIFICATION,
_NET_WM_WINDOW_TYPE_DIALOG,
+ _NET_WM_STATE_MODAL,
_NET_WM_SYNC,
_NET_SUPPORTED,
_MOTIF_WM_HINTS,
@@ -249,6 +251,8 @@ pub struct Callbacks {
pub struct X11WindowState {
pub destroyed: bool,
+ parent: Option<X11WindowStatePtr>,
+ children: FxHashSet<xproto::Window>,
client: X11ClientStatePtr,
executor: ForegroundExecutor,
atoms: XcbAtoms,
@@ -394,7 +398,7 @@ impl X11WindowState {
atoms: &XcbAtoms,
scale_factor: f32,
appearance: WindowAppearance,
- parent_window: Option<xproto::Window>,
+ parent_window: Option<X11WindowStatePtr>,
) -> anyhow::Result<Self> {
let x_screen_index = params
.display_id
@@ -546,8 +550,8 @@ impl X11WindowState {
)?;
}
- if params.kind == WindowKind::Floating {
- if let Some(parent_window) = parent_window {
+ if params.kind == WindowKind::Floating || params.kind == WindowKind::Dialog {
+ if let Some(parent_window) = parent_window.as_ref().map(|w| w.x_window) {
// WM_TRANSIENT_FOR hint indicating the main application window. For floating windows, we set
// a parent window (WM_TRANSIENT_FOR) such that the window manager knows where to
// place the floating window in relation to the main window.
@@ -563,11 +567,23 @@ impl X11WindowState {
),
)?;
}
+ }
+
+ let parent = if params.kind == WindowKind::Dialog
+ && let Some(parent) = parent_window
+ {
+ parent.add_child(x_window);
+
+ Some(parent)
+ } else {
+ None
+ };
+ if params.kind == WindowKind::Dialog {
// _NET_WM_WINDOW_TYPE_DIALOG indicates that this is a dialog (floating) window
// https://specifications.freedesktop.org/wm-spec/1.4/ar01s05.html
check_reply(
- || "X11 ChangeProperty32 setting window type for floating window failed.",
+ || "X11 ChangeProperty32 setting window type for dialog window failed.",
xcb.change_property32(
xproto::PropMode::REPLACE,
x_window,
@@ -576,6 +592,20 @@ impl X11WindowState {
&[atoms._NET_WM_WINDOW_TYPE_DIALOG],
),
)?;
+
+ // We set the modal state for dialog windows, so that the window manager
+ // can handle it appropriately (e.g., prevent interaction with the parent window
+ // while the dialog is open).
+ check_reply(
+ || "X11 ChangeProperty32 setting modal state for dialog window failed.",
+ xcb.change_property32(
+ xproto::PropMode::REPLACE,
+ x_window,
+ atoms._NET_WM_STATE,
+ xproto::AtomEnum::ATOM,
+ &[atoms._NET_WM_STATE_MODAL],
+ ),
+ )?;
}
check_reply(
@@ -667,6 +697,8 @@ impl X11WindowState {
let display = Rc::new(X11Display::new(xcb, scale_factor, x_screen_index)?);
Ok(Self {
+ parent,
+ children: FxHashSet::default(),
client,
executor,
display,
@@ -720,6 +752,11 @@ pub(crate) struct X11Window(pub X11WindowStatePtr);
impl Drop for X11Window {
fn drop(&mut self) {
let mut state = self.0.state.borrow_mut();
+
+ if let Some(parent) = state.parent.as_ref() {
+ parent.state.borrow_mut().children.remove(&self.0.x_window);
+ }
+
state.renderer.destroy();
let destroy_x_window = maybe!({
@@ -734,8 +771,6 @@ impl Drop for X11Window {
.log_err();
if destroy_x_window.is_some() {
- // Mark window as destroyed so that we can filter out when X11 events
- // for it still come in.
state.destroyed = true;
let this_ptr = self.0.clone();
@@ -773,7 +808,7 @@ impl X11Window {
atoms: &XcbAtoms,
scale_factor: f32,
appearance: WindowAppearance,
- parent_window: Option<xproto::Window>,
+ parent_window: Option<X11WindowStatePtr>,
) -> anyhow::Result<Self> {
let ptr = X11WindowStatePtr {
state: Rc::new(RefCell::new(X11WindowState::new(
@@ -979,7 +1014,31 @@ impl X11WindowStatePtr {
Ok(())
}
+ pub fn add_child(&self, child: xproto::Window) {
+ let mut state = self.state.borrow_mut();
+ state.children.insert(child);
+ }
+
+ pub fn is_blocked(&self) -> bool {
+ let state = self.state.borrow();
+ !state.children.is_empty()
+ }
+
pub fn close(&self) {
+ let state = self.state.borrow();
+ let client = state.client.clone();
+ #[allow(clippy::mutable_key_type)]
+ let children = state.children.clone();
+ drop(state);
+
+ if let Some(client) = client.get_client() {
+ for child in children {
+ if let Some(child_window) = client.get_window(child) {
+ child_window.close();
+ }
+ }
+ }
+
let mut callbacks = self.callbacks.borrow_mut();
if let Some(fun) = callbacks.close.take() {
fun()
@@ -994,6 +1053,9 @@ impl X11WindowStatePtr {
}
pub fn handle_input(&self, input: PlatformInput) {
+ if self.is_blocked() {
+ return;
+ }
if let Some(ref mut fun) = self.callbacks.borrow_mut().input
&& !fun(input.clone()).propagate
{
@@ -1016,6 +1078,9 @@ impl X11WindowStatePtr {
}
pub fn handle_ime_commit(&self, text: String) {
+ if self.is_blocked() {
+ return;
+ }
let mut state = self.state.borrow_mut();
if let Some(mut input_handler) = state.input_handler.take() {
drop(state);
@@ -1026,6 +1091,9 @@ impl X11WindowStatePtr {
}
pub fn handle_ime_preedit(&self, text: String) {
+ if self.is_blocked() {
+ return;
+ }
let mut state = self.state.borrow_mut();
if let Some(mut input_handler) = state.input_handler.take() {
drop(state);
@@ -1036,6 +1104,9 @@ impl X11WindowStatePtr {
}
pub fn handle_ime_unmark(&self) {
+ if self.is_blocked() {
+ return;
+ }
let mut state = self.state.borrow_mut();
if let Some(mut input_handler) = state.input_handler.take() {
drop(state);
@@ -1046,6 +1117,9 @@ impl X11WindowStatePtr {
}
pub fn handle_ime_delete(&self) {
+ if self.is_blocked() {
+ return;
+ }
let mut state = self.state.borrow_mut();
if let Some(mut input_handler) = state.input_handler.take() {
drop(state);
@@ -46,9 +46,9 @@ pub unsafe fn new_renderer(
_native_window: *mut c_void,
_native_view: *mut c_void,
_bounds: crate::Size<f32>,
- _transparent: bool,
+ transparent: bool,
) -> Renderer {
- MetalRenderer::new(context)
+ MetalRenderer::new(context, transparent)
}
pub(crate) struct InstanceBufferPool {
@@ -128,7 +128,7 @@ pub struct PathRasterizationVertex {
}
impl MetalRenderer {
- pub fn new(instance_buffer_pool: Arc<Mutex<InstanceBufferPool>>) -> Self {
+ pub fn new(instance_buffer_pool: Arc<Mutex<InstanceBufferPool>>, transparent: bool) -> Self {
// Prefer low‐power integrated GPUs on Intel Mac. On Apple
// Silicon, there is only ever one GPU, so this is equivalent to
// `metal::Device::system_default()`.
@@ -152,8 +152,13 @@ impl MetalRenderer {
let layer = metal::MetalLayer::new();
layer.set_device(&device);
layer.set_pixel_format(MTLPixelFormat::BGRA8Unorm);
- layer.set_opaque(false);
+ // Support direct-to-display rendering if the window is not transparent
+ // https://developer.apple.com/documentation/metal/managing-your-game-window-for-metal-in-macos
+ layer.set_opaque(!transparent);
layer.set_maximum_drawable_count(3);
+ // We already present at display sync with the display link
+ // This allows to use direct-to-display even in window mode
+ layer.set_display_sync_enabled(false);
unsafe {
let _: () = msg_send![&*layer, setAllowsNextDrawableTimeout: NO];
let _: () = msg_send![&*layer, setNeedsDisplayOnBoundsChange: YES];
@@ -352,8 +357,8 @@ impl MetalRenderer {
}
}
- pub fn update_transparency(&self, _transparent: bool) {
- // todo(mac)?
+ pub fn update_transparency(&self, transparent: bool) {
+ self.layer.set_opaque(!transparent);
}
pub fn destroy(&self) {
@@ -62,9 +62,12 @@ static mut BLURRED_VIEW_CLASS: *const Class = ptr::null();
#[allow(non_upper_case_globals)]
const NSWindowStyleMaskNonactivatingPanel: NSWindowStyleMask =
NSWindowStyleMask::from_bits_retain(1 << 7);
+// WindowLevel const value ref: https://docs.rs/core-graphics2/0.4.1/src/core_graphics2/window_level.rs.html
#[allow(non_upper_case_globals)]
const NSNormalWindowLevel: NSInteger = 0;
#[allow(non_upper_case_globals)]
+const NSFloatingWindowLevel: NSInteger = 3;
+#[allow(non_upper_case_globals)]
const NSPopUpWindowLevel: NSInteger = 101;
#[allow(non_upper_case_globals)]
const NSTrackingMouseEnteredAndExited: NSUInteger = 0x01;
@@ -423,6 +426,8 @@ struct MacWindowState {
select_previous_tab_callback: Option<Box<dyn FnMut()>>,
toggle_tab_bar_callback: Option<Box<dyn FnMut()>>,
activated_least_once: bool,
+ // The parent window if this window is a sheet (Dialog kind)
+ sheet_parent: Option<id>,
}
impl MacWindowState {
@@ -622,11 +627,16 @@ impl MacWindow {
}
let native_window: id = match kind {
- WindowKind::Normal | WindowKind::Floating => msg_send![WINDOW_CLASS, alloc],
+ WindowKind::Normal => {
+ msg_send![WINDOW_CLASS, alloc]
+ }
WindowKind::PopUp => {
style_mask |= NSWindowStyleMaskNonactivatingPanel;
msg_send![PANEL_CLASS, alloc]
}
+ WindowKind::Floating | WindowKind::Dialog => {
+ msg_send![PANEL_CLASS, alloc]
+ }
};
let display = display_id
@@ -729,6 +739,7 @@ impl MacWindow {
select_previous_tab_callback: None,
toggle_tab_bar_callback: None,
activated_least_once: false,
+ sheet_parent: None,
})));
(*native_window).set_ivar(
@@ -779,9 +790,18 @@ impl MacWindow {
content_view.addSubview_(native_view.autorelease());
native_window.makeFirstResponder_(native_view);
+ let app: id = NSApplication::sharedApplication(nil);
+ let main_window: id = msg_send![app, mainWindow];
+ let mut sheet_parent = None;
+
match kind {
WindowKind::Normal | WindowKind::Floating => {
- native_window.setLevel_(NSNormalWindowLevel);
+ if kind == WindowKind::Floating {
+ // Let the window float keep above normal windows.
+ native_window.setLevel_(NSFloatingWindowLevel);
+ } else {
+ native_window.setLevel_(NSNormalWindowLevel);
+ }
native_window.setAcceptsMouseMovedEvents_(YES);
if let Some(tabbing_identifier) = tabbing_identifier {
@@ -816,10 +836,23 @@ impl MacWindow {
NSWindowCollectionBehavior::NSWindowCollectionBehaviorFullScreenAuxiliary
);
}
+ WindowKind::Dialog => {
+ if !main_window.is_null() {
+ let parent = {
+ let active_sheet: id = msg_send![main_window, attachedSheet];
+ if active_sheet.is_null() {
+ main_window
+ } else {
+ active_sheet
+ }
+ };
+ let _: () =
+ msg_send![parent, beginSheet: native_window completionHandler: nil];
+ sheet_parent = Some(parent);
+ }
+ }
}
- let app = NSApplication::sharedApplication(nil);
- let main_window: id = msg_send![app, mainWindow];
if allows_automatic_window_tabbing
&& !main_window.is_null()
&& main_window != native_window
@@ -861,7 +894,11 @@ impl MacWindow {
// the window position might be incorrect if the main screen (the screen that contains the window that has focus)
// is different from the primary screen.
NSWindow::setFrameTopLeftPoint_(native_window, window_rect.origin);
- window.0.lock().move_traffic_light();
+ {
+ let mut window_state = window.0.lock();
+ window_state.move_traffic_light();
+ window_state.sheet_parent = sheet_parent;
+ }
pool.drain();
@@ -938,6 +975,7 @@ impl Drop for MacWindow {
let mut this = self.0.lock();
this.renderer.destroy();
let window = this.native_window;
+ let sheet_parent = this.sheet_parent.take();
this.display_link.take();
unsafe {
this.native_window.setDelegate_(nil);
@@ -946,6 +984,9 @@ impl Drop for MacWindow {
this.executor
.spawn(async move {
unsafe {
+ if let Some(parent) = sheet_parent {
+ let _: () = msg_send![parent, endSheet: window];
+ }
window.close();
window.autorelease();
}
@@ -270,6 +270,14 @@ impl WindowsWindowInner {
fn handle_destroy_msg(&self, handle: HWND) -> Option<isize> {
let callback = { self.state.callbacks.close.take() };
+ // Re-enable parent window if this was a modal dialog
+ if let Some(parent_hwnd) = self.parent_hwnd {
+ unsafe {
+ let _ = EnableWindow(parent_hwnd, true);
+ let _ = SetForegroundWindow(parent_hwnd);
+ }
+ }
+
if let Some(callback) = callback {
callback();
}
@@ -83,6 +83,7 @@ pub(crate) struct WindowsWindowInner {
pub(crate) validation_number: usize,
pub(crate) main_receiver: flume::Receiver<RunnableVariant>,
pub(crate) platform_window_handle: HWND,
+ pub(crate) parent_hwnd: Option<HWND>,
}
impl WindowsWindowState {
@@ -241,6 +242,7 @@ impl WindowsWindowInner {
main_receiver: context.main_receiver.clone(),
platform_window_handle: context.platform_window_handle,
system_settings: WindowsSystemSettings::new(context.display),
+ parent_hwnd: context.parent_hwnd,
}))
}
@@ -368,6 +370,7 @@ struct WindowCreateContext {
disable_direct_composition: bool,
directx_devices: DirectXDevices,
invalidate_devices: Arc<AtomicBool>,
+ parent_hwnd: Option<HWND>,
}
impl WindowsWindow {
@@ -390,6 +393,20 @@ impl WindowsWindow {
invalidate_devices,
} = creation_info;
register_window_class(icon);
+ let parent_hwnd = if params.kind == WindowKind::Dialog {
+ let parent_window = unsafe { GetActiveWindow() };
+ if parent_window.is_invalid() {
+ None
+ } else {
+ // Disable the parent window to make this dialog modal
+ unsafe {
+ EnableWindow(parent_window, false).as_bool();
+ };
+ Some(parent_window)
+ }
+ } else {
+ None
+ };
let hide_title_bar = params
.titlebar
.as_ref()
@@ -416,8 +433,14 @@ impl WindowsWindow {
if params.is_minimizable {
dwstyle |= WS_MINIMIZEBOX;
}
+ let dwexstyle = if params.kind == WindowKind::Dialog {
+ dwstyle |= WS_POPUP | WS_CAPTION;
+ WS_EX_DLGMODALFRAME
+ } else {
+ WS_EX_APPWINDOW
+ };
- (WS_EX_APPWINDOW, dwstyle)
+ (dwexstyle, dwstyle)
};
if !disable_direct_composition {
dwexstyle |= WS_EX_NOREDIRECTIONBITMAP;
@@ -449,6 +472,7 @@ impl WindowsWindow {
disable_direct_composition,
directx_devices,
invalidate_devices,
+ parent_hwnd,
};
let creation_result = unsafe {
CreateWindowExW(
@@ -460,7 +484,7 @@ impl WindowsWindow {
CW_USEDEFAULT,
CW_USEDEFAULT,
CW_USEDEFAULT,
- None,
+ parent_hwnd,
None,
Some(hinstance.into()),
Some(&context as *const _ as *const _),
@@ -128,22 +128,21 @@ impl LineWrapper {
})
}
- /// Truncate a line of text to the given width with this wrapper's font and font size.
- pub fn truncate_line<'a>(
+ /// Determines if a line should be truncated based on its width.
+ pub fn should_truncate_line(
&mut self,
- line: SharedString,
+ line: &str,
truncate_width: Pixels,
truncation_suffix: &str,
- runs: &'a [TextRun],
- ) -> (SharedString, Cow<'a, [TextRun]>) {
+ ) -> Option<usize> {
let mut width = px(0.);
- let mut suffix_width = truncation_suffix
+ let suffix_width = truncation_suffix
.chars()
.map(|c| self.width_for_char(c))
.fold(px(0.0), |a, x| a + x);
- let mut char_indices = line.char_indices();
let mut truncate_ix = 0;
- for (ix, c) in char_indices {
+
+ for (ix, c) in line.char_indices() {
if width + suffix_width < truncate_width {
truncate_ix = ix;
}
@@ -152,16 +151,32 @@ impl LineWrapper {
width += char_width;
if width.floor() > truncate_width {
- let result =
- SharedString::from(format!("{}{}", &line[..truncate_ix], truncation_suffix));
- let mut runs = runs.to_vec();
- update_runs_after_truncation(&result, truncation_suffix, &mut runs);
-
- return (result, Cow::Owned(runs));
+ return Some(truncate_ix);
}
}
- (line, Cow::Borrowed(runs))
+ None
+ }
+
+ /// Truncate a line of text to the given width with this wrapper's font and font size.
+ pub fn truncate_line<'a>(
+ &mut self,
+ line: SharedString,
+ truncate_width: Pixels,
+ truncation_suffix: &str,
+ runs: &'a [TextRun],
+ ) -> (SharedString, Cow<'a, [TextRun]>) {
+ if let Some(truncate_ix) =
+ self.should_truncate_line(&line, truncate_width, truncation_suffix)
+ {
+ let result =
+ SharedString::from(format!("{}{}", &line[..truncate_ix], truncation_suffix));
+ let mut runs = runs.to_vec();
+ update_runs_after_truncation(&result, truncation_suffix, &mut runs);
+ (result, Cow::Owned(runs))
+ } else {
+ (line, Cow::Borrowed(runs))
+ }
}
/// Any character in this list should be treated as a word character,
@@ -797,11 +797,26 @@ pub enum AuthenticateError {
Other(#[from] anyhow::Error),
}
+/// Either a built-in icon name or a path to an external SVG.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum IconOrSvg {
+ /// A built-in icon from Zed's icon set.
+ Icon(IconName),
+ /// Path to a custom SVG icon file.
+ Svg(SharedString),
+}
+
+impl Default for IconOrSvg {
+ fn default() -> Self {
+ Self::Icon(IconName::ZedAssistant)
+ }
+}
+
pub trait LanguageModelProvider: 'static {
fn id(&self) -> LanguageModelProviderId;
fn name(&self) -> LanguageModelProviderName;
- fn icon(&self) -> IconName {
- IconName::ZedAssistant
+ fn icon(&self) -> IconOrSvg {
+ IconOrSvg::default()
}
/// Returns the path to an external SVG icon for this provider, if any.
/// When present, this takes precedence over `icon()`.
@@ -8,7 +8,7 @@ use futures::{FutureExt, Stream, StreamExt, future, future::BoxFuture, stream::B
use gpui::{AnyView, App, AsyncApp, Context, Entity, Task};
use http_client::HttpClient;
use language_model::{
- ApiKeyState, AuthenticateError, ConfigurationViewTargetAgent, EnvVar, LanguageModel,
+ ApiKeyState, AuthenticateError, ConfigurationViewTargetAgent, EnvVar, IconOrSvg, LanguageModel,
LanguageModelCacheConfiguration, LanguageModelCompletionError, LanguageModelCompletionEvent,
LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
@@ -125,8 +125,8 @@ impl LanguageModelProvider for AnthropicLanguageModelProvider {
PROVIDER_NAME
}
- fn icon(&self) -> IconName {
- IconName::AiAnthropic
+ fn icon(&self) -> IconOrSvg {
+ IconOrSvg::Icon(IconName::AiAnthropic)
}
fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
@@ -30,7 +30,7 @@ use gpui::{
use gpui_tokio::Tokio;
use http_client::HttpClient;
use language_model::{
- AuthenticateError, EnvVar, LanguageModel, LanguageModelCacheConfiguration,
+ AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCacheConfiguration,
LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
@@ -426,8 +426,8 @@ impl LanguageModelProvider for BedrockLanguageModelProvider {
PROVIDER_NAME
}
- fn icon(&self) -> IconName {
- IconName::AiBedrock
+ fn icon(&self) -> IconOrSvg {
+ IconOrSvg::Icon(IconName::AiBedrock)
}
fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
@@ -19,7 +19,7 @@ use gpui::{AnyElement, AnyView, App, AsyncApp, Context, Entity, Subscription, Ta
use http_client::http::{HeaderMap, HeaderValue};
use http_client::{AsyncBody, HttpClient, HttpRequestExt, Method, Response, StatusCode};
use language_model::{
- AuthenticateError, LanguageModel, LanguageModelCacheConfiguration,
+ AuthenticateError, IconOrSvg, LanguageModel, LanguageModelCacheConfiguration,
LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
@@ -304,8 +304,8 @@ impl LanguageModelProvider for CloudLanguageModelProvider {
PROVIDER_NAME
}
- fn icon(&self) -> IconName {
- IconName::AiZed
+ fn icon(&self) -> IconOrSvg {
+ IconOrSvg::Icon(IconName::AiZed)
}
fn default_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
@@ -18,12 +18,12 @@ use gpui::{AnyView, App, AsyncApp, Entity, Subscription, Task};
use http_client::StatusCode;
use language::language_settings::all_language_settings;
use language_model::{
- AuthenticateError, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
- LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
- LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
- LanguageModelRequestMessage, LanguageModelToolChoice, LanguageModelToolResultContent,
- LanguageModelToolSchemaFormat, LanguageModelToolUse, MessageContent, RateLimiter, Role,
- StopReason, TokenUsage,
+ AuthenticateError, IconOrSvg, LanguageModel, LanguageModelCompletionError,
+ LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
+ LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
+ LanguageModelRequest, LanguageModelRequestMessage, LanguageModelToolChoice,
+ LanguageModelToolResultContent, LanguageModelToolSchemaFormat, LanguageModelToolUse,
+ MessageContent, RateLimiter, Role, StopReason, TokenUsage,
};
use settings::SettingsStore;
use ui::prelude::*;
@@ -104,8 +104,8 @@ impl LanguageModelProvider for CopilotChatLanguageModelProvider {
PROVIDER_NAME
}
- fn icon(&self) -> IconName {
- IconName::Copilot
+ fn icon(&self) -> IconOrSvg {
+ IconOrSvg::Icon(IconName::Copilot)
}
fn default_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
@@ -7,7 +7,7 @@ use futures::{FutureExt, StreamExt, future, future::BoxFuture, stream::BoxStream
use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, Window};
use http_client::HttpClient;
use language_model::{
- ApiKeyState, AuthenticateError, EnvVar, LanguageModel, LanguageModelCompletionError,
+ ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
LanguageModelRequest, LanguageModelToolChoice, LanguageModelToolResultContent,
@@ -127,8 +127,8 @@ impl LanguageModelProvider for DeepSeekLanguageModelProvider {
PROVIDER_NAME
}
- fn icon(&self) -> IconName {
- IconName::AiDeepSeek
+ fn icon(&self) -> IconOrSvg {
+ IconOrSvg::Icon(IconName::AiDeepSeek)
}
fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
@@ -13,7 +13,7 @@ use language_model::{
LanguageModelToolUse, LanguageModelToolUseId, MessageContent, StopReason,
};
use language_model::{
- LanguageModel, LanguageModelId, LanguageModelName, LanguageModelProvider,
+ IconOrSvg, LanguageModel, LanguageModelId, LanguageModelName, LanguageModelProvider,
LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
LanguageModelRequest, RateLimiter, Role,
};
@@ -147,8 +147,8 @@ impl LanguageModelProvider for GoogleLanguageModelProvider {
PROVIDER_NAME
}
- fn icon(&self) -> IconName {
- IconName::AiGoogle
+ fn icon(&self) -> IconOrSvg {
+ IconOrSvg::Icon(IconName::AiGoogle)
}
fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
@@ -10,7 +10,7 @@ use language_model::{
StopReason, TokenUsage,
};
use language_model::{
- LanguageModel, LanguageModelId, LanguageModelName, LanguageModelProvider,
+ IconOrSvg, LanguageModel, LanguageModelId, LanguageModelName, LanguageModelProvider,
LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
LanguageModelRequest, RateLimiter, Role,
};
@@ -175,8 +175,8 @@ impl LanguageModelProvider for LmStudioLanguageModelProvider {
PROVIDER_NAME
}
- fn icon(&self) -> IconName {
- IconName::AiLmStudio
+ fn icon(&self) -> IconOrSvg {
+ IconOrSvg::Icon(IconName::AiLmStudio)
}
fn default_model(&self, _: &App) -> Option<Arc<dyn LanguageModel>> {
@@ -5,7 +5,7 @@ use futures::{FutureExt, Stream, StreamExt, future, future::BoxFuture, stream::B
use gpui::{AnyView, App, AsyncApp, Context, Entity, Global, SharedString, Task, Window};
use http_client::HttpClient;
use language_model::{
- ApiKeyState, AuthenticateError, EnvVar, LanguageModel, LanguageModelCompletionError,
+ ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
LanguageModelRequest, LanguageModelToolChoice, LanguageModelToolResultContent,
@@ -176,8 +176,8 @@ impl LanguageModelProvider for MistralLanguageModelProvider {
PROVIDER_NAME
}
- fn icon(&self) -> IconName {
- IconName::AiMistral
+ fn icon(&self) -> IconOrSvg {
+ IconOrSvg::Icon(IconName::AiMistral)
}
fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
@@ -5,7 +5,7 @@ use futures::{Stream, TryFutureExt, stream};
use gpui::{AnyView, App, AsyncApp, Context, CursorStyle, Entity, Task};
use http_client::HttpClient;
use language_model::{
- ApiKeyState, AuthenticateError, EnvVar, LanguageModel, LanguageModelCompletionError,
+ ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
LanguageModelRequest, LanguageModelRequestTool, LanguageModelToolChoice, LanguageModelToolUse,
@@ -221,8 +221,8 @@ impl LanguageModelProvider for OllamaLanguageModelProvider {
PROVIDER_NAME
}
- fn icon(&self) -> IconName {
- IconName::AiOllama
+ fn icon(&self) -> IconOrSvg {
+ IconOrSvg::Icon(IconName::AiOllama)
}
fn default_model(&self, _: &App) -> Option<Arc<dyn LanguageModel>> {
@@ -249,33 +249,7 @@ impl LanguageModelProvider for OllamaLanguageModelProvider {
}
// Override with available models from settings
- for setting_model in &OllamaLanguageModelProvider::settings(cx).available_models {
- let setting_base = setting_model.name.split(':').next().unwrap();
- if let Some(model) = models
- .values_mut()
- .find(|m| m.name.split(':').next().unwrap() == setting_base)
- {
- model.max_tokens = setting_model.max_tokens;
- model.display_name = setting_model.display_name.clone();
- model.keep_alive = setting_model.keep_alive.clone();
- model.supports_tools = setting_model.supports_tools;
- model.supports_vision = setting_model.supports_images;
- model.supports_thinking = setting_model.supports_thinking;
- } else {
- models.insert(
- setting_model.name.clone(),
- ollama::Model {
- name: setting_model.name.clone(),
- display_name: setting_model.display_name.clone(),
- max_tokens: setting_model.max_tokens,
- keep_alive: setting_model.keep_alive.clone(),
- supports_tools: setting_model.supports_tools,
- supports_vision: setting_model.supports_images,
- supports_thinking: setting_model.supports_thinking,
- },
- );
- }
- }
+ merge_settings_into_models(&mut models, &settings.available_models);
let mut models = models
.into_values()
@@ -921,6 +895,35 @@ impl Render for ConfigurationView {
}
}
+fn merge_settings_into_models(
+ models: &mut HashMap<String, ollama::Model>,
+ available_models: &[AvailableModel],
+) {
+ for setting_model in available_models {
+ if let Some(model) = models.get_mut(&setting_model.name) {
+ model.max_tokens = setting_model.max_tokens;
+ model.display_name = setting_model.display_name.clone();
+ model.keep_alive = setting_model.keep_alive.clone();
+ model.supports_tools = setting_model.supports_tools;
+ model.supports_vision = setting_model.supports_images;
+ model.supports_thinking = setting_model.supports_thinking;
+ } else {
+ models.insert(
+ setting_model.name.clone(),
+ ollama::Model {
+ name: setting_model.name.clone(),
+ display_name: setting_model.display_name.clone(),
+ max_tokens: setting_model.max_tokens,
+ keep_alive: setting_model.keep_alive.clone(),
+ supports_tools: setting_model.supports_tools,
+ supports_vision: setting_model.supports_images,
+ supports_thinking: setting_model.supports_thinking,
+ },
+ );
+ }
+ }
+}
+
fn tool_into_ollama(tool: LanguageModelRequestTool) -> ollama::OllamaTool {
ollama::OllamaTool::Function {
function: OllamaFunctionTool {
@@ -930,3 +933,83 @@ fn tool_into_ollama(tool: LanguageModelRequestTool) -> ollama::OllamaTool {
},
}
}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn test_merge_settings_preserves_display_names_for_similar_models() {
+ // Regression test for https://github.com/zed-industries/zed/issues/43646
+ // When multiple models share the same base name (e.g., qwen2.5-coder:1.5b and qwen2.5-coder:3b),
+ // each model should get its own display_name from settings, not a random one.
+
+ let mut models: HashMap<String, ollama::Model> = HashMap::new();
+ models.insert(
+ "qwen2.5-coder:1.5b".to_string(),
+ ollama::Model {
+ name: "qwen2.5-coder:1.5b".to_string(),
+ display_name: None,
+ max_tokens: 4096,
+ keep_alive: None,
+ supports_tools: None,
+ supports_vision: None,
+ supports_thinking: None,
+ },
+ );
+ models.insert(
+ "qwen2.5-coder:3b".to_string(),
+ ollama::Model {
+ name: "qwen2.5-coder:3b".to_string(),
+ display_name: None,
+ max_tokens: 4096,
+ keep_alive: None,
+ supports_tools: None,
+ supports_vision: None,
+ supports_thinking: None,
+ },
+ );
+
+ let available_models = vec![
+ AvailableModel {
+ name: "qwen2.5-coder:1.5b".to_string(),
+ display_name: Some("QWEN2.5 Coder 1.5B".to_string()),
+ max_tokens: 5000,
+ keep_alive: None,
+ supports_tools: Some(true),
+ supports_images: None,
+ supports_thinking: None,
+ },
+ AvailableModel {
+ name: "qwen2.5-coder:3b".to_string(),
+ display_name: Some("QWEN2.5 Coder 3B".to_string()),
+ max_tokens: 6000,
+ keep_alive: None,
+ supports_tools: Some(true),
+ supports_images: None,
+ supports_thinking: None,
+ },
+ ];
+
+ merge_settings_into_models(&mut models, &available_models);
+
+ let model_1_5b = models
+ .get("qwen2.5-coder:1.5b")
+ .expect("1.5b model missing");
+ let model_3b = models.get("qwen2.5-coder:3b").expect("3b model missing");
+
+ assert_eq!(
+ model_1_5b.display_name,
+ Some("QWEN2.5 Coder 1.5B".to_string()),
+ "1.5b model should have its own display_name"
+ );
+ assert_eq!(model_1_5b.max_tokens, 5000);
+
+ assert_eq!(
+ model_3b.display_name,
+ Some("QWEN2.5 Coder 3B".to_string()),
+ "3b model should have its own display_name"
+ );
+ assert_eq!(model_3b.max_tokens, 6000);
+ }
+}
@@ -5,7 +5,7 @@ use futures::{FutureExt, StreamExt, future, future::BoxFuture};
use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, Window};
use http_client::HttpClient;
use language_model::{
- ApiKeyState, AuthenticateError, EnvVar, LanguageModel, LanguageModelCompletionError,
+ ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
LanguageModelRequest, LanguageModelToolChoice, LanguageModelToolResultContent,
@@ -122,8 +122,8 @@ impl LanguageModelProvider for OpenAiLanguageModelProvider {
PROVIDER_NAME
}
- fn icon(&self) -> IconName {
- IconName::AiOpenAi
+ fn icon(&self) -> IconOrSvg {
+ IconOrSvg::Icon(IconName::AiOpenAi)
}
fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
@@ -4,7 +4,7 @@ use futures::{FutureExt, StreamExt, future, future::BoxFuture};
use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, Window};
use http_client::HttpClient;
use language_model::{
- ApiKeyState, AuthenticateError, EnvVar, LanguageModel, LanguageModelCompletionError,
+ ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
LanguageModelRequest, LanguageModelToolChoice, LanguageModelToolSchemaFormat, RateLimiter,
@@ -133,8 +133,8 @@ impl LanguageModelProvider for OpenAiCompatibleLanguageModelProvider {
self.name.clone()
}
- fn icon(&self) -> IconName {
- IconName::AiOpenAiCompat
+ fn icon(&self) -> IconOrSvg {
+ IconOrSvg::Icon(IconName::AiOpenAiCompat)
}
fn default_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
@@ -4,7 +4,7 @@ use futures::{FutureExt, Stream, StreamExt, future, future::BoxFuture};
use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task};
use http_client::HttpClient;
use language_model::{
- ApiKeyState, AuthenticateError, EnvVar, LanguageModel, LanguageModelCompletionError,
+ ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
LanguageModelRequest, LanguageModelToolChoice, LanguageModelToolResultContent,
@@ -180,8 +180,8 @@ impl LanguageModelProvider for OpenRouterLanguageModelProvider {
PROVIDER_NAME
}
- fn icon(&self) -> IconName {
- IconName::AiOpenRouter
+ fn icon(&self) -> IconOrSvg {
+ IconOrSvg::Icon(IconName::AiOpenRouter)
}
fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
@@ -4,7 +4,7 @@ use futures::{FutureExt, StreamExt, future, future::BoxFuture};
use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, Window};
use http_client::HttpClient;
use language_model::{
- ApiKeyState, AuthenticateError, EnvVar, LanguageModel, LanguageModelCompletionError,
+ ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
LanguageModelRequest, LanguageModelToolChoice, RateLimiter, Role, env_var,
@@ -117,8 +117,8 @@ impl LanguageModelProvider for VercelLanguageModelProvider {
PROVIDER_NAME
}
- fn icon(&self) -> IconName {
- IconName::AiVZero
+ fn icon(&self) -> IconOrSvg {
+ IconOrSvg::Icon(IconName::AiVZero)
}
fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
@@ -4,7 +4,7 @@ use futures::{FutureExt, StreamExt, future, future::BoxFuture};
use gpui::{AnyView, App, AsyncApp, Context, Entity, Task, Window};
use http_client::HttpClient;
use language_model::{
- ApiKeyState, AuthenticateError, EnvVar, LanguageModel, LanguageModelCompletionError,
+ ApiKeyState, AuthenticateError, EnvVar, IconOrSvg, LanguageModel, LanguageModelCompletionError,
LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
LanguageModelRequest, LanguageModelToolChoice, LanguageModelToolSchemaFormat, RateLimiter,
@@ -118,8 +118,8 @@ impl LanguageModelProvider for XAiLanguageModelProvider {
PROVIDER_NAME
}
- fn icon(&self) -> IconName {
- IconName::AiXAi
+ fn icon(&self) -> IconOrSvg {
+ IconOrSvg::Icon(IconName::AiXAi)
}
fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
@@ -127,6 +127,16 @@ impl LanguageServerState {
return menu;
};
+ let server_versions = self
+ .lsp_store
+ .update(cx, |lsp_store, _| {
+ lsp_store
+ .language_server_statuses()
+ .map(|(server_id, status)| (server_id, status.server_version.clone()))
+ .collect::<HashMap<_, _>>()
+ })
+ .unwrap_or_default();
+
let mut first_button_encountered = false;
for item in &self.items {
if let LspMenuItem::ToggleServersButton { restart } = item {
@@ -254,6 +264,22 @@ impl LanguageServerState {
};
let server_name = server_info.name.clone();
+ let server_version = server_versions
+ .get(&server_info.id)
+ .and_then(|version| version.clone());
+
+ let tooltip_text = match (&server_version, &message) {
+ (None, None) => None,
+ (Some(version), None) => {
+ Some(SharedString::from(format!("Version: {}", version.as_ref())))
+ }
+ (None, Some(message)) => Some(message.clone()),
+ (Some(version), Some(message)) => Some(SharedString::from(format!(
+ "Version: {}\n\n{}",
+ version.as_ref(),
+ message.as_ref()
+ ))),
+ };
menu = menu.item(ContextMenuItem::custom_entry(
move |_, _| {
h_flex()
@@ -355,11 +381,11 @@ impl LanguageServerState {
}
}
},
- message.map(|server_message| {
+ tooltip_text.map(|tooltip_text| {
DocumentationAside::new(
DocumentationSide::Right,
- DocumentationEdge::Bottom,
- Rc::new(move |_| Label::new(server_message.clone()).into_any_element()),
+ DocumentationEdge::Top,
+ Rc::new(move |_| Label::new(tooltip_text.clone()).into_any_element()),
)
}),
));
@@ -330,6 +330,8 @@ impl LspLogView {
let server_info = format!(
"* Server: {NAME} (id {ID})
+* Version: {VERSION}
+
* Binary: {BINARY}
* Registered workspace folders:
@@ -340,6 +342,12 @@ impl LspLogView {
* Configuration: {CONFIGURATION}",
NAME = info.status.name,
ID = info.id,
+ VERSION = info
+ .status
+ .server_version
+ .as_ref()
+ .map(|version| version.as_ref())
+ .unwrap_or("Unknown"),
BINARY = info
.status
.binary
@@ -1334,6 +1342,7 @@ impl ServerInfo {
capabilities: server.capabilities(),
status: LanguageServerStatus {
name: server.name(),
+ server_version: server.version(),
pending_work: Default::default(),
has_pending_diagnostic_updates: false,
progress_tokens: Default::default(),
@@ -89,6 +89,7 @@ pub struct LanguageServer {
outbound_tx: channel::Sender<String>,
notification_tx: channel::Sender<NotificationSerializer>,
name: LanguageServerName,
+ version: Option<SharedString>,
process_name: Arc<str>,
binary: LanguageServerBinary,
capabilities: RwLock<ServerCapabilities>,
@@ -501,6 +502,7 @@ impl LanguageServer {
response_handlers,
io_handlers,
name: server_name,
+ version: None,
process_name: binary
.path
.file_name()
@@ -882,7 +884,9 @@ impl LanguageServer {
window: Some(WindowClientCapabilities {
work_done_progress: Some(true),
show_message: Some(ShowMessageRequestClientCapabilities {
- message_action_item: None,
+ message_action_item: Some(MessageActionItemCapabilities {
+ additional_properties_support: Some(true),
+ }),
}),
..WindowClientCapabilities::default()
}),
@@ -923,6 +927,7 @@ impl LanguageServer {
)
})?;
if let Some(info) = response.server_info {
+ self.version = info.version.map(SharedString::from);
self.process_name = info.name.into();
}
self.capabilities = RwLock::new(response.capabilities);
@@ -1153,6 +1158,11 @@ impl LanguageServer {
self.name.clone()
}
+ /// Get the version of the running language server.
+ pub fn version(&self) -> Option<SharedString> {
+ self.version.clone()
+ }
+
pub fn process_name(&self) -> &str {
&self.process_name
}
@@ -2610,9 +2610,8 @@ impl MultiBuffer {
for range in ranges {
let range = range.to_point(&snapshot);
let start = snapshot.point_to_offset(Point::new(range.start.row, 0));
- let end = snapshot.point_to_offset(Point::new(range.end.row + 1, 0));
- let start = start.saturating_sub_usize(1);
- let end = snapshot.len().min(end + 1usize);
+ let end = (snapshot.point_to_offset(Point::new(range.end.row + 1, 0)) + 1usize)
+ .min(snapshot.len());
cursor.seek(&start, Bias::Right);
while let Some(item) = cursor.item() {
if *cursor.start() >= end {
@@ -50,7 +50,13 @@ impl Settings for OutlinePanelSettings {
dock: panel.dock.unwrap(),
file_icons: panel.file_icons.unwrap(),
folder_icons: panel.folder_icons.unwrap(),
- git_status: panel.git_status.unwrap(),
+ git_status: panel.git_status.unwrap()
+ && content
+ .git
+ .unwrap()
+ .enabled
+ .unwrap()
+ .is_git_status_enabled(),
indent_size: panel.indent_size.unwrap(),
indent_guides: IndentGuidesSettings {
show: panel.indent_guides.unwrap().show.unwrap(),
@@ -128,6 +128,7 @@ use util::{
ConnectionResult, ResultExt as _, debug_panic, defer, maybe, merge_json_value_into,
paths::{PathStyle, SanitizedPath},
post_inc,
+ redact::redact_command,
rel_path::RelPath,
};
@@ -577,9 +578,12 @@ impl LocalLspStore {
},
},
);
- log::error!("Failed to start language server {server_name:?}: {err:?}");
+ log::error!(
+ "Failed to start language server {server_name:?}: {}",
+ redact_command(&format!("{err:?}"))
+ );
if !log.is_empty() {
- log::error!("server stderr: {log}");
+ log::error!("server stderr: {}", redact_command(&log));
}
None
}
@@ -3860,6 +3864,7 @@ pub enum LspStoreEvent {
#[derive(Clone, Debug, Serialize)]
pub struct LanguageServerStatus {
pub name: LanguageServerName,
+ pub server_version: Option<SharedString>,
pub pending_work: BTreeMap<ProgressToken, LanguageServerProgress>,
pub has_pending_diagnostic_updates: bool,
pub progress_tokens: HashSet<ProgressToken>,
@@ -8350,6 +8355,7 @@ impl LspStore {
server_id,
LanguageServerStatus {
name,
+ server_version: None,
pending_work: Default::default(),
has_pending_diagnostic_updates: false,
progress_tokens: Default::default(),
@@ -9385,6 +9391,7 @@ impl LspStore {
server_id,
LanguageServerStatus {
name: server_name.clone(),
+ server_version: None,
pending_work: Default::default(),
has_pending_diagnostic_updates: false,
progress_tokens: Default::default(),
@@ -11415,6 +11422,7 @@ impl LspStore {
server_id,
LanguageServerStatus {
name: language_server.name(),
+ server_version: language_server.version(),
pending_work: Default::default(),
has_pending_diagnostic_updates: false,
progress_tokens: Default::default(),
@@ -332,6 +332,10 @@ impl GoToDiagnosticSeverityFilter {
#[derive(Copy, Clone, Debug)]
pub struct GitSettings {
+ /// Whether or not git integration is enabled.
+ ///
+ /// Default: true
+ pub enabled: GitEnabledSettings,
/// Whether or not to show the git gutter.
///
/// Default: tracked_files
@@ -361,6 +365,18 @@ pub struct GitSettings {
pub path_style: GitPathStyle,
}
+#[derive(Clone, Copy, Debug)]
+pub struct GitEnabledSettings {
+ /// Whether git integration is enabled for showing git status.
+ ///
+ /// Default: true
+ pub status: bool,
+ /// Whether git integration is enabled for showing diffs.
+ ///
+ /// Default: true
+ pub diff: bool,
+}
+
#[derive(Clone, Copy, Debug, PartialEq, Default)]
pub enum GitPathStyle {
#[default]
@@ -502,7 +518,14 @@ impl Settings for ProjectSettings {
let inline_diagnostics = diagnostics.inline.as_ref().unwrap();
let git = content.git.as_ref().unwrap();
+ let git_enabled = {
+ GitEnabledSettings {
+ status: git.enabled.as_ref().unwrap().is_git_status_enabled(),
+ diff: git.enabled.as_ref().unwrap().is_git_diff_enabled(),
+ }
+ };
let git_settings = GitSettings {
+ enabled: git_enabled,
git_gutter: git.git_gutter.unwrap(),
gutter_debounce: git.gutter_debounce.unwrap_or_default(),
inline_blame: {
@@ -92,7 +92,13 @@ impl Settings for ProjectPanelSettings {
entry_spacing: project_panel.entry_spacing.unwrap(),
file_icons: project_panel.file_icons.unwrap(),
folder_icons: project_panel.folder_icons.unwrap(),
- git_status: project_panel.git_status.unwrap(),
+ git_status: project_panel.git_status.unwrap()
+ && content
+ .git
+ .unwrap()
+ .enabled
+ .unwrap()
+ .is_git_status_enabled(),
indent_size: project_panel.indent_size.unwrap(),
indent_guides: IndentGuidesSettings {
show: project_panel.indent_guides.unwrap().show.unwrap(),
@@ -28,6 +28,11 @@ parking_lot.workspace = true
paths.workspace = true
rope.workspace = true
serde.workspace = true
+strum.workspace = true
text.workspace = true
util.workspace = true
uuid.workspace = true
+
+[dev-dependencies]
+gpui = { workspace = true, features = ["test-support"] }
+tempfile.workspace = true
@@ -1,6 +1,6 @@
mod prompts;
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Result, anyhow};
use chrono::{DateTime, Utc};
use collections::HashMap;
use futures::FutureExt as _;
@@ -23,6 +23,7 @@ use std::{
path::PathBuf,
sync::{Arc, atomic::AtomicBool},
};
+use strum::{EnumIter, IntoEnumIterator as _};
use text::LineEnding;
use util::ResultExt;
use uuid::Uuid;
@@ -51,11 +52,51 @@ pub struct PromptMetadata {
pub saved_at: DateTime<Utc>,
}
+impl PromptMetadata {
+ fn builtin(builtin: BuiltInPrompt) -> Self {
+ Self {
+ id: PromptId::BuiltIn(builtin),
+ title: Some(builtin.title().into()),
+ default: false,
+ saved_at: DateTime::default(),
+ }
+ }
+}
+
+/// Built-in prompts that have default content and can be customized by users.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, EnumIter)]
+pub enum BuiltInPrompt {
+ CommitMessage,
+}
+
+impl BuiltInPrompt {
+ pub fn title(&self) -> &'static str {
+ match self {
+ Self::CommitMessage => "Commit message",
+ }
+ }
+
+ /// Returns the default content for this built-in prompt.
+ pub fn default_content(&self) -> &'static str {
+ match self {
+ Self::CommitMessage => include_str!("../../git_ui/src/commit_message_prompt.txt"),
+ }
+ }
+}
+
+impl std::fmt::Display for BuiltInPrompt {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ match self {
+ Self::CommitMessage => write!(f, "Commit message"),
+ }
+ }
+}
+
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[serde(tag = "kind")]
pub enum PromptId {
User { uuid: UserPromptId },
- CommitMessage,
+ BuiltIn(BuiltInPrompt),
}
impl PromptId {
@@ -63,31 +104,37 @@ impl PromptId {
UserPromptId::new().into()
}
- pub fn user_id(&self) -> Option<UserPromptId> {
+ pub fn as_user(&self) -> Option<UserPromptId> {
match self {
Self::User { uuid } => Some(*uuid),
- _ => None,
+ Self::BuiltIn { .. } => None,
}
}
- pub fn is_built_in(&self) -> bool {
+ pub fn as_built_in(&self) -> Option<BuiltInPrompt> {
match self {
- Self::User { .. } => false,
- Self::CommitMessage => true,
+ Self::User { .. } => None,
+ Self::BuiltIn(builtin) => Some(*builtin),
}
}
+ pub fn is_built_in(&self) -> bool {
+ matches!(self, Self::BuiltIn { .. })
+ }
+
pub fn can_edit(&self) -> bool {
match self {
- Self::User { .. } | Self::CommitMessage => true,
+ Self::User { .. } => true,
+ Self::BuiltIn(builtin) => match builtin {
+ BuiltInPrompt::CommitMessage => true,
+ },
}
}
+}
- pub fn default_content(&self) -> Option<&'static str> {
- match self {
- Self::User { .. } => None,
- Self::CommitMessage => Some(include_str!("../../git_ui/src/commit_message_prompt.txt")),
- }
+impl From<BuiltInPrompt> for PromptId {
+ fn from(builtin: BuiltInPrompt) -> Self {
+ PromptId::BuiltIn(builtin)
}
}
@@ -117,7 +164,7 @@ impl std::fmt::Display for PromptId {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
PromptId::User { uuid } => write!(f, "{}", uuid.0),
- PromptId::CommitMessage => write!(f, "Commit message"),
+ PromptId::BuiltIn(builtin) => write!(f, "{}", builtin),
}
}
}
@@ -150,6 +197,16 @@ impl MetadataCache {
cache.metadata.push(metadata.clone());
cache.metadata_by_id.insert(prompt_id, metadata);
}
+
+ // Insert all the built-in prompts that were not customized by the user
+ for builtin in BuiltInPrompt::iter() {
+ let builtin_id = PromptId::BuiltIn(builtin);
+ if !cache.metadata_by_id.contains_key(&builtin_id) {
+ let metadata = PromptMetadata::builtin(builtin);
+ cache.metadata.push(metadata.clone());
+ cache.metadata_by_id.insert(builtin_id, metadata);
+ }
+ }
cache.sort();
Ok(cache)
}
@@ -198,10 +255,6 @@ impl PromptStore {
let mut txn = db_env.write_txn()?;
let metadata = db_env.create_database(&mut txn, Some("metadata.v2"))?;
let bodies = db_env.create_database(&mut txn, Some("bodies.v2"))?;
-
- metadata.delete(&mut txn, &PromptId::CommitMessage)?;
- bodies.delete(&mut txn, &PromptId::CommitMessage)?;
-
txn.commit()?;
Self::upgrade_dbs(&db_env, metadata, bodies).log_err();
@@ -294,7 +347,16 @@ impl PromptStore {
let bodies = self.bodies;
cx.background_spawn(async move {
let txn = env.read_txn()?;
- let mut prompt = bodies.get(&txn, &id)?.context("prompt not found")?.into();
+ let mut prompt: String = match bodies.get(&txn, &id)? {
+ Some(body) => body.into(),
+ None => {
+ if let Some(built_in) = id.as_built_in() {
+ built_in.default_content().into()
+ } else {
+ anyhow::bail!("prompt not found")
+ }
+ }
+ };
LineEnding::normalize(&mut prompt);
Ok(prompt)
})
@@ -339,11 +401,6 @@ impl PromptStore {
})
}
- /// Returns the number of prompts in the store.
- pub fn prompt_count(&self) -> usize {
- self.metadata_cache.read().metadata.len()
- }
-
pub fn metadata(&self, id: PromptId) -> Option<PromptMetadata> {
self.metadata_cache.read().metadata_by_id.get(&id).cloned()
}
@@ -412,23 +469,38 @@ impl PromptStore {
return Task::ready(Err(anyhow!("this prompt cannot be edited")));
}
- let prompt_metadata = PromptMetadata {
- id,
- title,
- default,
- saved_at: Utc::now(),
+ let body = body.to_string();
+ let is_default_content = id
+ .as_built_in()
+ .is_some_and(|builtin| body.trim() == builtin.default_content().trim());
+
+ let metadata = if let Some(builtin) = id.as_built_in() {
+ PromptMetadata::builtin(builtin)
+ } else {
+ PromptMetadata {
+ id,
+ title,
+ default,
+ saved_at: Utc::now(),
+ }
};
- self.metadata_cache.write().insert(prompt_metadata.clone());
+
+ self.metadata_cache.write().insert(metadata.clone());
let db_connection = self.env.clone();
let bodies = self.bodies;
- let metadata = self.metadata;
+ let metadata_db = self.metadata;
let task = cx.background_spawn(async move {
let mut txn = db_connection.write_txn()?;
- metadata.put(&mut txn, &id, &prompt_metadata)?;
- bodies.put(&mut txn, &id, &body.to_string())?;
+ if is_default_content {
+ metadata_db.delete(&mut txn, &id)?;
+ bodies.delete(&mut txn, &id)?;
+ } else {
+ metadata_db.put(&mut txn, &id, &metadata)?;
+ bodies.put(&mut txn, &id, &body)?;
+ }
txn.commit()?;
@@ -490,3 +562,122 @@ impl PromptStore {
pub struct GlobalPromptStore(Shared<Task<Result<Entity<PromptStore>, Arc<anyhow::Error>>>>);
impl Global for GlobalPromptStore {}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+ use gpui::TestAppContext;
+
+ #[gpui::test]
+ async fn test_built_in_prompt_load_save(cx: &mut TestAppContext) {
+ cx.executor().allow_parking();
+
+ let temp_dir = tempfile::tempdir().unwrap();
+ let db_path = temp_dir.path().join("prompts-db");
+
+ let store = cx.update(|cx| PromptStore::new(db_path, cx)).await.unwrap();
+ let store = cx.new(|_cx| store);
+
+ let commit_message_id = PromptId::BuiltIn(BuiltInPrompt::CommitMessage);
+
+ let loaded_content = store
+ .update(cx, |store, cx| store.load(commit_message_id, cx))
+ .await
+ .unwrap();
+
+ let mut expected_content = BuiltInPrompt::CommitMessage.default_content().to_string();
+ LineEnding::normalize(&mut expected_content);
+ assert_eq!(
+ loaded_content.trim(),
+ expected_content.trim(),
+ "Loading a built-in prompt not in DB should return default content"
+ );
+
+ let metadata = store.read_with(cx, |store, _| store.metadata(commit_message_id));
+ assert!(
+ metadata.is_some(),
+ "Built-in prompt should always have metadata"
+ );
+ assert!(
+ store.read_with(cx, |store, _| {
+ store
+ .metadata_cache
+ .read()
+ .metadata_by_id
+ .contains_key(&commit_message_id)
+ }),
+ "Built-in prompt should always be in cache"
+ );
+
+ let custom_content = "Custom commit message prompt";
+ store
+ .update(cx, |store, cx| {
+ store.save(
+ commit_message_id,
+ Some("Commit message".into()),
+ false,
+ Rope::from(custom_content),
+ cx,
+ )
+ })
+ .await
+ .unwrap();
+
+ let loaded_custom = store
+ .update(cx, |store, cx| store.load(commit_message_id, cx))
+ .await
+ .unwrap();
+ assert_eq!(
+ loaded_custom.trim(),
+ custom_content.trim(),
+ "Custom content should be loaded after saving"
+ );
+
+ assert!(
+ store
+ .read_with(cx, |store, _| store.metadata(commit_message_id))
+ .is_some(),
+ "Built-in prompt should have metadata after customization"
+ );
+
+ store
+ .update(cx, |store, cx| {
+ store.save(
+ commit_message_id,
+ Some("Commit message".into()),
+ false,
+ Rope::from(BuiltInPrompt::CommitMessage.default_content()),
+ cx,
+ )
+ })
+ .await
+ .unwrap();
+
+ let metadata_after_reset =
+ store.read_with(cx, |store, _| store.metadata(commit_message_id));
+ assert!(
+ metadata_after_reset.is_some(),
+ "Built-in prompt should still have metadata after reset"
+ );
+ assert_eq!(
+ metadata_after_reset
+ .as_ref()
+ .and_then(|m| m.title.as_ref().map(|t| t.as_ref())),
+ Some("Commit message"),
+ "Built-in prompt should have default title after reset"
+ );
+
+ let loaded_after_reset = store
+ .update(cx, |store, cx| store.load(commit_message_id, cx))
+ .await
+ .unwrap();
+ let mut expected_content_after_reset =
+ BuiltInPrompt::CommitMessage.default_content().to_string();
+ LineEnding::normalize(&mut expected_content_after_reset);
+ assert_eq!(
+ loaded_after_reset.trim(),
+ expected_content_after_reset.trim(),
+ "After saving default content, load should return default"
+ );
+ }
+}
@@ -3,9 +3,9 @@ use collections::{HashMap, HashSet};
use editor::{CompletionProvider, SelectionEffects};
use editor::{CurrentLineHighlight, Editor, EditorElement, EditorEvent, EditorStyle, actions::Tab};
use gpui::{
- Action, App, Bounds, DEFAULT_ADDITIONAL_WINDOW_SIZE, Entity, EventEmitter, Focusable,
- PromptLevel, Subscription, Task, TextStyle, TitlebarOptions, WindowBounds, WindowHandle,
- WindowOptions, actions, point, size, transparent_black,
+ App, Bounds, DEFAULT_ADDITIONAL_WINDOW_SIZE, Entity, EventEmitter, Focusable, PromptLevel,
+ Subscription, Task, TextStyle, TitlebarOptions, WindowBounds, WindowHandle, WindowOptions,
+ actions, point, size, transparent_black,
};
use language::{Buffer, LanguageRegistry, language_settings::SoftWrap};
use language_model::{
@@ -21,7 +21,7 @@ use std::sync::atomic::AtomicBool;
use std::time::Duration;
use theme::ThemeSettings;
use title_bar::platform_title_bar::PlatformTitleBar;
-use ui::{Divider, KeyBinding, ListItem, ListItemSpacing, ListSubHeader, Tooltip, prelude::*};
+use ui::{Divider, ListItem, ListItemSpacing, ListSubHeader, Tooltip, prelude::*};
use util::{ResultExt, TryFutureExt};
use workspace::{Workspace, WorkspaceSettings, client_side_decorations};
use zed_actions::assistant::InlineAssist;
@@ -206,13 +206,8 @@ impl PickerDelegate for RulePickerDelegate {
self.filtered_entries.len()
}
- fn no_matches_text(&self, _window: &mut Window, cx: &mut App) -> Option<SharedString> {
- let text = if self.store.read(cx).prompt_count() == 0 {
- "No rules.".into()
- } else {
- "No rules found matching your search.".into()
- };
- Some(text)
+ fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
+ Some("No rules found matching your search.".into())
}
fn selected_index(&self) -> usize {
@@ -680,13 +675,13 @@ impl RulesLibrary {
window: &mut Window,
cx: &mut Context<Self>,
) {
- let Some(default_content) = prompt_id.default_content() else {
+ let Some(built_in) = prompt_id.as_built_in() else {
return;
};
if let Some(rule_editor) = self.rule_editors.get(&prompt_id) {
rule_editor.body_editor.update(cx, |editor, cx| {
- editor.set_text(default_content, window, cx);
+ editor.set_text(built_in.default_content(), window, cx);
});
}
}
@@ -1428,31 +1423,7 @@ impl Render for RulesLibrary {
this.border_t_1().border_color(cx.theme().colors().border)
})
.child(self.render_rule_list(cx))
- .map(|el| {
- if self.store.read(cx).prompt_count() == 0 {
- el.child(
- v_flex()
- .h_full()
- .flex_1()
- .items_center()
- .justify_center()
- .border_l_1()
- .border_color(cx.theme().colors().border)
- .bg(cx.theme().colors().editor_background)
- .child(
- Button::new("create-rule", "New Rule")
- .style(ButtonStyle::Outlined)
- .key_binding(KeyBinding::for_action(&NewRule, cx))
- .on_click(|_, window, cx| {
- window
- .dispatch_action(NewRule.boxed_clone(), cx)
- }),
- ),
- )
- } else {
- el.child(self.render_active_rule(cx))
- }
- }),
+ .child(self.render_active_rule(cx)),
),
window,
cx,
@@ -288,6 +288,11 @@ impl std::fmt::Debug for ContextServerCommand {
#[with_fallible_options]
#[derive(Copy, Clone, Debug, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
pub struct GitSettings {
+ /// Whether or not to enable git integration.
+ ///
+ /// Default: true
+ #[serde(flatten)]
+ pub enabled: Option<GitEnabledSettings>,
/// Whether or not to show the git gutter.
///
/// Default: tracked_files
@@ -317,6 +322,25 @@ pub struct GitSettings {
pub path_style: Option<GitPathStyle>,
}
+#[with_fallible_options]
+#[derive(Clone, Copy, Debug, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
+#[serde(rename_all = "snake_case")]
+pub struct GitEnabledSettings {
+ pub disable_git: Option<bool>,
+ pub enable_status: Option<bool>,
+ pub enable_diff: Option<bool>,
+}
+
+impl GitEnabledSettings {
+ pub fn is_git_status_enabled(&self) -> bool {
+ !self.disable_git.unwrap_or(false) && self.enable_status.unwrap_or(true)
+ }
+
+ pub fn is_git_diff_enabled(&self) -> bool {
+ !self.disable_git.unwrap_or(false) && self.enable_diff.unwrap_or(true)
+ }
+}
+
#[derive(
Clone,
Copy,
@@ -5519,6 +5519,102 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
SettingsPage {
title: "Version Control",
items: vec![
+ SettingsPageItem::SectionHeader("Git Integration"),
+ SettingsPageItem::DynamicItem(DynamicItem {
+ discriminant: SettingItem {
+ files: USER,
+ title: "Disable Git Integration",
+ description: "Disable all Git integration features in Zed.",
+ field: Box::new(SettingField::<bool> {
+ json_path: Some("git.disable_git"),
+ pick: |settings_content| {
+ settings_content
+ .git
+ .as_ref()?
+ .enabled
+ .as_ref()?
+ .disable_git
+ .as_ref()
+ },
+ write: |settings_content, value| {
+ settings_content
+ .git
+ .get_or_insert_default()
+ .enabled
+ .get_or_insert_default()
+ .disable_git = value;
+ },
+ }),
+ metadata: None,
+ },
+ pick_discriminant: |settings_content| {
+ let disabled = settings_content
+ .git
+ .as_ref()?
+ .enabled
+ .as_ref()?
+ .disable_git
+ .unwrap_or(false);
+ Some(if disabled { 0 } else { 1 })
+ },
+ fields: vec![
+ vec![],
+ vec![
+ SettingItem {
+ files: USER,
+ title: "Enable Git Status",
+ description: "Show Git status information in the editor.",
+ field: Box::new(SettingField::<bool> {
+ json_path: Some("git.enable_status"),
+ pick: |settings_content| {
+ settings_content
+ .git
+ .as_ref()?
+ .enabled
+ .as_ref()?
+ .enable_status
+ .as_ref()
+ },
+ write: |settings_content, value| {
+ settings_content
+ .git
+ .get_or_insert_default()
+ .enabled
+ .get_or_insert_default()
+ .enable_status = value;
+ },
+ }),
+ metadata: None,
+ },
+ SettingItem {
+ files: USER,
+ title: "Enable Git Diff",
+ description: "Show Git diff information in the editor.",
+ field: Box::new(SettingField::<bool> {
+ json_path: Some("git.enable_diff"),
+ pick: |settings_content| {
+ settings_content
+ .git
+ .as_ref()?
+ .enabled
+ .as_ref()?
+ .enable_diff
+ .as_ref()
+ },
+ write: |settings_content, value| {
+ settings_content
+ .git
+ .get_or_insert_default()
+ .enabled
+ .get_or_insert_default()
+ .enable_diff = value;
+ },
+ }),
+ metadata: None,
+ },
+ ],
+ ],
+ }),
SettingsPageItem::SectionHeader("Git Gutter"),
SettingsPageItem::SettingItem(SettingItem {
title: "Visibility",
@@ -1169,64 +1169,67 @@ pub fn new_terminal_pane(
let source = tab.pane.clone();
let item_id_to_move = item.item_id();
- let Ok(new_split_pane) = pane
- .drag_split_direction()
- .map(|split_direction| {
- drop_closure_terminal_panel.update(cx, |terminal_panel, cx| {
- let is_zoomed = if terminal_panel.active_pane == this_pane {
- pane.is_zoomed()
- } else {
- terminal_panel.active_pane.read(cx).is_zoomed()
- };
- let new_pane = new_terminal_pane(
- workspace.clone(),
- project.clone(),
- is_zoomed,
- window,
- cx,
- );
- terminal_panel.apply_tab_bar_buttons(&new_pane, cx);
- terminal_panel.center.split(
- &this_pane,
- &new_pane,
- split_direction,
- cx,
- )?;
- anyhow::Ok(new_pane)
- })
- })
- .transpose()
- else {
- return ControlFlow::Break(());
+ // If no split direction, let the regular pane drop handler take care of it
+ let Some(split_direction) = pane.drag_split_direction() else {
+ return ControlFlow::Continue(());
};
- match new_split_pane.transpose() {
- // Source pane may be the one currently updated, so defer the move.
- Ok(Some(new_pane)) => cx
- .spawn_in(window, async move |_, cx| {
- cx.update(|window, cx| {
- move_item(
- &source,
+ // Gather data synchronously before deferring
+ let is_zoomed = drop_closure_terminal_panel
+ .upgrade()
+ .map(|terminal_panel| {
+ let terminal_panel = terminal_panel.read(cx);
+ if terminal_panel.active_pane == this_pane {
+ pane.is_zoomed()
+ } else {
+ terminal_panel.active_pane.read(cx).is_zoomed()
+ }
+ })
+ .unwrap_or(false);
+
+ let workspace = workspace.clone();
+ let terminal_panel = drop_closure_terminal_panel.clone();
+
+ // Defer the split operation to avoid re-entrancy panic.
+ // The pane may be the one currently being updated, so we cannot
+ // call mark_positions (via split) synchronously.
+ cx.spawn_in(window, async move |_, cx| {
+ cx.update(|window, cx| {
+ let Ok(new_pane) =
+ terminal_panel.update(cx, |terminal_panel, cx| {
+ let new_pane = new_terminal_pane(
+ workspace, project, is_zoomed, window, cx,
+ );
+ terminal_panel.apply_tab_bar_buttons(&new_pane, cx);
+ terminal_panel.center.split(
+ &this_pane,
&new_pane,
- item_id_to_move,
- new_pane.read(cx).active_item_index(),
- true,
- window,
+ split_direction,
cx,
- );
+ )?;
+ anyhow::Ok(new_pane)
})
- .ok();
- })
- .detach(),
- // If we drop into existing pane or current pane,
- // regular pane drop handler will take care of it,
- // using the right tab index for the operation.
- Ok(None) => return ControlFlow::Continue(()),
- err @ Err(_) => {
- err.log_err();
- return ControlFlow::Break(());
- }
- };
+ else {
+ return;
+ };
+
+ let Some(new_pane) = new_pane.log_err() else {
+ return;
+ };
+
+ move_item(
+ &source,
+ &new_pane,
+ item_id_to_move,
+ new_pane.read(cx).active_item_index(),
+ true,
+ window,
+ cx,
+ );
+ })
+ .ok();
+ })
+ .detach();
} else if let Some(project_path) = item.project_path(cx)
&& let Some(entry_path) = project.read(cx).absolute_path(&project_path, cx)
{
@@ -893,39 +893,57 @@ impl ContextMenu {
entry_render,
handler,
selectable,
+ documentation_aside,
..
} => {
let handler = handler.clone();
let menu = cx.entity().downgrade();
let selectable = *selectable;
- ListItem::new(ix)
- .inset(true)
- .toggle_state(if selectable {
- Some(ix) == self.selected_index
- } else {
- false
+
+ div()
+ .id(("context-menu-child", ix))
+ .when_some(documentation_aside.clone(), |this, documentation_aside| {
+ this.occlude()
+ .on_hover(cx.listener(move |menu, hovered, _, cx| {
+ if *hovered {
+ menu.documentation_aside = Some((ix, documentation_aside.clone()));
+ } else if matches!(menu.documentation_aside, Some((id, _)) if id == ix)
+ {
+ menu.documentation_aside = None;
+ }
+ cx.notify();
+ }))
})
- .selectable(selectable)
- .when(selectable, |item| {
- item.on_click({
- let context = self.action_context.clone();
- let keep_open_on_confirm = self.keep_open_on_confirm;
- move |_, window, cx| {
- handler(context.as_ref(), window, cx);
- menu.update(cx, |menu, cx| {
- menu.clicked = true;
-
- if keep_open_on_confirm {
- menu.rebuild(window, cx);
- } else {
- cx.emit(DismissEvent);
+ .child(
+ ListItem::new(ix)
+ .inset(true)
+ .toggle_state(if selectable {
+ Some(ix) == self.selected_index
+ } else {
+ false
+ })
+ .selectable(selectable)
+ .when(selectable, |item| {
+ item.on_click({
+ let context = self.action_context.clone();
+ let keep_open_on_confirm = self.keep_open_on_confirm;
+ move |_, window, cx| {
+ handler(context.as_ref(), window, cx);
+ menu.update(cx, |menu, cx| {
+ menu.clicked = true;
+
+ if keep_open_on_confirm {
+ menu.rebuild(window, cx);
+ } else {
+ cx.emit(DismissEvent);
+ }
+ })
+ .ok();
}
})
- .ok();
- }
- })
- })
- .child(entry_render(window, cx))
+ })
+ .child(entry_render(window, cx)),
+ )
.into_any_element()
}
}
@@ -1,3 +1,9 @@
+use std::sync::LazyLock;
+
+static REDACT_REGEX: LazyLock<regex::Regex> = LazyLock::new(|| {
+ regex::Regex::new(r#"([A-Z_][A-Z0-9_]*)=("(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*'|\S+)"#).unwrap()
+});
+
/// Whether a given environment variable name should have its value redacted
pub fn should_redact(env_var_name: &str) -> bool {
const REDACTED_SUFFIXES: &[&str] = &[
@@ -13,3 +19,31 @@ pub fn should_redact(env_var_name: &str) -> bool {
.iter()
.any(|suffix| env_var_name.ends_with(suffix))
}
+
+/// Redact a string which could include a command with environment variables
+pub fn redact_command(command: &str) -> String {
+ REDACT_REGEX
+ .replace_all(command, |caps: ®ex::Captures| {
+ let var_name = &caps[1];
+ let value = &caps[2];
+ if should_redact(var_name) {
+ format!(r#"{}="[REDACTED]""#, var_name)
+ } else {
+ format!("{}={}", var_name, value)
+ }
+ })
+ .to_string()
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn test_redact_string_with_multiple_env_vars() {
+ let input = r#"failed to spawn command cd "/code/something" && ANTHROPIC_API_KEY="sk-ant-api03-WOOOO" COMMAND_MODE="unix2003" GEMINI_API_KEY="AIGEMINIFACE" HOME="/Users/foo""#;
+ let result = redact_command(input);
+ let expected = r#"failed to spawn command cd "/code/something" && ANTHROPIC_API_KEY="[REDACTED]" COMMAND_MODE="unix2003" GEMINI_API_KEY="[REDACTED]" HOME="/Users/foo""#;
+ assert_eq!(result, expected);
+ }
+}
@@ -76,7 +76,13 @@ impl Settings for ItemSettings {
fn from_settings(content: &settings::SettingsContent) -> Self {
let tabs = content.tabs.as_ref().unwrap();
Self {
- git_status: tabs.git_status.unwrap(),
+ git_status: tabs.git_status.unwrap()
+ && content
+ .git
+ .unwrap()
+ .enabled
+ .unwrap()
+ .is_git_status_enabled(),
close_position: tabs.close_position.unwrap(),
activate_on_close: tabs.activate_on_close.unwrap(),
file_icons: tabs.file_icons.unwrap(),
@@ -354,6 +354,8 @@ pub mod agent {
ResetAgentZoom,
/// Toggles the utility/agent pane open/closed state.
ToggleAgentPane,
+ /// Pastes clipboard content without any formatting.
+ PasteRaw,
]
);
}
@@ -177,7 +177,6 @@
- [Linux](./development/linux.md)
- [Windows](./development/windows.md)
- [FreeBSD](./development/freebsd.md)
- - [Local Collaboration](./development/local-collaboration.md)
- [Using Debuggers](./development/debuggers.md)
- [Performance](./performance.md)
- [Glossary](./development/glossary.md)
@@ -6,10 +6,6 @@ See the platform-specific instructions for building Zed from source:
- [Linux](./development/linux.md)
- [Windows](./development/windows.md)
-If you'd like to develop collaboration features, additionally see:
-
-- [Local Collaboration](./development/local-collaboration.md)
-
## Keychain access
Zed stores secrets in the system keychain.
@@ -73,7 +73,7 @@ h_flex()
- `Window`: A struct in zed representing a zed window in your desktop environment (see image below). There can be multiple if you have multiple zed instances open. Mostly passed around for rendering.
- `Modal`: A UI element that floats on top of the rest of the UI
-- `Picker`: A struct representing a list of items in floating on top of the UI (Modal). You can select an item and confirm. What happens on select or confirm is determined by the picker's delegate. (The 'Model' in the image below is a picker.)
+- `Picker`: A struct representing a list of items floating on top of the UI (Modal). You can select an item and confirm. What happens on select or confirm is determined by the picker's delegate. (The 'Modal' in the image below is a picker.)
- `PickerDelegate`: A trait used to specialize behavior for a `Picker`. The `Picker` stores the `PickerDelegate` in the field delegate.
- `Center`: The middle of the zed window, the center is split into multiple `Pane`s. In the codebase this is a field on the `Workspace` struct. (see image below).
- `Pane`: An area in the `Center` where we can place items, such as an editor, multi-buffer or terminal (see image below).
@@ -16,10 +16,6 @@ Clone down the [Zed repository](https://github.com/zed-industries/zed).
If you prefer to install the system libraries manually, you can find the list of required packages in the `script/linux` file.
-### Backend Dependencies (optional) {#backend-dependencies}
-
-If you are looking to develop Zed collaboration features using a local collaboration server, please see: [Local Collaboration](./local-collaboration.md) docs.
-
### Linkers {#linker}
On Linux, Rust's default linker is [LLVM's `lld`](https://blog.rust-lang.org/2025/09/18/Rust-1.90.0/). Alternative linkers, especially [Wild](https://github.com/davidlattimore/wild) and [Mold](https://github.com/rui314/mold) can significantly improve clean and incremental build time.
@@ -1,207 +0,0 @@
-# Local Collaboration
-
-1. Ensure you have access to our cloud infrastructure. If you don't have access, you can't collaborate locally at this time.
-
-2. Make sure you've installed Zed's dependencies for your platform:
-
-- [macOS](#macos)
-- [Linux](#linux)
-- [Windows](#backend-windows)
-
-Note that `collab` can be compiled only with MSVC toolchain on Windows
-
-3. Clone down our cloud repository and follow the instructions in the cloud README
-
-4. Setup the local database for your platform:
-
-- [macOS & Linux](#database-unix)
-- [Windows](#database-windows)
-
-5. Run collab:
-
-- [macOS & Linux](#run-collab-unix)
-- [Windows](#run-collab-windows)
-
-## Backend Dependencies
-
-If you are developing collaborative features of Zed, you'll need to install the dependencies of zed's `collab` server:
-
-- PostgreSQL
-- LiveKit
-- Foreman
-
-You can install these dependencies natively or run them under Docker.
-
-### macOS
-
-1. Install [Postgres.app](https://postgresapp.com) or [postgresql via homebrew](https://formulae.brew.sh/formula/postgresql@15):
-
- ```sh
- brew install postgresql@15
- ```
-
-2. Install [Livekit](https://formulae.brew.sh/formula/livekit) and [Foreman](https://formulae.brew.sh/formula/foreman)
-
- ```sh
- brew install livekit foreman
- ```
-
-- Follow the steps in the [collab README](https://github.com/zed-industries/zed/blob/main/crates/collab/README.md) to configure the Postgres database for integration tests
-
-Alternatively, if you have [Docker](https://www.docker.com/) installed you can bring up all the `collab` dependencies using Docker Compose.
-
-### Linux
-
-1. Install [Postgres](https://www.postgresql.org/download/linux/)
-
- ```sh
- sudo apt-get install postgresql # Ubuntu/Debian
- sudo pacman -S postgresql # Arch Linux
- sudo dnf install postgresql postgresql-server # RHEL/Fedora
- sudo zypper install postgresql postgresql-server # OpenSUSE
- ```
-
-2. Install [Livekit](https://github.com/livekit/livekit-cli)
-
- ```sh
- curl -sSL https://get.livekit.io/cli | bash
- ```
-
-3. Install [Foreman](https://theforeman.org/manuals/3.15/quickstart_guide.html)
-
-### Windows {#backend-windows}
-
-> This section is still in development. The instructions are not yet complete.
-
-- Install [Postgres](https://www.postgresql.org/download/windows/)
-- Install [Livekit](https://github.com/livekit/livekit), optionally you can add the `livekit-server` binary to your `PATH`.
-
-Alternatively, if you have [Docker](https://www.docker.com/) installed you can bring up all the `collab` dependencies using Docker Compose.
-
-### Docker {#Docker}
-
-If you have docker or podman available, you can run the backend dependencies inside containers with Docker Compose:
-
-```sh
-docker compose up -d
-```
-
-## Database setup
-
-Before you can run the `collab` server locally, you'll need to set up a `zed` Postgres database.
-
-### On macOS and Linux {#database-unix}
-
-```sh
-script/bootstrap
-```
-
-This script will set up the `zed` Postgres database, and populate it with some users. It requires internet access, because it fetches some users from the GitHub API.
-
-The script will seed the database with various content defined by:
-
-```sh
-cat crates/collab/seed.default.json
-```
-
-To use a different set of admin users, you can create your own version of that json file and export the `SEED_PATH` environment variable. Note that the usernames listed in the admins list currently must correspond to valid GitHub users.
-
-```json [settings]
-{
- "admins": ["admin1", "admin2"],
- "channels": ["zed"]
-}
-```
-
-### On Windows {#database-windows}
-
-```powershell
-.\script\bootstrap.ps1
-```
-
-## Testing collaborative features locally
-
-### On macOS and Linux {#run-collab-unix}
-
-Ensure that Postgres is configured and running, then run Zed's collaboration server and the `livekit` dev server:
-
-```sh
-foreman start
-# OR
-docker compose up
-```
-
-Alternatively, if you're not testing voice and screenshare, you can just run `collab` and `cloud`, and not the `livekit` dev server:
-
-```sh
-cargo run -p collab -- serve all
-```
-
-```sh
-cd ../cloud; cargo make dev
-```
-
-In a new terminal, run two or more instances of Zed.
-
-```sh
-script/zed-local -3
-```
-
-This script starts one to four instances of Zed, depending on the `-2`, `-3` or `-4` flags. Each instance will be connected to the local `collab` server, signed in as a different user from `.admins.json` or `.admins.default.json`.
-
-### On Windows {#run-collab-windows}
-
-Since `foreman` is not available on Windows, you can run the following commands in separate terminals:
-
-```powershell
-cargo run --package=collab -- serve all
-```
-
-If you have added the `livekit-server` binary to your `PATH`, you can run:
-
-```powershell
-livekit-server --dev
-```
-
-Otherwise,
-
-```powershell
-.\path\to\livekit-serve.exe --dev
-```
-
-You'll also need to start the cloud server:
-
-```powershell
-cd ..\cloud; cargo make dev
-```
-
-In a new terminal, run two or more instances of Zed.
-
-```powershell
-node .\script\zed-local -2
-```
-
-Note that this requires `node.exe` to be in your `PATH`.
-
-## Running a local collab server
-
-> [!NOTE]
-> Because of recent changes to our authentication system, Zed will not be able to authenticate itself with, and therefore use, a local collab server.
-
-If you want to run your own version of the zed collaboration service, you can, but note that this is still under development, and there is no support for authentication nor extensions.
-
-Configuration is done through environment variables. By default it will read the configuration from [`.env.toml`](https://github.com/zed-industries/zed/blob/main/crates/collab/.env.toml) and you should use that as a guide for setting this up.
-
-By default Zed assumes that the DATABASE_URL is a Postgres database, but you can make it use Sqlite by compiling with `--features sqlite` and using a sqlite DATABASE_URL with `?mode=rwc`.
-
-To authenticate you must first configure the server by creating a seed.json file that contains at a minimum your github handle. This will be used to create the user on demand.
-
-```json [settings]
-{
- "admins": ["nathansobo"]
-}
-```
-
-By default the collab server will seed the database when first creating it, but if you want to add more users you can explicitly reseed them with `SEED_PATH=./seed.json cargo run -p collab seed`
-
-Then when running the zed client you must specify two environment variables, `ZED_ADMIN_API_TOKEN` (which should match the value of `API_TOKEN` in .env.toml) and `ZED_IMPERSONATE` (which should match one of the users in your seed.json)
@@ -31,10 +31,6 @@ Clone down the [Zed repository](https://github.com/zed-industries/zed).
brew install cmake
```
-### Backend Dependencies (optional) {#backend-dependencies}
-
-If you are looking to develop Zed collaboration features using a local collaboration server, please see: [Local Collaboration](./local-collaboration.md) docs.
-
## Building Zed from Source
Once you have the dependencies installed, you can build Zed using [Cargo](https://doc.rust-lang.org/cargo/).
@@ -66,10 +66,6 @@ The list can be obtained as follows:
- Click on `More` in the `Installed` tab
- Click on `Export configuration`
-### Backend Dependencies (optional) {#backend-dependencies}
-
-If you are looking to develop Zed collaboration features using a local collaboration server, please see: [Local Collaboration](./local-collaboration.md) docs.
-
### Notes
You should modify the `pg_hba.conf` file in the `data` directory to use `trust` instead of `scram-sha-256` for the `host` method. Otherwise, the connection will fail with the error `password authentication failed`. The `pg_hba.conf` file typically locates at `C:\Program Files\PostgreSQL\17\data\pg_hba.conf`. After the modification, the file should look like this:
@@ -6,6 +6,9 @@ prHygiene({
rules: {
// Don't enable this rule just yet, as it can have false positives.
useImperativeMood: "off",
+ noConventionalCommits: {
+ bannedTypes: ["feat", "fix", "style", "refactor", "perf", "test", "chore", "build", "revert"],
+ },
},
});
@@ -8,6 +8,6 @@
},
"devDependencies": {
"danger": "13.0.4",
- "danger-plugin-pr-hygiene": "0.6.1"
+ "danger-plugin-pr-hygiene": "0.7.1"
}
}
@@ -12,8 +12,8 @@ importers:
specifier: 13.0.4
version: 13.0.4
danger-plugin-pr-hygiene:
- specifier: 0.6.1
- version: 0.6.1
+ specifier: 0.7.1
+ version: 0.7.1
packages:
@@ -134,8 +134,8 @@ packages:
core-js@3.45.1:
resolution: {integrity: sha512-L4NPsJlCfZsPeXukyzHFlg/i7IIVwHSItR0wg0FLNqYClJ4MQYTYLbC7EkjKYRLZF2iof2MUgN0EGy7MdQFChg==}
- danger-plugin-pr-hygiene@0.6.1:
- resolution: {integrity: sha512-nb+iUQvirE3BlKXI1WoOND6sujyGzHar590mJm5tt4RLi65HXFaU5hqONxgDoWFujJNHYnXse9yaZdxnxEi4QA==}
+ danger-plugin-pr-hygiene@0.7.1:
+ resolution: {integrity: sha512-ll070nNaL3OeO2nooYWflPE/CRKLeq8GiH2C68u5zM3gW4gepH89GhVv0sYNNGLx4cYwa1zZ/TuiYYhC49z06Q==}
danger@13.0.4:
resolution: {integrity: sha512-IAdQ5nSJyIs4zKj6AN35ixt2B0Ce3WZUm3IFe/CMnL/Op7wV7IGg4D348U0EKNaNPP58QgXbdSk9pM+IXP1QXg==}
@@ -573,7 +573,7 @@ snapshots:
core-js@3.45.1: {}
- danger-plugin-pr-hygiene@0.6.1: {}
+ danger-plugin-pr-hygiene@0.7.1: {}
danger@13.0.4:
dependencies: