Merge from vscode 2c306f762bf9c3db82dc06c7afaa56ef46d72f79 (#14050)

* Merge from vscode 2c306f762bf9c3db82dc06c7afaa56ef46d72f79

* Fix breaks

* Extension management fixes

* Fix breaks in windows bundling

* Fix/skip failing tests

* Update distro

* Add clear to nuget.config

* Add hygiene task

* Bump distro

* Fix hygiene issue

* Add build to hygiene exclusion

* Update distro

* Update hygiene

* Hygiene exclusions

* Update tsconfig

* Bump distro for server breaks

* Update build config

* Update darwin path

* Add done calls to notebook tests

* Skip failing tests

* Disable smoke tests

extensions/theme-quietlight/package.json

@@ -11,10 +11,11 @@
 	"contributes": {
 		"themes": [
 			{
-				"label": "Quiet Light",
+				"id": "Quiet Light",
+				"label": "%themeLabel%",
 				"uiTheme": "vs",
 				"path": "./themes/quietlight-color-theme.json"
 			}
 		]
 	}
-}
+}

extensions/theme-quietlight/package.nls.json

@@ -1,4 +1,5 @@
 {
 	"displayName": "Quiet Light Theme",
-	"description": "Quiet light theme for Visual Studio Code"
-}
+	"description": "Quiet light theme for Visual Studio Code",
+	"themeLabel": "Quiet Light"
+}

extensions/theme-quietlight/themes/quietlight-color-theme.json

@@ -45,6 +45,13 @@
 				"foreground": "#448C27"
 			}
 		},
+		{
+			"name": "Invalid",
+			"scope": "invalid",
+			"settings": {
+				"foreground": "#cd3131"
+			}
+		},
 		{
 			"name": "Invalid - Illegal",
 			"scope": "invalid.illegal",
@@ -409,16 +416,37 @@
 		},
 		{
 			"name": "Extra: Diff From",
-			"scope": "meta.diff.header.from-file",
+			"scope": ["meta.diff.header.from-file", "punctuation.definition.from-file.diff"],
 			"settings": {
-				"foreground": "#434343"
+				"foreground": "#4B69C6"
 			}
 		},
 		{
 			"name": "Extra: Diff To",
-			"scope": "meta.diff.header.to-file",
+			"scope": ["meta.diff.header.to-file", "punctuation.definition.to-file.diff"],
 			"settings": {
-				"foreground": "#434343"
+				"foreground": "#4B69C6"
+			}
+		},
+		{
+			"name": "diff: deleted",
+			"scope": "markup.deleted.diff",
+			"settings": {
+				"foreground": "#C73D20"
+			}
+		},
+		{
+			"name": "diff: changed",
+			"scope": "markup.changed.diff",
+			"settings": {
+				"foreground": "#9C5D27"
+			}
+		},
+		{
+			"name": "diff: inserted",
+			"scope": "markup.inserted.diff",
+			"settings": {
+				"foreground": "#448C27"
 			}
 		},
 		{
@@ -472,6 +500,7 @@
 		"peekViewResult.background": "#F2F8FC",
 		"peekView.border": "#705697",
 		"peekViewResult.matchHighlightBackground": "#93C6D6",
+		"tab.lastPinnedBorder": "#c9d0d9",
 		"statusBar.background": "#705697",
 		"statusBar.noFolderBackground": "#705697",
 		"statusBar.debuggingBackground": "#705697",