fix(lua): update queries

This commit is contained in:
Thomas Vigouroux 2020-05-07 09:23:33 +02:00
parent 824b063d0d
commit 22f73628f6
2 changed files with 21 additions and 28 deletions

View file

@ -3,16 +3,16 @@
;;; Builtins ;;; Builtins
;; Keywords ;; Keywords
"local" @keyword "local" @keyword
"if" @keyword "if" @conditional
"then" @keyword "then" @conditional
"else" @keyword "else" @conditional
"elseif" @keyword "elseif" @conditional
"end" @keyword "end" @keyword
"return" @keyword "return" @keyword
"do" @keyword "do" @repeat
"while" @keyword "while" @repeat
"repeat" @keyword "repeat" @repeat
"for" @keyword "for" @repeat
(break_statement) @keyword (break_statement) @keyword
"goto" @keyword "goto" @keyword
@ -43,15 +43,16 @@
"#" @operator "#" @operator
;; Constants ;; Constants
(false) @constant (false) @boolean
(true) @constant (true) @boolean
(nil) @constant (nil) @constant.builtin
(spread) @constant ;; "..." (spread) @constant ;; "..."
;; Nodes ;; Nodes
(function "function" @function "end" @function) (function "function" @function "end" @function)
(function_definition "function" @function "end" @function)
(local_function "function" @function "end" @function) (local_function "function" @function "end" @function)
(table "{" @operator "}" @operator) (table "{" @constructor "}" @constructor)
(comment) @comment (comment) @comment
(string) @string (string) @string
(number) @number (number) @number

View file

@ -2,25 +2,20 @@
;; Variable and field declarations ;; Variable and field declarations
((variable_declarator ((variable_declarator
(identifier) @definition) (identifier) @definition.var))
(set! definition.kind "v"))
((variable_declarator ((variable_declarator
(field_expression object:(*) @definition.associated (property_identifier) @definition)) (field_expression object:(*) @definition.associated (property_identifier) @definition.var)))
(set! difinition.kind "v"))
;; Parameters ;; Parameters
((local_function ((local_function
(parameters (identifier) @definition)) (parameters (identifier) @definition.var)))
(set! definition.kind "v"))
((function ((function
(parameters (identifier) @definition)) (parameters (identifier) @definition.var)))
(set! definition.kind "v"))
;; Loops ;; Loops
((loop_expression ((loop_expression
(identifier) @definition) (identifier) @definition.var))
(set! definition.kind "v"))
;; Function definitions ;; Function definitions
;; Functions definitions creates both a definition and a new scope ;; Functions definitions creates both a definition and a new scope
@ -28,16 +23,13 @@
(function_name (function_name
(function_name_field (function_name_field
(identifier) @definition.associated (identifier) @definition.associated
(property_identifier) @definition))) @scope (property_identifier) @definition.method))) @scope)
(set! definition.kind "m"))
((function ((function
(function_name (identifier) @definition)) @scope (function_name (identifier) @definition.function)) @scope)
(set! definition.kind "f"))
((local_function ((local_function
(identifier) @definition) @scope (identifier) @definition.function) @scope)
(set! definition.kind "f"))
((if_statement) @scope) ((if_statement) @scope)
((for_in_statement) @scope) ((for_in_statement) @scope)