Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Default rulers color to red #2669

Merged
merged 6 commits into from
Jun 21, 2022
Merged

Default rulers color to red #2669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0e61a52
Default rulers color to red
Mathspy Jun 3, 2022
4c90aa1
Use builtin Style methods instead of Bevy style defaults
Mathspy Jun 4, 2022
a8ed63e
Only default the style if there's no ui or ui.virtual
Mathspy Jun 4, 2022
c9166b9
Update themes style from ui.virtual to ui.virtual.whitespace
Mathspy Jun 4, 2022
dac30dd
Revert ui.virtual change in onelight theme
Mathspy Jun 4, 2022
0b45660
Prefer unwrap_or_else
Mathspy Jun 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions helix-term/src/ui/editor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use helix_core::{
use helix_view::{
document::{Mode, SCRATCH_BUFFER_NAME},
editor::{CompleteAction, CursorShapeConfig},
graphics::{CursorKind, Modifier, Rect, Style},
graphics::{Color, CursorKind, Modifier, Rect, Style},
input::KeyEvent,
keyboard::{KeyCode, KeyModifiers},
Document, Editor, Theme, View,
Expand Down Expand Up @@ -170,7 +170,9 @@ impl EditorView {
theme: &Theme,
) {
let editor_rulers = &editor.config().rulers;
let ruler_theme = theme.get("ui.virtual.ruler");
let ruler_theme = theme
.try_get("ui.virtual.ruler")
.unwrap_or_else(|| Style::default().bg(Color::Red));

let rulers = doc
.language_config()
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/base16_default_dark.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Author: RayGervais <[email protected]>

"ui.background" = { bg = "base00" }
"ui.virtual" = "base03"
"ui.virtual.whitespace" = "base03"
"ui.menu" = { fg = "base05", bg = "base01" }
"ui.menu.selected" = { fg = "base01", bg = "base04" }
"ui.linenr" = { fg = "base03", bg = "base01" }
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/base16_default_light.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"ui.statusline" = { fg = "base04", bg = "base01" }
"ui.cursor" = { fg = "base04", modifiers = ["reversed"] }
"ui.cursor.primary" = { fg = "base05", modifiers = ["reversed"] }
"ui.virtual" = "base03"
"ui.virtual.whitespace" = "base03"
"ui.text" = "base05"
"operator" = "base05"
"ui.text.focus" = "base05"
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/base16_terminal.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ui.help" = { fg = "white", bg = "black" }
"ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
"ui.cursor.primary" = { fg = "light-gray", modifiers = ["reversed"] }
"ui.virtual" = "light-gray"
"ui.virtual.whitespace" = "light-gray"
"variable" = "light-red"
"constant.numeric" = "yellow"
"constant" = "yellow"
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/bogster.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

"ui.text" = { fg = "#e5ded6" }
"ui.text.focus" = { fg = "#e5ded6", modifiers= ["bold"] }
"ui.virtual" = "#627d9d"
"ui.virtual.whitespace" = "#627d9d"

"ui.selection" = { bg = "#313f4e" }
# "ui.cursor.match" # TODO might want to override this because dimmed is not widely supported
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/boo_berry.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"ui.menu" = { fg = "lilac", bg = "berry_saturated" }
"ui.menu.selected" = { fg = "mint", bg = "berry_saturated" }
"ui.selection" = { bg = "berry_saturated" }
"ui.virtual" = { fg = "berry_desaturated" }
"ui.virtual.whitespace" = { fg = "berry_desaturated" }

"diff.plus" = { fg = "mint" }
"diff.delta" = { fg = "gold" }
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/catppuccin.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ label = "peach"

"ui.text" = { fg = "pink" }
"ui.text.focus" = { fg = "white" }
"ui.virtual" = { fg = "gray_0" }
"ui.virtual.whitespace" = { fg = "gray_0" }

"ui.selection" = { bg = "#540099" }
"ui.selection.primary" = { bg = "#540099" }
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/dark_plus.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"ui.text" = { fg = "text" }
"ui.text.focus" = { fg = "white" }

"ui.virtual" = { fg = "dark_gray" }
"ui.virtual.whitespace" = { fg = "dark_gray" }
"ui.virtual.ruler" = { bg = "borders" }

"warning" = { fg = "gold2" }
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/dracula.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"ui.text" = { fg = "foreground" }
"ui.text.focus" = { fg = "cyan" }
"ui.window" = { fg = "foreground" }
"ui.virtual" = { fg = "comment" }
"ui.virtual.whitespace" = { fg = "comment" }

"error" = { fg = "red" }
"warning" = { fg = "cyan" }
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/everforest_dark.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"ui.menu" = { fg = "fg", bg = "bg2" }
"ui.menu.selected" = { fg = "bg0", bg = "green" }
"ui.selection" = { bg = "bg3" }
"ui.virtual" = "grey0"
"ui.virtual.whitespace" = "grey0"

"hint" = "blue"
"info" = "aqua"
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/everforest_light.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"ui.menu" = { fg = "fg", bg = "bg2" }
"ui.menu.selected" = { fg = "bg0", bg = "green" }
"ui.selection" = { bg = "bg3" }
"ui.virtual" = "grey0"
"ui.virtual.whitespace" = "grey0"

"hint" = "blue"
"info" = "aqua"
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/gruvbox.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"ui.cursor.match" = { bg = "bg2" }
"ui.menu" = { fg = "fg1", bg = "bg2" }
"ui.menu.selected" = { fg = "bg2", bg = "blue1", modifiers = ["bold"] }
"ui.virtual" = "bg2"
"ui.virtual.whitespace" = "bg2"

"diagnostic" = { modifiers = ["underlined"] }

Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/gruvbox_light.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"ui.cursor.match" = { bg = "bg2" }
"ui.menu" = { fg = "fg1", bg = "bg2" }
"ui.menu.selected" = { fg = "bg2", bg = "blue1", modifiers = ["bold"] }
"ui.virtual" = "bg2"
"ui.virtual.whitespace" = "bg2"

"diagnostic" = { modifiers = ["underlined"] }

Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/ingrid.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

"ui.text" = { fg = "#7B91B3" }
"ui.text.focus" = { fg = "#250E07", modifiers= ["bold"] }
"ui.virtual" = "#A6B6CE"
"ui.virtual.whitespace" = "#A6B6CE"

"ui.selection" = { bg = "#540099" }
# "ui.cursor.match" # TODO might want to override this because dimmed is not widely supported
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/monokai.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"attribute" = { fg = "fn_declaration" }

"comment" = { fg = "#88846F" }
"ui.virtual" = "#88846F"
"ui.virtual.whitespace" = "#88846F"

"string" = { fg = "#e6db74" }
"constant.character" = { fg = "#e6db74" }
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/monokai_pro.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
"ui.menu" = { fg = "base8", bg = "base3" }
"ui.menu.selected" = { fg = "base2", bg = "yellow" }
"ui.virtual" = "base5"
"ui.virtual.whitespace" = "base5"

"info" = "base8"
"hint" = "base8"
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/monokai_pro_machine.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
"ui.menu" = { fg = "base8", bg = "base3" }
"ui.menu.selected" = { fg = "base2", bg = "yellow" }
"ui.virtual" = "base5"
"ui.virtual.whitespace" = "base5"

"info" = "base8"
"hint" = "base8"
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/monokai_pro_octagon.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
"ui.menu" = { fg = "base8", bg = "base3" }
"ui.menu.selected" = { fg = "base2", bg = "yellow" }
"ui.virtual" = "base5"
"ui.virtual.whitespace" = "base5"

"info" = "base8"
"hint" = "base8"
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/monokai_pro_ristretto.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
"ui.menu" = { fg = "base8", bg = "base3" }
"ui.menu.selected" = { fg = "base2", bg = "yellow" }
"ui.virtual" = "base5"
"ui.virtual.whitespace" = "base5"

"info" = "base8"
"hint" = "base8"
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/monokai_pro_spectrum.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
"ui.menu" = { fg = "base8", bg = "base3" }
"ui.menu.selected" = { fg = "base2", bg = "yellow" }
"ui.virtual" = "base5"
"ui.virtual.whitespace" = "base5"

"info" = "base8"
"hint" = "base8"
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/nord.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ui.text.focus" = { fg = "nord8", modifiers= ["bold"] }
"ui.menu" = { fg = "nord6", bg = "#232d38" }
"ui.menu.selected" = { fg = "nord8", bg = "nord2" }
"ui.virtual" = "gray"
"ui.virtual.whitespace" = "gray"

"info" = "nord8"
"hint" = "nord8"
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/rose_pine.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"ui.text" = { fg = "text" }
"ui.text.focus" = { fg = "foam", modifiers = ["bold"]}
"ui.text.info" = {fg = "pine", modifiers = ["bold"]}
"ui.virtual" = "highlight"
"ui.virtual.whitespace" = "highlight"
"operator" = "rose"
"variable" = "text"
"constant.numeric" = "iris"
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/rose_pine_dawn.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"ui.text" = { fg = "text" }
"ui.text.focus" = { fg = "foam", modifiers = ["bold"]}
"ui.text.info" = {fg = "pine", modifiers = ["bold"]}
"ui.virtual" = "highlight"
"ui.virtual.whitespace" = "highlight"
"operator" = "rose"
"variable" = "text"
"number" = "iris"
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/serika-dark.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"ui.menu" = { fg = "fg", bg = "bg2" }
"ui.menu.selected" = { fg = "bg0", bg = "bg_yellow" }
"ui.selection" = { bg = "bg3" }
"ui.virtual" = "grey2"
"ui.virtual.whitespace" = "grey2"

"hint" = "blue"
"info" = "aqua"
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/serika-light.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"ui.menu" = { fg = "bg0", bg = "bg3" }
"ui.menu.selected" = { fg = "bg0", bg = "bg_yellow" }
"ui.selection" = { fg = "bg0", bg = "bg3" }
"ui.virtual" = { fg = "bg2" }
"ui.virtual.whitespace" = { fg = "bg2" }

"hint" = "blue"
"info" = "aqua"
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/snazzy.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"ui.text" = { fg = "foreground" }
"ui.text.focus" = { fg = "cyan" }
"ui.window" = { fg = "foreground" }
"ui.virtual" = { fg = "comment" }
"ui.virtual.whitespace" = { fg = "comment" }

"error" = { fg = "red" }
"warning" = { fg = "cyan" }
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/solarized_dark.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
# 背景
"ui.background" = { bg = "base03" }

"ui.virtual" = { fg = "base01" }
"ui.virtual.whitespace" = { fg = "base01" }

# 行号栏
"ui.linenr" = { fg = "base0", bg = "base02" }
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/solarized_light.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
# background
"ui.background" = { bg = "base03" }

"ui.virtual" = { fg = "base01" }
"ui.virtual.whitespace" = { fg = "base01" }

# 行号栏
# line number column
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/spacebones_light.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"ui.cursor.match" = { bg = "bg3" }
"ui.menu" = { fg = "fg1", bg = "bg2" }
"ui.menu.selected" = { fg = "#655370", bg = "#d1dcdf", modifiers = ["bold"] }
"ui.virtual" = "bg2"
"ui.virtual.whitespace" = "bg2"

"diagnostic" = { modifiers = ["underlined"] }

Expand Down