diff --git a/Cargo.lock b/Cargo.lock
index 3a746e5438..7e1b55e9b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2459,8 +2459,10 @@ dependencies = [
"client",
"collections",
"editor",
+ "futures 0.3.28",
"gpui",
"language",
+ "log",
"lsp",
"postage",
"project",
@@ -9742,7 +9744,7 @@ dependencies = [
[[package]]
name = "tree-sitter-vue"
version = "0.0.1"
-source = "git+https://github.com/zed-industries/tree-sitter-vue?rev=95b2890#95b28908d90e928c308866f7631e73ef6e1d4b5f"
+source = "git+https://github.com/zed-industries/tree-sitter-vue?rev=9b6cb221ccb8d0b956fcb17e9a1efac2feefeb58#9b6cb221ccb8d0b956fcb17e9a1efac2feefeb58"
dependencies = [
"cc",
"tree-sitter",
diff --git a/Cargo.toml b/Cargo.toml
index 273ad265e8..268399ad3f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -177,7 +177,7 @@ tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml",
tree-sitter-lua = "0.0.14"
tree-sitter-nix = { git = "https://github.com/nix-community/tree-sitter-nix", rev = "66e3e9ce9180ae08fc57372061006ef83f0abde7" }
tree-sitter-nu = { git = "https://github.com/nushell/tree-sitter-nu", rev = "786689b0562b9799ce53e824cb45a1a2a04dc673"}
-tree-sitter-vue = {git = "https://github.com/zed-industries/tree-sitter-vue", rev = "95b2890"}
+tree-sitter-vue = {git = "https://github.com/zed-industries/tree-sitter-vue", rev = "9b6cb221ccb8d0b956fcb17e9a1efac2feefeb58"}
[patch.crates-io]
tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "35a6052fbcafc5e5fc0f9415b8652be7dcaf7222" }
async-task = { git = "https://github.com/zed-industries/async-task", rev = "341b57d6de98cdfd7b418567b8de2022ca993a6e" }
diff --git a/assets/icons/dash.svg b/assets/icons/dash.svg
new file mode 100644
index 0000000000..efff9eab5e
--- /dev/null
+++ b/assets/icons/dash.svg
@@ -0,0 +1 @@
+
diff --git a/crates/collab_ui/src/channel_view.rs b/crates/collab_ui/src/channel_view.rs
index 1bdcebd018..fe46f3bb3e 100644
--- a/crates/collab_ui/src/channel_view.rs
+++ b/crates/collab_ui/src/channel_view.rs
@@ -75,23 +75,23 @@ impl ChannelView {
let workspace = workspace.read(cx);
let project = workspace.project().to_owned();
let channel_store = ChannelStore::global(cx);
- let markdown = workspace
- .app_state()
- .languages
- .language_for_name("Markdown");
+ let language_registry = workspace.app_state().languages.clone();
+ let markdown = language_registry.language_for_name("Markdown");
let channel_buffer =
channel_store.update(cx, |store, cx| store.open_channel_buffer(channel_id, cx));
cx.spawn(|mut cx| async move {
let channel_buffer = channel_buffer.await?;
+ let markdown = markdown.await.log_err();
- if let Some(markdown) = markdown.await.log_err() {
- channel_buffer.update(&mut cx, |buffer, cx| {
- buffer.buffer().update(cx, |buffer, cx| {
+ channel_buffer.update(&mut cx, |buffer, cx| {
+ buffer.buffer().update(cx, |buffer, cx| {
+ buffer.set_language_registry(language_registry);
+ if let Some(markdown) = markdown {
buffer.set_language(Some(markdown), cx);
- })
- });
- }
+ }
+ })
+ });
pane.update(&mut cx, |pane, cx| {
let buffer_id = channel_buffer.read(cx).remote_id(cx);
diff --git a/crates/diagnostics/Cargo.toml b/crates/diagnostics/Cargo.toml
index b0b2450f05..0f9d108831 100644
--- a/crates/diagnostics/Cargo.toml
+++ b/crates/diagnostics/Cargo.toml
@@ -20,7 +20,9 @@ theme = { path = "../theme" }
util = { path = "../util" }
workspace = { path = "../workspace" }
+log.workspace = true
anyhow.workspace = true
+futures.workspace = true
schemars.workspace = true
serde.workspace = true
serde_derive.workspace = true
diff --git a/crates/diagnostics/src/diagnostics.rs b/crates/diagnostics/src/diagnostics.rs
index 0b1c6f8470..1ec4105fbd 100644
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -2,8 +2,8 @@ pub mod items;
mod project_diagnostics_settings;
mod toolbar_controls;
-use anyhow::Result;
-use collections::{BTreeSet, HashSet};
+use anyhow::{Context, Result};
+use collections::{HashMap, HashSet};
use editor::{
diagnostic_block_renderer,
display_map::{BlockDisposition, BlockId, BlockProperties, BlockStyle, RenderBlock},
@@ -11,9 +11,10 @@ use editor::{
scroll::autoscroll::Autoscroll,
Editor, ExcerptId, ExcerptRange, MultiBuffer, ToOffset,
};
+use futures::future::try_join_all;
use gpui::{
actions, elements::*, fonts::TextStyle, serde_json, AnyViewHandle, AppContext, Entity,
- ModelHandle, Task, View, ViewContext, ViewHandle, WeakViewHandle,
+ ModelHandle, Subscription, Task, View, ViewContext, ViewHandle, WeakViewHandle,
};
use language::{
Anchor, Bias, Buffer, Diagnostic, DiagnosticEntry, DiagnosticSeverity, Point, Selection,
@@ -28,6 +29,7 @@ use std::{
any::{Any, TypeId},
borrow::Cow,
cmp::Ordering,
+ mem,
ops::Range,
path::PathBuf,
sync::Arc,
@@ -60,8 +62,10 @@ struct ProjectDiagnosticsEditor {
summary: DiagnosticSummary,
excerpts: ModelHandle,
path_states: Vec,
- paths_to_update: BTreeSet<(ProjectPath, LanguageServerId)>,
+ paths_to_update: HashMap>,
+ current_diagnostics: HashMap>,
include_warnings: bool,
+ _subscriptions: Vec,
}
struct PathState {
@@ -125,9 +129,12 @@ impl View for ProjectDiagnosticsEditor {
"summary": project.diagnostic_summary(cx),
}),
"summary": self.summary,
- "paths_to_update": self.paths_to_update.iter().map(|(path, server_id)|
- (path.path.to_string_lossy(), server_id.0)
- ).collect::>(),
+ "paths_to_update": self.paths_to_update.iter().map(|(server_id, paths)|
+ (server_id.0, paths.into_iter().map(|path| path.path.to_string_lossy()).collect::>())
+ ).collect::>(),
+ "current_diagnostics": self.current_diagnostics.iter().map(|(server_id, paths)|
+ (server_id.0, paths.into_iter().map(|path| path.path.to_string_lossy()).collect::>())
+ ).collect::>(),
"paths_states": self.path_states.iter().map(|state|
json!({
"path": state.path.path.to_string_lossy(),
@@ -149,21 +156,30 @@ impl ProjectDiagnosticsEditor {
workspace: WeakViewHandle,
cx: &mut ViewContext,
) -> Self {
- cx.subscribe(&project_handle, |this, _, event, cx| match event {
- project::Event::DiskBasedDiagnosticsFinished { language_server_id } => {
- this.update_excerpts(Some(*language_server_id), cx);
- this.update_title(cx);
- }
- project::Event::DiagnosticsUpdated {
- language_server_id,
- path,
- } => {
- this.paths_to_update
- .insert((path.clone(), *language_server_id));
- }
- _ => {}
- })
- .detach();
+ let project_event_subscription =
+ cx.subscribe(&project_handle, |this, _, event, cx| match event {
+ project::Event::DiskBasedDiagnosticsFinished { language_server_id } => {
+ log::debug!("Disk based diagnostics finished for server {language_server_id}");
+ this.update_excerpts(Some(*language_server_id), cx);
+ }
+ project::Event::DiagnosticsUpdated {
+ language_server_id,
+ path,
+ } => {
+ log::debug!("Adding path {path:?} to update for server {language_server_id}");
+ this.paths_to_update
+ .entry(*language_server_id)
+ .or_default()
+ .insert(path.clone());
+ let no_multiselections = this.editor.update(cx, |editor, cx| {
+ editor.selections.all::(cx).len() <= 1
+ });
+ if no_multiselections && !this.is_dirty(cx) {
+ this.update_excerpts(Some(*language_server_id), cx);
+ }
+ }
+ _ => {}
+ });
let excerpts = cx.add_model(|cx| MultiBuffer::new(project_handle.read(cx).replica_id()));
let editor = cx.add_view(|cx| {
@@ -172,19 +188,14 @@ impl ProjectDiagnosticsEditor {
editor.set_vertical_scroll_margin(5, cx);
editor
});
- cx.subscribe(&editor, |this, _, event, cx| {
+ let editor_event_subscription = cx.subscribe(&editor, |this, _, event, cx| {
cx.emit(event.clone());
if event == &editor::Event::Focused && this.path_states.is_empty() {
cx.focus_self()
}
- })
- .detach();
+ });
let project = project_handle.read(cx);
- let paths_to_update = project
- .diagnostic_summaries(cx)
- .map(|(path, server_id, _)| (path, server_id))
- .collect();
let summary = project.diagnostic_summary(cx);
let mut this = Self {
project: project_handle,
@@ -193,8 +204,10 @@ impl ProjectDiagnosticsEditor {
excerpts,
editor,
path_states: Default::default(),
- paths_to_update,
+ paths_to_update: HashMap::default(),
include_warnings: settings::get::(cx).include_warnings,
+ current_diagnostics: HashMap::default(),
+ _subscriptions: vec![project_event_subscription, editor_event_subscription],
};
this.update_excerpts(None, cx);
this
@@ -214,12 +227,6 @@ impl ProjectDiagnosticsEditor {
fn toggle_warnings(&mut self, _: &ToggleWarnings, cx: &mut ViewContext) {
self.include_warnings = !self.include_warnings;
- self.paths_to_update = self
- .project
- .read(cx)
- .diagnostic_summaries(cx)
- .map(|(path, server_id, _)| (path, server_id))
- .collect();
self.update_excerpts(None, cx);
cx.notify();
}
@@ -229,29 +236,94 @@ impl ProjectDiagnosticsEditor {
language_server_id: Option,
cx: &mut ViewContext,
) {
- let mut paths = Vec::new();
- self.paths_to_update.retain(|(path, server_id)| {
- if language_server_id
- .map_or(true, |language_server_id| language_server_id == *server_id)
- {
- paths.push(path.clone());
- false
+ log::debug!("Updating excerpts for server {language_server_id:?}");
+ let mut paths_to_recheck = HashSet::default();
+ let mut new_summaries: HashMap> = self
+ .project
+ .read(cx)
+ .diagnostic_summaries(cx)
+ .fold(HashMap::default(), |mut summaries, (path, server_id, _)| {
+ summaries.entry(server_id).or_default().insert(path);
+ summaries
+ });
+ let mut old_diagnostics = if let Some(language_server_id) = language_server_id {
+ new_summaries.retain(|server_id, _| server_id == &language_server_id);
+ self.paths_to_update.retain(|server_id, paths| {
+ if server_id == &language_server_id {
+ paths_to_recheck.extend(paths.drain());
+ false
+ } else {
+ true
+ }
+ });
+ let mut old_diagnostics = HashMap::default();
+ if let Some(new_paths) = new_summaries.get(&language_server_id) {
+ if let Some(old_paths) = self
+ .current_diagnostics
+ .insert(language_server_id, new_paths.clone())
+ {
+ old_diagnostics.insert(language_server_id, old_paths);
+ }
} else {
- true
+ if let Some(old_paths) = self.current_diagnostics.remove(&language_server_id) {
+ old_diagnostics.insert(language_server_id, old_paths);
+ }
}
- });
+ old_diagnostics
+ } else {
+ paths_to_recheck.extend(self.paths_to_update.drain().flat_map(|(_, paths)| paths));
+ mem::replace(&mut self.current_diagnostics, new_summaries.clone())
+ };
+ for (server_id, new_paths) in new_summaries {
+ match old_diagnostics.remove(&server_id) {
+ Some(mut old_paths) => {
+ paths_to_recheck.extend(
+ new_paths
+ .into_iter()
+ .filter(|new_path| !old_paths.remove(new_path)),
+ );
+ paths_to_recheck.extend(old_paths);
+ }
+ None => paths_to_recheck.extend(new_paths),
+ }
+ }
+ paths_to_recheck.extend(old_diagnostics.into_iter().flat_map(|(_, paths)| paths));
+
+ if paths_to_recheck.is_empty() {
+ log::debug!("No paths to recheck for language server {language_server_id:?}");
+ return;
+ }
+ log::debug!(
+ "Rechecking {} paths for language server {:?}",
+ paths_to_recheck.len(),
+ language_server_id
+ );
let project = self.project.clone();
cx.spawn(|this, mut cx| {
async move {
- for path in paths {
- let buffer = project
- .update(&mut cx, |project, cx| project.open_buffer(path.clone(), cx))
- .await?;
- this.update(&mut cx, |this, cx| {
- this.populate_excerpts(path, language_server_id, buffer, cx)
- })?;
- }
- Result::<_, anyhow::Error>::Ok(())
+ let _: Vec<()> = try_join_all(paths_to_recheck.into_iter().map(|path| {
+ let mut cx = cx.clone();
+ let project = project.clone();
+ async move {
+ let buffer = project
+ .update(&mut cx, |project, cx| project.open_buffer(path.clone(), cx))
+ .await
+ .with_context(|| format!("opening buffer for path {path:?}"))?;
+ this.update(&mut cx, |this, cx| {
+ this.populate_excerpts(path, language_server_id, buffer, cx);
+ })
+ .context("missing project")?;
+ anyhow::Ok(())
+ }
+ }))
+ .await
+ .context("rechecking diagnostics for paths")?;
+
+ this.update(&mut cx, |this, cx| {
+ this.summary = this.project.read(cx).diagnostic_summary(cx);
+ cx.emit(Event::TitleChanged);
+ })?;
+ anyhow::Ok(())
}
.log_err()
})
@@ -554,11 +626,6 @@ impl ProjectDiagnosticsEditor {
}
cx.notify();
}
-
- fn update_title(&mut self, cx: &mut ViewContext) {
- self.summary = self.project.read(cx).diagnostic_summary(cx);
- cx.emit(Event::TitleChanged);
- }
}
impl Item for ProjectDiagnosticsEditor {
@@ -1301,25 +1368,6 @@ mod tests {
cx,
)
.unwrap();
- project
- .update_diagnostic_entries(
- server_id_2,
- PathBuf::from("/test/main.js"),
- None,
- vec![DiagnosticEntry {
- range: Unclipped(PointUtf16::new(1, 0))..Unclipped(PointUtf16::new(1, 1)),
- diagnostic: Diagnostic {
- message: "warning 1".to_string(),
- severity: DiagnosticSeverity::ERROR,
- is_primary: true,
- is_disk_based: true,
- group_id: 2,
- ..Default::default()
- },
- }],
- cx,
- )
- .unwrap();
});
// The first language server finishes
@@ -1353,6 +1401,25 @@ mod tests {
// The second language server finishes
project.update(cx, |project, cx| {
+ project
+ .update_diagnostic_entries(
+ server_id_2,
+ PathBuf::from("/test/main.js"),
+ None,
+ vec![DiagnosticEntry {
+ range: Unclipped(PointUtf16::new(1, 0))..Unclipped(PointUtf16::new(1, 1)),
+ diagnostic: Diagnostic {
+ message: "warning 1".to_string(),
+ severity: DiagnosticSeverity::ERROR,
+ is_primary: true,
+ is_disk_based: true,
+ group_id: 2,
+ ..Default::default()
+ },
+ }],
+ cx,
+ )
+ .unwrap();
project.disk_based_diagnostics_finished(server_id_2, cx);
});
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index c87606070e..1b922848e0 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -33,9 +33,9 @@ use util::{
paths::{PathExt, FILE_ROW_COLUMN_DELIMITER},
ResultExt, TryFutureExt,
};
-use workspace::item::{BreadcrumbText, FollowableItemHandle};
+use workspace::item::{BreadcrumbText, FollowableItemHandle, ItemHandle};
use workspace::{
- item::{FollowableItem, Item, ItemEvent, ItemHandle, ProjectItem},
+ item::{FollowableItem, Item, ItemEvent, ProjectItem},
searchable::{Direction, SearchEvent, SearchableItem, SearchableItemHandle},
ItemId, ItemNavHistory, Pane, StatusItemView, ToolbarItemLocation, ViewId, Workspace,
WorkspaceId,
diff --git a/crates/gpui_macros/src/gpui_macros.rs b/crates/gpui_macros/src/gpui_macros.rs
index aa55c27eaa..62fba3b612 100644
--- a/crates/gpui_macros/src/gpui_macros.rs
+++ b/crates/gpui_macros/src/gpui_macros.rs
@@ -170,6 +170,8 @@ pub fn test(args: TokenStream, function: TokenStream) -> TokenStream {
#max_retries,
#detect_nondeterminism,
&mut |cx, foreground_platform, deterministic, seed| {
+ // some of the macro contents do not use all variables, silence the warnings
+ let _ = (&cx, &foreground_platform, &deterministic, &seed);
#cx_vars
cx.foreground().run(#inner_fn_name(#inner_fn_args));
#cx_teardowns
@@ -247,6 +249,8 @@ pub fn test(args: TokenStream, function: TokenStream) -> TokenStream {
#max_retries,
#detect_nondeterminism,
&mut |cx, foreground_platform, deterministic, seed| {
+ // some of the macro contents do not use all variables, silence the warnings
+ let _ = (&cx, &foreground_platform, &deterministic, &seed);
#cx_vars
#inner_fn_name(#inner_fn_args);
#cx_teardowns
diff --git a/crates/refineable/derive_refineable/src/derive_refineable.rs b/crates/refineable/derive_refineable/src/derive_refineable.rs
index ed233e1b0d..c2d001b287 100644
--- a/crates/refineable/derive_refineable/src/derive_refineable.rs
+++ b/crates/refineable/derive_refineable/src/derive_refineable.rs
@@ -16,9 +16,33 @@ pub fn derive_refineable(input: TokenStream) -> TokenStream {
..
} = parse_macro_input!(input);
- let impl_debug_on_refinement = attrs
- .iter()
- .any(|attr| attr.path.is_ident("refineable") && attr.tokens.to_string().contains("debug"));
+ let refineable_attr = attrs.iter().find(|attr| attr.path.is_ident("refineable"));
+
+ let mut impl_debug_on_refinement = false;
+ let mut derive_serialize_on_refinement = false;
+ let mut derive_deserialize_on_refinement = false;
+
+ if let Some(refineable_attr) = refineable_attr {
+ if let Ok(syn::Meta::List(meta_list)) = refineable_attr.parse_meta() {
+ for nested in meta_list.nested {
+ let syn::NestedMeta::Meta(syn::Meta::Path(path)) = nested else {
+ continue;
+ };
+
+ if path.is_ident("debug") {
+ impl_debug_on_refinement = true;
+ }
+
+ if path.is_ident("serialize") {
+ derive_serialize_on_refinement = true;
+ }
+
+ if path.is_ident("deserialize") {
+ derive_deserialize_on_refinement = true;
+ }
+ }
+ }
+ }
let refinement_ident = format_ident!("{}Refinement", ident);
let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
@@ -235,8 +259,22 @@ pub fn derive_refineable(input: TokenStream) -> TokenStream {
quote! {}
};
+ let derive_serialize = if derive_serialize_on_refinement {
+ quote! { #[derive(serde::Serialize)]}
+ } else {
+ quote! {}
+ };
+
+ let derive_deserialize = if derive_deserialize_on_refinement {
+ quote! { #[derive(serde::Deserialize)]}
+ } else {
+ quote! {}
+ };
+
let gen = quote! {
#[derive(Clone)]
+ #derive_serialize
+ #derive_deserialize
pub struct #refinement_ident #impl_generics {
#( #field_visibilities #field_names: #wrapped_types ),*
}
diff --git a/crates/storybook2/src/components.rs b/crates/storybook2/src/components.rs
deleted file mode 100644
index a3dca51adc..0000000000
--- a/crates/storybook2/src/components.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-use gpui2::{
- div, ArcCow, Element, EventContext, Interactive, IntoElement, MouseButton, ParentElement,
- StyleHelpers, ViewContext,
-};
-use std::{marker::PhantomData, rc::Rc};
-
-struct ButtonHandlers {
- click: Option)>>,
-}
-
-impl Default for ButtonHandlers {
- fn default() -> Self {
- Self { click: None }
- }
-}
-
-#[derive(Component)]
-pub struct Button {
- handlers: ButtonHandlers,
- label: Option>,
- icon: Option>,
- data: Rc,
- view_type: PhantomData,
-}
-
-// Impl block for buttons without data.
-// See below for an impl block for any button.
-impl Button {
- fn new() -> Self {
- Self {
- handlers: ButtonHandlers::default(),
- label: None,
- icon: None,
- data: Rc::new(()),
- view_type: PhantomData,
- }
- }
-
- pub fn data(self, data: D) -> Button {
- Button {
- handlers: ButtonHandlers::default(),
- label: self.label,
- icon: self.icon,
- data: Rc::new(data),
- view_type: PhantomData,
- }
- }
-}
-
-// Impl block for button regardless of its data type.
-impl Button {
- pub fn label(mut self, label: impl Into>) -> Self {
- self.label = Some(label.into());
- self
- }
-
- pub fn icon(mut self, icon: impl Into>) -> Self {
- self.icon = Some(icon.into());
- self
- }
-
- pub fn on_click(
- mut self,
- handler: impl Fn(&mut V, &D, &mut EventContext) + 'static,
- ) -> Self {
- self.handlers.click = Some(Rc::new(handler));
- self
- }
-}
-
-pub fn button() -> Button {
- Button::new()
-}
-
-impl Button {
- fn render(
- &mut self,
- view: &mut V,
- cx: &mut ViewContext,
- ) -> impl IntoElement + Interactive {
- // let colors = &cx.theme::().colors;
-
- let button = div()
- // .fill(colors.error(0.5))
- .h_4()
- .children(self.label.clone());
-
- if let Some(handler) = self.handlers.click.clone() {
- let data = self.data.clone();
- button.on_mouse_down(MouseButton::Left, move |view, event, cx| {
- handler(view, data.as_ref(), cx)
- })
- } else {
- button
- }
- }
-}
diff --git a/crates/storybook2/src/stories/kitchen_sink.rs b/crates/storybook2/src/stories/kitchen_sink.rs
index cfa91417b6..cf8277c4f4 100644
--- a/crates/storybook2/src/stories/kitchen_sink.rs
+++ b/crates/storybook2/src/stories/kitchen_sink.rs
@@ -1,7 +1,4 @@
-use crate::{
- story::Story,
- story_selector::{ComponentStory, ElementStory},
-};
+use crate::{story::Story, story_selector::ComponentStory};
use gpui2::{Div, Render, StatefulInteraction, View, VisualContext};
use strum::IntoEnumIterator;
use ui::prelude::*;
@@ -18,9 +15,6 @@ impl Render for KitchenSinkStory {
type Element = Div>;
fn render(&mut self, cx: &mut ViewContext) -> Self::Element {
- let element_stories = ElementStory::iter()
- .map(|selector| selector.story(cx))
- .collect::>();
let component_stories = ComponentStory::iter()
.map(|selector| selector.story(cx))
.collect::>();
@@ -29,8 +23,6 @@ impl Render for KitchenSinkStory {
.id("kitchen-sink")
.overflow_y_scroll()
.child(Story::title(cx, "Kitchen Sink"))
- .child(Story::label(cx, "Elements"))
- .child(div().flex().flex_col().children(element_stories))
.child(Story::label(cx, "Components"))
.child(div().flex().flex_col().children(component_stories))
// Add a bit of space at the bottom of the kitchen sink so elements
diff --git a/crates/storybook2/src/story_selector.rs b/crates/storybook2/src/story_selector.rs
index 968309bd8a..2adf2956d3 100644
--- a/crates/storybook2/src/story_selector.rs
+++ b/crates/storybook2/src/story_selector.rs
@@ -7,55 +7,31 @@ use clap::builder::PossibleValue;
use clap::ValueEnum;
use gpui2::{AnyView, VisualContext};
use strum::{EnumIter, EnumString, IntoEnumIterator};
-use ui::{prelude::*, AvatarStory, ButtonStory, DetailsStory, IconStory, InputStory, LabelStory};
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy, strum::Display, EnumString, EnumIter)]
-#[strum(serialize_all = "snake_case")]
-pub enum ElementStory {
- Avatar,
- Button,
- Colors,
- Details,
- Focus,
- Icon,
- Input,
- Label,
- Scroll,
- Text,
- ZIndex,
-}
-
-impl ElementStory {
- pub fn story(&self, cx: &mut WindowContext) -> AnyView {
- match self {
- Self::Colors => cx.build_view(|_| ColorsStory).into(),
- Self::Avatar => cx.build_view(|_| AvatarStory).into(),
- Self::Button => cx.build_view(|_| ButtonStory).into(),
- Self::Details => cx.build_view(|_| DetailsStory).into(),
- Self::Focus => FocusStory::view(cx).into(),
- Self::Icon => cx.build_view(|_| IconStory).into(),
- Self::Input => cx.build_view(|_| InputStory).into(),
- Self::Label => cx.build_view(|_| LabelStory).into(),
- Self::Scroll => ScrollStory::view(cx).into(),
- Self::Text => TextStory::view(cx).into(),
- Self::ZIndex => cx.build_view(|_| ZIndexStory).into(),
- }
- }
-}
+use ui::prelude::*;
+use ui::{AvatarStory, ButtonStory, DetailsStory, IconStory, InputStory, LabelStory};
#[derive(Debug, PartialEq, Eq, Clone, Copy, strum::Display, EnumString, EnumIter)]
#[strum(serialize_all = "snake_case")]
pub enum ComponentStory {
AssistantPanel,
+ Avatar,
Breadcrumb,
Buffer,
+ Button,
ChatPanel,
+ Checkbox,
CollabPanel,
+ Colors,
CommandPalette,
- Copilot,
ContextMenu,
+ Copilot,
+ Details,
Facepile,
+ Focus,
+ Icon,
+ Input,
Keybinding,
+ Label,
LanguageSelector,
MultiBuffer,
NotificationsPanel,
@@ -63,29 +39,42 @@ pub enum ComponentStory {
Panel,
ProjectPanel,
RecentProjects,
+ Scroll,
Tab,
TabBar,
Terminal,
+ Text,
ThemeSelector,
TitleBar,
Toast,
Toolbar,
TrafficLights,
Workspace,
+ ZIndex,
}
impl ComponentStory {
pub fn story(&self, cx: &mut WindowContext) -> AnyView {
match self {
Self::AssistantPanel => cx.build_view(|_| ui::AssistantPanelStory).into(),
- Self::Buffer => cx.build_view(|_| ui::BufferStory).into(),
+ Self::Avatar => cx.build_view(|_| AvatarStory).into(),
Self::Breadcrumb => cx.build_view(|_| ui::BreadcrumbStory).into(),
+ Self::Buffer => cx.build_view(|_| ui::BufferStory).into(),
+ Self::Button => cx.build_view(|_| ButtonStory).into(),
Self::ChatPanel => cx.build_view(|_| ui::ChatPanelStory).into(),
+ Self::Checkbox => cx.build_view(|_| ui::CheckboxStory).into(),
Self::CollabPanel => cx.build_view(|_| ui::CollabPanelStory).into(),
+ Self::Colors => cx.build_view(|_| ColorsStory).into(),
Self::CommandPalette => cx.build_view(|_| ui::CommandPaletteStory).into(),
Self::ContextMenu => cx.build_view(|_| ui::ContextMenuStory).into(),
+ Self::Copilot => cx.build_view(|_| ui::CopilotModalStory).into(),
+ Self::Details => cx.build_view(|_| DetailsStory).into(),
Self::Facepile => cx.build_view(|_| ui::FacepileStory).into(),
+ Self::Focus => FocusStory::view(cx).into(),
+ Self::Icon => cx.build_view(|_| IconStory).into(),
+ Self::Input => cx.build_view(|_| InputStory).into(),
Self::Keybinding => cx.build_view(|_| ui::KeybindingStory).into(),
+ Self::Label => cx.build_view(|_| LabelStory).into(),
Self::LanguageSelector => cx.build_view(|_| ui::LanguageSelectorStory).into(),
Self::MultiBuffer => cx.build_view(|_| ui::MultiBufferStory).into(),
Self::NotificationsPanel => cx.build_view(|cx| ui::NotificationsPanelStory).into(),
@@ -93,23 +82,24 @@ impl ComponentStory {
Self::Panel => cx.build_view(|cx| ui::PanelStory).into(),
Self::ProjectPanel => cx.build_view(|_| ui::ProjectPanelStory).into(),
Self::RecentProjects => cx.build_view(|_| ui::RecentProjectsStory).into(),
+ Self::Scroll => ScrollStory::view(cx).into(),
Self::Tab => cx.build_view(|_| ui::TabStory).into(),
Self::TabBar => cx.build_view(|_| ui::TabBarStory).into(),
Self::Terminal => cx.build_view(|_| ui::TerminalStory).into(),
+ Self::Text => TextStory::view(cx).into(),
Self::ThemeSelector => cx.build_view(|_| ui::ThemeSelectorStory).into(),
+ Self::TitleBar => ui::TitleBarStory::view(cx).into(),
Self::Toast => cx.build_view(|_| ui::ToastStory).into(),
Self::Toolbar => cx.build_view(|_| ui::ToolbarStory).into(),
Self::TrafficLights => cx.build_view(|_| ui::TrafficLightsStory).into(),
- Self::Copilot => cx.build_view(|_| ui::CopilotModalStory).into(),
- Self::TitleBar => ui::TitleBarStory::view(cx).into(),
Self::Workspace => ui::WorkspaceStory::view(cx).into(),
+ Self::ZIndex => cx.build_view(|_| ZIndexStory).into(),
}
}
}
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
pub enum StorySelector {
- Element(ElementStory),
Component(ComponentStory),
KitchenSink,
}
@@ -126,13 +116,6 @@ impl FromStr for StorySelector {
return Ok(Self::KitchenSink);
}
- if let Some((_, story)) = story.split_once("elements/") {
- let element_story = ElementStory::from_str(story)
- .with_context(|| format!("story not found for element '{story}'"))?;
-
- return Ok(Self::Element(element_story));
- }
-
if let Some((_, story)) = story.split_once("components/") {
let component_story = ComponentStory::from_str(story)
.with_context(|| format!("story not found for component '{story}'"))?;
@@ -147,7 +130,6 @@ impl FromStr for StorySelector {
impl StorySelector {
pub fn story(&self, cx: &mut WindowContext) -> AnyView {
match self {
- Self::Element(element_story) => element_story.story(cx),
Self::Component(component_story) => component_story.story(cx),
Self::KitchenSink => KitchenSinkStory::view(cx).into(),
}
@@ -160,11 +142,9 @@ static ALL_STORY_SELECTORS: OnceLock> = OnceLock::new();
impl ValueEnum for StorySelector {
fn value_variants<'a>() -> &'a [Self] {
let stories = ALL_STORY_SELECTORS.get_or_init(|| {
- let element_stories = ElementStory::iter().map(StorySelector::Element);
let component_stories = ComponentStory::iter().map(StorySelector::Component);
- element_stories
- .chain(component_stories)
+ component_stories
.chain(std::iter::once(StorySelector::KitchenSink))
.collect::>()
});
@@ -174,7 +154,6 @@ impl ValueEnum for StorySelector {
fn to_possible_value(&self) -> Option {
let value = match self {
- Self::Element(story) => format!("elements/{story}"),
Self::Component(story) => format!("components/{story}"),
Self::KitchenSink => "kitchen_sink".to_string(),
};
diff --git a/crates/theme2/src/colors.rs b/crates/theme2/src/colors.rs
index b25304bcfa..1a1fd2e99e 100644
--- a/crates/theme2/src/colors.rs
+++ b/crates/theme2/src/colors.rs
@@ -49,12 +49,14 @@ pub struct GitStatusColors {
}
#[derive(Refineable, Clone, Debug)]
-#[refineable(debug)]
+#[refineable(debug, deserialize)]
pub struct ThemeColors {
pub border: Hsla,
pub border_variant: Hsla,
pub border_focused: Hsla,
+ pub border_selected: Hsla,
pub border_transparent: Hsla,
+ pub border_disabled: Hsla,
pub elevated_surface_background: Hsla,
pub surface_background: Hsla,
pub background: Hsla,
@@ -122,6 +124,8 @@ pub struct ThemeStyles {
#[cfg(test)]
mod tests {
+ use serde_json::json;
+
use super::*;
#[test]
@@ -163,4 +167,16 @@ mod tests {
assert_eq!(colors.text, magenta);
assert_eq!(colors.background, green);
}
+
+ #[test]
+ fn deserialize_theme_colors_refinement_from_json() {
+ let colors: ThemeColorsRefinement = serde_json::from_value(json!({
+ "background": "#ff00ff",
+ "text": "#ff0000"
+ }))
+ .unwrap();
+
+ assert_eq!(colors.background, Some(gpui::rgb(0xff00ff)));
+ assert_eq!(colors.text, Some(gpui::rgb(0xff0000)));
+ }
}
diff --git a/crates/theme2/src/default_colors.rs b/crates/theme2/src/default_colors.rs
index 55ce096a4c..53e34acf16 100644
--- a/crates/theme2/src/default_colors.rs
+++ b/crates/theme2/src/default_colors.rs
@@ -205,6 +205,8 @@ impl ThemeColors {
border: neutral().light().step_6(),
border_variant: neutral().light().step_5(),
border_focused: blue().light().step_5(),
+ border_disabled: neutral().light().step_3(),
+ border_selected: blue().light().step_5(),
border_transparent: system.transparent,
elevated_surface_background: neutral().light().step_2(),
surface_background: neutral().light().step_2(),
@@ -267,6 +269,8 @@ impl ThemeColors {
border: neutral().dark().step_6(),
border_variant: neutral().dark().step_5(),
border_focused: blue().dark().step_5(),
+ border_disabled: neutral().dark().step_3(),
+ border_selected: blue().dark().step_5(),
border_transparent: system.transparent,
elevated_surface_background: neutral().dark().step_2(),
surface_background: neutral().dark().step_2(),
diff --git a/crates/ui2/docs/building-ui.md b/crates/ui2/docs/building-ui.md
new file mode 100644
index 0000000000..e0160e336e
--- /dev/null
+++ b/crates/ui2/docs/building-ui.md
@@ -0,0 +1,49 @@
+# Building UI with GPUI
+
+## Common patterns
+
+### Method ordering
+
+- id
+- Flex properties
+- Position properties
+- Size properties
+- Style properties
+- Handlers
+- State properties
+
+### Using the Label Component to Create UI Text
+
+The `Label` component helps in displaying text on user interfaces. It creates an interface where specific parameters such as label color, line height style, and strikethrough can be set.
+
+Firstly, to create a `Label` instance, use the `Label::new()` function. This function takes a string that will be displayed as text in the interface.
+
+```rust
+Label::new("Hello, world!");
+```
+
+Now let's dive a bit deeper into how to customize `Label` instances:
+
+- **Setting Color:** To set the color of the label using various predefined color options such as `Default`, `Muted`, `Created`, `Modified`, `Deleted`, etc, the `color()` function is called on the `Label` instance:
+
+ ```rust
+ Label::new("Hello, world!").color(LabelColor::Default);
+ ```
+
+- **Setting Line Height Style:** To set the line height style, the `line_height_style()` function is utilized:
+
+ ```rust
+ Label::new("Hello, world!").line_height_style(LineHeightStyle::TextLabel);
+ ```
+
+- **Adding a Strikethrough:** To add a strikethrough in a `Label`, the `set_strikethrough()` function is used:
+
+ ```rust
+ Label::new("Hello, world!").set_strikethrough(true);
+ ```
+
+That's it! Now you can use the `Label` component to create and customize text on your application's interface.
+
+## Building a new component
+
+TODO
diff --git a/crates/ui2/docs/elevation.md b/crates/ui2/docs/elevation.md
deleted file mode 100644
index bd34de3396..0000000000
--- a/crates/ui2/docs/elevation.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Elevation
-
-Elevation in Zed applies to all surfaces and components. Elevation is categorized into levels.
-
-Elevation accomplishes the following:
-- Allows surfaces to move in front of or behind others, such as content scrolling beneath app top bars.
-- Reflects spatial relationships, for instance, how a floating action button’s shadow intimates its disconnection from a collection of cards.
-- Directs attention to structures at the highest elevation, like a temporary dialog arising in front of other surfaces.
-
-Elevations are the initial elevation values assigned to components by default.
-
-Components may transition to a higher elevation in some cases, like user interations.
-
-On such occasions, components transition to predetermined dynamic elevation offsets. These are the typical elevations to which components move when they are not at rest.
-
-## Understanding Elevation
-
-Elevation can be thought of as the physical closeness of an element to the user. Elements with lower elevations are physically further away from the user on the z-axis and appear to be underneath elements with higher elevations.
-
-Material Design 3 has a some great visualizations of elevation that may be helpful to understanding the mental modal of elevation. [Material Design – Elevation](https://m3.material.io/styles/elevation/overview)
-
-## Elevation Levels
-
-Zed integrates six unique elevation levels in its design system. The elevation of a surface is expressed as a whole number ranging from 0 to 5, both numbers inclusive. A component’s elevation is ascertained by combining the component’s resting elevation with any dynamic elevation offsets.
-
-The levels are detailed as follows:
-
-0. App Background
-1. UI Surface
-2. Elevated Elements
-3. Wash
-4. Focused Element
-5. Dragged Element
-
-### 0. App Background
-
-The app background constitutes the lowest elevation layer, appearing behind all other surfaces and components. It is predominantly used for the background color of the app.
-
-### 1. UI Surface
-
-The UI Surface is the standard elevation for components and is placed above the app background. It is generally used for the background color of the app bar, card, and sheet.
-
-### 2. Elevated Elements
-
-Elevated elements appear above the UI surface layer surfaces and components. Elevated elements are predominantly used for creating popovers, context menus, and tooltips.
-
-### 3. Wash
-
-Wash denotes a distinct elevation reserved to isolate app UI layers from high elevation components such as modals, notifications, and overlaid panels. The wash may not consistently be visible when these components are active. This layer is often referred to as a scrim or overlay and the background color of the wash is typically deployed in its design.
-
-### 4. Focused Element
-
-Focused elements obtain a higher elevation above surfaces and components at wash elevation. They are often used for modals, notifications, and overlaid panels and indicate that they are the sole element the user is interacting with at the moment.
-
-### 5. Dragged Element
-
-Dragged elements gain the highest elevation, thus appearing above surfaces and components at the elevation of focused elements. These are typically used for elements that are being dragged, following the cursor
diff --git a/crates/ui2/docs/hello-world.md b/crates/ui2/docs/hello-world.md
new file mode 100644
index 0000000000..c6ded9ce34
--- /dev/null
+++ b/crates/ui2/docs/hello-world.md
@@ -0,0 +1,160 @@
+# Hello World
+
+Let's work through the prototypical "Build a todo app" example to showcase how we might build a simple component from scratch.
+
+## Setup
+
+We'll create a headline, a list of todo items, and a form to add new items.
+
+~~~rust
+struct TodoList {
+ headline: SharedString,
+ items: Vec,
+ submit_form: ClickHandler
+}
+
+struct TodoItem {
+ text: SharedString,
+ completed: bool,
+ delete: ClickHandler
+}
+
+impl TodoList {
+ pub fn new(
+ // Here we impl Into
+ headline: impl Into,
+ items: Vec,
+ submit_form: ClickHandler
+ ) -> Self {
+ Self {
+ // and here we call .into() so we can simply pass a string
+ // when creating the headline. This pattern is used throughout
+ // outr components
+ headline: headline.into(),
+ items: Vec::new(),
+ submit_form,
+ }
+ }
+}
+~~~
+
+All of this is relatively straightforward.
+
+We use [gpui2::SharedString] in components instead of [std::string::String]. This allows us to [TODO: someone who actually knows please explain why we use SharedString].
+
+When we want to pass an action we pass a `ClickHandler`. Whenever we want to add an action, the struct it belongs to needs to be generic over the view type `V`.
+
+~~~rust
+use gpui2::hsla
+
+impl TodoList {
+ // ...
+ fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component {
+ div().size_4().bg(hsla(50.0/360.0, 1.0, 0.5, 1.0))
+ }
+}
+~~~
+
+Every component needs a render method, and it should return `impl Component`. This basic component will render a 16x16px yellow square on the screen.
+
+A couple of questions might come to mind:
+
+**Why is `size_4()` 16px, not 4px?**
+
+gpui's style system is based on conventions created by [Tailwind CSS](https://tailwindcss.com/). Here is an example of the list of sizes for `width`: [Width - TailwindCSS Docs](https://tailwindcss.com/docs/width).
+
+I'll quote from the Tailwind [Core Concepts](https://tailwindcss.com/docs/utility-first) docs here:
+
+> Now I know what you’re thinking, “this is an atrocity, what a horrible mess!”
+> and you’re right, it’s kind of ugly. In fact it’s just about impossible to
+> think this is a good idea the first time you see it —
+> you have to actually try it.
+
+As you start using the Tailwind-style conventions you will be surprised how quick it makes it to build out UIs.
+
+**Why `50.0/360.0` in `hsla()`?**
+
+gpui [gpui2::Hsla] use `0.0-1.0` for all it's values, but it is common for tools to use `0-360` for hue.
+
+This may change in the future, but this is a little trick that let's you use familiar looking values.
+
+## Building out the container
+
+Let's grab our [theme2::colors::ThemeColors] from the theme and start building out a basic container.
+
+We can access the current theme's colors like this:
+
+~~~rust
+impl TodoList {
+ // ...
+ fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component {
+ let color = cx.theme().colors()
+
+ div().size_4().hsla(50.0/360.0, 1.0, 0.5, 1.0)
+ }
+}
+~~~
+
+Now we have access to the complete set of colors defined in the theme.
+
+~~~rust
+use gpui2::hsla
+
+impl TodoList {
+ // ...
+ fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component {
+ let color = cx.theme().colors()
+
+ div().size_4().bg(color.surface)
+ }
+}
+~~~
+
+Let's finish up some basic styles for the container then move on to adding the other elements.
+
+~~~rust
+use gpui2::hsla
+
+impl TodoList {
+ // ...
+ fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component {
+ let color = cx.theme().colors()
+
+ div()
+ // Flex properties
+ .flex()
+ .flex_col() // Stack elements vertically
+ .gap_2() // Add 8px of space between elements
+ // Size properties
+ .w_96() // Set width to 384px
+ .p_4() // Add 16px of padding on all sides
+ // Color properties
+ .bg(color.surface) // Set background color
+ .text_color(color.text) // Set text color
+ // Border properties
+ .rounded_md() // Add 4px of border radius
+ .border() // Add a 1px border
+ .border_color(color.border)
+ .child(
+ "Hello, world!"
+ )
+ }
+}
+~~~
+
+### Headline
+
+TODO
+
+### List of todo items
+
+TODO
+
+### Input
+
+TODO
+
+
+### End result
+
+TODO
diff --git a/crates/ui2/docs/todo.md b/crates/ui2/docs/todo.md
new file mode 100644
index 0000000000..e7a053ecf4
--- /dev/null
+++ b/crates/ui2/docs/todo.md
@@ -0,0 +1,25 @@
+## Documentation priorities:
+
+These are the priorities to get documented, in a rough stack rank order:
+
+- [ ] label
+- [ ] button
+- [ ] icon_button
+- [ ] icon
+- [ ] list
+- [ ] avatar
+- [ ] panel
+- [ ] modal
+- [ ] palette
+- [ ] input
+- [ ] facepile
+- [ ] player
+- [ ] stacks
+- [ ] context menu
+- [ ] input
+- [ ] textarea/multiline input (not built - not an editor)
+- [ ] indicator
+- [ ] public actor
+- [ ] keybinding
+- [ ] tab
+- [ ] toast
diff --git a/crates/ui2/src/components.rs b/crates/ui2/src/components.rs
index 7a9cac01ca..a8a7ddfd46 100644
--- a/crates/ui2/src/components.rs
+++ b/crates/ui2/src/components.rs
@@ -1,71 +1,51 @@
-mod assistant_panel;
-mod breadcrumb;
-mod buffer;
-mod buffer_search;
-mod chat_panel;
-mod collab_panel;
-mod command_palette;
+mod avatar;
+mod button;
+mod checkbox;
mod context_menu;
-mod copilot;
-mod editor_pane;
+mod details;
mod facepile;
+mod icon;
mod icon_button;
+mod indicator;
+mod input;
mod keybinding;
-mod language_selector;
+mod label;
mod list;
mod modal;
-mod multi_buffer;
mod notification_toast;
-mod notifications_panel;
mod palette;
mod panel;
-mod panes;
+mod player;
mod player_stack;
-mod project_panel;
-mod recent_projects;
-mod status_bar;
+mod slot;
+mod stack;
mod tab;
-mod tab_bar;
-mod terminal;
-mod theme_selector;
-mod title_bar;
mod toast;
-mod toolbar;
-mod traffic_lights;
-mod workspace;
+mod toggle;
+mod tool_divider;
-pub use assistant_panel::*;
-pub use breadcrumb::*;
-pub use buffer::*;
-pub use buffer_search::*;
-pub use chat_panel::*;
-pub use collab_panel::*;
-pub use command_palette::*;
+pub use avatar::*;
+pub use button::*;
+pub use checkbox::*;
pub use context_menu::*;
-pub use copilot::*;
-pub use editor_pane::*;
+pub use details::*;
pub use facepile::*;
+pub use icon::*;
pub use icon_button::*;
+pub use indicator::*;
+pub use input::*;
pub use keybinding::*;
-pub use language_selector::*;
+pub use label::*;
pub use list::*;
pub use modal::*;
-pub use multi_buffer::*;
pub use notification_toast::*;
-pub use notifications_panel::*;
pub use palette::*;
pub use panel::*;
-pub use panes::*;
+pub use player::*;
pub use player_stack::*;
-pub use project_panel::*;
-pub use recent_projects::*;
-pub use status_bar::*;
+pub use slot::*;
+pub use stack::*;
pub use tab::*;
-pub use tab_bar::*;
-pub use terminal::*;
-pub use theme_selector::*;
-pub use title_bar::*;
pub use toast::*;
-pub use toolbar::*;
-pub use traffic_lights::*;
-pub use workspace::*;
+pub use toggle::*;
+pub use tool_divider::*;
diff --git a/crates/ui2/src/elements/avatar.rs b/crates/ui2/src/components/avatar.rs
similarity index 100%
rename from crates/ui2/src/elements/avatar.rs
rename to crates/ui2/src/components/avatar.rs
diff --git a/crates/ui2/src/elements/button.rs b/crates/ui2/src/components/button.rs
similarity index 96%
rename from crates/ui2/src/elements/button.rs
rename to crates/ui2/src/components/button.rs
index be7f29fee2..c13460aadd 100644
--- a/crates/ui2/src/elements/button.rs
+++ b/crates/ui2/src/components/button.rs
@@ -2,8 +2,27 @@ use std::sync::Arc;
use gpui2::{div, rems, DefiniteLength, Hsla, MouseButton, WindowContext};
-use crate::prelude::*;
use crate::{h_stack, Icon, IconColor, IconElement, Label, LabelColor, LineHeightStyle};
+use crate::{prelude::*, IconButton};
+
+/// Provides the flexibility to use either a standard
+/// button or an icon button in a given context.
+pub enum ButtonOrIconButton {
+ Button(Button),
+ IconButton(IconButton),
+}
+
+impl From