Merge pull request #1589 from zed-industries/add-code-action-size

Mikayla Maki created 3 years ago

Add code action size

Change summary

crates/editor/src/editor.rs    | 2 +-
crates/editor/src/element.rs   | 5 ++++-
crates/theme/src/theme.rs      | 9 ++++++++-
styles/package-lock.json       | 1 -
styles/src/styleTree/editor.ts | 5 ++++-
5 files changed, 17 insertions(+), 5 deletions(-)

Detailed changes

crates/editor/src/editor.rs

@@ -2737,7 +2737,7 @@ impl Editor {
             Some(
                 MouseEventHandler::new::<Tag, _, _>(0, cx, |_, _| {
                     Svg::new("icons/bolt_8.svg")
-                        .with_color(style.code_actions_indicator)
+                        .with_color(style.code_actions.indicator)
                         .boxed()
                 })
                 .with_cursor_style(CursorStyle::PointingHand)

crates/editor/src/element.rs

@@ -1453,7 +1453,10 @@ impl Element for EditorElement {
 
         if let Some((_, indicator)) = code_actions_indicator.as_mut() {
             indicator.layout(
-                SizeConstraint::strict_along(Axis::Vertical, line_height * 0.618),
+                SizeConstraint::strict_along(
+                    Axis::Vertical,
+                    line_height * style.code_actions.vertical_scale,
+                ),
                 cx,
             );
         }

crates/theme/src/theme.rs

@@ -480,7 +480,7 @@ pub struct Editor {
     pub hint_diagnostic: DiagnosticStyle,
     pub invalid_hint_diagnostic: DiagnosticStyle,
     pub autocomplete: AutocompleteStyle,
-    pub code_actions_indicator: Color,
+    pub code_actions: CodeActions,
     pub unnecessary_code_fade: f32,
     pub hover_popover: HoverPopover,
     pub link_definition: HighlightStyle,
@@ -541,6 +541,13 @@ pub struct FieldEditor {
     pub selection: SelectionStyle,
 }
 
+#[derive(Clone, Deserialize, Default)]
+pub struct CodeActions {
+    #[serde(default)]
+    pub indicator: Color,
+    pub vertical_scale: f32,
+}
+
 #[derive(Debug, Default, Clone, Copy)]
 pub struct Interactive<T> {
     pub default: T,

styles/package-lock.json

@@ -5,7 +5,6 @@
   "requires": true,
   "packages": {
     "": {
-      "name": "styles",
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {

styles/src/styleTree/editor.ts

@@ -55,7 +55,10 @@ export default function editor(theme: Theme) {
     textColor: theme.syntax.primary.color,
     background: backgroundColor(theme, 500),
     activeLineBackground: theme.editor.line.active,
-    codeActionsIndicator: iconColor(theme, "secondary"),
+    codeActions: {
+      indicator: iconColor(theme, "secondary"),
+      verticalScale: 0.618
+    },
     diffBackgroundDeleted: backgroundColor(theme, "error"),
     diffBackgroundInserted: backgroundColor(theme, "ok"),
     documentHighlightReadBackground: theme.editor.highlight.occurrence,