update hilight

Author: CppCXY

languages/emmylua/highlights.scm

@@ -1,89 +1,56 @@
 ;; Keywords
 
-"return" @keyword.return
-
-[
- "goto"
- "in"
- "local"
-] @keyword
-
-(label_statement) @label
-
-(break_statement) @keyword
-
-(do_statement
 [
   "do"
-  "end"
-] @keyword)
-
-(while_statement
-[
-  "while"
-  "do"
-  "end"
-] @repeat)
-
-(repeat_statement
-[
-  "repeat"
-  "until"
-] @repeat)
-
-(if_statement
-[
-  "if"
-  "elseif"
   "else"
-  "then"
-  "end"
-] @conditional)
-
-(elseif_statement
-[
   "elseif"
-  "then"
   "end"
-] @conditional)
-
-(else_statement
-[
-  "else"
-  "end"
-] @conditional)
-
-(for_statement
-[
   "for"
-  "do"
-  "end"
-] @repeat)
-
-(function_declaration
-[
   "function"
-  "end"
-] @keyword.function)
-
-(function_definition
-[
-  "function"
-  "end"
-] @keyword.function)
+  "goto"
+  "if"
+  "in"
+  "local"
+  "repeat"
+  "return"
+  "then"
+  "until"
+  "while"
+  (break_statement)
+] @keyword
 
 ;; Operators
 
-(binary_expression operator: _ @operator)
-
-(unary_expression operator: _ @operator)
-
 [
  "and"
  "not"
  "or"
 ] @keyword.operator
 
+[
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "^"
+  "#"
+  "=="
+  "~="
+  "<="
+  ">="
+  "<"
+  ">"
+  "="
+  "&"
+  "~"
+  "|"
+  "<<"
+  ">>"
+  "//"
+  ".."
+] @operator
+
 ;; Punctuations
 
 [
@@ -108,14 +75,13 @@
 
 (identifier) @variable
 
-((identifier) @variable.builtin
- (#eq? @variable.builtin "self"))
+((identifier) @variable.special
+ (#eq? @variable.special "self"))
 
 (variable_list
-  (attribute
-    "<" @punctuation.bracket
-    (identifier) @attribute
-    ">" @punctuation.bracket))
+   attribute: (attribute
+     (["<" ">"] @punctuation.bracket
+      (identifier) @attribute)))
 
 ;; Constants
 
@@ -133,9 +99,9 @@
 
 ;; Tables
 
-(field name: (identifier) @field)
+(field name: (identifier) @property)
 
-(dot_index_expression field: (identifier) @field)
+(dot_index_expression field: (identifier) @property)
 
 (table_constructor
 [
@@ -147,41 +113,20 @@
 
 (parameters (identifier) @parameter)
 
-(function_declaration
+(function_call
   name: [
     (identifier) @function
-    (dot_index_expression
-      field: (identifier) @function)
+    (dot_index_expression field: (identifier) @function)
   ])
 
 (function_declaration
-  name: (method_index_expression
-    method: (identifier) @method))
-
-(assignment_statement
-  (variable_list .
-    name: [
-      (identifier) @function
-      (dot_index_expression
-        field: (identifier) @function)
-    ])
-  (expression_list .
-    value: (function_definition)))
-
-(table_constructor
-  (field
-    name: (identifier) @function
-    value: (function_definition)))
-
-(function_call
   name: [
-    (identifier) @function.call
-    (dot_index_expression
-      field: (identifier) @function.call)
-    (method_index_expression
-      method: (identifier) @method.call)
+    (identifier) @function.definition
+    (dot_index_expression field: (identifier) @function.definition)
   ])
 
+(method_index_expression method: (identifier) @function.method)
+
 (function_call
   (identifier) @function.builtin
   (#any-of? @function.builtin
@@ -200,5 +145,4 @@
 (number) @number
 
 (string) @string
-
-(escape_sequence) @string.escape
+(escape_sequence) @string.escape