diff options
| author | Thomas Vigouroux <tomvig38@gmail.com> | 2020-05-07 09:23:33 +0200 |
|---|---|---|
| committer | Thomas Vigouroux <tomvig38@gmail.com> | 2020-05-07 14:03:29 +0200 |
| commit | 22f73628f618465913d93e907a0a3881ed221b1d (patch) | |
| tree | ae85ef0ad8e6a45ecfa7285aec3a430f3711d921 /queries/lua | |
| parent | fix: change locals extraction (diff) | |
| download | nvim-treesitter-22f73628f618465913d93e907a0a3881ed221b1d.tar nvim-treesitter-22f73628f618465913d93e907a0a3881ed221b1d.tar.gz nvim-treesitter-22f73628f618465913d93e907a0a3881ed221b1d.tar.bz2 nvim-treesitter-22f73628f618465913d93e907a0a3881ed221b1d.tar.lz nvim-treesitter-22f73628f618465913d93e907a0a3881ed221b1d.tar.xz nvim-treesitter-22f73628f618465913d93e907a0a3881ed221b1d.tar.zst nvim-treesitter-22f73628f618465913d93e907a0a3881ed221b1d.zip | |
fix(lua): update queries
Diffstat (limited to 'queries/lua')
| -rw-r--r-- | queries/lua/highlights.scm | 25 | ||||
| -rw-r--r-- | queries/lua/locals.scm | 24 |
2 files changed, 21 insertions, 28 deletions
diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm index 3077be108..a674638e8 100644 --- a/queries/lua/highlights.scm +++ b/queries/lua/highlights.scm @@ -3,16 +3,16 @@ ;;; Builtins ;; Keywords "local" @keyword -"if" @keyword -"then" @keyword -"else" @keyword -"elseif" @keyword +"if" @conditional +"then" @conditional +"else" @conditional +"elseif" @conditional "end" @keyword "return" @keyword -"do" @keyword -"while" @keyword -"repeat" @keyword -"for" @keyword +"do" @repeat +"while" @repeat +"repeat" @repeat +"for" @repeat (break_statement) @keyword "goto" @keyword @@ -43,15 +43,16 @@ "#" @operator ;; Constants -(false) @constant -(true) @constant -(nil) @constant +(false) @boolean +(true) @boolean +(nil) @constant.builtin (spread) @constant ;; "..." ;; Nodes (function "function" @function "end" @function) +(function_definition "function" @function "end" @function) (local_function "function" @function "end" @function) -(table "{" @operator "}" @operator) +(table "{" @constructor "}" @constructor) (comment) @comment (string) @string (number) @number diff --git a/queries/lua/locals.scm b/queries/lua/locals.scm index 5f21e0aaf..ee2927328 100644 --- a/queries/lua/locals.scm +++ b/queries/lua/locals.scm @@ -2,25 +2,20 @@ ;; Variable and field declarations ((variable_declarator - (identifier) @definition) - (set! definition.kind "v")) + (identifier) @definition.var)) ((variable_declarator - (field_expression object:(*) @definition.associated (property_identifier) @definition)) - (set! difinition.kind "v")) + (field_expression object:(*) @definition.associated (property_identifier) @definition.var))) ;; Parameters ((local_function - (parameters (identifier) @definition)) - (set! definition.kind "v")) + (parameters (identifier) @definition.var))) ((function - (parameters (identifier) @definition)) - (set! definition.kind "v")) + (parameters (identifier) @definition.var))) ;; Loops ((loop_expression - (identifier) @definition) - (set! definition.kind "v")) + (identifier) @definition.var)) ;; Function definitions ;; Functions definitions creates both a definition and a new scope @@ -28,16 +23,13 @@ (function_name (function_name_field (identifier) @definition.associated - (property_identifier) @definition))) @scope - (set! definition.kind "m")) + (property_identifier) @definition.method))) @scope) ((function - (function_name (identifier) @definition)) @scope - (set! definition.kind "f")) + (function_name (identifier) @definition.function)) @scope) ((local_function - (identifier) @definition) @scope - (set! definition.kind "f")) + (identifier) @definition.function) @scope) ((if_statement) @scope) ((for_in_statement) @scope) |