tm-grammars 1.22.3 → 1.22.4

package/grammars/java.json

@@ -203,7 +203,7 @@
           "name": "keyword.control.new.java"
         }
       },
-      "end": "(?=;|\\)|\\]|\\.|,|\\?|:|}|\\+|-|\\*|\\/(?!\\/|\\*)|%|!|&|\\||\\^|=)",
+      "end": "(?=;|\\)|\\]|\\.|,|\\?|:|}|\\+|\\-|\\*|\\/(?!\\/|\\*)|%|!|&|\\||\\^|=)",
       "patterns": [
         {
           "include": "#comments"
@@ -216,7 +216,7 @@
         },
         {
           "begin": "(?<=\\))",
-          "end": "(?=;|\\)|\\]|\\.|,|\\?|:|}|\\+|-|\\*|\\/(?!\\/|\\*)|%|!|&|\\||\\^|=)",
+          "end": "(?=;|\\)|\\]|\\.|,|\\?|:|}|\\+|\\-|\\*|\\/(?!\\/|\\*)|%|!|&|\\||\\^|=)",
           "patterns": [
             {
               "include": "#comments"
@@ -245,7 +245,7 @@
         },
         {
           "begin": "(?<=\\])",
-          "end": "(?=;|\\)|\\]|\\.|,|\\?|:|}|\\+|-|\\*|\\/(?!\\/|\\*)|%|!|&|\\||\\^|=)",
+          "end": "(?=;|\\)|\\]|\\.|,|\\?|:|}|\\+|\\-|\\*|\\/(?!\\/|\\*)|%|!|&|\\||\\^|=)",
           "patterns": [
             {
               "include": "#comments"
@@ -442,7 +442,7 @@
     "class-fields-and-methods": {
       "patterns": [
         {
-          "begin": "(?==)",
+          "begin": "(?=\\=)",
           "end": "(?=;)",
           "patterns": [
             {
@@ -646,7 +646,7 @@
                   "name": "variable.parameter.java"
                 }
               },
-              "match": "{(@link)\\s+(\\S+)?#([\\w$]+\\s*\\([^()]*\\)).*?}"
+              "match": "{(@link)\\s+(\\S+)?#([\\w$]+\\s*\\([^\\(\\)]*\\)).*?}"
             }
           ]
         }
@@ -939,11 +939,11 @@
           "name": "keyword.operator.assignment.java"
         },
         {
-          "match": "(--|\\+\\+)",
+          "match": "(\\-\\-|\\+\\+)",
           "name": "keyword.operator.increment-decrement.java"
         },
         {
-          "match": "(-|\\+|\\*|\\/|%)",
+          "match": "(\\-|\\+|\\*|\\/|%)",
           "name": "keyword.operator.arithmetic.java"
         },
         {
@@ -970,7 +970,7 @@
     },
     "member-variables": {
       "begin": "(?=private|protected|public|native|synchronized|abstract|threadsafe|transient|static|final)",
-      "end": "(?==|;)",
+      "end": "(?=\\=|;)",
       "patterns": [
         {
           "include": "#storage-modifiers"
@@ -1144,7 +1144,7 @@
     "numbers": {
       "patterns": [
         {
-          "match": "\\b(?<!\\$)0(x|X)((?<!\\.)[0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?[Ll]?(?!\\.)|([0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?\\.?|([0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?)?\\.[0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?)[Pp][+-]?\\d([0-9_]*\\d)?[FfDd]?)\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0(x|X)((?<!\\.)[0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?[Ll]?(?!\\.)|([0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?\\.?|([0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?)?\\.[0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?)[Pp][+-]?[0-9]([0-9_]*[0-9])?[FfDd]?)\\b(?!\\$)",
           "name": "constant.numeric.hex.java"
         },
         {
@@ -1156,7 +1156,7 @@
           "name": "constant.numeric.octal.java"
         },
         {
-          "match": "(?<!\\$)(\\b\\d([0-9_]*\\d)?\\.\\B(?!\\.)|\\b\\d([0-9_]*\\d)?\\.([Ee][+-]?\\d([0-9_]*\\d)?)[FfDd]?\\b|\\b\\d([0-9_]*\\d)?\\.([Ee][+-]?\\d([0-9_]*\\d)?)?[FfDd]\\b|\\b\\d([0-9_]*\\d)?\\.(\\d([0-9_]*\\d)?)([Ee][+-]?\\d([0-9_]*\\d)?)?[FfDd]?\\b|(?<!\\.)\\B\\.\\d([0-9_]*\\d)?([Ee][+-]?\\d([0-9_]*\\d)?)?[FfDd]?\\b|\\b\\d([0-9_]*\\d)?([Ee][+-]?\\d([0-9_]*\\d)?)[FfDd]?\\b|\\b\\d([0-9_]*\\d)?([Ee][+-]?\\d([0-9_]*\\d)?)?[FfDd]\\b|\\b(0|[1-9]([0-9_]*\\d)?)(?!\\.)[Ll]?\\b)(?!\\$)",
+          "match": "(?<!\\$)(\\b[0-9]([0-9_]*[0-9])?\\.\\B(?!\\.)|\\b[0-9]([0-9_]*[0-9])?\\.([Ee][+-]?[0-9]([0-9_]*[0-9])?)[FfDd]?\\b|\\b[0-9]([0-9_]*[0-9])?\\.([Ee][+-]?[0-9]([0-9_]*[0-9])?)?[FfDd]\\b|\\b[0-9]([0-9_]*[0-9])?\\.([0-9]([0-9_]*[0-9])?)([Ee][+-]?[0-9]([0-9_]*[0-9])?)?[FfDd]?\\b|(?<!\\.)\\B\\.[0-9]([0-9_]*[0-9])?([Ee][+-]?[0-9]([0-9_]*[0-9])?)?[FfDd]?\\b|\\b[0-9]([0-9_]*[0-9])?([Ee][+-]?[0-9]([0-9_]*[0-9])?)[FfDd]?\\b|\\b[0-9]([0-9_]*[0-9])?([Ee][+-]?[0-9]([0-9_]*[0-9])?)?[FfDd]\\b|\\b(0|[1-9]([0-9_]*[0-9])?)(?!\\.)[Ll]?\\b)(?!\\$)",
           "name": "constant.numeric.decimal.java"
         }
       ]
@@ -1414,7 +1414,7 @@
               "name": "invalid.illegal.identifier.java"
             }
           },
-          "match": "(\\.)\\s*(\\d[\\w$]*)"
+          "match": "(\\.)\\s*([0-9][\\w$]*)"
         }
       ]
     },
@@ -1512,7 +1512,7 @@
       ]
     },
     "record-constructor": {
-      "begin": "(?!new)(?=[\\w<].*\\s+)(?=([^(=/]|/(?!/))+(?={))",
+      "begin": "(?!new)(?=[\\w<].*\\s+)(?=([^\\(=/]|/(?!/))+(?={))",
       "end": "(})|(?=;)",
       "endCaptures": {
         "1": {
@@ -1839,7 +1839,7 @@
     },
     "variables": {
       "begin": "(?=\\b((void|boolean|byte|char|short|int|float|long|double)|(?>(\\w+\\.)*[A-Z_]+\\w*))\\b\\s*(<[\\w<>,\\.?\\s\\[\\]]*>)?\\s*((\\[\\])*)?\\s+[A-Za-z_$][\\w$]*([\\w\\[\\],$][\\w\\[\\],\\s]*)?\\s*(=|:|;))",
-      "end": "(?==|:|;)",
+      "end": "(?=\\=|:|;)",
       "name": "meta.definition.variable.java",
       "patterns": [
         {
@@ -1860,7 +1860,7 @@
     },
     "variables-local": {
       "begin": "(?=\\b(var)\\b\\s+[A-Za-z_$][\\w$]*\\s*(=|:|;))",
-      "end": "(?==|:|;)",
+      "end": "(?=\\=|:|;)",
       "name": "meta.definition.variable.local.java",
       "patterns": [
         {