diff options
| author | Amaan Qureshi <amaanq12@gmail.com> | 2023-04-17 22:24:59 -0400 |
|---|---|---|
| committer | Amaan Qureshi <amaanq12@gmail.com> | 2023-04-17 22:50:34 -0400 |
| commit | c79c37927bb6a937b5b85c45125db75dc204a6ef (patch) | |
| tree | ae5ef66994f8c9301bb8cde3419a259640265c74 | |
| parent | fix(ecma): comment should be `@indent.auto` (#4669) (diff) | |
| download | nvim-treesitter-c79c37927bb6a937b5b85c45125db75dc204a6ef.tar nvim-treesitter-c79c37927bb6a937b5b85c45125db75dc204a6ef.tar.gz nvim-treesitter-c79c37927bb6a937b5b85c45125db75dc204a6ef.tar.bz2 nvim-treesitter-c79c37927bb6a937b5b85c45125db75dc204a6ef.tar.lz nvim-treesitter-c79c37927bb6a937b5b85c45125db75dc204a6ef.tar.xz nvim-treesitter-c79c37927bb6a937b5b85c45125db75dc204a6ef.tar.zst nvim-treesitter-c79c37927bb6a937b5b85c45125db75dc204a6ef.zip | |
refactor(smali): refactor queries from upstream
| -rw-r--r-- | lockfile.json | 2 | ||||
| -rw-r--r-- | queries/smali/highlights.scm | 30 | ||||
| -rw-r--r-- | queries/smali/locals.scm | 3 |
3 files changed, 14 insertions, 21 deletions
diff --git a/lockfile.json b/lockfile.json index 1a8a7759e..6292b5cb9 100644 --- a/lockfile.json +++ b/lockfile.json @@ -426,7 +426,7 @@ "revision": "07547525cdf4627343dca5891f1743ae45e879bb" }, "smali": { - "revision": "a67a429784dafa0ca4342d71e6530137ca803883" + "revision": "b002dceb9b91a6d6de45479ab4b2e9596ebbaaf3" }, "smithy": { "revision": "cf8c7eb9faf7c7049839585eac19c94af231e6a0" diff --git a/queries/smali/highlights.scm b/queries/smali/highlights.scm index bdcb464ae..4f810c293 100644 --- a/queries/smali/highlights.scm +++ b/queries/smali/highlights.scm @@ -5,7 +5,7 @@ (primitive_type) @type.builtin ((class_identifier) @type.builtin - (#vim-match? @type.builtin "^L(android|com/android|dalvik|java)/")) + (#match? @type.builtin "^L(android|com/android|dalvik|java|kotlinx)/")) ; Methods @@ -14,19 +14,17 @@ (expression (opcode) @_invoke - (value (body (full_method_signature - (method_signature (method_identifier) @method.call)))) + (method_signature (method_identifier) @method.call))) (#lua-match? @_invoke "^invoke")) (method_handle (full_method_signature (method_signature (method_identifier) @method.call))) -(call_site) @method.call - (custom_invoke + . (identifier) @method.call (method_signature (method_identifier) @method.call)) (annotation_value @@ -39,25 +37,23 @@ (method_signature (method_identifier) @method.call)))) (field_definition - (value (body - (method_signature (method_identifier) @method.call)))) + (method_signature (method_identifier) @method.call))) (field_definition - (value (body (full_method_signature - (method_signature (method_identifier) @method.call))))) + (method_signature (method_identifier) @method.call)))) -((method_signature - (method_identifier) @constructor) +((method_identifier) @constructor (#any-of? @constructor "<init>" "<clinit>")) ; Fields -(field_identifier) @field - -(annotation_key) @field +[ + (field_identifier) + (annotation_key) +] @field ; Variables @@ -86,7 +82,7 @@ (#lua-match? @keyword.return "^return")) ((opcode) @conditional - (#vim-match? @conditional "^(if|cmp)")) + (#match? @conditional "^(if|cmp)")) ((opcode) @exception (#lua-match? @exception "^throw")) @@ -128,9 +124,6 @@ ".array-data" ".end array-data" ".enum" -] @keyword - -[ (prologue_directive) (epilogue_directive) ] @keyword @@ -143,6 +136,7 @@ ; Literals (string) @string +(source_directive (string "\"" _ @text.uri "\"")) (escape_sequence) @string.escape (character) @character diff --git a/queries/smali/locals.scm b/queries/smali/locals.scm index a91fec225..fcb3b631c 100644 --- a/queries/smali/locals.scm +++ b/queries/smali/locals.scm @@ -12,7 +12,6 @@ [ (identifier) (class_identifier) - (call_site) (label) (jmp_label) ] @reference @@ -21,7 +20,7 @@ (field_identifier) @definition.enum) ((field_definition - modifiers: (access_modifiers) @_mod + (access_modifiers) @_mod (field_identifier) @definition.enum) (#eq? @_mod "enum")) |