github-linguist 5.3.3 → 6.0.0

data/grammars/source.shen.json

@@ -1,162 +1,143 @@
 {
   "name": "Shen",
   "scopeName": "source.shen",
-  "fileTypes": [
-    "shen"
-  ],
-  "uuid": "4f20d927-cddd-4fd7-a7a6-9739f008439d",
   "patterns": [
     {
       "include": "#expressions"
     }
   ],
   "repository": {
-    "expressions": {
-      "patterns": [
-        {
-          "include": "#comments"
-        },
-        {
-          "include": "#atoms"
-        },
-        {
-          "include": "#parens"
-        },
-        {
-          "include": "#squares"
-        }
-      ]
-    },
-    "comments": {
-      "patterns": [
-        {
-          "name": "comment.line",
-          "match": "(\\\\\\\\.*$)"
-        },
-        {
-          "name": "comment.block",
-          "begin": "(\\\\\\*)",
-          "end": "(\\*\\\\)"
-        }
-      ]
-    },
-    "parens": {
-      "patterns": [
-        {
-          "name": "meta.group",
-          "begin": "(\\()",
-          "end": "(\\))",
-          "patterns": [
-            {
-              "include": "#expressions"
-            }
-          ]
-        }
-      ]
-    },
-    "squares": {
-      "patterns": [
-        {
-          "name": "meta.group",
-          "begin": "(\\[)",
-          "end": "(\\])",
-          "patterns": [
-            {
-              "include": "#expressions"
-            }
-          ]
-        }
-      ]
-    },
     "atoms": {
       "patterns": [
         {
-          "comment": "Multiline Strings",
           "name": "string.quoted.double",
           "begin": "(\\\")",
           "end": "(\\\")",
           "patterns": [
             {
-              "match": "(~A|~R|~S|~%|c#\\d+;)",
-              "name": "constant.character.escape"
+              "name": "constant.character.escape",
+              "match": "(~A|~R|~S|~%|c#\\d+;)"
             },
             {
-              "match": "(c#[^;]*;)",
-              "name": "invalid.illegal"
+              "name": "invalid.illegal",
+              "match": "(c#[^;]*;)"
             }
           ]
         },
         {
-          "comment": "Numbers",
           "name": "constant.numeric",
-          "match": "(?<=^|[\\s()\\[\\]])[+-]*\\d+\\.?\\d*(?=$|[\\s;()\\[\\]])"
+          "match": "(?\u003c=^|[\\s()\\[\\]])[+-]*\\d+\\.?\\d*(?=$|[\\s;()\\[\\]])"
         },
         {
-          "comment": "Malformed Numbers",
           "name": "invalid.illegal",
-          "match": "(?<=^|[\\s()\\[\\]])[+-]*\\d+\\.?\\d*[^\\s;()\\[\\]]+(?=$|[\\s;()\\[\\]])"
+          "match": "(?\u003c=^|[\\s()\\[\\]])[+-]*\\d+\\.?\\d*[^\\s;()\\[\\]]+(?=$|[\\s;()\\[\\]])"
         },
         {
-          "comment": "Special Forms",
           "name": "keyword.control",
-          "match": "(?<=\\()(and|or|if|do|lambda|freeze|let|cond|cases|trap-error|where|package|defun|/.|define|defmacro|defcc|defprolog|datatype)(?=$|[\\s;()\\[\\]{}])"
+          "match": "(?\u003c=\\()(and|or|if|do|lambda|freeze|let|cond|cases|trap-error|where|package|defun|/.|define|defmacro|defcc|defprolog|datatype)(?=$|[\\s;()\\[\\]{}])"
         },
         {
-          "comment": "Special Operators",
           "name": "keyword.control",
-          "match": "(?<=^|[\\s()\\[\\]{}])(->|<-|-->|<--|==>|<==|:=|__+)(?=$|[\\s;()\\[\\]{}])"
+          "match": "(?\u003c=^|[\\s()\\[\\]{}])(-\u003e|\u003c-|--\u003e|\u003c--|==\u003e|\u003c==|:=|__+)(?=$|[\\s;()\\[\\]{}])"
         },
         {
-          "comment": "Standard Operators",
           "name": "keyword.operator",
-          "match": "(?<=^|[\\s()\\[\\]{}])(=|==|<|>|<=|>=|\\+|-|\\*|/)(?=$|[\\s;()\\[\\]{}])"
+          "match": "(?\u003c=^|[\\s()\\[\\]{}])(=|==|\u003c|\u003e|\u003c=|\u003e=|\\+|-|\\*|/)(?=$|[\\s;()\\[\\]{}])"
         },
         {
-          "comment": "Definition Names",
           "name": "entity.name.function",
-          "match": "(?<=\\(define\\s)([^\\s()\\[\\]{}]*)(?=$|[\\s;()\\[\\]{}])"
+          "match": "(?\u003c=\\(define\\s)([^\\s()\\[\\]{}]*)(?=$|[\\s;()\\[\\]{}])"
         },
         {
-          "comment": "Macro Names",
           "name": "entity.name.function",
-          "match": "(?<=\\(defmacro\\s)([^\\s()\\[\\]{}]*)(?=$|[\\s;()\\[\\]{}])"
+          "match": "(?\u003c=\\(defmacro\\s)([^\\s()\\[\\]{}]*)(?=$|[\\s;()\\[\\]{}])"
         },
         {
-          "comment": "Prolog Names",
           "name": "entity.name.function",
-          "match": "(?<=\\(defprolog\\s)([^\\s()\\[\\]{}]*)(?=$|[\\s;()\\[\\]{}])"
+          "match": "(?\u003c=\\(defprolog\\s)([^\\s()\\[\\]{}]*)(?=$|[\\s;()\\[\\]{}])"
         },
         {
-          "comment": "Package Names",
           "name": "entity.name.section",
-          "match": "(?<=\\(package\\s)([^\\s()\\[\\]{}]*)(?=$|[\\s;()\\[\\]{}])"
+          "match": "(?\u003c=\\(package\\s)([^\\s()\\[\\]{}]*)(?=$|[\\s;()\\[\\]{}])"
         },
         {
-          "comment": "Data Types",
           "name": "entity.name.type",
-          "match": "(?<=\\(datatype\\s)([^\\s()\\[\\]{}]*)(?=$|[\\s;()\\[\\]{}])"
+          "match": "(?\u003c=\\(datatype\\s)([^\\s()\\[\\]{}]*)(?=$|[\\s;()\\[\\]{}])"
         },
         {
-          "comment": "Local Variables",
           "name": "variable.language",
-          "match": "(?<=^|[\\s()\\[\\]{}])([A-Z][^\\s()\\[\\];{}]*)(?=$|[\\s;()\\[\\]{}])"
+          "match": "(?\u003c=^|[\\s()\\[\\]{}])([A-Z][^\\s()\\[\\];{}]*)(?=$|[\\s;()\\[\\]{}])"
         },
         {
-          "comment": "Yacc Rule",
           "name": "entity.name.tag",
-          "match": "(?<=^|[\\s()\\[\\]])(<[^\\s()\\[\\]]*>)(?=$|[\\s;()\\[\\]])"
+          "match": "(?\u003c=^|[\\s()\\[\\]])(\u003c[^\\s()\\[\\]]*\u003e)(?=$|[\\s;()\\[\\]])"
         },
         {
-          "comment": "Idle Symbols",
           "name": "constant.language",
-          "match": "(?<=^|[\\s)\\[\\]{}])([^A-Z\\s()\\[\\]:;\\|{}][^\\s()\\[\\];{}]*)(?=$|[\\s;()\\[\\]{}])"
+          "match": "(?\u003c=^|[\\s)\\[\\]{}])([^A-Z\\s()\\[\\]:;\\|{}][^\\s()\\[\\];{}]*)(?=$|[\\s;()\\[\\]{}])"
         },
         {
-          "comment": "Empty Lists",
           "name": "constant.language",
           "match": "(\\(\\)|\\[\\])"
         }
       ]
+    },
+    "comments": {
+      "patterns": [
+        {
+          "name": "comment.line",
+          "match": "(\\\\\\\\.*$)"
+        },
+        {
+          "name": "comment.block",
+          "begin": "(\\\\\\*)",
+          "end": "(\\*\\\\)"
+        }
+      ]
+    },
+    "expressions": {
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#atoms"
+        },
+        {
+          "include": "#parens"
+        },
+        {
+          "include": "#squares"
+        }
+      ]
+    },
+    "parens": {
+      "patterns": [
+        {
+          "name": "meta.group",
+          "begin": "(\\()",
+          "end": "(\\))",
+          "patterns": [
+            {
+              "include": "#expressions"
+            }
+          ]
+        }
+      ]
+    },
+    "squares": {
+      "patterns": [
+        {
+          "name": "meta.group",
+          "begin": "(\\[)",
+          "end": "(\\])",
+          "patterns": [
+            {
+              "include": "#expressions"
+            }
+          ]
+        }
+      ]
     }
   }
-}
+}

data/grammars/source.smali.json

@@ -1,10 +1,6 @@
 {
-  "fileTypes": [
-    "Smali"
-  ],
-  "foldingStartMarker": "[\\s\\t]*\\.method",
-  "foldingStopMarker": "[\\s\\t]*\\.end method",
   "name": "Smali",
+  "scopeName": "source.smali",
   "patterns": [
     {
       "include": "#annotation"
@@ -37,6 +33,7 @@
       "include": "#field-end"
     },
     {
+      "match": "^[\\s\\t]*(\\.class)[\\s\\t]*((?:(?:interface|public|protected|private|abstract|static|final|synchronized|transient|volatile|native|strictfp|synthetic|enum|annotation)[\\s\\t]+)*)[\\s\\t]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "constant.language.smali"
@@ -53,11 +50,10 @@
         "5": {
           "name": "entity.name.tag.smali"
         }
-      },
-      "comment": "Class name",
-      "match": "^[\\s\\t]*(\\.class)[\\s\\t]*((?:(?:interface|public|protected|private|abstract|static|final|synchronized|transient|volatile|native|strictfp|synthetic|enum|annotation)[\\s\\t]+)*)[\\s\\t]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     {
+      "match": "^[\\s\\t]*(\\.(?:super|implements))[\\s\\t]+(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "constant.language.smali"
@@ -71,11 +67,10 @@
         "4": {
           "name": "entity.name.tag.smali"
         }
-      },
-      "comment": "Super / implements class name",
-      "match": "^[\\s\\t]*(\\.(?:super|implements))[\\s\\t]+(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     {
+      "match": "^[\\s\\t]*(\\.source)[\\s\\t]+(\")(.*?)((?\u003c!\\\\)\")(?=[\\s\\t]*(#.*)?$)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "constant.language.smali"
@@ -89,67 +84,21 @@
         "4": {
           "name": "entity.name.tag.smali"
         }
-      },
-      "comment": "Source file",
-      "match": "^[\\s\\t]*(\\.source)[\\s\\t]+(\")(.*?)((?<!\\\\)\")(?=[\\s\\t]*(#.*)?$)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     {
-      "begin": "^[\\s\\t]*(\\.method)[\\s\\t]*((?:(?:bridge|varargs|declared-synchronized|public|protected|private|abstract|static|final|synchronized|transient|volatile|native|strictfp|synthetic|enum)[\\s\\t]+)*)(constructor )?(<init>|<clinit>|(?:[\\$\\p{L}_\\-][\\p{L}\\d_\\$]*))\\(((?:[\\[]*(?:Z|B|S|C|I|J|F|D|L(?:[\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*);))*)\\)(?:(V)|[\\[]*(Z|B|S|C|I|J|F|D)|[\\[]*(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)))(?=[\\s\\t]*(#.*)?$)",
-      "beginCaptures": {
-        "1": {
-          "name": "constant.language.smali"
-        },
-        "10": {
-          "name": "entity.name.tag.smali"
-        },
-        "11": {
-          "name": "constant.numeric.smali"
-        },
-        "12": {
-          "name": "entity.name.tag.smali"
-        },
-        "2": {
-          "name": "variable.parameter.smali"
-        },
-        "3": {
-          "name": "variable.parameter.smali"
-        },
-        "4": {
-          "name": "entity.name.function.smali"
-        },
-        "5": {
-          "name": "constant.numeric.smali"
-        },
-        "6": {
-          "name": "constant.numeric.smali"
-        },
-        "7": {
-          "name": "constant.numeric.smali"
-        },
-        "8": {
-          "name": "entity.name.tag.smali"
-        },
-        "9": {
-          "name": "constant.numeric.smali"
-        }
-      },
-      "comment": "Method signature and body",
+      "begin": "^[\\s\\t]*(\\.method)[\\s\\t]*((?:(?:bridge|varargs|declared-synchronized|public|protected|private|abstract|static|final|synchronized|transient|volatile|native|strictfp|synthetic|enum)[\\s\\t]+)*)(constructor )?(\u003cinit\u003e|\u003cclinit\u003e|(?:[\\$\\p{L}_\\-][\\p{L}\\d_\\$]*))\\(((?:[\\[]*(?:Z|B|S|C|I|J|F|D|L(?:[\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*);))*)\\)(?:(V)|[\\[]*(Z|B|S|C|I|J|F|D)|[\\[]*(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)))(?=[\\s\\t]*(#.*)?$)",
       "end": "^[\\s\\t]*(\\.end method)(?=[\\s\\t]*(#.*)?$)",
-      "endCaptures": {
-        "1": {
-          "name": "constant.language.smali"
-        }
-      },
       "patterns": [
         {
           "include": "#comment-inline"
         },
         {
-          "comment": "Prologue",
-          "match": "^[\\s\\t]*(\\.prologue)(?=[\\s\\t]*(#.*)?$)",
-          "name": "constant.language.smali"
+          "name": "constant.language.smali",
+          "match": "^[\\s\\t]*(\\.prologue)(?=[\\s\\t]*(#.*)?$)"
         },
         {
+          "match": "^[\\s\\t]*(\\.local)[\\s\\t]+([vp]\\d+),[\\s\\t]+(\"[\\p{L}_\\$][\\w\\$]*\"):[\\[]*(?:(?:(Z|B|S|C|I|J|F|D)|(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))))(?:,(\")(.*?)((?\u003c!\\\\)\"))?(?:,[\\s\\t]*(\")(.*?)((?\u003c!\\\\)\"))?(?=[\\s\\t]*(#.*)?$)",
           "captures": {
             "1": {
               "name": "constant.language.smali"
@@ -190,11 +139,10 @@
             "9": {
               "name": "string.interpolated.smali"
             }
-          },
-          "comment": "Local",
-          "match": "^[\\s\\t]*(\\.local)[\\s\\t]+([vp]\\d+),[\\s\\t]+(\"[\\p{L}_\\$][\\w\\$]*\"):[\\[]*(?:(?:(Z|B|S|C|I|J|F|D)|(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))))(?:,(\")(.*?)((?<!\\\\)\"))?(?:,[\\s\\t]*(\")(.*?)((?<!\\\\)\"))?(?=[\\s\\t]*(#.*)?$)"
+          }
         },
         {
+          "match": "^[\\s\\t]*(\\.catch)[\\s\\t]+(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))[\\s\\t]+{(:[A-Za-z_\\d]+)[\\s\\t]+\\.\\.[\\s\\t]+(:[A-Za-z_\\d]+)}[\\s\\t]+(:[A-Za-z_\\d]+)(?=[\\s\\t]*(#.*)?$)",
           "captures": {
             "1": {
               "name": "constant.language.smali"
@@ -217,11 +165,10 @@
             "7": {
               "name": "keyword.control.smali"
             }
-          },
-          "comment": "Catch exceptions",
-          "match": "^[\\s\\t]*(\\.catch)[\\s\\t]+(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))[\\s\\t]+{(:[A-Za-z_\\d]+)[\\s\\t]+\\.\\.[\\s\\t]+(:[A-Za-z_\\d]+)}[\\s\\t]+(:[A-Za-z_\\d]+)(?=[\\s\\t]*(#.*)?$)"
+          }
         },
         {
+          "match": "^[\\s\\t]*(\\.catchall)[\\s\\t]+{(:[A-Za-z_\\d]+)[\\s\\t]+\\.\\.[\\s\\t]+(:[A-Za-z_\\d]+)}[\\s\\t]+(:[A-Za-z_\\d]+)(?=[\\s\\t]*(#.*)?$)",
           "captures": {
             "1": {
               "name": "constant.language.smali"
@@ -235,34 +182,21 @@
             "4": {
               "name": "keyword.control.smali"
             }
-          },
-          "comment": "Gotta catch 'em all!",
-          "match": "^[\\s\\t]*(\\.catchall)[\\s\\t]+{(:[A-Za-z_\\d]+)[\\s\\t]+\\.\\.[\\s\\t]+(:[A-Za-z_\\d]+)}[\\s\\t]+(:[A-Za-z_\\d]+)(?=[\\s\\t]*(#.*)?$)"
+          }
         },
         {
-          "comment": "End / Restart Local",
-          "match": "^[\\s\\t]*(\\.(?:end|restart)[\\s\\t]+local)[\\s\\t]+[vp]\\d+(?=[\\s\\t]*(#.*)?$)",
-          "name": "constant.language.smali"
+          "name": "constant.language.smali",
+          "match": "^[\\s\\t]*(\\.(?:end|restart)[\\s\\t]+local)[\\s\\t]+[vp]\\d+(?=[\\s\\t]*(#.*)?$)"
         },
         {
           "begin": "^[\\s\\t]*(\\.sparse-switch)(?=[\\s\\t]*(#.*)?$)",
-          "beginCaptures": {
-            "1": {
-              "name": "constant.language.smali"
-            }
-          },
-          "comment": "Sparse Switch",
           "end": "^[\\s\\t]*(\\.end sparse-switch)(?=[\\s\\t]*(#.*)?$)",
-          "endCaptures": {
-            "1": {
-              "name": "constant.language.smali"
-            }
-          },
           "patterns": [
             {
               "include": "#comment-inline"
             },
             {
+              "match": "^[\\s\\t]*(-?0x(?i:0|[1-9a-f][\\da-f]*))[\\s\\t]+-\u003e[\\s\\t]+(:[A-Za-z_\\d]+)(?=[\\s\\t]*(#.*)?$)",
               "captures": {
                 "1": {
                   "name": "variable.parameter.smali"
@@ -270,12 +204,22 @@
                 "2": {
                   "name": "keyword.control.smali"
                 }
-              },
-              "match": "^[\\s\\t]*(-?0x(?i:0|[1-9a-f][\\da-f]*))[\\s\\t]+->[\\s\\t]+(:[A-Za-z_\\d]+)(?=[\\s\\t]*(#.*)?$)"
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "constant.language.smali"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "constant.language.smali"
+            }
+          }
         },
         {
+          "match": "^[\\s\\t]*(\\.packed-switch)[\\s\\t]+(-0x1|0x(?i:0|[1-9a-f][\\da-f]*))(?=[\\s\\t]*(#.*)?$)",
           "captures": {
             "1": {
               "name": "constant.language.smali"
@@ -283,17 +227,28 @@
             "2": {
               "name": "variable.parameter.smali"
             }
-          },
-          "comment": "Begin Packed Switch, no idea what literal limit is for these. Have seen up to 0x7f090005",
-          "match": "^[\\s\\t]*(\\.packed-switch)[\\s\\t]+(-0x1|0x(?i:0|[1-9a-f][\\da-f]*))(?=[\\s\\t]*(#.*)?$)"
+          }
         },
         {
-          "comment": "End Packed Switch",
-          "match": "^[\\s\\t]*(\\.end packed-switch)(?=[\\s\\t]*(#.*)?$)",
-          "name": "constant.language.smali"
+          "name": "constant.language.smali",
+          "match": "^[\\s\\t]*(\\.end packed-switch)(?=[\\s\\t]*(#.*)?$)"
         },
         {
           "begin": "^[\\s\\t]*(\\.array-data)[\\s\\t]+(1|2|4|8)(?=[\\s\\t]*(#.*)?$)",
+          "end": "^[\\s\\t]*(\\.end array-data)(?=[\\s\\t]*(#.*)?$)",
+          "patterns": [
+            {
+              "include": "#comment-inline"
+            },
+            {
+              "match": "^[\\s\\t]*(?i:((?:-0x(?:0|[1-9a-f][\\da-f]{0,6}|[1-7][\\da-f]{7}|8[0]{7})|0x(?:0|[1-9a-f][\\da-f]{0,6}|[1-7][\\da-f]{7}))[st]?|(?:(?:-0x(?:0|[1-9a-f][\\da-f]{0,14}|[1-7][\\da-f]{15}|8[0]{15})|0x(?:0|[1-9a-f][\\da-f]{0,14}|[1-7][\\da-f]{15}))L))\\b)(?=[\\s\\t]*(#.*)?$)",
+              "captures": {
+                "1": {
+                  "name": "variable.parameter.smali"
+                }
+              }
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "constant.language.smali"
@@ -302,26 +257,11 @@
               "name": "variable.parameter.smali"
             }
           },
-          "comment": "Array data",
-          "end": "^[\\s\\t]*(\\.end array-data)(?=[\\s\\t]*(#.*)?$)",
           "endCaptures": {
             "1": {
               "name": "constant.language.smali"
             }
-          },
-          "patterns": [
-            {
-              "include": "#comment-inline"
-            },
-            {
-              "captures": {
-                "1": {
-                  "name": "variable.parameter.smali"
-                }
-              },
-              "match": "^[\\s\\t]*(?i:((?:-0x(?:0|[1-9a-f][\\da-f]{0,6}|[1-7][\\da-f]{7}|8[0]{7})|0x(?:0|[1-9a-f][\\da-f]{0,6}|[1-7][\\da-f]{7}))[st]?|(?:(?:-0x(?:0|[1-9a-f][\\da-f]{0,14}|[1-7][\\da-f]{15}|8[0]{15})|0x(?:0|[1-9a-f][\\da-f]{0,14}|[1-7][\\da-f]{15}))L))\\b)(?=[\\s\\t]*(#.*)?$)"
-            }
-          ]
+          }
         },
         {
           "include": "#field"
@@ -512,20 +452,63 @@
         {
           "include": "#opcode-format-10t-20t-30t-relaxed"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "constant.language.smali"
+        },
+        "10": {
+          "name": "entity.name.tag.smali"
+        },
+        "11": {
+          "name": "constant.numeric.smali"
+        },
+        "12": {
+          "name": "entity.name.tag.smali"
+        },
+        "2": {
+          "name": "variable.parameter.smali"
+        },
+        "3": {
+          "name": "variable.parameter.smali"
+        },
+        "4": {
+          "name": "entity.name.function.smali"
+        },
+        "5": {
+          "name": "constant.numeric.smali"
+        },
+        "6": {
+          "name": "constant.numeric.smali"
+        },
+        "7": {
+          "name": "constant.numeric.smali"
+        },
+        "8": {
+          "name": "entity.name.tag.smali"
+        },
+        "9": {
+          "name": "constant.numeric.smali"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "constant.language.smali"
+        }
+      }
     },
     {
+      "match": "^[\\s\\t]*(\\.(?:class|super|implements|method|(end )?(?:method|annotation|field)))",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "comment": "Method directives - relaxed",
-      "match": "^[\\s\\t]*(\\.(?:class|super|implements|method|(end )?(?:method|annotation|field)))"
+      }
     }
   ],
   "repository": {
     "annotation": {
+      "match": "^[\\s\\t]*(\\.annotation)[\\s\\t]+(build|runtime|system)[\\s\\t]+(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "constant.language.smali"
@@ -542,10 +525,10 @@
         "5": {
           "name": "entity.name.tag.smali"
         }
-      },
-      "match": "^[\\s\\t]*(\\.annotation)[\\s\\t]+(build|runtime|system)[\\s\\t]+(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "annotation-access": {
+      "match": "^[\\s\\t]*(accessFlags)[\\s\\t]*=[\\s\\t]*(0x(?:0|[1-9a-f][\\da-f]{0,3}))(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -553,20 +536,18 @@
         "2": {
           "name": "constant.numeric.smali"
         }
-      },
-      "comment": "accessFlags property in annotation. Haven't seen any of these go over 0x4019.",
-      "match": "^[\\s\\t]*(accessFlags)[\\s\\t]*=[\\s\\t]*(0x(?:0|[1-9a-f][\\da-f]{0,3}))(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "annotation-end": {
+      "match": "^[\\s\\t]*(\\.end annotation)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "constant.language.smali"
         }
-      },
-      "comment": "Parsing this is hard to do right. This is Good Enough™.",
-      "match": "^[\\s\\t]*(\\.end annotation)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "annotation-name": {
+      "match": "^[\\s\\t]*(name)[\\s\\t]*=[\\s\\t]*(?:(null)|(\")(.*?)((?\u003c!\\\\)\")?)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -583,11 +564,10 @@
         "5": {
           "name": "entity.name.tag.smali"
         }
-      },
-      "comment": "Name property in annotation",
-      "match": "^[\\s\\t]*(name)[\\s\\t]*=[\\s\\t]*(?:(null)|(\")(.*?)((?<!\\\\)\")?)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "annotation-value": {
+      "match": "^[\\s\\t]*(value)[\\s\\t]*=[\\s\\t]*(?:(\")(.*?)((?\u003c!\\\\)\")?|(?:\\.(enum|subannotation)[\\s\\t]+)?(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))(?:-\u003e(?:([\\p{L}_\\$][\\w\\$]*):[\\[]*(?:(?:(Z|B|S|C|I|J|F|D)|(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))))|(\u003cinit\u003e|\u003cclinit\u003e|(?:[\\$\\p{L}_][\\p{L}\\d_\\$]*))\\(((?:[\\[]*(?:Z|B|S|C|I|J|F|D|L(?:[\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*);))*)\\)(?:(V)|[\\[]*(Z|B|S|C|I|J|F|D)|[\\[]*(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)))))?(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -655,24 +635,17 @@
         "9": {
           "name": "string.interpolated.smali"
         }
-      },
-      "comment": "This is another hack because sublime can't handle multi-line regex, particulaly for 'end'.",
-      "match": "^[\\s\\t]*(value)[\\s\\t]*=[\\s\\t]*(?:(\")(.*?)((?<!\\\\)\")?|(?:\\.(enum|subannotation)[\\s\\t]+)?(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))(?:->(?:([\\p{L}_\\$][\\w\\$]*):[\\[]*(?:(?:(Z|B|S|C|I|J|F|D)|(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))))|(<init>|<clinit>|(?:[\\$\\p{L}_][\\p{L}\\d_\\$]*))\\(((?:[\\[]*(?:Z|B|S|C|I|J|F|D|L(?:[\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*);))*)\\)(?:(V)|[\\[]*(Z|B|S|C|I|J|F|D)|[\\[]*(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)))))?(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "annotation-value_list": {
       "begin": "^[\\s\\t]*(value)[\\s\\t]*=[\\s\\t]*{(?=[\\s\\t]*(#.*)?$)",
-      "beginCaptures": {
-        "1": {
-          "name": "support.function.smali"
-        }
-      },
-      "comment": "This is another hack. Deals.",
       "end": "^[\\s\\t]*}(?=[\\s\\t]*(#.*)?$)",
       "patterns": [
         {
           "include": "#comment-inline"
         },
         {
+          "match": "(?:(\")(.*?)((?\u003c!\\\\)\")?|(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))(?:,)?(?=[\\s\\t]*(#.*)?$)",
           "captures": {
             "1": {
               "name": "entity.name.tag.smali"
@@ -692,39 +665,41 @@
             "6": {
               "name": "entity.name.tag.smali"
             }
-          },
-          "match": "(?:(\")(.*?)((?<!\\\\)\")?|(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))(?:,)?(?=[\\s\\t]*(#.*)?$)"
+          }
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "support.function.smali"
         }
-      ]
+      }
     },
     "comment-alone": {
+      "match": "^[\\s\\t]*(#.*)$",
       "captures": {
         "1": {
           "name": "comment.line.number-sign.smali"
         }
-      },
-      "comment": "Single line, stand alone comment",
-      "match": "^[\\s\\t]*(#.*)$"
+      }
     },
     "comment-inline": {
+      "match": "(#.*)$",
       "captures": {
         "1": {
           "name": "comment.line.number-sign.smali"
         }
-      },
-      "comment": "In-line comment",
-      "match": "(#.*)$"
+      }
     },
     "directive-method-label": {
+      "match": "^[\\s\\t]*(:[A-Za-z_\\d]+)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "keyword.control.smali"
         }
-      },
-      "comment": "Label",
-      "match": "^[\\s\\t]*(:[A-Za-z_\\d]+)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "directive-method-line": {
+      "match": "[\\s\\t]*(\\.line)[\\s\\t]+(\\d+)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "constant.language.smali"
@@ -732,11 +707,10 @@
         "2": {
           "name": "variable.parameter.smali"
         }
-      },
-      "comment": "Line",
-      "match": "[\\s\\t]*(\\.line)[\\s\\t]+(\\d+)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "directive-method-parameter": {
+      "match": "[\\s\\t]*(\\.param(?:eter)?)[\\s\\t]+(p(?:0|[1-9][\\d]?|[1-4][\\d]{2}|50[\\d]|51[0-2])\\b)(?:,[\\s\\t]*(\")(.*?)((?\u003c!\\\\)\"))?(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -753,20 +727,18 @@
         "5": {
           "name": "entity.name.tag.smali"
         }
-      },
-      "comment": "Parameter",
-      "match": "[\\s\\t]*(\\.param(?:eter)?)[\\s\\t]+(p(?:0|[1-9][\\d]?|[1-4][\\d]{2}|50[\\d]|51[0-2])\\b)(?:,[\\s\\t]*(\")(.*?)((?<!\\\\)\"))?(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "directive-method-parameter-end": {
+      "match": "^[\\s\\t]*(\\.end param)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "constant.language.smali"
         }
-      },
-      "comment": "Parsing this is hard to do right. This is Good Enough™.",
-      "match": "^[\\s\\t]*(\\.end param)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "directive-method-registers_locals": {
+      "match": "[\\s\\t]*(\\.(?:registers|locals))[\\s\\t]+(\\d+)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "constant.language.smali"
@@ -774,19 +746,18 @@
         "2": {
           "name": "variable.parameter.smali"
         }
-      },
-      "comment": "Registers / Locals",
-      "match": "[\\s\\t]*(\\.(?:registers|locals))[\\s\\t]+(\\d+)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "directives-method-relaxed": {
+      "match": "^[\\s\\t]*(:|\\.(?:parameter|line|registers|locals|(?:restart )?local|prologue|(?:end )?(annotation|(sparse|packed)-switch|local)|catch(?:all)?))",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*(:|\\.(?:parameter|line|registers|locals|(?:restart )?local|prologue|(?:end )?(annotation|(sparse|packed)-switch|local)|catch(?:all)?))"
+      }
     },
     "field": {
+      "match": "^[\\s\\t]*(\\.field)[\\s\\t]+((?:(?:bridge|varargs|declared-synchronized|public|protected|private|abstract|static|final|synchronized|transient|volatile|native|strictfp|synthetic|enum)[\\s\\t]+)*)([\\p{L}_\\$\\-][\\w\\$]*):[\\[]*(?:(?:(Z|B|S|C|I|J|F|D)|(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))))(?:[\\s\\t]+=[\\s\\t]+(?:(null|true|false)|(?i:(\\d+(?:\\.\\d+)?[fldst]?))|(?i:((?:-0x(?:0|[1-9a-f][\\da-f]{0,6}|[1-7][\\da-f]{7}|8[0]{7})|0x(?:0|[1-9a-f][\\da-f]{0,6}|[1-7][\\da-f]{7}))|(?:(?:-0x(?:0|[1-9a-f][\\da-f]{0,14}|[1-7][\\da-f]{15}|8[0]{15})|0x(?:0|[1-9a-f][\\da-f]{0,14}|[1-7][\\da-f]{15}))[fldst]?))\\b)|([\"'])(.*?)((?\u003c!\\\\)[\"'])))?(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "constant.language.smali"
@@ -827,20 +798,18 @@
         "9": {
           "name": "constant.numeric.smali"
         }
-      },
-      "comment": "Field",
-      "match": "^[\\s\\t]*(\\.field)[\\s\\t]+((?:(?:bridge|varargs|declared-synchronized|public|protected|private|abstract|static|final|synchronized|transient|volatile|native|strictfp|synthetic|enum)[\\s\\t]+)*)([\\p{L}_\\$\\-][\\w\\$]*):[\\[]*(?:(?:(Z|B|S|C|I|J|F|D)|(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))))(?:[\\s\\t]+=[\\s\\t]+(?:(null|true|false)|(?i:(\\d+(?:\\.\\d+)?[fldst]?))|(?i:((?:-0x(?:0|[1-9a-f][\\da-f]{0,6}|[1-7][\\da-f]{7}|8[0]{7})|0x(?:0|[1-9a-f][\\da-f]{0,6}|[1-7][\\da-f]{7}))|(?:(?:-0x(?:0|[1-9a-f][\\da-f]{0,14}|[1-7][\\da-f]{15}|8[0]{15})|0x(?:0|[1-9a-f][\\da-f]{0,14}|[1-7][\\da-f]{15}))[fldst]?))\\b)|([\"'])(.*?)((?<!\\\\)[\"'])))?(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "field-end": {
+      "match": "^[\\s\\t]*(\\.end field)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "constant.language.smali"
         }
-      },
-      "comment": "Parsing this is hard to do right. This is Good Enough™.",
-      "match": "^[\\s\\t]*(\\.end field)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-10t-20t-30t": {
+      "match": "^[\\s\\t]*(goto(?:/16|/32)?) (:[A-Za-z_\\d]+)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -848,36 +817,34 @@
         "2": {
           "name": "keyword.control"
         }
-      },
-      "comment": "Format: op +AA(AA(AAAA))",
-      "match": "^[\\s\\t]*(goto(?:/16|/32)?) (:[A-Za-z_\\d]+)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-10t-20t-30t-relaxed": {
+      "match": "^[\\s\\t]*(goto(?:/16|/32)?)",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*(goto(?:/16|/32)?)"
+      }
     },
     "opcode-format-10x": {
+      "match": "^[\\s\\t]*(nop|return-void)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
         }
-      },
-      "comment": "Format: op",
-      "match": "^[\\s\\t]*(nop|return-void)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-10x-relaxed": {
+      "match": "^[\\s\\t]*(nop|return-void)",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*(nop|return-void)"
+      }
     },
     "opcode-format-11n": {
+      "match": "^[\\s\\t]*(const/4)[\\s\\t]+([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*(?i:(-0x[0-8]|0x[0-7]))(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -888,19 +855,18 @@
         "3": {
           "name": "constant.numeric.smali"
         }
-      },
-      "comment": "Format: op vA, #+B",
-      "match": "^[\\s\\t]*(const/4)[\\s\\t]+([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*(?i:(-0x[0-8]|0x[0-7]))(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-11n-relaxed": {
+      "match": "^[\\s\\t]*(const/4)",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*(const/4)"
+      }
     },
     "opcode-format-11x": {
+      "match": "^[\\s\\t]*(move-(?:result(?:-wide|-object)?|exception)|return(?:-wide|-object)?|monitor-(?:enter|exit)|throw)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -908,19 +874,18 @@
         "2": {
           "name": "variable.parameter.smali"
         }
-      },
-      "comment": "Format: op vAA",
-      "match": "^[\\s\\t]*(move-(?:result(?:-wide|-object)?|exception)|return(?:-wide|-object)?|monitor-(?:enter|exit)|throw)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-11x-relaxed": {
+      "match": "^[\\s\\t]*(move-(?:result(?:-wide|-object)?|exception)|return(?:-wide|-object)?|monitor-(?:enter|exit)|throw)",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*(move-(?:result(?:-wide|-object)?|exception)|return(?:-wide|-object)?|monitor-(?:enter|exit)|throw)"
+      }
     },
     "opcode-format-12x": {
+      "match": "^[\\s\\t]*(move(?:-wide|-object)?|array-length|neg-(?:int|long|float|double)|not-(?:int|long)|int-to-(?:long|float|double|byte|char|short)|long-to-(?:int|float|double)|float-to-(?:int|long|double)|double-to-(?:int|long|float)|(?:add|sub|mul|div|rem|and|or|xor|shl|shr|ushr)-(?:int|long)/2addr|(?:add|sub|mul|div|rem)-(?:float|double)/2addr)[\\s\\t]+([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -931,19 +896,18 @@
         "3": {
           "name": "variable.parameter.smali"
         }
-      },
-      "comment": "Format: op vA, vB",
-      "match": "^[\\s\\t]*(move(?:-wide|-object)?|array-length|neg-(?:int|long|float|double)|not-(?:int|long)|int-to-(?:long|float|double|byte|char|short)|long-to-(?:int|float|double)|float-to-(?:int|long|double)|double-to-(?:int|long|float)|(?:add|sub|mul|div|rem|and|or|xor|shl|shr|ushr)-(?:int|long)/2addr|(?:add|sub|mul|div|rem)-(?:float|double)/2addr)[\\s\\t]+([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-12x-relaxed": {
+      "match": "^[\\s\\t]*(move(?:-wide|-object)?|array-length|neg-(?:int|long|float|double)|not-(?:int|long)|int-to-(?:long|float|double|byte|char|short)|long-to-(?:int|float|double)|float-to-(?:int|long|double)|double-to-(?:int|long|float)|(?:add|sub|mul|div|rem|and|or|xor|shl|shr|ushr)-(?:int|long)/2addr|(?:add|sub|mul|div|rem)-(?:float|double)/2addr)",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*(move(?:-wide|-object)?|array-length|neg-(?:int|long|float|double)|not-(?:int|long)|int-to-(?:long|float|double|byte|char|short)|long-to-(?:int|float|double)|float-to-(?:int|long|double)|double-to-(?:int|long|float)|(?:add|sub|mul|div|rem|and|or|xor|shl|shr|ushr)-(?:int|long)/2addr|(?:add|sub|mul|div|rem)-(?:float|double)/2addr)"
+      }
     },
     "opcode-format-21c-field": {
+      "match": "^[\\s\\t]*((?:sget|sput)(?:-wide|-object|-boolean|-byte|-char|-short)?)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)-\u003e([\\p{L}_\\$][\\w\\$]*):[\\[]*(?:(?:(Z|B|S|C|I|J|F|D)|(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))))(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -975,19 +939,18 @@
         "9": {
           "name": "constant.numeric.smali"
         }
-      },
-      "comment": "Format: op vAA, field@BBBB",
-      "match": "^[\\s\\t]*((?:sget|sput)(?:-wide|-object|-boolean|-byte|-char|-short)?)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)->([\\p{L}_\\$][\\w\\$]*):[\\[]*(?:(?:(Z|B|S|C|I|J|F|D)|(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))))(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-21c-relaxed": {
+      "match": "^[\\s\\t]*(const-string|const-class|check-cast|new-instance|(?:sget|sput)(?:-wide|-object|-boolean|-byte|-char|-short)?)",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*(const-string|const-class|check-cast|new-instance|(?:sget|sput)(?:-wide|-object|-boolean|-byte|-char|-short)?)"
+      }
     },
     "opcode-format-21c-string": {
+      "match": "^[\\s\\t]*(const-string(?:/jumbo)?)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*(\")(.*?)((?\u003c!\\\\)\")(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1004,11 +967,10 @@
         "5": {
           "name": "entity.name.tag.smali"
         }
-      },
-      "comment": "Format: op vAA, string@BBBB",
-      "match": "^[\\s\\t]*(const-string(?:/jumbo)?)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*(\")(.*?)((?<!\\\\)\")(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-21c-type": {
+      "match": "^[\\s\\t]*(const-class|check-cast|new-instance)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*[\\[]*(?:(?:(Z|B|S|C|I|J|F|D)|(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))))(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1028,11 +990,10 @@
         "6": {
           "name": "entity.name.tag.smali"
         }
-      },
-      "comment": "Format: op vAA, type@BBBB",
-      "match": "^[\\s\\t]*(const-class|check-cast|new-instance)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*[\\[]*(?:(?:(Z|B|S|C|I|J|F|D)|(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))))(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-21h": {
+      "match": "^[\\s\\t]*(const(?:-wide)?/high16)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*((?i:-?0x(?:0|[1-9a-f][\\da-f]{0,2}|[1-7][\\da-f]{3}|8000)[0]{0,12}L?))\\b(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1043,19 +1004,18 @@
         "3": {
           "name": "constant.numeric.smali"
         }
-      },
-      "comment": "Format: op vAA, #+BBBB0000(00000000)",
-      "match": "^[\\s\\t]*(const(?:-wide)?/high16)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*((?i:-?0x(?:0|[1-9a-f][\\da-f]{0,2}|[1-7][\\da-f]{3}|8000)[0]{0,12}L?))\\b(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-21h-relaxed": {
+      "match": "^[\\s\\t]*(const(?:-wide)?/high16)",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*(const(?:-wide)?/high16)"
+      }
     },
     "opcode-format-21s": {
+      "match": "^[\\s\\t]*(const(?:-wide)?/16)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*(?i:(-0x(?:0|[1-9a-f][\\da-f]{0,2}|[1-7][\\da-f]{3}|8000)|0x(?:0|[1-9a-f][\\da-f]{0,2}|[1-7][\\da-f]{3})))\\b(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1066,19 +1026,18 @@
         "3": {
           "name": "constant.numeric.smali"
         }
-      },
-      "comment": "Format: op vAA, #+BBBB",
-      "match": "^[\\s\\t]*(const(?:-wide)?/16)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*(?i:(-0x(?:0|[1-9a-f][\\da-f]{0,2}|[1-7][\\da-f]{3}|8000)|0x(?:0|[1-9a-f][\\da-f]{0,2}|[1-7][\\da-f]{3})))\\b(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-21s-relaxed": {
+      "match": "^[\\s\\t]*(const(?:-wide)?/16)",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*(const(?:-wide)?/16)"
+      }
     },
     "opcode-format-21t": {
+      "match": "^[\\s\\t]*(if-(?:eq|ne|lt|ge|gt|le)z)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*(:[A-Za-z_\\d]+)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1089,19 +1048,18 @@
         "3": {
           "name": "keyword.control.smali"
         }
-      },
-      "comment": "Format: op vAA, +BBBB",
-      "match": "^[\\s\\t]*(if-(?:eq|ne|lt|ge|gt|le)z)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*(:[A-Za-z_\\d]+)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-21t-relaxed": {
+      "match": "^[\\s\\t]*(if-(?:eq|ne|lt|ge|gt|le)z)",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*(if-(?:eq|ne|lt|ge|gt|le)z)"
+      }
     },
     "opcode-format-22b": {
+      "match": "^[\\s\\t]*((?:add|rsub|mul|div|rem|and|or|xor|shl|shr|ushr)-int/lit8)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*(?i:(-0x(?:[\\da-f]|[1-7][\\da-f]|80)|0x(?:[\\da-f]|[1-7][\\da-f])))\\b(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1115,19 +1073,18 @@
         "4": {
           "name": "constant.numeric.smali"
         }
-      },
-      "comment": "Format: op vAA, vBB, #+CC",
-      "match": "^[\\s\\t]*((?:add|rsub|mul|div|rem|and|or|xor|shl|shr|ushr)-int/lit8)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*(?i:(-0x(?:[\\da-f]|[1-7][\\da-f]|80)|0x(?:[\\da-f]|[1-7][\\da-f])))\\b(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-22b-relaxed": {
+      "match": "^[\\s\\t]*((?:add|rsub|mul|div|rem|and|or|xor|shl|shr|ushr)-int/lit8)",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*((?:add|rsub|mul|div|rem|and|or|xor|shl|shr|ushr)-int/lit8)"
+      }
     },
     "opcode-format-22c-field": {
+      "match": "^[\\s\\t]*((?:iget|iput)(?:-wide|-object|-boolean|-byte|-char|-short)?)[\\s\\t]+([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)-\u003e([\\p{L}_\\$][\\w\\$]*):[\\[]*(?:(Z|B|S|C|I|J|F|D|(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))))(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1162,19 +1119,18 @@
         "9": {
           "name": "entity.name.tag.smali"
         }
-      },
-      "comment": "Format: op vA, vB, field@CCCC",
-      "match": "^[\\s\\t]*((?:iget|iput)(?:-wide|-object|-boolean|-byte|-char|-short)?)[\\s\\t]+([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)->([\\p{L}_\\$][\\w\\$]*):[\\[]*(?:(Z|B|S|C|I|J|F|D|(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))))(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-22c-relaxed": {
+      "match": "^[\\s\\t]*(instance-of|new-array|(?:iget|iput)(?:-wide|-object|-boolean|-byte|-char|-short)?)",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*(instance-of|new-array|(?:iget|iput)(?:-wide|-object|-boolean|-byte|-char|-short)?)"
+      }
     },
     "opcode-format-22c-type": {
+      "match": "^[\\s\\t]*(instance-of)[\\s\\t]+([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*[\\[]*(?:(Z|B|S|C|I|J|F|D)|(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1197,11 +1153,10 @@
         "7": {
           "name": "entity.name.tag.smali"
         }
-      },
-      "comment": "Format: op vA, vB, type@CCCC",
-      "match": "^[\\s\\t]*(instance-of)[\\s\\t]+([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*[\\[]*(?:(Z|B|S|C|I|J|F|D)|(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-22c-type_array": {
+      "match": "^[\\s\\t]*(new-array)[\\s\\t]+([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*[\\[]+(?:(Z|B|S|C|I|J|F|D)|(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1224,11 +1179,10 @@
         "7": {
           "name": "entity.name.tag.smali"
         }
-      },
-      "comment": "Format: op vA, vB, [type@CCCC",
-      "match": "^[\\s\\t]*(new-array)[\\s\\t]+([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*[\\[]+(?:(Z|B|S|C|I|J|F|D)|(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-22s": {
+      "match": "^[\\s\\t]*((?:(?:add|mul|div|rem|and|or|xor)-int/lit16)|rsub-int)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*(?i:(-0x(?:0|[1-9a-f][\\da-f]{0,2}|[1-7][\\da-f]{3}|8000)|0x(?:0|[1-9a-f][\\da-f]{0,2}|[1-7][\\da-f]{3})))\\b(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1242,19 +1196,18 @@
         "4": {
           "name": "constant.numeric.smali"
         }
-      },
-      "comment": "Format: op vA, vB, #+CCCC",
-      "match": "^[\\s\\t]*((?:(?:add|mul|div|rem|and|or|xor)-int/lit16)|rsub-int)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*(?i:(-0x(?:0|[1-9a-f][\\da-f]{0,2}|[1-7][\\da-f]{3}|8000)|0x(?:0|[1-9a-f][\\da-f]{0,2}|[1-7][\\da-f]{3})))\\b(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-22s-relaxed": {
+      "match": "^[\\s\\t]*((?:(?:add|mul|div|rem|and|or|xor)-int/lit16)|rsub-int)",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*((?:(?:add|mul|div|rem|and|or|xor)-int/lit16)|rsub-int)"
+      }
     },
     "opcode-format-22t": {
+      "match": "^[\\s\\t]*(if-(?:eq|ne|lt|ge|gt|le))[\\s\\t]+([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*(:[A-Za-z_\\d]+)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1268,19 +1221,18 @@
         "4": {
           "name": "keyword.control"
         }
-      },
-      "comment": "*Format: op vA, vB, +CCCC",
-      "match": "^[\\s\\t]*(if-(?:eq|ne|lt|ge|gt|le))[\\s\\t]+([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*(:[A-Za-z_\\d]+)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-22t-relaxed": {
+      "match": "(if-(?:eq|ne|lt|ge|gt|le))",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "(if-(?:eq|ne|lt|ge|gt|le))"
+      }
     },
     "opcode-format-22x": {
+      "match": "^[\\s\\t]*(move(?:-wide|-object)?/from16)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9][\\d]{0,3}|[1-5][\\d]{4}|6[0-4][\\d]{3}|65[0-4][\\d]{2}|655[0-2][\\d]|6553[0-5])\\b)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1291,19 +1243,18 @@
         "3": {
           "name": "variable.parameter.smali"
         }
-      },
-      "comment": "Format: op vAA, vBBBB",
-      "match": "^[\\s\\t]*(move(?:-wide|-object)?/from16)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9][\\d]{0,3}|[1-5][\\d]{4}|6[0-4][\\d]{3}|65[0-4][\\d]{2}|655[0-2][\\d]|6553[0-5])\\b)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-22x-relaxed": {
+      "match": "^[\\s\\t]*(move(?:-wide|-object)?/from16)",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*(move(?:-wide|-object)?/from16)"
+      }
     },
     "opcode-format-23x": {
+      "match": "^[\\s\\t]*((?:cmpl|cmpg)-(?:float|double)|cmp-long|(?:aget|aput)(?:-wide|-object|-boolean|-byte|-char|-short)?|(?:add|sub|mul|div|rem|and|or|xor|shl|shr|ushr)-(?:int|long)|(?:add|sub|mul|div|rem)-(?:float|double))[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1317,19 +1268,18 @@
         "4": {
           "name": "variable.parameter.smali"
         }
-      },
-      "comment": "Format: op vAA, vBB, vCC",
-      "match": "^[\\s\\t]*((?:cmpl|cmpg)-(?:float|double)|cmp-long|(?:aget|aput)(?:-wide|-object|-boolean|-byte|-char|-short)?|(?:add|sub|mul|div|rem|and|or|xor|shl|shr|ushr)-(?:int|long)|(?:add|sub|mul|div|rem)-(?:float|double))[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-23x-relaxed": {
+      "match": "^[\\s\\t]*((?:cmpl|cmpg)-(float|double)|cmp-long|(?:aget|aput)(?:-wide|-object|-boolean|-byte|-char|-short)?|(?:add|sub|mul|div|rem|and|or|xor|shl|shr|ushr)-(?:int|long)|(?:add|sub|mul|div|rem)-(?:float|double))",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*((?:cmpl|cmpg)-(float|double)|cmp-long|(?:aget|aput)(?:-wide|-object|-boolean|-byte|-char|-short)?|(?:add|sub|mul|div|rem|and|or|xor|shl|shr|ushr)-(?:int|long)|(?:add|sub|mul|div|rem)-(?:float|double))"
+      }
     },
     "opcode-format-31i": {
+      "match": "^[\\s\\t]*(const(?:-wide/32)?)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*(?i:(-0x(?:0|[1-9a-f][\\da-f]{0,6}|[1-7][\\da-f]{7}|8[0]{7})|0x(?:0|[1-9a-f][\\da-f]{0,6}|[1-7][\\da-f]{7}))\\b)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1340,19 +1290,18 @@
         "3": {
           "name": "constant.numeric.smali"
         }
-      },
-      "comment": "Format: op vAA, #+BBBBBBBB",
-      "match": "^[\\s\\t]*(const(?:-wide/32)?)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*(?i:(-0x(?:0|[1-9a-f][\\da-f]{0,6}|[1-7][\\da-f]{7}|8[0]{7})|0x(?:0|[1-9a-f][\\da-f]{0,6}|[1-7][\\da-f]{7}))\\b)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-31i-relaxed": {
+      "match": "^[\\s\\t]*(const(?:-wide/32)?)",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*(const(?:-wide/32)?)"
+      }
     },
     "opcode-format-31t": {
+      "match": "^[\\s\\t]*(fill-array-data|(?:packed|sparse)-switch)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*(:[A-Za-z_\\d]+)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1363,19 +1312,18 @@
         "3": {
           "name": "keyword.control"
         }
-      },
-      "comment": "Format: op vAA, +BBBBBBBB",
-      "match": "^[\\s\\t]*(fill-array-data|(?:packed|sparse)-switch)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*(:[A-Za-z_\\d]+)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-31t-relaxed": {
+      "match": "^[\\s\\t]*(fill-array-data|(?:packed|sparse)-switch)",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*(fill-array-data|(?:packed|sparse)-switch)"
+      }
     },
     "opcode-format-32x": {
+      "match": "^[\\s\\t]*(move(?:-wide|-object)?/16)[\\s\\t]+([vp](?:0|[1-9][\\d]{0,3}|[1-5][\\d]{4}|6[0-4][\\d]{3}|65[0-4][\\d]{2}|655[0-2][\\d]|6553[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9][\\d]{0,3}|[1-5][\\d]{4}|6[0-4][\\d]{3}|65[0-4][\\d]{2}|655[0-2][\\d]|6553[0-5])\\b)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1386,19 +1334,18 @@
         "3": {
           "name": "variable.parameter.smali"
         }
-      },
-      "comment": "Format: op vAAAA, vBBBB",
-      "match": "^[\\s\\t]*(move(?:-wide|-object)?/16)[\\s\\t]+([vp](?:0|[1-9][\\d]{0,3}|[1-5][\\d]{4}|6[0-4][\\d]{3}|65[0-4][\\d]{2}|655[0-2][\\d]|6553[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9][\\d]{0,3}|[1-5][\\d]{4}|6[0-4][\\d]{3}|65[0-4][\\d]{2}|655[0-2][\\d]|6553[0-5])\\b)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-32x-relaxed": {
+      "match": "^[\\s\\t]*(move(?:-wide|-object)?/16)",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*(move(?:-wide|-object)?/16)"
+      }
     },
     "opcode-format-35c-meth": {
+      "match": "^[\\s\\t]*(invoke-(?:virtual|super|direct|static|interface)) {[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b)?(?:,[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b))?(?:,[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b))?(?:,[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b))?(?:,[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b))?[\\s\\t]*},[\\s\\t]*[\\[]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)-\u003e(\u003cinit\u003e|\u003cclinit\u003e|(?:[\\$\\p{L}_][\\p{L}\\d_\\$]*))\\((?:[\\[]*(Z|B|S|C|I|J|F|D)|(?:[\\[]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)))?(?:[\\[]*(Z|B|S|C|I|J|F|D)|(?:[\\[]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)))?(?:[\\[]*(Z|B|S|C|I|J|F|D)|(?:[\\[]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)))?(?:[\\[]*(Z|B|S|C|I|J|F|D)|(?:[\\[]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)))?(?:[\\[]*(Z|B|S|C|I|J|F|D)|(?:[\\[]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)))?\\)(?:(?:(V)|[\\[]*(Z|B|S|C|I|J|F|D))|(?:[\\[]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)))(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1505,19 +1452,18 @@
         "9": {
           "name": "entity.name.tag.smali"
         }
-      },
-      "comment": "Format: op {vC, vD, vE, vF, vG}, meth@BBBB",
-      "match": "^[\\s\\t]*(invoke-(?:virtual|super|direct|static|interface)) {[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b)?(?:,[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b))?(?:,[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b))?(?:,[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b))?(?:,[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b))?[\\s\\t]*},[\\s\\t]*[\\[]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)->(<init>|<clinit>|(?:[\\$\\p{L}_][\\p{L}\\d_\\$]*))\\((?:[\\[]*(Z|B|S|C|I|J|F|D)|(?:[\\[]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)))?(?:[\\[]*(Z|B|S|C|I|J|F|D)|(?:[\\[]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)))?(?:[\\[]*(Z|B|S|C|I|J|F|D)|(?:[\\[]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)))?(?:[\\[]*(Z|B|S|C|I|J|F|D)|(?:[\\[]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)))?(?:[\\[]*(Z|B|S|C|I|J|F|D)|(?:[\\[]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)))?\\)(?:(?:(V)|[\\[]*(Z|B|S|C|I|J|F|D))|(?:[\\[]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)))(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-35c-relaxed": {
+      "match": "^[\\s\\t]*(filled-new-array|invoke-(?:virtual|super|direct|static|interface))",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*(filled-new-array|invoke-(?:virtual|super|direct|static|interface))"
+      }
     },
     "opcode-format-35c-type": {
+      "match": "^[\\s\\t]*(filled-new-array) {([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b)(?:,[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b))?(?:,[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b))?(?:,[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b))?},[\\s\\t]*[\\[]+(?:(Z|B|S|C|I|J|F|D)|(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1552,11 +1498,10 @@
         "9": {
           "name": "constant.numeric.smali"
         }
-      },
-      "comment": "Format: op {vC, vD, vE, vF, vG}, type@BBBB",
-      "match": "^[\\s\\t]*(filled-new-array) {([vp](?:0|[1-9]|1[0-5])\\b),[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b)(?:,[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b))?(?:,[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b))?(?:,[\\s\\t]*([vp](?:0|[1-9]|1[0-5])\\b))?},[\\s\\t]*[\\[]+(?:(Z|B|S|C|I|J|F|D)|(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-3rc-meth": {
+      "match": "^[\\s\\t]*(invoke-(?:virtual|super|direct|static|interface)/range) {[\\s\\t]*([vp](?:0|[1-9][\\d]{0,3}|[1-5][\\d]{4}|6[0-4][\\d]{3}|65[0-4][\\d]{2}|655[0-2][\\d]|6553[0-5])\\b) \\.\\. ([vp](?:0|[1-9][\\d]{0,3}|[1-5][\\d]{4}|6[0-4][\\d]{3}|65[0-4][\\d]{2}|655[0-2][\\d]|6553[0-5])\\b)[\\s\\t]*},[\\s\\t]*[\\[]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)-\u003e(\u003cinit\u003e|\u003cclinit\u003e|(?:[\\$\\p{L}_][\\p{L}\\d_\\$]*))\\(((?:[\\[]*(?:Z|B|S|C|I|J|F|D|L(?:[\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*);))*)\\)(?:(V)|[\\[]*(Z|B|S|C|I|J|F|D)|[\\[]*(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)))(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1603,19 +1548,18 @@
         "9": {
           "name": "constant.numeric.smali"
         }
-      },
-      "comment": "Format: op {vCCCC .. vNNNN}, meth@BBBB",
-      "match": "^[\\s\\t]*(invoke-(?:virtual|super|direct|static|interface)/range) {[\\s\\t]*([vp](?:0|[1-9][\\d]{0,3}|[1-5][\\d]{4}|6[0-4][\\d]{3}|65[0-4][\\d]{2}|655[0-2][\\d]|6553[0-5])\\b) \\.\\. ([vp](?:0|[1-9][\\d]{0,3}|[1-5][\\d]{4}|6[0-4][\\d]{3}|65[0-4][\\d]{2}|655[0-2][\\d]|6553[0-5])\\b)[\\s\\t]*},[\\s\\t]*[\\[]*(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)->(<init>|<clinit>|(?:[\\$\\p{L}_][\\p{L}\\d_\\$]*))\\(((?:[\\[]*(?:Z|B|S|C|I|J|F|D|L(?:[\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*);))*)\\)(?:(V)|[\\[]*(Z|B|S|C|I|J|F|D)|[\\[]*(?:(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;)))(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-3rc-relaxed": {
+      "match": "^[\\s\\t]*((?:filled-new-array|invoke-(?:virtual|super|direct|static|interface))/range)",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*((?:filled-new-array|invoke-(?:virtual|super|direct|static|interface))/range)"
+      }
     },
     "opcode-format-3rc-type": {
+      "match": "^[\\s\\t]*(filled-new-array/range) {([vp](?:0|[1-9][\\d]{0,3}|[1-5][\\d]{4}|6[0-4][\\d]{3}|65[0-4][\\d]{2}|655[0-2][\\d]|6553[0-5])\\b) \\.\\. ([vp](?:0|[1-9][\\d]{0,3}|[1-5][\\d]{4}|6[0-4][\\d]{3}|65[0-4][\\d]{2}|655[0-2][\\d]|6553[0-5])\\b)},[\\s\\t]*[\\[]+(?:(Z|B|S|C|I|J|F|D)|(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1638,11 +1582,10 @@
         "7": {
           "name": "entity.name.tag.smali"
         }
-      },
-      "comment": "Format: op {vCCCC .. vNNNN}, type@BBBB",
-      "match": "^[\\s\\t]*(filled-new-array/range) {([vp](?:0|[1-9][\\d]{0,3}|[1-5][\\d]{4}|6[0-4][\\d]{3}|65[0-4][\\d]{2}|655[0-2][\\d]|6553[0-5])\\b) \\.\\. ([vp](?:0|[1-9][\\d]{0,3}|[1-5][\\d]{4}|6[0-4][\\d]{3}|65[0-4][\\d]{2}|655[0-2][\\d]|6553[0-5])\\b)},[\\s\\t]*[\\[]+(?:(Z|B|S|C|I|J|F|D)|(L)([\\p{L}_\\$][\\p{L}\\d_\\$]*(?:/[\\p{L}_\\$][\\p{L}\\d_\\$]*)*)(;))(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-51l": {
+      "match": "^[\\s\\t]*(const-wide)(?!/32)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*(?i:((?:-0x(?:0|[1-9a-f][\\da-f]{0,6}|[1-7][\\da-f]{7}|8[0]{7})|0x(?:0|[1-9a-f][\\da-f]{0,6}|[1-7][\\da-f]{7}))|(?:(?:-0x(?:0|[1-9a-f][\\da-f]{0,14}|[1-7][\\da-f]{15}|8[0]{15})|0x(?:0|[1-9a-f][\\da-f]{0,14}|[1-7][\\da-f]{15}))L))\\b)(?=[\\s\\t]*(#.*)?$)",
       "captures": {
         "1": {
           "name": "support.function.smali"
@@ -1653,19 +1596,15 @@
         "3": {
           "name": "constant.numeric.smali"
         }
-      },
-      "comment": "Format: op vAA, #+BBBBBBBBBBBBBBBB",
-      "match": "^[\\s\\t]*(const-wide)(?!/32)[\\s\\t]+([vp](?:0|[1-9][\\d]?|1[\\d]{2}|2[0-4][\\d]|25[0-5])\\b),[\\s\\t]*(?i:((?:-0x(?:0|[1-9a-f][\\da-f]{0,6}|[1-7][\\da-f]{7}|8[0]{7})|0x(?:0|[1-9a-f][\\da-f]{0,6}|[1-7][\\da-f]{7}))|(?:(?:-0x(?:0|[1-9a-f][\\da-f]{0,14}|[1-7][\\da-f]{15}|8[0]{15})|0x(?:0|[1-9a-f][\\da-f]{0,14}|[1-7][\\da-f]{15}))L))\\b)(?=[\\s\\t]*(#.*)?$)"
+      }
     },
     "opcode-format-51l-relaxed": {
+      "match": "^[\\s\\t]*(const-wide)(?!\\/32)",
       "captures": {
         "1": {
           "name": "invalid.illegal.smali"
         }
-      },
-      "match": "^[\\s\\t]*(const-wide)(?!\\/32)"
+      }
     }
-  },
-  "scopeName": "source.smali",
-  "uuid": "d6fe4632-f21a-4533-8908-723df0b58ac0"
-}
+  }
+}