diff --git a/extensions/bat/syntaxes/batchfile.tmLanguage.json b/extensions/bat/syntaxes/batchfile.tmLanguage.json index 2aee0692ad8..996d5aed4da 100644 --- a/extensions/bat/syntaxes/batchfile.tmLanguage.json +++ b/extensions/bat/syntaxes/batchfile.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/mmims/language-batchfile/commit/3dd105c31484e5975144478dac1aa91d8f51e528", + "version": "https://github.com/mmims/language-batchfile/commit/9b2d868a43d6a04a4dc27cb31f907b960a4fdab1", "name": "Batch File", "scopeName": "source.batchfile", "patterns": [ @@ -110,7 +110,7 @@ "include": "#parens" }, { - "begin": "(\")\\s*([^ ][^=]*)(=)\"?", + "begin": "(\")\\s*([^ ][^=]*)(=)", "beginCaptures": { "1": { "name": "punctuation.definition.string.begin.batchfile" @@ -125,9 +125,10 @@ "end": "\"", "endCaptures": { "0": { - "name": "string.quoted.double.batchfile" + "name": "punctuation.definition.string.end.batchfile" } }, + "name": "string.quoted.double.batchfile", "patterns": [ { "include": "#variables" @@ -493,6 +494,10 @@ }, "name": "string.quoted.double.batchfile", "patterns": [ + { + "match": "%%", + "name": "constant.character.escape.batchfile" + }, { "include": "#variables" } @@ -507,9 +512,11 @@ "captures": { "1": { "name": "punctuation.definition.variable.batchfile" + }, + "2": { + "name": "variable.parameter.batchfile" } - }, - "name": "variable.parameter.batchfile" + } }, { "include": "#variable" diff --git a/extensions/bat/test/colorize-results/test_bat.json b/extensions/bat/test/colorize-results/test_bat.json index 48d1a37299e..0f2541c1edf 100644 --- a/extensions/bat/test/colorize-results/test_bat.json +++ b/extensions/bat/test/colorize-results/test_bat.json @@ -89,13 +89,13 @@ }, { "c": "%", - "t": "source.batchfile variable.parameter.batchfile punctuation.definition.variable.batchfile", + "t": "source.batchfile punctuation.definition.variable.batchfile", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE" + "hc_black": "default: #FFFFFF" } }, { diff --git a/extensions/java/syntaxes/java.tmLanguage.json b/extensions/java/syntaxes/java.tmLanguage.json index 0d29f449e02..f0c867f59c8 100644 --- a/extensions/java/syntaxes/java.tmLanguage.json +++ b/extensions/java/syntaxes/java.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/atom/language-java/commit/5c2863da1425d61914d2e04ef31b86f8c5883c5f", + "version": "https://github.com/atom/language-java/commit/bbbd3236c0ef9a9cd8c59d6ad4bd6b9b231dc714", "name": "Java", "scopeName": "source.java", "patterns": [ @@ -769,7 +769,7 @@ "name": "storage.modifier.$1.java" }, { - "match": "([a-zA-Z$_][a-zA-Z0-9$_]*)(?=\\s*<)", + "match": "(?(\\w+\\.)*[A-Z]+\\w*) # e.g. `javax.ws.rs.Response`, or `String`\n )\n (\n <[\\w<>,?\\s]*> # HashMap\n )?\n (\n (\\[\\])* # int[][]\n )?\n \\s+\n [A-Za-z_$][\\w$]* # At least one identifier after space\n ([\\w\\[\\],$][\\w\\[\\],\\s]*)? # possibly primitive array or additional identifiers\n \\s*(=|;)\n)", + "begin": "(?x)\n(?=\n (\n (void|boolean|byte|char|short|int|float|long|double)\n |\n (?>(\\w+\\.)*[A-Z]+\\w*) # e.g. `javax.ws.rs.Response`, or `String`\n )\n (\n <[\\w<>,\\.?\\s]*> # e.g. `HashMap`, or `List`\n )?\n (\n (\\[\\])* # int[][]\n )?\n \\s+\n [A-Za-z_$][\\w$]* # At least one identifier after space\n ([\\w\\[\\],$][\\w\\[\\],\\s]*)? # possibly primitive array or additional identifiers\n \\s*(=|;)\n)", "end": "(?=;)", "name": "meta.definition.variable.java", "patterns": [ diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json index b9374f7788d..a8525b380ef 100644 --- a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json +++ b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/b61fd56a52f6b85598eda2f3842dfb7447d0d4eb", + "version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/4ef3570784b60450d6baac681cb096fbf1d2397e", "name": "JavaScript (with React support)", "scopeName": "source.js", "patterns": [ @@ -3243,6 +3243,10 @@ { "name": "keyword.operator.expression.infer.js", "match": "(?[^\\[\\]]+|\\[\\g<8>\\])*)(\\])\n |((?:\\S*?\\(\\))|(?:\\S*?))\n )\n)?\n\\s*(?=,|\\)|/[/*]|\\#|$) # A closing parentheses (end of argument list) or a comma or a comment", + "match": "(?xi)\n(?:(\\?)\\s*)?(array|callable) # Typehint\n\\s+((&)?\\s*(\\$+)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name with possible reference\n(?: # Optional default value\n \\s*(=)\\s*\n (?:\n (null)\n |\n (\\[)((?>[^\\[\\]]+|\\[\\g<8>\\])*)(\\])\n |((?:\\S*?\\(\\))|(?:\\S*?))\n )\n)?\n\\s*(?=,|\\)|/[/*]|\\#|$) # A closing parentheses (end of argument list) or a comma or a comment", "name": "meta.function.parameter.array.php", "captures": { "1": { - "name": "storage.type.php" + "name": "keyword.operator.nullable-type.php" }, "2": { - "name": "variable.other.php" + "name": "storage.type.php" }, "3": { - "name": "storage.modifier.reference.php" + "name": "variable.other.php" }, "4": { - "name": "punctuation.definition.variable.php" + "name": "storage.modifier.reference.php" }, "5": { - "name": "keyword.operator.assignment.php" + "name": "punctuation.definition.variable.php" }, "6": { - "name": "constant.language.php" + "name": "keyword.operator.assignment.php" }, "7": { - "name": "punctuation.section.array.begin.php" + "name": "constant.language.php" }, "8": { + "name": "punctuation.section.array.begin.php" + }, + "9": { "patterns": [ { "include": "#parameter-default-types" } ] }, - "9": { + "10": { "name": "punctuation.section.array.end.php" }, - "10": { + "11": { "name": "invalid.illegal.non-null-typehinted.php" } } }, { - "begin": "(?xi)\n(\\\\?(?:[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*\\\\)*) # Optional namespace\n([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Typehinted class name\n\\s+((&)?\\s*(\\.\\.\\.)?(\\$+)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name with possible reference", + "begin": "(?xi)\n(?:(\\?)\\s*)?\n(\\\\?(?:[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*\\\\)*) # Optional namespace\n([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Typehinted class name\n\\s+((&)?\\s*(\\.\\.\\.)?(\\$+)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name with possible reference", "beginCaptures": { "1": { + "name": "keyword.operator.nullable-type.php" + }, + "2": { "name": "support.other.namespace.php", "patterns": [ { @@ -1089,19 +1109,19 @@ } ] }, - "2": { + "3": { "name": "storage.type.php" }, - "3": { + "4": { "name": "variable.other.php" }, - "4": { + "5": { "name": "storage.modifier.reference.php" }, - "5": { + "6": { "name": "keyword.operator.variadic.php" }, - "6": { + "7": { "name": "punctuation.definition.variable.php" } }, diff --git a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json index 420cdf9ebc1..21fba6f0e64 100644 --- a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json +++ b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/b61fd56a52f6b85598eda2f3842dfb7447d0d4eb", + "version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/4ef3570784b60450d6baac681cb096fbf1d2397e", "name": "TypeScript", "scopeName": "source.ts", "patterns": [ @@ -3277,6 +3277,10 @@ { "name": "keyword.operator.expression.infer.ts", "match": "(?