From 78b615529214333d2fb5dcf5626e0162d449cc66 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Fri, 17 Dec 2021 16:54:18 +0900
Subject: Partly fix julia's locals.scm

---
 runtime/queries/julia/locals.scm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'runtime/queries/julia')

diff --git a/runtime/queries/julia/locals.scm b/runtime/queries/julia/locals.scm
index f8b34f71..d5ac794e 100644
--- a/runtime/queries/julia/locals.scm
+++ b/runtime/queries/julia/locals.scm
@@ -2,24 +2,24 @@
 (import_statement
  (identifier) @definition.import)
 (variable_declaration
- (identifier) @definition.var)
+ (identifier) @local.definition)
 (variable_declaration
  (tuple_expression
-  (identifier) @definition.var))
+  (identifier) @local.definition))
 (for_binding
- (identifier) @definition.var)
+ (identifier) @local.definition)
 (for_binding
  (tuple_expression
-  (identifier) @definition.var))
+  (identifier) @local.definition))
 
 (assignment_expression
  (tuple_expression
-  (identifier) @definition.var))
+  (identifier) @local.definition))
 (assignment_expression
  (bare_tuple_expression
-  (identifier) @definition.var))
+  (identifier) @local.definition))
 (assignment_expression
- (identifier) @definition.var)
+ (identifier) @local.definition)
 
 (type_parameter_list
   (identifier) @definition.type)
@@ -43,11 +43,11 @@
  (identifier) @definition.parameter)
 
 (function_definition
- name: (identifier) @definition.function) @scope
+ name: (identifier) @definition.function) @local.scope
 (macro_definition 
- name: (identifier) @definition.macro) @scope
+ name: (identifier) @definition.macro) @local.scope
 
-(identifier) @reference
+(identifier) @local.reference
 
 [
   (try_statement)
@@ -56,4 +56,4 @@
   (let_statement)
   (compound_expression)
   (for_statement)
-] @scope
+] @local.scope
-- 
cgit v1.2.3-70-g09d2


From e72786df8eae5684c0330be18f190a33f516da76 Mon Sep 17 00:00:00 2001
From: Michael Davis
Date: Sun, 19 Dec 2021 08:56:56 -0600
Subject: Add tree-sitter-comment (#1300)

* Add tree-sitter-comment

Fix #1164

* fix precedence in tree-sitter-comment highlights

connects https://github.com/helix-editor/helix/pull/1170

* set injection-regex for comment language

* remove comment filetype

* fix comment injections for neovim-style injections tags

* add comment injections for elixir

* remove f.comment

* fix spacing in .gitmodules

* run 'cargo xtask docgen'

Co-authored-by: Ivan Tham <pickfire@riseup.net>---
 .gitmodules                                |  4 ++++
 book/src/generated/lang-support.md         |  1 +
 helix-syntax/languages/tree-sitter-comment |  1 +
 languages.toml                             |  9 ++++++++-
 runtime/queries/comment/highlights.scm     | 30 ++++++++++++++++++++++++++++++
 runtime/queries/elixir/injections.scm      |  2 ++
 runtime/queries/glsl/injections.scm        |  6 ++++--
 runtime/queries/julia/injections.scm       |  8 +++++---
 runtime/queries/ledger/injections.scm      |  4 ++--
 runtime/queries/python/injections.scm      |  2 ++
 runtime/queries/rust/injections.scm        |  3 +++
 runtime/queries/svelte/injections.scm      |  4 ++--
 runtime/queries/tsq/injections.scm         |  2 ++
 13 files changed, 66 insertions(+), 10 deletions(-)
 create mode 160000 helix-syntax/languages/tree-sitter-comment
 create mode 100644 runtime/queries/comment/highlights.scm
 create mode 100644 runtime/queries/elixir/injections.scm
 create mode 100644 runtime/queries/python/injections.scm
 create mode 100644 runtime/queries/tsq/injections.scm

(limited to 'runtime/queries/julia')

diff --git a/.gitmodules b/.gitmodules
index a899c778..c7b81336 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -142,6 +142,10 @@
 	path = helix-syntax/languages/tree-sitter-perl
 	url = https://github.com/ganezdragon/tree-sitter-perl
 	shallow = true
+[submodule "helix-syntax/languages/tree-sitter-comment"]
+	path = helix-syntax/languages/tree-sitter-comment
+	url = https://github.com/stsewd/tree-sitter-comment
+	shallow = true
 [submodule "helix-syntax/languages/tree-sitter-wgsl"]
 	path = helix-syntax/languages/tree-sitter-wgsl
 	url = https://github.com/szebniok/tree-sitter-wgsl
diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 3255b9af..cb91872b 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -4,6 +4,7 @@
 | c | ✓ |  |  | `clangd` |
 | c-sharp | ✓ |  |  |  |
 | cmake | ✓ |  |  | `cmake-language-server` |
+| comment | ✓ |  |  |  |
 | cpp | ✓ |  |  | `clangd` |
 | css | ✓ |  |  |  |
 | dart | ✓ |  | ✓ | `dart` |
diff --git a/helix-syntax/languages/tree-sitter-comment b/helix-syntax/languages/tree-sitter-comment
new file mode 160000
index 00000000..5dd3c62f
--- /dev/null
+++ b/helix-syntax/languages/tree-sitter-comment
@@ -0,0 +1 @@
+Subproject commit 5dd3c62f1bbe378b220fe16b317b85247898639e
diff --git a/languages.toml b/languages.toml
index 5c2bc8bb..0695022e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -406,6 +406,13 @@ shebangs = ["racket"]
 comment-token = ";"
 language-server = { command = "racket", args = ["-l", "racket-langserver"] }
 
+[[language]]
+name = "comment"
+scope = "scope.comment"
+roots = []
+file-types = []
+injection-regex = "comment"
+
 [[language]]
 name = "wgsl"
 scope = "source.wgsl"
@@ -448,4 +455,4 @@ roots = ["build.sbt"]
 file-types = ["scala", "sbt"]
 comment-token = "//"
 indent = { tab-width = 2, unit = "  " }
-language-server = { command = "metals" }
\ No newline at end of file
+language-server = { command = "metals" }
diff --git a/runtime/queries/comment/highlights.scm b/runtime/queries/comment/highlights.scm
new file mode 100644
index 00000000..88685d59
--- /dev/null
+++ b/runtime/queries/comment/highlights.scm
@@ -0,0 +1,30 @@
+[
+ "("
+ ")"
+] @punctuation.bracket
+
+":" @punctuation.delimiter
+
+((tag (name) @warning)
+ (#match? @warning "^(TODO|HACK|WARNING)$"))
+
+("text" @warning
+ (#match? @warning "^(TODO|HACK|WARNING)$"))
+
+((tag (name) @error)
+ (match? @error "^(FIXME|XXX|BUG)$"))
+
+("text" @error
+ (match? @error "^(FIXME|XXX|BUG)$"))
+
+(tag
+ (name) @ui.text
+ (user)? @constant)
+
+; Issue number (#123)
+("text" @constant.numeric
+ (#match? @constant.numeric "^#[0-9]+$"))
+
+; User mention (@user)
+("text" @tag
+ (#match? @tag "^[@][a-zA-Z0-9_-]+$"))
diff --git a/runtime/queries/elixir/injections.scm b/runtime/queries/elixir/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/elixir/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/glsl/injections.scm b/runtime/queries/glsl/injections.scm
index 7d3323b1..b01b8b4b 100644
--- a/runtime/queries/glsl/injections.scm
+++ b/runtime/queries/glsl/injections.scm
@@ -1,3 +1,5 @@
-(preproc_arg) @glsl
+((preproc_arg) @injection.content
+ (#set! injection.language "glsl"))
 
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/julia/injections.scm b/runtime/queries/julia/injections.scm
index be2412c0..3cf7339f 100644
--- a/runtime/queries/julia/injections.scm
+++ b/runtime/queries/julia/injections.scm
@@ -1,5 +1,7 @@
 ; TODO: re-add when markdown is added.
-; ((triple_string) @markdown
-;   (#offset! @markdown 0 3 0 -3))
+; ((triple_string) @injection.content
+;  (#offset! @injection.content 0 3 0 -3)
+;  (#set! injection.language "markdown"))
 
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/ledger/injections.scm b/runtime/queries/ledger/injections.scm
index 2d948141..c1714786 100644
--- a/runtime/queries/ledger/injections.scm
+++ b/runtime/queries/ledger/injections.scm
@@ -1,2 +1,2 @@
-(comment) @comment
-(note) @comment
+([(comment) (note)] @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/python/injections.scm b/runtime/queries/python/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/python/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/rust/injections.scm b/runtime/queries/rust/injections.scm
index 6035d418..d8382e49 100644
--- a/runtime/queries/rust/injections.scm
+++ b/runtime/queries/rust/injections.scm
@@ -1,3 +1,6 @@
+([(line_comment) (block_comment)] @injection.content
+ (#set! injection.language "comment"))
+
 ((macro_invocation
   (token_tree) @injection.content)
  (#set! injection.language "rust")
diff --git a/runtime/queries/svelte/injections.scm b/runtime/queries/svelte/injections.scm
index 266f4701..04e860cf 100644
--- a/runtime/queries/svelte/injections.scm
+++ b/runtime/queries/svelte/injections.scm
@@ -26,5 +26,5 @@
   (#set! injection.language "typescript")
 )
 
-(comment) @comment
-
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/tsq/injections.scm b/runtime/queries/tsq/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/tsq/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
-- 
cgit v1.2.3-70-g09d2


From fd7080498e2580d1e59580db8fd007fb081257fd Mon Sep 17 00:00:00 2001
From: Mathis Brossier
Date: Thu, 20 Jan 2022 16:50:06 +0100
Subject: tree sitter comments injections (#1527)

* tree sitter comments injections

* trailing newlines & julia fix

* Update runtime/queries/julia/injections.scm

Co-authored-by: Michael Davis <michael.davis@nfiindustries.com>

Co-authored-by: Michael Davis <michael.davis@nfiindustries.com>---
 runtime/queries/bash/injections.scm            | 2 ++
 runtime/queries/c-sharp/injections.scm         | 2 ++
 runtime/queries/css/injections.scm             | 2 ++
 runtime/queries/dart/injections.scm            | 2 ++
 runtime/queries/go/injections.scm              | 2 ++
 runtime/queries/haskell/injections.scm         | 2 ++
 runtime/queries/html/injections.scm            | 3 +++
 runtime/queries/java/injections.scm            | 2 ++
 runtime/queries/julia/injections.scm           | 6 ++----
 runtime/queries/latex/injections.scm           | 2 ++
 runtime/queries/lua/injections.scm             | 2 ++
 runtime/queries/make/injections.scm            | 2 ++
 runtime/queries/ocaml-interface/injections.scm | 2 ++
 runtime/queries/ocaml/injections.scm           | 2 ++
 runtime/queries/perl/injections.scm            | 2 ++
 runtime/queries/php/injections.scm             | 3 +++
 runtime/queries/protobuf/injections.scm        | 2 ++
 runtime/queries/ruby/injections.scm            | 2 ++
 runtime/queries/scala/injections.scm           | 3 ++-
 runtime/queries/toml/injections.scm            | 2 ++
 runtime/queries/tsx/injections.scm             | 1 +
 runtime/queries/typescript/injections.scm      | 1 +
 runtime/queries/vue/injections.scm             | 3 +++
 runtime/queries/wgsl/injections.scm            | 2 ++
 runtime/queries/yaml/injections.scm            | 2 +-
 runtime/queries/zig/injections.scm             | 2 ++
 26 files changed, 52 insertions(+), 6 deletions(-)
 create mode 100644 runtime/queries/bash/injections.scm
 create mode 100644 runtime/queries/c-sharp/injections.scm
 create mode 100644 runtime/queries/css/injections.scm
 create mode 100644 runtime/queries/dart/injections.scm
 create mode 100644 runtime/queries/go/injections.scm
 create mode 100644 runtime/queries/haskell/injections.scm
 create mode 100644 runtime/queries/java/injections.scm
 create mode 100644 runtime/queries/latex/injections.scm
 create mode 100644 runtime/queries/lua/injections.scm
 create mode 100644 runtime/queries/make/injections.scm
 create mode 100644 runtime/queries/ocaml-interface/injections.scm
 create mode 100644 runtime/queries/ocaml/injections.scm
 create mode 100644 runtime/queries/perl/injections.scm
 create mode 100644 runtime/queries/protobuf/injections.scm
 create mode 100644 runtime/queries/ruby/injections.scm
 create mode 100644 runtime/queries/toml/injections.scm
 create mode 100644 runtime/queries/tsx/injections.scm
 create mode 100644 runtime/queries/typescript/injections.scm
 create mode 100644 runtime/queries/wgsl/injections.scm
 create mode 100644 runtime/queries/zig/injections.scm

(limited to 'runtime/queries/julia')

diff --git a/runtime/queries/bash/injections.scm b/runtime/queries/bash/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/bash/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/c-sharp/injections.scm b/runtime/queries/c-sharp/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/c-sharp/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/css/injections.scm b/runtime/queries/css/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/css/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/dart/injections.scm b/runtime/queries/dart/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/dart/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/go/injections.scm b/runtime/queries/go/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/go/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/haskell/injections.scm b/runtime/queries/haskell/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/haskell/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/html/injections.scm b/runtime/queries/html/injections.scm
index 71e7c3ae..ef58f415 100644
--- a/runtime/queries/html/injections.scm
+++ b/runtime/queries/html/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
+
 ((script_element
   (raw_text) @injection.content)
  (#set! injection.language "javascript"))
diff --git a/runtime/queries/java/injections.scm b/runtime/queries/java/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/java/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/julia/injections.scm b/runtime/queries/julia/injections.scm
index 3cf7339f..1c1e804e 100644
--- a/runtime/queries/julia/injections.scm
+++ b/runtime/queries/julia/injections.scm
@@ -1,7 +1,5 @@
-; TODO: re-add when markdown is added.
-; ((triple_string) @injection.content
-;  (#offset! @injection.content 0 3 0 -3)
-;  (#set! injection.language "markdown"))
+((triple_string) @injection.content
+ (#set! injection.language "markdown"))
 
 ((comment) @injection.content
  (#set! injection.language "comment"))
diff --git a/runtime/queries/latex/injections.scm b/runtime/queries/latex/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/latex/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/lua/injections.scm b/runtime/queries/lua/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/lua/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/make/injections.scm b/runtime/queries/make/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/make/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/ocaml-interface/injections.scm b/runtime/queries/ocaml-interface/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/ocaml-interface/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/ocaml/injections.scm b/runtime/queries/ocaml/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/ocaml/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/perl/injections.scm b/runtime/queries/perl/injections.scm
new file mode 100644
index 00000000..cab5f53d
--- /dev/null
+++ b/runtime/queries/perl/injections.scm
@@ -0,0 +1,2 @@
+((comments) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/php/injections.scm b/runtime/queries/php/injections.scm
index 16d5736b..614a3850 100644
--- a/runtime/queries/php/injections.scm
+++ b/runtime/queries/php/injections.scm
@@ -1,3 +1,6 @@
 ((text) @injection.content
  (#set! injection.language "html")
  (#set! injection.combined))
+
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/protobuf/injections.scm b/runtime/queries/protobuf/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/protobuf/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/ruby/injections.scm b/runtime/queries/ruby/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/ruby/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/scala/injections.scm b/runtime/queries/scala/injections.scm
index 4bb7d675..321c90ad 100644
--- a/runtime/queries/scala/injections.scm
+++ b/runtime/queries/scala/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/toml/injections.scm b/runtime/queries/toml/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/toml/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/tsx/injections.scm b/runtime/queries/tsx/injections.scm
new file mode 100644
index 00000000..1b61e36d
--- /dev/null
+++ b/runtime/queries/tsx/injections.scm
@@ -0,0 +1 @@
+; inherits: typescript
diff --git a/runtime/queries/typescript/injections.scm b/runtime/queries/typescript/injections.scm
new file mode 100644
index 00000000..ff0ddfac
--- /dev/null
+++ b/runtime/queries/typescript/injections.scm
@@ -0,0 +1 @@
+; inherits: javascript
diff --git a/runtime/queries/vue/injections.scm b/runtime/queries/vue/injections.scm
index 8ee34ffb..73df868b 100644
--- a/runtime/queries/vue/injections.scm
+++ b/runtime/queries/vue/injections.scm
@@ -15,3 +15,6 @@
 ((style_element
   (raw_text) @injection.content)
  (#set! injection.language "css"))
+
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/wgsl/injections.scm b/runtime/queries/wgsl/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/wgsl/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/yaml/injections.scm b/runtime/queries/yaml/injections.scm
index 39bda293..321c90ad 100644
--- a/runtime/queries/yaml/injections.scm
+++ b/runtime/queries/yaml/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content         
+((comment) @injection.content
  (#set! injection.language "comment"))
diff --git a/runtime/queries/zig/injections.scm b/runtime/queries/zig/injections.scm
new file mode 100644
index 00000000..3df95897
--- /dev/null
+++ b/runtime/queries/zig/injections.scm
@@ -0,0 +1,2 @@
+([(line_comment) (doc_comment)] @injection.content
+ (#set! injection.language "comment"))
-- 
cgit v1.2.3-70-g09d2