From 4ec20eaeffa6144f01ae8d5a95b12ea1593f3080 Mon Sep 17 00:00:00 2001
From: Kirawi
Date: Fri, 26 Nov 2021 21:19:40 -0500
Subject: Add language support for WGSL (#1166)

---
 runtime/queries/wgsl/highlights.scm | 102 ++++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 runtime/queries/wgsl/highlights.scm

(limited to 'runtime/queries')

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
-- 
cgit v1.2.3-70-g09d2


From 6f1a7b1220c2ae565a2542fb089eb6d87f0a9421 Mon Sep 17 00:00:00 2001
From: Kirawi
Date: Sun, 28 Nov 2021 20:38:17 -0500
Subject: Add llvm grammar (#1167)

---
 .gitmodules                         |  4 ++++
 book/src/themes.md                  |  5 +++--
 languages.toml                      |  8 ++++++++
 runtime/queries/llvm/highlights.scm | 14 ++++++++++++++
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 runtime/queries/llvm/highlights.scm

(limited to 'runtime/queries')

diff --git a/.gitmodules b/.gitmodules
index 039a3ee3..6295b9e9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -146,3 +146,7 @@
 	path = helix-syntax/languages/tree-sitter-wgsl
 	url = https://github.com/szebniok/tree-sitter-wgsl
 	shallow = true
+[submodule "helix-syntax/tree-sitter-llvm"]
+	path = helix-syntax/languages/tree-sitter-llvm
+	url = https://github.com/benwilliamgraham/tree-sitter-llvm
+	shallow = true
diff --git a/book/src/themes.md b/book/src/themes.md
index ecbbb6e9..fd3f5b1e 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -145,11 +145,12 @@ We use a similar set of scopes as
     - `conditional` - `if`, `else`
     - `repeat` - `for`, `while`, `loop`
     - `import` - `import`, `export`
-    - (TODO: return?)
+    - `return`
+  - `operator` - `or`, `in`
   - `directive` - Preprocessor directives (`#if` in C) 
   - `function` - `fn`, `func`
 
-- `operator` - `||`, `+=`, `>`, `or`
+- `operator` - `||`, `+=`, `>`
 
 - `function`
   - `builtin`
diff --git a/languages.toml b/languages.toml
index 5dcbd872..4208e4b6 100644
--- a/languages.toml
+++ b/languages.toml
@@ -413,3 +413,11 @@ file-types = ["wgsl"]
 roots = []
 comment-token = "//"
 indent = { tab-width = 4, unit = "    " }
+
+[[language]]
+name = "llvm"
+scope = "source.llvm"
+roots = []
+file-types = ["ll"]
+comment-token = ";"
+indent = { tab-width = 2, unit = "  " }
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
-- 
cgit v1.2.3-70-g09d2