Merge branch 'main' into picker

crates/editor2/src/editor.rs

@@ -36,10 +36,10 @@ pub use element::{
 use futures::FutureExt;
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
-    actions, div, px, AnyElement, AppContext, BackgroundExecutor, Context, DispatchContext, Div,
+    actions, div, px, relative, AnyElement, AppContext, BackgroundExecutor, Context,
-    Element, Entity, EventEmitter, FocusHandle, FontStyle, FontWeight, Hsla, Model, Pixels, Render,
+    DispatchContext, Div, Element, Entity, EventEmitter, FocusHandle, FontStyle, FontWeight, Hsla,
-    Styled, Subscription, Task, TextStyle, View, ViewContext, VisualContext, WeakView,
+    Model, Pixels, Render, Styled, Subscription, Task, TextStyle, View, ViewContext, VisualContext,
-    WindowContext,
+    WeakView, WindowContext,
 };
 use highlight_matching_bracket::refresh_matching_bracket_highlights;
 use hover_popover::{hide_hover, HoverState};
@@ -593,7 +593,6 @@ pub struct EditorStyle {
     pub background: Hsla,
     pub local_player: PlayerColor,
     pub text: TextStyle,
-    pub line_height_scalar: f32,
     pub scrollbar_width: Pixels,
     pub syntax: Arc<SyntaxTheme>,
     pub diagnostic_style: DiagnosticStyle,
@@ -1795,14 +1794,11 @@ impl InlayHintRefreshReason {
 }
 
 impl Editor {
-    //     pub fn single_line(
+    pub fn single_line(cx: &mut ViewContext<Self>) -> Self {
-    //         field_editor_style: Option<Arc<GetFieldEditorTheme>>,
+        let buffer = cx.build_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), String::new()));
-    //         cx: &mut ViewContext<Self>,
+        let buffer = cx.build_model(|cx| MultiBuffer::singleton(buffer, cx));
-    //     ) -> Self {
+        Self::new(EditorMode::SingleLine, buffer, None, cx)
-    //         let buffer = cx.build_model(|cx| Buffer::new(0, cx.model_id() as u64, String::new()));
+    }
-    //         let buffer = cx.build_model(|cx| MultiBuffer::singleton(buffer, cx));
-    //         Self::new(EditorMode::SingleLine, buffer, None, field_editor_style, cx)
-    //     }
 
     //     pub fn multi_line(
     //         field_editor_style: Option<Arc<GetFieldEditorTheme>>,
@@ -9372,14 +9368,13 @@ impl Render for Editor {
             font_size: settings.buffer_font_size.into(),
             font_weight: FontWeight::NORMAL,
             font_style: FontStyle::Normal,
-            line_height: Default::default(),
+            line_height: relative(settings.buffer_line_height.value()),
             underline: None,
         };
         EditorElement::new(EditorStyle {
             background: cx.theme().colors().editor_background,
             local_player: cx.theme().players().local(),
             text: text_style,
-            line_height_scalar: settings.buffer_line_height.value(),
             scrollbar_width: px(12.),
             syntax: cx.theme().syntax().clone(),
             diagnostic_style: cx.theme().diagnostic_style(),

crates/editor2/src/element.rs

@@ -1605,7 +1605,7 @@ impl EditorElement {
         let style = self.style.clone();
         let font_id = cx.text_system().font_id(&style.text.font()).unwrap();
         let font_size = style.text.font_size.to_pixels(cx.rem_size());
-        let line_height = (font_size * style.line_height_scalar).round();
+        let line_height = style.text.line_height_in_pixels(cx.rem_size());
         let em_width = cx
             .text_system()
             .typographic_bounds(font_id, font_size, 'm')
@@ -2593,7 +2593,11 @@ impl Element<Editor> for EditorElement {
         let rem_size = cx.rem_size();
         let mut style = Style::default();
         style.size.width = relative(1.).into();
-        style.size.height = relative(1.).into();
+        style.size.height = match editor.mode {
+            EditorMode::SingleLine => self.style.text.line_height_in_pixels(cx.rem_size()).into(),
+            EditorMode::AutoHeight { .. } => todo!(),
+            EditorMode::Full => relative(1.).into(),
+        };
         cx.request_layout(&style, None)
     }
 

crates/go_to_line2/src/go_to_line.rs

@@ -1,12 +1,10 @@
-use gpui::{div, px, red, AppContext, Div, Render, Styled, ViewContext, VisualContext};
+use gpui::{actions, div, px, red, AppContext, Div, Render, Styled, ViewContext, VisualContext};
-use serde::Deserialize;
 use workspace::ModalRegistry;
 
-// actions!(go_to_line, [Toggle]);
+actions!(Toggle);
-#[derive(Clone, Default, PartialEq, Deserialize)]
-struct Toggle;
 
 pub fn init(cx: &mut AppContext) {
+    cx.register_action_type::<Toggle>();
     cx.global_mut::<ModalRegistry>()
         .register_modal(Toggle, |_, cx| {
             // if let Some(editor) = workspace

crates/gpui2/src/element.rs

@@ -134,7 +134,10 @@ where
                         .layout(state, frame_state.as_mut().unwrap(), cx);
                 }
             }
-            _ => panic!("must call initialize before layout"),
+            ElementRenderPhase::Start => panic!("must call initialize before layout"),
+            ElementRenderPhase::LayoutRequested { .. } | ElementRenderPhase::Painted => {
+                panic!("element rendered twice")
+            }
         };
 
         self.phase = ElementRenderPhase::LayoutRequested {

crates/gpui2/src/interactive.rs

@@ -422,9 +422,10 @@ pub trait ElementInteractivity<V: 'static>: 'static {
                         None
                     }),
                 ));
-                let result = stateful.stateless.initialize(cx, f);
+
-                stateful.key_listeners.pop();
+                cx.with_key_dispatch_context(stateful.dispatch_context.clone(), |cx| {
-                result
+                    cx.with_key_listeners(mem::take(&mut stateful.key_listeners), f)
+                })
             })
         } else {
             let stateless = self.as_stateless_mut();

crates/gpui2/src/style.rs

@@ -189,6 +189,10 @@ impl TextStyle {
         }
     }
 
+    pub fn line_height_in_pixels(&self, rem_size: Pixels) -> Pixels {
+        self.line_height.to_pixels(self.font_size, rem_size)
+    }
+
     pub fn to_run(&self, len: usize) -> TextRun {
         TextRun {
             len,

crates/settings2/src/keymap_file.rs

@@ -1,7 +1,7 @@
 use crate::{settings_store::parse_json_with_comments, SettingsAssets};
 use anyhow::{anyhow, Context, Result};
 use collections::BTreeMap;
-use gpui::{AppContext, KeyBinding, SharedString};
+use gpui::{actions, Action, AppContext, KeyBinding, SharedString};
 use schemars::{
     gen::{SchemaGenerator, SchemaSettings},
     schema::{InstanceType, Schema, SchemaObject, SingleOrVec, SubschemaValidation},
@@ -137,8 +137,10 @@ impl KeymapFile {
     }
 }
 
+actions!(NoAction);
+
 fn no_action() -> Box<dyn gpui::Action> {
-    todo!()
+    NoAction.boxed_clone()
 }
 
 #[cfg(test)]

crates/theme2/src/colors.rs

@@ -71,71 +71,213 @@ pub struct GitStatusColors {
 #[refineable(debug, deserialize)]
 pub struct ThemeColors {
     pub border: Hsla,
+    /// Border color. Used for deemphasized borders, like a visual divider between two sections
     pub border_variant: Hsla,
+    /// Border color. Used for focused elements, like keyboard focused list item.
     pub border_focused: Hsla,
+    /// Border color. Used for selected elements, like an active search filter or selected checkbox.
     pub border_selected: Hsla,
+    /// Border color. Used for transparent borders. Used for placeholder borders when an element gains a border on state change.
     pub border_transparent: Hsla,
+    /// Border color. Used for disabled elements, like a disabled input or button.
     pub border_disabled: Hsla,
+    /// Border color. Used for elevated surfaces, like a context menu, popup, or dialog.
     pub elevated_surface_background: Hsla,
+    /// Background Color. Used for grounded surfaces like a panel or tab.
     pub surface_background: Hsla,
+    /// Background Color. Used for the app background and blank panels or windows.
     pub background: Hsla,
+    /// Background Color. Used for the background of an element that should have a different background than the surface it's on.
+    ///
+    /// Elements might include: Buttons, Inputs, Checkboxes, Radio Buttons...
+    ///
+    /// For an element that should have the same background as the surface it's on, use `ghost_element_background`.
     pub element_background: Hsla,
+    /// Background Color. Used for the hover state of an element that should have a different background than the surface it's on.
+    ///
+    /// Hover states are triggered by the mouse entering an element, or a finger touching an element on a touch screen.
     pub element_hover: Hsla,
+    /// Background Color. Used for the active state of an element that should have a different background than the surface it's on.
+    ///
+    /// Active states are triggered by the mouse button being pressed down on an element, or the Return button or other activator being pressd.
     pub element_active: Hsla,
+    /// Background Color. Used for the selected state of an element that should have a different background than the surface it's on.
+    ///
+    /// Selected states are triggered by the element being selected (or "activated") by the user.
+    ///
+    /// This could include a selected checkbox, a toggleable button that is toggled on, etc.
     pub element_selected: Hsla,
+    /// Background Color. Used for the disabled state of an element that should have a different background than the surface it's on.
+    ///
+    /// Disabled states are shown when a user cannot interact with an element, like a disabled button or input.
     pub element_disabled: Hsla,
-    pub element_placeholder: Hsla,
+    /// Background Color. Used for the area that shows where a dragged element will be dropped.
-    pub element_drop_target: Hsla,
+    pub drop_target_background: Hsla,
+    /// Border Color. Used to show the area that shows where a dragged element will be dropped.
+    // pub drop_target_border: Hsla,
+    /// Used for the background of a ghost element that should have the same background as the surface it's on.
+    ///
+    /// Elements might include: Buttons, Inputs, Checkboxes, Radio Buttons...
+    ///
+    /// For an element that should have a different background than the surface it's on, use `element_background`.
     pub ghost_element_background: Hsla,
+    /// Background Color. Used for the hover state of a ghost element that should have the same background as the surface it's on.
+    ///
+    /// Hover states are triggered by the mouse entering an element, or a finger touching an element on a touch screen.
     pub ghost_element_hover: Hsla,
+    /// Background Color. Used for the active state of a ghost element that should have the same background as the surface it's on.
+    ///
+    /// Active states are triggered by the mouse button being pressed down on an element, or the Return button or other activator being pressd.
     pub ghost_element_active: Hsla,
+    /// Background Color. Used for the selected state of a ghost element that should have the same background as the surface it's on.
+    ///
+    /// Selected states are triggered by the element being selected (or "activated") by the user.
+    ///
+    /// This could include a selected checkbox, a toggleable button that is toggled on, etc.
     pub ghost_element_selected: Hsla,
+    /// Background Color. Used for the disabled state of a ghost element that should have the same background as the surface it's on.
+    ///
+    /// Disabled states are shown when a user cannot interact with an element, like a disabled button or input.
     pub ghost_element_disabled: Hsla,
+    /// Text Color. Default text color used for most text.
     pub text: Hsla,
+    /// Text Color. Color of muted or deemphasized text. It is a subdued version of the standard text color.
     pub text_muted: Hsla,
+    /// Text Color. Color of the placeholder text typically shown in input fields to guide the user to enter valid data.
     pub text_placeholder: Hsla,
+    /// Text Color. Color used for text denoting disabled elements. Typically, the color is faded or grayed out to emphasize the disabled state.
     pub text_disabled: Hsla,
+    /// Text Color. Color used for emphasis or highlighting certain text, like an active filter or a matched character in a search.
     pub text_accent: Hsla,
+    /// Fill Color. Used for the default fill color of an icon.
     pub icon: Hsla,
+    /// Fill Color. Used for the muted or deemphasized fill color of an icon.
+    ///
+    /// This might be used to show an icon in an inactive pane, or to demphasize a series of icons to give them less visual weight.
     pub icon_muted: Hsla,
+    /// Fill Color. Used for the disabled fill color of an icon.
+    ///
+    /// Disabled states are shown when a user cannot interact with an element, like a icon button.
     pub icon_disabled: Hsla,
+    /// Fill Color. Used for the placeholder fill color of an icon.
+    ///
+    /// This might be used to show an icon in an input that disappears when the user enters text.
     pub icon_placeholder: Hsla,
+    /// Fill Color. Used for the accent fill color of an icon.
+    ///
+    /// This might be used to show when a toggleable icon button is selected.
     pub icon_accent: Hsla,
+
+    // ===
+    // UI Elements
+    // ===
     pub status_bar_background: Hsla,
     pub title_bar_background: Hsla,
     pub toolbar_background: Hsla,
     pub tab_bar_background: Hsla,
     pub tab_inactive_background: Hsla,
     pub tab_active_background: Hsla,
+    // pub panel_background: Hsla,
+    // pub pane_focused_border: Hsla,
+    // /// The color of the scrollbar thumb.
+    // pub scrollbar_thumb_background: Hsla,
+    // /// The color of the scrollbar thumb when hovered over.
+    // pub scrollbar_thumb_hover_background: Hsla,
+    // /// The border color of the scrollbar thumb.
+    // pub scrollbar_thumb_border: Hsla,
+    // /// The background color of the scrollbar track.
+    // pub scrollbar_track_background: Hsla,
+    // /// The border color of the scrollbar track.
+    // pub scrollbar_track_border: Hsla,
+    // /// The opacity of the scrollbar status marks, like diagnostic states and git status..
+    // pub scrollbar_status_opacity: Hsla,
+
+    // ===
+    // Editor
+    // ===
     pub editor_background: Hsla,
+    // pub editor_inactive_background: Hsla,
     pub editor_gutter_background: Hsla,
     pub editor_subheader_background: Hsla,
     pub editor_active_line_background: Hsla,
     pub editor_highlighted_line_background: Hsla,
+    /// Text Color. Used for the text of the line number in the editor gutter.
     pub editor_line_number: Hsla,
+    /// Text Color. Used for the text of the line number in the editor gutter when the line is highlighted.
     pub editor_active_line_number: Hsla,
+    /// Text Color. Used to mark invisible characters in the editor.
+    ///
+    /// Example: spaces, tabs, carriage returns, etc.
     pub editor_invisible: Hsla,
     pub editor_wrap_guide: Hsla,
     pub editor_active_wrap_guide: Hsla,
     pub editor_document_highlight_read_background: Hsla,
     pub editor_document_highlight_write_background: Hsla,
+
+    // ===
+    // Terminal
+    // ===
+    /// Terminal Background Color
     pub terminal_background: Hsla,
+    /// Bright Black Color for ANSI Terminal
     pub terminal_ansi_bright_black: Hsla,
+    /// Bright Red Color for ANSI Terminal
     pub terminal_ansi_bright_red: Hsla,
+    /// Bright Green Color for ANSI Terminal
     pub terminal_ansi_bright_green: Hsla,
+    /// Bright Yellow Color for ANSI Terminal
     pub terminal_ansi_bright_yellow: Hsla,
+    /// Bright Blue Color for ANSI Terminal
     pub terminal_ansi_bright_blue: Hsla,
+    /// Bright Magenta Color for ANSI Terminal
     pub terminal_ansi_bright_magenta: Hsla,
+    /// Bright Cyan Color for ANSI Terminal
     pub terminal_ansi_bright_cyan: Hsla,
+    /// Bright White Color for ANSI Terminal
     pub terminal_ansi_bright_white: Hsla,
+    /// Black Color for ANSI Terminal
     pub terminal_ansi_black: Hsla,
+    /// Red Color for ANSI Terminal
     pub terminal_ansi_red: Hsla,
+    /// Green Color for ANSI Terminal
     pub terminal_ansi_green: Hsla,
+    /// Yellow Color for ANSI Terminal
     pub terminal_ansi_yellow: Hsla,
+    /// Blue Color for ANSI Terminal
     pub terminal_ansi_blue: Hsla,
+    /// Magenta Color for ANSI Terminal
     pub terminal_ansi_magenta: Hsla,
+    /// Cyan Color for ANSI Terminal
     pub terminal_ansi_cyan: Hsla,
+    /// White Color for ANSI Terminal
     pub terminal_ansi_white: Hsla,
+    // new colors
+
+    // ===
+    // Elevation
+    // ===
+    // elevation_0_shadow
+    // elevation_0_shadow_color
+    // elevation_1_shadow
+    // elevation_1_shadow_color
+    // elevation_2_shadow
+    // elevation_2_shadow_color
+    // elevation_3_shadow
+    // elevation_3_shadow_color
+    // elevation_4_shadow
+    // elevation_4_shadow_color
+    // elevation_5_shadow
+    // elevation_5_shadow_color
+
+    // ===
+    // UI Text
+    // ===
+    // pub headline: Hsla,
+    // pub paragraph: Hsla,
+    // pub link: Hsla,
+    // pub link_hover: Hsla,
+    // pub code_block_background: Hsla,
+    // pub code_block_border: Hsla,
 }
 
 #[derive(Refineable, Clone)]

crates/theme2/src/default_colors.rs

@@ -220,8 +220,7 @@ impl ThemeColors {
             element_active: neutral().light().step_5(),
             element_selected: neutral().light().step_5(),
             element_disabled: neutral().light_alpha().step_3(),
-            element_placeholder: neutral().light().step_11(),
+            drop_target_background: blue().light_alpha().step_2(),
-            element_drop_target: blue().light_alpha().step_2(),
             ghost_element_background: system.transparent,
             ghost_element_hover: neutral().light().step_4(),
             ghost_element_active: neutral().light().step_5(),
@@ -293,8 +292,7 @@ impl ThemeColors {
             element_active: neutral().dark().step_5(),
             element_selected: neutral().dark().step_5(),
             element_disabled: neutral().dark_alpha().step_3(),
-            element_placeholder: neutral().dark().step_11(),
+            drop_target_background: blue().dark_alpha().step_2(),
-            element_drop_target: blue().dark_alpha().step_2(),
             ghost_element_background: system.transparent,
             ghost_element_hover: neutral().dark().step_4(),
             ghost_element_active: neutral().dark().step_5(),

crates/theme_importer/src/theme_printer.rs

@@ -140,8 +140,7 @@ impl<'a> Debug for ThemeColorsRefinementPrinter<'a> {
             ("element_active", self.0.element_active),
             ("element_selected", self.0.element_selected),
             ("element_disabled", self.0.element_disabled),
-            ("element_placeholder", self.0.element_placeholder),
+            ("drop_target_background", self.0.drop_target_background),
-            ("element_drop_target", self.0.element_drop_target),
             ("ghost_element_background", self.0.ghost_element_background),
             ("ghost_element_hover", self.0.ghost_element_hover),
             ("ghost_element_active", self.0.ghost_element_active),

crates/ui2/src/components/tab.rs

@@ -127,7 +127,7 @@ impl Tab {
         div()
             .id(self.id.clone())
             .on_drag(move |_view, cx| cx.build_view(|cx| drag_state.clone()))
-            .drag_over::<TabDragState>(|d| d.bg(cx.theme().colors().element_drop_target))
+            .drag_over::<TabDragState>(|d| d.bg(cx.theme().colors().drop_target_background))
             .on_drop(|_view, state: View<TabDragState>, cx| {
                 eprintln!("{:?}", state.read(cx));
             })

crates/workspace2/src/modal_layer.rs

@@ -28,10 +28,6 @@ struct ToggleModal {
     name: String,
 }
 
-// complete change of plan?
-// on_action(ToggleModal{ name})
-// register_modal(name, |workspace, cx| { ... })
-
 impl ModalRegistry {
     pub fn register_modal<A: 'static, V, B>(&mut self, action: A, build_view: B)
     where
@@ -40,12 +36,10 @@ impl ModalRegistry {
     {
         let build_view = Arc::new(build_view);
 
-        dbg!("yonder");
         self.registered_modals.push((
             TypeId::of::<A>(),
             Box::new(move |mut div| {
                 let build_view = build_view.clone();
-                dbg!("this point");
 
                 div.on_action(
                     move |workspace: &mut Workspace, event: &A, cx: &mut ViewContext<Workspace>| {
@@ -67,9 +61,7 @@ impl ModalLayer {
         Self { open_modal: None }
     }
 
-    pub fn render(&self, cx: &ViewContext<Workspace>) -> impl Component<Workspace> {
+    pub fn render(&self, workspace: &Workspace, cx: &ViewContext<Workspace>) -> Div<Workspace> {
-        dbg!("rendering ModalLayer");
-
         let mut div = div();
 
         // div, c workspace.toggle_modal()div.on_action()) {

crates/workspace2/src/workspace2.rs

@@ -3707,7 +3707,9 @@ impl Render for Workspace {
             .bg(cx.theme().colors().background)
             .child(self.render_titlebar(cx))
             .child(
-                div()
+                self.modal_layer
+                    .read(cx)
+                    .render(self, cx)
                     .flex_1()
                     .w_full()
                     .flex()
@@ -3840,8 +3842,6 @@ impl Render for Workspace {
                               //         .on_click(Arc::new(|workspace, cx| workspace.toggle_debug(cx))),
                               // ),
             )
-            //     .child(self.modal_layer.clone())
-            .child(self.modal_layer.read(cx).render(cx))
     }
 }