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

4 files changed, 128 insertions, 12 deletions

diff --git a/runtime/queries/llvm/highlights.scm b/runtime/queries/llvm/highlights.scm
new file mode 100644
index 00000000..73afe85e
--- /dev/null
+++ b/runtime/queries/llvm/highlights.scm
@@ -0,0 +1,14 @@
+(type) @type
+(statement) @keyword.operator
+(number) @constant.numeric.integer
+(comment) @comment
+(string) @string
+(label) @label
+(keyword) @keyword
+"ret" @keyword.control.return
+(boolean) @constant.builtin.boolean
+(float) @constant.numeric.float
+(constant) @constant
+(identifier) @variable
+(symbol) @punctuation.delimiter
+(bracket) @punctuation.bracket
diff --git a/runtime/queries/wgsl/highlights.scm b/runtime/queries/wgsl/highlights.scm
new file mode 100644
index 00000000..7fbc87d8
--- /dev/null
+++ b/runtime/queries/wgsl/highlights.scm
@@ -0,0 +1,102 @@
+(const_literal) @constant.numeric
+
+(type_declaration) @type
+
+(function_declaration
+    (identifier) @function)
+
+(struct_declaration
+    (identifier) @type)
+
+(type_constructor_or_function_call_expression
+    (type_declaration) @function)
+
+(parameter
+    (variable_identifier_declaration (identifier) @variable.parameter))
+
+[
+    "struct"
+    "bitcast"
+    ; "block"
+    "discard"
+    "enable"
+    "fallthrough"
+    "fn"
+    "let"
+    "private"
+    "read"
+    "read_write"
+    "return"
+    "storage"
+    "type"
+    "uniform"
+    "var"
+    "workgroup"
+    "write"
+    (texel_format)
+] @keyword ; TODO reserved keywords
+
+[
+    (true)
+    (false)
+] @constant.builtin.boolean
+
+[ "," "." ":" ";" ] @punctuation.delimiter
+
+;; brackets
+[
+    "("
+    ")"
+    "["
+    "]"
+    "{"
+    "}"
+] @punctuation.bracket
+
+[
+    "loop"
+    "for"
+    "break"
+    "continue"
+    "continuing"
+] @keyword.control.repeat
+
+[
+    "if"
+    "else"
+    "elseif"
+    "switch"
+    "case"
+    "default"
+] @keyword.control.conditional
+
+[
+    "&"
+    "&&"
+    "/"
+    "!"
+    "="
+    "=="
+    "!="
+    ">"
+    ">="
+    ">>"
+    "<"
+    "<="
+    "<<"
+    "%"
+    "-"
+    "+"
+    "|"
+    "||"
+    "*"
+    "~"
+    "^"
+] @operator
+
+(attribute
+    (identifier) @variable.other.member)
+
+(comment) @comment
+
+(ERROR) @error
diff --git a/runtime/themes/solarized_dark.toml b/runtime/themes/solarized_dark.toml
index afcafd54..984c86ee 100644
--- a/runtime/themes/solarized_dark.toml
+++ b/runtime/themes/solarized_dark.toml
@@ -28,18 +28,18 @@
 # 行号栏
 "ui.linenr" = { fg = "base0", bg = "base02" }
 # 当前行号栏
-"ui.linenr.selected" = { fg = "red", modifiers = ["bold"] }
+"ui.linenr.selected" = { fg = "blue", modifiers = ["bold"] }
 
 # 状态栏
-"ui.statusline" = { fg = "base02", bg = "base1" }
+"ui.statusline" = { fg = "base03", bg = "base0" }
 # 非活动状态栏
-"ui.statusline.inactive" = { fg = "base02", bg = "base00" }
+"ui.statusline.inactive" = { fg = "base1", bg = "base01" }
 
 # 补全窗口, preview窗口
-"ui.popup" = { bg = "base1" }
+"ui.popup" = { bg = "base02" }
 # 影响 补全选中 cmd弹出信息选中
-"ui.menu.selected" = { fg = "base02", bg = "violet"}
-"ui.menu" = { fg = "base02" }
+"ui.menu.selected" = { fg = "base02", bg = "base2"}
+"ui.menu" = { fg = "base1" }
 # ??
 "ui.window" = { fg = "base3" }
 # 命令行 补全的帮助信息
diff --git a/runtime/themes/solarized_light.toml b/runtime/themes/solarized_light.toml
index aec5bf48..0ab1b962 100644
--- a/runtime/themes/solarized_light.toml
+++ b/runtime/themes/solarized_light.toml
@@ -28,18 +28,18 @@
 # 行号栏
 "ui.linenr" = { fg = "base0", bg = "base02" }
 # 当前行号栏
-"ui.linenr.selected" = { fg = "red", modifiers = ["bold"] }
+"ui.linenr.selected" = { fg = "blue", modifiers = ["bold"] }
 
 # 状态栏
-"ui.statusline" = { fg = "base02", bg = "base1" }
+"ui.statusline" = { fg = "base03", bg = "base0" }
 # 非活动状态栏
-"ui.statusline.inactive" = { fg = "base02", bg = "base00" }
+"ui.statusline.inactive" = { fg = "base1", bg = "base01" }
 
 # 补全窗口, preview窗口
-"ui.popup" = { bg = "base1" }
+"ui.popup" = { bg = "base02" }
 # 影响 补全选中 cmd弹出信息选中
-"ui.menu.selected" = { fg = "base02", bg = "violet"}
-"ui.menu" = { fg = "base02" }
+"ui.menu.selected" = { fg = "base02", bg = "base2"}
+"ui.menu" = { fg = "base1" }
 # ??
 "ui.window" = { fg = "base3" }
 # 命令行 补全的帮助信息