Update to latest tree-sitter-crystal

Highlighting, injection, and outline improvements

Author: nobodywasishere

extension.toml

@@ -7,7 +7,7 @@ schema_version = 1
 version = "0.0.3"
 
 [grammars.crystal]
-commit = "cd3ae0751a58bca9fe875e580102578f5228a5a1"
+commit = "2af0dc12e65b98ea4c9737f645776277ef8d8f55"
 repository = "https://github.com/crystal-lang-tools/tree-sitter-crystal"
 
 [grammars.ecr]

languages/crystal/embedding.scm

@@ -28,6 +28,9 @@
         (method_def
             "def" @name
             name: (_) @name)
+        (abstract_method_def
+            "def" @name
+            name: (_) @name)
         (module_def
             "module" @name
             name: (_) @name)

languages/crystal/highlights.scm

@@ -1,7 +1,17 @@
+[
+  ","
+  ";"
+  "."
+  ":"
+  "*"
+  "**"
+] @punctuation.delimiter
+
 [
   "alias"
   "alignof"
   "annotation"
+  "asm"
   "begin"
   "break"
   "case"
@@ -65,12 +75,34 @@
 (pseudo_constant) @constant
 
 ; literals
-[
-  (string)
-  (char)
-] @string
+(char
+    ["'" (literal_content)] @string.special)
+
+(char
+    (escape_sequence) @string.escape)
+
+(string
+    ["\"" (literal_content)] @string)
 
-(symbol) @string.special.symbol
+(string
+  (escape_sequence) @string.escape)
+
+(symbol
+  [
+    ":"
+    ":\""
+    "\""
+    (literal_content)
+  ] @string.special.symbol)
+
+(symbol
+  (escape_sequence) @string.escape)
+
+(command
+    ["`" (literal_content)] @string.special)
+
+(command
+  (escape_sequence) @string.escape)
 
 (regex
   "/" @punctuation.bracket)
@@ -80,14 +112,16 @@
 
 (regex_modifier) @string.special.symbol
 
-(heredoc_content) @string
+(heredoc_body
+    (literal_content) @string)
+
+(heredoc_body
+    (escape_sequence) @string.escape)
 
 [
   (heredoc_start)
   (heredoc_end)
-] @label
-
-(string_escape_sequence) @string.escape
+] @string.escape
 
 [
   (integer)
@@ -110,6 +144,7 @@
     (class_def)
     (struct_def)
     (method_def)
+    (abstract_method_def)
     (macro_def)
     (module_def)
     (enum_def)
@@ -128,52 +163,30 @@
   "="
   "=>"
   "->"
-  "+="
-  "&+="
-  "-="
-  "&-="
-  "*="
-  "&*="
-  "/="
-  "//="
-  "%="
-  "|="
-  "&="
-  "^="
-  "**="
-  "<<="
-  ">>="
-  "||="
-  "&&="
+  "&"
+  (operator)
 ] @operator
 
-(operator) @operator
-
-[
-  ","
-  ";"
-  "."
-] @punctuation.delimiter
-
 [
   "("
   ")"
   "["
+  "@["
   "]"
   "{"
   "}"
 ] @punctuation.bracket
 
-(annotation
-	"@[" @punctuation.bracket)
-
 (index_call
   method: (operator) @punctuation.bracket
   [
     "]"
     "]?"
   ] @punctuation.bracket)
 
+(block
+    "|" @punctuation.bracket)
+
 [
   "{%"
   "%}"
@@ -187,6 +200,8 @@
 
 (identifier) @variable
 
+; TODO: {splat,double_splat,block,fun}_param + rescue param
+
 ; Types
 [
   (constant)
@@ -200,20 +215,24 @@
 (nilable_type
   "?" @type)
 
+(union_type
+    "|" @operator)
+
 (annotation
   (constant) @attribute)
 
 (method_def
-  name: [
-    (identifier)
-    (constant)
-  ] @function)
+  name: (identifier) @function)
 
 (macro_def
-  name: [
-    (identifier)
-    (constant)
-  ] @function)
+  name: (identifier) @function)
+
+(abstract_method_def
+  name: (identifier) @function)
+
+(fun_def
+  name: (identifier) @function
+  real_name: (identifier)? @function)
 
 (macro_var) @variable
 
@@ -223,13 +242,13 @@
 ] @property
 
 (named_expr
-  name: (_) @label
-  ":" @label)
+  name: (identifier) @property
+  ":" @property)
 
-(underscore) @variable.special
+(named_type
+    name: (identifier) @property)
 
-(pointer_type
-  "*" @operator)
+(underscore) @variable.special
 
 ; function calls
 (call

languages/crystal/injections.scm

@@ -3,7 +3,7 @@
   (#set! injection.language "regex"))
 
 (heredoc_body
-  (heredoc_content) @injection.content
+  (literal_content) @injection.content
   (heredoc_end) @injection.language
   (#downcase! injection.language))
 

languages/crystal/outline.scm

@@ -14,6 +14,13 @@
     "." @context)?
     name: (_) @name) @item
 
+(abstract_method_def
+    "abstract" @context
+    "def" @context
+    ((_) @context
+    "." @context)?
+    name: (_) @name) @item
+
 (fun_def
 	"fun" @context
 	name: (_) @name