Style wrap guides (#3693)

[[PR Description]] This PR styles wrap guides. Wrap guides weren't being added to the theme in the theme importer, and they were also missing from One Dark. One Dark: ![CleanShot 2023-12-18 at 11 16 48@2x](https://github.com/zed-industries/zed/assets/1714999/5578127f-8d69-4f47-af60-c44de87331e0) Gruvbox: ![CleanShot 2023-12-18 at 11 17 38@2x](https://github.com/zed-industries/zed/assets/1714999/a2ac5db9-e5bf-4452-9f9d-49f074231587) Bad border (known importer issue): ![CleanShot 2023-12-18 at 11 17 49@2x](https://github.com/zed-industries/zed/assets/1714999/37d11e37-38b6-4001-aef0-19fc2d925425) No border (known importer issue): ![CleanShot 2023-12-18 at 11 18 14@2x](https://github.com/zed-industries/zed/assets/1714999/3d74bd8c-514e-4e14-94db-425a39d057ab) Release Notes: - N/A
zed-industries · Dec 18, 2023 · 5c7de10 · 5c7de10
2 parents 4707248 + da7628c
commit 5c7de10
Show file tree

Hide file tree

Showing 13 changed files with 75 additions and 2 deletions.
diff --git a/crates/theme2/src/one_themes.rs b/crates/theme2/src/one_themes.rs
@@ -86,8 +86,8 @@ pub(crate) fn one_dark() -> Theme {
                 editor_line_number: hsla(222.0 / 360., 11.5 / 100., 34.1 / 100., 1.0),
                 editor_active_line_number: hsla(216.0 / 360., 5.9 / 100., 49.6 / 100., 1.0),
                 editor_invisible: hsla(222.0 / 360., 11.5 / 100., 34.1 / 100., 1.0),
-                editor_wrap_guide: gpui::black(),
-                editor_active_wrap_guide: gpui::red(),
+                editor_wrap_guide: hsla(228. / 360., 8. / 100., 25. / 100., 1.),
+                editor_active_wrap_guide: hsla(228. / 360., 8. / 100., 25. / 100., 1.),
                 editor_document_highlight_read_background: hsla(
                     207.8 / 360.,
                     81. / 100.,

diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs
@@ -52,6 +52,8 @@ pub fn andromeda() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0x23262eff).into()),
                         editor_line_number: Some(rgba(0x746f77ff).into()),
                         editor_active_line_number: Some(rgba(0xd5ced9ff).into()),
+                        editor_wrap_guide: Some(rgba(0x1b1d23ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0x1b1d23ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xee5d43ff).into()),
                         terminal_ansi_bright_green: Some(rgba(0x96e072ff).into()),
                         terminal_ansi_bright_yellow: Some(rgba(0xffe66dff).into()),
@@ -267,6 +269,8 @@ pub fn andromeda() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0x262a33ff).into()),
                         editor_line_number: Some(rgba(0x746f77ff).into()),
                         editor_active_line_number: Some(rgba(0xd5ced9ff).into()),
+                        editor_wrap_guide: Some(rgba(0x1b1d23ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0x1b1d23ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xee5d43ff).into()),
                         terminal_ansi_bright_green: Some(rgba(0x96e072ff).into()),
                         terminal_ansi_bright_yellow: Some(rgba(0xffe66dff).into()),

diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs
@@ -51,6 +51,8 @@ pub fn ayu() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0xf8f9faff).into()),
                         editor_line_number: Some(rgba(0x8a919966).into()),
                         editor_active_line_number: Some(rgba(0x5c6166ff).into()),
+                        editor_wrap_guide: Some(rgba(0x6b7d8f1f).into()),
+                        editor_active_wrap_guide: Some(rgba(0x6b7d8f1f).into()),
                         terminal_background: Some(rgba(0xf8f9faff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x686868ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xf07171ff).into()),
@@ -358,6 +360,8 @@ pub fn ayu() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0x1f2430ff).into()),
                         editor_line_number: Some(rgba(0x8a919966).into()),
                         editor_active_line_number: Some(rgba(0xcccac2ff).into()),
+                        editor_wrap_guide: Some(rgba(0x171b24ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0x171b24ff).into()),
                         terminal_background: Some(rgba(0x1f2430ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x686868ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xf28779ff).into()),
@@ -665,6 +669,8 @@ pub fn ayu() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0x0b0e14ff).into()),
                         editor_line_number: Some(rgba(0x6c738099).into()),
                         editor_active_line_number: Some(rgba(0xbfbdb6ff).into()),
+                        editor_wrap_guide: Some(rgba(0x1e232bff).into()),
+                        editor_active_wrap_guide: Some(rgba(0x1e232bff).into()),
                         terminal_background: Some(rgba(0x0b0e14ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x686868ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xf07178ff).into()),

diff --git a/crates/theme2/src/themes/dracula.rs b/crates/theme2/src/themes/dracula.rs
@@ -48,6 +48,8 @@ pub fn dracula() -> UserThemeFamily {
                     editor_gutter_background: Some(rgba(0x282a36ff).into()),
                     editor_line_number: Some(rgba(0x6272a4ff).into()),
                     editor_active_line_number: Some(rgba(0xf8f8f2ff).into()),
+                    editor_wrap_guide: Some(rgba(0xbd93f9ff).into()),
+                    editor_active_wrap_guide: Some(rgba(0xbd93f9ff).into()),
                     terminal_background: Some(rgba(0x282a36ff).into()),
                     terminal_ansi_bright_black: Some(rgba(0x6272a4ff).into()),
                     terminal_ansi_bright_red: Some(rgba(0xff6e6eff).into()),

diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs
@@ -51,6 +51,8 @@ pub fn gruvbox() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0x1d2021ff).into()),
                         editor_line_number: Some(rgba(0x665c54ff).into()),
                         editor_active_line_number: Some(rgba(0xebdbb2ff).into()),
+                        editor_wrap_guide: Some(rgba(0x3c3836ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0x3c3836ff).into()),
                         terminal_background: Some(rgba(0x1d2021ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x928374ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xfb4934ff).into()),
@@ -344,6 +346,8 @@ pub fn gruvbox() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0x282828ff).into()),
                         editor_line_number: Some(rgba(0x665c54ff).into()),
                         editor_active_line_number: Some(rgba(0xebdbb2ff).into()),
+                        editor_wrap_guide: Some(rgba(0x3c3836ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0x3c3836ff).into()),
                         terminal_background: Some(rgba(0x282828ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x928374ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xfb4934ff).into()),
@@ -637,6 +641,8 @@ pub fn gruvbox() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0x32302fff).into()),
                         editor_line_number: Some(rgba(0x665c54ff).into()),
                         editor_active_line_number: Some(rgba(0xebdbb2ff).into()),
+                        editor_wrap_guide: Some(rgba(0x3c3836ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0x3c3836ff).into()),
                         terminal_background: Some(rgba(0x32302fff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x928374ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xfb4934ff).into()),
@@ -930,6 +936,8 @@ pub fn gruvbox() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0xf9f5d7ff).into()),
                         editor_line_number: Some(rgba(0xbdae93ff).into()),
                         editor_active_line_number: Some(rgba(0x3c3836ff).into()),
+                        editor_wrap_guide: Some(rgba(0xebdbb2ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0xebdbb2ff).into()),
                         terminal_background: Some(rgba(0xf9f5d7ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x928374ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0x9d0006ff).into()),
@@ -1223,6 +1231,8 @@ pub fn gruvbox() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0xfbf1c7ff).into()),
                         editor_line_number: Some(rgba(0xbdae93ff).into()),
                         editor_active_line_number: Some(rgba(0x3c3836ff).into()),
+                        editor_wrap_guide: Some(rgba(0xebdbb2ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0xebdbb2ff).into()),
                         terminal_background: Some(rgba(0xfbf1c7ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x928374ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0x9d0006ff).into()),
@@ -1516,6 +1526,8 @@ pub fn gruvbox() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0xf2e5bcff).into()),
                         editor_line_number: Some(rgba(0xbdae93ff).into()),
                         editor_active_line_number: Some(rgba(0x3c3836ff).into()),
+                        editor_wrap_guide: Some(rgba(0xebdbb2ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0xebdbb2ff).into()),
                         terminal_background: Some(rgba(0xf2e5bcff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x928374ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0x9d0006ff).into()),

diff --git a/crates/theme2/src/themes/night_owl.rs b/crates/theme2/src/themes/night_owl.rs
@@ -51,6 +51,8 @@ pub fn night_owl() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0x011627ff).into()),
                         editor_line_number: Some(rgba(0x4b6479ff).into()),
                         editor_active_line_number: Some(rgba(0xd6deebff).into()),
+                        editor_wrap_guide: Some(rgba(0x5f7e97ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0x5f7e97ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x575656ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xef5350ff).into()),
                         terminal_ansi_bright_green: Some(rgba(0x22da6eff).into()),
@@ -311,6 +313,8 @@ pub fn night_owl() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0xfbfbfbff).into()),
                         editor_line_number: Some(rgba(0x90a7b2ff).into()),
                         editor_active_line_number: Some(rgba(0x403f53ff).into()),
+                        editor_wrap_guide: Some(rgba(0xd9d9d9ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0xd9d9d9ff).into()),
                         terminal_background: Some(rgba(0xf6f6f6ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x403f53ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xde3d3bff).into()),

diff --git a/crates/theme2/src/themes/noctis.rs b/crates/theme2/src/themes/noctis.rs
@@ -52,6 +52,8 @@ pub fn noctis() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0x07273bff).into()),
                         editor_line_number: Some(rgba(0x4d6c80ff).into()),
                         editor_active_line_number: Some(rgba(0xbecfdaff).into()),
+                        editor_wrap_guide: Some(rgba(0x1679b6ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0x1679b6ff).into()),
                         terminal_background: Some(rgba(0x051b29ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x475e6cff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
@@ -330,6 +332,8 @@ pub fn noctis() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0x322a2dff).into()),
                         editor_line_number: Some(rgba(0x715b63ff).into()),
                         editor_active_line_number: Some(rgba(0xcbbec2ff).into()),
+                        editor_wrap_guide: Some(rgba(0x997582ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0x997582ff).into()),
                         terminal_background: Some(rgba(0x272022ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x69545bff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
@@ -608,6 +612,8 @@ pub fn noctis() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0xf4f6f6ff).into()),
                         editor_line_number: Some(rgba(0xa0abacff).into()),
                         editor_active_line_number: Some(rgba(0x005661ff).into()),
+                        editor_wrap_guide: Some(rgba(0x00c6e0ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0x00c6e0ff).into()),
                         terminal_background: Some(rgba(0xe1eeefff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x004d57ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xff4000ff).into()),
@@ -886,6 +892,8 @@ pub fn noctis() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0xf2f1f8ff).into()),
                         editor_line_number: Some(rgba(0x9d9ab1ff).into()),
                         editor_active_line_number: Some(rgba(0x0c006bff).into()),
+                        editor_wrap_guide: Some(rgba(0xaea4f4ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0xaea4f4ff).into()),
                         terminal_background: Some(rgba(0xe9e7f3ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x0f0080ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xff4000ff).into()),
@@ -1164,6 +1172,8 @@ pub fn noctis() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0xfef8ecff).into()),
                         editor_line_number: Some(rgba(0xa0abacff).into()),
                         editor_active_line_number: Some(rgba(0x005661ff).into()),
+                        editor_wrap_guide: Some(rgba(0x00c6e0ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0x00c6e0ff).into()),
                         terminal_background: Some(rgba(0xf6eddaff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x004d57ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xff4000ff).into()),
@@ -1442,6 +1452,8 @@ pub fn noctis() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0x1b2932ff).into()),
                         editor_line_number: Some(rgba(0x5d6e79ff).into()),
                         editor_active_line_number: Some(rgba(0xc5cdd3ff).into()),
+                        editor_wrap_guide: Some(rgba(0x496d83ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0x496d83ff).into()),
                         terminal_background: Some(rgba(0x0e1920ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x425866ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xca8468ff).into()),
@@ -1720,6 +1732,8 @@ pub fn noctis() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0x052529ff).into()),
                         editor_line_number: Some(rgba(0x4e6b6eff).into()),
                         editor_active_line_number: Some(rgba(0xb2cacdff).into()),
+                        editor_wrap_guide: Some(rgba(0x0e6671ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0x0e6671ff).into()),
                         terminal_background: Some(rgba(0x03191bff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x47686cff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
@@ -1998,6 +2012,8 @@ pub fn noctis() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0x031417ff).into()),
                         editor_line_number: Some(rgba(0x4e6b6eff).into()),
                         editor_active_line_number: Some(rgba(0xb2cacdff).into()),
+                        editor_wrap_guide: Some(rgba(0x0e6671ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0x0e6671ff).into()),
                         terminal_background: Some(rgba(0x020c0eff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x47686cff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
@@ -2276,6 +2292,8 @@ pub fn noctis() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0x031417ff).into()),
                         editor_line_number: Some(rgba(0x4e6b6eff).into()),
                         editor_active_line_number: Some(rgba(0xb2cacdff).into()),
+                        editor_wrap_guide: Some(rgba(0x0e6671ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0x0e6671ff).into()),
                         terminal_background: Some(rgba(0x020c0eff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x47686cff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
@@ -2554,6 +2572,8 @@ pub fn noctis() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0x292640ff).into()),
                         editor_line_number: Some(rgba(0x5c5973ff).into()),
                         editor_active_line_number: Some(rgba(0xc5c2d6ff).into()),
+                        editor_wrap_guide: Some(rgba(0x6e67a8ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0x6e67a8ff).into()),
                         terminal_background: Some(rgba(0x1f1d30ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x504e65ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
@@ -2832,6 +2852,8 @@ pub fn noctis() -> UserThemeFamily {
                         editor_gutter_background: Some(rgba(0x30243dff).into()),
                         editor_line_number: Some(rgba(0x665973ff).into()),
                         editor_active_line_number: Some(rgba(0xccbfd9ff).into()),
+                        editor_wrap_guide: Some(rgba(0x8767a8ff).into()),
+                        editor_active_wrap_guide: Some(rgba(0x8767a8ff).into()),
                         terminal_background: Some(rgba(0x291d35ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x594e65ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),

diff --git a/crates/theme2/src/themes/nord.rs b/crates/theme2/src/themes/nord.rs
@@ -51,6 +51,8 @@ pub fn nord() -> UserThemeFamily {
                     editor_gutter_background: Some(rgba(0x2e3440ff).into()),
                     editor_line_number: Some(rgba(0x4c566aff).into()),
                     editor_active_line_number: Some(rgba(0xd8dee9ff).into()),
+                    editor_wrap_guide: Some(rgba(0x3b4252ff).into()),
+                    editor_active_wrap_guide: Some(rgba(0x3b4252ff).into()),
                     terminal_background: Some(rgba(0x2e3440ff).into()),
                     terminal_ansi_bright_black: Some(rgba(0x4c566aff).into()),
                     terminal_ansi_bright_red: Some(rgba(0xbf616aff).into()),