Merge remote-tracking branch 'origin/master' into debug

4 files changed, 263 insertions, 3 deletions

diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml
index 78736c3b..a619f902 100644
--- a/runtime/themes/nord.toml
+++ b/runtime/themes/nord.toml
@@ -10,11 +10,11 @@
 # Polar Night
 # nord0 - background color
 "ui.background" = { bg = "nord0" }
-"ui.statusline.inactive" = { fg = "nord4", bg = "nord0" }
+"ui.statusline.inactive" = { fg = "nord8", bg = "nord1" }
 
 
 # nord1 - status bars, panels, modals, autocompletion
-"ui.statusline" = { fg = "nord8", bg = "nord1" }
+"ui.statusline" = { fg = "nord4", bg = "#4c566a" }
 "ui.popup" = { bg = "#232d38" }
 "ui.window" = { bg = "#232d38" }
 "ui.help" = { bg = "#232d38", fg = "nord4" }
@@ -25,7 +25,7 @@
 
 # nord3 - comments, nord3 based lighter color
 # relative: https://github.com/arcticicestudio/nord/issues/94
-"comment" = "gray"
+"comment" = { fg = "gray", modifiers = ["italic"] }
 "ui.linenr" = { fg = "gray" }
 
 # Snow Storm
diff --git a/runtime/themes/solarized_dark.toml b/runtime/themes/solarized_dark.toml
new file mode 100644
index 00000000..afcafd54
--- /dev/null
+++ b/runtime/themes/solarized_dark.toml
@@ -0,0 +1,97 @@
+"attribute" = { fg = "violet" }
+"keyword" = { fg = "green" }
+"keyword.directive" = { fg = "orange" }
+"namespace" = { fg = "violet" }
+"operator" = { fg = "green" }
+"special" = { fg = "orange" }
+"variable.builtin" = { fg = "cyan", modifiers = ["bold"] }
+"variable.function" = { fg = "blue" }
+"type" = { fg = "yellow" }
+"type.builtin" = { fg = "yellow", modifiers = ["bold"] }
+"constructor" = { fg = "blue" }
+"function" = { fg = "blue" }
+"function.macro" = { fg = "magenta" }
+"function.builtin" = { fg = "blue", modifiers = ["bold"] }
+"function.special" = { fg = "magenta" }
+"comment" = { fg = "base01" }
+"string" = { fg = "cyan" }
+"constant" = { fg = "cyan" }
+"constant.builtin" = { fg = "cyan", modifiers = ["bold"] }
+"constant.character.escape" = { fg = "red", modifiers = ["bold"] }
+"label" = { fg = "green" }
+"module" = { fg = "violet" }
+"tag" = { fg = "magenta" }
+
+# 背景
+"ui.background" = { bg = "base03" }
+
+# 行号栏
+"ui.linenr" = { fg = "base0", bg = "base02" }
+# 当前行号栏
+"ui.linenr.selected" = { fg = "red", modifiers = ["bold"] }
+
+# 状态栏
+"ui.statusline" = { fg = "base02", bg = "base1" }
+# 非活动状态栏
+"ui.statusline.inactive" = { fg = "base02", bg = "base00" }
+
+# 补全窗口, preview窗口
+"ui.popup" = { bg = "base1" }
+# 影响 补全选中 cmd弹出信息选中
+"ui.menu.selected" = { fg = "base02", bg = "violet"}
+"ui.menu" = { fg = "base02" }
+# ??
+"ui.window" = { fg = "base3" }
+# 命令行 补全的帮助信息
+"ui.help" = { modifiers = ["reversed"] }
+
+# 快捷键窗口 
+"ui.info" = { bg = "base1" }
+# 快捷键字体
+"ui.info.text" = {fg = "base02", modifiers = ["bold"]}
+
+# 普通ui的字体样式
+"ui.text" = { fg = "base1" }
+# 影响 picker列表选中, 快捷键帮助窗口文本
+"ui.text.focus" = { fg = "blue", modifiers = ["bold"]}
+# file picker中， 预览的当前选中项
+"ui.highlight" = { fg = "red", modifiers = ["bold", "italic", "underlined"] }
+
+# 主光标/selectio
+"ui.cursor.primary" = {fg = "base03", bg = "base1"}
+"ui.selection.primary" = { fg = "base03", bg = "base01" }
+"ui.cursor.select" = {fg = "base02", bg = "green"}
+"ui.selection" = { fg = "base02", bg = "yellow" }
+
+# normal模式的光标
+"ui.cursor" = {fg = "base03", bg = "green"}
+"ui.cursor.insert" = {fg = "base03", bg = "base3"}
+# 当前光标匹配的标点符号
+"ui.cursor.match" = {modifiers = ["reversed"]}
+
+"warning" =  { fg = "orange", modifiers= ["bold", "underlined"] }
+"error" = { fg = "red", modifiers= ["bold", "underlined"] }
+"info" = { fg = "blue", modifiers= ["bold", "underlined"] }
+"hint" = { fg = "base01", modifiers= ["bold", "underlined"] }
+"diagnostic" = { mdifiers = ["underlined"] }
+
+[palette]
+# 深色 越来越深
+base03  = "#002b36"
+base02  = "#073642"
+base01  = "#586e75"
+base00  = "#657b83"
+base0   = "#839496"
+base1   = "#93a1a1"
+base2   = "#eee8d5"
+base3   = "#fdf6e3"
+
+# 浅色 越來越浅
+yellow  = "#b58900"
+orange  = "#cb4b16"
+red     = "#dc322f"
+magenta = "#d33682"
+violet  = "#6c71c4"
+blue    = "#268bd2"
+cyan    = "#2aa198"
+green   = "#859900"
diff --git a/runtime/themes/solarized_light.toml b/runtime/themes/solarized_light.toml
new file mode 100644
index 00000000..aec5bf48
--- /dev/null
+++ b/runtime/themes/solarized_light.toml
@@ -0,0 +1,98 @@
+"attribute" = { fg = "violet" }
+"keyword" = { fg = "green" }
+"keyword.directive" = { fg = "orange" }
+"namespace" = { fg = "violet" }
+"operator" = { fg = "green" }
+"special" = { fg = "orange" }
+"variable.builtin" = { fg = "cyan", modifiers = ["bold"] }
+"variable.function" = { fg = "blue" }
+"type" = { fg = "yellow" }
+"type.builtin" = { fg = "yellow", modifiers = ["bold"] }
+"constructor" = { fg = "blue" }
+"function" = { fg = "blue" }
+"function.macro" = { fg = "magenta" }
+"function.builtin" = { fg = "blue", modifiers = ["bold"] }
+"function.special" = { fg = "magenta" }
+"comment" = { fg = "base01" }
+"string" = { fg = "cyan" }
+"constant" = { fg = "cyan" }
+"constant.builtin" = { fg = "cyan", modifiers = ["bold"] }
+"constant.character.escape" = { fg = "red", modifiers = ["bold"] }
+"label" = { fg = "green" }
+"module" = { fg = "violet" }
+"tag" = { fg = "magenta" }
+
+# 背景
+"ui.background" = { bg = "base03" }
+
+# 行号栏
+"ui.linenr" = { fg = "base0", bg = "base02" }
+# 当前行号栏
+"ui.linenr.selected" = { fg = "red", modifiers = ["bold"] }
+
+# 状态栏
+"ui.statusline" = { fg = "base02", bg = "base1" }
+# 非活动状态栏
+"ui.statusline.inactive" = { fg = "base02", bg = "base00" }
+
+# 补全窗口, preview窗口
+"ui.popup" = { bg = "base1" }
+# 影响 补全选中 cmd弹出信息选中
+"ui.menu.selected" = { fg = "base02", bg = "violet"}
+"ui.menu" = { fg = "base02" }
+# ??
+"ui.window" = { fg = "base3" }
+# 命令行 补全的帮助信息
+"ui.help" = { modifiers = ["reversed"] }
+
+# 快捷键窗口 
+"ui.info" = { bg = "base1" }
+# 快捷键字体
+"ui.info.text" = {fg = "base02", modifiers = ["bold"]}
+
+# 普通ui的字体样式
+"ui.text" = { fg = "base1" }
+# 影响 picker列表选中, 快捷键帮助窗口文本
+"ui.text.focus" = { fg = "blue", modifiers = ["bold"]}
+# file picker中， 预览的当前选中项
+"ui.highlight" = { fg = "red", modifiers = ["bold", "italic", "underlined"] }
+
+# 主光标/selectio
+"ui.cursor.primary" = {fg = "base03", bg = "base1"}
+"ui.selection.primary" = { fg = "base03", bg = "base01" }
+"ui.cursor.select" = {fg = "base02", bg = "green"}
+"ui.selection" = { fg = "base02", bg = "yellow" }
+
+# normal模式的光标
+"ui.cursor" = {fg = "base03", bg = "green"}
+"ui.cursor.insert" = {fg = "base03", bg = "base3"}
+# 当前光标匹配的标点符号
+"ui.cursor.match" = {modifiers = ["reversed"]}
+
+"warning" =  { fg = "orange", modifiers= ["bold", "underlined"] }
+"error" = { fg = "red", modifiers= ["bold", "underlined"] }
+"info" = { fg = "blue", modifiers= ["bold", "underlined"] }
+"hint" = { fg = "base01", modifiers= ["bold", "underlined"] }
+"diagnostic" = { mdifiers = ["underlined"] }
+
+[palette]
+red     	= '#dc322f'
+green   	= '#859900'
+yellow  	= '#b58900'
+blue    	= '#268bd2'
+magenta 	= '#d33682'
+cyan    	= '#2aa198'
+orange  	= '#cb4b16'
+violet  	= '#6c71c4'
+
+# 深色 越来越深
+base0   	= '#657b83'
+base1   	= '#586e75'
+base2   	= '#073642'
+base3   	= '#002b36'
+
+## 浅色 越來越浅
+base00  	= '#839496'
+base01  	= '#93a1a1'
+base02  	= '#eee8d5'
+base03  	= '#fdf6e3'
diff --git a/runtime/themes/spacebones_light.toml b/runtime/themes/spacebones_light.toml
new file mode 100644
index 00000000..92f116ab
--- /dev/null
+++ b/runtime/themes/spacebones_light.toml
@@ -0,0 +1,65 @@
+# Author : Koen Van der Auwera <atog@hey.com>
+# Based on SpaceBones Light https://github.com/chipotle/spacebones
+# https://github.com/chipotle/spacebones/blob/main/SpaceBones%20Light.bbColorScheme
+
+"attribute" = "#b1951d"
+"keyword" = { fg = "#3a81c3" }
+"keyword.directive" = "#3a81c3"
+"namespace" = "#b1951d"
+"punctuation" = "#6c3163"
+"punctuation.delimiter" = "#6c3163"
+"operator" = "#ba2f59"
+"special" = "#ba2f59"
+"property" = "#7590db"
+"variable.property" = "#7590db"
+"variable" = "#715ab1"
+"variable.builtin" = "#715ab1"
+"variable.parameter" = "#7590db"
+"type" = "#6c3163"
+"type.builtin" = "#6c3163"
+"constructor" = { fg = "#4e3163", modifiers = ["bold"] }
+"function" = { fg = "#715ab1", modifiers = ["bold"] }
+"function.macro" = "#b1951d"
+"function.builtin" = "#b1951d"
+"comment" = { fg = "#a49da5", modifiers = ["italic"]  }
+"constant" = { fg = "#6c3163" }
+"constant.builtin" = { fg = "#6c3163", modifiers = ["bold"] }
+"string" = "#2d9574"
+"number" = "#6c3163"
+"escape" = { fg = "fg2", modifiers = ["bold"] }
+"label" = "#b1951d"
+"module" = "#b1951d"
+
+"warning" = { fg = "#da8b55" }
+"error" = { fg = "#e0211d" }
+"info" = { fg = "#b1951d" }
+"hint" = { fg = "#d1dcdf" }
+
+"ui.background" = { bg = "bg0" }
+"ui.linenr" = { fg = "bg3" }
+"ui.linenr.selected" = { fg = "#b1951d" }
+"ui.statusline" = { fg = "fg1", bg = "bg2" }
+"ui.statusline.inactive" = { fg = "fg4", bg = "bg1" }
+"ui.popup" = { bg = "bg1" }
+"ui.window" = { bg = "bg1" }
+"ui.help" = { bg = "bg1", fg = "fg1" }
+"ui.text" = { fg = "fg1" }
+"ui.text.focus" = { fg = "fg1" }
+"ui.selection" = { bg = "bg3", modifiers = ["reversed"] }
+"ui.cursor.primary" = { modifiers = ["reversed"] }
+"ui.cursor.match" = { modifiers = ["reversed"] }
+"ui.menu" = { fg = "fg1", bg = "bg2" }
+"ui.menu.selected" = { fg = "#655370", bg = "#d1dcdf", modifiers = ["bold"] }
+
+"diagnostic" = { modifiers = ["underlined"] }
+
+[palette]
+bg0 = "#fbf8ef"
+bg1 = "#efeae9"
+bg2 = "#d1dcdf"
+bg3 = "#b4c6cb"
+
+fg1 = "#655370"
+fg2 = "#5f3bc4"
+fg3 = "#bdae93"
+fg4 = "#a89984"