refactor(smali): refactor queries from upstream

This commit is contained in:
Amaan Qureshi 2023-04-17 22:24:59 -04:00
parent 7ade4d2e77
commit c79c37927b
3 changed files with 14 additions and 21 deletions

View file

@ -426,7 +426,7 @@
"revision": "07547525cdf4627343dca5891f1743ae45e879bb" "revision": "07547525cdf4627343dca5891f1743ae45e879bb"
}, },
"smali": { "smali": {
"revision": "a67a429784dafa0ca4342d71e6530137ca803883" "revision": "b002dceb9b91a6d6de45479ab4b2e9596ebbaaf3"
}, },
"smithy": { "smithy": {
"revision": "cf8c7eb9faf7c7049839585eac19c94af231e6a0" "revision": "cf8c7eb9faf7c7049839585eac19c94af231e6a0"

View file

@ -5,7 +5,7 @@
(primitive_type) @type.builtin (primitive_type) @type.builtin
((class_identifier) @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 ; Methods
@ -14,19 +14,17 @@
(expression (expression
(opcode) @_invoke (opcode) @_invoke
(value
(body (body
(full_method_signature (full_method_signature
(method_signature (method_identifier) @method.call)))) (method_signature (method_identifier) @method.call)))
(#lua-match? @_invoke "^invoke")) (#lua-match? @_invoke "^invoke"))
(method_handle (method_handle
(full_method_signature (full_method_signature
(method_signature (method_identifier) @method.call))) (method_signature (method_identifier) @method.call)))
(call_site) @method.call
(custom_invoke (custom_invoke
. (identifier) @method.call
(method_signature (method_identifier) @method.call)) (method_signature (method_identifier) @method.call))
(annotation_value (annotation_value
@ -39,25 +37,23 @@
(method_signature (method_identifier) @method.call)))) (method_signature (method_identifier) @method.call))))
(field_definition (field_definition
(value
(body (body
(method_signature (method_identifier) @method.call)))) (method_signature (method_identifier) @method.call)))
(field_definition (field_definition
(value
(body (body
(full_method_signature (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>")) (#any-of? @constructor "<init>" "<clinit>"))
; Fields ; Fields
(field_identifier) @field [
(field_identifier)
(annotation_key) @field (annotation_key)
] @field
; Variables ; Variables
@ -86,7 +82,7 @@
(#lua-match? @keyword.return "^return")) (#lua-match? @keyword.return "^return"))
((opcode) @conditional ((opcode) @conditional
(#vim-match? @conditional "^(if|cmp)")) (#match? @conditional "^(if|cmp)"))
((opcode) @exception ((opcode) @exception
(#lua-match? @exception "^throw")) (#lua-match? @exception "^throw"))
@ -128,9 +124,6 @@
".array-data" ".array-data"
".end array-data" ".end array-data"
".enum" ".enum"
] @keyword
[
(prologue_directive) (prologue_directive)
(epilogue_directive) (epilogue_directive)
] @keyword ] @keyword
@ -143,6 +136,7 @@
; Literals ; Literals
(string) @string (string) @string
(source_directive (string "\"" _ @text.uri "\""))
(escape_sequence) @string.escape (escape_sequence) @string.escape
(character) @character (character) @character

View file

@ -12,7 +12,6 @@
[ [
(identifier) (identifier)
(class_identifier) (class_identifier)
(call_site)
(label) (label)
(jmp_label) (jmp_label)
] @reference ] @reference
@ -21,7 +20,7 @@
(field_identifier) @definition.enum) (field_identifier) @definition.enum)
((field_definition ((field_definition
modifiers: (access_modifiers) @_mod (access_modifiers) @_mod
(field_identifier) @definition.enum) (field_identifier) @definition.enum)
(#eq? @_mod "enum")) (#eq? @_mod "enum"))