Update injections & highlights, add folds

3 files changed, 154 insertions, 123 deletions

diff --git a/queries/elixir/folds.scm b/queries/elixir/folds.scm
index 91d54b4d4..b99a6d9e0 100644
--- a/queries/elixir/folds.scm
+++ b/queries/elixir/folds.scm
@@ -1,9 +1,9 @@
 [
-  (do_block)
   (anonymous_function)
-  (map)
-  (struct)
+  (arguments)
+  (block)
+  (do_block)
   (list)
-  (keyword_list)
-  (heredoc)
+  (map)
+  (tuple)
 ] @fold
diff --git a/queries/elixir/highlights.scm b/queries/elixir/highlights.scm
index 408d271b8..2cb14c109 100644
--- a/queries/elixir/highlights.scm
+++ b/queries/elixir/highlights.scm
@@ -1,10 +1,9 @@
-; Punctuation delimiters
+; Punctuation
 [
-  "%"
   ","
+  ";"
 ] @punctuation.delimiter
 
-; Punctuation brackets
 [
   "("
   ")"
@@ -16,105 +15,37 @@
   "}"
 ] @punctuation.bracket
 
-; Operators
 [
-  "!"
-  "!="
-  "!=="
-  "&"
-  "&&"
-  "&&&"
-  "*"
-  "**"
-  "+"
-  "++"
-  "+++"
-  "-"
-  "--"
-  "---"
-  "."
-  ".."
-  "/"
-  "//"
-  "::"
-  "<"
-  "<-"
-  "<<<"
-  "<<~"
-  "<="
-  "<>"
-  "<|>"
-  "<~"
-  "<~>"
-  "="
-  "=="
-  "==="
-  "=>"
-  "=~"
-  ">"
-  ">="
-  ">>>"
-  "@"
-  "^"
-  "and"
-  "in"
-  "not"
-  "or"
-  "when"
-  "|"
-  "|>"
-  "||"
-  "|||"
-  "~>"
-  "~>>"
-  "~~~"
-  "~"
-] @operator
-
-; Do/Fn blocks
-[
-  "do"
-  "end"
-  "fn"
-] @keyword
+  "%"
+] @punctuation.special
 
-; Exception blocks
-[
-  "catch"
-  "rescue" 
-] @exception
+; Identifiers
+(identifier) @variable
 
-; Conditional blocks
-[ 
-  "else" 
-] @conditional
+; Unused identifiers
+((identifier) @comment (#match? @comment 
+  "^_"
+))
 
 ; Comments
 (comment) @comment
 
-; Parser errors
-(ERROR) @error
-
-; Sigils
-(sigil (sigil_name) @operator quoted_start: _ @operator quoted_end: _ @operator)
+; Strings
+(string) @string
 
 ; Modules
 (alias) @type
 
-; Atoms
+; Atoms & Keywords
 [
   (atom)
   (quoted_atom) 
+  (keyword)
+  (quoted_keyword)
 ] @symbol
 
-; Keywords
-(keyword) @symbol
-
-; Strings
-(string) @string
-
 ; Interpolation
-(interpolation "#{" @string.escape (_)? "}" @string.escape)
+(interpolation "#{" @string.escape "}" @string.escape)
 
 ; Escape sequences
 (escape_sequence) @string.escape
@@ -137,6 +68,21 @@
 ; Nil
 (nil) @constant.builtin
 
+; Operators
+(operator_identifier) @operator
+
+(unary_operator
+  operator: _ @operator)
+
+(binary_operator
+  operator: _ @operator)
+
+(dot
+  operator: _ @operator)
+
+(stab_clause
+  operator: _ @operator)
+
 ; Calling a local function
 (call target: (identifier) @function) 
 
@@ -146,48 +92,51 @@
   (_)
 ] right: (identifier) @function) (arguments))
 
-; Module attributes
-(unary_operator operator: "@" @constant operand: [
-  (identifier) @constant
-  (call target: (identifier) @constant)
-])
-
-; Unused identifiers
-((identifier) @comment (#match? @comment 
-  "^_([^_].*)?$"
-))
- 
 ; Calling a local def function
-(call target: ((identifier) @keyword.function (#match? @keyword.function
-  "^def(.*)?$"
-)) (arguments (identifier) @function)?)
+(call target: ((identifier) @keyword.function (#any-of? @keyword.function
+  "def"
+  "defdelegate"
+  "defexception"
+  "defguard"
+  "defguardp"
+  "defimpl"
+  "defmacro"
+  "defmacrop"
+  "defmodule"
+  "defn"
+  "defnp"
+  "defoverridable"
+  "defp"
+  "defprotocol"
+  "defstruct"
+)) (arguments [
+  (identifier) @function
+  (binary_operator left: (identifier) @function operator: "when")
+])?)
 
-; Conditionals
-(call target: (identifier) @conditional (#any-of? @conditional
+; Kernel Keywords & Special Forms
+(call target: ((identifier) @keyword (#any-of? @keyword
+  "alias"
   "case"
   "cond"
-  "if"
-  "receive"
-  "unless"
-  "with"
-))
-
-; Comprehensions
-(call target: (identifier) @repeat (#any-of? @repeat
-  "for"
-))
-
-; Exceptions
-(call target: (identifier) @exception (#any-of? @exception
-  "after"
-  "catch"
   "else"
+  "for"
+  "if"
+  "import"
+  "quote"
   "raise"
+  "receive"
+  "require"
   "reraise"
-  "rescue"
+  "super"
   "throw"
   "try"
-))
+  "unless"
+  "unquote"
+  "unquote_splicing"
+  "use"
+  "with"
+)))
 
 ; Special constants
 ((identifier) @constant.builtin (#any-of? @constant.builtin
@@ -197,3 +146,78 @@
   "__MODULE__"
   "__STACKTRACE__"
 ))
+
+; Reserved Keywords
+[
+  "after"
+  "and"
+  "catch"
+  "do"
+  "end"
+  "fn"
+  "in"
+  "not"
+  "or"
+  "rescue" 
+  "when"
+  "else"
+] @keyword
+
+; Capture Operator
+(unary_operator
+  operator: "&"
+  operand: [
+    (integer) @operator
+    (binary_operator
+      left: [
+        (call target: (dot left: (_) right: (identifier) @function))
+        (identifier) @function
+      ]
+      operator: "/"
+      right: (integer) @operator
+    )
+])
+
+; Module attributes
+(unary_operator 
+  operator: "@" @constant 
+  operand: [
+    (identifier) @constant
+    (call target: (identifier) @constant)
+])
+
+; Documentation
+(unary_operator
+  operator: "@" @comment
+  operand: (call
+    target: ((identifier) @comment) @_identifier
+    (arguments
+      [
+        (string) @comment
+        (charlist) @comment
+        (sigil
+          quoted_start: _ @comment
+          quoted_end: _ @comment) @comment
+        (boolean) @comment
+      ]))
+  (#any-of? @_identifier "moduledoc" "typedoc" "doc"))
+
+; Sigils
+(sigil 
+  "~" @string.special
+  ((sigil_name) @string.special) @_sigil_name
+  quoted_start: _ @string.special 
+  quoted_end: _ @string.special
+  ((sigil_modifiers) @string.special)?
+  (#not-any-of? @_sigil_name "s" "S"))
+
+(sigil 
+  "~" @string
+  ((sigil_name) @string) @_sigil_name
+  quoted_start: _ @string 
+  quoted_end: _ @string
+  ((sigil_modifiers) @string)?
+  (#any-of? @_sigil_name "s" "S")) @string
+
+; Parser errors
+(ERROR) @error
diff --git a/queries/elixir/injections.scm b/queries/elixir/injections.scm
index e0dc22034..0451ec8d2 100644
--- a/queries/elixir/injections.scm
+++ b/queries/elixir/injections.scm
@@ -12,3 +12,10 @@
   (sigil_name) @_sigil_name 
   (quoted_content) @zig 
 (#eq? @_sigil_name "Z"))
+
+(sigil 
+  (sigil_name) @_sigil_name 
+  (quoted_content) @regex 
+(#any-of? @_sigil_name "r" "R"))
+
+(comment) @comment