aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorBlaž Hrastnik2022-06-21 16:38:21 +0000
committerGitHub2022-06-21 16:38:21 +0000
commit458b89e21dcf76bbf9ca6ba237bd334f4922722d (patch)
treef859642d007db7274d3cd657ecaa59b1ec014cd8 /runtime
parent5f7c247430998fabceb55d4689118dd75e2bdfb1 (diff)
parent6a3f7f2c399f0b92cef97b0c85ebe976fd7cfcac (diff)
Merge branch 'master' into test-harness
Diffstat (limited to 'runtime')
-rw-r--r--runtime/queries/elixir/textobjects.scm8
-rw-r--r--runtime/queries/erlang/textobjects.scm8
-rw-r--r--runtime/queries/gleam/textobjects.scm5
-rw-r--r--runtime/queries/go/textobjects.scm5
-rw-r--r--runtime/queries/javascript/injections.scm12
-rw-r--r--runtime/queries/jsdoc/injections.scm5
-rw-r--r--runtime/queries/python/textobjects.scm5
-rw-r--r--runtime/queries/rust/textobjects.scm14
-rw-r--r--runtime/themes/base16_default_dark.toml2
-rw-r--r--runtime/themes/base16_default_light.toml2
-rw-r--r--runtime/themes/base16_terminal.toml2
-rw-r--r--runtime/themes/bogster.toml2
-rw-r--r--runtime/themes/boo_berry.toml2
-rw-r--r--runtime/themes/catppuccin.toml2
-rw-r--r--runtime/themes/dark_plus.toml2
-rw-r--r--runtime/themes/dracula.toml2
-rw-r--r--runtime/themes/everforest_dark.toml2
-rw-r--r--runtime/themes/everforest_light.toml2
-rw-r--r--runtime/themes/gruvbox.toml2
-rw-r--r--runtime/themes/gruvbox_light.toml2
-rw-r--r--runtime/themes/ingrid.toml2
-rw-r--r--runtime/themes/monokai.toml2
-rw-r--r--runtime/themes/monokai_pro.toml2
-rw-r--r--runtime/themes/monokai_pro_machine.toml2
-rw-r--r--runtime/themes/monokai_pro_octagon.toml2
-rw-r--r--runtime/themes/monokai_pro_ristretto.toml2
-rw-r--r--runtime/themes/monokai_pro_spectrum.toml2
-rw-r--r--runtime/themes/noctis_bordo.toml80
-rw-r--r--runtime/themes/nord.toml2
-rw-r--r--runtime/themes/rose_pine.toml2
-rw-r--r--runtime/themes/rose_pine_dawn.toml2
-rw-r--r--runtime/themes/serika-dark.toml2
-rw-r--r--runtime/themes/serika-light.toml2
-rw-r--r--runtime/themes/snazzy.toml2
-rw-r--r--runtime/themes/solarized_dark.toml2
-rw-r--r--runtime/themes/solarized_light.toml2
-rw-r--r--runtime/themes/spacebones_light.toml2
37 files changed, 167 insertions, 31 deletions
diff --git a/runtime/queries/elixir/textobjects.scm b/runtime/queries/elixir/textobjects.scm
index 52a6f66d..227a52f4 100644
--- a/runtime/queries/elixir/textobjects.scm
+++ b/runtime/queries/elixir/textobjects.scm
@@ -16,7 +16,7 @@
(pair
value: (_) @function.inside))?)?
(do_block (_)* @function.inside)?)
- (#match? @_keyword "^(def|defdelegate|defguard|defguardp|defmacro|defmacrop|defn|defnp|defp|test|describe|setup)$")) @function.around
+ (#match? @_keyword "^(def|defdelegate|defguard|defguardp|defmacro|defmacrop|defn|defnp|defp)$")) @function.around
(anonymous_function
(stab_clause right: (body) @function.inside)) @function.around
@@ -25,3 +25,9 @@
target: (identifier) @_keyword
(do_block (_)* @class.inside))
(#match? @_keyword "^(defmodule|defprotocol|defimpl)$")) @class.around
+
+((call
+ target: (identifier) @_keyword
+ (arguments ((string) . (_)?))
+ (do_block (_)* @test.inside)?)
+ (#match? @_keyword "^(test|describe)$")) @test.around
diff --git a/runtime/queries/erlang/textobjects.scm b/runtime/queries/erlang/textobjects.scm
index c46b5c6f..013629f8 100644
--- a/runtime/queries/erlang/textobjects.scm
+++ b/runtime/queries/erlang/textobjects.scm
@@ -6,3 +6,11 @@
(stab_clause body: (_) @function.inside)) @function.around
(comment (comment_content) @comment.inside) @comment.around
+
+; EUnit test names.
+; (CommonTest cases are not recognizable by syntax alone.)
+((function_clause
+ name: (atom) @_name
+ pattern: (arguments (_)? @parameter.inside)
+ body: (_) @test.inside) @test.around
+ (#match? @_name "_test$"))
diff --git a/runtime/queries/gleam/textobjects.scm b/runtime/queries/gleam/textobjects.scm
index b382f4bd..19cd0dcf 100644
--- a/runtime/queries/gleam/textobjects.scm
+++ b/runtime/queries/gleam/textobjects.scm
@@ -4,3 +4,8 @@
(anonymous_function
body: (function_body) @function.inside) @function.around
+
+((function
+ name: (identifier) @_name
+ body: (function_body) @test.inside) @test.around
+ (#match? @_name "_test$"))
diff --git a/runtime/queries/go/textobjects.scm b/runtime/queries/go/textobjects.scm
index a48ccce1..df1b0866 100644
--- a/runtime/queries/go/textobjects.scm
+++ b/runtime/queries/go/textobjects.scm
@@ -26,3 +26,8 @@
(comment) @comment.inside
(comment)+ @comment.around
+
+((function_declaration
+ name: (identifier) @_name
+ body: (block)? @test.inside) @test.around
+ (#match? @_name "^Test"))
diff --git a/runtime/queries/javascript/injections.scm b/runtime/queries/javascript/injections.scm
index e8429111..af3aef10 100644
--- a/runtime/queries/javascript/injections.scm
+++ b/runtime/queries/javascript/injections.scm
@@ -22,7 +22,15 @@
((regex_pattern) @injection.content
(#set! injection.language "regex"))
- ; Parse JSDoc annotations in comments
+; Parse JSDoc annotations in multiline comments
((comment) @injection.content
- (#set! injection.language "jsdoc"))
+ (#set! injection.language "jsdoc")
+ (#match? @injection.content "^/\\*+"))
+
+; Parse general tags in single line comments
+
+((comment) @injection.content
+ (#set! injection.language "comment")
+ (#match? @injection.content "^//"))
+
diff --git a/runtime/queries/jsdoc/injections.scm b/runtime/queries/jsdoc/injections.scm
new file mode 100644
index 00000000..877b671d
--- /dev/null
+++ b/runtime/queries/jsdoc/injections.scm
@@ -0,0 +1,5 @@
+; Parse general comment tags
+
+((document) @injection.content
+ (#set! injection.include-children)
+ (#set! injection.language "comment")) \ No newline at end of file
diff --git a/runtime/queries/python/textobjects.scm b/runtime/queries/python/textobjects.scm
index 5c6a61d1..966e4744 100644
--- a/runtime/queries/python/textobjects.scm
+++ b/runtime/queries/python/textobjects.scm
@@ -16,3 +16,8 @@
(comment) @comment.inside
(comment)+ @comment.around
+
+((function_definition
+ name: (identifier) @_name
+ body: (block)? @test.inside) @test.around
+ (#match? @_name "^test_"))
diff --git a/runtime/queries/rust/textobjects.scm b/runtime/queries/rust/textobjects.scm
index ba86050b..94c8c9f8 100644
--- a/runtime/queries/rust/textobjects.scm
+++ b/runtime/queries/rust/textobjects.scm
@@ -77,3 +77,17 @@
(line_comment)+ @comment.around
(block_comment) @comment.around
+
+(; #[test]
+ (attribute_item
+ (meta_item
+ (identifier) @_test_attribute))
+ ; allow other attributes like #[should_panic] and comments
+ [
+ (attribute_item)
+ (line_comment)
+ ]*
+ ; the test function
+ (function_item
+ body: (_) @test.inside) @test.around
+ (#eq? @_test_attribute "test"))
diff --git a/runtime/themes/base16_default_dark.toml b/runtime/themes/base16_default_dark.toml
index 7516e492..33252330 100644
--- a/runtime/themes/base16_default_dark.toml
+++ b/runtime/themes/base16_default_dark.toml
@@ -1,7 +1,7 @@
# Author: RayGervais <raygervais@hotmail.ca>
"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" }
diff --git a/runtime/themes/base16_default_light.toml b/runtime/themes/base16_default_light.toml
index 36847459..bc2b8e67 100644
--- a/runtime/themes/base16_default_light.toml
+++ b/runtime/themes/base16_default_light.toml
@@ -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"
diff --git a/runtime/themes/base16_terminal.toml b/runtime/themes/base16_terminal.toml
index 92848816..3a1d4845 100644
--- a/runtime/themes/base16_terminal.toml
+++ b/runtime/themes/base16_terminal.toml
@@ -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"
diff --git a/runtime/themes/bogster.toml b/runtime/themes/bogster.toml
index df3a7f31..76e24648 100644
--- a/runtime/themes/bogster.toml
+++ b/runtime/themes/bogster.toml
@@ -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
diff --git a/runtime/themes/boo_berry.toml b/runtime/themes/boo_berry.toml
index 5cd25397..a79b75c5 100644
--- a/runtime/themes/boo_berry.toml
+++ b/runtime/themes/boo_berry.toml
@@ -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" }
diff --git a/runtime/themes/catppuccin.toml b/runtime/themes/catppuccin.toml
index da9be4fb..eaa4ba51 100644
--- a/runtime/themes/catppuccin.toml
+++ b/runtime/themes/catppuccin.toml
@@ -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" }
diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml
index c785dd38..957ca61d 100644
--- a/runtime/themes/dark_plus.toml
+++ b/runtime/themes/dark_plus.toml
@@ -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" }
diff --git a/runtime/themes/dracula.toml b/runtime/themes/dracula.toml
index e32c3117..72b37d02 100644
--- a/runtime/themes/dracula.toml
+++ b/runtime/themes/dracula.toml
@@ -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" }
diff --git a/runtime/themes/everforest_dark.toml b/runtime/themes/everforest_dark.toml
index 5b6d1b7c..ef74ea9e 100644
--- a/runtime/themes/everforest_dark.toml
+++ b/runtime/themes/everforest_dark.toml
@@ -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"
diff --git a/runtime/themes/everforest_light.toml b/runtime/themes/everforest_light.toml
index b0370165..60557ba0 100644
--- a/runtime/themes/everforest_light.toml
+++ b/runtime/themes/everforest_light.toml
@@ -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"
diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml
index 6de35244..48fb14fa 100644
--- a/runtime/themes/gruvbox.toml
+++ b/runtime/themes/gruvbox.toml
@@ -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"] }
diff --git a/runtime/themes/gruvbox_light.toml b/runtime/themes/gruvbox_light.toml
index 2930dff0..02a32dec 100644
--- a/runtime/themes/gruvbox_light.toml
+++ b/runtime/themes/gruvbox_light.toml
@@ -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"] }
diff --git a/runtime/themes/ingrid.toml b/runtime/themes/ingrid.toml
index 79b749b1..58713704 100644
--- a/runtime/themes/ingrid.toml
+++ b/runtime/themes/ingrid.toml
@@ -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
diff --git a/runtime/themes/monokai.toml b/runtime/themes/monokai.toml
index 3fb1fadc..5a890615 100644
--- a/runtime/themes/monokai.toml
+++ b/runtime/themes/monokai.toml
@@ -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" }
diff --git a/runtime/themes/monokai_pro.toml b/runtime/themes/monokai_pro.toml
index 5580a33c..7c457d45 100644
--- a/runtime/themes/monokai_pro.toml
+++ b/runtime/themes/monokai_pro.toml
@@ -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"
diff --git a/runtime/themes/monokai_pro_machine.toml b/runtime/themes/monokai_pro_machine.toml
index abbe5bdc..bfc7031d 100644
--- a/runtime/themes/monokai_pro_machine.toml
+++ b/runtime/themes/monokai_pro_machine.toml
@@ -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"
diff --git a/runtime/themes/monokai_pro_octagon.toml b/runtime/themes/monokai_pro_octagon.toml
index b249cfe2..889e7624 100644
--- a/runtime/themes/monokai_pro_octagon.toml
+++ b/runtime/themes/monokai_pro_octagon.toml
@@ -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"
diff --git a/runtime/themes/monokai_pro_ristretto.toml b/runtime/themes/monokai_pro_ristretto.toml
index cd4cbd8e..f8ad8422 100644
--- a/runtime/themes/monokai_pro_ristretto.toml
+++ b/runtime/themes/monokai_pro_ristretto.toml
@@ -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"
diff --git a/runtime/themes/monokai_pro_spectrum.toml b/runtime/themes/monokai_pro_spectrum.toml
index 4160a15e..9f5864fc 100644
--- a/runtime/themes/monokai_pro_spectrum.toml
+++ b/runtime/themes/monokai_pro_spectrum.toml
@@ -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"
diff --git a/runtime/themes/noctis_bordo.toml b/runtime/themes/noctis_bordo.toml
new file mode 100644
index 00000000..3487d784
--- /dev/null
+++ b/runtime/themes/noctis_bordo.toml
@@ -0,0 +1,80 @@
+# Author: Joseph Harrison-Lim <josephharrisonlim@gmail.com>
+
+"attributes" = { fg = "#7060eb", modifiers = ["bold"] }
+"comment" = { fg = "base03", modifiers = ["italic"] }
+"comment.block.documentation" = { fg = "base06", modifiers = ["italic"] }
+"constant" = "base09"
+"constant.character.escape" = "base0C"
+"constant.numeric" = "#7060eb"
+"constructor" = "base0D"
+"function" = "base0D"
+"keyword" = "base0E"
+"keyword.control" = { fg = "base0E", modifiers = ["bold"] }
+"keyword.directive" = "white"
+"keyword.import" = { fg = "#df769b" }
+"keyword.operator" = { fg = "base0E", modifiers = ["italic"] }
+"label" = "base0E"
+"namespace" = "base0E"
+"operator" = "base05"
+"string" = "base0B"
+"type" = "base10"
+"variable" = "base08"
+"variable.other.member" = "base08"
+"special" = "base0D"
+
+"ui.background" = { bg = "base00" }
+"ui.virtual" = "base03"
+"ui.menu" = { fg = "base05", bg = "base01" }
+"ui.menu.selected" = { fg = "base0B", bg = "base01" }
+"ui.popup" = { bg = "base01" }
+"ui.window" = { bg = "base01" }
+"ui.linenr" = { fg = "#715b63", bg = "base01" }
+"ui.linenr.selected" = { fg = "base02", bg = "base01", modifiers = ["bold"] }
+"ui.selection" = { fg = "base05", bg = "base02" }
+"ui.statusline" = { fg = "base02", bg = "base01" }
+"ui.cursor" = { fg = "base04", modifiers = ["reversed"] }
+"ui.cursor.primary" = { fg = "base05", modifiers = ["reversed"] }
+"ui.text" = "base05"
+"ui.text.focus" = "base05"
+"ui.cursor.match" = { fg = "base0A", modifiers = ["underlined"] }
+"ui.help" = { fg = "base06", bg = "base01" }
+
+"markup.bold" = { fg = "base0A", modifiers = ["bold"] }
+"markup.heading" = "base0D"
+"markup.italic" = { fg = "base0E", modifiers = ["italic"] }
+"markup.link.text" = "base08"
+"markup.link.url" = { fg = "base09", modifiers = ["underlined"] }
+"markup.list" = "base08"
+"markup.quote" = "base0C"
+"markup.raw" = "base0B"
+
+"diff.delta" = "base09"
+"diff.plus" = "base0B"
+"diff.minus" = "base08"
+
+"diagnostic" = { modifiers = ["underlined"] }
+"ui.gutter" = { bg = "base01" }
+"info" = "base0D"
+"hint" = "base03"
+"debug" = "base03"
+"warning" = "base09"
+"error" = "base08"
+
+[palette]
+base00 = "#322a2d" # Default Background
+base01 = "#2c2528" # Lighter Background (Used for status bars, line number and folding marks)
+base02 = "#997582" # Selection Background
+base03 = "#585858" # Comments, Invisibles, Line Highlighting
+base04 = "#322a2d" # Dark Foreground (Used for status bars)
+base05 = "#cbbec2" # Default Foreground, Caret, Delimiters, Operators
+base06 = "#e8e8e8" # Light Foreground (Not often used)
+base07 = "#f8f8f8" # Light Background (Not often used)
+base08 = "#e4b781" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
+base09 = "#d5971a" # Integers, Boolean, Constants, XML Attributes, Markup Link Url
+base0A = "#df769b" # Classes, Markup Bold, Search Text Background
+base0B = "#49e9a6" # Strings, Inherited Class, Markup Code, Diff Inserted
+base0C = "#16b673" # Support, Regular Expressions, Escape Characters, Markup Quotes
+base0D = "#16a3b6" # Functions, Methods, Attribute IDs, Headings
+base0E = "#ba8baf" # Keywords, Storage, Selector, Markup Italic, Diff Changed
+base0F = "#d67e5c" # Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
+base10 = "#b0b0ff" # Types
diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml
index a61c1715..3b994bb5 100644
--- a/runtime/themes/nord.toml
+++ b/runtime/themes/nord.toml
@@ -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"
diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml
index f0575880..09b1e25c 100644
--- a/runtime/themes/rose_pine.toml
+++ b/runtime/themes/rose_pine.toml
@@ -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"
diff --git a/runtime/themes/rose_pine_dawn.toml b/runtime/themes/rose_pine_dawn.toml
index 5ad304e3..9ba0959d 100644
--- a/runtime/themes/rose_pine_dawn.toml
+++ b/runtime/themes/rose_pine_dawn.toml
@@ -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"
diff --git a/runtime/themes/serika-dark.toml b/runtime/themes/serika-dark.toml
index 3dd982d1..3b4bc60f 100644
--- a/runtime/themes/serika-dark.toml
+++ b/runtime/themes/serika-dark.toml
@@ -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"
diff --git a/runtime/themes/serika-light.toml b/runtime/themes/serika-light.toml
index 67c8328b..3b0f8fb4 100644
--- a/runtime/themes/serika-light.toml
+++ b/runtime/themes/serika-light.toml
@@ -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"
diff --git a/runtime/themes/snazzy.toml b/runtime/themes/snazzy.toml
index c0547f33..da47fd63 100644
--- a/runtime/themes/snazzy.toml
+++ b/runtime/themes/snazzy.toml
@@ -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" }
diff --git a/runtime/themes/solarized_dark.toml b/runtime/themes/solarized_dark.toml
index f15e1fa0..d8126f6e 100644
--- a/runtime/themes/solarized_dark.toml
+++ b/runtime/themes/solarized_dark.toml
@@ -39,7 +39,7 @@
# 背景
"ui.background" = { bg = "base03" }
-"ui.virtual" = { fg = "base01" }
+"ui.virtual.whitespace" = { fg = "base01" }
# 行号栏
"ui.linenr" = { fg = "base0", bg = "base02" }
diff --git a/runtime/themes/solarized_light.toml b/runtime/themes/solarized_light.toml
index eec4220d..cd1028bd 100644
--- a/runtime/themes/solarized_light.toml
+++ b/runtime/themes/solarized_light.toml
@@ -40,7 +40,7 @@
# background
"ui.background" = { bg = "base03" }
-"ui.virtual" = { fg = "base01" }
+"ui.virtual.whitespace" = { fg = "base01" }
# 行号栏
# line number column
diff --git a/runtime/themes/spacebones_light.toml b/runtime/themes/spacebones_light.toml
index 80a19375..b088e2d3 100644
--- a/runtime/themes/spacebones_light.toml
+++ b/runtime/themes/spacebones_light.toml
@@ -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"] }