Merge pull request #50 from hugopl/highlight-update

Highlight update

queries/injections.scm

@@ -0,0 +1,7 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+(heredoc_body
+  (heredoc_content) @injection.content
+  (heredoc_end) @injection.language
+  (#downcase! @injection.language))

queries/nvim/folds.scm

@@ -0,0 +1,21 @@
+[
+  (annotation_def)
+  (begin_block)
+  (block)
+  (c_struct_def)
+  (case)
+  (class_def)
+  (else)
+  (enum_def)
+  (fun_def)
+  (if)
+  (lib_def)
+  (method_def)
+  (module_def)
+  (rescue_block)
+  (select)
+  (struct_def)
+  (union_def)
+  (when)
+  (while)
+] @fold

queries/highlights.scm → queries/nvim/highlights.scm

@@ -1,31 +1,29 @@
-(identifier) @variable
-
-((constant) @constant
- (#match? @constant "^[A-Z\\d_]+$"))
-
 [
   "alias"
+  "annotation"
   "begin"
   "break"
   "case"
-  "class"
-  "def"
   "do"
   "end"
   "ensure"
+  "extend"
   "in"
-  "module"
+  "include"
+  "lib"
   "next"
-  "rescue"
+  "select"
   "then"
-  "unless"
-  "until"
   "when"
-  "while"
 ] @keyword
+["def" "fun"] @keyword.function
+["class" "enum" "module" "struct" "type" "union"] @keyword.type
+["require"] @keyword.import
 ["return" "yield"] @keyword.return
-["if" "else" "elsif"] @keyword.conditional
+["if" "else" "elsif" "unless"] @keyword.conditional
+["while" "until"] @keyword.repeat
 ["rescue"] @keyword.exception
+[(private) (protected) "abstract"] @keyword.modifier
 
 (pseudo_constant) @constant.builtin
 
@@ -36,9 +34,13 @@
 
 (regex) @string.regex
 
+(heredoc_content) @string
+[(heredoc_start) (heredoc_end)] @label
+
 (string_escape_sequence) @escape
 
-[(integer) (float)] @number
+(integer) @number
+(float) @number.float
 
 [(true) (false)] @boolean
 
@@ -73,13 +75,10 @@
   "}"
 ] @punctuation.bracket
 
-(class_def name: [(constant) (generic_type)] @type)
+; Types
+[(constant) (generic_instance_type) (generic_type)] @type
 
-(module_def name: [(constant) (generic_type)] @module)
-
-(struct_def name: [(constant) (generic_type)] @type)
-
-(enum_def name: [(constant)] @type)
+(annotation (constant) @attribute)
 
 (method_def name: [(identifier) (constant)] @function.method)
 
@@ -88,4 +87,7 @@
 [
   (class_var)
   (instance_var)
-] @property
+] @variable.member
+
+; function calls
+(call method: (identifier) @function.call)

queries/nvim/injections.scm

@@ -0,0 +1,7 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+(heredoc_body
+  (heredoc_content) @injection.content
+  (heredoc_end) @injection.language
+  (#downcase! @injection.language))