diff --git a/extensions/dart/cgmanifest.json b/extensions/dart/cgmanifest.json index fb2bd89d625..84f084ffdbd 100644 --- a/extensions/dart/cgmanifest.json +++ b/extensions/dart/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "dart-lang/dart-syntax-highlight", "repositoryUrl": "https://github.com/dart-lang/dart-syntax-highlight", - "commitHash": "a93646fe6e552d1984c24fd31b1c07dcb3ce7c21" + "commitHash": "9d4857e114b7000d94232d83187ad142961c678a" } }, "licenseDetail": [ diff --git a/extensions/dart/syntaxes/dart.tmLanguage.json b/extensions/dart/syntaxes/dart.tmLanguage.json index b491ff8656c..00f374a6ba2 100644 --- a/extensions/dart/syntaxes/dart.tmLanguage.json +++ b/extensions/dart/syntaxes/dart.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/dart-lang/dart-syntax-highlight/commit/a93646fe6e552d1984c24fd31b1c07dcb3ce7c21", + "version": "https://github.com/dart-lang/dart-syntax-highlight/commit/9d4857e114b7000d94232d83187ad142961c678a", "name": "Dart", "scopeName": "source.dart", "patterns": [ @@ -252,7 +252,7 @@ "function-identifier": { "patterns": [ { - "match": "([_$]*[a-z][a-zA-Z0-9_$]*)(<(?:[a-zA-Z0-9_$<>?]|,\\s*|\\s+extends\\s+)+>)?(\\(|\\s+=>)", + "match": "([_$]*[a-z][a-zA-Z0-9_$]*)(<(?:[a-zA-Z0-9_$<>?]|,\\s*|\\s+extends\\s+)+>)?[!?]?(\\(|\\s+=>)", "captures": { "1": { "name": "entity.name.function.dart" diff --git a/extensions/fsharp/cgmanifest.json b/extensions/fsharp/cgmanifest.json index 1ea8e70b788..c01c28355af 100644 --- a/extensions/fsharp/cgmanifest.json +++ b/extensions/fsharp/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "ionide/ionide-fsgrammar", "repositoryUrl": "https://github.com/ionide/ionide-fsgrammar", - "commitHash": "b528e4360b4cd967aa93c2f7849e459ff91d192c" + "commitHash": "8825a76681cdc14801b5d9490372ff67ec6b9711" } }, "license": "MIT", diff --git a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json b/extensions/fsharp/syntaxes/fsharp.tmLanguage.json index f20a3d1893b..f6cbec6c364 100644 --- a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json +++ b/extensions/fsharp/syntaxes/fsharp.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/ionide/ionide-fsgrammar/commit/b528e4360b4cd967aa93c2f7849e459ff91d192c", + "version": "https://github.com/ionide/ionide-fsgrammar/commit/8825a76681cdc14801b5d9490372ff67ec6b9711", "name": "fsharp", "scopeName": "source.fsharp", "patterns": [ @@ -1148,7 +1148,7 @@ }, { "name": "namespace.open.fsharp", - "begin": "\\b(open)\\s+([[:alpha:]][[:alpha:]0-9'_]*)(?=(\\.[A-Z][[:alpha:]0-9_]*)*)", + "begin": "\\b(open type|open)\\s+([[:alpha:]][[:alpha:]0-9'_]*)(?=(\\.[A-Z][[:alpha:]0-9_]*)*)", "end": "(\\s|$)", "beginCaptures": { "1": { diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json index 405006f6e29..04a23eca114 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/56b7270f094b036256774702e3b7f96490981190", + "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/4d30ff834ec324f56291addd197aa1e423cedfdd", "name": "JavaScript (with React support)", "scopeName": "source.js", "patterns": [ @@ -3993,10 +3993,10 @@ "include": "#type-object" }, { - "include": "#type-conditional" + "include": "#type-operators" }, { - "include": "#type-operators" + "include": "#type-conditional" }, { "include": "#type-fn-type-parameters" @@ -4344,6 +4344,9 @@ { "include": "#typeof-operator" }, + { + "include": "#type-infer" + }, { "begin": "([&|])(?=\\s*\\{)", "beginCaptures": { @@ -4375,16 +4378,31 @@ "name": "keyword.operator.ternary.js", "match": "(\\?|\\:)" }, - { - "name": "keyword.operator.expression.infer.js", - "match": "(?]*([>\\]]))?(?:(\\[)[^\\]]*(\\]))?(\\{)", "captures": { "1": { "name": "keyword.control.cite.latex" diff --git a/extensions/markdown-basics/cgmanifest.json b/extensions/markdown-basics/cgmanifest.json index 06f3fb5a14b..b4cf6b662ea 100644 --- a/extensions/markdown-basics/cgmanifest.json +++ b/extensions/markdown-basics/cgmanifest.json @@ -33,7 +33,7 @@ "git": { "name": "microsoft/vscode-markdown-tm-grammar", "repositoryUrl": "https://github.com/microsoft/vscode-markdown-tm-grammar", - "commitHash": "df4829558048663156abcc4235619c773335445e" + "commitHash": "84a1a8e831a74cc263f96e4dc17b7e9ba3f86c80" } }, "license": "MIT", diff --git a/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json b/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json index fa453cecac4..1c6c859458f 100644 --- a/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json +++ b/extensions/markdown-basics/syntaxes/markdown.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/vscode-markdown-tm-grammar/commit/df4829558048663156abcc4235619c773335445e", + "version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/84a1a8e831a74cc263f96e4dc17b7e9ba3f86c80", "name": "Markdown", "scopeName": "text.html.markdown", "patterns": [ @@ -957,7 +957,7 @@ ] }, "fenced_code_block_js": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(js|jsx|javascript|es6|mjs|cjs|\\{\\.js.+?\\})((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(js|jsx|javascript|es6|mjs|cjs|dataviewjs|\\{\\.js.+?\\})((\\s+|:|,|\\{|\\?)[^`~]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { diff --git a/extensions/typescript-basics/cgmanifest.json b/extensions/typescript-basics/cgmanifest.json index 7e854bdb7b5..d0fcb000eca 100644 --- a/extensions/typescript-basics/cgmanifest.json +++ b/extensions/typescript-basics/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "TypeScript-TmLanguage", "repositoryUrl": "https://github.com/microsoft/TypeScript-TmLanguage", - "commitHash": "56b7270f094b036256774702e3b7f96490981190" + "commitHash": "4d30ff834ec324f56291addd197aa1e423cedfdd" } }, "license": "MIT", diff --git a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json index 950e0afeeec..5164273d6a4 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/56b7270f094b036256774702e3b7f96490981190", + "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/4d30ff834ec324f56291addd197aa1e423cedfdd", "name": "TypeScript", "scopeName": "source.ts", "patterns": [ @@ -4042,10 +4042,10 @@ "include": "#type-object" }, { - "include": "#type-conditional" + "include": "#type-operators" }, { - "include": "#type-operators" + "include": "#type-conditional" }, { "include": "#type-fn-type-parameters" @@ -4393,6 +4393,9 @@ { "include": "#typeof-operator" }, + { + "include": "#type-infer" + }, { "begin": "([&|])(?=\\s*\\{)", "beginCaptures": { @@ -4424,16 +4427,31 @@ "name": "keyword.operator.ternary.ts", "match": "(\\?|\\:)" }, - { - "name": "keyword.operator.expression.infer.ts", - "match": "(?