update highlight

Author: CppCXY

extension.toml

@@ -15,4 +15,4 @@ repository = "https://github.com/tree-sitter-grammars/tree-sitter-lua"
 commit = "d76023017f7485eae629cb60d406c7a1ca0f40c9"
 [grammars.emmyluadoc]
 repository = "https://github.com/EmmyLuaLs/tree-sitter-emmyluadoc"
-commit = "c35436fb77c61dff0a41e3e774d8dc0373752f37"
+commit = "96c68175990802ad687235c31df8760efeb558c7"

languages/emmylua/highlights.scm

@@ -1,13 +1,15 @@
 ;; Keywords
 
-"return" @keyword
+"return" @keyword.return
 
 [
  "goto"
  "in"
  "local"
 ] @keyword
 
+(label_statement) @label
+
 (break_statement) @keyword
 
 (do_statement
@@ -21,13 +23,13 @@
   "while"
   "do"
   "end"
-] @keyword)
+] @repeat)
 
 (repeat_statement
 [
   "repeat"
   "until"
-] @keyword)
+] @repeat)
 
 (if_statement
 [
@@ -36,71 +38,51 @@
   "else"
   "then"
   "end"
-] @keyword)
+] @conditional)
 
 (elseif_statement
 [
   "elseif"
   "then"
   "end"
-] @keyword)
+] @conditional)
 
 (else_statement
 [
   "else"
   "end"
-] @keyword)
+] @conditional)
 
 (for_statement
 [
   "for"
   "do"
   "end"
-] @keyword)
+] @repeat)
 
 (function_declaration
 [
   "function"
   "end"
-] @keyword)
+] @keyword.function)
 
 (function_definition
 [
   "function"
   "end"
-] @keyword)
+] @keyword.function)
 
 ;; Operators
 
+(binary_expression operator: _ @operator)
+
+(unary_expression operator: _ @operator)
+
 [
  "and"
  "not"
  "or"
-] @operator
-
-[
-  "+"
-  "-"
-  "*"
-  "/"
-  "%"
-  "^"
-  "#"
-  "=="
-  "~="
-  "<="
-  ">="
-  "<"
-  ">"
-  "="
-  "&"
-  "~"
-  "|"
-  "<<"
-  ">>"
-  "//"
-  ".."
-] @operator
+] @keyword.operator
 
 ;; Punctuations
 
@@ -126,13 +108,14 @@
 
 (identifier) @variable
 
-((identifier) @variable.special
- (#eq? @variable.special "self"))
+((identifier) @variable.builtin
+ (#eq? @variable.builtin "self"))
 
 (variable_list
-   attribute: (attribute
-     (["<" ">"] @punctuation.bracket
-      (identifier) @attribute)))
+  (attribute
+    "<" @punctuation.bracket
+    (identifier) @attribute
+    ">" @punctuation.bracket))
 
 ;; Constants
 
@@ -150,9 +133,9 @@
 
 ;; Tables
 
-(field name: (identifier) @property)
+(field name: (identifier) @field)
 
-(dot_index_expression field: (identifier) @property)
+(dot_index_expression field: (identifier) @field)
 
 (table_constructor
 [
@@ -164,20 +147,41 @@
 
 (parameters (identifier) @parameter)
 
-(function_call
+(function_declaration
   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.definition
-    (dot_index_expression field: (identifier) @function.definition)
+    (identifier) @function.call
+    (dot_index_expression
+      field: (identifier) @function.call)
+    (method_index_expression
+      method: (identifier) @method.call)
   ])
 
-(method_index_expression method: (identifier) @function.method)
-
 (function_call
   (identifier) @function.builtin
   (#any-of? @function.builtin
@@ -189,12 +193,12 @@
 
 ;; Others
 
-;; Regular comments
 (comment) @comment
 
 (hash_bang_line) @preproc
 
 (number) @number
 
 (string) @string
+
 (escape_sequence) @string.escape

languages/emmyluadoc/highlights.scm

@@ -53,7 +53,7 @@
 ; ============================================
 
 ((identifier) @type.builtin
-  (#match? @type.builtin "^(string|number|boolean|table|function|thread|userdata|nil|any|unknown|self)$"))
+  (#match? @type.builtin "^(string|number|integer|boolean|table|function|thread|userdata|nil|any|unknown|self)$"))
 
 ; 自定义类型
 (basic_type
@@ -78,10 +78,10 @@
 ; ============================================
 
 (field_annotation
-  name: (identifier) @variable.member)
+  name: (field_name) @variable.member)
 
 (param_annotation
-  name: (identifier) @variable.parameter)
+  name: (param_name) @variable.parameter)
 
 (return_annotation
   name: (identifier)? @variable.parameter)
@@ -225,3 +225,39 @@
 
 (table_type
   "table" @type.builtin)
+
+; 表字面量类型 (Table Literal Types)
+(table_literal_type
+  "{" @punctuation.bracket
+  "}" @punctuation.bracket)
+
+(table_field
+  name: (identifier) @property
+  ":" @punctuation.delimiter
+  type: (type_list
+    (type
+      (primary_type
+        (basic_type
+          (identifier) @type)))))
+
+; 表字段中的逗号
+(table_literal_type
+  "," @punctuation.delimiter)
+
+; ============================================
+; 泛型参数 (Generic Parameters)
+; ============================================
+
+; @class 和 @alias 的泛型参数定义
+(generic_params
+  "<" @punctuation.bracket
+  ">" @punctuation.bracket)
+
+(generic_params
+  params: (identifier) @type.parameter)
+
+; ============================================
+; nil 字面量 (nil Literal)
+; ============================================
+
+"nil" @constant.builtin

languages/emmyluadoc/injections.scm

@@ -0,0 +1,5 @@
+; Injections query for EmmyLuaDoc
+; 用于嵌入其他语言的语法
+
+; 目前 EmmyLuaDoc 不需要特殊的注入
+; 此文件保留为空，供未来扩展使用

languages/emmyluadoc/locals.scm

@@ -10,11 +10,11 @@
 
 ; 字段定义
 (field_annotation
-  name: (identifier) @definition.field)
+  name: (field_name) @definition.field)
 
 ; 参数定义
 (param_annotation
-  name: (identifier) @definition.parameter)
+  name: (param_name) @definition.parameter)
 
 ; 泛型定义
 (generic_annotation

languages/emmyluadoc/tags.scm

@@ -7,7 +7,7 @@
 
 ; 字段定义
 (field_annotation
-  name: (identifier) @name) @definition.field
+  name: (field_name) @name) @definition.field
 
 ; 枚举定义
 (enum_annotation
@@ -19,7 +19,7 @@
 
 ; 函数参数
 (param_annotation
-  name: (identifier) @name) @definition.parameter
+  name: (param_name) @name) @definition.parameter
 
 ; 泛型参数
 (generic_annotation