From e069fb9dea0d41eedb9257050f2231b7b0b88d0e Mon Sep 17 00:00:00 2001
From: Michael Davis <michael.davis@nfiindustries.com>
Date: Sat, 16 Oct 2021 03:58:04 -0500
Subject: [PATCH] Add highlight support for tree-sitter-query language (tsq)
 (#845)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add submodule on tree-sitter/tree-sitter-tsq

mark tsq submodule as shallow

* add tree-sitter-tsq to languages

* add highlight queries for tsq

* Update .gitmodules

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
---
 .gitmodules                            |  4 +++
 helix-syntax/languages/tree-sitter-tsq |  1 +
 languages.toml                         |  8 +++++
 runtime/queries/tsq/highlights.scm     | 46 ++++++++++++++++++++++++++
 4 files changed, 59 insertions(+)
 create mode 160000 helix-syntax/languages/tree-sitter-tsq
 create mode 100644 runtime/queries/tsq/highlights.scm

diff --git a/.gitmodules b/.gitmodules
index 95b3670b6..a8e6481ea 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -126,3 +126,7 @@
 	path = helix-syntax/languages/tree-sitter-vue
 	url = https://github.com/ikatyang/tree-sitter-vue
 	shallow = true
+[submodule "helix-syntax/languages/tree-sitter-tsq"]
+	path = helix-syntax/languages/tree-sitter-tsq
+	url = https://github.com/tree-sitter/tree-sitter-tsq
+	shallow = true
diff --git a/helix-syntax/languages/tree-sitter-tsq b/helix-syntax/languages/tree-sitter-tsq
new file mode 160000
index 000000000..b665659d3
--- /dev/null
+++ b/helix-syntax/languages/tree-sitter-tsq
@@ -0,0 +1 @@
+Subproject commit b665659d3238e6036e22ed0e24935e60efb39415
diff --git a/languages.toml b/languages.toml
index 7715425bf..60b996c05 100644
--- a/languages.toml
+++ b/languages.toml
@@ -328,3 +328,11 @@ language-server = { command = "swipl", args = [
     "-g", "use_module(library(lsp_server))",
     "-g", "lsp_server:main",
     "-t", "halt", "--", "stdio"] }
+
+[[language]]
+name = "tsq"
+scope = "source.tsq"
+file-types = ["scm"]
+roots = []
+comment-token = ";"
+indent = { tab-width = 2, unit = "  " }
diff --git a/runtime/queries/tsq/highlights.scm b/runtime/queries/tsq/highlights.scm
new file mode 100644
index 000000000..9ba5699a8
--- /dev/null
+++ b/runtime/queries/tsq/highlights.scm
@@ -0,0 +1,46 @@
+; mark the string passed #match? as a regex
+(((predicate_name) @function
+  (capture)
+  (string) @string.regexp)
+ (#eq? @function "#match?"))
+
+; highlight inheritance comments
+((query . (comment) @keyword.directive)
+ (#match? @keyword.directive "^;\ +inherits *:"))
+
+[
+  "("
+  ")"
+  "["
+  "]"
+] @punctuation.bracket
+
+":" @punctuation.delimiter
+
+[
+  (one_or_more)
+  (zero_or_one)
+  (zero_or_more)
+] @operator
+
+[
+  (wildcard_node)
+  (anchor)
+] @constant.builtin
+
+[
+  (anonymous_leaf)
+  (string)
+] @string
+
+(comment) @comment
+
+(field_name) @property
+
+(capture) @label
+
+(predicate_name) @function
+
+(escape_sequence) @escape
+
+(node_name) @variable