Merge remote-tracking branch 'origin/main' into scrollbars2

2023-12-11 09:51:43 +01:00
parent 9b0bea32ed cea26c9d10
commit 03df63aa00
107 changed files with 13202 additions and 9651 deletions
@@ -39,8 +39,8 @@ use futures::FutureExt;
 use fuzzy::{StringMatch, StringMatchCandidate};
 use git::diff_hunk_to_display;
 use gpui::{
-    actions, div, point, prelude::*, px, relative, rems, size, uniform_list, Action, AnyElement,
-    AppContext, AsyncWindowContext, BackgroundExecutor, Bounds, ClipboardItem, Context,
+    actions, div, impl_actions, point, prelude::*, px, relative, rems, size, uniform_list, Action,
+    AnyElement, AppContext, AsyncWindowContext, BackgroundExecutor, Bounds, ClipboardItem, Context,
    DispatchPhase, Div, ElementId, EventEmitter, FocusHandle, FocusableView, FontFeatures,
    FontStyle, FontWeight, HighlightStyle, Hsla, InputHandler, InteractiveText, KeyContext, Model,
    MouseButton, ParentElement, Pixels, Render, RenderOnce, SharedString, Styled, StyledText,
@@ -185,82 +185,101 @@ pub fn render_parsed_markdown(
    })
 }

-#[derive(PartialEq, Clone, Deserialize, Default, Action)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct SelectNext {
    #[serde(default)]
    pub replace_newest: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, Action)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct SelectPrevious {
    #[serde(default)]
    pub replace_newest: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, Action)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct SelectAllMatches {
    #[serde(default)]
    pub replace_newest: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, Action)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct SelectToBeginningOfLine {
    #[serde(default)]
    stop_at_soft_wraps: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, Action)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct MovePageUp {
    #[serde(default)]
    center_cursor: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, Action)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct MovePageDown {
    #[serde(default)]
    center_cursor: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, Action)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct SelectToEndOfLine {
    #[serde(default)]
    stop_at_soft_wraps: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, Action)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct ToggleCodeActions {
    #[serde(default)]
    pub deployed_from_indicator: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, Action)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct ConfirmCompletion {
    #[serde(default)]
    pub item_ix: Option<usize>,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, Action)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct ConfirmCodeAction {
    #[serde(default)]
    pub item_ix: Option<usize>,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, Action)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct ToggleComments {
    #[serde(default)]
    pub advance_downwards: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, Action)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct FoldAt {
    pub buffer_row: u32,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, Action)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct UnfoldAt {
    pub buffer_row: u32,
 }

+impl_actions!(
+    editor,
+    [
+        SelectNext,
+        SelectPrevious,
+        SelectAllMatches,
+        SelectToBeginningOfLine,
+        MovePageUp,
+        MovePageDown,
+        SelectToEndOfLine,
+        ToggleCodeActions,
+        ConfirmCompletion,
+        ConfirmCodeAction,
+        ToggleComments,
+        FoldAt,
+        UnfoldAt
+    ]
+);
+
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum InlayId {
    Suggestion(usize),
@@ -277,121 +296,124 @@ impl InlayId {
 }

 actions!(
-    AddSelectionAbove,
-    AddSelectionBelow,
-    Backspace,
-    Cancel,
-    ConfirmRename,
-    ContextMenuFirst,
-    ContextMenuLast,
-    ContextMenuNext,
-    ContextMenuPrev,
-    ConvertToKebabCase,
-    ConvertToLowerCamelCase,
-    ConvertToLowerCase,
-    ConvertToSnakeCase,
-    ConvertToTitleCase,
-    ConvertToUpperCamelCase,
-    ConvertToUpperCase,
-    Copy,
-    CopyHighlightJson,
-    CopyPath,
-    CopyRelativePath,
-    Cut,
-    CutToEndOfLine,
-    Delete,
-    DeleteLine,
-    DeleteToBeginningOfLine,
-    DeleteToEndOfLine,
-    DeleteToNextSubwordEnd,
-    DeleteToNextWordEnd,
-    DeleteToPreviousSubwordStart,
-    DeleteToPreviousWordStart,
-    DuplicateLine,
-    FindAllReferences,
-    Fold,
-    FoldSelectedRanges,
-    Format,
-    GoToDefinition,
-    GoToDefinitionSplit,
-    GoToDiagnostic,
-    GoToHunk,
-    GoToPrevDiagnostic,
-    GoToPrevHunk,
-    GoToTypeDefinition,
-    GoToTypeDefinitionSplit,
-    HalfPageDown,
-    HalfPageUp,
-    Hover,
-    Indent,
-    JoinLines,
-    LineDown,
-    LineUp,
-    MoveDown,
-    MoveLeft,
-    MoveLineDown,
-    MoveLineUp,
-    MoveRight,
-    MoveToBeginning,
-    MoveToBeginningOfLine,
-    MoveToEnclosingBracket,
-    MoveToEnd,
-    MoveToEndOfLine,
-    MoveToEndOfParagraph,
-    MoveToNextSubwordEnd,
-    MoveToNextWordEnd,
-    MoveToPreviousSubwordStart,
-    MoveToPreviousWordStart,
-    MoveToStartOfParagraph,
-    MoveUp,
-    Newline,
-    NewlineAbove,
-    NewlineBelow,
-    NextScreen,
-    OpenExcerpts,
-    Outdent,
-    PageDown,
-    PageUp,
-    Paste,
-    Redo,
-    RedoSelection,
-    Rename,
-    RestartLanguageServer,
-    RevealInFinder,
-    ReverseLines,
-    ScrollCursorBottom,
-    ScrollCursorCenter,
-    ScrollCursorTop,
-    SelectAll,
-    SelectDown,
-    SelectLargerSyntaxNode,
-    SelectLeft,
-    SelectLine,
-    SelectRight,
-    SelectSmallerSyntaxNode,
-    SelectToBeginning,
-    SelectToEnd,
-    SelectToEndOfParagraph,
-    SelectToNextSubwordEnd,
-    SelectToNextWordEnd,
-    SelectToPreviousSubwordStart,
-    SelectToPreviousWordStart,
-    SelectToStartOfParagraph,
-    SelectUp,
-    ShowCharacterPalette,
-    ShowCompletions,
-    ShuffleLines,
-    SortLinesCaseInsensitive,
-    SortLinesCaseSensitive,
-    SplitSelectionIntoLines,
-    Tab,
-    TabPrev,
-    ToggleInlayHints,
-    ToggleSoftWrap,
-    Transpose,
-    Undo,
-    UndoSelection,
-    UnfoldLines,
+    editor,
+    [
+        AddSelectionAbove,
+        AddSelectionBelow,
+        Backspace,
+        Cancel,
+        ConfirmRename,
+        ContextMenuFirst,
+        ContextMenuLast,
+        ContextMenuNext,
+        ContextMenuPrev,
+        ConvertToKebabCase,
+        ConvertToLowerCamelCase,
+        ConvertToLowerCase,
+        ConvertToSnakeCase,
+        ConvertToTitleCase,
+        ConvertToUpperCamelCase,
+        ConvertToUpperCase,
+        Copy,
+        CopyHighlightJson,
+        CopyPath,
+        CopyRelativePath,
+        Cut,
+        CutToEndOfLine,
+        Delete,
+        DeleteLine,
+        DeleteToBeginningOfLine,
+        DeleteToEndOfLine,
+        DeleteToNextSubwordEnd,
+        DeleteToNextWordEnd,
+        DeleteToPreviousSubwordStart,
+        DeleteToPreviousWordStart,
+        DuplicateLine,
+        FindAllReferences,
+        Fold,
+        FoldSelectedRanges,
+        Format,
+        GoToDefinition,
+        GoToDefinitionSplit,
+        GoToDiagnostic,
+        GoToHunk,
+        GoToPrevDiagnostic,
+        GoToPrevHunk,
+        GoToTypeDefinition,
+        GoToTypeDefinitionSplit,
+        HalfPageDown,
+        HalfPageUp,
+        Hover,
+        Indent,
+        JoinLines,
+        LineDown,
+        LineUp,
+        MoveDown,
+        MoveLeft,
+        MoveLineDown,
+        MoveLineUp,
+        MoveRight,
+        MoveToBeginning,
+        MoveToBeginningOfLine,
+        MoveToEnclosingBracket,
+        MoveToEnd,
+        MoveToEndOfLine,
+        MoveToEndOfParagraph,
+        MoveToNextSubwordEnd,
+        MoveToNextWordEnd,
+        MoveToPreviousSubwordStart,
+        MoveToPreviousWordStart,
+        MoveToStartOfParagraph,
+        MoveUp,
+        Newline,
+        NewlineAbove,
+        NewlineBelow,
+        NextScreen,
+        OpenExcerpts,
+        Outdent,
+        PageDown,
+        PageUp,
+        Paste,
+        Redo,
+        RedoSelection,
+        Rename,
+        RestartLanguageServer,
+        RevealInFinder,
+        ReverseLines,
+        ScrollCursorBottom,
+        ScrollCursorCenter,
+        ScrollCursorTop,
+        SelectAll,
+        SelectDown,
+        SelectLargerSyntaxNode,
+        SelectLeft,
+        SelectLine,
+        SelectRight,
+        SelectSmallerSyntaxNode,
+        SelectToBeginning,
+        SelectToEnd,
+        SelectToEndOfParagraph,
+        SelectToNextSubwordEnd,
+        SelectToNextWordEnd,
+        SelectToPreviousSubwordStart,
+        SelectToPreviousWordStart,
+        SelectToStartOfParagraph,
+        SelectUp,
+        ShowCharacterPalette,
+        ShowCompletions,
+        ShuffleLines,
+        SortLinesCaseInsensitive,
+        SortLinesCaseSensitive,
+        SplitSelectionIntoLines,
+        Tab,
+        TabPrev,
+        ToggleInlayHints,
+        ToggleSoftWrap,
+        Transpose,
+        Undo,
+        UndoSelection,
+        UnfoldLines,
+    ]
 );

 enum DocumentHighlightRead {}
@@ -750,44 +750,47 @@ impl EditorElement {
            }
        }

-        for (ix, fold_indicator) in layout.fold_indicators.drain(..).enumerate() {
-            if let Some(mut fold_indicator) = fold_indicator {
-                let mut fold_indicator = fold_indicator.into_any_element();
+        cx.with_z_index(1, |cx| {
+            for (ix, fold_indicator) in layout.fold_indicators.drain(..).enumerate() {
+                if let Some(mut fold_indicator) = fold_indicator {
+                    let mut fold_indicator = fold_indicator.into_any_element();
+                    let available_space = size(
+                        AvailableSpace::MinContent,
+                        AvailableSpace::Definite(line_height * 0.55),
+                    );
+                    let fold_indicator_size = fold_indicator.measure(available_space, cx);
+
+                    let position = point(
+                        bounds.size.width - layout.gutter_padding,
+                        ix as f32 * line_height - (scroll_top % line_height),
+                    );
+                    let centering_offset = point(
+                        (layout.gutter_padding + layout.gutter_margin - fold_indicator_size.width)
+                            / 2.,
+                        (line_height - fold_indicator_size.height) / 2.,
+                    );
+                    let origin = bounds.origin + position + centering_offset;
+                    fold_indicator.draw(origin, available_space, cx);
+                }
+            }
+
+            if let Some(indicator) = layout.code_actions_indicator.take() {
+                let mut button = indicator.button.into_any_element();
                let available_space = size(
                    AvailableSpace::MinContent,
-                    AvailableSpace::Definite(line_height * 0.55),
+                    AvailableSpace::Definite(line_height),
                );
-                let fold_indicator_size = fold_indicator.measure(available_space, cx);
+                let indicator_size = button.measure(available_space, cx);

-                let position = point(
-                    bounds.size.width - layout.gutter_padding,
-                    ix as f32 * line_height - (scroll_top % line_height),
-                );
-                let centering_offset = point(
-                    (layout.gutter_padding + layout.gutter_margin - fold_indicator_size.width) / 2.,
-                    (line_height - fold_indicator_size.height) / 2.,
-                );
-                let origin = bounds.origin + position + centering_offset;
-                fold_indicator.draw(origin, available_space, cx);
+                let mut x = Pixels::ZERO;
+                let mut y = indicator.row as f32 * line_height - scroll_top;
+                // Center indicator.
+                x += ((layout.gutter_padding + layout.gutter_margin) - indicator_size.width) / 2.;
+                y += (line_height - indicator_size.height) / 2.;
+
+                button.draw(bounds.origin + point(x, y), available_space, cx);
            }
-        }
-
-        if let Some(indicator) = layout.code_actions_indicator.take() {
-            let mut button = indicator.button.into_any_element();
-            let available_space = size(
-                AvailableSpace::MinContent,
-                AvailableSpace::Definite(line_height),
-            );
-            let indicator_size = button.measure(available_space, cx);
-
-            let mut x = Pixels::ZERO;
-            let mut y = indicator.row as f32 * line_height - scroll_top;
-            // Center indicator.
-            x += ((layout.gutter_padding + layout.gutter_margin) - indicator_size.width) / 2.;
-            y += (line_height - indicator_size.height) / 2.;
-
-            button.draw(bounds.origin + point(x, y), available_space, cx);
-        }
+        });
    }

    fn paint_diff_hunks(bounds: Bounds<Pixels>, layout: &LayoutState, cx: &mut WindowContext) {
@@ -825,8 +828,8 @@ impl EditorElement {
            };

            let color = match status {
-                DiffHunkStatus::Added => gpui::green(), // todo!("use the appropriate color")
-                DiffHunkStatus::Modified => gpui::yellow(), // todo!("use the appropriate color")
+                DiffHunkStatus::Added => cx.theme().status().created,
+                DiffHunkStatus::Modified => cx.theme().status().modified,

                //TODO: This rendering is entirely a horrible hack
                DiffHunkStatus::Removed => {
@@ -843,7 +846,7 @@ impl EditorElement {
                    cx.paint_quad(
                        highlight_bounds,
                        Corners::all(1. * line_height),
-                        gpui::red(), // todo!("use the right color")
+                        cx.theme().status().deleted,
                        Edges::default(),
                        transparent_black(),
                    );
@@ -26,7 +26,7 @@ pub const MIN_POPOVER_CHARACTER_WIDTH: f32 = 20.;
 pub const MIN_POPOVER_LINE_HEIGHT: Pixels = px(4.);
 pub const HOVER_POPOVER_GAP: Pixels = px(10.);

-actions!(Hover);
+actions!(editor, [Hover]);

 /// Bindable action which uses the most recent selection head to trigger a hover
 pub fn hover(editor: &mut Editor, _: &Hover, cx: &mut ViewContext<Editor>) {