Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)

* Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d

* Fix vs unit tests and hygiene issue

* Fix strict null check issue

extensions/theme-monokai-dimmed/package.json

@@ -4,6 +4,7 @@
 	"description": "%description%",
 	"version": "1.0.0",
 	"publisher": "vscode",
+	"license": "MIT",
 	"engines": {
 		"vscode": "*"
 	},

extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json

@@ -143,7 +143,7 @@
 		},
 		{
 			"name": "Class name",
-			"scope": "entity.name.class, entity.name.type",
+			"scope": "entity.name.class, entity.name.type, entity.name.namespace, entity.name.scope-resolution",
 			"settings": {
 				"fontStyle": "",
 				"foreground": "#9B0000",
@@ -255,7 +255,7 @@
 			}
 		},
 		{
-			"name": "Keyword Control",
+			"name": "Keyword Control / Special",
 			"scope": [
 				"keyword.control",
 				"keyword.operator.new.cpp",