From c5deb308148b148ff0592e18203f1ca721716668 Mon Sep 17 00:00:00 2001 From: nosa Date: Sun, 14 Aug 2022 14:35:15 +0100 Subject: Theme Related Fixes (#3412) --- book/src/themes.md | 4 +++- runtime/queries/regex/highlights.scm | 2 +- runtime/themes/autumn.toml | 2 +- runtime/themes/autumn_night.toml | 2 +- runtime/themes/base16_default_dark.toml | 2 +- runtime/themes/base16_default_light.toml | 2 +- runtime/themes/base16_terminal.toml | 2 +- runtime/themes/base16_transparent.toml | 2 +- runtime/themes/doom_acario_dark.toml | 2 +- runtime/themes/flatwhite.toml | 1 - runtime/themes/night_owl.toml | 1 - runtime/themes/noctis.toml | 1 - runtime/themes/noctis_bordo.toml | 2 +- runtime/themes/onedark.toml | 1 - runtime/themes/onelight.toml | 1 - runtime/themes/pop-dark.toml | 3 +-- runtime/themes/rose_pine.toml | 5 ++--- runtime/themes/rose_pine_dawn.toml | 5 ++--- runtime/themes/rose_pine_moon.toml | 5 ++--- runtime/themes/serika-dark.toml | 1 - runtime/themes/serika-light.toml | 1 - runtime/themes/snazzy.toml | 2 +- runtime/themes/spacebones_light.toml | 1 - 23 files changed, 20 insertions(+), 30 deletions(-) diff --git a/book/src/themes.md b/book/src/themes.md index e03782db..b37ee852 100644 --- a/book/src/themes.md +++ b/book/src/themes.md @@ -103,6 +103,8 @@ We use a similar set of scopes as [SublimeText](https://www.sublimetext.com/docs/scope_naming.html). See also [TextMate](https://macromates.com/manual/en/language_grammars) scopes. +- `attribute` - Class attributes, html tag attributes + - `type` - Types - `builtin` - Primitive types provided by the language (`int`, `usize`) - `constructor` @@ -133,13 +135,13 @@ We use a similar set of scopes as - `parameter` - Function parameters - `other` - `member` - Fields of composite data types (e.g. structs, unions) - - `function` (TODO: ?) - `label` - `punctuation` - `delimiter` - Commas, colons - `bracket` - Parentheses, angle brackets, etc. + - `special` - String interpolation brackets. - `keyword` - `control` diff --git a/runtime/queries/regex/highlights.scm b/runtime/queries/regex/highlights.scm index 9376caa9..cad08f40 100644 --- a/runtime/queries/regex/highlights.scm +++ b/runtime/queries/regex/highlights.scm @@ -35,7 +35,7 @@ (non_boundary_assertion) ] @constant.character.escape -(group_name) @property +(group_name) @label (count_quantifier [ diff --git a/runtime/themes/autumn.toml b/runtime/themes/autumn.toml index 024ca650..d9c2f8a6 100644 --- a/runtime/themes/autumn.toml +++ b/runtime/themes/autumn.toml @@ -31,7 +31,7 @@ "variable" = "my_white3" "constant.numeric" = "my_turquoise" "constant" = "my_white3" -"attributes" = "my_turquoise" +"attribute" = "my_turquoise" "type" = { fg = "my_white3", modifiers = ["italic"] } "ui.cursor.match" = { fg = "my_white3", modifiers = ["underlined"] } "string" = "my_green" diff --git a/runtime/themes/autumn_night.toml b/runtime/themes/autumn_night.toml index 381e21d9..b4a7c6c0 100644 --- a/runtime/themes/autumn_night.toml +++ b/runtime/themes/autumn_night.toml @@ -31,7 +31,7 @@ "variable" = "my_white3" "constant.numeric" = "my_turquoise" "constant" = "my_white3" -"attributes" = "my_turquoise" +"attribute" = "my_turquoise" "type" = { fg = "my_white3", modifiers = ["italic"] } "ui.cursor.match" = { fg = "my_white3", modifiers = ["underlined"] } "string" = "my_green" diff --git a/runtime/themes/base16_default_dark.toml b/runtime/themes/base16_default_dark.toml index 33252330..460e7363 100644 --- a/runtime/themes/base16_default_dark.toml +++ b/runtime/themes/base16_default_dark.toml @@ -19,7 +19,7 @@ "variable" = "base08" "constant.numeric" = "base09" "constant" = "base09" -"attributes" = "base09" +"attribute" = "base09" "type" = "base0A" "ui.cursor.match" = { fg = "base0A", modifiers = ["underlined"] } "string" = "base0B" diff --git a/runtime/themes/base16_default_light.toml b/runtime/themes/base16_default_light.toml index bc2b8e67..6874c39e 100644 --- a/runtime/themes/base16_default_light.toml +++ b/runtime/themes/base16_default_light.toml @@ -19,7 +19,7 @@ "variable" = "base08" "constant.numeric" = "base09" "constant" = "base09" -"attributes" = "base09" +"attribute" = "base09" "type" = "base0A" "ui.cursor.match" = { fg = "base0A", modifiers = ["underlined"] } "string" = "base0B" diff --git a/runtime/themes/base16_terminal.toml b/runtime/themes/base16_terminal.toml index 3a1d4845..1f5328dc 100644 --- a/runtime/themes/base16_terminal.toml +++ b/runtime/themes/base16_terminal.toml @@ -17,7 +17,7 @@ "variable" = "light-red" "constant.numeric" = "yellow" "constant" = "yellow" -"attributes" = "yellow" +"attribute" = "yellow" "type" = "light-yellow" "ui.cursor.match" = { fg = "light-yellow", modifiers = ["underlined"] } "string" = "light-green" diff --git a/runtime/themes/base16_transparent.toml b/runtime/themes/base16_transparent.toml index 64d33868..0c6d924f 100644 --- a/runtime/themes/base16_transparent.toml +++ b/runtime/themes/base16_transparent.toml @@ -28,7 +28,7 @@ "variable" = "light-red" "constant.numeric" = "yellow" "constant" = "yellow" -"attributes" = "yellow" +"attribute" = "yellow" "type" = "light-yellow" "string" = "light-green" "variable.other.member" = "green" diff --git a/runtime/themes/doom_acario_dark.toml b/runtime/themes/doom_acario_dark.toml index 816e6626..5fb8272f 100644 --- a/runtime/themes/doom_acario_dark.toml +++ b/runtime/themes/doom_acario_dark.toml @@ -20,7 +20,7 @@ operator = { fg = 'blue' } function = { fg = 'yellow' } tag = { fg = 'cyan' } attribute = { fg = 'blue' } -attributes = { fg = 'blue' } +attribute = { fg = 'blue' } namespace = { fg = 'red' } 'markup.heading' = { fg = 'red' } diff --git a/runtime/themes/flatwhite.toml b/runtime/themes/flatwhite.toml index a5c29878..f290ff41 100644 --- a/runtime/themes/flatwhite.toml +++ b/runtime/themes/flatwhite.toml @@ -13,7 +13,6 @@ "label" = { modifiers = ["bold"] } "namespace" = { fg = "teal_text", bg = "teal_bg" } "operator" = { fg = "base1", bg = "base7" } -"property" = { fg = "blue_text", bg = "blue_bg" } "punctuation.bracket" = { modifiers = ["bold"] } "special" = { fg = "blue_text", bg = "blue_bg" } "string" = { fg = "green_text", bg = "green_bg" } diff --git a/runtime/themes/night_owl.toml b/runtime/themes/night_owl.toml index 825bd412..55b09fbc 100644 --- a/runtime/themes/night_owl.toml +++ b/runtime/themes/night_owl.toml @@ -60,7 +60,6 @@ 'function.special' = { fg = 'pink' } 'tag' = { fg = 'blue' } 'namespace' = { fg = 'peach' } -'property' = { fg = 'green' } 'special' = { fg = 'greyE' } 'module' = { fg = 'greyE' } 'attribute' = { fg = 'paleblue' } diff --git a/runtime/themes/noctis.toml b/runtime/themes/noctis.toml index 8690ab3a..1740a924 100644 --- a/runtime/themes/noctis.toml +++ b/runtime/themes/noctis.toml @@ -62,7 +62,6 @@ # SYNTAX HIGHLIGHTING ============================== # All the keys here are Treesitter scopes. -'property' = { fg = "red" } # Regex group names. 'special' = { fg = "mid-blue"} # Special symbols e.g `?` in Rust, `...` in Hare. 'attribute' = { fg = "yellow" } # Class attributes, html tag attributes. diff --git a/runtime/themes/noctis_bordo.toml b/runtime/themes/noctis_bordo.toml index 3487d784..ebd5c87d 100644 --- a/runtime/themes/noctis_bordo.toml +++ b/runtime/themes/noctis_bordo.toml @@ -1,6 +1,6 @@ # Author: Joseph Harrison-Lim -"attributes" = { fg = "#7060eb", modifiers = ["bold"] } +"attribute" = { fg = "#7060eb", modifiers = ["bold"] } "comment" = { fg = "base03", modifiers = ["italic"] } "comment.block.documentation" = { fg = "base06", modifiers = ["italic"] } "constant" = "base09" diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml index 5508692a..3beb962f 100644 --- a/runtime/themes/onedark.toml +++ b/runtime/themes/onedark.toml @@ -18,7 +18,6 @@ "namespace" = { fg = "blue" } "operator" = { fg = "purple" } "keyword.operator" = { fg = "purple" } -"property" = { fg = "red" } "special" = { fg = "blue" } "string" = { fg = "green" } "type" = { fg = "yellow" } diff --git a/runtime/themes/onelight.toml b/runtime/themes/onelight.toml index f1432270..a21c8ba2 100644 --- a/runtime/themes/onelight.toml +++ b/runtime/themes/onelight.toml @@ -27,7 +27,6 @@ "label" = { fg = "cyan" } "namespace" = { fg = "red" } "operator" = { fg = "red" } -"property" = { fg = "red" } "special" = { fg = "purple" } "string" = { fg = "green" } "module" = { fg = "cyan" } diff --git a/runtime/themes/pop-dark.toml b/runtime/themes/pop-dark.toml index 172e8391..4d501a20 100644 --- a/runtime/themes/pop-dark.toml +++ b/runtime/themes/pop-dark.toml @@ -41,9 +41,8 @@ label = { fg = 'greenS' } module = { bg = 'orangeL' } special = { fg = 'orangeW' } operator = { fg = 'orangeY' } -property = { bg = 'blueH' } attribute = { fg = 'orangeL' } -attributes = { fg = 'orangeL' } +attribute = { fg = 'orangeL' } namespace = { fg = 'orangeL' } 'type' = { fg = 'redH' } 'type.builtin' = { fg = 'orangeL' } diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml index 1755388f..1e494946 100644 --- a/runtime/themes/rose_pine.toml +++ b/runtime/themes/rose_pine.toml @@ -22,11 +22,10 @@ "variable" = "text" "constant.numeric" = "iris" "constant" = "gold" -"attributes" = "gold" +"attribute" = "gold" "type" = "foam" "ui.cursor.match" = { fg = "gold", modifiers = ["underlined"] } "string" = "gold" -"property" = "foam" "constant.character.escape" = "subtle" "function" = "rose" "function.builtin" = "rose" @@ -40,7 +39,7 @@ "ui.popup.info" = { bg = "surface" } "ui.window" = { bg = "base" } "ui.help" = { bg = "overlay", fg = "foam" } -"text" = "text" +"ui.text" = "text" "diff.plus" = "foam" "diff.delta" = "rose" "diff.minus" = "love" diff --git a/runtime/themes/rose_pine_dawn.toml b/runtime/themes/rose_pine_dawn.toml index a3c0f446..b28f6412 100644 --- a/runtime/themes/rose_pine_dawn.toml +++ b/runtime/themes/rose_pine_dawn.toml @@ -19,11 +19,10 @@ "variable" = "text" "number" = "iris" "constant" = "gold" -"attributes" = "gold" +"attribute" = "gold" "type" = "foam" "ui.cursor.match" = { fg = "gold", modifiers = ["underlined"] } "string" = "gold" -"property" = "foam" "escape" = "subtle" "function" = "rose" "function.builtin" = "rose" @@ -37,7 +36,7 @@ "ui.popup.info" = { bg = "surface" } "ui.window" = { bg = "base" } "ui.help" = { bg = "overlay", fg = "foam" } -"text" = "text" +"ui.text" = "text" "diff.plus" = "foam" "diff.delta" = "rose" "diff.minus" = "love" diff --git a/runtime/themes/rose_pine_moon.toml b/runtime/themes/rose_pine_moon.toml index 835e9f50..618ac841 100644 --- a/runtime/themes/rose_pine_moon.toml +++ b/runtime/themes/rose_pine_moon.toml @@ -25,11 +25,10 @@ "variable" = "text" "constant.numeric" = "iris" "constant" = "gold" -"attributes" = "gold" +"attribute" = "gold" "type" = "foam" "ui.cursor.match" = { fg = "gold", modifiers = ["underlined"] } "string" = "gold" -"property" = "foam" "constant.character.escape" = "subtle" "function" = "rose" "function.builtin" = "rose" @@ -43,7 +42,7 @@ "ui.popup.info" = { bg = "surface" } "ui.window" = { bg = "base" } "ui.help" = { bg = "overlay", fg = "foam" } -"text" = "text" +"ui.text" = "text" "diff.plus" = "foam" "diff.delta" = "rose" "diff.minus" = "love" diff --git a/runtime/themes/serika-dark.toml b/runtime/themes/serika-dark.toml index ec160874..e13c2f87 100644 --- a/runtime/themes/serika-dark.toml +++ b/runtime/themes/serika-dark.toml @@ -30,7 +30,6 @@ "attribute" = "aqua" "constructor" = "yellow" "module" = "blue" -"property" = "yellow" "special" = "orange" "ui.background" = { bg = "bg0" } diff --git a/runtime/themes/serika-light.toml b/runtime/themes/serika-light.toml index 4eca3de9..c0a4b8d8 100644 --- a/runtime/themes/serika-light.toml +++ b/runtime/themes/serika-light.toml @@ -30,7 +30,6 @@ "attribute" = "aqua" "constructor" = "yellow" "module" = "blue" -"property" = "yellow" "special" = "orange" "ui.background" = { bg = "bg0" } diff --git a/runtime/themes/snazzy.toml b/runtime/themes/snazzy.toml index f4521e7f..8cecc61e 100644 --- a/runtime/themes/snazzy.toml +++ b/runtime/themes/snazzy.toml @@ -8,7 +8,7 @@ "operator" = { fg = "magenta" } "punctuation" = { fg = "foreground" } "string" = { fg = "yellow" } -"path" = { fg = "blue" } +"string.special.path" = { fg = "blue" } "string.regexp" = { fg = "red" } "tag" = { fg = "magenta" } "type" = { fg = "cyan", modifiers = ["italic"] } diff --git a/runtime/themes/spacebones_light.toml b/runtime/themes/spacebones_light.toml index 57071af2..e12ef285 100644 --- a/runtime/themes/spacebones_light.toml +++ b/runtime/themes/spacebones_light.toml @@ -10,7 +10,6 @@ "punctuation.delimiter" = "#6c3163" "operator" = "#ba2f59" "special" = "#ba2f59" -"property" = "#7590db" "variable.property" = "#7590db" "variable" = "#715ab1" "variable.builtin" = "#715ab1" -- cgit v1.2.3-70-g09d2