From 50b3c04d0abe22d19371e2a43e3d1b68fb59bed7 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Mon, 9 Oct 2023 12:33:40 +0200
Subject: [PATCH] Revert C# grammar to last-known-good commit (#195144)

* Revert C# grammar back to last-known-good commit
Part of #195098

* Also add missing test_cshtml.json test result

* Add new test for issue
---
 extensions/csharp/cgmanifest.json             |    4 +-
 .../csharp/syntaxes/csharp.tmLanguage.json    | 1956 ++++++-----------
 .../test/colorize-fixtures/test.cs            |    4 +
 .../test/colorize-results/test_cs.json        |  656 +++++-
 .../test/colorize-results/test_cshtml.json    |  110 +-
 5 files changed, 1271 insertions(+), 1459 deletions(-)

diff --git a/extensions/csharp/cgmanifest.json b/extensions/csharp/cgmanifest.json
index cd80dd226f5..176ee56da48 100644
--- a/extensions/csharp/cgmanifest.json
+++ b/extensions/csharp/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "dotnet/csharp-tmLanguage",
 					"repositoryUrl": "https://github.com/dotnet/csharp-tmLanguage",
-					"commitHash": "29a37e5e2d66deefe5a06afad793a820871f4fdf"
+					"commitHash": "772323937fedd65c6dc1c8ce6ea41d97415ed7d1"
 				}
 			},
 			"license": "MIT",
@@ -15,4 +15,4 @@
 		}
 	],
 	"version": 1
-}
\ No newline at end of file
+}
diff --git a/extensions/csharp/syntaxes/csharp.tmLanguage.json b/extensions/csharp/syntaxes/csharp.tmLanguage.json
index ee0a7fac2a8..c4266da462d 100644
--- a/extensions/csharp/syntaxes/csharp.tmLanguage.json
+++ b/extensions/csharp/syntaxes/csharp.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/dotnet/csharp-tmLanguage/commit/29a37e5e2d66deefe5a06afad793a820871f4fdf",
+	"version": "https://github.com/dotnet/csharp-tmLanguage/commit/772323937fedd65c6dc1c8ce6ea41d97415ed7d1",
 	"name": "C#",
 	"scopeName": "source.cs",
 	"patterns": [
@@ -210,6 +210,9 @@
 				{
 					"include": "#else-part"
 				},
+				{
+					"include": "#switch-statement"
+				},
 				{
 					"include": "#goto-statement"
 				},
@@ -235,10 +238,10 @@
 					"include": "#checked-unchecked-statement"
 				},
 				{
-					"include": "#context-control-statement"
+					"include": "#lock-statement"
 				},
 				{
-					"include": "#context-control-paren-statement"
+					"include": "#using-statement"
 				},
 				{
 					"include": "#labeled-statement"
@@ -275,10 +278,13 @@
 					"include": "#comment"
 				},
 				{
-					"include": "#expression-operator-expression"
+					"include": "#checked-unchecked-expression"
 				},
 				{
-					"include": "#type-operator-expression"
+					"include": "#typeof-or-default-expression"
+				},
+				{
+					"include": "#nameof-expression"
 				},
 				{
 					"include": "#default-literal-expression"
@@ -299,20 +305,14 @@
 					"include": "#type-builtin"
 				},
 				{
-					"include": "#language-variable"
+					"include": "#this-or-base-expression"
 				},
 				{
-					"include": "#switch-statement-or-expression"
-				},
-				{
-					"include": "#with-expression"
+					"include": "#switch-expression"
 				},
 				{
 					"include": "#conditional-operator"
 				},
-				{
-					"include": "#assignment-expression"
-				},
 				{
 					"include": "#expression-operators"
 				},
@@ -370,39 +370,36 @@
 			]
 		},
 		"extern-alias-directive": {
-			"begin": "\\b(extern)\\s+(alias)\\b",
+			"begin": "\\s*(extern)\\b\\s*(alias)\\b\\s*(@?[_[:alpha:]][_[:alnum:]]*)",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.other.directive.extern.cs"
+					"name": "keyword.other.extern.cs"
 				},
 				"2": {
-					"name": "keyword.other.directive.alias.cs"
-				}
-			},
-			"end": "(?=;)",
-			"patterns": [
-				{
-					"match": "\\@?[_[:alpha:]][_[:alnum:]]*",
+					"name": "keyword.other.alias.cs"
+				},
+				"3": {
 					"name": "variable.other.alias.cs"
 				}
-			]
+			},
+			"end": "(?=;)"
 		},
 		"using-directive": {
 			"patterns": [
 				{
-					"begin": "\\b(?:(global)\\s+)?(using)\\s+(static)\\b\\s*(?:(unsafe)\\b\\s*)?",
+					"begin": "(\\b(global)\\b\\s+)?\\b(using)\\b\\s+(static)\\b\\s+(\\b(unsafe)\\b\\s+)?",
 					"beginCaptures": {
-						"1": {
-							"name": "keyword.other.directive.global.cs"
-						},
 						"2": {
-							"name": "keyword.other.directive.using.cs"
+							"name": "keyword.other.global.cs"
 						},
 						"3": {
-							"name": "keyword.other.directive.static.cs"
+							"name": "keyword.other.using.cs"
 						},
 						"4": {
-							"name": "storage.modifier.unsafe.cs"
+							"name": "keyword.other.static.cs"
+						},
+						"6": {
+							"name": "storage.modifier.cs"
 						}
 					},
 					"end": "(?=;)",
@@ -413,22 +410,19 @@
 					]
 				},
 				{
-					"begin": "\\b(?:(global)\\s+)?(using)\\b\\s*(?:(unsafe)\\b\\s*)?(@?[_[:alpha:]][_[:alnum:]]*)\\s*(=)",
+					"begin": "(\\b(global)\\b\\s+)?\\b(using)\\b\\s+(\\b(unsafe)\\b\\s+)?(?=(@?[_[:alpha:]][_[:alnum:]]*)\\s*=)",
 					"beginCaptures": {
-						"1": {
-							"name": "keyword.other.directive.global.cs"
-						},
 						"2": {
-							"name": "keyword.other.directive.using.cs"
+							"name": "keyword.other.global.cs"
 						},
 						"3": {
-							"name": "storage.modifier.unsafe.cs"
-						},
-						"4": {
-							"name": "entity.name.type.alias.cs"
+							"name": "keyword.other.using.cs"
 						},
 						"5": {
-							"name": "keyword.operator.assignment.cs"
+							"name": "storage.modifier.cs"
+						},
+						"6": {
+							"name": "entity.name.type.alias.cs"
 						}
 					},
 					"end": "(?=;)",
@@ -438,17 +432,20 @@
 						},
 						{
 							"include": "#type"
+						},
+						{
+							"include": "#operator-assignment"
 						}
 					]
 				},
 				{
-					"begin": "\\b(?:(global)\\s+)?(using)\\b\\s*+(?!\\(|var\\b)",
+					"begin": "(\\b(global)\\b\\s+)?\\b(using)\\s*(?!\\(|\\s|var)",
 					"beginCaptures": {
-						"1": {
-							"name": "keyword.other.directive.global.cs"
-						},
 						"2": {
-							"name": "keyword.other.directive.using.cs"
+							"name": "keyword.other.global.cs"
+						},
+						"3": {
+							"name": "keyword.other.using.cs"
 						}
 					},
 					"end": "(?=;)",
@@ -458,10 +455,7 @@
 						},
 						{
 							"name": "entity.name.type.namespace.cs",
-							"match": "\\@?[_[:alpha:]][_[:alnum:]]*"
-						},
-						{
-							"include": "#punctuation-accessor"
+							"match": "@?[_[:alpha:]][_[:alnum:]]*"
 						},
 						{
 							"include": "#operator-assignment"
@@ -557,7 +551,7 @@
 			"begin": "\\b(namespace)\\s+",
 			"beginCaptures": {
 				"1": {
-					"name": "storage.type.namespace.cs"
+					"name": "keyword.other.namespace.cs"
 				}
 			},
 			"end": "(?<=\\})|(?=;)",
@@ -600,7 +594,7 @@
 			]
 		},
 		"storage-modifier": {
-			"name": "storage.modifier.$1.cs",
+			"name": "storage.modifier.cs",
 			"match": "(?<!\\.)\\b(new|public|protected|internal|private|abstract|virtual|override|sealed|static|partial|readonly|volatile|const|extern|async|unsafe|ref|required|file)\\b"
 		},
 		"class-declaration": {
@@ -611,10 +605,10 @@
 					"begin": "(?x)\n(\\b(record)\\b\\s+)?\n\\b(class)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)\\s*",
 					"beginCaptures": {
 						"2": {
-							"name": "storage.type.record.cs"
+							"name": "keyword.other.record.cs"
 						},
 						"3": {
-							"name": "storage.type.class.cs"
+							"name": "keyword.other.class.cs"
 						},
 						"4": {
 							"name": "entity.name.type.class.cs"
@@ -670,7 +664,7 @@
 			"begin": "(?x)\n(?:\\b(delegate)\\b)\\s+\n(?<type_name>\n  (?:\n    (?:ref\\s+(?:readonly\\s+)?)?   # ref return\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*\n(<([^<>]+)>)?\\s*\n(?=\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "storage.type.delegate.cs"
+					"name": "keyword.other.delegate.cs"
 				},
 				"2": {
 					"patterns": [
@@ -718,7 +712,7 @@
 							"match": "(enum)\\s+(@?[_[:alpha:]][_[:alnum:]]*)",
 							"captures": {
 								"1": {
-									"name": "storage.type.enum.cs"
+									"name": "keyword.other.enum.cs"
 								},
 								"2": {
 									"name": "entity.name.type.enum.cs"
@@ -802,7 +796,7 @@
 					"begin": "(?x)\n(interface)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)",
 					"beginCaptures": {
 						"1": {
-							"name": "storage.type.interface.cs"
+							"name": "keyword.other.interface.cs"
 						},
 						"2": {
 							"name": "entity.name.type.interface.cs"
@@ -859,7 +853,7 @@
 					"begin": "(?x)\n(record)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)",
 					"beginCaptures": {
 						"1": {
-							"name": "storage.type.record.cs"
+							"name": "keyword.other.record.cs"
 						},
 						"2": {
 							"name": "entity.name.type.class.cs"
@@ -919,10 +913,10 @@
 					"begin": "(?x)\n(\\b(record)\\b\\s+)?\n(struct)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)",
 					"beginCaptures": {
 						"2": {
-							"name": "storage.type.record.cs"
+							"name": "keyword.other.record.cs"
 						},
 						"3": {
-							"name": "storage.type.struct.cs"
+							"name": "keyword.other.struct.cs"
 						},
 						"4": {
 							"name": "entity.name.type.struct.cs"
@@ -990,11 +984,19 @@
 			"patterns": [
 				{
 					"match": "\\b(in|out)\\b",
-					"name": "storage.modifier.$1.cs"
+					"captures": {
+						"1": {
+							"name": "storage.modifier.cs"
+						}
+					}
 				},
 				{
 					"match": "(@?[_[:alpha:]][_[:alnum:]]*)\\b",
-					"name": "entity.name.type.type-parameter.cs"
+					"captures": {
+						"1": {
+							"name": "entity.name.type.type-parameter.cs"
+						}
+					}
 				},
 				{
 					"include": "#comment"
@@ -1031,7 +1033,7 @@
 			"begin": "(where)\\s+(@?[_[:alpha:]][_[:alnum:]]*)\\s*(:)",
 			"beginCaptures": {
 				"1": {
-					"name": "storage.modifier.where.cs"
+					"name": "keyword.other.where.cs"
 				},
 				"2": {
 					"name": "entity.name.type.type-parameter.cs"
@@ -1043,18 +1045,18 @@
 			"end": "(?=\\{|where|;|=>)",
 			"patterns": [
 				{
-					"name": "storage.type.class.cs",
+					"name": "keyword.other.class.cs",
 					"match": "\\bclass\\b"
 				},
 				{
-					"name": "storage.type.struct.cs",
+					"name": "keyword.other.struct.cs",
 					"match": "\\bstruct\\b"
 				},
 				{
 					"match": "(new)\\s*(\\()\\s*(\\))",
 					"captures": {
 						"1": {
-							"name": "keyword.operator.expression.new.cs"
+							"name": "keyword.other.new.cs"
 						},
 						"2": {
 							"name": "punctuation.parenthesis.open.cs"
@@ -1110,7 +1112,7 @@
 			]
 		},
 		"property-declaration": {
-			"begin": "(?x)\n\n# The negative lookahead below ensures that we don't match nested types\n# or other declarations as properties.\n(?![[:word:][:space:]]*\\b(?:class|interface|struct|enum|event)\\b)\n\n(?<return_type>\n  (?<type_name>\n    (?:\n      (?:ref\\s+(?:readonly\\s+)?)?   # ref return\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)\n(?<interface_name>\\g<type_name>\\s*\\.\\s*)?\n(?<property_name>\\g<identifier>)\\s*\n(?=\\{|=>|//|/\\*|$)",
+			"begin": "(?x)\n\n# The negative lookahead below ensures that we don't match nested types\n# or other declarations as properties.\n(?![[:word:][:space:]]*\\b(?:class|interface|struct|enum|event)\\b)\n\n(?<return_type>\n  (?<type_name>\n    (?:\n      (?:ref\\s+(?:readonly\\s+)?)?   # ref return\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)\n(?<interface_name>\\g<type_name>\\s*\\.\\s*)?\n(?<property_name>\\g<identifier>)\\s*\n(?=\\{|=>|$)",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
@@ -1142,7 +1144,7 @@
 					"include": "#property-accessors"
 				},
 				{
-					"include": "#accessor-getter-expression"
+					"include": "#expression-body"
 				},
 				{
 					"include": "#variable-initializer"
@@ -1173,7 +1175,7 @@
 					]
 				},
 				"8": {
-					"name": "variable.language.this.cs"
+					"name": "keyword.other.this.cs"
 				}
 			},
 			"end": "(?<=\\})|(?=;)",
@@ -1188,7 +1190,7 @@
 					"include": "#property-accessors"
 				},
 				{
-					"include": "#accessor-getter-expression"
+					"include": "#expression-body"
 				},
 				{
 					"include": "#variable-initializer"
@@ -1196,10 +1198,10 @@
 			]
 		},
 		"event-declaration": {
-			"begin": "(?x)\n\\b(event)\\b\\s*\n(?<return_type>\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)\n(?<interface_name>\\g<type_name>\\s*\\.\\s*)?\n(\\g<identifier>)\\s* # first event name\n(?=\\{|;|,|=|//|/\\*|$)",
+			"begin": "(?x)\n\\b(event)\\b\\s*\n(?<return_type>\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)\n(?<interface_name>\\g<type_name>\\s*\\.\\s*)?\n(?<event_names>\\g<identifier>(?:\\s*,\\s*\\g<identifier>)*)\\s*\n(?=\\{|;|$)",
 			"beginCaptures": {
 				"1": {
-					"name": "storage.type.event.cs"
+					"name": "keyword.other.event.cs"
 				},
 				"2": {
 					"patterns": [
@@ -1219,7 +1221,15 @@
 					]
 				},
 				"9": {
-					"name": "entity.name.variable.event.cs"
+					"patterns": [
+						{
+							"name": "entity.name.variable.event.cs",
+							"match": "@?[_[:alpha:]][_[:alnum:]]*"
+						},
+						{
+							"include": "#punctuation-comma"
+						}
+					]
 				}
 			},
 			"end": "(?<=\\})|(?=;)",
@@ -1230,29 +1240,8 @@
 				{
 					"include": "#event-accessors"
 				},
-				{
-					"name": "entity.name.variable.event.cs",
-					"match": "@?[_[:alpha:]][_[:alnum:]]*"
-				},
 				{
 					"include": "#punctuation-comma"
-				},
-				{
-					"begin": "=",
-					"beginCaptures": {
-						"0": {
-							"name": "keyword.operator.assignment.cs"
-						}
-					},
-					"end": "(?<=,)|(?=;)",
-					"patterns": [
-						{
-							"include": "#expression"
-						},
-						{
-							"include": "#punctuation-comma"
-						}
-					]
 				}
 			]
 		},
@@ -1270,6 +1259,22 @@
 				}
 			},
 			"patterns": [
+				{
+					"name": "storage.modifier.cs",
+					"match": "\\b(private|protected|internal)\\b"
+				},
+				{
+					"name": "keyword.other.get.cs",
+					"match": "\\b(get)\\b"
+				},
+				{
+					"name": "keyword.other.set.cs",
+					"match": "\\b(set)\\b"
+				},
+				{
+					"name": "keyword.other.init.cs",
+					"match": "\\b(init)\\b"
+				},
 				{
 					"include": "#comment"
 				},
@@ -1277,36 +1282,13 @@
 					"include": "#attribute-section"
 				},
 				{
-					"name": "storage.modifier.$1.cs",
-					"match": "\\b(private|protected|internal)\\b"
+					"include": "#expression-body"
 				},
 				{
-					"begin": "\\b(get)\\b\\s*(?=\\{|;|=>|//|/\\*|$)",
-					"beginCaptures": {
-						"1": {
-							"name": "storage.type.accessor.$1.cs"
-						}
-					},
-					"end": "(?<=\\}|;)|(?=\\})",
-					"patterns": [
-						{
-							"include": "#accessor-getter"
-						}
-					]
+					"include": "#block"
 				},
 				{
-					"begin": "\\b(set|init)\\b\\s*(?=\\{|;|=>|//|/\\*|$)",
-					"beginCaptures": {
-						"1": {
-							"name": "storage.type.accessor.$1.cs"
-						}
-					},
-					"end": "(?<=\\}|;)|(?=\\})",
-					"patterns": [
-						{
-							"include": "#accessor-setter"
-						}
-					]
+					"include": "#punctuation-semicolon"
 				}
 			]
 		},
@@ -1324,6 +1306,14 @@
 				}
 			},
 			"patterns": [
+				{
+					"name": "keyword.other.add.cs",
+					"match": "\\b(add)\\b"
+				},
+				{
+					"name": "keyword.other.remove.cs",
+					"match": "\\b(remove)\\b"
+				},
 				{
 					"include": "#comment"
 				},
@@ -1331,108 +1321,10 @@
 					"include": "#attribute-section"
 				},
 				{
-					"begin": "\\b(add|remove)\\b\\s*(?=\\{|;|=>|//|/\\*|$)",
-					"beginCaptures": {
-						"1": {
-							"name": "storage.type.accessor.$1.cs"
-						}
-					},
-					"end": "(?<=\\}|;)|(?=\\})",
-					"patterns": [
-						{
-							"include": "#accessor-setter"
-						}
-					]
-				}
-			]
-		},
-		"accessor-getter": {
-			"patterns": [
-				{
-					"begin": "\\{",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.curlybrace.open.cs"
-						}
-					},
-					"end": "\\}",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.curlybrace.close.cs"
-						}
-					},
-					"contentName": "meta.accessor.getter.cs",
-					"patterns": [
-						{
-							"include": "#statement"
-						}
-					]
+					"include": "#expression-body"
 				},
 				{
-					"include": "#accessor-getter-expression"
-				},
-				{
-					"include": "#punctuation-semicolon"
-				}
-			]
-		},
-		"accessor-getter-expression": {
-			"begin": "=>",
-			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.arrow.cs"
-				}
-			},
-			"end": "(?=;|\\})",
-			"contentName": "meta.accessor.getter.cs",
-			"patterns": [
-				{
-					"include": "#ref-modifier"
-				},
-				{
-					"include": "#expression"
-				}
-			]
-		},
-		"accessor-setter": {
-			"patterns": [
-				{
-					"begin": "\\{",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.curlybrace.open.cs"
-						}
-					},
-					"end": "\\}",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.curlybrace.close.cs"
-						}
-					},
-					"contentName": "meta.accessor.setter.cs",
-					"patterns": [
-						{
-							"include": "#statement"
-						}
-					]
-				},
-				{
-					"begin": "=>",
-					"beginCaptures": {
-						"0": {
-							"name": "keyword.operator.arrow.cs"
-						}
-					},
-					"end": "(?=;|\\})",
-					"contentName": "meta.accessor.setter.cs",
-					"patterns": [
-						{
-							"include": "#ref-modifier"
-						},
-						{
-							"include": "#expression"
-						}
-					]
+					"include": "#block"
 				},
 				{
 					"include": "#punctuation-semicolon"
@@ -1533,10 +1425,13 @@
 			]
 		},
 		"constructor-initializer": {
-			"begin": "\\b(base|this)\\b\\s*(?=\\()",
+			"begin": "\\b(?:(base)|(this))\\b\\s*(?=\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "variable.language.$1.cs"
+					"name": "keyword.other.base.cs"
+				},
+				"2": {
+					"name": "keyword.other.this.cs"
 				}
 			},
 			"end": "(?<=\\))",
@@ -1573,7 +1468,7 @@
 			]
 		},
 		"operator-declaration": {
-			"begin": "(?x)\n(?<type_name>\n  (?:\n    (?:ref\\s+(?:readonly\\s+)?)?   # ref return\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\\b(?<operator_keyword>operator)\\b\\s*\n(?<operator>[+\\-*/%&|\\^!=~<>]+|true|false)\\s*\n(?=\\()",
+			"begin": "(?x)\n(?<type_name>\n  (?:\n    (?:ref\\s+(?:readonly\\s+)?)?   # ref return\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(?<operator_keyword>(?:\\b(?:operator)))\\s*\n(?<operator>(?:\\+|-|\\*|/|%|&|\\||\\^|\\<\\<|\\>\\>|==|!=|\\>|\\<|\\>=|\\<=|!|~|\\+\\+|--|true|false))\\s*\n(?=\\()",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
@@ -1583,7 +1478,7 @@
 					]
 				},
 				"6": {
-					"name": "storage.type.operator.cs"
+					"name": "keyword.other.operator-decl.cs"
 				},
 				"7": {
 					"name": "entity.name.function.cs"
@@ -1614,7 +1509,7 @@
 							"match": "\\b(explicit)\\b",
 							"captures": {
 								"1": {
-									"name": "storage.modifier.explicit.cs"
+									"name": "keyword.other.explicit.cs"
 								}
 							}
 						},
@@ -1622,14 +1517,14 @@
 							"match": "\\b(implicit)\\b",
 							"captures": {
 								"1": {
-									"name": "storage.modifier.implicit.cs"
+									"name": "keyword.other.implicit.cs"
 								}
 							}
 						}
 					]
 				},
 				"2": {
-					"name": "storage.type.operator.cs"
+					"name": "keyword.other.operator-decl.cs"
 				},
 				"3": {
 					"patterns": [
@@ -1712,19 +1607,19 @@
 			"begin": "(?<!\\.)\\b(goto)\\b",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.control.flow.goto.cs"
+					"name": "keyword.control.goto.cs"
 				}
 			},
-			"end": "(?=[;}])",
+			"end": "(?=;)",
 			"patterns": [
 				{
 					"begin": "\\b(case)\\b",
 					"beginCaptures": {
 						"1": {
-							"name": "keyword.control.conditional.case.cs"
+							"name": "keyword.control.case.cs"
 						}
 					},
-					"end": "(?=[;}])",
+					"end": "(?=;)",
 					"patterns": [
 						{
 							"include": "#expression"
@@ -1735,7 +1630,7 @@
 					"match": "\\b(default)\\b",
 					"captures": {
 						"1": {
-							"name": "keyword.control.conditional.default.cs"
+							"name": "keyword.control.default.cs"
 						}
 					}
 				},
@@ -1752,7 +1647,7 @@
 					"name": "keyword.control.flow.return.cs"
 				}
 			},
-			"end": "(?=[;}])",
+			"end": "(?=;)",
 			"patterns": [
 				{
 					"include": "#ref-modifier"
@@ -1763,8 +1658,15 @@
 			]
 		},
 		"break-or-continue-statement": {
-			"match": "(?<!\\.)\\b(break|continue)\\b",
-			"name": "keyword.control.flow.$1.cs"
+			"match": "(?<!\\.)\\b(?:(break)|(continue))\\b",
+			"captures": {
+				"1": {
+					"name": "keyword.control.flow.break.cs"
+				},
+				"2": {
+					"name": "keyword.control.flow.continue.cs"
+				}
+			}
 		},
 		"throw-statement": {
 			"begin": "(?<!\\.)\\b(throw)\\b",
@@ -1773,7 +1675,7 @@
 					"name": "keyword.control.flow.throw.cs"
 				}
 			},
-			"end": "(?=[;}])",
+			"end": "(?=;)",
 			"patterns": [
 				{
 					"include": "#expression"
@@ -1800,7 +1702,7 @@
 					"name": "keyword.control.flow.return.cs"
 				}
 			},
-			"end": "(?=[;}])",
+			"end": "(?=;)",
 			"patterns": [
 				{
 					"include": "#expression"
@@ -1819,22 +1721,16 @@
 			}
 		},
 		"await-statement": {
-			"begin": "(?<!\\.\\s*)\\b(await)\\b",
+			"begin": "(?<!\\.)\\b(await)\\b",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.operator.expression.await.cs"
+					"name": "keyword.other.await.cs"
 				}
 			},
-			"end": "(?<=})|(?=;|})",
+			"end": "(?=;)",
 			"patterns": [
 				{
-					"include": "#foreach-statement"
-				},
-				{
-					"include": "#using-statement"
-				},
-				{
-					"include": "#expression"
+					"include": "#statement"
 				}
 			]
 		},
@@ -1845,7 +1741,7 @@
 					"name": "keyword.control.conditional.if.cs"
 				}
 			},
-			"end": "(?<=})|(?=;)",
+			"end": "(?<=\\})|(?=;)",
 			"patterns": [
 				{
 					"begin": "\\(",
@@ -1878,50 +1774,22 @@
 					"name": "keyword.control.conditional.else.cs"
 				}
 			},
-			"end": "(?<=})|(?=;)",
+			"end": "(?<=\\})|(?=;)",
 			"patterns": [
 				{
 					"include": "#statement"
 				}
 			]
 		},
-		"switch-statement-or-expression": {
-			"begin": "(?<!\\.)\\b(switch)\\b",
+		"switch-statement": {
+			"begin": "(?<!\\.)\\b(switch)\\b\\s*(?=\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.control.conditional.switch.cs"
+					"name": "keyword.control.switch.cs"
 				}
 			},
-			"end": "(?<=})|(?=})",
+			"end": "(?<=\\})",
 			"patterns": [
-				{
-					"include": "#intrusive"
-				},
-				{
-					"begin": "(?=\\()",
-					"end": "(?<=\\})|(?=\\})",
-					"patterns": [
-						{
-							"include": "#switch-statement"
-						}
-					]
-				},
-				{
-					"begin": "(?=\\{)",
-					"end": "(?<=\\})|(?=\\})",
-					"patterns": [
-						{
-							"include": "#switch-expression"
-						}
-					]
-				}
-			]
-		},
-		"switch-statement": {
-			"patterns": [
-				{
-					"include": "#intrusive"
-				},
 				{
 					"begin": "\\(",
 					"beginCaptures": {
@@ -1965,495 +1833,19 @@
 				}
 			]
 		},
-		"switch-label": {
-			"begin": "\\b(case|default)\\b",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.conditional.$1.cs"
-				}
-			},
-			"end": "(:)|(?=})",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.separator.colon.cs"
-				}
-			},
-			"patterns": [
-				{
-					"begin": "\\b(when)\\b",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.control.conditional.when.cs"
-						}
-					},
-					"end": "(?=:|})",
-					"patterns": [
-						{
-							"include": "#case-guard"
-						}
-					]
-				},
-				{
-					"begin": "(?!\\s)",
-					"end": "(?=\\bwhen\\b|:|})",
-					"patterns": [
-						{
-							"include": "#pattern"
-						}
-					]
-				}
-			]
-		},
 		"switch-expression": {
-			"begin": "\\{",
+			"begin": "(?x) (?<!\\.)\\b(switch)\\b",
 			"beginCaptures": {
-				"0": {
-					"name": "punctuation.curlybrace.open.cs"
+				"1": {
+					"name": "keyword.control.switch.cs"
 				}
 			},
-			"end": "\\}",
+			"end": "(?<=\\})",
 			"endCaptures": {
 				"0": {
 					"name": "punctuation.curlybrace.close.cs"
 				}
 			},
-			"patterns": [
-				{
-					"include": "#punctuation-comma"
-				},
-				{
-					"begin": "=>",
-					"beginCaptures": {
-						"0": {
-							"name": "keyword.operator.arrow.cs"
-						}
-					},
-					"end": "(?=,|})",
-					"patterns": [
-						{
-							"include": "#expression"
-						}
-					]
-				},
-				{
-					"begin": "\\b(when)\\b",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.control.conditional.when.cs"
-						}
-					},
-					"end": "(?==>|,|})",
-					"patterns": [
-						{
-							"include": "#case-guard"
-						}
-					]
-				},
-				{
-					"begin": "(?!\\s)",
-					"end": "(?=\\bwhen\\b|=>|,|})",
-					"patterns": [
-						{
-							"include": "#pattern"
-						}
-					]
-				}
-			]
-		},
-		"case-guard": {
-			"patterns": [
-				{
-					"include": "#parenthesized-expression"
-				},
-				{
-					"include": "#expression"
-				}
-			]
-		},
-		"is-expression": {
-			"begin": "(?<!\\.)\\b(is)\\b",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.operator.expression.pattern.is.cs"
-				}
-			},
-			"end": "(?=[)}\\],;:?=&|^]|!=)",
-			"patterns": [
-				{
-					"include": "#pattern"
-				}
-			]
-		},
-		"pattern": {
-			"patterns": [
-				{
-					"include": "#intrusive"
-				},
-				{
-					"include": "#combinator-pattern"
-				},
-				{
-					"include": "#discard-pattern"
-				},
-				{
-					"include": "#constant-pattern"
-				},
-				{
-					"include": "#relational-pattern"
-				},
-				{
-					"include": "#var-pattern"
-				},
-				{
-					"include": "#type-pattern"
-				},
-				{
-					"include": "#positional-pattern"
-				},
-				{
-					"include": "#property-pattern"
-				},
-				{
-					"include": "#list-pattern"
-				},
-				{
-					"include": "#slice-pattern"
-				}
-			]
-		},
-		"combinator-pattern": {
-			"match": "\\b(and|or|not)\\b",
-			"name": "keyword.operator.expression.pattern.combinator.$1.cs"
-		},
-		"discard-pattern": {
-			"match": "_(?![_[:alnum:]])",
-			"name": "variable.language.discard.cs"
-		},
-		"constant-pattern": {
-			"patterns": [
-				{
-					"include": "#boolean-literal"
-				},
-				{
-					"include": "#null-literal"
-				},
-				{
-					"include": "#numeric-literal"
-				},
-				{
-					"include": "#char-literal"
-				},
-				{
-					"include": "#string-literal"
-				},
-				{
-					"include": "#raw-string-literal"
-				},
-				{
-					"include": "#verbatim-string-literal"
-				},
-				{
-					"include": "#type-operator-expression"
-				},
-				{
-					"include": "#expression-operator-expression"
-				},
-				{
-					"include": "#expression-operators"
-				},
-				{
-					"include": "#casted-constant-pattern"
-				}
-			]
-		},
-		"casted-constant-pattern": {
-			"begin": "(?x)\n(\\()\n  ([\\s.:@_[:alnum:]]+)\n(\\))\n(?=[\\s+\\-!~]*@?[_[:alnum:]('\"]+)",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.parenthesis.open.cs"
-				},
-				"2": {
-					"patterns": [
-						{
-							"include": "#type-builtin"
-						},
-						{
-							"include": "#type-name"
-						}
-					]
-				},
-				"3": {
-					"name": "punctuation.parenthesis.close.cs"
-				}
-			},
-			"end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
-			"patterns": [
-				{
-					"include": "#casted-constant-pattern"
-				},
-				{
-					"begin": "\\(",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.parenthesis.open.cs"
-						}
-					},
-					"end": "\\)",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.parenthesis.close.cs"
-						}
-					},
-					"patterns": [
-						{
-							"include": "#constant-pattern"
-						}
-					]
-				},
-				{
-					"include": "#constant-pattern"
-				},
-				{
-					"match": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(\\:\\:)",
-					"captures": {
-						"1": {
-							"name": "entity.name.type.alias.cs"
-						},
-						"2": {
-							"name": "punctuation.separator.coloncolon.cs"
-						}
-					}
-				},
-				{
-					"match": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(\\.)",
-					"captures": {
-						"1": {
-							"name": "entity.name.type.cs"
-						},
-						"2": {
-							"name": "punctuation.accessor.cs"
-						}
-					}
-				},
-				{
-					"match": "\\@?[_[:alpha:]][_[:alnum:]]*",
-					"name": "variable.other.constant.cs"
-				}
-			]
-		},
-		"relational-pattern": {
-			"begin": "<=?|>=?",
-			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.relational.cs"
-				}
-			},
-			"end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
-			"patterns": [
-				{
-					"include": "#expression"
-				}
-			]
-		},
-		"var-pattern": {
-			"begin": "\\b(var)\\b",
-			"beginCaptures": {
-				"1": {
-					"name": "storage.type.var.cs"
-				}
-			},
-			"end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
-			"patterns": [
-				{
-					"include": "#designation-pattern"
-				}
-			]
-		},
-		"designation-pattern": {
-			"patterns": [
-				{
-					"include": "#intrusive"
-				},
-				{
-					"begin": "\\(",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.parenthesis.open.cs"
-						}
-					},
-					"end": "\\)",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.parenthesis.close.cs"
-						}
-					},
-					"patterns": [
-						{
-							"include": "#punctuation-comma"
-						},
-						{
-							"include": "#designation-pattern"
-						}
-					]
-				},
-				{
-					"include": "#simple-designation-pattern"
-				}
-			]
-		},
-		"simple-designation-pattern": {
-			"patterns": [
-				{
-					"include": "#discard-pattern"
-				},
-				{
-					"match": "@?[_[:alpha:]][_[:alnum:]]*",
-					"name": "entity.name.variable.local.cs"
-				}
-			]
-		},
-		"type-pattern": {
-			"begin": "(?=@?[_[:alpha:]][_[:alnum:]]*)",
-			"end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
-			"patterns": [
-				{
-					"begin": "\\G",
-					"end": "(?!\\G[@_[:alpha:]])(?=[\\({@_[:alpha:])}\\],;:=&|^]|(?:\\s|^)\\?|!=|\\b(and|or|when)\\b)",
-					"patterns": [
-						{
-							"include": "#intrusive"
-						},
-						{
-							"include": "#type-subpattern"
-						}
-					]
-				},
-				{
-					"begin": "(?=[\\({@_[:alpha:]])",
-					"end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
-					"patterns": [
-						{
-							"include": "#intrusive"
-						},
-						{
-							"include": "#positional-pattern"
-						},
-						{
-							"include": "#property-pattern"
-						},
-						{
-							"include": "#simple-designation-pattern"
-						}
-					]
-				}
-			]
-		},
-		"type-subpattern": {
-			"patterns": [
-				{
-					"include": "#type-builtin"
-				},
-				{
-					"begin": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(::)",
-					"beginCaptures": {
-						"1": {
-							"name": "entity.name.type.alias.cs"
-						},
-						"2": {
-							"name": "punctuation.separator.coloncolon.cs"
-						}
-					},
-					"end": "(?<=[_[:alnum:]])|(?=[.<\\[\\({)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
-					"patterns": [
-						{
-							"include": "#intrusive"
-						},
-						{
-							"match": "\\@?[_[:alpha:]][_[:alnum:]]*",
-							"name": "entity.name.type.cs"
-						}
-					]
-				},
-				{
-					"match": "\\@?[_[:alpha:]][_[:alnum:]]*",
-					"name": "entity.name.type.cs"
-				},
-				{
-					"begin": "\\.",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.accessor.cs"
-						}
-					},
-					"end": "(?<=[_[:alnum:]])|(?=[<\\[\\({)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
-					"patterns": [
-						{
-							"include": "#intrusive"
-						},
-						{
-							"match": "\\@?[_[:alpha:]][_[:alnum:]]*",
-							"name": "entity.name.type.cs"
-						}
-					]
-				},
-				{
-					"include": "#type-arguments"
-				},
-				{
-					"include": "#type-array-suffix"
-				},
-				{
-					"match": "(?<!\\s)\\?",
-					"name": "punctuation.separator.question-mark.cs"
-				}
-			]
-		},
-		"positional-pattern": {
-			"begin": "(?=\\()",
-			"end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
-			"patterns": [
-				{
-					"begin": "\\(",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.parenthesis.open.cs"
-						}
-					},
-					"end": "\\)",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.parenthesis.close.cs"
-						}
-					},
-					"patterns": [
-						{
-							"include": "#subpattern"
-						},
-						{
-							"include": "#punctuation-comma"
-						}
-					]
-				},
-				{
-					"begin": "(?<=\\))",
-					"end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
-					"patterns": [
-						{
-							"include": "#intrusive"
-						},
-						{
-							"include": "#property-pattern"
-						},
-						{
-							"include": "#simple-designation-pattern"
-						}
-					]
-				}
-			]
-		},
-		"property-pattern": {
-			"begin": "(?={)",
-			"end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
 			"patterns": [
 				{
 					"begin": "\\{",
@@ -2470,97 +1862,183 @@
 					},
 					"patterns": [
 						{
-							"include": "#subpattern"
+							"include": "#comment"
+						},
+						{
+							"include": "#literal"
+						},
+						{
+							"include": "#switch-var-pattern"
+						},
+						{
+							"include": "#switch-property-expression"
+						},
+						{
+							"include": "#member-access-expression"
+						},
+						{
+							"include": "#switch-pattern"
+						},
+						{
+							"include": "#expression-body"
 						},
 						{
 							"include": "#punctuation-comma"
 						}
 					]
-				},
-				{
-					"begin": "(?<=\\})",
-					"end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
-					"patterns": [
-						{
-							"include": "#intrusive"
-						},
-						{
-							"include": "#simple-designation-pattern"
-						}
-					]
 				}
 			]
 		},
-		"subpattern": {
+		"switch-pattern": {
+			"begin": "(?x) # e.g. int x OR var 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>)\\b\\s*",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"2": {
+					"name": "entity.name.variable.local.cs"
+				}
+			},
+			"end": "(?==>)",
 			"patterns": [
 				{
-					"match": "(@?[_[:alpha:]][_[:alnum:]]*(?:\\s*\\.\\s*@?[_[:alpha:]][_[:alnum:]]*)*)\\s*(:)",
+					"include": "#comment"
+				},
+				{
+					"include": "#switch-when-clause"
+				}
+			]
+		},
+		"switch-property-expression": {
+			"begin": "(?x) # e.g. int x OR var 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(\\{)",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"6": {
+					"name": "punctuation.curlybrace.open.cs"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.curlybrace.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#expression"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"switch-var-pattern": {
+			"begin": "(?x) # match foreach (var (x, y) in ...)\n(?:\\b(var)\\b\\s*)\n(?<tuple>\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s*",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.var.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#tuple-declaration-deconstruction-element-list"
+						}
+					]
+				}
+			},
+			"end": "(?==>)",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#switch-when-clause"
+				}
+			]
+		},
+		"switch-when-clause": {
+			"begin": "(?<!\\.)\\b(when)\\b\\s*(\\()?",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.try.when.cs"
+				},
+				"2": {
+					"name": "punctuation.parenthesis.open.cs"
+				}
+			},
+			"end": "(?==>)",
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#expression"
+				},
+				{
+					"include": "#punctuation-comma"
+				},
+				{
+					"match": "\\(",
+					"captures": {
+						"0": {
+							"name": "punctuation.parenthesis.open.cs"
+						}
+					}
+				},
+				{
+					"match": "\\)",
+					"captures": {
+						"0": {
+							"name": "punctuation.parenthesis.close.cs"
+						}
+					}
+				}
+			]
+		},
+		"switch-label": {
+			"patterns": [
+				{
+					"begin": "(?<!\\.)\\b(case)\\b\\s+",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.case.cs"
+						}
+					},
+					"end": ":",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.separator.colon.cs"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"match": "(?<!\\.)\\b(default)\\b\\s*(:)",
 					"captures": {
 						"1": {
-							"patterns": [
-								{
-									"match": "\\@?[_[:alpha:]][_[:alnum:]]*",
-									"name": "variable.other.object.property.cs"
-								},
-								{
-									"include": "#punctuation-accessor"
-								}
-							]
+							"name": "keyword.control.default.cs"
 						},
 						"2": {
 							"name": "punctuation.separator.colon.cs"
 						}
 					}
-				},
-				{
-					"include": "#pattern"
 				}
 			]
 		},
-		"list-pattern": {
-			"begin": "(?=\\[)",
-			"end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
-			"patterns": [
-				{
-					"begin": "\\[",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.squarebracket.open.cs"
-						}
-					},
-					"end": "\\]",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.squarebracket.close.cs"
-						}
-					},
-					"patterns": [
-						{
-							"include": "#pattern"
-						},
-						{
-							"include": "#punctuation-comma"
-						}
-					]
-				},
-				{
-					"begin": "(?<=\\])",
-					"end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
-					"patterns": [
-						{
-							"include": "#intrusive"
-						},
-						{
-							"include": "#simple-designation-pattern"
-						}
-					]
-				}
-			]
-		},
-		"slice-pattern": {
-			"match": "\\.\\.",
-			"name": "keyword.operator.range.cs"
-		},
 		"do-statement": {
 			"begin": "(?<!\\.)\\b(do)\\b",
 			"beginCaptures": {
@@ -2609,13 +2087,13 @@
 			]
 		},
 		"for-statement": {
-			"begin": "\\b(for)\\b",
+			"begin": "(?<!\\.)\\b(for)\\b\\s*(?=\\()",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.loop.for.cs"
 				}
 			},
-			"end": "(?<=\\))|(?=;|})",
+			"end": "(?<=\\})|(?=;)",
 			"patterns": [
 				{
 					"begin": "\\(",
@@ -2632,51 +2110,33 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G",
-							"end": "(?=;|\\))",
-							"patterns": [
-								{
-									"include": "#intrusive"
-								},
-								{
-									"include": "#local-variable-declaration"
-								}
-							]
+							"include": "#local-variable-declaration"
 						},
 						{
-							"begin": "(?=;)",
-							"end": "(?=\\))",
-							"patterns": [
-								{
-									"include": "#intrusive"
-								},
-								{
-									"include": "#expression"
-								},
-								{
-									"include": "#punctuation-comma"
-								},
-								{
-									"include": "#punctuation-semicolon"
-								}
-							]
+							"include": "#expression"
+						},
+						{
+							"include": "#punctuation-comma"
+						},
+						{
+							"include": "#punctuation-semicolon"
 						}
 					]
+				},
+				{
+					"include": "#statement"
 				}
 			]
 		},
 		"foreach-statement": {
-			"begin": "\\b(foreach)\\b",
+			"begin": "(?<!\\.)\\b(foreach)\\b\\s*(?=\\()",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.loop.foreach.cs"
 				}
 			},
-			"end": "(?<=\\))|(?=;|})",
+			"end": "(?<=\\})|(?=;)",
 			"patterns": [
-				{
-					"include": "#intrusive"
-				},
 				{
 					"begin": "\\(",
 					"beginCaptures": {
@@ -2691,14 +2151,11 @@
 						}
 					},
 					"patterns": [
-						{
-							"include": "#intrusive"
-						},
 						{
 							"match": "(?x)\n(?:\n  (\\bvar\\b)|\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  )\n)\\s+\n(\\g<identifier>)\\s+\n\\b(in)\\b",
 							"captures": {
 								"1": {
-									"name": "storage.type.var.cs"
+									"name": "keyword.other.var.cs"
 								},
 								"2": {
 									"patterns": [
@@ -2719,7 +2176,7 @@
 							"match": "(?x) # match foreach (var (x, y) in ...)\n(?:\\b(var)\\b\\s*)?\n(?<tuple>\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s+\n\\b(in)\\b",
 							"captures": {
 								"1": {
-									"name": "storage.type.var.cs"
+									"name": "keyword.other.var.cs"
 								},
 								"2": {
 									"patterns": [
@@ -2737,6 +2194,9 @@
 							"include": "#expression"
 						}
 					]
+				},
+				{
+					"include": "#statement"
 				}
 			]
 		},
@@ -2757,7 +2217,7 @@
 			"begin": "(?<!\\.)\\b(try)\\b",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.control.exception.try.cs"
+					"name": "keyword.control.try.cs"
 				}
 			},
 			"end": "(?<=\\})",
@@ -2774,7 +2234,7 @@
 			"begin": "(?<!\\.)\\b(finally)\\b",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.control.exception.finally.cs"
+					"name": "keyword.control.try.finally.cs"
 				}
 			},
 			"end": "(?<=\\})",
@@ -2791,7 +2251,7 @@
 			"begin": "(?<!\\.)\\b(catch)\\b",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.control.exception.catch.cs"
+					"name": "keyword.control.try.catch.cs"
 				}
 			},
 			"end": "(?<=\\})",
@@ -2842,7 +2302,7 @@
 			"begin": "(?<!\\.)\\b(when)\\b\\s*(\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.control.exception.when.cs"
+					"name": "keyword.control.try.when.cs"
 				},
 				"2": {
 					"name": "punctuation.parenthesis.open.cs"
@@ -2863,71 +2323,35 @@
 				}
 			]
 		},
-		"context-control-statement": {
-			"match": "\\b(checked|unchecked|unsafe)\\b(?!\\s*[@_[:alpha:](])",
-			"name": "keyword.control.context.$1.cs"
-		},
-		"context-control-paren-statement": {
-			"patterns": [
-				{
-					"include": "#fixed-statement"
-				},
-				{
-					"include": "#lock-statement"
-				},
-				{
-					"include": "#using-statement"
-				}
-			]
-		},
-		"fixed-statement": {
-			"begin": "\\b(fixed)\\b",
+		"checked-unchecked-statement": {
+			"begin": "(?<!\\.)\\b(?:(checked)|(unchecked))\\b\\s*(?!\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.control.context.fixed.cs"
+					"name": "keyword.other.checked.cs"
+				},
+				"2": {
+					"name": "keyword.other.unchecked.cs"
 				}
 			},
-			"end": "(?<=\\))|(?=;|})",
+			"end": "(?<=\\})",
 			"patterns": [
 				{
-					"include": "#intrusive"
+					"include": "#block"
 				},
 				{
-					"begin": "\\(",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.parenthesis.open.cs"
-						}
-					},
-					"end": "\\)",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.parenthesis.close.cs"
-						}
-					},
-					"patterns": [
-						{
-							"include": "#intrusive"
-						},
-						{
-							"include": "#local-variable-declaration"
-						}
-					]
+					"include": "#comment"
 				}
 			]
 		},
 		"lock-statement": {
-			"begin": "\\b(lock)\\b",
+			"begin": "(?<!\\.)\\b(lock)\\b\\s*(?=\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.control.context.lock.cs"
+					"name": "keyword.other.lock.cs"
 				}
 			},
-			"end": "(?<=\\))|(?=;|})",
+			"end": "(?<=\\})|(?=;)",
 			"patterns": [
-				{
-					"include": "#intrusive"
-				},
 				{
 					"begin": "\\(",
 					"beginCaptures": {
@@ -2942,28 +2366,25 @@
 						}
 					},
 					"patterns": [
-						{
-							"include": "#intrusive"
-						},
 						{
 							"include": "#expression"
 						}
 					]
+				},
+				{
+					"include": "#statement"
 				}
 			]
 		},
 		"using-statement": {
-			"begin": "\\b(using)\\b",
+			"begin": "(?<!\\.)\\b(using)\\b\\s*(?=\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.control.context.using.cs"
+					"name": "keyword.other.using.cs"
 				}
 			},
-			"end": "(?<=\\))|(?=;|})",
+			"end": "(?=\\;|})",
 			"patterns": [
-				{
-					"include": "#intrusive"
-				},
 				{
 					"begin": "\\(",
 					"beginCaptures": {
@@ -2978,12 +2399,6 @@
 						}
 					},
 					"patterns": [
-						{
-							"include": "#intrusive"
-						},
-						{
-							"include": "#await-expression"
-						},
 						{
 							"include": "#local-variable-declaration"
 						},
@@ -2993,7 +2408,7 @@
 					]
 				},
 				{
-					"include": "#local-variable-declaration"
+					"include": "#statement"
 				}
 			]
 		},
@@ -3025,29 +2440,32 @@
 			]
 		},
 		"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  (?:(\\busing)\\s+)?\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 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"
+					"name": "keyword.other.using.cs"
 				},
 				"2": {
-					"name": "storage.modifier.readonly.cs"
+					"name": "storage.modifier.cs"
 				},
 				"3": {
-					"name": "storage.type.var.cs"
+					"name": "storage.modifier.cs"
 				},
 				"4": {
+					"name": "keyword.other.var.cs"
+				},
+				"5": {
 					"patterns": [
 						{
 							"include": "#type"
 						}
 					]
 				},
-				"9": {
+				"10": {
 					"name": "entity.name.variable.local.cs"
 				}
 			},
-			"end": "(?=[;)}])",
+			"end": "(?=;|\\))",
 			"patterns": [
 				{
 					"name": "entity.name.variable.local.cs",
@@ -3068,7 +2486,7 @@
 			"begin": "(?x)\n(?<const_keyword>\\b(?:const)\\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(\\g<identifier>)\\s*\n(?=,|;|=)",
 			"beginCaptures": {
 				"1": {
-					"name": "storage.modifier.const.cs"
+					"name": "storage.modifier.cs"
 				},
 				"2": {
 					"patterns": [
@@ -3099,49 +2517,9 @@
 			]
 		},
 		"local-function-declaration": {
-			"begin": "(?x)\n\\b((?:(?:async|unsafe|static|extern)\\s+)*)\n(?<type_name>\n  (?:ref\\s+(?:readonly\\s+)?)?   # ref return\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*\\?)? # nullable suffix?\n  (?:\\s* # array suffix?\n    \\[\n      \\s*(?:,\\s*)* # commata for multi-dimensional arrays\n    \\]\n    (?:\\s*\\?)? # arrays can be nullable reference types\n  )*\n)\\s+\n(\\g<identifier>)\\s*\n(<[^<>]+>)?\\s*\n(?=\\()",
-			"beginCaptures": {
-				"1": {
-					"patterns": [
-						{
-							"include": "#storage-modifier"
-						}
-					]
-				},
-				"2": {
-					"patterns": [
-						{
-							"include": "#type"
-						}
-					]
-				},
-				"7": {
-					"name": "entity.name.function.cs"
-				},
-				"8": {
-					"patterns": [
-						{
-							"include": "#type-parameter-list"
-						}
-					]
-				}
-			},
-			"end": "(?<=\\})|(?=;)",
 			"patterns": [
 				{
-					"include": "#comment"
-				},
-				{
-					"include": "#parenthesized-parameter-list"
-				},
-				{
-					"include": "#generic-constraints"
-				},
-				{
-					"include": "#expression-body"
-				},
-				{
-					"include": "#block"
+					"include": "#method-declaration"
 				}
 			]
 		},
@@ -3149,7 +2527,7 @@
 			"begin": "(?x) # e.g. var (x, y) = GetPoint();\n(?:\\b(var)\\b\\s*)\n(?<tuple>\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s*\n(?=;|=|\\))",
 			"beginCaptures": {
 				"1": {
-					"name": "storage.type.var.cs"
+					"name": "keyword.other.var.cs"
 				},
 				"2": {
 					"patterns": [
@@ -3257,7 +2635,7 @@
 			"match": "(?x) # e.g. int x OR var x\n(?:\n  \\b(var)\\b|\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  )\n)\\s+\n(\\g<identifier>)\\b\\s*\n(?=[,)\\]])",
 			"captures": {
 				"1": {
-					"name": "storage.type.var.cs"
+					"name": "keyword.other.var.cs"
 				},
 				"2": {
 					"patterns": [
@@ -3275,7 +2653,7 @@
 			"match": "(?x) # e.g. int x OR var x\n(?:\n  \\b(var)\\b|\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  )\n)\\s+\n(\\g<identifier>)\\b\\s*\n(?=[,)])",
 			"captures": {
 				"1": {
-					"name": "storage.type.var.cs"
+					"name": "keyword.other.var.cs"
 				},
 				"2": {
 					"patterns": [
@@ -3289,11 +2667,61 @@
 				}
 			}
 		},
-		"expression-operator-expression": {
-			"begin": "\\b(checked|unchecked|nameof)\\s*(\\()",
+		"checked-unchecked-expression": {
+			"begin": "(?<!\\.)\\b(?:(checked)|(unchecked))\\b\\s*(\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.operator.expression.$1.cs"
+					"name": "keyword.other.checked.cs"
+				},
+				"2": {
+					"name": "keyword.other.unchecked.cs"
+				},
+				"3": {
+					"name": "punctuation.parenthesis.open.cs"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
+		},
+		"typeof-or-default-expression": {
+			"begin": "(?<!\\.)\\b(?:(typeof)|(default))\\b\\s*(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.typeof.cs"
+				},
+				"2": {
+					"name": "keyword.other.default.cs"
+				},
+				"3": {
+					"name": "punctuation.parenthesis.open.cs"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#type"
+				}
+			]
+		},
+		"nameof-expression": {
+			"begin": "(?<!\\.)\\b(nameof)\\b\\s*(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.nameof.cs"
 				},
 				"2": {
 					"name": "punctuation.parenthesis.open.cs"
@@ -3311,38 +2739,16 @@
 				}
 			]
 		},
-		"type-operator-expression": {
-			"begin": "\\b(default|sizeof|typeof)\\s*(\\()",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.operator.expression.$1.cs"
-				},
-				"2": {
-					"name": "punctuation.parenthesis.open.cs"
-				}
-			},
-			"end": "\\)",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.parenthesis.close.cs"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#type"
-				}
-			]
-		},
 		"default-literal-expression": {
-			"match": "\\b(default)\\b",
+			"match": "(?<!\\.)\\b(default)\\b",
 			"captures": {
 				"1": {
-					"name": "keyword.operator.expression.default.cs"
+					"name": "keyword.other.default.cs"
 				}
 			}
 		},
 		"throw-expression": {
-			"match": "\\b(throw)\\b",
+			"match": "(?<!\\.)\\b(throw)\\b",
 			"captures": {
 				"1": {
 					"name": "keyword.control.flow.throw.cs"
@@ -3977,28 +3383,7 @@
 				}
 			}
 		},
-		"assignment-expression": {
-			"begin": "(?:\\*|/|%|\\+|-|\\?\\?|\\&|\\^|<<|>>>?|\\|)?=(?!=|>)",
-			"beginCaptures": {
-				"0": {
-					"patterns": [
-						{
-							"include": "#assignment-operators"
-						}
-					]
-				}
-			},
-			"end": "(?=[,\\)\\];}])",
-			"patterns": [
-				{
-					"include": "#ref-modifier"
-				},
-				{
-					"include": "#expression"
-				}
-			]
-		},
-		"assignment-operators": {
+		"expression-operators": {
 			"patterns": [
 				{
 					"name": "keyword.operator.assignment.compound.cs",
@@ -4006,19 +3391,11 @@
 				},
 				{
 					"name": "keyword.operator.assignment.compound.bitwise.cs",
-					"match": "\\&=|\\^=|<<=|>>>?=|\\|="
+					"match": "\\&=|\\^=|<<=|>>=|\\|="
 				},
-				{
-					"name": "keyword.operator.assignment.cs",
-					"match": "\\="
-				}
-			]
-		},
-		"expression-operators": {
-			"patterns": [
 				{
 					"name": "keyword.operator.bitwise.shift.cs",
-					"match": "<<|>>>?"
+					"match": "<<|>>"
 				},
 				{
 					"name": "keyword.operator.comparison.cs",
@@ -4036,6 +3413,10 @@
 					"name": "keyword.operator.bitwise.cs",
 					"match": "\\&|~|\\^|\\|"
 				},
+				{
+					"name": "keyword.operator.assignment.cs",
+					"match": "\\="
+				},
 				{
 					"name": "keyword.operator.decrement.cs",
 					"match": "--"
@@ -4046,50 +3427,56 @@
 				},
 				{
 					"name": "keyword.operator.arithmetic.cs",
-					"match": "\\+|-(?!>)|\\*|/|%"
+					"match": "%|\\*|/|-|\\+"
 				},
 				{
 					"name": "keyword.operator.null-coalescing.cs",
 					"match": "\\?\\?"
-				},
-				{
-					"name": "keyword.operator.range.cs",
-					"match": "\\.\\."
 				}
 			]
 		},
-		"with-expression": {
-			"begin": "(?<!\\.)\\b(with)\\b\\s*(?=\\{|//|/\\*|$)",
+		"switch-literal": {
+			"name": "constant.language.null.cs",
+			"match": "(?<!\\.)\\bnull\\b",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.operator.expression.with.cs"
+					"name": "constant.language.null.cs"
 				}
 			},
-			"end": "(?<=\\})",
 			"patterns": [
 				{
 					"include": "#comment"
 				},
 				{
-					"include": "#initializer-expression"
+					"include": "#punctuation-comma"
+				},
+				{
+					"include": "#expression-body"
 				}
 			]
 		},
 		"conditional-operator": {
+			"begin": "\\?(?!\\s*[?.\\[]|\\s*$)",
+			"beginCaptures": {
+				"0": {
+					"name": "keyword.operator.conditional.question-mark.cs"
+				}
+			},
+			"end": ":",
+			"endCaptures": {
+				"0": {
+					"name": "keyword.operator.conditional.colon.cs"
+				}
+			},
 			"patterns": [
 				{
-					"name": "keyword.operator.conditional.question-mark.cs",
-					"match": "\\?(?!\\?|\\s*[.\\[])"
-				},
-				{
-					"name": "keyword.operator.conditional.colon.cs",
-					"match": ":"
+					"include": "#expression"
 				}
 			]
 		},
 		"await-expression": {
-			"name": "keyword.operator.expression.await.cs",
-			"match": "(?<!\\.\\s*)\\b(await)\\b"
+			"name": "keyword.other.await.cs",
+			"match": "(?!\\.)\\b(await)\\b"
 		},
 		"parenthesized-expression": {
 			"begin": "\\(",
@@ -4155,10 +3542,10 @@
 			}
 		},
 		"as-expression": {
-			"match": "(?x)\n(?<!\\.)\\b(as)\\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*\\?(?!\\?))? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        \\s*(?:,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      (?:\\s*\\?(?!\\?))? # arrays can be nullable reference types\n    )*\n  )\n)?",
+			"match": "(?x)\n(?<!\\.)\\b(as)\\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)?",
 			"captures": {
 				"1": {
-					"name": "keyword.operator.expression.as.cs"
+					"name": "keyword.other.as.cs"
 				},
 				"2": {
 					"patterns": [
@@ -4169,20 +3556,34 @@
 				}
 			}
 		},
-		"language-variable": {
-			"patterns": [
-				{
-					"name": "variable.language.$1.cs",
-					"match": "\\b(base|this)\\b"
+		"is-expression": {
+			"match": "(?x)\n(?<!\\.)\\b(is)\\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)?",
+			"captures": {
+				"1": {
+					"name": "keyword.other.is.cs"
 				},
-				{
-					"name": "variable.other.$1.cs",
-					"match": "\\b(value)\\b"
+				"2": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
 				}
-			]
+			}
+		},
+		"this-or-base-expression": {
+			"match": "\\b(?:(base)|(this))\\b",
+			"captures": {
+				"1": {
+					"name": "keyword.other.base.cs"
+				},
+				"2": {
+					"name": "keyword.other.this.cs"
+				}
+			}
 		},
 		"invocation-expression": {
-			"begin": "(?x)\n(?:\n  (?:(\\?)\\s*)?                                    # preceding null-conditional operator?\n  (\\.)\\s*|                                        # preceding dot?\n  (->)\\s*                                         # preceding pointer arrow?\n)?\n(@?[_[:alpha:]][_[:alnum:]]*)\\s*                  # method name\n(\n  <\n  (?<type_args>\n    [^<>()]+|\n    <\\g<type_args>+>|\n    \\(\\g<type_args>+\\)\n  )+\n  >\\s*\n)?                                                # type arguments\n(?=\\()                                            # open paren of argument list",
+			"begin": "(?x)\n(?:(\\?)\\s*)?                                     # preceding null-conditional operator?\n(?:(\\.)\\s*)?                                     # preceding dot?\n(@?[_[:alpha:]][_[:alnum:]]*)\\s*                   # method name\n(?<type_args>\\s*<([^<>]|\\g<type_args>)+>\\s*)?\\s* # type arguments\n(?=\\()                                           # open paren of argument list",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.null-conditional.cs"
@@ -4191,12 +3592,9 @@
 					"name": "punctuation.accessor.cs"
 				},
 				"3": {
-					"name": "punctuation.accessor.pointer.cs"
-				},
-				"4": {
 					"name": "entity.name.function.cs"
 				},
-				"5": {
+				"4": {
 					"patterns": [
 						{
 							"include": "#type-arguments"
@@ -4212,7 +3610,7 @@
 			]
 		},
 		"element-access-expression": {
-			"begin": "(?x)\n(?:\n  (?:(\\?)\\s*)?  # preceding null-conditional operator?\n  (\\.)\\s*|      # preceding dot?\n  (->)\\s*       # preceding pointer arrow?\n)?\n(?:(@?[_[:alpha:]][_[:alnum:]]*)\\s*)? # property name\n(?:(\\?)\\s*)?                        # null-conditional operator?\n(?=\\[)                              # open bracket of argument list",
+			"begin": "(?x)\n(?:(\\?)\\s*)?                        # preceding null-conditional operator?\n(?:(\\.)\\s*)?                        # preceding dot?\n(?:(@?[_[:alpha:]][_[:alnum:]]*)\\s*)? # property name\n(?:(\\?)\\s*)?                        # null-conditional operator?\n(?=\\[)                              # open bracket of argument list",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.null-conditional.cs"
@@ -4221,12 +3619,9 @@
 					"name": "punctuation.accessor.cs"
 				},
 				"3": {
-					"name": "punctuation.accessor.pointer.cs"
-				},
-				"4": {
 					"name": "variable.other.object.property.cs"
 				},
-				"5": {
+				"4": {
 					"name": "keyword.operator.null-conditional.cs"
 				}
 			},
@@ -4240,7 +3635,7 @@
 		"member-access-expression": {
 			"patterns": [
 				{
-					"match": "(?x)\n(?:\n  (?:(\\?)\\s*)?                    # preceding null-conditional operator?\n  (\\.)\\s*|                        # preceding dot?\n  (->)\\s*                         # preceding pointer arrow?\n)\n(@?[_[:alpha:]][_[:alnum:]]*)\\s*  # property name\n(?![_[:alnum:]]|\\(|(\\?)?\\[|<)     # next character is not alpha-numeric, nor a (, [, or <. Also, test for ?[",
+					"match": "(?x)\n(?:(\\?)\\s*)?                   # preceding null-conditional operator?\n(\\.)\\s*                        # preceding dot\n(@?[_[:alpha:]][_[:alnum:]]*)\\s* # property name\n(?![_[:alnum:]]|\\(|(\\?)?\\[|<)  # next character is not alpha-numeric, nor a (, [, or <. Also, test for ?[",
 					"captures": {
 						"1": {
 							"name": "keyword.operator.null-conditional.cs"
@@ -4249,9 +3644,6 @@
 							"name": "punctuation.accessor.cs"
 						},
 						"3": {
-							"name": "punctuation.accessor.pointer.cs"
-						},
-						"4": {
 							"name": "variable.other.object.property.cs"
 						}
 					}
@@ -4275,7 +3667,7 @@
 					}
 				},
 				{
-					"match": "(?x)\n(@?[_[:alpha:]][_[:alnum:]]*)\n(?=\n  \\s*(?:(?:\\?\\s*)?\\.|->)\n  \\s*@?[_[:alpha:]][_[:alnum:]]*\n)",
+					"match": "(?x)\n(@?[_[:alpha:]][_[:alnum:]]*)\n(?=\n  (\\s*\\?)?\n  \\s*\\.\\s*@?[_[:alpha:]][_[:alnum:]]*\n)",
 					"captures": {
 						"1": {
 							"name": "variable.other.object.cs"
@@ -4298,7 +3690,7 @@
 			"begin": "(?x)\n(new)(?:\\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(?=\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.operator.expression.new.cs"
+					"name": "keyword.other.new.cs"
 				},
 				"2": {
 					"patterns": [
@@ -4316,10 +3708,10 @@
 			]
 		},
 		"object-creation-expression-with-no-parameters": {
-			"match": "(?x)\n(new)\\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(?=\\{|//|/\\*|$)",
+			"match": "(?x)\n(new)\\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(?=\\{|$)",
 			"captures": {
 				"1": {
-					"name": "keyword.operator.expression.new.cs"
+					"name": "keyword.other.new.cs"
 				},
 				"2": {
 					"patterns": [
@@ -4334,7 +3726,7 @@
 			"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(?=\\[)",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.operator.expression.$1.cs"
+					"name": "keyword.other.new.cs"
 				},
 				"2": {
 					"patterns": [
@@ -4352,17 +3744,14 @@
 			]
 		},
 		"anonymous-object-creation-expression": {
-			"begin": "\\b(new)\\b\\s*(?=\\{|//|/\\*|$)",
+			"begin": "\\b(new)\\b\\s*(?=\\{|$)",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.operator.expression.new.cs"
+					"name": "keyword.other.new.cs"
 				}
 			},
 			"end": "(?<=\\})",
 			"patterns": [
-				{
-					"include": "#comment"
-				},
 				{
 					"include": "#initializer-expression"
 				}
@@ -4437,10 +3826,10 @@
 			]
 		},
 		"parameter": {
-			"match": "(?x)\n(?:(?:\\b(ref|params|out|in|this)\\b)\\s+)?\n(?<type_name>\n  (?:\n    (?:ref\\s+)?   # ref return\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>)",
+			"match": "(?x)\n(?:(?:\\b(ref|params|out|in|this)\\b)\\s+)?\n(?<type_name>\n  (?:\n    (?:ref\\s+)?   # ref return\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>)",
 			"captures": {
 				"1": {
-					"name": "storage.modifier.$1.cs"
+					"name": "storage.modifier.cs"
 				},
 				"2": {
 					"patterns": [
@@ -4524,25 +3913,11 @@
 		"argument": {
 			"patterns": [
 				{
-					"name": "storage.modifier.$1.cs",
-					"match": "\\b(ref|in)\\b"
+					"name": "storage.modifier.cs",
+					"match": "\\b(ref|out|in)\\b"
 				},
 				{
-					"begin": "\\b(out)\\b",
-					"beginCaptures": {
-						"1": {
-							"name": "storage.modifier.out.cs"
-						}
-					},
-					"end": "(?=,|\\)|\\])",
-					"patterns": [
-						{
-							"include": "#declaration-expression-local"
-						},
-						{
-							"include": "#expression"
-						}
-					]
+					"include": "#declaration-expression-local"
 				},
 				{
 					"include": "#expression"
@@ -4553,7 +3928,7 @@
 			"begin": "(?x)\n\\b(from)\\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)?\n\\s+(\\g<identifier>)\\b\\s*\n\\b(in)\\b\\s*",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.operator.expression.query.from.cs"
+					"name": "keyword.query.from.cs"
 				},
 				"2": {
 					"patterns": [
@@ -4566,7 +3941,7 @@
 					"name": "entity.name.variable.range-variable.cs"
 				},
 				"8": {
-					"name": "keyword.operator.expression.query.in.cs"
+					"name": "keyword.query.in.cs"
 				}
 			},
 			"end": "(?=;|\\))",
@@ -4605,7 +3980,7 @@
 			"begin": "(?x)\n\\b(let)\\b\\s*\n(@?[_[:alpha:]][_[:alnum:]]*)\\b\\s*\n(=)\\s*",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.operator.expression.query.let.cs"
+					"name": "keyword.query.let.cs"
 				},
 				"2": {
 					"name": "entity.name.variable.range-variable.cs"
@@ -4628,7 +4003,7 @@
 			"begin": "(?x)\n\\b(where)\\b\\s*",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.operator.expression.query.where.cs"
+					"name": "keyword.query.where.cs"
 				}
 			},
 			"end": "(?=;|\\))",
@@ -4645,7 +4020,7 @@
 			"begin": "(?x)\n\\b(join)\\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)?\n\\s+(\\g<identifier>)\\b\\s*\n\\b(in)\\b\\s*",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.operator.expression.query.join.cs"
+					"name": "keyword.query.join.cs"
 				},
 				"2": {
 					"patterns": [
@@ -4658,7 +4033,7 @@
 					"name": "entity.name.variable.range-variable.cs"
 				},
 				"8": {
-					"name": "keyword.operator.expression.query.in.cs"
+					"name": "keyword.query.in.cs"
 				}
 			},
 			"end": "(?=;|\\))",
@@ -4684,7 +4059,7 @@
 			"match": "\\b(on)\\b\\s*",
 			"captures": {
 				"1": {
-					"name": "keyword.operator.expression.query.on.cs"
+					"name": "keyword.query.on.cs"
 				}
 			}
 		},
@@ -4692,7 +4067,7 @@
 			"match": "\\b(equals)\\b\\s*",
 			"captures": {
 				"1": {
-					"name": "keyword.operator.expression.query.equals.cs"
+					"name": "keyword.query.equals.cs"
 				}
 			}
 		},
@@ -4700,7 +4075,7 @@
 			"match": "(?x)\n\\b(into)\\b\\s*\n(@?[_[:alpha:]][_[:alnum:]]*)\\b\\s*",
 			"captures": {
 				"1": {
-					"name": "keyword.operator.expression.query.into.cs"
+					"name": "keyword.query.into.cs"
 				},
 				"2": {
 					"name": "entity.name.variable.range-variable.cs"
@@ -4711,7 +4086,7 @@
 			"begin": "\\b(orderby)\\b\\s*",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.operator.expression.query.orderby.cs"
+					"name": "keyword.query.orderby.cs"
 				}
 			},
 			"end": "(?=;|\\))",
@@ -4731,10 +4106,13 @@
 			]
 		},
 		"ordering-direction": {
-			"match": "\\b(ascending|descending)\\b",
+			"match": "\\b(?:(ascending)|(descending))\\b",
 			"captures": {
 				"1": {
-					"name": "keyword.operator.expression.query.$1.cs"
+					"name": "keyword.query.ascending.cs"
+				},
+				"2": {
+					"name": "keyword.query.descending.cs"
 				}
 			}
 		},
@@ -4742,7 +4120,7 @@
 			"begin": "\\b(select)\\b\\s*",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.operator.expression.query.select.cs"
+					"name": "keyword.query.select.cs"
 				}
 			},
 			"end": "(?=;|\\))",
@@ -4759,7 +4137,7 @@
 			"begin": "\\b(group)\\b\\s*",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.operator.expression.query.group.cs"
+					"name": "keyword.query.group.cs"
 				}
 			},
 			"end": "(?=;|\\))",
@@ -4782,7 +4160,7 @@
 			"match": "\\b(by)\\b\\s*",
 			"captures": {
 				"1": {
-					"name": "keyword.operator.expression.query.by.cs"
+					"name": "keyword.query.by.cs"
 				}
 			}
 		},
@@ -4790,7 +4168,7 @@
 			"match": "(?x)\n\\b(into)\\b\\s*\n(@?[_[:alpha:]][_[:alnum:]]*)\\b\\s*",
 			"captures": {
 				"1": {
-					"name": "keyword.operator.expression.query.into.cs"
+					"name": "keyword.query.into.cs"
 				},
 				"2": {
 					"name": "entity.name.variable.range-variable.cs"
@@ -4800,138 +4178,119 @@
 		"anonymous-method-expression": {
 			"patterns": [
 				{
-					"begin": "(?x)\n((?:\\b(?:async|static)\\b\\s*)*)\n(?:\n  (@?[_[:alpha:]][_[:alnum:]]*)\\b|\n  (\\()\n    (?<tuple>(?:[^()]|\\(\\g<tuple>\\))*)\n  (\\))\n)\\s*\n(=>)",
+					"begin": "(?x)\n(?:\\b(async)\\b\\s*)?\n(@?[_[:alpha:]][_[:alnum:]]*)\\b\\s*\n(=>)",
 					"beginCaptures": {
 						"1": {
-							"patterns": [
-								{
-									"match": "async|static",
-									"name": "storage.modifier.$0.cs"
-								}
-							]
+							"name": "storage.modifier.cs"
 						},
 						"2": {
 							"name": "entity.name.variable.parameter.cs"
 						},
 						"3": {
-							"name": "punctuation.parenthesis.open.cs"
-						},
-						"4": {
-							"patterns": [
-								{
-									"include": "#comment"
-								},
-								{
-									"include": "#explicit-anonymous-function-parameter"
-								},
-								{
-									"include": "#implicit-anonymous-function-parameter"
-								},
-								{
-									"include": "#default-argument"
-								},
-								{
-									"include": "#punctuation-comma"
-								}
-							]
-						},
-						"5": {
-							"name": "punctuation.parenthesis.close.cs"
-						},
-						"6": {
 							"name": "keyword.operator.arrow.cs"
 						}
 					},
-					"end": "(?=[,;)}])",
+					"end": "(?=\\)|;|}|,)",
 					"patterns": [
 						{
-							"include": "#intrusive"
+							"include": "#block"
 						},
 						{
-							"begin": "(?={)",
-							"end": "(?=[,;)}])",
-							"patterns": [
-								{
-									"include": "#block"
-								},
-								{
-									"include": "#intrusive"
-								}
-							]
+							"include": "#ref-modifier"
 						},
 						{
-							"begin": "\\b(ref)\\b|(?=\\S)",
-							"beginCaptures": {
-								"1": {
-									"name": "storage.modifier.ref.cs"
-								}
-							},
-							"end": "(?=[,;)}])",
-							"patterns": [
-								{
-									"include": "#expression"
-								}
-							]
+							"include": "#expression"
 						}
 					]
 				},
 				{
-					"begin": "(?x)\n((?:\\b(?:async|static)\\b\\s*)*)\n\\b(delegate)\\b\\s*",
+					"begin": "(?x)\n(?:\\b(async)\\b\\s*)?\n(\\(.*?\\))\\s*\n(=>)",
 					"beginCaptures": {
 						"1": {
-							"patterns": [
-								{
-									"match": "async|static",
-									"name": "storage.modifier.$0.cs"
-								}
-							]
+							"name": "storage.modifier.cs"
 						},
 						"2": {
-							"name": "storage.type.delegate.cs"
-						}
-					},
-					"end": "(?<=})|(?=[,;)}])",
-					"patterns": [
-						{
-							"include": "#intrusive"
-						},
-						{
-							"begin": "\\(",
-							"beginCaptures": {
-								"0": {
-									"name": "punctuation.parenthesis.open.cs"
-								}
-							},
-							"end": "\\)",
-							"endCaptures": {
-								"0": {
-									"name": "punctuation.parenthesis.close.cs"
-								}
-							},
 							"patterns": [
 								{
-									"include": "#intrusive"
-								},
-								{
-									"include": "#explicit-anonymous-function-parameter"
-								},
-								{
-									"include": "#punctuation-comma"
+									"include": "#lambda-parameter-list"
 								}
 							]
 						},
+						"3": {
+							"name": "keyword.operator.arrow.cs"
+						}
+					},
+					"end": "(?=\\)|;|}|,)",
+					"patterns": [
+						{
+							"include": "#block"
+						},
+						{
+							"include": "#ref-modifier"
+						},
+						{
+							"include": "#expression"
+						}
+					]
+				},
+				{
+					"begin": "(?x)\n(?:\\b(async)\\b\\s*)?\n(?:\\b(delegate)\\b\\s*)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.cs"
+						},
+						"2": {
+							"name": "keyword.other.delegate.cs"
+						}
+					},
+					"end": "(?=\\)|;|}|,)",
+					"patterns": [
+						{
+							"include": "#parenthesized-parameter-list"
+						},
 						{
 							"include": "#block"
+						},
+						{
+							"include": "#expression"
 						}
 					]
 				}
 			]
 		},
-		"explicit-anonymous-function-parameter": {
-			"match": "(?x)\n(?:\\b(ref|params|out|in)\\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><(?:[^<>]|\\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\\b(\\g<identifier>)\\b",
+		"lambda-parameter-list": {
+			"begin": "\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.open.cs"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.parenthesis.close.cs"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#attribute-section"
+				},
+				{
+					"include": "#lambda-parameter"
+				},
+				{
+					"include": "#punctuation-comma"
+				}
+			]
+		},
+		"lambda-parameter": {
+			"match": "(?x)\n(?:\\b(ref|out|in)\\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(\\g<identifier>)\\b\\s*\n(?=[,)])",
 			"captures": {
 				"1": {
-					"name": "storage.modifier.$1.cs"
+					"name": "storage.modifier.cs"
 				},
 				"2": {
 					"patterns": [
@@ -4945,25 +4304,8 @@
 				}
 			}
 		},
-		"implicit-anonymous-function-parameter": {
-			"match": "\\@?[_[:alpha:]][_[:alnum:]]*\\b",
-			"name": "entity.name.variable.parameter.cs"
-		},
-		"default-argument": {
-			"begin": "=",
-			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.assignment.cs"
-				}
-			},
-			"end": "(?=,|\\))",
-			"patterns": [
-				{
-					"include": "#expression"
-				}
-			]
-		},
 		"type": {
+			"name": "meta.type.cs",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -4991,19 +4333,16 @@
 				},
 				{
 					"include": "#type-nullable-suffix"
-				},
-				{
-					"include": "#type-pointer-suffix"
 				}
 			]
 		},
 		"ref-modifier": {
-			"name": "storage.modifier.ref.cs",
-			"match": "\\bref\\b"
+			"name": "storage.modifier.cs",
+			"match": "\\b(ref)\\b"
 		},
 		"readonly-modifier": {
-			"name": "storage.modifier.readonly.cs",
-			"match": "\\breadonly\\b"
+			"name": "storage.modifier.cs",
+			"match": "\\b(readonly)\\b"
 		},
 		"tuple-type": {
 			"begin": "\\(",
@@ -5043,10 +4382,10 @@
 			}
 		},
 		"type-builtin": {
-			"match": "\\b(bool|s?byte|u?short|n?u?int|u?long|float|double|decimal|char|string|object|void|dynamic)\\b",
+			"match": "\\b(bool|byte|char|decimal|double|float|int|long|object|sbyte|short|string|uint|ulong|ushort|void|dynamic)\\b",
 			"captures": {
 				"1": {
-					"name": "keyword.type.$1.cs"
+					"name": "keyword.type.cs"
 				}
 			}
 		},
@@ -5105,6 +4444,9 @@
 				}
 			},
 			"patterns": [
+				{
+					"include": "#comment"
+				},
 				{
 					"include": "#type"
 				},
@@ -5127,9 +4469,6 @@
 				}
 			},
 			"patterns": [
-				{
-					"include": "#intrusive"
-				},
 				{
 					"include": "#punctuation-comma"
 				}
@@ -5137,11 +4476,11 @@
 		},
 		"type-nullable-suffix": {
 			"match": "\\?",
-			"name": "punctuation.separator.question-mark.cs"
-		},
-		"type-pointer-suffix": {
-			"match": "\\*",
-			"name": "punctuation.separator.asterisk.cs"
+			"captures": {
+				"0": {
+					"name": "punctuation.separator.question-mark.cs"
+				}
+			}
 		},
 		"operator-assignment": {
 			"name": "keyword.operator.assignment.cs",
@@ -5159,16 +4498,6 @@
 			"name": "punctuation.accessor.cs",
 			"match": "\\."
 		},
-		"intrusive": {
-			"patterns": [
-				{
-					"include": "#preprocessor"
-				},
-				{
-					"include": "#comment"
-				}
-			]
-		},
 		"preprocessor": {
 			"name": "meta.preprocessor.cs",
 			"begin": "^\\s*(\\#)\\s*",
@@ -5474,47 +4803,38 @@
 		"comment": {
 			"patterns": [
 				{
-					"name": "comment.block.documentation.cs",
-					"begin": "(^\\s+)?(///)(?!/)",
-					"while": "^(\\s*)(///)(?!/)",
-					"captures": {
-						"1": {
-							"name": "punctuation.whitespace.comment.leading.cs"
-						},
-						"2": {
+					"name": "comment.block.cs",
+					"begin": "/\\*",
+					"beginCaptures": {
+						"0": {
 							"name": "punctuation.definition.comment.cs"
 						}
 					},
-					"patterns": [
-						{
-							"include": "#xml-doc-comment"
+					"end": "\\*/",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.comment.cs"
 						}
-					]
+					}
 				},
 				{
-					"name": "comment.block.documentation.cs",
-					"begin": "(^\\s+)?(/\\*\\*)(?!/)",
-					"end": "(^\\s+)?(\\*/)",
-					"captures": {
+					"begin": "(^\\s+)?(?=//)",
+					"beginCaptures": {
 						"1": {
 							"name": "punctuation.whitespace.comment.leading.cs"
-						},
-						"2": {
-							"name": "punctuation.definition.comment.cs"
 						}
 					},
+					"end": "(?=$)",
 					"patterns": [
 						{
-							"begin": "\\G(?=(?~\\*/)$)",
-							"while": "^(\\s*+)(\\*(?!/))?(?=(?~\\*/)$)",
-							"whileCaptures": {
-								"1": {
-									"name": "punctuation.whitespace.comment.leading.cs"
-								},
-								"2": {
+							"name": "comment.block.documentation.cs",
+							"begin": "(?<!/)///(?!/)",
+							"beginCaptures": {
+								"0": {
 									"name": "punctuation.definition.comment.cs"
 								}
 							},
+							"end": "(?=$)",
 							"patterns": [
 								{
 									"include": "#xml-doc-comment"
@@ -5522,32 +4842,16 @@
 							]
 						},
 						{
-							"include": "#xml-doc-comment"
+							"name": "comment.line.double-slash.cs",
+							"begin": "(?<!/)//(?:(?!/)|(?=//))",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.comment.cs"
+								}
+							},
+							"end": "(?=$)"
 						}
 					]
-				},
-				{
-					"name": "comment.line.double-slash.cs",
-					"begin": "(^\\s+)?(//).*$",
-					"while": "^(\\s*)(//).*$",
-					"captures": {
-						"1": {
-							"name": "punctuation.whitespace.comment.leading.cs"
-						},
-						"2": {
-							"name": "punctuation.definition.comment.cs"
-						}
-					}
-				},
-				{
-					"name": "comment.block.cs",
-					"begin": "/\\*",
-					"end": "\\*/",
-					"captures": {
-						"0": {
-							"name": "punctuation.definition.comment.cs"
-						}
-					}
 				}
 			]
 		},
@@ -5721,4 +5025,4 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/vscode-colorize-tests/test/colorize-fixtures/test.cs b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.cs
index c7098217742..9671574d338 100644
--- a/extensions/vscode-colorize-tests/test/colorize-fixtures/test.cs
+++ b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.cs
@@ -5,6 +5,10 @@ namespace SampleNamespace
     {
         static void Main(string[] args)
         {
+			if (currentTab < lastTab && setTabWithoutUpdate(currentTab + 1))
+            {
+                System.Console.WriteLine("Tests #195098");
+            }
             int[] radii = { 15, 32, 108, 74, 9 };
             const double pi = 3.14159;
             foreach (int radius in radii) {
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json
index e846aa23b4e..bf42bc29b6d 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json
@@ -1,16 +1,16 @@
 [
 	{
 		"c": "using",
-		"t": "source.cs keyword.other.directive.using.cs",
+		"t": "source.cs keyword.other.using.cs",
 		"r": {
-			"dark_plus": "keyword.other.directive.using: #C586C0",
-			"light_plus": "keyword.other.directive.using: #AF00DB",
+			"dark_plus": "keyword.other.using: #C586C0",
+			"light_plus": "keyword.other.using: #AF00DB",
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
-			"hc_black": "keyword.other.directive.using: #C586C0",
-			"dark_modern": "keyword.other.directive.using: #C586C0",
-			"hc_light": "keyword.other.directive.using: #B5200D",
-			"light_modern": "keyword.other.directive.using: #AF00DB"
+			"hc_black": "keyword.other.using: #C586C0",
+			"dark_modern": "keyword.other.using: #C586C0",
+			"hc_light": "keyword.other.using: #B5200D",
+			"light_modern": "keyword.other.using: #AF00DB"
 		}
 	},
 	{
@@ -57,16 +57,16 @@
 	},
 	{
 		"c": "namespace",
-		"t": "source.cs storage.type.namespace.cs",
+		"t": "source.cs keyword.other.namespace.cs",
 		"r": {
-			"dark_plus": "storage.type: #569CD6",
-			"light_plus": "storage.type: #0000FF",
-			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type: #569CD6",
-			"dark_modern": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6",
+			"dark_modern": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_modern": "keyword: #0000FF"
 		}
 	},
 	{
@@ -127,16 +127,16 @@
 	},
 	{
 		"c": "class",
-		"t": "source.cs storage.type.class.cs",
+		"t": "source.cs keyword.other.class.cs",
 		"r": {
-			"dark_plus": "storage.type: #569CD6",
-			"light_plus": "storage.type: #0000FF",
-			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type: #569CD6",
-			"dark_modern": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6",
+			"dark_modern": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_modern": "keyword: #0000FF"
 		}
 	},
 	{
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": "static",
-		"t": "source.cs storage.modifier.static.cs",
+		"t": "source.cs storage.modifier.cs",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -239,7 +239,7 @@
 	},
 	{
 		"c": "void",
-		"t": "source.cs keyword.type.void.cs",
+		"t": "source.cs keyword.type.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -295,7 +295,7 @@
 	},
 	{
 		"c": "string",
-		"t": "source.cs keyword.type.string.cs",
+		"t": "source.cs keyword.type.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -405,6 +405,510 @@
 			"light_modern": "default: #3B3B3B"
 		}
 	},
+	{
+		"c": "\t\t\t",
+		"t": "source.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "if",
+		"t": "source.cs keyword.control.conditional.if.cs",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.cs punctuation.parenthesis.open.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "currentTab",
+		"t": "source.cs variable.other.readwrite.cs",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "<",
+		"t": "source.cs keyword.operator.relational.cs",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "lastTab",
+		"t": "source.cs variable.other.readwrite.cs",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "&&",
+		"t": "source.cs keyword.operator.logical.cs",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "setTabWithoutUpdate",
+		"t": "source.cs entity.name.function.cs",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.cs punctuation.parenthesis.open.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "currentTab",
+		"t": "source.cs variable.other.readwrite.cs",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "+",
+		"t": "source.cs keyword.operator.arithmetic.cs",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "1",
+		"t": "source.cs constant.numeric.decimal.cs",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "))",
+		"t": "source.cs punctuation.parenthesis.close.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "            ",
+		"t": "source.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.cs punctuation.curlybrace.open.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "                ",
+		"t": "source.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "System",
+		"t": "source.cs variable.other.object.cs",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "source.cs punctuation.accessor.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "Console",
+		"t": "source.cs variable.other.object.property.cs",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "source.cs punctuation.accessor.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "WriteLine",
+		"t": "source.cs entity.name.function.cs",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.cs punctuation.parenthesis.open.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "\"",
+		"t": "source.cs string.quoted.double.cs punctuation.definition.string.begin.cs",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "Tests #195098",
+		"t": "source.cs string.quoted.double.cs",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "\"",
+		"t": "source.cs string.quoted.double.cs punctuation.definition.string.end.cs",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.cs punctuation.parenthesis.close.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.cs punctuation.terminator.statement.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "            ",
+		"t": "source.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.cs punctuation.curlybrace.close.cs",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
 	{
 		"c": "            ",
 		"t": "source.cs",
@@ -421,7 +925,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cs keyword.type.int.cs",
+		"t": "source.cs keyword.type.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -799,7 +1303,7 @@
 	},
 	{
 		"c": "const",
-		"t": "source.cs storage.modifier.const.cs",
+		"t": "source.cs storage.modifier.cs",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -827,7 +1331,7 @@
 	},
 	{
 		"c": "double",
-		"t": "source.cs keyword.type.double.cs",
+		"t": "source.cs keyword.type.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -1023,7 +1527,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cs keyword.type.int.cs",
+		"t": "source.cs keyword.type.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -1177,7 +1681,7 @@
 	},
 	{
 		"c": "double",
-		"t": "source.cs keyword.type.double.cs",
+		"t": "source.cs keyword.type.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -1429,16 +1933,16 @@
 	},
 	{
 		"c": "                ",
-		"t": "source.cs comment.line.double-slash.cs punctuation.whitespace.comment.leading.cs",
+		"t": "source.cs punctuation.whitespace.comment.leading.cs",
 		"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"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
 		}
 	},
 	{
@@ -1751,7 +2255,7 @@
 	},
 	{
 		"c": "public",
-		"t": "source.cs storage.modifier.public.cs",
+		"t": "source.cs storage.modifier.cs",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -1779,7 +2283,7 @@
 	},
 	{
 		"c": "void",
-		"t": "source.cs keyword.type.void.cs",
+		"t": "source.cs keyword.type.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -1947,16 +2451,16 @@
 	},
 	{
 		"c": "new",
-		"t": "source.cs keyword.operator.expression.new.cs",
+		"t": "source.cs keyword.other.new.cs",
 		"r": {
-			"dark_plus": "keyword.operator.expression: #569CD6",
-			"light_plus": "keyword.operator.expression: #0000FF",
-			"dark_vs": "keyword.operator.expression: #569CD6",
-			"light_vs": "keyword.operator.expression: #0000FF",
-			"hc_black": "keyword.operator.expression: #569CD6",
-			"dark_modern": "keyword.operator.expression: #569CD6",
-			"hc_light": "keyword.operator.expression: #0F4A85",
-			"light_modern": "keyword.operator.expression: #0000FF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6",
+			"dark_modern": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_modern": "keyword: #0000FF"
 		}
 	},
 	{
@@ -2003,7 +2507,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cs keyword.type.int.cs",
+		"t": "source.cs keyword.type.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -2115,7 +2619,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cs keyword.type.int.cs",
+		"t": "source.cs keyword.type.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -2255,16 +2759,16 @@
 	},
 	{
 		"c": "new",
-		"t": "source.cs keyword.operator.expression.new.cs",
+		"t": "source.cs keyword.other.new.cs",
 		"r": {
-			"dark_plus": "keyword.operator.expression: #569CD6",
-			"light_plus": "keyword.operator.expression: #0000FF",
-			"dark_vs": "keyword.operator.expression: #569CD6",
-			"light_vs": "keyword.operator.expression: #0000FF",
-			"hc_black": "keyword.operator.expression: #569CD6",
-			"dark_modern": "keyword.operator.expression: #569CD6",
-			"hc_light": "keyword.operator.expression: #0F4A85",
-			"light_modern": "keyword.operator.expression: #0000FF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6",
+			"dark_modern": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_modern": "keyword: #0000FF"
 		}
 	},
 	{
@@ -2311,7 +2815,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cs keyword.type.int.cs",
+		"t": "source.cs keyword.type.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -2423,7 +2927,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cs keyword.type.int.cs",
+		"t": "source.cs keyword.type.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -2521,16 +3025,16 @@
 	},
 	{
 		"c": "new",
-		"t": "source.cs keyword.operator.expression.new.cs",
+		"t": "source.cs keyword.other.new.cs",
 		"r": {
-			"dark_plus": "keyword.operator.expression: #569CD6",
-			"light_plus": "keyword.operator.expression: #0000FF",
-			"dark_vs": "keyword.operator.expression: #569CD6",
-			"light_vs": "keyword.operator.expression: #0000FF",
-			"hc_black": "keyword.operator.expression: #569CD6",
-			"dark_modern": "keyword.operator.expression: #569CD6",
-			"hc_light": "keyword.operator.expression: #0F4A85",
-			"light_modern": "keyword.operator.expression: #0000FF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6",
+			"dark_modern": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_modern": "keyword: #0000FF"
 		}
 	},
 	{
@@ -2577,7 +3081,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cs keyword.type.int.cs",
+		"t": "source.cs keyword.type.cs",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json
index 4307f03ed1e..5923b8411fe 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json
+++ b/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 storage.type.var.cs",
+		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs keyword.other.var.cs",
 		"r": {
-			"dark_plus": "storage.type: #569CD6",
-			"light_plus": "storage.type: #0000FF",
-			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type: #569CD6",
-			"dark_modern": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6",
+			"dark_modern": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_modern": "keyword: #0000FF"
 		}
 	},
 	{
@@ -169,16 +169,16 @@
 	},
 	{
 		"c": "var",
-		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs storage.type.var.cs",
+		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs keyword.other.var.cs",
 		"r": {
-			"dark_plus": "storage.type: #569CD6",
-			"light_plus": "storage.type: #0000FF",
-			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type: #569CD6",
-			"dark_modern": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6",
+			"dark_modern": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_modern": "keyword: #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 comment.line.double-slash.cs punctuation.whitespace.comment.leading.cs",
+		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.whitespace.comment.leading.cs",
 		"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"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
 		}
 	},
 	{
@@ -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 storage.type.var.cs",
+		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock keyword.other.var.cs",
 		"r": {
-			"dark_plus": "storage.type: #569CD6",
-			"light_plus": "storage.type: #0000FF",
-			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type: #569CD6",
-			"dark_modern": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6",
+			"dark_modern": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_modern": "keyword: #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 storage.type.var.cs",
+		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock keyword.other.var.cs",
 		"r": {
-			"dark_plus": "storage.type: #569CD6",
-			"light_plus": "storage.type: #0000FF",
-			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type: #569CD6",
-			"dark_modern": "storage.type: #569CD6",
-			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6",
+			"dark_modern": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_modern": "keyword: #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 comment.line.double-slash.cs punctuation.whitespace.comment.leading.cs",
+		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.whitespace.comment.leading.cs",
 		"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"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
 		}
 	},
 	{
@@ -4535,4 +4535,4 @@
 			"light_modern": "punctuation.definition.tag: #800000"
 		}
 	}
-]
\ No newline at end of file
+]