Update grammars (#192749)

extensions/csharp/cgmanifest.json

@@ -6,7 +6,7 @@
 				"git": {
 					"name": "dotnet/csharp-tmLanguage",
 					"repositoryUrl": "https://github.com/dotnet/csharp-tmLanguage",
-					"commitHash": "772323937fedd65c6dc1c8ce6ea41d97415ed7d1"
+					"commitHash": "525e628edad54c0f7aa15b015310df240803ea66"
 				}
 			},
 			"license": "MIT",

extensions/java/cgmanifest.json

@@ -6,7 +6,7 @@
 				"git": {
 					"name": "redhat-developer/vscode-java",
 					"repositoryUrl": "https://github.com/redhat-developer/vscode-java",
-					"commitHash": "5fb57e8e1c5d776b21be13cd7227b25b87edf4a6"
+					"commitHash": "5d224a552cf5f0f8ebccf69e43e2575ed2c13839"
 				}
 			},
 			"license": "MIT",
@@ -44,7 +44,7 @@
 				"suitability for any purpose."
 			],
 			"description": "This grammar was derived from https://github.com/atom/language-java/blob/master/grammars/java.cson.",
-			"version": "1.21.0"
+			"version": "1.22.0"
 		}
 	],
 	"version": 1

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/redhat-developer/vscode-java/commit/5fb57e8e1c5d776b21be13cd7227b25b87edf4a6",
+	"version": "https://github.com/redhat-developer/vscode-java/commit/5d224a552cf5f0f8ebccf69e43e2575ed2c13839",
 	"name": "Java",
 	"scopeName": "source.java",
 	"patterns": [

extensions/julia/cgmanifest.json

@@ -6,7 +6,7 @@
 				"git": {
 					"name": "JuliaEditorSupport/atom-language-julia",
 					"repositoryUrl": "https://github.com/JuliaEditorSupport/atom-language-julia",
-					"commitHash": "ccc0277c9ee9af34a0b50e5fa27a6f5191601b8c"
+					"commitHash": "7cbe6a7c4f2c8275e15f5b6e0722d285730ffb99"
 				}
 			},
 			"license": "MIT",

extensions/julia/syntaxes/julia.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/JuliaEditorSupport/atom-language-julia/commit/ccc0277c9ee9af34a0b50e5fa27a6f5191601b8c",
+	"version": "https://github.com/JuliaEditorSupport/atom-language-julia/commit/7cbe6a7c4f2c8275e15f5b6e0722d285730ffb99",
 	"name": "Julia",
 	"scopeName": "source.julia",
 	"comment": "This grammar is used by Atom (Oniguruma), GitHub (PCRE), and VSCode (Oniguruma),\nso all regexps must be compatible with both engines.\n\nSpecs:\n- https://github.com/kkos/oniguruma/blob/master/doc/RE\n- https://www.pcre.org/current/doc/html/",
@@ -356,13 +356,16 @@
 					"name": "keyword.operator.shift.julia"
 				},
 				{
-					"match": "(?:\\s*(::|>:|<:)\\s*((?:(?:Union)?\\([^)]*\\)|[[:alpha:]_$∇][[:word:]⁺-ₜ!′\\.]*(?:(?:{(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})|(?:\".+?(?<!\\\\)\"))?)))(?:\\.\\.\\.)?",
+					"match": "(?:\\s*(::|>:|<:)\\s*((?:(?:Union)?\\([^)]*\\)|[[:alpha:]_$∇][[:word:]⁺-ₜ!′\\.]*(?:(?:{(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})|(?:\".+?(?<!\\\\)\"))?)))(?:\\.\\.\\.)?((?:\\.)?'*)",
 					"captures": {
 						"1": {
 							"name": "keyword.operator.relation.types.julia"
 						},
 						"2": {
 							"name": "support.type.julia"
+						},
+						"3": {
+							"name": "keyword.operator.transpose.julia"
 						}
 					}
 				},

extensions/latex/cgmanifest.json

@@ -6,11 +6,11 @@
 				"git": {
 					"name": "jlelong/vscode-latex-basics",
 					"repositoryUrl": "https://github.com/jlelong/vscode-latex-basics",
-					"commitHash": "30d04562e592305b6f6d41a539b3ccf326888aaf"
+					"commitHash": "3ae82b457c28f0368cbbb47024b0245ef1ff3d33"
 				}
 			},
 			"license": "MIT",
-			"version": "1.5.3",
+			"version": "1.5.2",
 			"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",

extensions/latex/syntaxes/Bibtex.tmLanguage.json

@@ -4,30 +4,74 @@
 		"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/7adad0868ecafbb1df978f1e052d6c3c85c38732",
+	"version": "https://github.com/jlelong/vscode-latex-basics/commit/36411b38cf4ed18e02050249e2162b1316488686",
 	"name": "BibTeX",
 	"scopeName": "text.bibtex",
-	"comment": "Grammar based on description from http://artis.imag.fr/~Xavier.Decoret/resources/xdkbibtex/bibtex_summary.html#comment\n\t\n\tTODO: Does not support @preamble\n\t",
+	"comment": "Grammar based on description from https://github.com/aclements/biblib\n",
 	"patterns": [
 		{
-			"begin": "@Comment",
+			"match": "@(?i:comment)(?=[\\s{(])",
-			"beginCaptures": {
+			"captures": {
 				"0": {
 					"name": "punctuation.definition.comment.bibtex"
 				}
 			},
-			"end": "$\\n?",
+			"name": "comment.block.at-sign.bibtex"
-			"name": "comment.line.at-sign.bibtex"
 		},
 		{
+			"begin": "((@)(?i:preamble))\\s*(\\{)\\s*",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.preamble.bibtex"
+				},
+				"2": {
+					"name": "punctuation.definition.keyword.bibtex"
+				},
+				"3": {
+					"name": "punctuation.section.preamble.begin.bibtex"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.preamble.end.bibtex"
+				}
+			},
+			"name": "meta.preamble.braces.bibtex",
 			"patterns": [
 				{
-					"include": "#percentage_comment"
+					"include": "#field_value"
 				}
 			]
 		},
 		{
-			"begin": "((@)(?i:string))\\s*(\\{)\\s*([a-zA-Z0-9\\!\\$\\&\\*\\+\\-\\.\\/\\:\\;\\<\\>\\?\\[\\]\\^\\_\\`\\|]+)",
+			"begin": "((@)(?i:preamble))\\s*(\\()\\s*",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.preamble.bibtex"
+				},
+				"2": {
+					"name": "punctuation.definition.keyword.bibtex"
+				},
+				"3": {
+					"name": "punctuation.section.preamble.begin.bibtex"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.preamble.end.bibtex"
+				}
+			},
+			"name": "meta.preamble.parenthesis.bibtex",
+			"patterns": [
+				{
+					"include": "#field_value"
+				}
+			]
+		},
+		{
+			"begin": "((@)(?i:string))\\s*(\\{)\\s*([a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.other.string-constant.bibtex"
@@ -51,12 +95,12 @@
 			"name": "meta.string-constant.braces.bibtex",
 			"patterns": [
 				{
-					"include": "#string_content"
+					"include": "#field_value"
 				}
 			]
 		},
 		{
-			"begin": "((@)(?i:string))\\s*(\\()\\s*([a-zA-Z0-9\\!\\$\\&\\*\\+\\-\\.\\/\\:\\;\\<\\>\\?\\[\\]\\^\\_\\`\\|]+)",
+			"begin": "((@)(?i:string))\\s*(\\()\\s*([a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.other.string-constant.bibtex"
@@ -80,12 +124,12 @@
 			"name": "meta.string-constant.parenthesis.bibtex",
 			"patterns": [
 				{
-					"include": "#string_content"
+					"include": "#field_value"
 				}
 			]
 		},
 		{
-			"begin": "((@)[a-zA-Z]+)\\s*(\\{)\\s*([^\\s,]*)",
+			"begin": "((@)[a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(\\{)\\s*([^\\s,}]*)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.other.entry-type.bibtex"
@@ -109,13 +153,7 @@
 			"name": "meta.entry.braces.bibtex",
 			"patterns": [
 				{
-					"include": "#percentage_comment"
+					"begin": "([a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(\\=)",
-				},
-				{
-					"include": "#url_field"
-				},
-				{
-					"begin": "([a-zA-Z0-9\\!\\$\\&\\*\\+\\-\\.\\/\\:\\;\\<\\>\\?\\[\\]\\^\\_\\`\\|]+)\\s*(\\=)",
 					"beginCaptures": {
 						"1": {
 							"name": "support.function.key.bibtex"
@@ -128,23 +166,14 @@
 					"name": "meta.key-assignment.bibtex",
 					"patterns": [
 						{
-							"include": "#percentage_comment"
+							"include": "#field_value"
-						},
-						{
-							"include": "#integer"
-						},
-						{
-							"include": "#string_content"
-						},
-						{
-							"include": "#string_var"
 						}
 					]
 				}
 			]
 		},
 		{
-			"begin": "((@)[a-zA-Z]+)\\s*(\\()\\s*([^\\s,]*)",
+			"begin": "((@)[a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(\\()\\s*([^\\s,]*)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.other.entry-type.bibtex"
@@ -168,13 +197,7 @@
 			"name": "meta.entry.parenthesis.bibtex",
 			"patterns": [
 				{
-					"include": "#percentage_comment"
+					"begin": "([a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(\\=)",
-				},
-				{
-					"include": "#url_field"
-				},
-				{
-					"begin": "([a-zA-Z0-9\\!\\$\\&\\*\\+\\-\\.\\/\\:\\;\\<\\>\\?\\[\\]\\^\\_\\`\\|]+)\\s*(\\=)",
 					"beginCaptures": {
 						"1": {
 							"name": "support.function.key.bibtex"
@@ -187,16 +210,7 @@
 					"name": "meta.key-assignment.bibtex",
 					"patterns": [
 						{
-							"include": "#percentage_comment"
+							"include": "#field_value"
-						},
-						{
-							"include": "#integer"
-						},
-						{
-							"include": "#string_content"
-						},
-						{
-							"include": "#string_var"
 						}
 					]
 				}
@@ -209,6 +223,23 @@
 		}
 	],
 	"repository": {
+		"field_value": {
+			"patterns": [
+				{
+					"include": "#string_content"
+				},
+				{
+					"include": "#integer"
+				},
+				{
+					"include": "#string_var"
+				},
+				{
+					"name": "keyword.operator.bibtex",
+					"match": "#"
+				}
+			]
+		},
 		"integer": {
 			"match": "\\s*(\\d+)\\s*",
 			"captures": {
@@ -218,13 +249,13 @@
 			}
 		},
 		"nested_braces": {
-			"begin": "(?<!\\\\)\\{",
+			"begin": "\\{",
 			"beginCaptures": {
 				"0": {
 					"name": "punctuation.definition.group.begin.bibtex"
 				}
 			},
-			"end": "(?<!\\\\)\\}",
+			"end": "\\}",
 			"endCaptures": {
 				"0": {
 					"name": "punctuation.definition.group.end.bibtex"
@@ -237,16 +268,10 @@
 			]
 		},
 		"string_var": {
-			"match": "(#)?\\s*([a-zA-Z0-9\\!\\$\\&\\*\\+\\-\\.\\/\\:\\;\\<\\>\\?\\[\\]\\^\\_\\`\\|]+)\\s*(#)?",
+			"match": "[a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*",
 			"captures": {
-				"1": {
+				"0": {
-					"name": "keyword.operator.bibtex"
-				},
-				"2": {
 					"name": "support.variable.bibtex"
-				},
-				"3": {
-					"name": "keyword.operator.bibtex"
 				}
 			}
 		},
@@ -259,23 +284,13 @@
 							"name": "punctuation.definition.string.begin.bibtex"
 						}
 					},
-					"end": "(\\})(?=(?:,?\\s*\\}?\\s*\\n)|(?:\\s*#))",
+					"end": "\\}",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.string.end.bibtex"
 						}
 					},
 					"patterns": [
-						{
-							"include": "#url_cmd"
-						},
-						{
-							"include": "#percentage_comment"
-						},
-						{
-							"match": "@",
-							"name": "invalid.illegal.at-sign.bibtex"
-						},
 						{
 							"include": "#nested_braces"
 						}
@@ -288,7 +303,7 @@
 							"name": "punctuation.definition.string.begin.bibtex"
 						}
 					},
-					"end": "\"(?=(?:,?\\s*\\}?\\s*\\n)|(?:\\s*#))",
+					"end": "\"",
 					"endCaptures": {
 						"0": {
 							"name": "punctuation.definition.string.end.bibtex"
@@ -296,106 +311,11 @@
 					},
 					"patterns": [
 						{
-							"include": "#url_cmd"
+							"include": "#nested_braces"
-						},
-						{
-							"include": "#percentage_comment"
-						},
-						{
-							"match": "@",
-							"name": "invalid.illegal.at-sign.bibtex"
 						}
 					]
 				}
 			]
-		},
-		"string_url": {
-			"patterns": [
-				{
-					"begin": "\\{|\"",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.bibtex"
-						}
-					},
-					"end": "(\\}|\")(?=(?:,?\\s*\\}?\\s*\\n)|(?:\\s*#))",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.definition.string.end.bibtex"
-						}
-					},
-					"contentName": "meta.url.bibtex",
-					"patterns": [
-						{
-							"include": "#url_cmd"
-						}
-					]
-				}
-			]
-		},
-		"percentage_comment": {
-			"patterns": [
-				{
-					"begin": "(^[ \\t]+)?(?=%)",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.whitespace.comment.leading.bibtex"
-						}
-					},
-					"end": "(?!\\G)",
-					"patterns": [
-						{
-							"begin": "(?<!\\\\)%",
-							"beginCaptures": {
-								"0": {
-									"name": "punctuation.definition.comment.bibtex"
-								}
-							},
-							"end": "$\\n?",
-							"name": "comment.line.percentage.bibtex"
-						}
-					]
-				}
-			]
-		},
-		"url_cmd": {
-			"captures": {
-				"1": {
-					"name": "support.function.url.bibtex"
-				},
-				"2": {
-					"name": "punctuation.definition.function.bibtex"
-				},
-				"3": {
-					"name": "punctuation.definition.arguments.begin.bibtex"
-				},
-				"4": {
-					"name": "markup.underline.link.bibtex"
-				},
-				"5": {
-					"name": "punctuation.definition.arguments.end.bibtex"
-				}
-			},
-			"match": "(?:\\s*)((\\\\)(?:url|href))(\\{)([^}]*)(\\})",
-			"name": "meta.function.link.url.bibtex"
-		},
-		"url_field": {
-			"begin": "(url)\\s*(\\=)",
-			"beginCaptures": {
-				"1": {
-					"name": "support.function.key.bibtex"
-				},
-				"2": {
-					"name": "punctuation.separator.key-value.bibtex"
-				}
-			},
-			"end": "(?=[,}])",
-			"name": "meta.key-assignment.url.bibtex",
-			"patterns": [
-				{
-					"include": "#string_url"
-				}
-			]
 		}
 	}
 }

extensions/latex/syntaxes/LaTeX.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/jlelong/vscode-latex-basics/commit/30d04562e592305b6f6d41a539b3ccf326888aaf",
+	"version": "https://github.com/jlelong/vscode-latex-basics/commit/66ea1422ac817ff7704359b8ec4934a987024aaa",
 	"name": "LaTeX",
 	"scopeName": "text.tex.latex",
 	"patterns": [
@@ -2356,7 +2356,7 @@
 			"name": "meta.definition.label.latex",
 			"patterns": [
 				{
-					"match": "[a-zA-Z0-9\\.,:/*!^_-]",
+					"match": "[\\p{Alphabetic}\\p{Number}\\.,:/*!^_-]",
 					"name": "variable.parameter.definition.label.latex"
 				}
 			]

extensions/perl/package.json

@@ -9,7 +9,7 @@
     "vscode": "*"
   },
   "scripts": {
-    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/perl.tmbundle Syntaxes/Perl.plist ./syntaxes/perl.tmLanguage.json Syntaxes/Perl%%206.tmLanguage ./syntaxes/perl6.tmLanguage.json"
+    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/perl.tmbundle Syntaxes/Perl.plist ./syntaxes/perl.tmLanguage.json Syntaxes/Perl%206.tmLanguage ./syntaxes/perl6.tmLanguage.json"
   },
   "contributes": {
     "languages": [

extensions/vb/package.json

@@ -9,7 +9,7 @@
     "vscode": "*"
   },
   "scripts": {
-    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/asp.vb.net.tmbundle Syntaxes/ASP%%20VB.net.plist ./syntaxes/asp-vb-net.tmlanguage.json"
+    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/asp.vb.net.tmbundle Syntaxes/ASP%20VB.net.plist ./syntaxes/asp-vb-net.tmlanguage.json"
   },
   "contributes": {
     "languages": [

extensions/vscode-colorize-tests/test/colorize-results/test_bib.json

@@ -1,21 +1,7 @@
 [
 	{
-		"c": "%",
+		"c": "%  a sample bibliography file",
-		"t": "text.bibtex comment.line.percentage.bibtex punctuation.definition.comment.bibtex",
+		"t": "text.bibtex comment.block.bibtex",
-		"r": {
-			"dark_plus": "comment: #6A9955",
-			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #6A9955",
-			"light_vs": "comment: #008000",
-			"hc_black": "comment: #7CA668",
-			"dark_modern": "comment: #6A9955",
-			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
-		}
-	},
-	{
-		"c": "  a sample bibliography file",
-		"t": "text.bibtex comment.line.percentage.bibtex",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -29,7 +15,7 @@
 	},
 	{
 		"c": "%",
-		"t": "text.bibtex comment.line.percentage.bibtex punctuation.definition.comment.bibtex",
+		"t": "text.bibtex comment.block.bibtex",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -1386,8 +1372,8 @@
 		}
 	},
 	{
-		"c": "%",
+		"c": "%  The authors mentioned here are almost, but not quite,",
-		"t": "text.bibtex comment.line.percentage.bibtex punctuation.definition.comment.bibtex",
+		"t": "text.bibtex comment.block.bibtex",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -1400,36 +1386,8 @@
 		}
 	},
 	{
-		"c": "  The authors mentioned here are almost, but not quite,",
+		"c": "%  entirely unrelated to Matt Groening.",
-		"t": "text.bibtex comment.line.percentage.bibtex",
+		"t": "text.bibtex comment.block.bibtex",
-		"r": {
-			"dark_plus": "comment: #6A9955",
-			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #6A9955",
-			"light_vs": "comment: #008000",
-			"hc_black": "comment: #7CA668",
-			"dark_modern": "comment: #6A9955",
-			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
-		}
-	},
-	{
-		"c": "%",
-		"t": "text.bibtex comment.line.percentage.bibtex punctuation.definition.comment.bibtex",
-		"r": {
-			"dark_plus": "comment: #6A9955",
-			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #6A9955",
-			"light_vs": "comment: #008000",
-			"hc_black": "comment: #7CA668",
-			"dark_modern": "comment: #6A9955",
-			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
-		}
-	},
-	{
-		"c": "  entirely unrelated to Matt Groening.",
-		"t": "text.bibtex comment.line.percentage.bibtex",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",

extensions/vscode-colorize-tests/test/colorize-results/test_cs.json

@@ -1,16 +1,16 @@
 [
 	{
 		"c": "using",
-		"t": "source.cs keyword.other.using.cs",
+		"t": "source.cs keyword.other.directive.using.cs",
 		"r": {
-			"dark_plus": "keyword.other.using: #C586C0",
+			"dark_plus": "keyword: #569CD6",
-			"light_plus": "keyword.other.using: #AF00DB",
+			"light_plus": "keyword: #0000FF",
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
-			"hc_black": "keyword.other.using: #C586C0",
+			"hc_black": "keyword: #569CD6",
-			"dark_modern": "keyword.other.using: #C586C0",
+			"dark_modern": "keyword: #569CD6",
-			"hc_light": "keyword.other.using: #B5200D",
+			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword.other.using: #AF00DB"
+			"light_modern": "keyword: #0000FF"
 		}
 	},
 	{
@@ -57,16 +57,16 @@
 	},
 	{
 		"c": "namespace",
-		"t": "source.cs keyword.other.namespace.cs",
+		"t": "source.cs storage.type.namespace.cs",
 		"r": {
-			"dark_plus": "keyword: #569CD6",
+			"dark_plus": "storage.type: #569CD6",
-			"light_plus": "keyword: #0000FF",
+			"light_plus": "storage.type: #0000FF",
-			"dark_vs": "keyword: #569CD6",
+			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "keyword: #0000FF",
+			"light_vs": "storage.type: #0000FF",
-			"hc_black": "keyword: #569CD6",
+			"hc_black": "storage.type: #569CD6",
-			"dark_modern": "keyword: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
-			"hc_light": "keyword: #0F4A85",
+			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -127,16 +127,16 @@
 	},
 	{
 		"c": "class",
-		"t": "source.cs keyword.other.class.cs",
+		"t": "source.cs storage.type.class.cs",
 		"r": {
-			"dark_plus": "keyword: #569CD6",
+			"dark_plus": "storage.type: #569CD6",
-			"light_plus": "keyword: #0000FF",
+			"light_plus": "storage.type: #0000FF",
-			"dark_vs": "keyword: #569CD6",
+			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "keyword: #0000FF",
+			"light_vs": "storage.type: #0000FF",
-			"hc_black": "keyword: #569CD6",
+			"hc_black": "storage.type: #569CD6",
-			"dark_modern": "keyword: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
-			"hc_light": "keyword: #0F4A85",
+			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": "static",
-		"t": "source.cs storage.modifier.cs",
+		"t": "source.cs storage.modifier.static.cs",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -239,7 +239,7 @@
 	},
 	{
 		"c": "void",
-		"t": "source.cs keyword.type.cs",
+		"t": "source.cs keyword.type.void.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -295,7 +295,7 @@
 	},
 	{
 		"c": "string",
-		"t": "source.cs keyword.type.cs",
+		"t": "source.cs keyword.type.string.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -421,7 +421,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cs keyword.type.cs",
+		"t": "source.cs keyword.type.int.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -799,7 +799,7 @@
 	},
 	{
 		"c": "const",
-		"t": "source.cs storage.modifier.cs",
+		"t": "source.cs storage.modifier.const.cs",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -827,7 +827,7 @@
 	},
 	{
 		"c": "double",
-		"t": "source.cs keyword.type.cs",
+		"t": "source.cs keyword.type.double.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -1023,7 +1023,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cs keyword.type.cs",
+		"t": "source.cs keyword.type.int.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -1177,7 +1177,7 @@
 	},
 	{
 		"c": "double",
-		"t": "source.cs keyword.type.cs",
+		"t": "source.cs keyword.type.double.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -1429,16 +1429,16 @@
 	},
 	{
 		"c": "                ",
-		"t": "source.cs punctuation.whitespace.comment.leading.cs",
+		"t": "source.cs comment.line.double-slash.cs punctuation.whitespace.comment.leading.cs",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
+			"dark_plus": "comment: #6A9955",
-			"light_plus": "default: #000000",
+			"light_plus": "comment: #008000",
-			"dark_vs": "default: #D4D4D4",
+			"dark_vs": "comment: #6A9955",
-			"light_vs": "default: #000000",
+			"light_vs": "comment: #008000",
-			"hc_black": "default: #FFFFFF",
+			"hc_black": "comment: #7CA668",
-			"dark_modern": "default: #CCCCCC",
+			"dark_modern": "comment: #6A9955",
-			"hc_light": "default: #292929",
+			"hc_light": "comment: #515151",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "comment: #008000"
 		}
 	},
 	{
@@ -1751,7 +1751,7 @@
 	},
 	{
 		"c": "public",
-		"t": "source.cs storage.modifier.cs",
+		"t": "source.cs storage.modifier.public.cs",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -1779,7 +1779,7 @@
 	},
 	{
 		"c": "void",
-		"t": "source.cs keyword.type.cs",
+		"t": "source.cs keyword.type.void.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -1947,16 +1947,16 @@
 	},
 	{
 		"c": "new",
-		"t": "source.cs keyword.other.new.cs",
+		"t": "source.cs keyword.operator.expression.new.cs",
 		"r": {
-			"dark_plus": "keyword: #569CD6",
+			"dark_plus": "keyword.operator.expression: #569CD6",
-			"light_plus": "keyword: #0000FF",
+			"light_plus": "keyword.operator.expression: #0000FF",
-			"dark_vs": "keyword: #569CD6",
+			"dark_vs": "keyword.operator.expression: #569CD6",
-			"light_vs": "keyword: #0000FF",
+			"light_vs": "keyword.operator.expression: #0000FF",
-			"hc_black": "keyword: #569CD6",
+			"hc_black": "keyword.operator.expression: #569CD6",
-			"dark_modern": "keyword: #569CD6",
+			"dark_modern": "keyword.operator.expression: #569CD6",
-			"hc_light": "keyword: #0F4A85",
+			"hc_light": "keyword.operator.expression: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword.operator.expression: #0000FF"
 		}
 	},
 	{
@@ -2003,7 +2003,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cs keyword.type.cs",
+		"t": "source.cs keyword.type.int.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -2115,7 +2115,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cs keyword.type.cs",
+		"t": "source.cs keyword.type.int.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -2255,16 +2255,16 @@
 	},
 	{
 		"c": "new",
-		"t": "source.cs keyword.other.new.cs",
+		"t": "source.cs keyword.operator.expression.new.cs",
 		"r": {
-			"dark_plus": "keyword: #569CD6",
+			"dark_plus": "keyword.operator.expression: #569CD6",
-			"light_plus": "keyword: #0000FF",
+			"light_plus": "keyword.operator.expression: #0000FF",
-			"dark_vs": "keyword: #569CD6",
+			"dark_vs": "keyword.operator.expression: #569CD6",
-			"light_vs": "keyword: #0000FF",
+			"light_vs": "keyword.operator.expression: #0000FF",
-			"hc_black": "keyword: #569CD6",
+			"hc_black": "keyword.operator.expression: #569CD6",
-			"dark_modern": "keyword: #569CD6",
+			"dark_modern": "keyword.operator.expression: #569CD6",
-			"hc_light": "keyword: #0F4A85",
+			"hc_light": "keyword.operator.expression: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword.operator.expression: #0000FF"
 		}
 	},
 	{
@@ -2311,7 +2311,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cs keyword.type.cs",
+		"t": "source.cs keyword.type.int.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -2423,7 +2423,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cs keyword.type.cs",
+		"t": "source.cs keyword.type.int.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -2521,16 +2521,16 @@
 	},
 	{
 		"c": "new",
-		"t": "source.cs keyword.other.new.cs",
+		"t": "source.cs keyword.operator.expression.new.cs",
 		"r": {
-			"dark_plus": "keyword: #569CD6",
+			"dark_plus": "keyword.operator.expression: #569CD6",
-			"light_plus": "keyword: #0000FF",
+			"light_plus": "keyword.operator.expression: #0000FF",
-			"dark_vs": "keyword: #569CD6",
+			"dark_vs": "keyword.operator.expression: #569CD6",
-			"light_vs": "keyword: #0000FF",
+			"light_vs": "keyword.operator.expression: #0000FF",
-			"hc_black": "keyword: #569CD6",
+			"hc_black": "keyword.operator.expression: #569CD6",
-			"dark_modern": "keyword: #569CD6",
+			"dark_modern": "keyword.operator.expression: #569CD6",
-			"hc_light": "keyword: #0F4A85",
+			"hc_light": "keyword.operator.expression: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword.operator.expression: #0000FF"
 		}
 	},
 	{
@@ -2577,7 +2577,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cs keyword.type.cs",
+		"t": "source.cs keyword.type.int.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",

extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json

@@ -43,16 +43,16 @@
 	},
 	{
 		"c": "var",
-		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs keyword.other.var.cs",
+		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs storage.type.var.cs",
 		"r": {
-			"dark_plus": "keyword: #569CD6",
+			"dark_plus": "storage.type: #569CD6",
-			"light_plus": "keyword: #0000FF",
+			"light_plus": "storage.type: #0000FF",
-			"dark_vs": "keyword: #569CD6",
+			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "keyword: #0000FF",
+			"light_vs": "storage.type: #0000FF",
-			"hc_black": "keyword: #569CD6",
+			"hc_black": "storage.type: #569CD6",
-			"dark_modern": "keyword: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
-			"hc_light": "keyword: #0F4A85",
+			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -169,16 +169,16 @@
 	},
 	{
 		"c": "var",
-		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs keyword.other.var.cs",
+		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs storage.type.var.cs",
 		"r": {
-			"dark_plus": "keyword: #569CD6",
+			"dark_plus": "storage.type: #569CD6",
-			"light_plus": "keyword: #0000FF",
+			"light_plus": "storage.type: #0000FF",
-			"dark_vs": "keyword: #569CD6",
+			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "keyword: #0000FF",
+			"light_vs": "storage.type: #0000FF",
-			"hc_black": "keyword: #569CD6",
+			"hc_black": "storage.type: #569CD6",
-			"dark_modern": "keyword: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
-			"hc_light": "keyword: #0F4A85",
+			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -505,16 +505,16 @@
 	},
 	{
 		"c": "        ",
-		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.whitespace.comment.leading.cs",
+		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock comment.line.double-slash.cs punctuation.whitespace.comment.leading.cs",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
+			"dark_plus": "comment: #6A9955",
-			"light_plus": "default: #000000",
+			"light_plus": "comment: #008000",
-			"dark_vs": "default: #D4D4D4",
+			"dark_vs": "comment: #6A9955",
-			"light_vs": "default: #000000",
+			"light_vs": "comment: #008000",
-			"hc_black": "default: #FFFFFF",
+			"hc_black": "comment: #7CA668",
-			"dark_modern": "default: #CCCCCC",
+			"dark_modern": "comment: #6A9955",
-			"hc_light": "default: #292929",
+			"hc_light": "comment: #515151",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "comment: #008000"
 		}
 	},
 	{
@@ -561,16 +561,16 @@
 	},
 	{
 		"c": "var",
-		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock keyword.other.var.cs",
+		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock storage.type.var.cs",
 		"r": {
-			"dark_plus": "keyword: #569CD6",
+			"dark_plus": "storage.type: #569CD6",
-			"light_plus": "keyword: #0000FF",
+			"light_plus": "storage.type: #0000FF",
-			"dark_vs": "keyword: #569CD6",
+			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "keyword: #0000FF",
+			"light_vs": "storage.type: #0000FF",
-			"hc_black": "keyword: #569CD6",
+			"hc_black": "storage.type: #569CD6",
-			"dark_modern": "keyword: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
-			"hc_light": "keyword: #0F4A85",
+			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -757,16 +757,16 @@
 	},
 	{
 		"c": "var",
-		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock keyword.other.var.cs",
+		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock storage.type.var.cs",
 		"r": {
-			"dark_plus": "keyword: #569CD6",
+			"dark_plus": "storage.type: #569CD6",
-			"light_plus": "keyword: #0000FF",
+			"light_plus": "storage.type: #0000FF",
-			"dark_vs": "keyword: #569CD6",
+			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "keyword: #0000FF",
+			"light_vs": "storage.type: #0000FF",
-			"hc_black": "keyword: #569CD6",
+			"hc_black": "storage.type: #569CD6",
-			"dark_modern": "keyword: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
-			"hc_light": "keyword: #0F4A85",
+			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "storage.type: #0000FF"
 		}
 	},
 	{
@@ -939,16 +939,16 @@
 	},
 	{
 		"c": "        ",
-		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.whitespace.comment.leading.cs",
+		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock comment.line.double-slash.cs punctuation.whitespace.comment.leading.cs",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
+			"dark_plus": "comment: #6A9955",
-			"light_plus": "default: #000000",
+			"light_plus": "comment: #008000",
-			"dark_vs": "default: #D4D4D4",
+			"dark_vs": "comment: #6A9955",
-			"light_vs": "default: #000000",
+			"light_vs": "comment: #008000",
-			"hc_black": "default: #FFFFFF",
+			"hc_black": "comment: #7CA668",
-			"dark_modern": "default: #CCCCCC",
+			"dark_modern": "comment: #6A9955",
-			"hc_light": "default: #292929",
+			"hc_light": "comment: #515151",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "comment: #008000"
 		}
 	},
 	{