Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

extensions_ui: Add `RebuildDevExtension` action (#55173)

Taha5e32405669d0
diff --git a/Cargo.lock b/Cargo.lock
index f2cb97bf96a..d3d73884776 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6379,6 +6379,7 @@ dependencies = [
"anyhow",
"cloud_api_types",
"collections",
+ "command_palette_hooks",
"db",
"editor",
"extension",
@@ -6392,6 +6393,7 @@ dependencies = [
"picker",
"project",
"release_channel",
+ "schemars 1.0.4",
"semver",
"serde",
"settings",
diff --git a/crates/extensions_ui/Cargo.toml b/crates/extensions_ui/Cargo.toml
index b1446f0128d..fbe4b1434f4 100644
--- a/crates/extensions_ui/Cargo.toml
+++ b/crates/extensions_ui/Cargo.toml
@@ -14,6 +14,7 @@ path = "src/extensions_ui.rs"
[dependencies]
anyhow.workspace = true
cloud_api_types.workspace = true
+command_palette_hooks.workspace = true
collections.workspace = true
db.workspace = true
editor.workspace = true
@@ -29,6 +30,7 @@ picker.workspace = true
project.workspace = true
release_channel.workspace = true
semver.workspace = true
+schemars.workspace = true
serde.workspace = true
settings.workspace = true
smallvec.workspace = true
diff --git a/crates/extensions_ui/src/extensions_ui.rs b/crates/extensions_ui/src/extensions_ui.rs
index 5df1a7d1628..8b729cc4e2a 100644
--- a/crates/extensions_ui/src/extensions_ui.rs
+++ b/crates/extensions_ui/src/extensions_ui.rs
@@ -4,34 +4,40 @@ mod extension_version_selector;
use std::sync::OnceLock;
use std::time::Duration;
-use std::{ops::Range, sync::Arc};
+use std::{any::TypeId, ops::Range, sync::Arc};
use anyhow::Context as _;
use cloud_api_types::{ExtensionMetadata, ExtensionProvides};
use collections::{BTreeMap, BTreeSet};
+use command_palette_hooks::CommandPaletteFilter;
use editor::{Editor, EditorElement, EditorStyle};
use extension_host::{ExtensionManifest, ExtensionOperation, ExtensionStore};
-use fuzzy::{StringMatchCandidate, match_strings};
+use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
use gpui::{
- Action, Anchor, App, ClipboardItem, Context, Entity, EventEmitter, Focusable,
+ Action, Anchor, App, ClipboardItem, Context, DismissEvent, Entity, EventEmitter, Focusable,
InteractiveElement, KeyContext, ParentElement, Point, Render, Styled, Task, TaskExt, TextStyle,
UniformListScrollHandle, WeakEntity, Window, actions, point, uniform_list,
};
use num_format::{Locale, ToFormattedString};
+use picker::{Picker, PickerDelegate};
use project::DirectoryLister;
use release_channel::ReleaseChannel;
+use schemars::JsonSchema;
+use serde::Deserialize;
use settings::{Settings, SettingsContent};
use strum::IntoEnumIterator as _;
use theme_settings::ThemeSettings;
use ui::{
- Banner, Chip, ContextMenu, Divider, PopoverMenu, ScrollableHandle, Switch, ToggleButtonGroup,
- ToggleButtonGroupSize, ToggleButtonGroupStyle, ToggleButtonSimple, Tooltip, WithScrollbar,
- prelude::*,
+ Banner, Chip, ContextMenu, Divider, ListItem, ListItemSpacing, PopoverMenu, ScrollableHandle,
+ Switch, ToggleButtonGroup, ToggleButtonGroupSize, ToggleButtonGroupStyle, ToggleButtonSimple,
+ Tooltip, WithScrollbar, prelude::*,
};
+use util::ResultExt;
use vim_mode_setting::VimModeSetting;
use workspace::{
Workspace,
item::{Item, ItemEvent},
+ workspace_error::{ErrorAction, ErrorSeverity, WorkspaceError},
};
use zed_actions::ExtensionCategoryFilter;
@@ -44,11 +50,65 @@ actions!(
zed,
[
/// Installs an extension from a local directory for development.
- InstallDevExtension
+ InstallDevExtension,
]
);
+/// Rebuilds an installed dev extension.
+#[derive(Clone, Debug, Default, PartialEq, Deserialize, JsonSchema, gpui::Action)]
+#[action(namespace = zed)]
+#[serde(deny_unknown_fields)]
+pub struct RebuildDevExtension {
+ /// The ID of the dev extension to rebuild.
+ ///
+ /// Default: opens a picker if multiple dev extensions are installed.
+ #[serde(default)]
+ pub extension_id: Option<String>,
+}
+
+#[derive(Default)]
+struct DevExtensionNotInstalledError {
+ extension_id: Option<SharedString>,
+}
+
+impl WorkspaceError for DevExtensionNotInstalledError {
+ fn primary_message(&self) -> SharedString {
+ match &self.extension_id {
+ Some(extension_id) => {
+ format!("Dev extension '{extension_id}' is not installed.").into()
+ }
+ None => "No dev extensions are installed.".into(),
+ }
+ }
+
+ fn primary_action(&self) -> ErrorAction {
+ ErrorAction::new("Install Dev Extension", InstallDevExtension)
+ }
+
+ fn severity(&self) -> ErrorSeverity {
+ ErrorSeverity::Warning
+ }
+}
+
+fn update_rebuild_dev_extension_visibility(store: &Entity<ExtensionStore>, cx: &mut App) {
+ let has_dev_extensions = store.read(cx).dev_extensions().next().is_some();
+ CommandPaletteFilter::update_global(cx, |filter, _cx| {
+ if has_dev_extensions {
+ filter.show_action_types(&[TypeId::of::<RebuildDevExtension>()]);
+ } else {
+ filter.hide_action_types(&[TypeId::of::<RebuildDevExtension>()]);
+ }
+ });
+}
+
pub fn init(cx: &mut App) {
+ let store = ExtensionStore::global(cx);
+ update_rebuild_dev_extension_visibility(&store, cx);
+ cx.observe(&store, |store, cx| {
+ update_rebuild_dev_extension_visibility(&store, cx);
+ })
+ .detach();
+
cx.observe_new(move |workspace: &mut Workspace, window, cx| {
let Some(window) = window else {
return;
@@ -168,6 +228,57 @@ pub fn init(cx: &mut App) {
Some(())
})
.detach();
+ })
+ .register_action(move |workspace, action: &RebuildDevExtension, window, cx| {
+ if let Some(target_id) = action.extension_id.as_deref() {
+ let extension_id = ExtensionStore::global(cx)
+ .read(cx)
+ .dev_extensions()
+ .find_map(|m| {
+ if m.id.as_ref() == target_id {
+ Some(m.id.clone())
+ } else {
+ None
+ }
+ });
+ if let Some(extension_id) = extension_id {
+ ExtensionStore::global(cx).update(cx, |store, cx| {
+ store.rebuild_dev_extension(extension_id, cx);
+ });
+ } else {
+ workspace.show_error(
+ DevExtensionNotInstalledError {
+ extension_id: Some(SharedString::from(target_id.to_owned())),
+ },
+ cx,
+ );
+ }
+ return;
+ }
+
+ let dev_extensions = ExtensionStore::global(cx)
+ .read(cx)
+ .dev_extensions()
+ .cloned()
+ .collect::<Vec<_>>();
+
+ match dev_extensions.len() {
+ 0 => {
+ workspace.show_error(DevExtensionNotInstalledError::default(), cx);
+ }
+ 1 => {
+ let extension_id = dev_extensions[0].id.clone();
+ ExtensionStore::global(cx).update(cx, |store, cx| {
+ store.rebuild_dev_extension(extension_id, cx);
+ });
+ }
+ _ => {
+ workspace.toggle_modal(window, cx, |window, cx| {
+ let delegate = DevExtensionRebuildPickerDelegate::new(dev_extensions);
+ Picker::uniform_list(delegate, window, cx).width(rems(34.))
+ });
+ }
+ }
});
cx.subscribe_in(workspace.project(), window, |_, _, event, window, cx| {
@@ -1639,6 +1750,167 @@ impl ExtensionsPage {
}
}
+struct DevExtensionRebuildPickerDelegate {
+ entries: Vec<Arc<ExtensionManifest>>,
+ matches: Vec<StringMatch>,
+ selected_index: usize,
+}
+
+impl DevExtensionRebuildPickerDelegate {
+ fn new(manifests: Vec<Arc<ExtensionManifest>>) -> Self {
+ let matches = manifests
+ .iter()
+ .enumerate()
+ .map(|(ix, manifest)| StringMatch {
+ candidate_id: ix,
+ score: 0.0,
+ positions: Vec::new(),
+ string: manifest.name.clone(),
+ })
+ .collect();
+
+ Self {
+ entries: manifests,
+ matches,
+ selected_index: 0,
+ }
+ }
+}
+
+impl PickerDelegate for DevExtensionRebuildPickerDelegate {
+ type ListItem = ListItem;
+
+ fn match_count(&self) -> usize {
+ self.matches.len()
+ }
+
+ fn selected_index(&self) -> usize {
+ self.selected_index
+ }
+
+ fn set_selected_index(
+ &mut self,
+ ix: usize,
+ _window: &mut Window,
+ _cx: &mut Context<Picker<Self>>,
+ ) {
+ self.selected_index = ix;
+ }
+
+ fn selected_index_changed(
+ &self,
+ _ix: usize,
+ _window: &mut Window,
+ _cx: &mut Context<Picker<Self>>,
+ ) -> Option<Box<dyn Fn(&mut Window, &mut App) + 'static>> {
+ None
+ }
+
+ fn update_matches(
+ &mut self,
+ query: String,
+ window: &mut Window,
+ cx: &mut Context<Picker<Self>>,
+ ) -> Task<()> {
+ let background = cx.background_executor().clone();
+ let candidates = self
+ .entries
+ .iter()
+ .enumerate()
+ .map(|(ix, manifest)| StringMatchCandidate::new(ix, manifest.name.as_ref()))
+ .collect::<Vec<_>>();
+
+ cx.spawn_in(window, async move |this, cx| {
+ let matches = if query.is_empty() {
+ candidates
+ .into_iter()
+ .enumerate()
+ .map(|(index, candidate)| StringMatch {
+ candidate_id: index,
+ string: candidate.string,
+ positions: Vec::new(),
+ score: 0.0,
+ })
+ .collect()
+ } else {
+ match_strings(
+ &candidates,
+ &query,
+ false,
+ true,
+ 100,
+ &Default::default(),
+ background,
+ )
+ .await
+ };
+
+ this.update(cx, |this, _cx| {
+ this.delegate.matches = matches;
+ this.delegate.selected_index = this
+ .delegate
+ .selected_index
+ .min(this.delegate.matches.len().saturating_sub(1));
+ })
+ .log_err();
+ })
+ }
+
+ fn confirm(&mut self, _secondary: bool, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
+ let Some(mat) = self.matches.get(self.selected_index) else {
+ return;
+ };
+
+ let extension_id = self.entries[mat.candidate_id].id.clone();
+ ExtensionStore::global(cx).update(cx, |store, cx| {
+ store.rebuild_dev_extension(extension_id, cx);
+ });
+
+ cx.emit(DismissEvent);
+ }
+
+ fn dismissed(&mut self, _window: &mut Window, _cx: &mut Context<Picker<Self>>) {}
+
+ fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
+ Arc::from("Rebuild dev extension…")
+ }
+
+ fn render_match(
+ &self,
+ ix: usize,
+ selected: bool,
+ _window: &mut Window,
+ _cx: &mut Context<Picker<Self>>,
+ ) -> Option<Self::ListItem> {
+ let mat = self.matches.get(ix)?;
+ let entry = self.entries.get(mat.candidate_id)?;
+
+ let item = ListItem::new(("dev-extension-list-item", mat.candidate_id))
+ .inset(true)
+ .spacing(ListItemSpacing::Sparse)
+ .toggle_state(selected)
+ .child(
+ h_flex()
+ .w_full()
+ .py_px()
+ .justify_between()
+ .gap_2()
+ .child(Label::new(entry.name.clone()))
+ .child(
+ Label::new(format!("{} • v{}", entry.id, entry.version))
+ .size(LabelSize::Small)
+ .color(Color::Muted),
+ ),
+ );
+
+ Some(item)
+ }
+
+ fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
+ Some("No dev extensions found".into())
+ }
+}
+
impl Render for ExtensionsPage {
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
v_flex()
diff --git a/crates/workspace/src/workspace_error.rs b/crates/workspace/src/workspace_error.rs
index e6293c43a84..8f8329f7019 100644
--- a/crates/workspace/src/workspace_error.rs
+++ b/crates/workspace/src/workspace_error.rs
@@ -15,8 +15,8 @@ impl ErrorSeverity {
pub fn auto_dismiss_delay(&self) -> Option<Duration> {
match self {
ErrorSeverity::Critical => None,
- ErrorSeverity::Error => Some(Duration::from_secs(20)),
- ErrorSeverity::Warning => Some(Duration::from_secs(10)),
+ ErrorSeverity::Error => Some(Duration::from_secs(30)),
+ ErrorSeverity::Warning => Some(Duration::from_secs(20)),
}
}
}