Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add tree-sitter-regex #1362

Merged
merged 12 commits into from
Jan 6, 2022
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -182,3 +182,7 @@
path = helix-syntax/languages/tree-sitter-git-rebase
url = https://github.com/the-mikedavis/tree-sitter-git-rebase.git
shallow = true
[submodule "helix-syntax/languages/tree-sitter-regex"]
path = helix-syntax/languages/tree-sitter-regex
url = https://github.com/tree-sitter/tree-sitter-regex.git
shallow = true
1 change: 1 addition & 0 deletions book/src/generated/lang-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
| protobuf | ✓ | | ✓ | |
| python | ✓ | ✓ | ✓ | `pylsp` |
| racket | | | | `racket` |
| regex | ✓ | | | |
| ruby | ✓ | | ✓ | `solargraph` |
| rust | ✓ | ✓ | ✓ | `rust-analyzer` |
| scala | ✓ | | ✓ | `metals` |
Expand Down
1 change: 1 addition & 0 deletions helix-syntax/languages/tree-sitter-regex
Submodule tree-sitter-regex added at e1cfca
7 changes: 7 additions & 0 deletions languages.toml
Original file line number Diff line number Diff line change
Expand Up @@ -499,3 +499,10 @@ file-types = ["git-rebase-todo"]
injection-regex = "git-rebase"
comment-token = "#"
indent = { tab-width = 2, unit = " " }

[[language]]
name = "regex"
scope = "source.regex"
injection-regex = "regex"
file-types = ["regex"]
roots = []
7 changes: 7 additions & 0 deletions runtime/queries/elixir/injections.scm
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
((comment) @injection.content
(#set! injection.language "comment"))

((sigil
(sigil_name) @_sigil_name
(quoted_content) @injection.content)
(#match? @_sigil_name "^(r|R)$")
(#set! injection.language "regex")
(#set! injection.combined))
53 changes: 53 additions & 0 deletions runtime/queries/regex/highlights.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
; upstream: https://github.com/tree-sitter/tree-sitter-regex/blob/e1cfca3c79896ff79842f057ea13e529b66af636/queries/highlights.scm

[
"("
")"
"(?"
"(?:"
"(?<"
">"
"["
"]"
"{"
"}"
] @punctuation.bracket

[
"*"
"+"
"|"
"="
"<="
"!"
"<!"
"?"
] @operator

[
(identity_escape)
(control_letter_escape)
(character_class_escape)
(control_escape)
(start_assertion)
(end_assertion)
(boundary_assertion)
(non_boundary_assertion)
] @constant.character.escape

(group_name) @property

(count_quantifier
[
(decimal_digits) @constant.numeric
"," @punctuation.delimiter
])

(character_class
[
"^" @operator
(class_range "-" @operator)
])

(class_character) @constant.character
(pattern_character) @string
14 changes: 14 additions & 0 deletions runtime/queries/rust/injections.scm
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,17 @@
(token_tree) @injection.content)
(#set! injection.language "rust")
(#set! injection.include-children))

(call_expression
function: (scoped_identifier
path: (identifier) @_regex (#eq? @_regex "Regex")
name: (identifier) @_new (#eq? @_new "new"))
arguments: (arguments (raw_string_literal) @injection.content)
(#set! injection.language "regex"))

(call_expression
function: (scoped_identifier
path: (scoped_identifier (identifier) @_regex (#eq? @_regex "Regex") .)
name: (identifier) @_new (#eq? @_new "new"))
arguments: (arguments (raw_string_literal) @injection.content)
(#set! injection.language "regex"))