microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-20 23:52:56 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

Update TextMate grammars from upstream sources (#286560)

Browse Source 
* Update TextMate grammars from upstream sources
* Fix integration test on Windows to run TypeScript file directly
* Baseline update
This commit is contained in:
Dmitriy Vasyura
2026-01-08 17:24:04 +01:00
committed by GitHub
parent 16ccd1afc5
commit c8fdd1650c
20 changed files with 565 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/npm/update-all-grammars.ts
View File

@@ -33,7 +33,7 @@ async function main() {
// run integration tests
if (process.platform === 'win32') {
_spawn('.\\scripts\\test-integration.bat', [], { env: process.env, stdio: 'inherit' });
_spawn('.\\scripts\\test-integration.bat', [], { shell: true, env: process.env, stdio: 'inherit' });
} else {
_spawn('/bin/bash', ['./scripts/test-integration.sh'], { env: process.env, stdio: 'inherit' });
}

2
extensions/csharp/cgmanifest.json
View File

@@ -6,7 +6,7 @@
"git": {
"name": "dotnet/csharp-tmLanguage",
"repositoryUrl": "https://github.com/dotnet/csharp-tmLanguage",
"commitHash": "965478e687f08d3b2ee4fe17104d3f41638bdca2"
"commitHash": "2e6860d87d4019b0b793b1e21e9e5c82185a01aa"
}
},
"license": "MIT",

153
extensions/csharp/syntaxes/csharp.tmLanguage.json
View File

@@ -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/dotnet/csharp-tmLanguage/commit/965478e687f08d3b2ee4fe17104d3f41638bdca2",
"version": "https://github.com/dotnet/csharp-tmLanguage/commit/2e6860d87d4019b0b793b1e21e9e5c82185a01aa",
"name": "C#",
"scopeName": "source.cs",
"patterns": [
@@ -118,9 +118,15 @@
{
"include": "#type-declarations"
},
{
"include": "#constructor-declaration"
},
{
"include": "#property-declaration"
},
{
"include": "#fixed-size-buffer-declaration"
},
{
"include": "#field-declaration"
},
@@ -133,9 +139,6 @@
{
"include": "#variable-initializer"
},
{
"include": "#constructor-declaration"
},
{
"include": "#destructor-declaration"
},
@@ -334,6 +337,12 @@
{
"include": "#is-expression"
},
{
"include": "#boolean-literal"
},
{
"include": "#null-literal"
},
{
"include": "#anonymous-method-expression"
},
@@ -477,7 +486,7 @@
]
},
"attribute-section": {
"begin": "(\\[)(assembly|module|field|event|method|param|property|return|type)?(\\:)?",
"begin": "(\\[)(assembly|module|field|event|method|param|property|return|typevar|type)?(\\:)?",
"beginCaptures": {
"1": {
"name": "punctuation.squarebracket.open.cs"
@@ -1025,6 +1034,9 @@
},
"end": "(?=\\{|where|;)",
"patterns": [
{
"include": "#base-class-constructor-call"
},
{
"include": "#type"
},
@@ -1036,6 +1048,33 @@
}
]
},
"base-class-constructor-call": {
"begin": "(?x)\n(?:\n (@?[_[:alpha:]][_[:alnum:]]*)\\s*(\\.) # qualified name part\n)*\n(@?[_[:alpha:]][_[:alnum:]]*)\\s* # type name\n(\n <\n (?<type_args>\n [^<>()]|\n \\((?:[^<>()]|<[^<>()]*>|\\([^<>()]*\\))*\\)|\n <\\g<type_args>*>\n )*\n >\\s*\n)? # optional type arguments\n(?=\\() # followed by argument list",
"beginCaptures": {
"1": {
"name": "entity.name.type.cs"
},
"2": {
"name": "punctuation.accessor.cs"
},
"3": {
"name": "entity.name.type.cs"
},
"4": {
"patterns": [
{
"include": "#type-arguments"
}
]
}
},
"end": "(?<=\\))",
"patterns": [
{
"include": "#argument-list"
}
]
},
"generic-constraints": {
"begin": "(where)\\s+(@?[_[:alpha:]][_[:alnum:]]*)\\s*(:)",
"beginCaptures": {
@@ -1096,6 +1135,33 @@
}
]
},
"fixed-size-buffer-declaration": {
"begin": "(?x)\n\\b(fixed)\\b\\s+\n(?<type_name>\n (?:\n (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n (?<name_and_type_args> # identifier + type arguments (if any)\n \\g<identifier>\\s*\n (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n )\n (?:\\s*\\.\\s*\\g<name_and_type_args>)* # Are there any more names being dotted into?\n )\n)\\s+\n(\\g<identifier>)\\s* # buffer name\n(?=\\[)",
"beginCaptures": {
"1": {
"name": "storage.modifier.fixed.cs"
},
"2": {
"patterns": [
{
"include": "#type"
}
]
},
"6": {
"name": "entity.name.variable.field.cs"
}
},
"end": "(?=;)",
"patterns": [
{
"include": "#bracketed-argument-list"
},
{
"include": "#comment"
}
]
},
"field-declaration": {
"begin": "(?x)\n(?<type_name>\n (?:\n (?:\n (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n (?<name_and_type_args> # identifier + type arguments (if any)\n \\g<identifier>\\s*\n (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n )\n (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n )\n (?:\\s*\\?\\s*)? # nullable suffix?\n (?:\\s* # array suffix?\n \\[\n (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n \\]\n \\s*\n (?:\\?)? # arrays can be nullable reference types\n \\s*\n )*\n )\n)\\s+\n(\\g<identifier>)\\s* # first field name\n(?!=>|==)(?=,|;|=|$)",
"beginCaptures": {
@@ -1302,10 +1368,13 @@
"match": "\\b(private|protected|internal)\\b"
},
{
"begin": "\\b(get)\\b\\s*(?=\\{|;|=>|//|/\\*|$)",
"begin": "(?:\\b(readonly)\\s+)?\\b(get)\\b\\s*(?=\\{|;|=>|//|/\\*|$)",
"beginCaptures": {
"1": {
"name": "storage.type.accessor.$1.cs"
"name": "storage.modifier.readonly.cs"
},
"2": {
"name": "storage.type.accessor.get.cs"
}
},
"end": "(?<=\\}|;)|(?=\\})",
@@ -1511,17 +1580,14 @@
]
},
"constructor-declaration": {
"begin": "(?=@?[_[:alpha:]][_[:alnum:]]*\\s*\\()",
"begin": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(?=\\(|$)",
"beginCaptures": {
"1": {
"name": "entity.name.function.cs"
}
},
"end": "(?<=\\})|(?=;)",
"patterns": [
{
"match": "(@?[_[:alpha:]][_[:alnum:]]*)\\b",
"captures": {
"1": {
"name": "entity.name.function.cs"
}
}
},
{
"begin": "(:)",
"beginCaptures": {
@@ -2661,6 +2727,15 @@
},
{
"include": "#local-variable-declaration"
},
{
"include": "#local-tuple-var-deconstruction"
},
{
"include": "#tuple-deconstruction-assignment"
},
{
"include": "#expression"
}
]
},
@@ -3045,11 +3120,14 @@
},
{
"include": "#local-tuple-var-deconstruction"
},
{
"include": "#local-tuple-declaration-deconstruction"
}
]
},
"local-variable-declaration": {
"begin": "(?x)\n(?:\n (?:(\\bref)\\s+(?:(\\breadonly)\\s+)?)?(\\bvar\\b)| # ref local\n (?<type_name>\n (?:\n (?:ref\\s+(?:readonly\\s+)?)? # ref local\n (?:\n (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n (?<name_and_type_args> # identifier + type arguments (if any)\n \\g<identifier>\\s*\n (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n )\n (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n )\n (?:\\s*[?*]\\s*)? # nullable or pointer suffix?\n (?:\\s* # array suffix?\n \\[\n (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n \\]\n \\s*\n (?:\\?)? # arrays can be nullable reference types\n \\s*\n )*\n )\n )\n)\\s+\n(\\g<identifier>)\\s*\n(?!=>)\n(?=,|;|=|\\))",
"begin": "(?x)\n(?:\n (?:(\\bref)\\s+(?:(\\breadonly)\\s+)?)?(\\bvar\\b)| # ref local\n (?<type_name>\n (?:\n (?:ref\\s+(?:readonly\\s+)?)? # ref local\n (?:\n (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n (?<name_and_type_args> # identifier + type arguments (if any)\n \\g<identifier>\\s*\n (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n )\n (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n )\n (?:\\s*\\*\\s*)* # pointer suffix?\n (?:\\s*\\?\\s*)? # nullable suffix?\n (?:\\s* # array suffix?\n \\[\n (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n \\]\n \\s*\n (?:\\?)? # arrays can be nullable reference types\n \\s*\n )*\n )\n )\n)\\s+\n(\\g<identifier>)\\s*\n(?!=>)\n(?=,|;|=|\\))",
"beginCaptures": {
"1": {
"name": "storage.modifier.ref.cs"
@@ -3193,6 +3271,18 @@
}
]
},
"local-tuple-declaration-deconstruction": {
"match": "(?x) # e.g. (int x, var y) = GetPoint();\n(?<tuple>\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s*\n(?!=>|==)(?==)",
"captures": {
"1": {
"patterns": [
{
"include": "#tuple-declaration-deconstruction-element-list"
}
]
}
}
},
"tuple-deconstruction-assignment": {
"match": "(?x)\n(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s*\n(?!=>|==)(?==)",
"captures": {
@@ -4355,7 +4445,7 @@
}
},
"array-creation-expression": {
"begin": "(?x)\n\\b(new|stackalloc)\\b\\s*\n(?<type_name>\n (?:\n (?:\n (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n (?<name_and_type_args> # identifier + type arguments (if any)\n \\g<identifier>\\s*\n (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n )\n (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n )\n (?:\\s*\\?\\s*)? # nullable suffix?\n (?:\\s* # array suffix?\n \\[\n (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n \\]\n \\s*\n (?:\\?)? # arrays can be nullable reference types\n \\s*\n )*\n )\n)?\\s*\n(?=\\[)",
"begin": "(?x)\n\\b(new|stackalloc)\\b\\s*\n(?<type_name>\n (?:\n (?:\n (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n (?<name_and_type_args> # identifier + type arguments (if any)\n \\g<identifier>\\s*\n (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n )\n (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n )\n (?:\\s*\\*\\s*)* # pointer suffix?\n (?:\\s*\\?\\s*)? # nullable suffix?\n (?:\\s* # array suffix?\n \\[\n (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n \\]\n \\s*\n (?:\\?)? # arrays can be nullable reference types\n \\s*\n )*\n )\n)?\\s*\n(?=\\[)",
"beginCaptures": {
"1": {
"name": "keyword.operator.expression.$1.cs"
@@ -5204,7 +5294,7 @@
"end": "(?<=$)",
"patterns": [
{
"include": "#comment"
"include": "#preprocessor-comment"
},
{
"include": "#preprocessor-define-or-undef"
@@ -5244,6 +5334,29 @@
}
]
},
"preprocessor-comment": {
"patterns": [
{
"name": "comment.line.double-slash.cs",
"match": "(//).*(?=$)",
"captures": {
"1": {
"name": "punctuation.definition.comment.cs"
}
}
},
{
"name": "comment.block.cs",
"begin": "/\\*",
"end": "\\*/",
"captures": {
"0": {
"name": "punctuation.definition.comment.cs"
}
}
}
]
},
"preprocessor-define-or-undef": {
"match": "\\b(?:(define)|(undef))\\b\\s*\\b([_[:alpha:]][_[:alnum:]]*)\\b",
"captures": {
@@ -5271,7 +5384,7 @@
"end": "(?=$)",
"patterns": [
{
"include": "#comment"
"include": "#preprocessor-comment"
},
{
"include": "#preprocessor-expression"

4
extensions/go/cgmanifest.json
View File

@@ -6,12 +6,12 @@
"git": {
"name": "go-syntax",
"repositoryUrl": "https://github.com/worlpaker/go-syntax",
"commitHash": "8c70c078f56d237f72574ce49cc95839c4f8a741"
"commitHash": "6e8421faf8f1445512825f63925e54a62106bcf1"
}
},
"license": "MIT",
"description": "The file syntaxes/go.tmLanguage.json is from https://github.com/worlpaker/go-syntax, which in turn was derived from https://github.com/jeff-hykin/better-go-syntax.",
"version": "0.8.4"
"version": "0.8.5"
}
],
"version": 1

5
extensions/go/syntaxes/go.tmLanguage.json
View File

@@ -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/worlpaker/go-syntax/commit/8c70c078f56d237f72574ce49cc95839c4f8a741",
"version": "https://github.com/worlpaker/go-syntax/commit/6e8421faf8f1445512825f63925e54a62106bcf1",
"name": "Go",
"scopeName": "source.go",
"patterns": [
@@ -2487,6 +2487,9 @@
{
"include": "#struct_variables_types"
},
{
"include": "#support_functions"
},
{
"include": "#type-declarations"
},

18
extensions/json/syntaxes/snippets.tmLanguage.json
View File

File diff suppressed because one or more lines are too long

4
extensions/latex/cgmanifest.json
View File

@@ -6,11 +6,11 @@
"git": {
"name": "jlelong/vscode-latex-basics",
"repositoryUrl": "https://github.com/jlelong/vscode-latex-basics",
"commitHash": "f40116471b3b479082937850c822a27208d6b054"
"commitHash": "620451dfbdcd7eb36dcd79633e38c62099c13e0e"
}
},
"license": "MIT",
"version": "1.15.0",
"version": "1.16.0",
"description": "The files in syntaxes/ were originally part of https://github.com/James-Yu/LaTeX-Workshop. They have been extracted in the hope that they can useful outside of the LaTeX-Workshop extension.",
"licenseDetail": [
"Copyright (c) vscode-latex-basics authors",

63
extensions/latex/syntaxes/LaTeX.tmLanguage.json
View File

@@ -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/jlelong/vscode-latex-basics/commit/84ce12aa6be384369ff218ac25efb27e6f34e78c",
"version": "https://github.com/jlelong/vscode-latex-basics/commit/620451dfbdcd7eb36dcd79633e38c62099c13e0e",
"name": "LaTeX",
"scopeName": "text.tex.latex",
"patterns": [
@@ -209,7 +209,7 @@
"name": "meta.function.section.$3.latex",
"patterns": [
{
"include": "text.tex#braces"
"include": "#braces"
},
{
"include": "$self"
@@ -241,7 +241,7 @@
"name": "meta.function.emph.latex",
"patterns": [
{
"include": "text.tex#braces"
"include": "#braces"
},
{
"include": "$self"
@@ -272,7 +272,7 @@
"name": "meta.function.textit.latex",
"patterns": [
{
"include": "text.tex#braces"
"include": "#braces"
},
{
"include": "$self"
@@ -302,7 +302,7 @@
"name": "meta.function.textbf.latex",
"patterns": [
{
"include": "text.tex#braces"
"include": "#braces"
},
{
"include": "$self"
@@ -332,7 +332,7 @@
"name": "meta.function.texttt.latex",
"patterns": [
{
"include": "text.tex#braces"
"include": "#braces"
},
{
"include": "$self"
@@ -3622,7 +3622,7 @@
"all-balanced-env": {
"patterns": [
{
"begin": "(?:\\s*)((\\\\)begin)(\\{)((?:\\+?array|equation|(?:IEEE|sub)?eqnarray|multline|align|aligned|alignat|alignedat|flalign|flaligned|flalignat|split|gather|gathered|\\+?cases|(?:display)?math|\\+?[a-zA-Z]*matrix|[pbBvV]?NiceMatrix|[pbBvV]?NiceArray|(?:(?:arg)?(?:mini|maxi)))(?:\\*|!)?)(\\})(\\s*\\n)?",
"begin": "(?:\\s*)((\\\\)begin)(\\{)((?:\\+?array|equation|(?:IEEE|sub)?eqnarray|multline|align|aligned|alignat|alignedat|flalign|flaligned|flalignat|split|gather|gathered|(?:\\+|d|r|dr)?cases|(?:display)?math|\\+?[a-zA-Z]*matrix|[pbBvV]?NiceMatrix|[pbBvV]?NiceArray|(?:(?:arg)?(?:mini|maxi)))(?:\\*|!)?)(\\})(\\s*\\n)?",
"captures": {
"1": {
"name": "support.function.be.latex"
@@ -3921,13 +3921,54 @@
"include": "#column-specials"
},
{
"include": "text.tex#braces"
"include": "#braces"
},
{
"include": "text.tex"
}
]
},
"braces": {
"begin": "(?<!\\\\)\\{",
"beginCaptures": {
"0": {
"name": "punctuation.group.begin.latex"
}
},
"end": "(?<!\\\\)\\}",
"endCaptures": {
"0": {
"name": "punctuation.group.end.latex"
}
},
"name": "meta.group.braces.latex",
"patterns": [
{
"include": "#text-font-macro"
},
{
"include": "#citation-macro"
},
{
"include": "#references-macro"
},
{
"include": "#label-macro"
},
{
"include": "#macro-with-args-tokenizer"
},
{
"include": "#all-other-macro"
},
{
"include": "text.tex"
},
{
"include": "#braces"
}
]
},
"label-macro": {
"begin": "((\\\\)z?label)((?:\\[[^\\[]*?\\])*)(\\{)",
"beginCaptures": {
@@ -3997,7 +4038,7 @@
},
"patterns": [
{
"include": "text.tex#braces"
"include": "#braces"
},
{
"include": "$self"
@@ -4033,7 +4074,7 @@
},
"patterns": [
{
"include": "text.tex#braces"
"include": "#braces"
},
{
"include": "$self"
@@ -4268,7 +4309,7 @@
"include": "#column-specials"
},
{
"include": "text.tex#braces"
"include": "#braces"
},
{
"include": "text.tex"

184
extensions/latex/syntaxes/markdown-latex-combined.tmLanguage.json
View File

@@ -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/jlelong/vscode-latex-basics/commit/d689e50d5a02534f9385306b3d0225d78be4db85",
"version": "https://github.com/jlelong/vscode-latex-basics/commit/8795ab7e45ae21070a6914cb57d2f040fc49254f",
"name": "Markdown",
"scopeName": "text.tex.markdown_latex_combined",
"patterns": [
@@ -962,6 +962,39 @@
}
]
},
"fenced_code_block_ignore": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(gitignore|ignore)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
"name": "markup.fenced_code.block.markdown",
"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
"beginCaptures": {
"3": {
"name": "punctuation.definition.markdown"
},
"4": {
"name": "fenced_code.block.language.markdown"
},
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
"3": {
"name": "punctuation.definition.markdown"
}
},
"patterns": [
{
"begin": "(^|\\G)(\\s*)(.*)",
"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
"contentName": "meta.embedded.block.ignore",
"patterns": [
{
"include": "source.ignore"
}
]
}
]
},
"fenced_code_block_js": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(js|jsx|javascript|es6|mjs|cjs|dataviewjs|\\{\\.js.+?\\})((\\s+|:|,|\\{|\\?)[^`]*)?$)",
"name": "markup.fenced_code.block.markdown",
@@ -1094,6 +1127,39 @@
}
]
},
"fenced_code_block_jsonl": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(jsonl|jsonlines)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
"name": "markup.fenced_code.block.markdown",
"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
"beginCaptures": {
"3": {
"name": "punctuation.definition.markdown"
},
"4": {
"name": "fenced_code.block.language.markdown"
},
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
"3": {
"name": "punctuation.definition.markdown"
}
},
"patterns": [
{
"begin": "(^|\\G)(\\s*)(.*)",
"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
"contentName": "meta.embedded.block.jsonl",
"patterns": [
{
"include": "source.json.lines"
}
]
}
]
},
"fenced_code_block_less": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(less)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
"name": "markup.fenced_code.block.markdown",
@@ -1919,6 +1985,105 @@
}
]
},
"fenced_code_block_yang": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(yang)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
"name": "markup.fenced_code.block.markdown",
"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
"beginCaptures": {
"3": {
"name": "punctuation.definition.markdown"
},
"4": {
"name": "fenced_code.block.language.markdown"
},
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
"3": {
"name": "punctuation.definition.markdown"
}
},
"patterns": [
{
"begin": "(^|\\G)(\\s*)(.*)",
"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
"contentName": "meta.embedded.block.yang",
"patterns": [
{
"include": "source.yang"
}
]
}
]
},
"fenced_code_block_abap": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(abap)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
"name": "markup.fenced_code.block.markdown",
"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
"beginCaptures": {
"3": {
"name": "punctuation.definition.markdown"
},
"4": {
"name": "fenced_code.block.language.markdown"
},
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
"3": {
"name": "punctuation.definition.markdown"
}
},
"patterns": [
{
"begin": "(^|\\G)(\\s*)(.*)",
"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
"contentName": "meta.embedded.block.abap",
"patterns": [
{
"include": "source.abap"
}
]
}
]
},
"fenced_code_block_restructuredtext": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(restructuredtext|rst)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
"name": "markup.fenced_code.block.markdown",
"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
"beginCaptures": {
"3": {
"name": "punctuation.definition.markdown"
},
"4": {
"name": "fenced_code.block.language.markdown"
},
"5": {
"name": "fenced_code.block.language.attributes.markdown"
}
},
"endCaptures": {
"3": {
"name": "punctuation.definition.markdown"
}
},
"patterns": [
{
"begin": "(^|\\G)(\\s*)(.*)",
"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
"contentName": "meta.embedded.block.restructuredtext",
"patterns": [
{
"include": "source.rst"
}
]
}
]
},
"fenced_code_block": {
"patterns": [
{
@@ -2002,6 +2167,9 @@
{
"include": "#fenced_code_block_pug"
},
{
"include": "#fenced_code_block_ignore"
},
{
"include": "#fenced_code_block_js"
},
@@ -2014,6 +2182,9 @@
{
"include": "#fenced_code_block_jsonc"
},
{
"include": "#fenced_code_block_jsonl"
},
{
"include": "#fenced_code_block_less"
},
@@ -2089,6 +2260,15 @@
{
"include": "#fenced_code_block_twig"
},
{
"include": "#fenced_code_block_yang"
},
{
"include": "#fenced_code_block_abap"
},
{
"include": "#fenced_code_block_restructuredtext"
},
{
"include": "#fenced_code_block_unknown"
}
@@ -3090,7 +3270,7 @@
"name": "punctuation.definition.strikethrough.markdown"
}
},
"match": "(?<!\\\\)(~{2,})((?:[^~]|(?!(?<![~\\\\])\\1(?!~))~)*+)(\\1)",
"match": "(?<!\\\\)(~{2,})(?!(?<=\\w~~)_)((?:[^~]|(?!(?<![~\\\\])\\1(?!~))~)*+)(\\1)(?!(?<=_\\1)\\w)",
"name": "markup.strikethrough.markdown"
}
}

2
extensions/lua/cgmanifest.json
View File

@@ -6,7 +6,7 @@
"git": {
"name": "sumneko/lua.tmbundle",
"repositoryUrl": "https://github.com/sumneko/lua.tmbundle",
"commitHash": "1483add845ebfb3e1e631fe372603e5fed2cdd42"
"commitHash": "b295d83bf0e91b5d3a69eb097f9ed351623b95be"
}
},
"licenseDetail": [

35
extensions/lua/syntaxes/lua.tmLanguage.json
View File

@@ -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/sumneko/lua.tmbundle/commit/1483add845ebfb3e1e631fe372603e5fed2cdd42",
"version": "https://github.com/sumneko/lua.tmbundle/commit/b295d83bf0e91b5d3a69eb097f9ed351623b95be",
"name": "Lua",
"scopeName": "source.lua",
"patterns": [
@@ -31,7 +31,7 @@
"name": "punctuation.definition.parameters.begin.lua"
}
},
"end": "(\\))|(?=[\\-\\.{}\\[\\]\"'])",
"end": "(\\))|(?=[\\-{}\\[\\]\"'])|(?<!\\.)\\.(?!\\.)",
"endCaptures": {
"1": {
"name": "punctuation.definition.parameters.finish.lua"
@@ -42,6 +42,17 @@
{
"include": "#comment"
},
{
"match": "(\\.{3})\\s*([a-zA-Z_][a-zA-Z0-9_]*)",
"captures": {
"1": {
"name": "constant.language.lua"
},
"2": {
"name": "variable.parameter.function.lua"
}
}
},
{
"match": "[a-zA-Z_][a-zA-Z0-9_]*",
"name": "variable.parameter.function.lua"
@@ -158,6 +169,14 @@
"match": "\\b(local)\\b",
"name": "keyword.local.lua"
},
{
"match": "^\\s*(global)\\b(?!\\s*=)",
"captures": {
"1": {
"name": "keyword.global.lua"
}
}
},
{
"match": "\\b(function)\\b(?![,:])",
"name": "keyword.control.lua"
@@ -179,13 +198,17 @@
"name": "entity.name.tag.lua"
},
{
"match": "(?<![^.]\\.|:)\\b(coroutine\\.(create|isyieldable|close|resume|running|status|wrap|yield)|string\\.(byte|char|dump|find|format|gmatch|gsub|len|lower|match|pack|packsize|rep|reverse|sub|unpack|upper)|table\\.(concat|insert|maxn|move|pack|remove|sort|unpack)|math\\.(abs|acos|asin|atan2?|ceil|cosh?|deg|exp|floor|fmod|frexp|ldexp|log|log10|max|min|modf|pow|rad|random|randomseed|sinh?|sqrt|tanh?|tointeger|type)|io\\.(close|flush|input|lines|open|output|popen|read|tmpfile|type|write)|os\\.(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)|package\\.(loadlib|seeall|searchpath)|debug\\.(debug|[gs]etfenv|[gs]ethook|getinfo|[gs]etlocal|[gs]etmetatable|getregistry|[gs]etupvalue|[gs]etuservalue|set[Cc]stacklimit|traceback|upvalueid|upvaluejoin)|bit32\\.(arshift|band|bnot|bor|btest|bxor|extract|replace|lrotate|lshift|rrotate|rshift)|utf8\\.(char|codes|codepoint|len|offset))\\b(?!\\s*=(?!=))",
"match": "(?<![^.]\\.|:)\\b(coroutine\\.(create|isyieldable|close|resume|running|status|wrap|yield)|string\\.(byte|char|dump|find|format|gmatch|gsub|len|lower|match|pack|packsize|rep|reverse|sub|unpack|upper)|table\\.(concat|create|insert|maxn|move|pack|remove|sort|unpack)|math\\.(abs|acos|asin|atan2?|ceil|cosh?|deg|exp|floor|fmod|frexp|ldexp|log|log10|max|min|modf|pow|rad|random|randomseed|sinh?|sqrt|tanh?|tointeger|type)|io\\.(close|flush|input|lines|open|output|popen|read|tmpfile|type|write)|os\\.(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)|package\\.(loadlib|seeall|searchpath)|debug\\.(debug|[gs]etfenv|[gs]ethook|getinfo|[gs]etlocal|[gs]etmetatable|getregistry|[gs]etupvalue|[gs]etuservalue|set[Cc]stacklimit|traceback|upvalueid|upvaluejoin)|bit32\\.(arshift|band|bnot|bor|btest|bxor|extract|replace|lrotate|lshift|rrotate|rshift)|utf8\\.(char|codes|codepoint|len|offset))\\b(?!\\s*=(?!=))",
"name": "support.function.library.lua"
},
{
"match": "\\b(and|or|not|\\|\\||\\&\\&|\\!)\\b",
"match": "\\b(\\|\\||\\&\\&|\\!)\\b",
"name": "keyword.operator.lua"
},
{
"match": "\\b(and|or|not)\\b",
"name": "keyword.operator.logical.lua"
},
{
"match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?=\\s*(?:[({\"']|\\[\\[))",
"name": "support.function.any-method.lua"
@@ -900,11 +923,11 @@
"end": "(?=[\\s#])",
"patterns": [
{
"match": "[\\(\\),:\\?][ \\t]*",
"match": "[\\(\\),\\:\\?\\[\\]\\<\\>][ \\t]*",
"name": "keyword.operator.lua"
},
{
"match": "([a-zA-Z_][a-zA-Z0-9_\\.\\*\\[\\]\\<\\>\\,\\-]*)(?<!,)[ \\t]*(?=\\??:)",
"match": "([a-zA-Z_][a-zA-Z0-9_\\.\\*\\-]*)(?<!,)[ \\t]*(?=\\??:)",
"name": "entity.name.variable.lua"
},
{

2
extensions/php/cgmanifest.json
View File

@@ -6,7 +6,7 @@
"git": {
"name": "language-php",
"repositoryUrl": "https://github.com/KapitanOczywisty/language-php",
"commitHash": "b17fdadac1756fc13a0853c26fca2f0b4495c0bd"
"commitHash": "6941b924add3b2587a5be789248176edf5f14595"
}
},
"license": "MIT",

8
extensions/php/syntaxes/php.tmLanguage.json
View File

@@ -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/KapitanOczywisty/language-php/commit/b17fdadac1756fc13a0853c26fca2f0b4495c0bd",
"version": "https://github.com/KapitanOczywisty/language-php/commit/6941b924add3b2587a5be789248176edf5f14595",
"scopeName": "source.php",
"patterns": [
{
@@ -982,9 +982,13 @@
"name": "keyword.operator.arithmetic.php"
},
{
"match": "(?i)(!|&&|\\|\\|)|\\b(and|or|xor|as)\\b",
"match": "(?i)(!|&&|\\|\\|)|\\b(and|or|xor)\\b",
"name": "keyword.operator.logical.php"
},
{
"match": "(?i)\\bas\\b",
"name": "keyword.operator.as.php"
},
{
"include": "#function-call"
},

2
extensions/razor/cgmanifest.json
View File

@@ -6,7 +6,7 @@
"git": {
"name": "dotnet/razor",
"repositoryUrl": "https://github.com/dotnet/razor",
"commitHash": "9b1e979b6c3fe7cfbe30f595b9b0994d20bd482c"
"commitHash": "743f32a68c61809b22fd84e8748c3686ef1bb8b8"
}
},
"license": "MIT",

155
extensions/razor/syntaxes/cshtml.tmLanguage.json
View File

@@ -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/dotnet/razor/commit/9b1e979b6c3fe7cfbe30f595b9b0994d20bd482c",
"version": "https://github.com/dotnet/razor/commit/743f32a68c61809b22fd84e8748c3686ef1bb8b8",
"name": "ASP.NET Razor",
"scopeName": "text.html.cshtml",
"injections": {
@@ -27,6 +27,13 @@
"include": "#implicit-expression"
}
]
},
"source.cs": {
"patterns": [
{
"include": "#inline-template"
}
]
}
},
"patterns": [
@@ -129,6 +136,9 @@
{
"include": "#text-tag"
},
{
"include": "#inline-template"
},
{
"include": "#wellformed-html"
},
@@ -183,6 +193,111 @@
}
}
},
"inline-template": {
"patterns": [
{
"include": "#inline-template-void-tag"
},
{
"include": "#inline-template-non-void-tag"
}
]
},
"inline-template-void-tag": {
"name": "meta.tag.structure.$4.void.html",
"begin": "(?i)(@)(<)(!)?(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)(?=\\s|/?>)",
"beginCaptures": {
"1": {
"patterns": [
{
"include": "#transition"
}
]
},
"2": {
"name": "punctuation.definition.tag.begin.html"
},
"3": {
"name": "constant.character.escape.razor.tagHelperOptOut"
},
"4": {
"name": "entity.name.tag.html"
}
},
"patterns": [
{
"include": "#razor-control-structures"
},
{
"include": "text.html.derivative"
}
],
"end": "/?>",
"endCaptures": {
"0": {
"name": "punctuation.definition.tag.end.html"
}
}
},
"inline-template-non-void-tag": {
"begin": "(@)(<)(!)?([^/\\s>]+)(?=\\s|/?>)",
"beginCaptures": {
"1": {
"patterns": [
{
"include": "#transition"
}
]
},
"2": {
"name": "punctuation.definition.tag.begin.html"
},
"3": {
"name": "constant.character.escape.razor.tagHelperOptOut"
},
"4": {
"name": "entity.name.tag.html"
}
},
"end": "(</)(\\4)\\s*(>)|(/>)",
"endCaptures": {
"1": {
"name": "punctuation.definition.tag.begin.html"
},
"2": {
"name": "entity.name.tag.html"
},
"3": {
"name": "punctuation.definition.tag.end.html"
},
"4": {
"name": "punctuation.definition.tag.end.html"
}
},
"patterns": [
{
"begin": "(?<=>)(?!$)",
"end": "(?=</)",
"patterns": [
{
"include": "#inline-template"
},
{
"include": "#wellformed-html"
},
{
"include": "#razor-control-structures"
}
]
},
{
"include": "#razor-control-structures"
},
{
"include": "text.html.derivative"
}
]
},
"razor-comment": {
"name": "meta.comment.razor",
"begin": "(@)(\\*)",
@@ -1185,7 +1300,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"using-statement-with-optional-transition": {
"name": "meta.statement.using.razor",
@@ -1213,7 +1328,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"if-statement": {
"name": "meta.statement.if.razor",
@@ -1241,7 +1356,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"if-statement-with-optional-transition": {
"name": "meta.statement.if.razor",
@@ -1269,7 +1384,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"else-part": {
"name": "meta.statement.else.razor",
@@ -1293,7 +1408,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"for-statement": {
"name": "meta.statement.for.razor",
@@ -1321,7 +1436,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"for-statement-with-optional-transition": {
"name": "meta.statement.for.razor",
@@ -1349,7 +1464,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"foreach-statement": {
"name": "meta.statement.foreach.razor",
@@ -1384,7 +1499,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"foreach-statement-with-optional-transition": {
"name": "meta.statement.foreach.razor",
@@ -1419,7 +1534,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"foreach-condition": {
"begin": "\\(",
@@ -1505,7 +1620,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"do-statement-with-optional-transition": {
"name": "meta.statement.do.razor",
@@ -1533,7 +1648,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"while-statement": {
"name": "meta.statement.while.razor",
@@ -1594,7 +1709,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"switch-statement-with-optional-transition": {
"name": "meta.statement.switch.razor",
@@ -1622,7 +1737,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"switch-code-block": {
"name": "meta.structure.razor.csharp.codeblock.switch",
@@ -1676,7 +1791,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"lock-statement-with-optional-transition": {
"name": "meta.statement.lock.razor",
@@ -1704,7 +1819,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"try-statement": {
"patterns": [
@@ -1758,7 +1873,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"try-block-with-optional-transition": {
"name": "meta.statement.try.razor",
@@ -1786,7 +1901,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"catch-clause": {
"name": "meta.statement.catch.razor",
@@ -1810,7 +1925,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"catch-condition": {
"begin": "\\(",
@@ -1859,7 +1974,7 @@
"include": "#razor-codeblock-body"
}
],
"end": "(?<=})"
"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
},
"await-prefix": {
"name": "keyword.other.await.cs",

2
extensions/sql/build/update-grammar.mjs
View File

@@ -5,4 +5,4 @@
import * as vscodeGrammarUpdater from 'vscode-grammar-updater';
vscodeGrammarUpdater.update('microsoft/vscode-mssql', 'syntaxes/SQL.plist', './syntaxes/sql.tmLanguage.json', undefined, 'main');
vscodeGrammarUpdater.update('microsoft/vscode-mssql', 'extensions/mssql/syntaxes/SQL.plist', './syntaxes/sql.tmLanguage.json', undefined, 'main');

2
extensions/sql/cgmanifest.json
View File

@@ -6,7 +6,7 @@
"git": {
"name": "microsoft/vscode-mssql",
"repositoryUrl": "https://github.com/microsoft/vscode-mssql",
"commitHash": "ff0c7d3b3582100856fe5b839663b2a8704dc4e4"
"commitHash": "5fd71951c51e0a8385fb546ccebf0716a549fedf"
}
},
"license": "MIT",

4
extensions/sql/syntaxes/sql.tmLanguage.json
View File

@@ -1,10 +1,10 @@
{
"information_for_contributors": [
"This file has been converted from https://github.com/microsoft/vscode-mssql/blob/master/syntaxes/SQL.plist",
"This file has been converted from https://github.com/microsoft/vscode-mssql/blob/master/extensions/mssql/syntaxes/SQL.plist",
"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-mssql/commit/ff0c7d3b3582100856fe5b839663b2a8704dc4e4",
"version": "https://github.com/microsoft/vscode-mssql/commit/5fd71951c51e0a8385fb546ccebf0716a549fedf",
"name": "SQL",
"scopeName": "source.sql",
"patterns": [

2
extensions/vscode-colorize-tests/test/colorize-results/issue-28354_php.json
View File

@@ -183,7 +183,7 @@
},
{
"c": "AS",
"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php keyword.operator.logical.php",
"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php keyword.operator.as.php",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",

2
scripts/test.bat
View File

@@ -12,7 +12,7 @@ set NAMESHORT=%NAMESHORT:"=%.exe
set CODE=".build\electron\%NAMESHORT%"
:: Download Electron if needed
call node build\lib\electron.js
call node build\lib\electron.ts
if %errorlevel% neq 0 node .\node_modules\gulp\bin\gulp.js electron
:: Run tests