on master help sign in
Theme Related Fixes (#3412)
c5deb30nosa
book/src/themes.md+3−1
@@ -103,6 +103,8 @@ We use a similar set of scopes as
103[SublimeText](https://www.sublimetext.com/docs/scope_naming.html). See also
103[SublimeText](https://www.sublimetext.com/docs/scope_naming.html). See also
104[TextMate](https://macromates.com/manual/en/language_grammars) scopes.
104[TextMate](https://macromates.com/manual/en/language_grammars) scopes.
105
105
106+- `attribute` - Class attributes, html tag attributes
107+
106- `type` - Types
108- `type` - Types
107 - `builtin` - Primitive types provided by the language (`int`, `usize`)
109 - `builtin` - Primitive types provided by the language (`int`, `usize`)
108- `constructor`
110- `constructor`
@@ -133,13 +135,13 @@ We use a similar set of scopes as
133 - `parameter` - Function parameters
135 - `parameter` - Function parameters
134 - `other`
136 - `other`
135 - `member` - Fields of composite data types (e.g. structs, unions)
137 - `member` - Fields of composite data types (e.g. structs, unions)
136− - `function` (TODO: ?)
137
138
138- `label`
139- `label`
139
140
140- `punctuation`
141- `punctuation`
141 - `delimiter` - Commas, colons
142 - `delimiter` - Commas, colons
142 - `bracket` - Parentheses, angle brackets, etc.
143 - `bracket` - Parentheses, angle brackets, etc.
144+ - `special` - String interpolation brackets.
143
145
144- `keyword`
146- `keyword`
145 - `control`
147 - `control`
runtime/queries/regex/highlights.scm+1−1
@@ -35,7 +35,7 @@
35 (non_boundary_assertion)
35 (non_boundary_assertion)
36] @constant.character.escape
36] @constant.character.escape
37
37
38−(group_name) @property
38+(group_name) @label
39
39
40(count_quantifier
40(count_quantifier
41 [
41 [
runtime/themes/autumn.toml+1−1
@@ -31,7 +31,7 @@
31"variable" = "my_white3"
31"variable" = "my_white3"
32"constant.numeric" = "my_turquoise"
32"constant.numeric" = "my_turquoise"
33"constant" = "my_white3"
33"constant" = "my_white3"
34−"attributes" = "my_turquoise"
34+"attribute" = "my_turquoise"
35"type" = { fg = "my_white3", modifiers = ["italic"] }
35"type" = { fg = "my_white3", modifiers = ["italic"] }
36"ui.cursor.match" = { fg = "my_white3", modifiers = ["underlined"] }
36"ui.cursor.match" = { fg = "my_white3", modifiers = ["underlined"] }
37"string" = "my_green"
37"string" = "my_green"
runtime/themes/autumn_night.toml+1−1
@@ -31,7 +31,7 @@
31"variable" = "my_white3"
31"variable" = "my_white3"
32"constant.numeric" = "my_turquoise"
32"constant.numeric" = "my_turquoise"
33"constant" = "my_white3"
33"constant" = "my_white3"
34−"attributes" = "my_turquoise"
34+"attribute" = "my_turquoise"
35"type" = { fg = "my_white3", modifiers = ["italic"] }
35"type" = { fg = "my_white3", modifiers = ["italic"] }
36"ui.cursor.match" = { fg = "my_white3", modifiers = ["underlined"] }
36"ui.cursor.match" = { fg = "my_white3", modifiers = ["underlined"] }
37"string" = "my_green"
37"string" = "my_green"
runtime/themes/base16_default_dark.toml+1−1
@@ -19,7 +19,7 @@
19"variable" = "base08"
19"variable" = "base08"
20"constant.numeric" = "base09"
20"constant.numeric" = "base09"
21"constant" = "base09"
21"constant" = "base09"
22−"attributes" = "base09"
22+"attribute" = "base09"
23"type" = "base0A"
23"type" = "base0A"
24"ui.cursor.match" = { fg = "base0A", modifiers = ["underlined"] }
24"ui.cursor.match" = { fg = "base0A", modifiers = ["underlined"] }
25"string" = "base0B"
25"string" = "base0B"
runtime/themes/base16_default_light.toml+1−1
@@ -19,7 +19,7 @@
19"variable" = "base08"
19"variable" = "base08"
20"constant.numeric" = "base09"
20"constant.numeric" = "base09"
21"constant" = "base09"
21"constant" = "base09"
22−"attributes" = "base09"
22+"attribute" = "base09"
23"type" = "base0A"
23"type" = "base0A"
24"ui.cursor.match" = { fg = "base0A", modifiers = ["underlined"] }
24"ui.cursor.match" = { fg = "base0A", modifiers = ["underlined"] }
25"string" = "base0B"
25"string" = "base0B"
runtime/themes/base16_terminal.toml+1−1
@@ -17,7 +17,7 @@
17"variable" = "light-red"
17"variable" = "light-red"
18"constant.numeric" = "yellow"
18"constant.numeric" = "yellow"
19"constant" = "yellow"
19"constant" = "yellow"
20−"attributes" = "yellow"
20+"attribute" = "yellow"
21"type" = "light-yellow"
21"type" = "light-yellow"
22"ui.cursor.match" = { fg = "light-yellow", modifiers = ["underlined"] }
22"ui.cursor.match" = { fg = "light-yellow", modifiers = ["underlined"] }
23"string" = "light-green"
23"string" = "light-green"
runtime/themes/base16_transparent.toml+1−1
@@ -28,7 +28,7 @@
28"variable" = "light-red"
28"variable" = "light-red"
29"constant.numeric" = "yellow"
29"constant.numeric" = "yellow"
30"constant" = "yellow"
30"constant" = "yellow"
31−"attributes" = "yellow"
31+"attribute" = "yellow"
32"type" = "light-yellow"
32"type" = "light-yellow"
33"string" = "light-green"
33"string" = "light-green"
34"variable.other.member" = "green"
34"variable.other.member" = "green"
runtime/themes/doom_acario_dark.toml+1−1
@@ -20,7 +20,7 @@ operator = { fg = 'blue' }
20function = { fg = 'yellow' }
20function = { fg = 'yellow' }
21tag = { fg = 'cyan' }
21tag = { fg = 'cyan' }
22attribute = { fg = 'blue' }
22attribute = { fg = 'blue' }
23−attributes = { fg = 'blue' }
23+attribute = { fg = 'blue' }
24namespace = { fg = 'red' }
24namespace = { fg = 'red' }
25
25
26'markup.heading' = { fg = 'red' }
26'markup.heading' = { fg = 'red' }
runtime/themes/flatwhite.toml−1
@@ -13,7 +13,6 @@
13"label" = { modifiers = ["bold"] }
13"label" = { modifiers = ["bold"] }
14"namespace" = { fg = "teal_text", bg = "teal_bg" }
14"namespace" = { fg = "teal_text", bg = "teal_bg" }
15"operator" = { fg = "base1", bg = "base7" }
15"operator" = { fg = "base1", bg = "base7" }
16−"property" = { fg = "blue_text", bg = "blue_bg" }
17"punctuation.bracket" = { modifiers = ["bold"] }
16"punctuation.bracket" = { modifiers = ["bold"] }
18"special" = { fg = "blue_text", bg = "blue_bg" }
17"special" = { fg = "blue_text", bg = "blue_bg" }
19"string" = { fg = "green_text", bg = "green_bg" }
18"string" = { fg = "green_text", bg = "green_bg" }
runtime/themes/night_owl.toml−1
@@ -60,7 +60,6 @@
60'function.special' = { fg = 'pink' }
60'function.special' = { fg = 'pink' }
61'tag' = { fg = 'blue' }
61'tag' = { fg = 'blue' }
62'namespace' = { fg = 'peach' }
62'namespace' = { fg = 'peach' }
63−'property' = { fg = 'green' }
64'special' = { fg = 'greyE' }
63'special' = { fg = 'greyE' }
65'module' = { fg = 'greyE' }
64'module' = { fg = 'greyE' }
66'attribute' = { fg = 'paleblue' }
65'attribute' = { fg = 'paleblue' }
runtime/themes/noctis.toml−1
@@ -62,7 +62,6 @@
62# SYNTAX HIGHLIGHTING ==============================
62# SYNTAX HIGHLIGHTING ==============================
63# All the keys here are Treesitter scopes.
63# All the keys here are Treesitter scopes.
64
64
65−'property' = { fg = "red" } # Regex group names.
66'special' = { fg = "mid-blue"} # Special symbols e.g `?` in Rust, `...` in Hare.
65'special' = { fg = "mid-blue"} # Special symbols e.g `?` in Rust, `...` in Hare.
67'attribute' = { fg = "yellow" } # Class attributes, html tag attributes.
66'attribute' = { fg = "yellow" } # Class attributes, html tag attributes.
68
67
runtime/themes/noctis_bordo.toml+1−1
@@ -1,6 +1,6 @@
1# Author: Joseph Harrison-Lim <josephharrisonlim@gmail.com>
1# Author: Joseph Harrison-Lim <josephharrisonlim@gmail.com>
2
2
3−"attributes" = { fg = "#7060eb", modifiers = ["bold"] }
3+"attribute" = { fg = "#7060eb", modifiers = ["bold"] }
4"comment" = { fg = "base03", modifiers = ["italic"] }
4"comment" = { fg = "base03", modifiers = ["italic"] }
5"comment.block.documentation" = { fg = "base06", modifiers = ["italic"] }
5"comment.block.documentation" = { fg = "base06", modifiers = ["italic"] }
6"constant" = "base09"
6"constant" = "base09"
runtime/themes/onedark.toml−1
@@ -18,7 +18,6 @@
18"namespace" = { fg = "blue" }
18"namespace" = { fg = "blue" }
19"operator" = { fg = "purple" }
19"operator" = { fg = "purple" }
20"keyword.operator" = { fg = "purple" }
20"keyword.operator" = { fg = "purple" }
21−"property" = { fg = "red" }
22"special" = { fg = "blue" }
21"special" = { fg = "blue" }
23"string" = { fg = "green" }
22"string" = { fg = "green" }
24"type" = { fg = "yellow" }
23"type" = { fg = "yellow" }
runtime/themes/onelight.toml−1
@@ -27,7 +27,6 @@
27"label" = { fg = "cyan" }
27"label" = { fg = "cyan" }
28"namespace" = { fg = "red" }
28"namespace" = { fg = "red" }
29"operator" = { fg = "red" }
29"operator" = { fg = "red" }
30−"property" = { fg = "red" }
31"special" = { fg = "purple" }
30"special" = { fg = "purple" }
32"string" = { fg = "green" }
31"string" = { fg = "green" }
33"module" = { fg = "cyan" }
32"module" = { fg = "cyan" }
runtime/themes/pop-dark.toml+1−2
@@ -41,9 +41,8 @@ label = { fg = 'greenS' }
41module = { bg = 'orangeL' }
41module = { bg = 'orangeL' }
42special = { fg = 'orangeW' }
42special = { fg = 'orangeW' }
43operator = { fg = 'orangeY' }
43operator = { fg = 'orangeY' }
44−property = { bg = 'blueH' }
45attribute = { fg = 'orangeL' }
44attribute = { fg = 'orangeL' }
46−attributes = { fg = 'orangeL' }
45+attribute = { fg = 'orangeL' }
47namespace = { fg = 'orangeL' }
46namespace = { fg = 'orangeL' }
48'type' = { fg = 'redH' }
47'type' = { fg = 'redH' }
49'type.builtin' = { fg = 'orangeL' }
48'type.builtin' = { fg = 'orangeL' }
runtime/themes/rose_pine.toml+2−3
@@ -22,11 +22,10 @@
22"variable" = "text"
22"variable" = "text"
23"constant.numeric" = "iris"
23"constant.numeric" = "iris"
24"constant" = "gold"
24"constant" = "gold"
25−"attributes" = "gold"
25+"attribute" = "gold"
26"type" = "foam"
26"type" = "foam"
27"ui.cursor.match" = { fg = "gold", modifiers = ["underlined"] }
27"ui.cursor.match" = { fg = "gold", modifiers = ["underlined"] }
28"string" = "gold"
28"string" = "gold"
29−"property" = "foam"
30"constant.character.escape" = "subtle"
29"constant.character.escape" = "subtle"
31"function" = "rose"
30"function" = "rose"
32"function.builtin" = "rose"
31"function.builtin" = "rose"
@@ -40,7 +39,7 @@
40"ui.popup.info" = { bg = "surface" }
39"ui.popup.info" = { bg = "surface" }
41"ui.window" = { bg = "base" }
40"ui.window" = { bg = "base" }
42"ui.help" = { bg = "overlay", fg = "foam" }
41"ui.help" = { bg = "overlay", fg = "foam" }
43−"text" = "text"
42+"ui.text" = "text"
44"diff.plus" = "foam"
43"diff.plus" = "foam"
45"diff.delta" = "rose"
44"diff.delta" = "rose"
46"diff.minus" = "love"
45"diff.minus" = "love"
runtime/themes/rose_pine_dawn.toml+2−3
@@ -19,11 +19,10 @@
19"variable" = "text"
19"variable" = "text"
20"number" = "iris"
20"number" = "iris"
21"constant" = "gold"
21"constant" = "gold"
22−"attributes" = "gold"
22+"attribute" = "gold"
23"type" = "foam"
23"type" = "foam"
24"ui.cursor.match" = { fg = "gold", modifiers = ["underlined"] }
24"ui.cursor.match" = { fg = "gold", modifiers = ["underlined"] }
25"string" = "gold"
25"string" = "gold"
26−"property" = "foam"
27"escape" = "subtle"
26"escape" = "subtle"
28"function" = "rose"
27"function" = "rose"
29"function.builtin" = "rose"
28"function.builtin" = "rose"
@@ -37,7 +36,7 @@
37"ui.popup.info" = { bg = "surface" }
36"ui.popup.info" = { bg = "surface" }
38"ui.window" = { bg = "base" }
37"ui.window" = { bg = "base" }
39"ui.help" = { bg = "overlay", fg = "foam" }
38"ui.help" = { bg = "overlay", fg = "foam" }
40−"text" = "text"
39+"ui.text" = "text"
41"diff.plus" = "foam"
40"diff.plus" = "foam"
42"diff.delta" = "rose"
41"diff.delta" = "rose"
43"diff.minus" = "love"
42"diff.minus" = "love"
runtime/themes/rose_pine_moon.toml+2−3
@@ -25,11 +25,10 @@
25"variable" = "text"
25"variable" = "text"
26"constant.numeric" = "iris"
26"constant.numeric" = "iris"
27"constant" = "gold"
27"constant" = "gold"
28−"attributes" = "gold"
28+"attribute" = "gold"
29"type" = "foam"
29"type" = "foam"
30"ui.cursor.match" = { fg = "gold", modifiers = ["underlined"] }
30"ui.cursor.match" = { fg = "gold", modifiers = ["underlined"] }
31"string" = "gold"
31"string" = "gold"
32−"property" = "foam"
33"constant.character.escape" = "subtle"
32"constant.character.escape" = "subtle"
34"function" = "rose"
33"function" = "rose"
35"function.builtin" = "rose"
34"function.builtin" = "rose"
@@ -43,7 +42,7 @@
43"ui.popup.info" = { bg = "surface" }
42"ui.popup.info" = { bg = "surface" }
44"ui.window" = { bg = "base" }
43"ui.window" = { bg = "base" }
45"ui.help" = { bg = "overlay", fg = "foam" }
44"ui.help" = { bg = "overlay", fg = "foam" }
46−"text" = "text"
45+"ui.text" = "text"
47"diff.plus" = "foam"
46"diff.plus" = "foam"
48"diff.delta" = "rose"
47"diff.delta" = "rose"
49"diff.minus" = "love"
48"diff.minus" = "love"
runtime/themes/serika-dark.toml−1
@@ -30,7 +30,6 @@
30"attribute" = "aqua"
30"attribute" = "aqua"
31"constructor" = "yellow"
31"constructor" = "yellow"
32"module" = "blue"
32"module" = "blue"
33−"property" = "yellow"
34"special" = "orange"
33"special" = "orange"
35
34
36"ui.background" = { bg = "bg0" }
35"ui.background" = { bg = "bg0" }
runtime/themes/serika-light.toml−1
@@ -30,7 +30,6 @@
30"attribute" = "aqua"
30"attribute" = "aqua"
31"constructor" = "yellow"
31"constructor" = "yellow"
32"module" = "blue"
32"module" = "blue"
33−"property" = "yellow"
34"special" = "orange"
33"special" = "orange"
35
34
36"ui.background" = { bg = "bg0" }
35"ui.background" = { bg = "bg0" }
runtime/themes/snazzy.toml+1−1
@@ -8,7 +8,7 @@
8"operator" = { fg = "magenta" }
8"operator" = { fg = "magenta" }
9"punctuation" = { fg = "foreground" }
9"punctuation" = { fg = "foreground" }
10"string" = { fg = "yellow" }
10"string" = { fg = "yellow" }
11−"path" = { fg = "blue" }
11+"string.special.path" = { fg = "blue" }
12"string.regexp" = { fg = "red" }
12"string.regexp" = { fg = "red" }
13"tag" = { fg = "magenta" }
13"tag" = { fg = "magenta" }
14"type" = { fg = "cyan", modifiers = ["italic"] }
14"type" = { fg = "cyan", modifiers = ["italic"] }
runtime/themes/spacebones_light.toml−1
@@ -10,7 +10,6 @@
10"punctuation.delimiter" = "#6c3163"
10"punctuation.delimiter" = "#6c3163"
11"operator" = "#ba2f59"
11"operator" = "#ba2f59"
12"special" = "#ba2f59"
12"special" = "#ba2f59"
13−"property" = "#7590db"
14"variable.property" = "#7590db"
13"variable.property" = "#7590db"
15"variable" = "#715ab1"
14"variable" = "#715ab1"
16"variable.builtin" = "#715ab1"
15"variable.builtin" = "#715ab1"