git.iko.soy/helix
on master help sign in
Default rulers color to red (#2669)
fa4934cMathspy
helix-term/src/ui/editor.rs+4−2
compare with master
unifiedsplit
@@ -20,7 +20,7 @@ use helix_core::{
20use helix_view::{
20use helix_view::{
21 document::{Mode, SCRATCH_BUFFER_NAME},
21 document::{Mode, SCRATCH_BUFFER_NAME},
22 editor::{CompleteAction, CursorShapeConfig},
22 editor::{CompleteAction, CursorShapeConfig},
23− graphics::{CursorKind, Modifier, Rect, Style},
23+ graphics::{Color, CursorKind, Modifier, Rect, Style},
24 input::KeyEvent,
24 input::KeyEvent,
25 keyboard::{KeyCode, KeyModifiers},
25 keyboard::{KeyCode, KeyModifiers},
26 Document, Editor, Theme, View,
26 Document, Editor, Theme, View,
@@ -170,7 +170,9 @@ impl EditorView {
170 theme: &Theme,
170 theme: &Theme,
171 ) {
171 ) {
172 let editor_rulers = &editor.config().rulers;
172 let editor_rulers = &editor.config().rulers;
173− let ruler_theme = theme.get("ui.virtual.ruler");
173+ let ruler_theme = theme
174+ .try_get("ui.virtual.ruler")
175+ .unwrap_or_else(|| Style::default().bg(Color::Red));
174
176
175 let rulers = doc
177 let rulers = doc
176 .language_config()
178 .language_config()
runtime/themes/base16_default_dark.toml+1−1
@@ -1,7 +1,7 @@
1# Author: RayGervais <raygervais@hotmail.ca>
1# Author: RayGervais <raygervais@hotmail.ca>
2
2
3"ui.background" = { bg = "base00" }
3"ui.background" = { bg = "base00" }
4−"ui.virtual" = "base03"
4+"ui.virtual.whitespace" = "base03"
5"ui.menu" = { fg = "base05", bg = "base01" }
5"ui.menu" = { fg = "base05", bg = "base01" }
6"ui.menu.selected" = { fg = "base01", bg = "base04" }
6"ui.menu.selected" = { fg = "base01", bg = "base04" }
7"ui.linenr" = { fg = "base03", bg = "base01" }
7"ui.linenr" = { fg = "base03", bg = "base01" }
runtime/themes/base16_default_light.toml+1−1
@@ -12,7 +12,7 @@
12"ui.statusline" = { fg = "base04", bg = "base01" }
12"ui.statusline" = { fg = "base04", bg = "base01" }
13"ui.cursor" = { fg = "base04", modifiers = ["reversed"] }
13"ui.cursor" = { fg = "base04", modifiers = ["reversed"] }
14"ui.cursor.primary" = { fg = "base05", modifiers = ["reversed"] }
14"ui.cursor.primary" = { fg = "base05", modifiers = ["reversed"] }
15−"ui.virtual" = "base03"
15+"ui.virtual.whitespace" = "base03"
16"ui.text" = "base05"
16"ui.text" = "base05"
17"operator" = "base05"
17"operator" = "base05"
18"ui.text.focus" = "base05"
18"ui.text.focus" = "base05"
runtime/themes/base16_terminal.toml+1−1
@@ -13,7 +13,7 @@
13"ui.help" = { fg = "white", bg = "black" }
13"ui.help" = { fg = "white", bg = "black" }
14"ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
14"ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
15"ui.cursor.primary" = { fg = "light-gray", modifiers = ["reversed"] }
15"ui.cursor.primary" = { fg = "light-gray", modifiers = ["reversed"] }
16−"ui.virtual" = "light-gray"
16+"ui.virtual.whitespace" = "light-gray"
17"variable" = "light-red"
17"variable" = "light-red"
18"constant.numeric" = "yellow"
18"constant.numeric" = "yellow"
19"constant" = "yellow"
19"constant" = "yellow"
runtime/themes/bogster.toml+1−1
@@ -53,7 +53,7 @@
53
53
54"ui.text" = { fg = "#e5ded6" }
54"ui.text" = { fg = "#e5ded6" }
55"ui.text.focus" = { fg = "#e5ded6", modifiers= ["bold"] }
55"ui.text.focus" = { fg = "#e5ded6", modifiers= ["bold"] }
56−"ui.virtual" = "#627d9d"
56+"ui.virtual.whitespace" = "#627d9d"
57
57
58"ui.selection" = { bg = "#313f4e" }
58"ui.selection" = { bg = "#313f4e" }
59# "ui.cursor.match" # TODO might want to override this because dimmed is not widely supported
59# "ui.cursor.match" # TODO might want to override this because dimmed is not widely supported
runtime/themes/boo_berry.toml+1−1
@@ -44,7 +44,7 @@
44"ui.menu" = { fg = "lilac", bg = "berry_saturated" }
44"ui.menu" = { fg = "lilac", bg = "berry_saturated" }
45"ui.menu.selected" = { fg = "mint", bg = "berry_saturated" }
45"ui.menu.selected" = { fg = "mint", bg = "berry_saturated" }
46"ui.selection" = { bg = "berry_saturated" }
46"ui.selection" = { bg = "berry_saturated" }
47−"ui.virtual" = { fg = "berry_desaturated" }
47+"ui.virtual.whitespace" = { fg = "berry_desaturated" }
48
48
49"diff.plus" = { fg = "mint" }
49"diff.plus" = { fg = "mint" }
50"diff.delta" = { fg = "gold" }
50"diff.delta" = { fg = "gold" }
runtime/themes/catppuccin.toml+1−1
@@ -48,7 +48,7 @@ label = "peach"
48
48
49"ui.text" = { fg = "pink" }
49"ui.text" = { fg = "pink" }
50"ui.text.focus" = { fg = "white" }
50"ui.text.focus" = { fg = "white" }
51−"ui.virtual" = { fg = "gray_0" }
51+"ui.virtual.whitespace" = { fg = "gray_0" }
52
52
53"ui.selection" = { bg = "#540099" }
53"ui.selection" = { bg = "#540099" }
54"ui.selection.primary" = { bg = "#540099" }
54"ui.selection.primary" = { bg = "#540099" }
runtime/themes/dark_plus.toml+1−1
@@ -78,7 +78,7 @@
78"ui.text" = { fg = "text" }
78"ui.text" = { fg = "text" }
79"ui.text.focus" = { fg = "white" }
79"ui.text.focus" = { fg = "white" }
80
80
81−"ui.virtual" = { fg = "dark_gray" }
81+"ui.virtual.whitespace" = { fg = "dark_gray" }
82"ui.virtual.ruler" = { bg = "borders" }
82"ui.virtual.ruler" = { bg = "borders" }
83
83
84"warning" = { fg = "gold2" }
84"warning" = { fg = "gold2" }
runtime/themes/dracula.toml+1−1
@@ -36,7 +36,7 @@
36"ui.text" = { fg = "foreground" }
36"ui.text" = { fg = "foreground" }
37"ui.text.focus" = { fg = "cyan" }
37"ui.text.focus" = { fg = "cyan" }
38"ui.window" = { fg = "foreground" }
38"ui.window" = { fg = "foreground" }
39−"ui.virtual" = { fg = "comment" }
39+"ui.virtual.whitespace" = { fg = "comment" }
40
40
41"error" = { fg = "red" }
41"error" = { fg = "red" }
42"warning" = { fg = "cyan" }
42"warning" = { fg = "cyan" }
runtime/themes/everforest_dark.toml+1−1
@@ -70,7 +70,7 @@
70"ui.menu" = { fg = "fg", bg = "bg2" }
70"ui.menu" = { fg = "fg", bg = "bg2" }
71"ui.menu.selected" = { fg = "bg0", bg = "green" }
71"ui.menu.selected" = { fg = "bg0", bg = "green" }
72"ui.selection" = { bg = "bg3" }
72"ui.selection" = { bg = "bg3" }
73−"ui.virtual" = "grey0"
73+"ui.virtual.whitespace" = "grey0"
74
74
75"hint" = "blue"
75"hint" = "blue"
76"info" = "aqua"
76"info" = "aqua"
runtime/themes/everforest_light.toml+1−1
@@ -70,7 +70,7 @@
70"ui.menu" = { fg = "fg", bg = "bg2" }
70"ui.menu" = { fg = "fg", bg = "bg2" }
71"ui.menu.selected" = { fg = "bg0", bg = "green" }
71"ui.menu.selected" = { fg = "bg0", bg = "green" }
72"ui.selection" = { bg = "bg3" }
72"ui.selection" = { bg = "bg3" }
73−"ui.virtual" = "grey0"
73+"ui.virtual.whitespace" = "grey0"
74
74
75"hint" = "blue"
75"hint" = "blue"
76"info" = "aqua"
76"info" = "aqua"
runtime/themes/gruvbox.toml+1−1
@@ -53,7 +53,7 @@
53"ui.cursor.match" = { bg = "bg2" }
53"ui.cursor.match" = { bg = "bg2" }
54"ui.menu" = { fg = "fg1", bg = "bg2" }
54"ui.menu" = { fg = "fg1", bg = "bg2" }
55"ui.menu.selected" = { fg = "bg2", bg = "blue1", modifiers = ["bold"] }
55"ui.menu.selected" = { fg = "bg2", bg = "blue1", modifiers = ["bold"] }
56−"ui.virtual" = "bg2"
56+"ui.virtual.whitespace" = "bg2"
57
57
58"diagnostic" = { modifiers = ["underlined"] }
58"diagnostic" = { modifiers = ["underlined"] }
59
59
runtime/themes/gruvbox_light.toml+1−1
@@ -54,7 +54,7 @@
54"ui.cursor.match" = { bg = "bg2" }
54"ui.cursor.match" = { bg = "bg2" }
55"ui.menu" = { fg = "fg1", bg = "bg2" }
55"ui.menu" = { fg = "fg1", bg = "bg2" }
56"ui.menu.selected" = { fg = "bg2", bg = "blue1", modifiers = ["bold"] }
56"ui.menu.selected" = { fg = "bg2", bg = "blue1", modifiers = ["bold"] }
57−"ui.virtual" = "bg2"
57+"ui.virtual.whitespace" = "bg2"
58
58
59"diagnostic" = { modifiers = ["underlined"] }
59"diagnostic" = { modifiers = ["underlined"] }
60
60
runtime/themes/ingrid.toml+1−1
@@ -53,7 +53,7 @@
53
53
54"ui.text" = { fg = "#7B91B3" }
54"ui.text" = { fg = "#7B91B3" }
55"ui.text.focus" = { fg = "#250E07", modifiers= ["bold"] }
55"ui.text.focus" = { fg = "#250E07", modifiers= ["bold"] }
56−"ui.virtual" = "#A6B6CE"
56+"ui.virtual.whitespace" = "#A6B6CE"
57
57
58"ui.selection" = { bg = "#540099" }
58"ui.selection" = { bg = "#540099" }
59# "ui.cursor.match" # TODO might want to override this because dimmed is not widely supported
59# "ui.cursor.match" # TODO might want to override this because dimmed is not widely supported
runtime/themes/monokai.toml+1−1
@@ -32,7 +32,7 @@
32"attribute" = { fg = "fn_declaration" }
32"attribute" = { fg = "fn_declaration" }
33
33
34"comment" = { fg = "#88846F" }
34"comment" = { fg = "#88846F" }
35−"ui.virtual" = "#88846F"
35+"ui.virtual.whitespace" = "#88846F"
36
36
37"string" = { fg = "#e6db74" }
37"string" = { fg = "#e6db74" }
38"constant.character" = { fg = "#e6db74" }
38"constant.character" = { fg = "#e6db74" }
runtime/themes/monokai_pro.toml+1−1
@@ -6,7 +6,7 @@
6"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
6"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
7"ui.menu" = { fg = "base8", bg = "base3" }
7"ui.menu" = { fg = "base8", bg = "base3" }
8"ui.menu.selected" = { fg = "base2", bg = "yellow" }
8"ui.menu.selected" = { fg = "base2", bg = "yellow" }
9−"ui.virtual" = "base5"
9+"ui.virtual.whitespace" = "base5"
10
10
11"info" = "base8"
11"info" = "base8"
12"hint" = "base8"
12"hint" = "base8"
runtime/themes/monokai_pro_machine.toml+1−1
@@ -6,7 +6,7 @@
6"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
6"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
7"ui.menu" = { fg = "base8", bg = "base3" }
7"ui.menu" = { fg = "base8", bg = "base3" }
8"ui.menu.selected" = { fg = "base2", bg = "yellow" }
8"ui.menu.selected" = { fg = "base2", bg = "yellow" }
9−"ui.virtual" = "base5"
9+"ui.virtual.whitespace" = "base5"
10
10
11"info" = "base8"
11"info" = "base8"
12"hint" = "base8"
12"hint" = "base8"
runtime/themes/monokai_pro_octagon.toml+1−1
@@ -6,7 +6,7 @@
6"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
6"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
7"ui.menu" = { fg = "base8", bg = "base3" }
7"ui.menu" = { fg = "base8", bg = "base3" }
8"ui.menu.selected" = { fg = "base2", bg = "yellow" }
8"ui.menu.selected" = { fg = "base2", bg = "yellow" }
9−"ui.virtual" = "base5"
9+"ui.virtual.whitespace" = "base5"
10
10
11"info" = "base8"
11"info" = "base8"
12"hint" = "base8"
12"hint" = "base8"
runtime/themes/monokai_pro_ristretto.toml+1−1
@@ -6,7 +6,7 @@
6"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
6"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
7"ui.menu" = { fg = "base8", bg = "base3" }
7"ui.menu" = { fg = "base8", bg = "base3" }
8"ui.menu.selected" = { fg = "base2", bg = "yellow" }
8"ui.menu.selected" = { fg = "base2", bg = "yellow" }
9−"ui.virtual" = "base5"
9+"ui.virtual.whitespace" = "base5"
10
10
11"info" = "base8"
11"info" = "base8"
12"hint" = "base8"
12"hint" = "base8"
runtime/themes/monokai_pro_spectrum.toml+1−1
@@ -6,7 +6,7 @@
6"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
6"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
7"ui.menu" = { fg = "base8", bg = "base3" }
7"ui.menu" = { fg = "base8", bg = "base3" }
8"ui.menu.selected" = { fg = "base2", bg = "yellow" }
8"ui.menu.selected" = { fg = "base2", bg = "yellow" }
9−"ui.virtual" = "base5"
9+"ui.virtual.whitespace" = "base5"
10
10
11"info" = "base8"
11"info" = "base8"
12"hint" = "base8"
12"hint" = "base8"
runtime/themes/nord.toml+1−1
@@ -4,7 +4,7 @@
4"ui.text.focus" = { fg = "nord8", modifiers= ["bold"] }
4"ui.text.focus" = { fg = "nord8", modifiers= ["bold"] }
5"ui.menu" = { fg = "nord6", bg = "#232d38" }
5"ui.menu" = { fg = "nord6", bg = "#232d38" }
6"ui.menu.selected" = { fg = "nord8", bg = "nord2" }
6"ui.menu.selected" = { fg = "nord8", bg = "nord2" }
7−"ui.virtual" = "gray"
7+"ui.virtual.whitespace" = "gray"
8
8
9"info" = "nord8"
9"info" = "nord8"
10"hint" = "nord8"
10"hint" = "nord8"
runtime/themes/rose_pine.toml+1−1
@@ -14,7 +14,7 @@
14"ui.text" = { fg = "text" }
14"ui.text" = { fg = "text" }
15"ui.text.focus" = { fg = "foam", modifiers = ["bold"]}
15"ui.text.focus" = { fg = "foam", modifiers = ["bold"]}
16"ui.text.info" = {fg = "pine", modifiers = ["bold"]}
16"ui.text.info" = {fg = "pine", modifiers = ["bold"]}
17−"ui.virtual" = "highlight"
17+"ui.virtual.whitespace" = "highlight"
18"operator" = "rose"
18"operator" = "rose"
19"variable" = "text"
19"variable" = "text"
20"constant.numeric" = "iris"
20"constant.numeric" = "iris"
runtime/themes/rose_pine_dawn.toml+1−1
@@ -14,7 +14,7 @@
14"ui.text" = { fg = "text" }
14"ui.text" = { fg = "text" }
15"ui.text.focus" = { fg = "foam", modifiers = ["bold"]}
15"ui.text.focus" = { fg = "foam", modifiers = ["bold"]}
16"ui.text.info" = {fg = "pine", modifiers = ["bold"]}
16"ui.text.info" = {fg = "pine", modifiers = ["bold"]}
17−"ui.virtual" = "highlight"
17+"ui.virtual.whitespace" = "highlight"
18"operator" = "rose"
18"operator" = "rose"
19"variable" = "text"
19"variable" = "text"
20"number" = "iris"
20"number" = "iris"
runtime/themes/serika-dark.toml+1−1
@@ -50,7 +50,7 @@
50"ui.menu" = { fg = "fg", bg = "bg2" }
50"ui.menu" = { fg = "fg", bg = "bg2" }
51"ui.menu.selected" = { fg = "bg0", bg = "bg_yellow" }
51"ui.menu.selected" = { fg = "bg0", bg = "bg_yellow" }
52"ui.selection" = { bg = "bg3" }
52"ui.selection" = { bg = "bg3" }
53−"ui.virtual" = "grey2"
53+"ui.virtual.whitespace" = "grey2"
54
54
55"hint" = "blue"
55"hint" = "blue"
56"info" = "aqua"
56"info" = "aqua"
runtime/themes/serika-light.toml+1−1
@@ -50,7 +50,7 @@
50"ui.menu" = { fg = "bg0", bg = "bg3" }
50"ui.menu" = { fg = "bg0", bg = "bg3" }
51"ui.menu.selected" = { fg = "bg0", bg = "bg_yellow" }
51"ui.menu.selected" = { fg = "bg0", bg = "bg_yellow" }
52"ui.selection" = { fg = "bg0", bg = "bg3" }
52"ui.selection" = { fg = "bg0", bg = "bg3" }
53−"ui.virtual" = { fg = "bg2" }
53+"ui.virtual.whitespace" = { fg = "bg2" }
54
54
55"hint" = "blue"
55"hint" = "blue"
56"info" = "aqua"
56"info" = "aqua"
runtime/themes/snazzy.toml+1−1
@@ -38,7 +38,7 @@
38"ui.text" = { fg = "foreground" }
38"ui.text" = { fg = "foreground" }
39"ui.text.focus" = { fg = "cyan" }
39"ui.text.focus" = { fg = "cyan" }
40"ui.window" = { fg = "foreground" }
40"ui.window" = { fg = "foreground" }
41−"ui.virtual" = { fg = "comment" }
41+"ui.virtual.whitespace" = { fg = "comment" }
42
42
43"error" = { fg = "red" }
43"error" = { fg = "red" }
44"warning" = { fg = "cyan" }
44"warning" = { fg = "cyan" }
runtime/themes/solarized_dark.toml+1−1
@@ -39,7 +39,7 @@
39# 背景
39# 背景
40"ui.background" = { bg = "base03" }
40"ui.background" = { bg = "base03" }
41
41
42−"ui.virtual" = { fg = "base01" }
42+"ui.virtual.whitespace" = { fg = "base01" }
43
43
44# 行号栏
44# 行号栏
45"ui.linenr" = { fg = "base0", bg = "base02" }
45"ui.linenr" = { fg = "base0", bg = "base02" }
runtime/themes/solarized_light.toml+1−1
@@ -40,7 +40,7 @@
40# background
40# background
41"ui.background" = { bg = "base03" }
41"ui.background" = { bg = "base03" }
42
42
43−"ui.virtual" = { fg = "base01" }
43+"ui.virtual.whitespace" = { fg = "base01" }
44
44
45# 行号栏
45# 行号栏
46# line number column
46# line number column
runtime/themes/spacebones_light.toml+1−1
@@ -64,7 +64,7 @@
64"ui.cursor.match" = { bg = "bg3" }
64"ui.cursor.match" = { bg = "bg3" }
65"ui.menu" = { fg = "fg1", bg = "bg2" }
65"ui.menu" = { fg = "fg1", bg = "bg2" }
66"ui.menu.selected" = { fg = "#655370", bg = "#d1dcdf", modifiers = ["bold"] }
66"ui.menu.selected" = { fg = "#655370", bg = "#d1dcdf", modifiers = ["bold"] }
67−"ui.virtual" = "bg2"
67+"ui.virtual.whitespace" = "bg2"
68
68
69"diagnostic" = { modifiers = ["underlined"] }
69"diagnostic" = { modifiers = ["underlined"] }
70
70