Skip to content

Commit

Permalink
add tree-sitter-regex (#1362)
Browse files Browse the repository at this point in the history
* add tree-sitter-regex

* adapt regex highlights from upstream

* inject regex into elixir sigil_r/2 and sigil_R/2

* generate lang-support docs

* capture interesting nodes in character-ranges

* make $.character_class captures more consistent

* fix fallthrough behavior for character classes

* capture pattern characters as 'string'

* use latest tree-sitter-regex

* set elixir regex injections as combined

* add link to upstream queries

* inject regex in rust into 'Regex::new' raw string literals
  • Loading branch information
the-mikedavis authored Jan 6, 2022
1 parent 2e02a1d commit a8fd33a
Show file tree
Hide file tree
Showing 7 changed files with 87 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -190,3 +190,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 @@ -38,6 +38,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 @@ -530,3 +530,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"))

0 comments on commit a8fd33a

Please sign in to comment.