Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-20 02:08:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update grammars (#184151)

Browse Source 
* Update grammars

* Update grammar tests
This commit is contained in:
Alex Ross
2023-06-02 13:54:16 +02:00
committed by GitHub
parent 8092bb26d4
commit 53dcdf3ee8
14 changed files with 156 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/csharp/cgmanifest.json
View File

@@ -6,7 +6,7 @@
"git": { "git": {
"name": "dotnet/csharp-tmLanguage", "name": "dotnet/csharp-tmLanguage",
"repositoryUrl": "https://github.com/dotnet/csharp-tmLanguage", "repositoryUrl": "https://github.com/dotnet/csharp-tmLanguage",
"commitHash": "5e7dd90d2af9817b0dfb614b21c79a3e81882d9f" "commitHash": "2918bd69cfcc658bd5b4ec1b106bb008e5c21120"
} }
}, },
"license": "MIT", "license": "MIT",

63
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.", "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." "Once accepted there, we are happy to receive an update request."
], ],
"version": "https://github.com/dotnet/csharp-tmLanguage/commit/5e7dd90d2af9817b0dfb614b21c79a3e81882d9f", "version": "https://github.com/dotnet/csharp-tmLanguage/commit/2918bd69cfcc658bd5b4ec1b106bb008e5c21120",
"name": "C#", "name": "C#",
"scopeName": "source.cs", "scopeName": "source.cs",
"patterns": [ "patterns": [
@@ -57,10 +57,10 @@
"script-top-level": { "script-top-level": {
"patterns": [ "patterns": [
{ {
"include": "#method-declaration" "include": "#statement"
}, },
{ {
"include": "#statement" "include": "#method-declaration"
}, },
{ {
"include": "#punctuation-semicolon" "include": "#punctuation-semicolon"
@@ -91,10 +91,10 @@
"include": "#interface-declaration" "include": "#interface-declaration"
}, },
{ {
"include": "#record-declaration" "include": "#struct-declaration"
}, },
{ {
"include": "#struct-declaration" "include": "#record-declaration"
}, },
{ {
"include": "#attribute-section" "include": "#attribute-section"
@@ -421,7 +421,7 @@
] ]
}, },
{ {
"begin": "\\b(using)\\s*", "begin": "\\b(using)\\s*(?!\\(|\\s|var)",
"beginCaptures": { "beginCaptures": {
"1": { "1": {
"name": "keyword.other.using.cs" "name": "keyword.other.using.cs"
@@ -577,20 +577,23 @@
"match": "(?<!\\.)\\b(new|public|protected|internal|private|abstract|virtual|override|sealed|static|partial|readonly|volatile|const|extern|async|unsafe|ref|required)\\b" "match": "(?<!\\.)\\b(new|public|protected|internal|private|abstract|virtual|override|sealed|static|partial|readonly|volatile|const|extern|async|unsafe|ref|required)\\b"
}, },
"class-declaration": { "class-declaration": {
"begin": "(?=\\bclass\\b)", "begin": "(?=(\\brecord\\b\\s+)?\\bclass\\b)",
"end": "(?<=\\})", "end": "(?<=\\})|(?=;)",
"patterns": [ "patterns": [
{ {
"begin": "(?x)\n\\b(class)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)\\s*", "begin": "(?x)\n(\\b(record)\\b\\s+)?\n\\b(class)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)\\s*",
"beginCaptures": { "beginCaptures": {
"1": { "2": {
"name": "keyword.other.record.cs"
},
"3": {
"name": "keyword.other.class.cs" "name": "keyword.other.class.cs"
}, },
"2": { "4": {
"name": "entity.name.type.class.cs" "name": "entity.name.type.class.cs"
} }
}, },
"end": "(?=\\{)", "end": "(?=\\{)|(?=;)",
"patterns": [ "patterns": [
{ {
"include": "#comment" "include": "#comment"
@@ -598,6 +601,9 @@
{ {
"include": "#type-parameter-list" "include": "#type-parameter-list"
}, },
{
"include": "#parenthesized-parameter-list"
},
{ {
"include": "#base-types" "include": "#base-types"
}, },
@@ -820,7 +826,7 @@
}, },
"record-declaration": { "record-declaration": {
"begin": "(?=\\brecord\\b)", "begin": "(?=\\brecord\\b)",
"end": "(?<=\\})", "end": "(?<=\\})|(?=;)",
"patterns": [ "patterns": [
{ {
"begin": "(?x)\n(record)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)", "begin": "(?x)\n(record)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)",
@@ -829,10 +835,10 @@
"name": "keyword.other.record.cs" "name": "keyword.other.record.cs"
}, },
"2": { "2": {
"name": "entity.name.type.record.cs" "name": "entity.name.type.class.cs"
} }
}, },
"end": "(?=\\{)", "end": "(?=\\{)|(?=;)",
"patterns": [ "patterns": [
{ {
"include": "#comment" "include": "#comment"
@@ -840,6 +846,9 @@
{ {
"include": "#type-parameter-list" "include": "#type-parameter-list"
}, },
{
"include": "#parenthesized-parameter-list"
},
{ {
"include": "#base-types" "include": "#base-types"
}, },
@@ -876,20 +885,23 @@
] ]
}, },
"struct-declaration": { "struct-declaration": {
"begin": "(?=\\bstruct\\b)", "begin": "(?=(\\brecord\\b\\s+)?\\bstruct\\b)",
"end": "(?<=\\})", "end": "(?<=\\})|(?=;)",
"patterns": [ "patterns": [
{ {
"begin": "(?x)\n(struct)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)", "begin": "(?x)\n(\\b(record)\\b\\s+)?\n(struct)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)",
"beginCaptures": { "beginCaptures": {
"1": { "2": {
"name": "keyword.other.record.cs"
},
"3": {
"name": "keyword.other.struct.cs" "name": "keyword.other.struct.cs"
}, },
"2": { "4": {
"name": "entity.name.type.struct.cs" "name": "entity.name.type.struct.cs"
} }
}, },
"end": "(?=\\{)", "end": "(?=\\{)|(?=;)",
"patterns": [ "patterns": [
{ {
"include": "#comment" "include": "#comment"
@@ -897,6 +909,9 @@
{ {
"include": "#type-parameter-list" "include": "#type-parameter-list"
}, },
{
"include": "#parenthesized-parameter-list"
},
{ {
"include": "#base-types" "include": "#base-types"
}, },
@@ -980,7 +995,7 @@
"name": "punctuation.separator.colon.cs" "name": "punctuation.separator.colon.cs"
} }
}, },
"end": "(?=\\{|where)", "end": "(?=\\{|where|;)",
"patterns": [ "patterns": [
{ {
"include": "#type" "include": "#type"
@@ -3006,7 +3021,7 @@
"match": "(?<!\\.)\\bnull\\b" "match": "(?<!\\.)\\bnull\\b"
}, },
"numeric-literal": { "numeric-literal": {
"match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|_)|(?<=[eE])[+-])*", "match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_]|_)|(?<=[eE])[+-]|\\.\\d)*",
"captures": { "captures": {
"0": { "0": {
"patterns": [ "patterns": [
@@ -3152,7 +3167,7 @@
} }
}, },
{ {
"match": "(?:(?:[0-9a-zA-Z_\\.]|_)|(?<=[eE])[+-])+", "match": "(?:(?:[0-9a-zA-Z_]|_)|(?<=[eE])[+-]|\\.\\d)+",
"name": "invalid.illegal.constant.numeric.cs" "name": "invalid.illegal.constant.numeric.cs"
} }
] ]

2
extensions/dart/cgmanifest.json
View File

@@ -6,7 +6,7 @@
"git": { "git": {
"name": "dart-lang/dart-syntax-highlight", "name": "dart-lang/dart-syntax-highlight",
"repositoryUrl": "https://github.com/dart-lang/dart-syntax-highlight", "repositoryUrl": "https://github.com/dart-lang/dart-syntax-highlight",
"commitHash": "b6324bfae2058bc29bb01af6bd2011c3eb35545d" "commitHash": "4a321c4e0756a840b71d03290da8c736d73dbaa1"
} }
}, },
"licenseDetail": [ "licenseDetail": [

5
extensions/dart/syntaxes/dart.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.", "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." "Once accepted there, we are happy to receive an update request."
], ],
"version": "https://github.com/dart-lang/dart-syntax-highlight/commit/b6324bfae2058bc29bb01af6bd2011c3eb35545d", "version": "https://github.com/dart-lang/dart-syntax-highlight/commit/4a321c4e0756a840b71d03290da8c736d73dbaa1",
"name": "Dart", "name": "Dart",
"scopeName": "source.dart", "scopeName": "source.dart",
"patterns": [ "patterns": [
@@ -298,6 +298,9 @@
{ {
"name": "keyword.declaration.dart", "name": "keyword.declaration.dart",
"match": "extends" "match": "extends"
},
{
"include": "#comments"
} }
] ]
}, },

2
extensions/fsharp/cgmanifest.json
View File

@@ -6,7 +6,7 @@
"git": { "git": {
"name": "ionide/ionide-fsgrammar", "name": "ionide/ionide-fsgrammar",
"repositoryUrl": "https://github.com/ionide/ionide-fsgrammar", "repositoryUrl": "https://github.com/ionide/ionide-fsgrammar",
"commitHash": "713cd4a34e7729e444cf85ae287dd94c19e34337" "commitHash": "71b1ead8c99715f6c994115ebab7ee4a14cf0c59"
} }
}, },
"license": "MIT", "license": "MIT",

56
extensions/fsharp/syntaxes/fsharp.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.", "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." "Once accepted there, we are happy to receive an update request."
], ],
"version": "https://github.com/ionide/ionide-fsgrammar/commit/713cd4a34e7729e444cf85ae287dd94c19e34337", "version": "https://github.com/ionide/ionide-fsgrammar/commit/71b1ead8c99715f6c994115ebab7ee4a14cf0c59",
"name": "fsharp", "name": "fsharp",
"scopeName": "source.fsharp", "scopeName": "source.fsharp",
"patterns": [ "patterns": [
@@ -241,7 +241,7 @@
"match": "\\b(private|to|public|internal|function|yield!|yield|class|exception|match|delegate|of|new|in|as|if|then|else|elif|for|begin|end|inherit|do|let\\!|return\\!|return|interface|with|abstract|enum|member|try|finally|and|when|or|use|use\\!|struct|while|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b" "match": "\\b(private|to|public|internal|function|yield!|yield|class|exception|match|delegate|of|new|in|as|if|then|else|elif|for|begin|end|inherit|do|let\\!|return\\!|return|interface|with|abstract|enum|member|try|finally|and|when|or|use|use\\!|struct|while|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b"
}, },
{ {
"name": "keyword.fsharp", "name": "keyword.symbol.fsharp",
"match": ":" "match": ":"
}, },
{ {
@@ -488,7 +488,7 @@
"end": "\\s*(?=(->))", "end": "\\s*(?=(->))",
"beginCaptures": { "beginCaptures": {
"1": { "1": {
"name": "keyword.symbol.arrow.fsharp" "name": "keyword.symbol.fsharp"
} }
}, },
"endCaptures": { "endCaptures": {
@@ -607,7 +607,7 @@
"constants": { "constants": {
"patterns": [ "patterns": [
{ {
"name": "constant.language.unit.fsharp", "name": "keyword.symbol.fsharp",
"match": "\\(\\)" "match": "\\(\\)"
}, },
{ {
@@ -624,7 +624,7 @@
}, },
{ {
"name": "constant.other.fsharp", "name": "constant.other.fsharp",
"match": "\\b(null|unit|void)\\b" "match": "\\b(null|void)\\b"
} }
] ]
}, },
@@ -643,7 +643,7 @@
"name": "support.function.attribute.fsharp" "name": "support.function.attribute.fsharp"
}, },
"5": { "5": {
"name": "keyword.fsharp" "name": "keyword.symbol.fsharp"
} }
}, },
"endCaptures": { "endCaptures": {
@@ -813,7 +813,7 @@
"match": "(->)\\s*(\\()?\\s*([?[:alpha:]0-9'`^._ ]+)*", "match": "(->)\\s*(\\()?\\s*([?[:alpha:]0-9'`^._ ]+)*",
"captures": { "captures": {
"1": { "1": {
"name": "keyword.symbol.fsharp" "name": "keyword.symbol.arrow.fsharp"
}, },
"2": { "2": {
"name": "keyword.symbol.fsharp" "name": "keyword.symbol.fsharp"
@@ -929,7 +929,7 @@
{ {
"name": "binding.fsharp", "name": "binding.fsharp",
"begin": "\\b(let mutable|static let mutable|static let|let inline|let|and|member val|static member inline|static member|default|member|override|let!)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9\\._`\\s]+|(?<=,)\\s)*)?", "begin": "\\b(let mutable|static let mutable|static let|let inline|let|and|member val|static member inline|static member|default|member|override|let!)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9\\._`\\s]+|(?<=,)\\s)*)?",
"end": "\\s*(with\\b|=|\\n+=|(?<=\\=))", "end": "\\s*((with\\b)|(=|\\n+=|(?<=\\=)))",
"beginCaptures": { "beginCaptures": {
"1": { "1": {
"name": "keyword.fsharp" "name": "keyword.fsharp"
@@ -948,8 +948,11 @@
} }
}, },
"endCaptures": { "endCaptures": {
"1": { "2": {
"name": "keyword.fsharp" "name": "keyword.fsharp"
},
"3": {
"name": "keyword.symbol.fsharp"
} }
}, },
"patterns": [ "patterns": [
@@ -969,7 +972,7 @@
}, },
"endCaptures": { "endCaptures": {
"1": { "1": {
"name": "keyword.fsharp" "name": "keyword.symbol.fsharp"
} }
}, },
"patterns": [ "patterns": [
@@ -989,7 +992,7 @@
}, },
"endCaptures": { "endCaptures": {
"1": { "1": {
"name": "keyword.fsharp" "name": "keyword.symbol.fsharp"
} }
}, },
"patterns": [ "patterns": [
@@ -1034,12 +1037,12 @@
"name": "keyword.fsharp" "name": "keyword.fsharp"
}, },
"2": { "2": {
"name": "keyword.fsharp" "name": "keyword.symbol.fsharp"
} }
}, },
"endCaptures": { "endCaptures": {
"1": { "1": {
"name": "keyword.fsharp" "name": "keyword.symbol.fsharp"
} }
}, },
"patterns": [ "patterns": [
@@ -1110,19 +1113,19 @@
}, },
{ {
"name": "keyword.fsharp", "name": "keyword.fsharp",
"match": "\\b(private|to|public|internal|function|class|exception|delegate|of|as|begin|end|inherit|let!|interface|abstract|enum|member|and|when|or|use|use\\!|struct|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b" "match": "\\b(private|to|public|internal|function|class|exception|delegate|of|new|as|begin|end|inherit|let!|interface|abstract|enum|member|and|when|or|use|use\\!|struct|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b"
}, },
{ {
"name": "keyword.control", "name": "keyword.control",
"match": "\\b(match|yield|yield!|with|if|then|else|elif|for|in|return!|return|try|finally|while|do)(?!')\\b" "match": "\\b(match|yield|yield!|with|if|then|else|elif|for|in|return!|return|try|finally|while|do)(?!')\\b"
}, },
{ {
"name": "keyword.symbol.new", "name": "keyword.symbol.arrow.fsharp",
"match": "\\b(new)\\b" "match": "(\\->|\\<\\-)"
}, },
{ {
"name": "keyword.symbol.fsharp", "name": "keyword.symbol.fsharp",
"match": "(&&&|\\|\\|\\||\\^\\^\\^|~~~|<<<|>>>|\\|>|\\->|\\<\\-|:>|:\\?>|:|\\[|\\]|\\;|<>|=|@|\\|\\||&&|{|}|\\||_|\\.\\.|\\,|\\+|\\-|\\*|\\/|\\^|\\!|\\>|\\>\\=|\\>\\>|\\<|\\<\\=|\\(|\\)|\\<\\<)" "match": "(&&&|\\|\\|\\||\\^\\^\\^|~~~|<<<|>>>|\\|>|:>|:\\?>|:|\\[|\\]|\\;|<>|=|@|\\|\\||&&|{|}|\\||_|\\.\\.|\\,|\\+|\\-|\\*|\\/|\\^|\\!|\\>|\\>\\=|\\>\\>|\\<|\\<\\=|\\(|\\)|\\<\\<)"
} }
] ]
}, },
@@ -1208,7 +1211,7 @@
"name": "entity.name.type.namespace.fsharp" "name": "entity.name.type.namespace.fsharp"
}, },
"3": { "3": {
"name": "punctuation.separator.namespace-definition.fsharp" "name": "keyword.symbol.fsharp"
}, },
"4": { "4": {
"name": "entity.name.section.fsharp" "name": "entity.name.section.fsharp"
@@ -1324,7 +1327,7 @@
"variables": { "variables": {
"patterns": [ "patterns": [
{ {
"name": "constant.language.unit.fsharp", "name": "keyword.symbol.fsharp",
"match": "\\(\\)" "match": "\\(\\)"
}, },
{ {
@@ -1347,7 +1350,7 @@
"end": "(>)", "end": "(>)",
"beginCaptures": { "beginCaptures": {
"1": { "1": {
"name": "keyword.symbol.fsharp" "name": "keyword.symbol.arrow.fsharp"
}, },
"2": { "2": {
"name": "entity.name.type.fsharp" "name": "entity.name.type.fsharp"
@@ -1379,7 +1382,7 @@
"match": "\\s*(->)\\s*(?!with|get|set\\b)\\b([\\w0-9'`^._]+)", "match": "\\s*(->)\\s*(?!with|get|set\\b)\\b([\\w0-9'`^._]+)",
"captures": { "captures": {
"1": { "1": {
"name": "keyword.symbol.fsharp" "name": "keyword.symbol.arrow.fsharp"
}, },
"2": { "2": {
"name": "entity.name.type.fsharp" "name": "entity.name.type.fsharp"
@@ -1582,7 +1585,7 @@
"name": "keyword.symbol.fsharp" "name": "keyword.symbol.fsharp"
}, },
"7": { "7": {
"name": "constant.language.unit.fsharp" "name": "keyword.symbol.fsharp"
} }
}, },
"patterns": [ "patterns": [
@@ -1605,12 +1608,12 @@
"end": "((?<!:)>)", "end": "((?<!:)>)",
"beginCaptures": { "beginCaptures": {
"1": { "1": {
"name": "keyword.fsharp" "name": "keyword.symbol.fsharp"
} }
}, },
"endCaptures": { "endCaptures": {
"1": { "1": {
"name": "keyword.fsharp" "name": "keyword.symbol.fsharp"
} }
}, },
"patterns": [ "patterns": [
@@ -1671,9 +1674,6 @@
"match": "\\s*(private|internal|public)", "match": "\\s*(private|internal|public)",
"captures": { "captures": {
"1": { "1": {
"name": "keyword.symbol.fsharp"
},
"2": {
"name": "storage.modifier.fsharp" "name": "storage.modifier.fsharp"
} }
} }
@@ -1792,7 +1792,7 @@
"patterns": [ "patterns": [
{ {
"name": "cexpr.fsharp", "name": "cexpr.fsharp",
"match": "\\b(async|seq|promise|task|maybe|asyncMaybe|controller|scope|application|pipeline)\\s*\\{", "match": "\\b(async|seq|promise|task|maybe|asyncMaybe|controller|scope|application|pipeline)(?=\\s*\\{)",
"captures": { "captures": {
"0": { "0": {
"name": "keyword.fsharp" "name": "keyword.fsharp"

2
extensions/markdown-basics/cgmanifest.json
View File

@@ -33,7 +33,7 @@
"git": { "git": {
"name": "microsoft/vscode-markdown-tm-grammar", "name": "microsoft/vscode-markdown-tm-grammar",
"repositoryUrl": "https://github.com/microsoft/vscode-markdown-tm-grammar", "repositoryUrl": "https://github.com/microsoft/vscode-markdown-tm-grammar",
"commitHash": "ca2caf2157d0674be3d641f71499b84d514e4e5e" "commitHash": "a63d69ebca4c4c88cdb2003f440a5accb8c60e88"
} }
}, },
"license": "MIT", "license": "MIT",

35
extensions/markdown-basics/syntaxes/markdown.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.", "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." "Once accepted there, we are happy to receive an update request."
], ],
"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/ca2caf2157d0674be3d641f71499b84d514e4e5e", "version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/a63d69ebca4c4c88cdb2003f440a5accb8c60e88",
"name": "Markdown", "name": "Markdown",
"scopeName": "text.html.markdown", "scopeName": "text.html.markdown",
"patterns": [ "patterns": [
@@ -2635,47 +2635,50 @@
"5": { "5": {
"name": "punctuation.definition.metadata.markdown" "name": "punctuation.definition.metadata.markdown"
}, },
"6": {
"name": "punctuation.definition.link.markdown"
},
"7": { "7": {
"name": "markup.underline.link.image.markdown" "name": "punctuation.definition.link.markdown"
}, },
"8": { "8": {
"name": "punctuation.definition.link.markdown" "name": "markup.underline.link.image.markdown"
}, },
"9": { "9": {
"name": "string.other.link.description.title.markdown" "name": "punctuation.definition.link.markdown"
}, },
"10": { "10": {
"name": "punctuation.definition.string.markdown" "name": "markup.underline.link.image.markdown"
},
"11": {
"name": "punctuation.definition.string.markdown"
}, },
"12": { "12": {
"name": "string.other.link.description.title.markdown" "name": "string.other.link.description.title.markdown"
}, },
"13": { "13": {
"name": "punctuation.definition.string.markdown" "name": "punctuation.definition.string.begin.markdown"
}, },
"14": { "14": {
"name": "punctuation.definition.string.markdown" "name": "punctuation.definition.string.end.markdown"
}, },
"15": { "15": {
"name": "string.other.link.description.title.markdown" "name": "string.other.link.description.title.markdown"
}, },
"16": { "16": {
"name": "punctuation.definition.string.markdown" "name": "punctuation.definition.string.begin.markdown"
}, },
"17": { "17": {
"name": "punctuation.definition.string.markdown" "name": "punctuation.definition.string.end.markdown"
}, },
"18": { "18": {
"name": "string.other.link.description.title.markdown"
},
"19": {
"name": "punctuation.definition.string.begin.markdown"
},
"20": {
"name": "punctuation.definition.string.end.markdown"
},
"21": {
"name": "punctuation.definition.metadata.markdown" "name": "punctuation.definition.metadata.markdown"
} }
}, },
"match": "(?x)\n (\\!\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])\n # Match the link text.\n (\\() # Opening paren for url\n (<?)(\\S+?)(>?) # The url\n [ \\t]* # Optional whitespace\n (?:\n ((\\().+?(\\))) # Match title in parens…\n | ((\").+?(\")) # or in double quotes…\n | ((').+?(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n (\\))\n", "match": "(?x)\n (\\!\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])\n # Match the link text.\n (\\() # Opening paren for url\n # The url\n [ \\t]*\n (\n (<)([^<>\\n]*)(>)\n | ((?<url>(?>[^\\s()]+)|\\(\\g<url>*\\))*)\n )\n [ \\t]*\n (?:\n ((\\().+?(\\))) # Match title in parens…\n | ((\").+?(\")) # or in double quotes…\n | ((').+?(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n (\\))\n",
"name": "meta.image.inline.markdown" "name": "meta.image.inline.markdown"
}, },
"image-ref": { "image-ref": {

2
extensions/razor/cgmanifest.json
View File

@@ -6,7 +6,7 @@
"git": { "git": {
"name": "dotnet/razor", "name": "dotnet/razor",
"repositoryUrl": "https://github.com/dotnet/razor", "repositoryUrl": "https://github.com/dotnet/razor",
"commitHash": "8d0ae9664cb27276eab36d83e48e88356468ca67" "commitHash": "69f60231df08319b544d3d32a588575acbb58ff0"
} }
}, },
"license": "MIT", "license": "MIT",

6
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.", "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." "Once accepted there, we are happy to receive an update request."
], ],
"version": "https://github.com/dotnet/razor/commit/8d0ae9664cb27276eab36d83e48e88356468ca67", "version": "https://github.com/dotnet/razor/commit/69f60231df08319b544d3d32a588575acbb58ff0",
"name": "ASP.NET Razor", "name": "ASP.NET Razor",
"scopeName": "text.html.cshtml", "scopeName": "text.html.cshtml",
"patterns": [ "patterns": [
@@ -531,7 +531,7 @@
] ]
}, },
"code-directive": { "code-directive": {
"begin": "(@)(code)\\s*", "begin": "(@)(code)((?=\\{)|\\s+)",
"beginCaptures": { "beginCaptures": {
"1": { "1": {
"patterns": [ "patterns": [
@@ -552,7 +552,7 @@
"end": "(?<=})|\\s" "end": "(?<=})|\\s"
}, },
"functions-directive": { "functions-directive": {
"begin": "(@)(functions)\\s*", "begin": "(@)(functions)((?=\\{)|\\s+)",
"beginCaptures": { "beginCaptures": {
"1": { "1": {
"patterns": [ "patterns": [

4
extensions/sql/cgmanifest.json
View File

@@ -6,11 +6,11 @@
"git": { "git": {
"name": "microsoft/vscode-mssql", "name": "microsoft/vscode-mssql",
"repositoryUrl": "https://github.com/microsoft/vscode-mssql", "repositoryUrl": "https://github.com/microsoft/vscode-mssql",
"commitHash": "3929516cce0a570e91ee1be74b09ed886cb360f4" "commitHash": "cb5940297a8cef76daaf4a6b63c4968c9a12d17a"
} }
}, },
"license": "MIT", "license": "MIT",
"version": "1.19.0" "version": "1.20.0"
} }
], ],
"version": 1 "version": 1

12
extensions/sql/syntaxes/sql.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.", "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." "Once accepted there, we are happy to receive an update request."
], ],
"version": "https://github.com/microsoft/vscode-mssql/commit/3929516cce0a570e91ee1be74b09ed886cb360f4", "version": "https://github.com/microsoft/vscode-mssql/commit/cb5940297a8cef76daaf4a6b63c4968c9a12d17a",
"name": "SQL", "name": "SQL",
"scopeName": "source.sql", "scopeName": "source.sql",
"patterns": [ "patterns": [
@@ -424,6 +424,11 @@
"patterns": [] "patterns": []
}, },
{ {
"include": "#comment-block"
}
]
},
"comment-block": {
"begin": "/\\*", "begin": "/\\*",
"captures": { "captures": {
"0": { "0": {
@@ -431,7 +436,10 @@
} }
}, },
"end": "\\*/", "end": "\\*/",
"name": "comment.block.c" "name": "comment.block",
"patterns": [
{
"include": "#comment-block"
} }
] ]
}, },

74
extensions/vscode-colorize-tests/test/colorize-results/test_fs.json
View File

@@ -309,7 +309,7 @@
}, },
{ {
"c": "=", "c": "=",
"t": "source.fsharp binding.fsharp keyword.fsharp", "t": "source.fsharp binding.fsharp keyword.symbol.fsharp",
"r": { "r": {
"dark_plus": "keyword: #569CD6", "dark_plus": "keyword: #569CD6",
"light_plus": "keyword: #0000FF", "light_plus": "keyword: #0000FF",
@@ -351,7 +351,7 @@
}, },
{ {
"c": "new", "c": "new",
"t": "source.fsharp keyword.symbol.new", "t": "source.fsharp keyword.fsharp",
"r": { "r": {
"dark_plus": "keyword: #569CD6", "dark_plus": "keyword: #569CD6",
"light_plus": "keyword: #0000FF", "light_plus": "keyword: #0000FF",
@@ -631,7 +631,7 @@
}, },
{ {
"c": "=", "c": "=",
"t": "source.fsharp binding.fsharp keyword.fsharp", "t": "source.fsharp binding.fsharp keyword.symbol.fsharp",
"r": { "r": {
"dark_plus": "keyword: #569CD6", "dark_plus": "keyword: #569CD6",
"light_plus": "keyword: #0000FF", "light_plus": "keyword: #0000FF",
@@ -785,16 +785,16 @@
}, },
{ {
"c": "()", "c": "()",
"t": "source.fsharp binding.fsharp constant.language.unit.fsharp", "t": "source.fsharp binding.fsharp keyword.symbol.fsharp",
"r": { "r": {
"dark_plus": "constant.language: #569CD6", "dark_plus": "keyword: #569CD6",
"light_plus": "constant.language: #0000FF", "light_plus": "keyword: #0000FF",
"dark_vs": "constant.language: #569CD6", "dark_vs": "keyword: #569CD6",
"light_vs": "constant.language: #0000FF", "light_vs": "keyword: #0000FF",
"hc_black": "constant.language: #569CD6", "hc_black": "keyword: #569CD6",
"dark_modern": "constant.language: #569CD6", "dark_modern": "keyword: #569CD6",
"hc_light": "constant.language: #0F4A85", "hc_light": "keyword: #0F4A85",
"light_modern": "constant.language: #0000FF" "light_modern": "keyword: #0000FF"
} }
}, },
{ {
@@ -813,7 +813,7 @@
}, },
{ {
"c": "=", "c": "=",
"t": "source.fsharp binding.fsharp keyword.fsharp", "t": "source.fsharp binding.fsharp keyword.symbol.fsharp",
"r": { "r": {
"dark_plus": "keyword: #569CD6", "dark_plus": "keyword: #569CD6",
"light_plus": "keyword: #0000FF", "light_plus": "keyword: #0000FF",
@@ -953,7 +953,7 @@
}, },
{ {
"c": "=", "c": "=",
"t": "source.fsharp binding.fsharp keyword.fsharp", "t": "source.fsharp binding.fsharp keyword.symbol.fsharp",
"r": { "r": {
"dark_plus": "keyword: #569CD6", "dark_plus": "keyword: #569CD6",
"light_plus": "keyword: #0000FF", "light_plus": "keyword: #0000FF",
@@ -981,7 +981,7 @@
}, },
{ {
"c": "<-", "c": "<-",
"t": "source.fsharp keyword.symbol.fsharp", "t": "source.fsharp keyword.symbol.arrow.fsharp",
"r": { "r": {
"dark_plus": "keyword: #569CD6", "dark_plus": "keyword: #569CD6",
"light_plus": "keyword: #0000FF", "light_plus": "keyword: #0000FF",
@@ -1079,16 +1079,16 @@
}, },
{ {
"c": "()", "c": "()",
"t": "source.fsharp binding.fsharp constant.language.unit.fsharp", "t": "source.fsharp binding.fsharp keyword.symbol.fsharp",
"r": { "r": {
"dark_plus": "constant.language: #569CD6", "dark_plus": "keyword: #569CD6",
"light_plus": "constant.language: #0000FF", "light_plus": "keyword: #0000FF",
"dark_vs": "constant.language: #569CD6", "dark_vs": "keyword: #569CD6",
"light_vs": "constant.language: #0000FF", "light_vs": "keyword: #0000FF",
"hc_black": "constant.language: #569CD6", "hc_black": "keyword: #569CD6",
"dark_modern": "constant.language: #569CD6", "dark_modern": "keyword: #569CD6",
"hc_light": "constant.language: #0F4A85", "hc_light": "keyword: #0F4A85",
"light_modern": "constant.language: #0000FF" "light_modern": "keyword: #0000FF"
} }
}, },
{ {
@@ -1107,7 +1107,7 @@
}, },
{ {
"c": "=", "c": "=",
"t": "source.fsharp binding.fsharp keyword.fsharp", "t": "source.fsharp binding.fsharp keyword.symbol.fsharp",
"r": { "r": {
"dark_plus": "keyword: #569CD6", "dark_plus": "keyword: #569CD6",
"light_plus": "keyword: #0000FF", "light_plus": "keyword: #0000FF",
@@ -1135,7 +1135,7 @@
}, },
{ {
"c": "<-", "c": "<-",
"t": "source.fsharp keyword.symbol.fsharp", "t": "source.fsharp keyword.symbol.arrow.fsharp",
"r": { "r": {
"dark_plus": "keyword: #569CD6", "dark_plus": "keyword: #569CD6",
"light_plus": "keyword: #0000FF", "light_plus": "keyword: #0000FF",
@@ -1275,7 +1275,7 @@
}, },
{ {
"c": "=", "c": "=",
"t": "source.fsharp binding.fsharp keyword.fsharp", "t": "source.fsharp binding.fsharp keyword.symbol.fsharp",
"r": { "r": {
"dark_plus": "keyword: #569CD6", "dark_plus": "keyword: #569CD6",
"light_plus": "keyword: #0000FF", "light_plus": "keyword: #0000FF",
@@ -1401,16 +1401,16 @@
}, },
{ {
"c": "()", "c": "()",
"t": "source.fsharp binding.fsharp constant.language.unit.fsharp", "t": "source.fsharp binding.fsharp keyword.symbol.fsharp",
"r": { "r": {
"dark_plus": "constant.language: #569CD6", "dark_plus": "keyword: #569CD6",
"light_plus": "constant.language: #0000FF", "light_plus": "keyword: #0000FF",
"dark_vs": "constant.language: #569CD6", "dark_vs": "keyword: #569CD6",
"light_vs": "constant.language: #0000FF", "light_vs": "keyword: #0000FF",
"hc_black": "constant.language: #569CD6", "hc_black": "keyword: #569CD6",
"dark_modern": "constant.language: #569CD6", "dark_modern": "keyword: #569CD6",
"hc_light": "constant.language: #0F4A85", "hc_light": "keyword: #0F4A85",
"light_modern": "constant.language: #0000FF" "light_modern": "keyword: #0000FF"
} }
}, },
{ {
@@ -1429,7 +1429,7 @@
}, },
{ {
"c": "=", "c": "=",
"t": "source.fsharp binding.fsharp keyword.fsharp", "t": "source.fsharp binding.fsharp keyword.symbol.fsharp",
"r": { "r": {
"dark_plus": "keyword: #569CD6", "dark_plus": "keyword: #569CD6",
"light_plus": "keyword: #0000FF", "light_plus": "keyword: #0000FF",

4
extensions/vscode-colorize-tests/test/colorize-results/test_md.json
View File

@@ -2717,7 +2717,7 @@
}, },
{ {
"c": "\"", "c": "\"",
"t": "text.html.markdown meta.paragraph.markdown meta.image.inline.markdown string.other.link.description.title.markdown punctuation.definition.string.markdown", "t": "text.html.markdown meta.paragraph.markdown meta.image.inline.markdown string.other.link.description.title.markdown punctuation.definition.string.begin.markdown",
"r": { "r": {
"dark_plus": "string: #CE9178", "dark_plus": "string: #CE9178",
"light_plus": "string: #A31515", "light_plus": "string: #A31515",
@@ -2745,7 +2745,7 @@
}, },
{ {
"c": "\"", "c": "\"",
"t": "text.html.markdown meta.paragraph.markdown meta.image.inline.markdown string.other.link.description.title.markdown punctuation.definition.string.markdown", "t": "text.html.markdown meta.paragraph.markdown meta.image.inline.markdown string.other.link.description.title.markdown punctuation.definition.string.end.markdown",
"r": { "r": {
"dark_plus": "string: #CE9178", "dark_plus": "string: #CE9178",
"light_plus": "string: #A31515", "light_plus": "string: #A31515",