diff --git a/.vscode/settings.json b/.vscode/settings.json
index 02813fa947e..ae8d69938e2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -99,5 +99,10 @@
 		"*.js": "$(capture).*.js",
 		"bootstrap.js": "bootstrap-*.js"
 	},
-	"explorer.experimental.fileNesting.enabled": true
+	"explorer.experimental.fileNesting.enabled": true,
+	"editor.quickSuggestions": {
+		"other": "inline",
+		"comments": "inline",
+		"strings": "inline"
+	},
 }
diff --git a/.yarnrc b/.yarnrc
index 9cbcfebdd18..0ef74229647 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -1,4 +1,4 @@
 disturl "https://electronjs.org/headers"
-target "17.3.0"
+target "17.3.1"
 runtime "electron"
 build_from_source "true"
diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index 6f4e8661cb2..475aa86b7ca 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -236,7 +236,7 @@ steps:
   - script: |
       set -e
       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin-$(VSCODE_ARCH)" \
-      yarn smoketest-no-compile --web --headless
+      yarn smoketest-no-compile --web --tracing --headless
     timeoutInMinutes: 10
     displayName: Run smoke tests (Browser, Chromium)
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
@@ -245,10 +245,11 @@ steps:
       set -e
       APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
       APP_NAME="`ls $APP_ROOT | head -n 1`"
-      yarn smoketest-no-compile --build "$APP_ROOT/$APP_NAME"
+      yarn smoketest-no-compile --tracing --build "$APP_ROOT/$APP_NAME"
     # Increased timeout because this test downloads stable code
     timeoutInMinutes: 20
     displayName: Run smoke tests (Electron)
+    # continueOnError: true
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
@@ -256,11 +257,32 @@ steps:
       APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
       APP_NAME="`ls $APP_ROOT | head -n 1`"
       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)" \
-      yarn smoketest-no-compile --build "$APP_ROOT/$APP_NAME" --remote
+      yarn smoketest-no-compile --tracing --remote --build "$APP_ROOT/$APP_NAME"
     timeoutInMinutes: 10
     displayName: Run smoke tests (Remote)
+    # continueOnError: true
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
+  # - script: |
+  #     set -e
+  #     APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+  #     APP_NAME="`ls $APP_ROOT | head -n 1`"
+  #     yarn smoketest-no-compile --legacy --tracing --build "$APP_ROOT/$APP_NAME"
+  #   # Increased timeout because this test downloads stable code
+  #   timeoutInMinutes: 20
+  #   displayName: Run smoke tests (Legacy, Electron)
+  #   condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+  # - script: |
+  #     set -e
+  #     APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+  #     APP_NAME="`ls $APP_ROOT | head -n 1`"
+  #     VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)" \
+  #     yarn smoketest-no-compile --legacy --tracing --remote --build "$APP_ROOT/$APP_NAME"
+  #   timeoutInMinutes: 10
+  #   displayName: Run smoke tests (Legacy, Remote)
+  #   condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
   - task: PublishPipelineArtifact@0
     inputs:
       artifactName: crash-dump-macos-$(VSCODE_ARCH)
diff --git a/build/azure-pipelines/linux/product-build-linux-client.yml b/build/azure-pipelines/linux/product-build-linux-client.yml
index 35aad220604..5995d0c5939 100644
--- a/build/azure-pipelines/linux/product-build-linux-client.yml
+++ b/build/azure-pipelines/linux/product-build-linux-client.yml
@@ -259,7 +259,7 @@ steps:
   - script: |
       set -e
       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH)" \
-      yarn smoketest-no-compile --web --headless --electronArgs="--disable-dev-shm-usage"
+      yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage"
     timeoutInMinutes: 10
     displayName: Run smoke tests (Browser, Chromium)
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
@@ -267,21 +267,41 @@ steps:
   - script: |
       set -e
       APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
-      yarn smoketest-no-compile --build "$APP_PATH" --electronArgs="--disable-dev-shm-usage"
+      yarn smoketest-no-compile --tracing --build "$APP_PATH"
     # Increased timeout because this test downloads stable code
     timeoutInMinutes: 20
     displayName: Run smoke tests (Electron)
+    # continueOnError: true
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
       set -e
       APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
-      yarn smoketest-no-compile --build "$APP_PATH" --remote --electronArgs="--disable-dev-shm-usage"
+      yarn smoketest-no-compile --tracing --remote --build "$APP_PATH"
     timeoutInMinutes: 10
     displayName: Run smoke tests (Remote)
+    # continueOnError: true
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
+  # - script: |
+  #     set -e
+  #     APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
+  #     yarn smoketest-no-compile --legacy --tracing --build "$APP_PATH"
+  #   # Increased timeout because this test downloads stable code
+  #   timeoutInMinutes: 20
+  #   displayName: Run smoke tests (Legacy, Electron)
+  #   condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+  # - script: |
+  #     set -e
+  #     APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
+  #     VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
+  #     yarn smoketest-no-compile --legacy --tracing --remote --build "$APP_PATH"
+  #   timeoutInMinutes: 10
+  #   displayName: Run smoke tests (Legacy, Remote)
+  #   condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
   - task: PublishPipelineArtifact@0
     inputs:
       artifactName: crash-dump-linux-$(VSCODE_ARCH)
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index 001ce407218..b68783b2e2c 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -220,7 +220,7 @@ steps:
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
       $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)"
-      exec { yarn smoketest-no-compile --web --headless }
+      exec { yarn smoketest-no-compile --web --tracing --headless }
     displayName: Run smoke tests (Browser, Chromium)
     timeoutInMinutes: 10
     condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
@@ -229,8 +229,9 @@ steps:
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
       $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
-      exec { yarn smoketest-no-compile --build "$AppRoot" }
+      exec { yarn smoketest-no-compile --tracing --build "$AppRoot" }
     displayName: Run smoke tests (Electron)
+    continueOnError: true
     # Increased timeout because this test downloads stable code
     timeoutInMinutes: 20
     condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
@@ -240,8 +241,29 @@ steps:
       $ErrorActionPreference = "Stop"
       $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
       $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"
-      exec { yarn smoketest-no-compile --build "$AppRoot" --remote }
+      exec { yarn smoketest-no-compile --tracing --remote --build "$AppRoot" }
     displayName: Run smoke tests (Remote)
+    continueOnError: true
+    timeoutInMinutes: 10
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
+
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
+      exec { yarn smoketest-no-compile --legacy --tracing --build "$AppRoot" }
+    displayName: Run smoke tests (Legacy, Electron)
+    # Increased timeout because this test downloads stable code
+    timeoutInMinutes: 20
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
+
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
+      $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"
+      exec { yarn smoketest-no-compile --legacy --tracing --remote --build "$AppRoot" }
+    displayName: Run smoke tests (Legacy, Remote)
     timeoutInMinutes: 10
     condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
diff --git a/build/darwin/create-universal-app.js b/build/darwin/create-universal-app.js
index 1206a8e4c22..197bf5b2f1b 100644
--- a/build/darwin/create-universal-app.js
+++ b/build/darwin/create-universal-app.js
@@ -33,6 +33,7 @@ async function main() {
             'CodeResources',
             'fsevents.node',
             'Info.plist',
+            'MainMenu.nib',
             '.npmrc'
         ],
         outAppPath,
diff --git a/build/darwin/create-universal-app.ts b/build/darwin/create-universal-app.ts
index 332e81dbb2c..7d145eaec71 100644
--- a/build/darwin/create-universal-app.ts
+++ b/build/darwin/create-universal-app.ts
@@ -38,6 +38,7 @@ async function main() {
 			'CodeResources',
 			'fsevents.node',
 			'Info.plist', // TODO@deepak1556: regressed with 11.4.2 internal builds
+			'MainMenu.nib', // Generated sequence is not deterministic with Xcode 13
 			'.npmrc'
 		],
 		outAppPath,
diff --git a/build/lib/layersChecker.js b/build/lib/layersChecker.js
index 113f15245b6..8caccef815e 100644
--- a/build/lib/layersChecker.js
+++ b/build/lib/layersChecker.js
@@ -29,30 +29,13 @@ const CORE_TYPES = [
     'setInterval',
     'clearInterval',
     'console',
-    'log',
-    'info',
-    'warn',
-    'error',
-    'trace',
-    'group',
-    'groupEnd',
-    'table',
-    'assert',
+    'Console',
     'Error',
+    'ErrorConstructor',
     'String',
-    'throws',
-    'stack',
-    'captureStackTrace',
-    'stackTraceLimit',
     'TextDecoder',
     'TextEncoder',
-    'encode',
-    'decode',
     'self',
-    'trimStart',
-    'trimEnd',
-    'trimLeft',
-    'trimRight',
     'queueMicrotask',
     'Array',
     'Uint8Array',
@@ -70,7 +53,9 @@ const CORE_TYPES = [
     'atob',
     'AbortSignal',
     'MessageChannel',
-    'MessagePort'
+    'MessagePort',
+    'URL',
+    'URLSearchParams'
 ];
 // Types that are defined in a common layer but are known to be only
 // available in native environments should not be allowed in browser
@@ -94,7 +79,6 @@ const RULES = [
             ...CORE_TYPES,
             // Safe access to postMessage() and friends
             'MessageEvent',
-            'data'
         ],
         disallowedTypes: NATIVE_TYPES,
         disallowedDefinitions: [
@@ -180,19 +164,7 @@ const RULES = [
     // node.js
     {
         target: '**/vs/**/node/**',
-        allowedTypes: [
-            ...CORE_TYPES,
-            // --> types from node.d.ts that duplicate from lib.dom.d.ts
-            'URL',
-            'protocol',
-            'hostname',
-            'port',
-            'pathname',
-            'search',
-            'username',
-            'password',
-            'origin'
-        ],
+        allowedTypes: CORE_TYPES,
         disallowedDefinitions: [
             'lib.dom.d.ts' // no DOM
         ]
@@ -232,43 +204,49 @@ function checkFile(program, sourceFile, rule) {
         if (node.kind !== ts.SyntaxKind.Identifier) {
             return ts.forEachChild(node, checkNode); // recurse down
         }
-        const text = node.getText(sourceFile);
+        const checker = program.getTypeChecker();
+        const symbol = checker.getSymbolAtLocation(node);
+        if (!symbol) {
+            return;
+        }
+        let _parentSymbol = symbol;
+        while (_parentSymbol.parent) {
+            _parentSymbol = _parentSymbol.parent;
+        }
+        const parentSymbol = _parentSymbol;
+        const text = parentSymbol.getName();
         if (rule.allowedTypes?.some(allowed => allowed === text)) {
             return; // override
         }
         if (rule.disallowedTypes?.some(disallowed => disallowed === text)) {
             const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
-            console.log(`[build/lib/layersChecker.ts]: Reference to '${text}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1})`);
+            console.log(`[build/lib/layersChecker.ts]: Reference to type '${text}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1})`);
             hasErrors = true;
             return;
         }
-        const checker = program.getTypeChecker();
-        const symbol = checker.getSymbolAtLocation(node);
-        if (symbol) {
-            const declarations = symbol.declarations;
-            if (Array.isArray(declarations)) {
-                DeclarationLoop: for (const declaration of declarations) {
-                    if (declaration) {
-                        const parent = declaration.parent;
-                        if (parent) {
-                            const parentSourceFile = parent.getSourceFile();
-                            if (parentSourceFile) {
-                                const definitionFileName = parentSourceFile.fileName;
-                                if (rule.allowedDefinitions) {
-                                    for (const allowedDefinition of rule.allowedDefinitions) {
-                                        if (definitionFileName.indexOf(allowedDefinition) >= 0) {
-                                            continue DeclarationLoop;
-                                        }
+        const declarations = symbol.declarations;
+        if (Array.isArray(declarations)) {
+            DeclarationLoop: for (const declaration of declarations) {
+                if (declaration) {
+                    const parent = declaration.parent;
+                    if (parent) {
+                        const parentSourceFile = parent.getSourceFile();
+                        if (parentSourceFile) {
+                            const definitionFileName = parentSourceFile.fileName;
+                            if (rule.allowedDefinitions) {
+                                for (const allowedDefinition of rule.allowedDefinitions) {
+                                    if (definitionFileName.indexOf(allowedDefinition) >= 0) {
+                                        continue DeclarationLoop;
                                     }
                                 }
-                                if (rule.disallowedDefinitions) {
-                                    for (const disallowedDefinition of rule.disallowedDefinitions) {
-                                        if (definitionFileName.indexOf(disallowedDefinition) >= 0) {
-                                            const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
-                                            console.log(`[build/lib/layersChecker.ts]: Reference to '${text}' from '${disallowedDefinition}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1})`);
-                                            hasErrors = true;
-                                            return;
-                                        }
+                            }
+                            if (rule.disallowedDefinitions) {
+                                for (const disallowedDefinition of rule.disallowedDefinitions) {
+                                    if (definitionFileName.indexOf(disallowedDefinition) >= 0) {
+                                        const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
+                                        console.log(`[build/lib/layersChecker.ts]: Reference to symbol '${text}' from '${disallowedDefinition}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1})`);
+                                        hasErrors = true;
+                                        return;
                                     }
                                 }
                             }
diff --git a/build/lib/layersChecker.ts b/build/lib/layersChecker.ts
index e8cea015a75..af9ccd0ae92 100644
--- a/build/lib/layersChecker.ts
+++ b/build/lib/layersChecker.ts
@@ -30,30 +30,13 @@ const CORE_TYPES = [
 	'setInterval',
 	'clearInterval',
 	'console',
-	'log',
-	'info',
-	'warn',
-	'error',
-	'trace',
-	'group',
-	'groupEnd',
-	'table',
-	'assert',
+	'Console',
 	'Error',
+	'ErrorConstructor',
 	'String',
-	'throws',
-	'stack',
-	'captureStackTrace',
-	'stackTraceLimit',
 	'TextDecoder',
 	'TextEncoder',
-	'encode',
-	'decode',
 	'self',
-	'trimStart',
-	'trimEnd',
-	'trimLeft',
-	'trimRight',
 	'queueMicrotask',
 	'Array',
 	'Uint8Array',
@@ -71,7 +54,9 @@ const CORE_TYPES = [
 	'atob',
 	'AbortSignal',
 	'MessageChannel',
-	'MessagePort'
+	'MessagePort',
+	'URL',
+	'URLSearchParams'
 ];
 
 // Types that are defined in a common layer but are known to be only
@@ -100,7 +85,6 @@ const RULES = [
 
 			// Safe access to postMessage() and friends
 			'MessageEvent',
-			'data'
 		],
 		disallowedTypes: NATIVE_TYPES,
 		disallowedDefinitions: [
@@ -195,20 +179,7 @@ const RULES = [
 	// node.js
 	{
 		target: '**/vs/**/node/**',
-		allowedTypes: [
-			...CORE_TYPES,
-
-			// --> types from node.d.ts that duplicate from lib.dom.d.ts
-			'URL',
-			'protocol',
-			'hostname',
-			'port',
-			'pathname',
-			'search',
-			'username',
-			'password',
-			'origin'
-		],
+		allowedTypes: CORE_TYPES,
 		disallowedDefinitions: [
 			'lib.dom.d.ts'	// no DOM
 		]
@@ -266,7 +237,21 @@ function checkFile(program: ts.Program, sourceFile: ts.SourceFile, rule: IRule)
 			return ts.forEachChild(node, checkNode); // recurse down
 		}
 
-		const text = node.getText(sourceFile);
+		const checker = program.getTypeChecker();
+		const symbol = checker.getSymbolAtLocation(node);
+
+		if (!symbol) {
+			return;
+		}
+
+		let _parentSymbol: any = symbol;
+
+		while (_parentSymbol.parent) {
+			_parentSymbol = _parentSymbol.parent;
+		}
+
+		const parentSymbol = _parentSymbol as ts.Symbol;
+		const text = parentSymbol.getName();
 
 		if (rule.allowedTypes?.some(allowed => allowed === text)) {
 			return; // override
@@ -274,40 +259,37 @@ function checkFile(program: ts.Program, sourceFile: ts.SourceFile, rule: IRule)
 
 		if (rule.disallowedTypes?.some(disallowed => disallowed === text)) {
 			const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
-			console.log(`[build/lib/layersChecker.ts]: Reference to '${text}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1})`);
+			console.log(`[build/lib/layersChecker.ts]: Reference to type '${text}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1})`);
 
 			hasErrors = true;
 			return;
 		}
 
-		const checker = program.getTypeChecker();
-		const symbol = checker.getSymbolAtLocation(node);
-		if (symbol) {
-			const declarations = symbol.declarations;
-			if (Array.isArray(declarations)) {
-				DeclarationLoop: for (const declaration of declarations) {
-					if (declaration) {
-						const parent = declaration.parent;
-						if (parent) {
-							const parentSourceFile = parent.getSourceFile();
-							if (parentSourceFile) {
-								const definitionFileName = parentSourceFile.fileName;
-								if (rule.allowedDefinitions) {
-									for (const allowedDefinition of rule.allowedDefinitions) {
-										if (definitionFileName.indexOf(allowedDefinition) >= 0) {
-											continue DeclarationLoop;
-										}
+		const declarations = symbol.declarations;
+		if (Array.isArray(declarations)) {
+			DeclarationLoop: for (const declaration of declarations) {
+				if (declaration) {
+					const parent = declaration.parent;
+					if (parent) {
+						const parentSourceFile = parent.getSourceFile();
+						if (parentSourceFile) {
+							const definitionFileName = parentSourceFile.fileName;
+							if (rule.allowedDefinitions) {
+								for (const allowedDefinition of rule.allowedDefinitions) {
+									if (definitionFileName.indexOf(allowedDefinition) >= 0) {
+										continue DeclarationLoop;
 									}
 								}
-								if (rule.disallowedDefinitions) {
-									for (const disallowedDefinition of rule.disallowedDefinitions) {
-										if (definitionFileName.indexOf(disallowedDefinition) >= 0) {
-											const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
-											console.log(`[build/lib/layersChecker.ts]: Reference to '${text}' from '${disallowedDefinition}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1})`);
+							}
+							if (rule.disallowedDefinitions) {
+								for (const disallowedDefinition of rule.disallowedDefinitions) {
+									if (definitionFileName.indexOf(disallowedDefinition) >= 0) {
+										const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
 
-											hasErrors = true;
-											return;
-										}
+										console.log(`[build/lib/layersChecker.ts]: Reference to symbol '${text}' from '${disallowedDefinition}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1})`);
+
+										hasErrors = true;
+										return;
 									}
 								}
 							}
diff --git a/cgmanifest.json b/cgmanifest.json
index ca83f087f7a..cb20604a3a4 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -60,12 +60,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "1401284b44c37853072d502b86f30009c9901d00"
+					"commitHash": "9ace5b3491881cb4230a921bb4809edeb393858c"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "17.3.0"
+			"version": "17.3.1"
 		},
 		{
 			"component": {
diff --git a/extensions/css-language-features/client/src/cssClient.ts b/extensions/css-language-features/client/src/cssClient.ts
index 35774d6ed29..282c347bdd8 100644
--- a/extensions/css-language-features/client/src/cssClient.ts
+++ b/extensions/css-language-features/client/src/cssClient.ts
@@ -32,9 +32,12 @@ interface CSSFormatSettings {
 	newlineBetweenSelectors?: boolean;
 	newlineBetweenRules?: boolean;
 	spaceAroundSelectorSeparator?: boolean;
+	braceStyle?: 'collapse' | 'expand';
+	preserveNewLines?: boolean;
+	maxPreserveNewLines?: number | null;
 }
 
-const cssFormatSettingKeys: (keyof CSSFormatSettings)[] = ['newlineBetweenSelectors', 'newlineBetweenRules', 'spaceAroundSelectorSeparator'];
+const cssFormatSettingKeys: (keyof CSSFormatSettings)[] = ['newlineBetweenSelectors', 'newlineBetweenRules', 'spaceAroundSelectorSeparator', 'braceStyle', 'preserveNewLines', 'maxPreserveNewLines'];
 
 export function startClient(context: ExtensionContext, newLanguageClient: LanguageClientConstructor, runtime: Runtime) {
 
@@ -196,7 +199,7 @@ export function startClient(context: ExtensionContext, newLanguageClient: Langua
 					if (formatterSettings) {
 						for (const key of cssFormatSettingKeys) {
 							const val = formatterSettings[key];
-							if (val !== undefined) {
+							if (val !== undefined && val !== null) {
 								params.options[key] = val;
 							}
 						}
diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json
index 12ec5c76cd0..e9ea587d4db 100644
--- a/extensions/css-language-features/package.json
+++ b/extensions/css-language-features/package.json
@@ -331,6 +331,28 @@
             "scope": "resource",
             "default": false,
             "markdownDescription": "%css.format.spaceAroundSelectorSeparator.desc%"
+          },
+          "css.format.braceStyle": {
+            "type": "string",
+            "scope": "resource",
+            "default": "collapse",
+            "enum": ["collapse", "expand"],
+            "markdownDescription": "%css.format.braceStyle.desc%"
+          },
+          "css.format.preserveNewLines": {
+            "type": "boolean",
+            "scope": "resource",
+            "default": true,
+            "markdownDescription": "%css.format.preserveNewLines.desc%"
+          },
+          "css.format.maxPreserveNewLines": {
+            "type": [
+              "number",
+              "null"
+            ],
+            "scope": "resource",
+            "default": null,
+            "markdownDescription": "%css.format.maxPreserveNewLines.desc%"
           }
         }
       },
@@ -611,6 +633,28 @@
             "scope": "resource",
             "default": false,
             "markdownDescription": "%scss.format.spaceAroundSelectorSeparator.desc%"
+          },
+          "scss.format.braceStyle": {
+            "type": "string",
+            "scope": "resource",
+            "default": "collapse",
+            "enum": ["collapse", "expand"],
+            "markdownDescription": "%scss.format.braceStyle.desc%"
+          },
+          "scss.format.preserveNewLines": {
+            "type": "boolean",
+            "scope": "resource",
+            "default": true,
+            "markdownDescription": "%scss.format.preserveNewLines.desc%"
+          },
+          "scss.format.maxPreserveNewLines": {
+            "type": [
+              "number",
+              "null"
+            ],
+            "scope": "resource",
+            "default": null,
+            "markdownDescription": "%scss.format.maxPreserveNewLines.desc%"
           }
         }
       },
@@ -892,6 +936,28 @@
             "scope": "resource",
             "default": false,
             "markdownDescription": "%less.format.spaceAroundSelectorSeparator.desc%"
+          },
+          "less.format.braceStyle": {
+            "type": "string",
+            "scope": "resource",
+            "default": "collapse",
+            "enum": ["collapse", "expand"],
+            "markdownDescription": "%less.format.braceStyle.desc%"
+          },
+          "less.format.preserveNewLines": {
+            "type": "boolean",
+            "scope": "resource",
+            "default": true,
+            "markdownDescription": "%less.format.preserveNewLines.desc%"
+          },
+          "less.format.maxPreserveNewLines": {
+            "type": [
+              "number",
+              "null"
+            ],
+            "scope": "resource",
+            "default": null,
+            "markdownDescription": "%less.format.maxPreserveNewLines.desc%"
           }
         }
       }
diff --git a/extensions/css-language-features/package.nls.json b/extensions/css-language-features/package.nls.json
index fbcaed2113a..784eaa531b7 100644
--- a/extensions/css-language-features/package.nls.json
+++ b/extensions/css-language-features/package.nls.json
@@ -34,6 +34,9 @@
 	"css.format.newlineBetweenSelectors.desc": "Separate selectors with a new line.",
 	"css.format.newlineBetweenRules.desc": "Separate rulesets by a blank line.",
 	"css.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators '>', '+', '~' (e.g. `a > b`).",
+	"css.format.braceStyle.desc": "Put braces on the same line as rules (`collapse`) or put braces on own line (`expand`).",
+	"css.format.preserveNewLines.desc": "Whether existing line breaks before elements should be preserved.",
+	"css.format.maxPreserveNewLines.desc": "Maximum number of line breaks to be preserved in one chunk, when `#css.format.preserveNewLines#` is enabled.",
 	"less.title": "LESS",
 	"less.completion.triggerPropertyValueCompletion.desc": "By default, VS Code triggers property value completion after selecting a CSS property. Use this setting to disable this behavior.",
 	"less.completion.completePropertyWithSemicolon.desc": "Insert semicolon at end of line when completing CSS properties.",
@@ -65,6 +68,9 @@
 	"less.format.newlineBetweenSelectors.desc": "Separate selectors with a new line.",
 	"less.format.newlineBetweenRules.desc": "Separate rulesets by a blank line.",
 	"less.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators '>', '+', '~' (e.g. `a > b`).",
+	"less.format.braceStyle.desc": "Put braces on the same line as rules (`collapse`) or put braces on own line (`expand`).",
+	"less.format.preserveNewLines.desc": "Whether existing line breaks before elements should be preserved.",
+	"less.format.maxPreserveNewLines.desc": "Maximum number of line breaks to be preserved in one chunk, when `#less.format.preserveNewLines#` is enabled.",
 	"scss.title": "SCSS (Sass)",
 	"scss.completion.triggerPropertyValueCompletion.desc": "By default, VS Code triggers property value completion after selecting a CSS property. Use this setting to disable this behavior.",
 	"scss.completion.completePropertyWithSemicolon.desc": "Insert semicolon at end of line when completing CSS properties.",
@@ -96,6 +102,9 @@
 	"scss.format.newlineBetweenSelectors.desc": "Separate selectors with a new line.",
 	"scss.format.newlineBetweenRules.desc": "Separate rulesets by a blank line.",
 	"scss.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators '>', '+', '~' (e.g. `a > b`).",
+	"scss.format.braceStyle.desc": "Put braces on the same line as rules (`collapse`) or put braces on own line (`expand`).",
+	"scss.format.preserveNewLines.desc": "Whether existing line breaks before elements should be preserved.",
+	"scss.format.maxPreserveNewLines.desc": "Maximum number of line breaks to be preserved in one chunk, when `#scss.format.preserveNewLines#` is enabled.",
 	"css.colorDecorators.enable.deprecationMessage": "The setting `css.colorDecorators.enable` has been deprecated in favor of `editor.colorDecorators`.",
 	"scss.colorDecorators.enable.deprecationMessage": "The setting `scss.colorDecorators.enable` has been deprecated in favor of `editor.colorDecorators`.",
 	"less.colorDecorators.enable.deprecationMessage": "The setting `less.colorDecorators.enable` has been deprecated in favor of `editor.colorDecorators`."
diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json
index fc604a23125..865414065cf 100644
--- a/extensions/css-language-features/server/package.json
+++ b/extensions/css-language-features/server/package.json
@@ -10,7 +10,7 @@
   "main": "./out/node/cssServerMain",
   "browser": "./dist/browser/cssServerMain",
   "dependencies": {
-    "vscode-css-languageservice": "^5.3.0",
+    "vscode-css-languageservice": "^5.4.1",
     "vscode-languageserver": "^7.0.0",
     "vscode-uri": "^3.0.3"
   },
diff --git a/extensions/css-language-features/server/yarn.lock b/extensions/css-language-features/server/yarn.lock
index 6615d59d27a..a781f65f7cf 100644
--- a/extensions/css-language-features/server/yarn.lock
+++ b/extensions/css-language-features/server/yarn.lock
@@ -12,10 +12,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"
   integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==
 
-vscode-css-languageservice@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-5.3.0.tgz#48b800865c5b6ca7ab43225c63e8a4f1f24ec9b0"
-  integrity sha512-ujWW855AoJlE4ETU17Gff7unlZZTHDA0w26itk9EQFMfJqi9lE6S67zOsMvcPmJf55MrnGQbojDYZRiDVaFjdA==
+vscode-css-languageservice@^5.4.1:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-5.4.1.tgz#6bb309d617c40f5b4b7752d05f1cbb9b2eaab102"
+  integrity sha512-W7D3GKFXf97ReAaU4EZ2nxVO1kQhztbycJgc1b/Ipr0h8zYWr88BADmrXu02z+lsCS84D7Sr4hoUzDKeaFn2Kg==
   dependencies:
     vscode-languageserver-textdocument "^1.0.4"
     vscode-languageserver-types "^3.16.0"
diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts
index afb90b64418..1462a2ec4d7 100644
--- a/extensions/emmet/src/defaultCompletionProvider.ts
+++ b/extensions/emmet/src/defaultCompletionProvider.ts
@@ -161,25 +161,27 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 			return;
 		}
 
-		let noiseCheckPromise: Thenable<any> = Promise.resolve();
+		let isNoisePromise: Thenable<boolean> = Promise.resolve(false);
 
 		// Fix for https://github.com/microsoft/vscode/issues/32647
 		// Check for document symbols in js/ts/jsx/tsx and avoid triggering emmet for abbreviations of the form symbolName.sometext
 		// Presence of > or * or + in the abbreviation denotes valid abbreviation that should trigger emmet
 		if (!isStyleSheet(syntax) && (document.languageId === 'javascript' || document.languageId === 'javascriptreact' || document.languageId === 'typescript' || document.languageId === 'typescriptreact')) {
 			let abbreviation: string = extractAbbreviationResults.abbreviation;
-			if (abbreviation.startsWith('this.')) {
-				noiseCheckPromise = Promise.resolve(true);
+			// For the second condition, we don't want abbreviations that have [] characters but not ='s in them to expand
+			// In turn, users must explicitly expand abbreviations of the form Component[attr1 attr2], but it means we don't try to expand a[i].
+			if (abbreviation.startsWith('this.') || /\[[^\]=]*\]/.test(abbreviation)) {
+				isNoisePromise = Promise.resolve(true);
 			} else {
-				noiseCheckPromise = vscode.commands.executeCommand<vscode.SymbolInformation[]>('vscode.executeDocumentSymbolProvider', document.uri).then((symbols: vscode.SymbolInformation[] | undefined) => {
-					return symbols && symbols.find(x => abbreviation === x.name || (abbreviation.startsWith(x.name + '.') && !/>|\*|\+/.test(abbreviation)));
+				isNoisePromise = vscode.commands.executeCommand<vscode.SymbolInformation[] | undefined>('vscode.executeDocumentSymbolProvider', document.uri).then(symbols => {
+					return !!symbols && symbols.some(x => abbreviation === x.name || (abbreviation.startsWith(x.name + '.') && !/>|\*|\+/.test(abbreviation)));
 				});
 			}
 		}
 
-		return noiseCheckPromise.then((noise): vscode.CompletionList | undefined => {
-			if (noise) {
-				return;
+		return isNoisePromise.then((isNoise): vscode.CompletionList | undefined => {
+			if (isNoise) {
+				return undefined;
 			}
 
 			const config = getEmmetConfiguration(syntax!);
diff --git a/extensions/emmet/src/test/completion.test.ts b/extensions/emmet/src/test/completion.test.ts
index 755b11aea18..ec94a0f4928 100644
--- a/extensions/emmet/src/test/completion.test.ts
+++ b/extensions/emmet/src/test/completion.test.ts
@@ -15,32 +15,40 @@ suite('Tests for completion in CSS embedded in HTML', () => {
 	teardown(closeAllEditors);
 
 	test('style attribute & attribute value in html', async () => {
-		await testHtmlCompletionProvider('<div style="|"', [{ label: 'padding: ;' }]);
-		await testHtmlCompletionProvider(`<div style='|'`, [{ label: 'padding: ;' }]);
-		await testHtmlCompletionProvider(`<div style='p|'`, [{ label: 'padding: ;' }]);
-		await testHtmlCompletionProvider(`<div style='color: #0|'`, [{ label: '#000000' }]);
+		await testCompletionProvider('html', '<div style="|"', [{ label: 'padding: ;' }]);
+		await testCompletionProvider('html', `<div style='|'`, [{ label: 'padding: ;' }]);
+		await testCompletionProvider('html', `<div style='p|'`, [{ label: 'padding: ;' }]);
+		await testCompletionProvider('html', `<div style='color: #0|'`, [{ label: '#000000' }]);
 	});
 
 	// https://github.com/microsoft/vscode/issues/79766
 	test('#79766, correct region determination', async () => {
-		await testHtmlCompletionProvider(`<div style="color: #000">di|</div>`, [
+		await testCompletionProvider('html', `<div style="color: #000">di|</div>`, [
 			{ label: 'div', documentation: `<div>|</div>` }
 		]);
 	});
 
 	// https://github.com/microsoft/vscode/issues/86941
 	test('#86941, widows should not be completed', async () => {
-		await testCssCompletionProvider(`.foo { wi| }`, [
-			{ label: 'widows: ;', documentation: `widows: ;` }
-		]);
+		await testCompletionProvider('css', `.foo { wi| }`, undefined);
 	});
 
 	// https://github.com/microsoft/vscode/issues/117020
 	test('#117020, ! at end of abbreviation should have completion', async () => {
-		await testCssCompletionProvider(`.foo { bdbn!| }`, [
+		await testCompletionProvider('css', `.foo { bdbn!| }`, [
 			{ label: 'border-bottom: none !important;', documentation: `border-bottom: none !important;` }
 		]);
 	});
+
+	// https://github.com/microsoft/vscode/issues/138461
+	test('#138461, JSX array noise', async () => {
+		await testCompletionProvider('jsx', 'a[i]', undefined);
+		await testCompletionProvider('jsx', 'Component[a b]', undefined);
+		await testCompletionProvider('jsx', '[a, b]', undefined);
+		await testCompletionProvider('jsx', '[a=b]', [
+			{ label: '<div a="b"></div>', documentation: '<div a="b">|</div>' }
+		]);
+	});
 });
 
 interface TestCompletionItem {
@@ -49,11 +57,11 @@ interface TestCompletionItem {
 	documentation?: string;
 }
 
-function testHtmlCompletionProvider(contents: string, expectedItems: TestCompletionItem[]): Thenable<any> {
+function testCompletionProvider(fileExtension: string, contents: string, expectedItems: TestCompletionItem[] | undefined): Thenable<boolean> {
 	const cursorPos = contents.indexOf('|');
-	const htmlContents = contents.slice(0, cursorPos) + contents.slice(cursorPos + 1);
+	const slicedContents = contents.slice(0, cursorPos) + contents.slice(cursorPos + 1);
 
-	return withRandomFileEditor(htmlContents, 'html', async (editor, _doc) => {
+	return withRandomFileEditor(slicedContents, fileExtension, async (editor, _doc) => {
 		const selection = new Selection(editor.document.positionAt(cursorPos), editor.document.positionAt(cursorPos));
 		editor.selection = selection;
 		const cancelSrc = new CancellationTokenSource();
@@ -69,51 +77,14 @@ function testHtmlCompletionProvider(contents: string, expectedItems: TestComplet
 
 		const completionList = await completionPromise;
 		if (!completionList || !completionList.items || !completionList.items.length) {
+			if (completionList === undefined) {
+				assert.strictEqual(expectedItems, completionList);
+			}
 			return Promise.resolve();
 		}
 
-		expectedItems.forEach(eItem => {
-			const matches = completionList.items.filter(i => i.label === eItem.label);
-			const match = matches && matches.length > 0 ? matches[0] : undefined;
-			assert.ok(match, `Didn't find completion item with label ${eItem.label}`);
-
-			if (match) {
-				assert.strictEqual(match.detail, 'Emmet Abbreviation', `Match needs to come from Emmet`);
-
-				if (eItem.documentation) {
-					assert.strictEqual(match.documentation, eItem.documentation, `Emmet completion Documentation doesn't match`);
-				}
-			}
-		});
-
-		return Promise.resolve();
-	});
-}
-
-function testCssCompletionProvider(contents: string, expectedItems: TestCompletionItem[]): Thenable<any> {
-	const cursorPos = contents.indexOf('|');
-	const cssContents = contents.slice(0, cursorPos) + contents.slice(cursorPos + 1);
-
-	return withRandomFileEditor(cssContents, 'css', async (editor, _doc) => {
-		const selection = new Selection(editor.document.positionAt(cursorPos), editor.document.positionAt(cursorPos));
-		editor.selection = selection;
-		const cancelSrc = new CancellationTokenSource();
-		const completionPromise = completionProvider.provideCompletionItems(
-			editor.document,
-			editor.selection.active,
-			cancelSrc.token,
-			{ triggerKind: CompletionTriggerKind.Invoke, triggerCharacter: undefined }
-		);
-		if (!completionPromise) {
-			return Promise.resolve();
-		}
-
-		const completionList = await completionPromise;
-		if (!completionList || !completionList.items || !completionList.items.length) {
-			return Promise.resolve();
-		}
-
-		expectedItems.forEach(eItem => {
+		assert.strictEqual(expectedItems === undefined, false);
+		expectedItems!.forEach(eItem => {
 			const matches = completionList.items.filter(i => i.label === eItem.label);
 			const match = matches && matches.length > 0 ? matches[0] : undefined;
 			assert.ok(match, `Didn't find completion item with label ${eItem.label}`);
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
index e81d25bae3b..ee45de467e6 100644
--- a/extensions/emmet/src/util.ts
+++ b/extensions/emmet/src/util.ts
@@ -226,7 +226,7 @@ export function parsePartialStylesheet(document: vscode.TextDocument, position:
 	}
 
 	function consumeBlockCommentBackwards() {
-		if (stream.peek() === slash) {
+		if (!stream.sof() && stream.peek() === slash) {
 			if (stream.backUp(1) === star) {
 				stream.pos = findOpeningCommentBeforePosition(stream.pos) ?? startOffset;
 			} else {
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 97696d22028..1122b41fc4c 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -986,6 +986,11 @@
           "group": "1_header@4",
           "when": "scmProvider == git"
         },
+        {
+          "command": "git.fetch",
+          "group": "1_header@5",
+          "when": "scmProvider == git"
+        },
         {
           "submenu": "git.commit",
           "group": "2_main@1",
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 92c78a44969..7899d1bb8ad 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -1272,7 +1272,7 @@ export class Repository implements Disposable {
 
 		const diffEditorTabsToClose: Tab[] = [];
 
-		for (const tab of window.tabGroups.groups.map(g => g.tabs).flat()) {
+		for (const tab of window.tabGroups.all.map(g => g.tabs).flat()) {
 			const { kind } = tab;
 			if (kind instanceof TabKindTextDiff || kind instanceof TabKindNotebookDiff) {
 				if (kind.modified.scheme === 'git' && indexResources.some(r => pathEquals(r, kind.modified.fsPath))) {
diff --git a/extensions/github/package.json b/extensions/github/package.json
index f86f98683af..af7b544f596 100644
--- a/extensions/github/package.json
+++ b/extensions/github/package.json
@@ -49,6 +49,15 @@
             "scope": "resource",
             "default": true,
             "description": "%config.gitAuthentication%"
+          },
+          "github.gitProtocol": {
+            "type": "string",
+            "enum": [
+              "https",
+              "ssh"
+            ],
+            "default": "https",
+            "description": "%config.gitProtocol%"
           }
         }
       }
diff --git a/extensions/github/package.nls.json b/extensions/github/package.nls.json
index 472c5ab7e4c..ebebab0e0e2 100644
--- a/extensions/github/package.nls.json
+++ b/extensions/github/package.nls.json
@@ -2,6 +2,7 @@
 	"displayName": "GitHub",
 	"description": "GitHub features for VS Code",
 	"config.gitAuthentication": "Controls whether to enable automatic GitHub authentication for git commands within VS Code.",
+	"config.gitProtocol": "Controls which protocol is used to clone a GitHub repository",
 	"welcome.publishFolder": "You can also directly publish this folder to a GitHub repository. Once published, you'll have access to source control features powered by git and GitHub.\n[$(github) Publish to GitHub](command:github.publish)",
 	"welcome.publishWorkspaceFolder": "You can also directly publish a workspace folder to a GitHub repository. Once published, you'll have access to source control features powered by git and GitHub.\n[$(github) Publish to GitHub](command:github.publish)"
 }
diff --git a/extensions/github/src/auth.ts b/extensions/github/src/auth.ts
index a0a0244255a..af91374e91f 100644
--- a/extensions/github/src/auth.ts
+++ b/extensions/github/src/auth.ts
@@ -53,4 +53,3 @@ export function getOctokit(): Promise<Octokit> {
 
 	return _octokit;
 }
-
diff --git a/extensions/github/src/publish.ts b/extensions/github/src/publish.ts
index 0954e2c67ff..fe8a31bbc67 100644
--- a/extensions/github/src/publish.ts
+++ b/extensions/github/src/publish.ts
@@ -197,7 +197,9 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
 		progress.report({ message: localize('publishing_uploading', "Uploading files"), increment: 25 });
 
 		const branch = await repository.getBranch('HEAD');
-		await repository.addRemote('origin', createdGithubRepository.clone_url);
+		const protocol = vscode.workspace.getConfiguration('github').get<'https' | 'ssh'>('gitProtocol');
+		const remoteUrl = protocol === 'https' ? createdGithubRepository.clone_url : createdGithubRepository.ssh_url;
+		await repository.addRemote('origin', remoteUrl);
 		await repository.push('origin', branch.name, true);
 
 		return createdGithubRepository;
diff --git a/extensions/github/src/pushErrorHandler.ts b/extensions/github/src/pushErrorHandler.ts
index 5948c526ea1..9e8af7dbcc9 100644
--- a/extensions/github/src/pushErrorHandler.ts
+++ b/extensions/github/src/pushErrorHandler.ts
@@ -73,7 +73,9 @@ async function handlePushError(repository: Repository, remote: Remote, refspec:
 		await repository.renameRemote(remote.name, 'upstream');
 
 		// Issue: what if there's already another `origin` repo?
-		await repository.addRemote('origin', ghRepository.clone_url);
+		const protocol = workspace.getConfiguration('github').get<'https' | 'ssh'>('gitProtocol');
+		const remoteUrl = protocol === 'https' ? ghRepository.clone_url : ghRepository.ssh_url;
+		await repository.addRemote('origin', remoteUrl);
 
 		try {
 			await repository.fetch('origin', remoteName);
diff --git a/extensions/github/src/remoteSourceProvider.ts b/extensions/github/src/remoteSourceProvider.ts
index 7f3f9ae41eb..6e0b5fadbf7 100644
--- a/extensions/github/src/remoteSourceProvider.ts
+++ b/extensions/github/src/remoteSourceProvider.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { workspace } from 'vscode';
 import { RemoteSourceProvider, RemoteSource } from './typings/git-base';
 import { getOctokit } from './auth';
 import { Octokit } from '@octokit/rest';
@@ -14,10 +15,11 @@ function parse(url: string): { owner: string; repo: string } | undefined {
 }
 
 function asRemoteSource(raw: any): RemoteSource {
+	const protocol = workspace.getConfiguration('github').get<'https' | 'ssh'>('gitProtocol');
 	return {
 		name: `$(github) ${raw.full_name}`,
 		description: raw.description || undefined,
-		url: raw.clone_url
+		url: protocol === 'https' ? raw.clone_url : raw.ssh_url
 	};
 }
 
diff --git a/extensions/html-language-features/server/src/modes/embeddedSupport.ts b/extensions/html-language-features/server/src/modes/embeddedSupport.ts
index f0ad3d9676a..941510d3deb 100644
--- a/extensions/html-language-features/server/src/modes/embeddedSupport.ts
+++ b/extensions/html-language-features/server/src/modes/embeddedSupport.ts
@@ -181,7 +181,6 @@ function getPrefix(c: EmbeddedRegion) {
 	if (c.attributeValue) {
 		switch (c.languageId) {
 			case 'css': return CSS_STYLE_RULE + '{';
-			case 'javascript': return '()=>{';
 		}
 	}
 	return '';
@@ -190,7 +189,7 @@ function getSuffix(c: EmbeddedRegion) {
 	if (c.attributeValue) {
 		switch (c.languageId) {
 			case 'css': return '}';
-			case 'javascript': return '};';
+			case 'javascript': return ';';
 		}
 	}
 	return '';
diff --git a/extensions/html-language-features/server/src/modes/javascriptMode.ts b/extensions/html-language-features/server/src/modes/javascriptMode.ts
index 36a41173b30..b4780e87715 100644
--- a/extensions/html-language-features/server/src/modes/javascriptMode.ts
+++ b/extensions/html-language-features/server/src/modes/javascriptMode.ts
@@ -87,7 +87,7 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 			const languageService = await host.getLanguageService(jsDocument);
 			const syntaxDiagnostics: ts.Diagnostic[] = languageService.getSyntacticDiagnostics(jsDocument.uri);
 			const semanticDiagnostics = languageService.getSemanticDiagnostics(jsDocument.uri);
-			return syntaxDiagnostics.concat(semanticDiagnostics).map((diag: ts.Diagnostic): Diagnostic => {
+			return syntaxDiagnostics.concat(semanticDiagnostics).filter(d => d.code !== 1108).map((diag: ts.Diagnostic): Diagnostic => {
 				return {
 					range: convertRange(jsDocument, diag),
 					severity: DiagnosticSeverity.Error,
diff --git a/extensions/html-language-features/server/src/test/embedded.test.ts b/extensions/html-language-features/server/src/test/embedded.test.ts
index 94974abb19b..1e63a72ec89 100644
--- a/extensions/html-language-features/server/src/test/embedded.test.ts
+++ b/extensions/html-language-features/server/src/test/embedded.test.ts
@@ -120,7 +120,9 @@ suite('HTML Embedded Support', () => {
 		assertEmbeddedLanguageContent('<html><script>var i = 0;</script></html>', 'javascript', '              var i = 0;                ');
 		assertEmbeddedLanguageContent('<script type="text/javascript">var i = 0;</script>', 'javascript', '                               var i = 0;         ');
 
-		assertEmbeddedLanguageContent('<div onKeyUp="foo()" onkeydown="bar()"/>', 'javascript', '         ()=>{foo()};      ()=>{bar()}; ');
+		assertEmbeddedLanguageContent('<div onKeyUp="foo()" onkeydown="bar()"/>', 'javascript', '              foo();            bar();  ');
+		assertEmbeddedLanguageContent('<div onKeyUp="return"/>', 'javascript', '              return;  ');
+
 	});
 
 });
diff --git a/extensions/javascript/snippets/javascript.code-snippets b/extensions/javascript/snippets/javascript.code-snippets
index ac5cd5549f1..47a6f40d202 100644
--- a/extensions/javascript/snippets/javascript.code-snippets
+++ b/extensions/javascript/snippets/javascript.code-snippets
@@ -149,12 +149,12 @@
 		],
 		"description": "Set Interval Function"
 	},
-	"Import external module.": {
-		"prefix": "import statement",
+	"Import Statement": {
+		"prefix": "import",
 		"body": [
 			"import { $0 } from \"${1:module}\";"
 		],
-		"description": "Import external module."
+		"description": "Import external module"
 	},
 	"Region Start": {
 		"prefix": "#region",
diff --git a/extensions/json-language-features/client/src/jsonClient.ts b/extensions/json-language-features/client/src/jsonClient.ts
index 7fd2b32ca2f..1044fa22599 100644
--- a/extensions/json-language-features/client/src/jsonClient.ts
+++ b/extensions/json-language-features/client/src/jsonClient.ts
@@ -68,7 +68,7 @@ interface Settings {
 	};
 }
 
-interface JSONSchemaSettings {
+export interface JSONSchemaSettings {
 	fileMatch?: string[];
 	url?: string;
 	schema?: any;
diff --git a/extensions/json-language-features/client/src/languageStatus.ts b/extensions/json-language-features/client/src/languageStatus.ts
index 63541be773d..152759c39a1 100644
--- a/extensions/json-language-features/client/src/languageStatus.ts
+++ b/extensions/json-language-features/client/src/languageStatus.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { window, languages, Uri, LanguageStatusSeverity, Disposable, commands, QuickPickItem, extensions, workspace } from 'vscode';
-import { JSONLanguageStatus } from './jsonClient';
+import { window, languages, Uri, LanguageStatusSeverity, Disposable, commands, QuickPickItem, extensions, workspace, Extension, WorkspaceFolder, QuickPickItemKind, ThemeIcon } from 'vscode';
+import { JSONLanguageStatus, JSONSchemaSettings } from './jsonClient';
 
 import * as nls from 'vscode-nls';
 
@@ -16,75 +16,160 @@ type ShowSchemasInput = {
 };
 
 interface ShowSchemasItem extends QuickPickItem {
-	uri: Uri;
+	uri?: Uri;
+	buttonCommands?: (() => void)[];
 }
 
-function equalsIgnoreCase(a: string, b: string): boolean {
-	return a.length === b.length && a.toLowerCase().localeCompare(b.toLowerCase()) === 0;
-}
+function getExtensionSchemaAssociations() {
+	const associations: { fullUri: string; extension: Extension<any>; label: string }[] = [];
 
-function isEqualAuthority(a1: string | undefined, a2: string | undefined) {
-	return a1 === a2 || (a1 !== undefined && a2 !== undefined && equalsIgnoreCase(a1, a2));
-}
-
-function findExtension(uri: Uri) {
-	for (const ext of extensions.all) {
-		const parent = ext.extensionUri;
-		if (uri.scheme === parent.scheme && isEqualAuthority(uri.authority, parent.authority) && uri.path.startsWith(parent.path + '/')) {
-			return ext;
-		}
-	}
-	return undefined;
-}
-
-function findWorkspaceFolder(uri: Uri) {
-	if (workspace.workspaceFolders) {
-		for (const wf of workspace.workspaceFolders) {
-			const parent = wf.uri;
-			if (uri.scheme === parent.scheme && isEqualAuthority(uri.authority, parent.authority) && uri.path.startsWith(parent.path + '/')) {
-				return wf;
+	for (const extension of extensions.all) {
+		const jsonValidations = extension.packageJSON?.contributes?.jsonValidation;
+		if (Array.isArray(jsonValidations)) {
+			for (const jsonValidation of jsonValidations) {
+				let uri = jsonValidation.url;
+				if (typeof uri === 'string') {
+					if (uri[0] === '.' && uri[1] === '/') {
+						uri = Uri.joinPath(extension.extensionUri, uri).toString(false);
+					}
+					associations.push({ fullUri: uri, extension, label: jsonValidation.url });
+				}
 			}
 		}
 	}
-	return undefined;
+	return {
+		findExtension(uri: string): ShowSchemasItem | undefined {
+			for (const association of associations) {
+				if (association.fullUri === uri) {
+					return {
+						label: association.label,
+						detail: localize('schemaFromextension', 'Configured by extension: {0}', association.extension.id),
+						uri: Uri.parse(association.fullUri),
+						buttons: [{ iconPath: new ThemeIcon('extensions'), tooltip: localize('openExtension', 'Open Extension') }],
+						buttonCommands: [() => commands.executeCommand('workbench.extensions.action.showExtensionsWithIds', [[association.extension.id]])]
+					};
+				}
+			}
+			return undefined;
+		}
+	};
 }
 
-function renderShowSchemasItem(schema: string): ShowSchemasItem {
-	const uri = Uri.parse(schema);
-	const extension = findExtension(uri);
-	if (extension) {
-		return { label: extension.id, description: uri.path.substring(extension.extensionUri.path.length + 1), uri };
+//
+
+function getSettingsSchemaAssociations(uri: string) {
+	const resourceUri = Uri.parse(uri);
+	const workspaceFolder = workspace.getWorkspaceFolder(resourceUri);
+
+	const settings = workspace.getConfiguration('json', resourceUri).inspect<JSONSchemaSettings[]>('schemas');
+
+	const associations: { fullUri: string; workspaceFolder: WorkspaceFolder | undefined; label: string }[] = [];
+
+	const folderSettingSchemas = settings?.workspaceFolderValue;
+	if (workspaceFolder && Array.isArray(folderSettingSchemas)) {
+		for (const setting of folderSettingSchemas) {
+			const uri = setting.url;
+			if (typeof uri === 'string') {
+				let fullUri = uri;
+				if (uri[0] === '.' && uri[1] === '/') {
+					fullUri = Uri.joinPath(workspaceFolder.uri, uri).toString(false);
+				}
+				associations.push({ fullUri, workspaceFolder, label: uri });
+			}
+		}
 	}
-	const wf = findWorkspaceFolder(uri);
-	if (wf) {
-		return { label: uri.path.substring(wf.uri.path.length + 1), description: 'Workspace', uri };
+	const userSettingSchemas = settings?.globalValue;
+	if (Array.isArray(userSettingSchemas)) {
+		for (const setting of userSettingSchemas) {
+			const uri = setting.url;
+			if (typeof uri === 'string') {
+				let fullUri = uri;
+				if (workspaceFolder && uri[0] === '.' && uri[1] === '/') {
+					fullUri = Uri.joinPath(workspaceFolder.uri, uri).toString(false);
+				}
+				associations.push({ fullUri, workspaceFolder: undefined, label: uri });
+			}
+		}
 	}
-	if (uri.scheme === 'file') {
-		return { label: uri.fsPath, uri };
-	} else if (uri.scheme === 'vscode') {
-		return { label: schema, description: 'internally generated', uri };
-	}
-	return { label: schema, uri };
+	return {
+		findSetting(uri: string): ShowSchemasItem | undefined {
+			for (const association of associations) {
+				if (association.fullUri === uri) {
+					return {
+						label: association.label,
+						detail: association.workspaceFolder ? localize('schemaFromFolderSettings', 'Configured in workspace settings') : localize('schemaFromUserSettings', 'Configured in user settings'),
+						uri: Uri.parse(association.fullUri),
+						buttons: [{ iconPath: new ThemeIcon('gear'), tooltip: localize('openSettings', 'Open Settings') }],
+						buttonCommands: [() => commands.executeCommand(association.workspaceFolder ? 'workbench.action.openWorkspaceSettingsFile' : 'workbench.action.openSettingsJson', ['json.schemas'])]
+					};
+				}
+			}
+			return undefined;
+		}
+	};
 }
 
+function showSchemaList(input: ShowSchemasInput) {
+
+	const extensionSchemaAssocations = getExtensionSchemaAssociations();
+	const settingsSchemaAssocations = getSettingsSchemaAssociations(input.uri);
+
+	const extensionEntries = [];
+	const settingsEntries = [];
+	const otherEntries = [];
+
+	for (const schemaUri of input.schemas) {
+		const extensionEntry = extensionSchemaAssocations.findExtension(schemaUri);
+		if (extensionEntry) {
+			extensionEntries.push(extensionEntry);
+			continue;
+		}
+		const settingsEntry = settingsSchemaAssocations.findSetting(schemaUri);
+		if (settingsEntry) {
+			settingsEntries.push(settingsEntry);
+			continue;
+		}
+		otherEntries.push({ label: schemaUri, uri: Uri.parse(schemaUri) });
+	}
+
+	const items: ShowSchemasItem[] = [...extensionEntries, ...settingsEntries, ...otherEntries];
+	if (items.length === 0) {
+		items.push({
+			label: localize('schema.noSchema', 'No schema configured for this file'),
+			buttons: [{ iconPath: new ThemeIcon('gear'), tooltip: localize('openSettings', 'Open Settings') }],
+			buttonCommands: [() => commands.executeCommand('workbench.action.openSettingsJson', ['json.schemas'])]
+		});
+	}
+
+	items.push({ label: '', kind: QuickPickItemKind.Separator });
+	items.push({ label: localize('schema.showdocs', 'Learn more about JSON schema configuration...'), uri: Uri.parse('https://code.visualstudio.com/docs/languages/json#_json-schemas-and-settings') });
+
+	const quickPick = window.createQuickPick<ShowSchemasItem>();
+	quickPick.title = localize('schemaPicker.title', 'JSON Schemas used for {0}', input.uri);
+	//	quickPick.placeholder = items.length ? localize('schemaPicker.placeholder', 'Select the schema to open') : undefined;
+	quickPick.items = items;
+	quickPick.show();
+	quickPick.onDidAccept(() => {
+		const uri = quickPick.selectedItems[0].uri;
+		if (uri) {
+			commands.executeCommand('vscode.open', uri);
+			quickPick.dispose();
+		}
+	});
+	quickPick.onDidTriggerItemButton(b => {
+		const index = b.item.buttons?.indexOf(b.button);
+		if (index !== undefined && index >= 0 && b.item.buttonCommands && b.item.buttonCommands[index]) {
+			b.item.buttonCommands[index]();
+		}
+	});
+}
 
 export function createLanguageStatusItem(documentSelector: string[], statusRequest: (uri: string) => Promise<JSONLanguageStatus>): Disposable {
 	const statusItem = languages.createLanguageStatusItem('json.projectStatus', documentSelector);
 	statusItem.name = localize('statusItem.name', "JSON Validation Status");
 	statusItem.severity = LanguageStatusSeverity.Information;
 
-	const showSchemasCommand = commands.registerCommand('_json.showAssociatedSchemaList', (arg: ShowSchemasInput) => {
-		const items: ShowSchemasItem[] = arg.schemas.sort().map(renderShowSchemasItem);
-		const quickPick = window.createQuickPick<ShowSchemasItem>();
-		quickPick.title = localize('schemaPicker.title', 'JSON Schemas used for {0}', arg.uri.toString());
-		quickPick.placeholder = localize('schemaPicker.placeholder', 'Select the schema to open');
-		quickPick.items = items;
-		quickPick.show();
-		quickPick.onDidAccept(() => {
-			commands.executeCommand('vscode.open', quickPick.selectedItems[0].uri);
-			quickPick.dispose();
-		});
-	});
+	const showSchemasCommand = commands.registerCommand('_json.showAssociatedSchemaList', showSchemaList);
 
 	const activeEditorListener = window.onDidChangeActiveTextEditor(() => {
 		updateLanguageStatus();
@@ -101,29 +186,24 @@ export function createLanguageStatusItem(documentSelector: string[], statusReque
 				const schemas = (await statusRequest(document.uri.toString())).schemas;
 				statusItem.detail = undefined;
 				if (schemas.length === 0) {
-					statusItem.text = localize('status.noSchema', 'Validated without JSON schema');
+					statusItem.text = localize('status.noSchema.short', "No Schema Validation");
+					statusItem.detail = localize('status.noSchema', 'No JSON schema configured.');
 				} else if (schemas.length === 1) {
-					const item = renderShowSchemasItem(schemas[0]);
-					statusItem.text = localize('status.singleSchema', 'Validated with JSON schema');
-					statusItem.command = {
-						command: 'vscode.open',
-						title: localize('status.openSchemaLink', 'Open Schema'),
-						tooltip: item.description ? `${item.label} - ${item.description}` : item.label,
-						arguments: [item.uri]
-					};
+					statusItem.text = localize('status.withSchema.short', "Schema Validated");
+					statusItem.detail = localize('status.singleSchema', 'JSON schema configured.');
 				} else {
-					statusItem.text = localize('status.multipleSchema', 'Validated with multiple JSON schemas');
-					statusItem.command = {
-						command: '_json.showAssociatedSchemaList',
-						title: localize('status.openSchemasLink', 'Show Schemas'),
-						arguments: [{ schemas, uri: document.uri.toString() } as ShowSchemasInput]
-					};
+					statusItem.text = localize('status.withSchemas.short', "Schema Validated");
+					statusItem.detail = localize('status.multipleSchema', 'Multiple JSON schemas configured.');
 				}
+				statusItem.command = {
+					command: '_json.showAssociatedSchemaList',
+					title: localize('status.openSchemasLink', 'Show Schemas'),
+					arguments: [{ schemas, uri: document.uri.toString() } as ShowSchemasInput]
+				};
 			} catch (e) {
 				statusItem.text = localize('status.error', 'Unable to compute used schemas');
 				statusItem.detail = undefined;
 				statusItem.command = undefined;
-				console.log(e);
 			}
 		} else {
 			statusItem.text = localize('status.notJSON', 'Not a JSON editor');
diff --git a/extensions/markdown-language-features/notebook/index.ts b/extensions/markdown-language-features/notebook/index.ts
index dc4798fc896..7b4652a9795 100644
--- a/extensions/markdown-language-features/notebook/index.ts
+++ b/extensions/markdown-language-features/notebook/index.ts
@@ -204,7 +204,8 @@ export const activate: ActivationFunction<void> = (ctx) => {
 				previewNode.classList.add('emptyMarkdownCell');
 			} else {
 				previewNode.classList.remove('emptyMarkdownCell');
-				const markdownText = outputInfo.mime.startsWith('text/x-') ? `\`\`\`${outputInfo.mime.substr(7)}\n${text}\n\`\`\`` : text;
+				const markdownText = outputInfo.mime.startsWith('text/x-') ? `\`\`\`${outputInfo.mime.substr(7)}\n${text}\n\`\`\``
+					: (outputInfo.mime.startsWith('application/') ? `\`\`\`${outputInfo.mime.substr(12)}\n${text}\n\`\`\`` : text);
 				const unsanitizedRenderedMarkdown = markdownIt.render(markdownText);
 				previewNode.innerHTML = (ctx.workspace.isTrusted
 					? unsanitizedRenderedMarkdown
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index 8fa1a37eaae..33d3be13b78 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -29,6 +29,7 @@
     "onCommand:markdown.showPreviewSecuritySelector",
     "onCommand:markdown.api.render",
     "onCommand:markdown.api.reloadPlugins",
+    "onCommand:markdown.findAllFileReferences",
     "onWebviewPanel:markdown.preview",
     "onCustomEditor:vscode.markdown.preview.editor"
   ],
@@ -122,7 +123,8 @@
           "text/x-typescript",
           "text/x-vb",
           "text/x-xml",
-          "text/x-yaml"
+          "text/x-yaml",
+          "application/json"
         ]
       }
     ],
@@ -168,6 +170,11 @@
         "command": "markdown.preview.toggleLock",
         "title": "%markdown.preview.toggleLock.title%",
         "category": "Markdown"
+      },
+      {
+        "command": "markdown.findAllFileReferences",
+        "title": "%markdown.findAllFileReferences%",
+        "category": "Markdown"
       }
     ],
     "menus": {
@@ -204,6 +211,11 @@
           "command": "markdown.showPreview",
           "when": "resourceLangId == markdown && !hasCustomMarkdownPreview",
           "group": "navigation"
+        },
+        {
+          "command": "markdown.findAllFileReferences",
+          "when": "resourceLangId == markdown",
+          "group": "4_search"
         }
       ],
       "editor/title/context": [
@@ -211,6 +223,10 @@
           "command": "markdown.showPreview",
           "when": "resourceLangId == markdown && !hasCustomMarkdownPreview",
           "group": "1_open"
+        },
+        {
+          "command": "markdown.findAllFileReferences",
+          "when": "resourceLangId == markdown"
         }
       ],
       "commandPalette": [
@@ -253,6 +269,10 @@
         {
           "command": "markdown.preview.refresh",
           "when": "markdownPreviewFocus"
+        },
+        {
+          "command": "markdown.findAllFileReferences",
+          "when": "editorLangId == markdown"
         }
       ]
     },
diff --git a/extensions/markdown-language-features/package.nls.json b/extensions/markdown-language-features/package.nls.json
index ba4d239f0e1..78927ee2a78 100644
--- a/extensions/markdown-language-features/package.nls.json
+++ b/extensions/markdown-language-features/package.nls.json
@@ -20,6 +20,7 @@
 	"markdown.trace.desc": "Enable debug logging for the Markdown extension.",
 	"markdown.preview.refresh.title": "Refresh Preview",
 	"markdown.preview.toggleLock.title": "Toggle Preview Locking",
+	"markdown.findAllFileReferences": "Find File References",
 	"configuration.markdown.preview.openMarkdownLinks.description": "Controls how links to other Markdown files in the Markdown preview should be opened.",
 	"configuration.markdown.preview.openMarkdownLinks.inEditor": "Try to open links in the editor.",
 	"configuration.markdown.preview.openMarkdownLinks.inPreview": "Try to open links in the Markdown preview.",
diff --git a/extensions/markdown-language-features/src/commandManager.ts b/extensions/markdown-language-features/src/commandManager.ts
index 359d5b9ca96..86609dbe2b2 100644
--- a/extensions/markdown-language-features/src/commandManager.ts
+++ b/extensions/markdown-language-features/src/commandManager.ts
@@ -21,9 +21,11 @@ export class CommandManager {
 		this.commands.clear();
 	}
 
-	public register<T extends Command>(command: T): T {
+	public register<T extends Command>(command: T): vscode.Disposable {
 		this.registerCommand(command.id, command.execute, command);
-		return command;
+		return new vscode.Disposable(() => {
+			this.commands.delete(command.id);
+		});
 	}
 
 	private registerCommand(id: string, impl: (...args: any[]) => void, thisArg?: any) {
@@ -33,4 +35,4 @@ export class CommandManager {
 
 		this.commands.set(id, vscode.commands.registerCommand(id, impl, thisArg));
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/markdown-language-features/src/extension.ts b/extensions/markdown-language-features/src/extension.ts
index eac0433c22b..e0c0477cce4 100644
--- a/extensions/markdown-language-features/src/extension.ts
+++ b/extensions/markdown-language-features/src/extension.ts
@@ -9,6 +9,7 @@ import * as commands from './commands/index';
 import { MdLinkProvider } from './languageFeatures/documentLinkProvider';
 import { MdDocumentSymbolProvider } from './languageFeatures/documentSymbolProvider';
 import { registerDropIntoEditor } from './languageFeatures/dropIntoEditor';
+import { registerFindFileReferences } from './languageFeatures/fileReferences';
 import { MdFoldingProvider } from './languageFeatures/foldingProvider';
 import { MdPathCompletionProvider } from './languageFeatures/pathCompletions';
 import { MdReferencesProvider } from './languageFeatures/references';
@@ -36,24 +37,24 @@ export function activate(context: vscode.ExtensionContext) {
 	const cspArbiter = new ExtensionContentSecurityPolicyArbiter(context.globalState, context.workspaceState);
 	const engine = new MarkdownEngine(contributions, githubSlugifier);
 	const logger = new Logger();
+	const commandManager = new CommandManager();
 
 	const contentProvider = new MarkdownContentProvider(engine, context, cspArbiter, contributions, logger);
 	const symbolProvider = new MdDocumentSymbolProvider(engine);
 	const previewManager = new MarkdownPreviewManager(contentProvider, logger, contributions, engine);
 	context.subscriptions.push(previewManager);
 
-	context.subscriptions.push(registerMarkdownLanguageFeatures(symbolProvider, engine));
-	context.subscriptions.push(registerMarkdownCommands(previewManager, telemetryReporter, cspArbiter, engine));
+	context.subscriptions.push(registerMarkdownLanguageFeatures(commandManager, symbolProvider, engine));
+	context.subscriptions.push(registerMarkdownCommands(commandManager, previewManager, telemetryReporter, cspArbiter, engine));
 
 	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(() => {
 		logger.updateConfiguration();
 		previewManager.updateConfiguration();
 	}));
-
-	context.subscriptions.push(registerDropIntoEditor());
 }
 
 function registerMarkdownLanguageFeatures(
+	commandManager: CommandManager,
 	symbolProvider: MdDocumentSymbolProvider,
 	engine: MarkdownEngine
 ): vscode.Disposable {
@@ -72,10 +73,13 @@ function registerMarkdownLanguageFeatures(
 		vscode.languages.registerReferenceProvider(selector, referencesProvider),
 		vscode.languages.registerRenameProvider(selector, new MdRenameProvider(referencesProvider, githubSlugifier)),
 		MdPathCompletionProvider.register(selector, engine, linkProvider),
+		registerDropIntoEditor(selector),
+		registerFindFileReferences(commandManager, referencesProvider),
 	);
 }
 
 function registerMarkdownCommands(
+	commandManager: CommandManager,
 	previewManager: MarkdownPreviewManager,
 	telemetryReporter: TelemetryReporter,
 	cspArbiter: ContentSecurityPolicyArbiter,
@@ -83,7 +87,6 @@ function registerMarkdownCommands(
 ): vscode.Disposable {
 	const previewSecuritySelector = new PreviewSecuritySelector(cspArbiter, previewManager);
 
-	const commandManager = new CommandManager();
 	commandManager.register(new commands.ShowPreviewCommand(previewManager, telemetryReporter));
 	commandManager.register(new commands.ShowPreviewToSideCommand(previewManager, telemetryReporter));
 	commandManager.register(new commands.ShowLockedPreviewToSideCommand(previewManager, telemetryReporter));
diff --git a/extensions/markdown-language-features/src/languageFeatures/documentLinkProvider.ts b/extensions/markdown-language-features/src/languageFeatures/documentLinkProvider.ts
index 4d474658591..2f5a63cafaf 100644
--- a/extensions/markdown-language-features/src/languageFeatures/documentLinkProvider.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/documentLinkProvider.ts
@@ -87,26 +87,25 @@ function getWorkspaceFolder(document: SkinnyTextDocument) {
 		|| vscode.workspace.workspaceFolders?.[0]?.uri;
 }
 
+interface MdLinkSource {
+	readonly text: string;
+	readonly resource: vscode.Uri;
+	readonly hrefRange: vscode.Range;
+}
+
 export interface MdInlineLink {
 	readonly kind: 'link';
-
+	readonly source: MdLinkSource;
 	readonly href: LinkHref;
-
-	readonly sourceText: string;
-	readonly sourceResource: vscode.Uri;
-	readonly sourceHrefRange: vscode.Range;
 }
 
 export interface MdLinkDefinition {
 	readonly kind: 'definition';
-
-	readonly sourceText: string;
-	readonly sourceResource: vscode.Uri;
-	readonly sourceHrefRange: vscode.Range;
-
-	readonly refRange: vscode.Range;
-
-	readonly ref: string;
+	readonly source: MdLinkSource;
+	readonly ref: {
+		readonly range: vscode.Range;
+		readonly text: string;
+	};
 	readonly href: ExternalHref | InternalHref;
 }
 
@@ -129,9 +128,11 @@ function extractDocumentLink(
 		return {
 			kind: 'link',
 			href: linkTarget,
-			sourceText: link,
-			sourceResource: document.uri,
-			sourceHrefRange: new vscode.Range(linkStart, linkEnd)
+			source: {
+				text: link,
+				resource: document.uri,
+				hrefRange: new vscode.Range(linkStart, linkEnd)
+			}
 		};
 	} catch {
 		return undefined;
@@ -192,8 +193,8 @@ async function findCode(document: SkinnyTextDocument, engine: MarkdownEngine): P
 }
 
 function isLinkInsideCode(code: CodeInDocument, link: MdLink) {
-	return code.multiline.some(interval => link.sourceHrefRange.start.line >= interval[0] && link.sourceHrefRange.start.line < interval[1]) ||
-		code.inline.some(position => position.intersection(link.sourceHrefRange));
+	return code.multiline.some(interval => link.source.hrefRange.start.line >= interval[0] && link.source.hrefRange.start.line < interval[1]) ||
+		code.inline.some(position => position.intersection(link.source.hrefRange));
 }
 
 export class MdLinkProvider implements vscode.DocumentLinkProvider {
@@ -219,11 +220,11 @@ export class MdLinkProvider implements vscode.DocumentLinkProvider {
 	private toValidDocumentLink(link: MdLink, definitionSet: LinkDefinitionSet): vscode.DocumentLink | undefined {
 		switch (link.href.kind) {
 			case 'external': {
-				return new vscode.DocumentLink(link.sourceHrefRange, link.href.uri);
+				return new vscode.DocumentLink(link.source.hrefRange, link.href.uri);
 			}
 			case 'internal': {
-				const uri = OpenDocumentLinkCommand.createCommandUri(link.sourceResource, link.href.path, link.href.fragment);
-				const documentLink = new vscode.DocumentLink(link.sourceHrefRange, uri);
+				const uri = OpenDocumentLinkCommand.createCommandUri(link.source.resource, link.href.path, link.href.fragment);
+				const documentLink = new vscode.DocumentLink(link.source.hrefRange, uri);
 				documentLink.tooltip = localize('documentLink.tooltip', 'Follow link');
 				return documentLink;
 			}
@@ -231,8 +232,8 @@ export class MdLinkProvider implements vscode.DocumentLinkProvider {
 				const def = definitionSet.lookup(link.href.ref);
 				if (def) {
 					return new vscode.DocumentLink(
-						link.sourceHrefRange,
-						vscode.Uri.parse(`command:_markdown.moveCursorToPosition?${encodeURIComponent(JSON.stringify([def.sourceHrefRange.start.line, def.sourceHrefRange.start.character]))}`));
+						link.source.hrefRange,
+						vscode.Uri.parse(`command:_markdown.moveCursorToPosition?${encodeURIComponent(JSON.stringify([def.source.hrefRange.start.line, def.source.hrefRange.start.character]))}`));
 				} else {
 					return undefined;
 				}
@@ -288,9 +289,11 @@ export class MdLinkProvider implements vscode.DocumentLinkProvider {
 
 			yield {
 				kind: 'link',
-				sourceText: reference,
-				sourceHrefRange: new vscode.Range(linkStart, linkEnd),
-				sourceResource: document.uri,
+				source: {
+					text: reference,
+					hrefRange: new vscode.Range(linkStart, linkEnd),
+					resource: document.uri,
+				},
 				href: {
 					kind: 'reference',
 					ref: reference,
@@ -318,11 +321,12 @@ export class MdLinkProvider implements vscode.DocumentLinkProvider {
 				if (target) {
 					yield {
 						kind: 'definition',
-						sourceText: link,
-						sourceResource: document.uri,
-						sourceHrefRange: new vscode.Range(linkStart, linkEnd),
-						refRange,
-						ref: reference,
+						source: {
+							text: link,
+							resource: document.uri,
+							hrefRange: new vscode.Range(linkStart, linkEnd),
+						},
+						ref: { text: reference, range: refRange },
 						href: target,
 					};
 				}
@@ -333,11 +337,12 @@ export class MdLinkProvider implements vscode.DocumentLinkProvider {
 				if (target) {
 					yield {
 						kind: 'definition',
-						sourceText: link,
-						sourceResource: document.uri,
-						sourceHrefRange: new vscode.Range(linkStart, linkEnd),
-						refRange,
-						ref: reference,
+						source: {
+							text: link,
+							resource: document.uri,
+							hrefRange: new vscode.Range(linkStart, linkEnd),
+						},
+						ref: { text: reference, range: refRange },
 						href: target,
 					};
 				}
@@ -352,7 +357,7 @@ export class LinkDefinitionSet {
 	constructor(links: Iterable<MdLink>) {
 		for (const link of links) {
 			if (link.kind === 'definition') {
-				this._map.set(link.ref, link);
+				this._map.set(link.ref.text, link);
 			}
 		}
 	}
diff --git a/extensions/markdown-language-features/src/languageFeatures/dropIntoEditor.ts b/extensions/markdown-language-features/src/languageFeatures/dropIntoEditor.ts
index dba36394bc0..14a2ace9db6 100644
--- a/extensions/markdown-language-features/src/languageFeatures/dropIntoEditor.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/dropIntoEditor.ts
@@ -7,12 +7,12 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import * as URI from 'vscode-uri';
 
-export function registerDropIntoEditor() {
-	return vscode.workspace.onWillDropOnTextEditor(e => {
-		e.waitUntil((async () => {
-			const urlList = await e.dataTransfer.get('text/uri-list')?.asString();
+export function registerDropIntoEditor(selector: vscode.DocumentSelector) {
+	return vscode.languages.registerDocumentOnDropProvider(selector, new class implements vscode.DocumentOnDropProvider {
+		async provideDocumentOnDropEdits(document: vscode.TextDocument, position: vscode.Position, dataTransfer: vscode.DataTransfer, _token: vscode.CancellationToken): Promise<vscode.SnippetTextEdit | undefined> {
+			const urlList = await dataTransfer.get('text/uri-list')?.asString();
 			if (!urlList) {
-				return;
+				return undefined;
 			}
 
 			const uris: vscode.Uri[] = [];
@@ -30,7 +30,7 @@ export function registerDropIntoEditor() {
 
 			const snippet = new vscode.SnippetString();
 			uris.forEach((uri, i) => {
-				const rel = path.relative(URI.Utils.dirname(e.editor.document.uri).fsPath, uri.fsPath);
+				const rel = path.relative(URI.Utils.dirname(document.uri).fsPath, uri.fsPath);
 
 				snippet.appendText('[');
 				snippet.appendTabstop();
@@ -41,7 +41,7 @@ export function registerDropIntoEditor() {
 				}
 			});
 
-			return e.editor.insertSnippet(snippet, e.position);
-		})());
+			return new vscode.SnippetTextEdit(new vscode.Range(position, position), snippet);
+		}
 	});
 }
diff --git a/extensions/markdown-language-features/src/languageFeatures/fileReferences.ts b/extensions/markdown-language-features/src/languageFeatures/fileReferences.ts
new file mode 100644
index 00000000000..b9f1321cf06
--- /dev/null
+++ b/extensions/markdown-language-features/src/languageFeatures/fileReferences.ts
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import * as nls from 'vscode-nls';
+import { Command, CommandManager } from '../commandManager';
+import { MdReferencesProvider } from './references';
+
+const localize = nls.loadMessageBundle();
+
+
+export class FindFileReferencesCommand implements Command {
+
+	public readonly id = 'markdown.findAllFileReferences';
+
+	constructor(
+		private readonly referencesProvider: MdReferencesProvider,
+	) { }
+
+	public async execute(resource?: vscode.Uri) {
+		if (!resource) {
+			resource = vscode.window.activeTextEditor?.document.uri;
+		}
+
+		if (!resource) {
+			vscode.window.showErrorMessage(localize('error.noResource', "Find file references failed. No resource provided."));
+			return;
+		}
+
+		await vscode.window.withProgress({
+			location: vscode.ProgressLocation.Window,
+			title: localize('progress.title', "Finding file references")
+		}, async (_progress, token) => {
+			const references = await this.referencesProvider.getAllReferencesToFile(resource!, token);
+			const locations = references.map(ref => ref.location);
+
+			const config = vscode.workspace.getConfiguration('references');
+			const existingSetting = config.inspect<string>('preferredLocation');
+
+			await config.update('preferredLocation', 'view');
+			try {
+				await vscode.commands.executeCommand('editor.action.showReferences', resource, new vscode.Position(0, 0), locations);
+			} finally {
+				await config.update('preferredLocation', existingSetting?.workspaceFolderValue ?? existingSetting?.workspaceValue);
+			}
+		});
+	}
+}
+
+export function registerFindFileReferences(commandManager: CommandManager, referencesProvider: MdReferencesProvider): vscode.Disposable {
+	return commandManager.register(new FindFileReferencesCommand(referencesProvider));
+}
diff --git a/extensions/markdown-language-features/src/languageFeatures/pathCompletions.ts b/extensions/markdown-language-features/src/languageFeatures/pathCompletions.ts
index aea8efa3386..612698acbc6 100644
--- a/extensions/markdown-language-features/src/languageFeatures/pathCompletions.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/pathCompletions.ts
@@ -240,7 +240,7 @@ export class MdPathCompletionProvider implements vscode.CompletionItemProvider {
 		for (const def of definitions) {
 			yield {
 				kind: vscode.CompletionItemKind.Reference,
-				label: def.ref,
+				label: def.ref.text,
 				range: {
 					inserting: insertionRange,
 					replacing: replacementRange,
diff --git a/extensions/markdown-language-features/src/languageFeatures/references.ts b/extensions/markdown-language-features/src/languageFeatures/references.ts
index c2d56f8e3fb..43f129922ec 100644
--- a/extensions/markdown-language-features/src/languageFeatures/references.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/references.ts
@@ -16,7 +16,7 @@ import { MdWorkspaceCache } from './workspaceCache';
 /**
  * A link in a markdown file.
  */
-interface MdLinkReference {
+export interface MdLinkReference {
 	readonly kind: 'link';
 	readonly isTriggerLocation: boolean;
 	readonly isDefinition: boolean;
@@ -30,7 +30,7 @@ interface MdLinkReference {
 /**
  * A header in a markdown file.
  */
-interface MdHeaderReference {
+export interface MdHeaderReference {
 	readonly kind: 'header';
 
 	readonly isTriggerLocation: boolean;
@@ -43,6 +43,13 @@ interface MdHeaderReference {
 	 */
 	readonly location: vscode.Location;
 
+	/**
+	 * The text of the header.
+	 *
+	 * In `# a b c #` this would be `a b c`
+	 */
+	readonly headerText: string;
+
 	/**
 	 * The range of the header text itself.
 	 *
@@ -55,12 +62,12 @@ export type MdReference = MdLinkReference | MdHeaderReference;
 
 
 function getFragmentLocation(link: MdLink): vscode.Location | undefined {
-	const index = link.sourceText.indexOf('#');
+	const index = link.source.text.indexOf('#');
 	if (index < 0) {
 		return undefined;
 	}
-	return new vscode.Location(link.sourceResource, link.sourceHrefRange.with({
-		start: link.sourceHrefRange.start.translate({ characterDelta: index + 1 }),
+	return new vscode.Location(link.source.resource, link.source.hrefRange.with({
+		start: link.source.hrefRange.start.translate({ characterDelta: index + 1 }),
 	}));
 }
 
@@ -80,14 +87,14 @@ export class MdReferencesProvider extends Disposable implements vscode.Reference
 	}
 
 	async provideReferences(document: SkinnyTextDocument, position: vscode.Position, context: vscode.ReferenceContext, token: vscode.CancellationToken): Promise<vscode.Location[] | undefined> {
-		const allRefs = await this.getAllReferences(document, position, token);
+		const allRefs = await this.getAllReferencesAtPosition(document, position, token);
 
 		return allRefs
 			.filter(ref => context.includeDeclaration || !ref.isDefinition)
 			.map(ref => ref.location);
 	}
 
-	public async getAllReferences(document: SkinnyTextDocument, position: vscode.Position, token: vscode.CancellationToken): Promise<MdReference[]> {
+	public async getAllReferencesAtPosition(document: SkinnyTextDocument, position: vscode.Position, token: vscode.CancellationToken): Promise<MdReference[]> {
 		const toc = await TableOfContents.create(this.engine, document);
 		if (token.isCancellationRequested) {
 			return [];
@@ -97,7 +104,7 @@ export class MdReferencesProvider extends Disposable implements vscode.Reference
 		if (header) {
 			return this.getReferencesToHeader(document, header);
 		} else {
-			return this.getReferencesToLinkAtPosition(document, position);
+			return this.getReferencesToLinkAtPosition(document, position, token);
 		}
 	}
 
@@ -111,12 +118,13 @@ export class MdReferencesProvider extends Disposable implements vscode.Reference
 			isTriggerLocation: true,
 			isDefinition: true,
 			location: header.headerLocation,
+			headerText: header.text,
 			headerTextLocation: header.headerTextLocation
 		});
 
 		for (const link of links) {
 			if (link.href.kind === 'internal'
-				&& this.looksLikeLinkToDoc(link.href, document)
+				&& this.looksLikeLinkToDoc(link.href, document.uri)
 				&& this.slugifier.fromHeading(link.href.fragment).value === header.slug.value
 			) {
 				references.push({
@@ -124,7 +132,7 @@ export class MdReferencesProvider extends Disposable implements vscode.Reference
 					isTriggerLocation: false,
 					isDefinition: false,
 					link,
-					location: new vscode.Location(link.sourceResource, link.sourceHrefRange),
+					location: new vscode.Location(link.source.resource, link.source.hrefRange),
 					fragmentLocation: getFragmentLocation(link),
 				});
 			}
@@ -133,20 +141,20 @@ export class MdReferencesProvider extends Disposable implements vscode.Reference
 		return references;
 	}
 
-	private async getReferencesToLinkAtPosition(document: SkinnyTextDocument, position: vscode.Position): Promise<MdReference[]> {
+	private async getReferencesToLinkAtPosition(document: SkinnyTextDocument, position: vscode.Position, token: vscode.CancellationToken): Promise<MdReference[]> {
 		const docLinks = await this.linkProvider.getAllLinks(document);
 
 		for (const link of docLinks) {
 			if (link.kind === 'definition') {
 				// We could be in either the ref name or the definition
-				if (link.refRange.contains(position)) {
-					return Array.from(this.getReferencesToLinkReference(docLinks, link.ref, { resource: document.uri, range: link.refRange }));
-				} else if (link.sourceHrefRange.contains(position)) {
-					return this.getReferencesToLink(link);
+				if (link.ref.range.contains(position)) {
+					return Array.from(this.getReferencesToLinkReference(docLinks, link.ref.text, { resource: document.uri, range: link.ref.range }));
+				} else if (link.source.hrefRange.contains(position)) {
+					return this.getReferencesToLink(link, token);
 				}
 			} else {
-				if (link.sourceHrefRange.contains(position)) {
-					return this.getReferencesToLink(link);
+				if (link.source.hrefRange.contains(position)) {
+					return this.getReferencesToLink(link, token);
 				}
 			}
 		}
@@ -154,11 +162,14 @@ export class MdReferencesProvider extends Disposable implements vscode.Reference
 		return [];
 	}
 
-	private async getReferencesToLink(sourceLink: MdLink): Promise<MdReference[]> {
+	private async getReferencesToLink(sourceLink: MdLink, token: vscode.CancellationToken): Promise<MdReference[]> {
 		const allLinksInWorkspace = (await this._linkCache.getAll()).flat();
+		if (token.isCancellationRequested) {
+			return [];
+		}
 
 		if (sourceLink.href.kind === 'reference') {
-			return Array.from(this.getReferencesToLinkReference(allLinksInWorkspace, sourceLink.href.ref, { resource: sourceLink.sourceResource, range: sourceLink.sourceHrefRange }));
+			return Array.from(this.getReferencesToLinkReference(allLinksInWorkspace, sourceLink.href.ref, { resource: sourceLink.source.resource, range: sourceLink.source.hrefRange }));
 		}
 
 		if (sourceLink.href.kind !== 'internal') {
@@ -174,7 +185,7 @@ export class MdReferencesProvider extends Disposable implements vscode.Reference
 			}
 		}
 
-		if (!targetDoc) {
+		if (!targetDoc || token.isCancellationRequested) {
 			return [];
 		}
 
@@ -189,77 +200,88 @@ export class MdReferencesProvider extends Disposable implements vscode.Reference
 					isTriggerLocation: false,
 					isDefinition: true,
 					location: entry.headerLocation,
+					headerText: entry.text,
 					headerTextLocation: entry.headerTextLocation
 				});
 			}
 		}
 
-		for (const link of allLinksInWorkspace) {
-			if (link.href.kind !== 'internal') {
-				continue;
-			}
+		if (sourceLink.href.fragment) {
+			for (const link of allLinksInWorkspace) {
+				if (link.href.kind !== 'internal' || !this.looksLikeLinkToDoc(link.href, targetDoc.uri)) {
+					continue;
+				}
 
-			if (!this.looksLikeLinkToDoc(link.href, targetDoc)) {
-				continue;
-			}
-
-			const isTriggerLocation = sourceLink.sourceResource.fsPath === link.sourceResource.fsPath && sourceLink.sourceHrefRange.isEqual(link.sourceHrefRange);
-
-			if (sourceLink.href.fragment) {
 				if (this.slugifier.fromHeading(link.href.fragment).equals(this.slugifier.fromHeading(sourceLink.href.fragment))) {
+					const isTriggerLocation = sourceLink.source.resource.fsPath === link.source.resource.fsPath && sourceLink.source.hrefRange.isEqual(link.source.hrefRange);
 					references.push({
 						kind: 'link',
 						isTriggerLocation,
 						isDefinition: false,
 						link,
-						location: new vscode.Location(link.sourceResource, link.sourceHrefRange),
-						fragmentLocation: getFragmentLocation(link),
-					});
-				}
-			} else { // Triggered on a link without a fragment so we only require matching the file and ignore fragments
-
-				// But exclude cases where the file is referencing itself
-				if (link.sourceResource.fsPath !== targetDoc.uri.fsPath) {
-					references.push({
-						kind: 'link',
-						isTriggerLocation,
-						isDefinition: false,
-						link,
-						location: new vscode.Location(link.sourceResource, link.sourceHrefRange),
+						location: new vscode.Location(link.source.resource, link.source.hrefRange),
 						fragmentLocation: getFragmentLocation(link),
 					});
 				}
 			}
+		} else { // Triggered on a link without a fragment so we only require matching the file and ignore fragments
+			references.push(...this.findAllLinksToFile(targetDoc.uri, allLinksInWorkspace, sourceLink));
 		}
 
 		return references;
 	}
 
-	private looksLikeLinkToDoc(href: InternalHref, targetDoc: SkinnyTextDocument) {
-		return href.path.fsPath === targetDoc.uri.fsPath
-			|| uri.Utils.extname(href.path) === '' && href.path.with({ path: href.path.path + '.md' }).fsPath === targetDoc.uri.fsPath;
+	private looksLikeLinkToDoc(href: InternalHref, targetDoc: vscode.Uri) {
+		return href.path.fsPath === targetDoc.fsPath
+			|| uri.Utils.extname(href.path) === '' && href.path.with({ path: href.path.path + '.md' }).fsPath === targetDoc.fsPath;
+	}
+
+	public async getAllReferencesToFile(resource: vscode.Uri, _token: vscode.CancellationToken): Promise<MdReference[]> {
+		const allLinksInWorkspace = (await this._linkCache.getAll()).flat();
+		return Array.from(this.findAllLinksToFile(resource, allLinksInWorkspace, undefined));
+	}
+
+	private *findAllLinksToFile(resource: vscode.Uri, allLinksInWorkspace: readonly MdLink[], sourceLink: MdLink | undefined): Iterable<MdReference> {
+		for (const link of allLinksInWorkspace) {
+			if (link.href.kind !== 'internal' || !this.looksLikeLinkToDoc(link.href, resource)) {
+				continue;
+			}
+
+			// Exclude cases where the file is implicitly referencing itself
+			if (!link.source.text.startsWith('#') || link.source.resource.fsPath !== resource.fsPath) {
+				const isTriggerLocation = !!sourceLink && sourceLink.source.resource.fsPath === link.source.resource.fsPath && sourceLink.source.hrefRange.isEqual(link.source.hrefRange);
+				yield {
+					kind: 'link',
+					isTriggerLocation,
+					isDefinition: false,
+					link,
+					location: new vscode.Location(link.source.resource, link.source.hrefRange),
+					fragmentLocation: getFragmentLocation(link),
+				};
+			}
+		}
 	}
 
 	private *getReferencesToLinkReference(allLinks: Iterable<MdLink>, refToFind: string, from: { resource: vscode.Uri; range: vscode.Range }): Iterable<MdReference> {
 		for (const link of allLinks) {
 			let ref: string;
 			if (link.kind === 'definition') {
-				ref = link.ref;
+				ref = link.ref.text;
 			} else if (link.href.kind === 'reference') {
 				ref = link.href.ref;
 			} else {
 				continue;
 			}
 
-			if (ref === refToFind && link.sourceResource.fsPath === from.resource.fsPath) {
-				const isTriggerLocation = from.resource.fsPath === link.sourceResource.fsPath && (
-					(link.href.kind === 'reference' && from.range.isEqual(link.sourceHrefRange)) || (link.kind === 'definition' && from.range.isEqual(link.refRange)));
+			if (ref === refToFind && link.source.resource.fsPath === from.resource.fsPath) {
+				const isTriggerLocation = from.resource.fsPath === link.source.resource.fsPath && (
+					(link.href.kind === 'reference' && from.range.isEqual(link.source.hrefRange)) || (link.kind === 'definition' && from.range.isEqual(link.ref.range)));
 				yield {
 					kind: 'link',
 					isTriggerLocation,
 					isDefinition: link.kind === 'definition',
 					link,
-					location: new vscode.Location(from.resource, link.sourceHrefRange),
+					location: new vscode.Location(from.resource, link.source.hrefRange),
 					fragmentLocation: getFragmentLocation(link),
 				};
 			}
diff --git a/extensions/markdown-language-features/src/languageFeatures/rename.ts b/extensions/markdown-language-features/src/languageFeatures/rename.ts
index 19478795e65..5e613db365f 100644
--- a/extensions/markdown-language-features/src/languageFeatures/rename.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/rename.ts
@@ -7,7 +7,7 @@ import * as nls from 'vscode-nls';
 import { Slugifier } from '../slugify';
 import { Disposable } from '../util/dispose';
 import { SkinnyTextDocument } from '../workspaceContents';
-import { MdReference, MdReferencesProvider } from './references';
+import { MdHeaderReference, MdReference, MdReferencesProvider } from './references';
 
 const localize = nls.loadMessageBundle();
 
@@ -18,6 +18,7 @@ export class MdRenameProvider extends Disposable implements vscode.RenameProvide
 		readonly resource: vscode.Uri;
 		readonly version: number;
 		readonly position: vscode.Position;
+		readonly triggerRef: MdReference;
 		readonly references: MdReference[];
 	} | undefined;
 
@@ -28,57 +29,60 @@ export class MdRenameProvider extends Disposable implements vscode.RenameProvide
 		super();
 	}
 
-	public async prepareRename(document: SkinnyTextDocument, position: vscode.Position, token: vscode.CancellationToken): Promise<undefined | vscode.Range> {
-		const references = await this.referencesProvider.getAllReferences(document, position, token);
+	public async prepareRename(document: SkinnyTextDocument, position: vscode.Position, token: vscode.CancellationToken): Promise<undefined | { readonly range: vscode.Range; readonly placeholder: string }> {
+		const allRefsInfo = await this.getAllReferences(document, position, token);
 		if (token.isCancellationRequested) {
 			return undefined;
 		}
 
-		if (!references?.length) {
+		if (!allRefsInfo || !allRefsInfo.references.length) {
 			throw new Error(localize('invalidRenameLocation', "Rename not supported at location"));
 		}
 
-		const triggerRef = references.find(ref => ref.isTriggerLocation);
-		if (!triggerRef) {
-			return undefined;
-		}
-
+		const triggerRef = allRefsInfo.triggerRef;
 		switch (triggerRef.kind) {
 			case 'header':
-				return triggerRef.headerTextLocation.range;
+				return { range: triggerRef.headerTextLocation.range, placeholder: triggerRef.headerText };
 
 			case 'link':
 				if (triggerRef.link.kind === 'definition') {
 					// We may have been triggered on the ref or the definition itself
-					if (triggerRef.link.refRange.contains(position)) {
-						return triggerRef.link.refRange;
-					} else {
-						return triggerRef.link.sourceHrefRange;
+					if (triggerRef.link.ref.range.contains(position)) {
+						return { range: triggerRef.link.ref.range, placeholder: triggerRef.link.ref.text };
 					}
-				} else {
-					return triggerRef.fragmentLocation?.range ?? triggerRef.location.range;
 				}
+
+				if (triggerRef.fragmentLocation) {
+					const declaration = this.findHeaderDeclaration(allRefsInfo.references);
+					if (declaration) {
+						return { range: triggerRef.fragmentLocation.range, placeholder: declaration.headerText };
+					}
+					return { range: triggerRef.fragmentLocation.range, placeholder: document.getText(triggerRef.fragmentLocation.range) };
+				}
+
+				throw new Error(localize('renameNoFiles', "Renaming files is currently not supported"));
 		}
 	}
 
+	private findHeaderDeclaration(references: readonly MdReference[]): MdHeaderReference | undefined {
+		return references.find(ref => ref.isDefinition && ref.kind === 'header') as MdHeaderReference | undefined;
+	}
+
 	public async provideRenameEdits(document: SkinnyTextDocument, position: vscode.Position, newName: string, token: vscode.CancellationToken): Promise<vscode.WorkspaceEdit | undefined> {
-		const references = await this.getAllReferences(document, position, token);
-		if (token.isCancellationRequested || !references?.length) {
+		const allRefsInfo = await this.getAllReferences(document, position, token);
+		if (token.isCancellationRequested || !allRefsInfo || !allRefsInfo.references.length) {
 			return undefined;
 		}
 
-		const triggerRef = references.find(ref => ref.isTriggerLocation);
-		if (!triggerRef) {
-			return undefined;
-		}
+		const triggerRef = allRefsInfo.triggerRef;
 
 		const isRefRename = triggerRef.kind === 'link' && (
-			(triggerRef.link.kind === 'definition' && triggerRef.link.refRange.contains(position)) || triggerRef.link.href.kind === 'reference'
+			(triggerRef.link.kind === 'definition' && triggerRef.link.ref.range.contains(position)) || triggerRef.link.href.kind === 'reference'
 		);
 		const slug = this.slugifier.fromHeading(newName).value;
 
 		const edit = new vscode.WorkspaceEdit();
-		for (const ref of references) {
+		for (const ref of allRefsInfo.references) {
 			switch (ref.kind) {
 				case 'header':
 					edit.replace(ref.location.uri, ref.headerTextLocation.range, newName);
@@ -88,13 +92,11 @@ export class MdRenameProvider extends Disposable implements vscode.RenameProvide
 					if (ref.link.kind === 'definition') {
 						// We may be renaming either the reference or the definition itself
 						if (isRefRename) {
-							edit.replace(ref.link.sourceResource, ref.link.refRange, newName);
-						} else {
-							edit.replace(ref.link.sourceResource, ref.fragmentLocation?.range ?? ref.link.sourceHrefRange, ref.fragmentLocation ? slug : newName);
+							edit.replace(ref.link.source.resource, ref.link.ref.range, newName);
+							continue;
 						}
-					} else {
-						edit.replace(ref.location.uri, ref.fragmentLocation?.range ?? ref.location.range, ref.link.href.kind === 'reference' ? newName : slug);
 					}
+					edit.replace(ref.link.source.resource, ref.fragmentLocation?.range ?? ref.location.range, isRefRename && !ref.fragmentLocation ? newName : slug);
 					break;
 			}
 		}
@@ -102,7 +104,7 @@ export class MdRenameProvider extends Disposable implements vscode.RenameProvide
 		return edit;
 	}
 
-	private async getAllReferences(document: SkinnyTextDocument, position: vscode.Position, token: vscode.CancellationToken) {
+	private async getAllReferences(document: SkinnyTextDocument, position: vscode.Position, token: vscode.CancellationToken): Promise<{ references: MdReference[]; triggerRef: MdReference } | undefined> {
 		const version = document.version;
 
 		if (this.cachedRefs
@@ -110,16 +112,22 @@ export class MdRenameProvider extends Disposable implements vscode.RenameProvide
 			&& this.cachedRefs.version === document.version
 			&& this.cachedRefs.position.isEqual(position)
 		) {
-			return this.cachedRefs.references;
+			return this.cachedRefs;
+		}
+
+		const references = await this.referencesProvider.getAllReferencesAtPosition(document, position, token);
+		const triggerRef = references.find(ref => ref.isTriggerLocation);
+		if (!triggerRef) {
+			return undefined;
 		}
 
-		const references = await this.referencesProvider.getAllReferences(document, position, token);
 		this.cachedRefs = {
 			resource: document.uri,
 			version,
 			position,
-			references
+			references,
+			triggerRef
 		};
-		return references;
+		return this.cachedRefs;
 	}
 }
diff --git a/extensions/markdown-language-features/src/test/fileReferences.test.ts b/extensions/markdown-language-features/src/test/fileReferences.test.ts
new file mode 100644
index 00000000000..b949f7e51bf
--- /dev/null
+++ b/extensions/markdown-language-features/src/test/fileReferences.test.ts
@@ -0,0 +1,118 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import 'mocha';
+import * as vscode from 'vscode';
+import { MdLinkProvider } from '../languageFeatures/documentLinkProvider';
+import { MdReference, MdReferencesProvider } from '../languageFeatures/references';
+import { githubSlugifier } from '../slugify';
+import { InMemoryDocument } from '../util/inMemoryDocument';
+import { MdWorkspaceContents } from '../workspaceContents';
+import { createNewMarkdownEngine } from './engine';
+import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
+import { joinLines, noopToken, workspacePath } from './util';
+
+
+function getFileReferences(resource: vscode.Uri, workspaceContents: MdWorkspaceContents) {
+	const engine = createNewMarkdownEngine();
+	const linkProvider = new MdLinkProvider(engine);
+	const provider = new MdReferencesProvider(linkProvider, workspaceContents, engine, githubSlugifier);
+	return provider.getAllReferencesToFile(resource, noopToken);
+}
+
+function assertReferencesEqual(actualRefs: readonly MdReference[], ...expectedRefs: { uri: vscode.Uri; line: number }[]) {
+	assert.strictEqual(actualRefs.length, expectedRefs.length, `Reference counts should match`);
+
+	for (let i = 0; i < actualRefs.length; ++i) {
+		const actual = actualRefs[i].location;
+		const expected = expectedRefs[i];
+		assert.strictEqual(actual.uri.toString(), expected.uri.toString(), `Ref '${i}' has expected document`);
+		assert.strictEqual(actual.range.start.line, expected.line, `Ref '${i}' has expected start line`);
+		assert.strictEqual(actual.range.end.line, expected.line, `Ref '${i}' has expected end line`);
+	}
+}
+
+suite('markdown: find file references', () => {
+
+	test('Should find basic references', async () => {
+		const docUri = workspacePath('doc.md');
+		const otherUri = workspacePath('other.md');
+
+		const refs = await getFileReferences(otherUri, new InMemoryWorkspaceMarkdownDocuments([
+			new InMemoryDocument(docUri, joinLines(
+				`# header`,
+				`[link 1](./other.md)`,
+				`[link 2](./other.md)`,
+			)),
+			new InMemoryDocument(otherUri, joinLines(
+				`# header`,
+				`pre`,
+				`[link 3](./other.md)`,
+				`post`,
+			)),
+		]));
+
+		assertReferencesEqual(refs!,
+			{ uri: docUri, line: 1 },
+			{ uri: docUri, line: 2 },
+			{ uri: otherUri, line: 2 },
+		);
+	});
+
+	test('Should find references with and without file extensions', async () => {
+		const docUri = workspacePath('doc.md');
+		const otherUri = workspacePath('other.md');
+
+		const refs = await getFileReferences(otherUri, new InMemoryWorkspaceMarkdownDocuments([
+			new InMemoryDocument(docUri, joinLines(
+				`# header`,
+				`[link 1](./other.md)`,
+				`[link 2](./other)`,
+			)),
+			new InMemoryDocument(otherUri, joinLines(
+				`# header`,
+				`pre`,
+				`[link 3](./other.md)`,
+				`[link 4](./other)`,
+				`post`,
+			)),
+		]));
+
+		assertReferencesEqual(refs!,
+			{ uri: docUri, line: 1 },
+			{ uri: docUri, line: 2 },
+			{ uri: otherUri, line: 2 },
+			{ uri: otherUri, line: 3 },
+		);
+	});
+
+	test('Should find references with headers on links', async () => {
+		const docUri = workspacePath('doc.md');
+		const otherUri = workspacePath('other.md');
+
+		const refs = await getFileReferences(otherUri, new InMemoryWorkspaceMarkdownDocuments([
+			new InMemoryDocument(docUri, joinLines(
+				`# header`,
+				`[link 1](./other.md#sub-bla)`,
+				`[link 2](./other#sub-bla)`,
+			)),
+			new InMemoryDocument(otherUri, joinLines(
+				`# header`,
+				`pre`,
+				`[link 3](./other.md#sub-bla)`,
+				`[link 4](./other#sub-bla)`,
+				`post`,
+			)),
+		]));
+
+		assertReferencesEqual(refs!,
+			{ uri: docUri, line: 1 },
+			{ uri: docUri, line: 2 },
+			{ uri: otherUri, line: 2 },
+			{ uri: otherUri, line: 3 },
+		);
+	});
+});
diff --git a/extensions/markdown-language-features/src/test/references.test.ts b/extensions/markdown-language-features/src/test/references.test.ts
index 4b7f9532cec..319fcec7817 100644
--- a/extensions/markdown-language-features/src/test/references.test.ts
+++ b/extensions/markdown-language-features/src/test/references.test.ts
@@ -312,7 +312,7 @@ suite('markdown: find all references', () => {
 		const otherUri = workspacePath('sub', 'other.md');
 
 		const doc = new InMemoryDocument(docUri, joinLines(
-			`[other](./sub/other)`,
+			`[other](./sub/other)`, // trigger here
 		));
 
 		const refs = await getReferences(doc, new vscode.Position(0, 15), new InMemoryWorkspaceMarkdownDocuments([
@@ -328,6 +328,22 @@ suite('markdown: find all references', () => {
 		);
 	});
 
+	test('Should find explicit references to own file ', async () => {
+		const uri = workspacePath('doc.md');
+		const doc = new InMemoryDocument(uri, joinLines(
+			`[bare](doc.md)`, // trigger here
+			`[rel](./doc.md)`,
+			`[abs](/doc.md)`,
+		));
+
+		const refs = await getReferences(doc, new vscode.Position(0, 12), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		assertReferencesEqual(refs!,
+			{ uri, line: 0 },
+			{ uri, line: 1 },
+			{ uri, line: 2 },
+		);
+	});
+
 	suite('Reference links', () => {
 		test('Should find reference links within file from link', async () => {
 			const docUri = workspacePath('doc.md');
diff --git a/extensions/markdown-language-features/src/test/rename.test.ts b/extensions/markdown-language-features/src/test/rename.test.ts
index e22453f3e02..cc3ad0617a9 100644
--- a/extensions/markdown-language-features/src/test/rename.test.ts
+++ b/extensions/markdown-language-features/src/test/rename.test.ts
@@ -18,9 +18,9 @@ import { assertRangeEqual, joinLines, noopToken, workspacePath } from './util';
 
 
 /**
- * Get the range that the rename should happen on.
+ * Get prepare rename info.
  */
-function getRenameRange(doc: InMemoryDocument, pos: vscode.Position, workspaceContents: MdWorkspaceContents) {
+function prepareRename(doc: InMemoryDocument, pos: vscode.Position, workspaceContents: MdWorkspaceContents): Promise<undefined | { readonly range: vscode.Range; readonly placeholder: string }> {
 	const engine = createNewMarkdownEngine();
 	const linkProvider = new MdLinkProvider(engine);
 	const referencesProvider = new MdReferencesProvider(linkProvider, workspaceContents, engine, githubSlugifier);
@@ -72,8 +72,8 @@ suite('markdown: rename', () => {
 			`# abc`
 		));
 
-		const range = await getRenameRange(doc, new vscode.Position(0, 0), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertRangeEqual(range!, new vscode.Range(0, 2, 0, 5));
+		const info = await prepareRename(doc, new vscode.Position(0, 0), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		assertRangeEqual(info!.range, new vscode.Range(0, 2, 0, 5));
 
 		const edit = await getRenameEdits(doc, new vscode.Position(0, 0), "New Header", new InMemoryWorkspaceMarkdownDocuments([doc]));
 		assertEditsEqual(edit!, {
@@ -89,8 +89,8 @@ suite('markdown: rename', () => {
 			`### abc ###`
 		));
 
-		const range = await getRenameRange(doc, new vscode.Position(0, 0), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertRangeEqual(range!, new vscode.Range(0, 4, 0, 7));
+		const info = await prepareRename(doc, new vscode.Position(0, 0), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		assertRangeEqual(info!.range, new vscode.Range(0, 4, 0, 7));
 
 		const edit = await getRenameEdits(doc, new vscode.Position(0, 0), "New Header", new InMemoryWorkspaceMarkdownDocuments([doc]));
 		assertEditsEqual(edit!, {
@@ -208,7 +208,53 @@ suite('markdown: rename', () => {
 		});
 	});
 
-	test('Rename on ref should rename refs and def', async () => {
+	test('Rename on link in other file should pick up all refs', async () => {
+		const uri = workspacePath('doc.md');
+		const otherUri = workspacePath('other.md');
+		const doc = new InMemoryDocument(uri, joinLines(
+			`### A b C`,
+			`[text](#a-b-c)`,
+		));
+
+		const otherDoc = new InMemoryDocument(otherUri, joinLines(
+			`[text](#a-b-c)`,
+			`[text](./doc.md#a-b-c)`,
+			`[text](./doc#a-b-c)`
+		));
+
+		const expectedEdits = [
+			{
+				uri: uri, edits: [
+					new vscode.TextEdit(new vscode.Range(0, 4, 0, 9), 'New Header'),
+					new vscode.TextEdit(new vscode.Range(1, 8, 1, 13), 'new-header'),
+				]
+			}, {
+				uri: otherUri, edits: [
+					new vscode.TextEdit(new vscode.Range(1, 16, 1, 21), 'new-header'),
+					new vscode.TextEdit(new vscode.Range(2, 13, 2, 18), 'new-header'),
+				]
+			}
+		];
+
+		{
+			// Rename on header with file extension
+			const edit = await getRenameEdits(otherDoc, new vscode.Position(1, 17), "New Header", new InMemoryWorkspaceMarkdownDocuments([
+				doc,
+				otherDoc
+			]));
+			assertEditsEqual(edit!, ...expectedEdits);
+		}
+		{
+			// Rename on header without extension
+			const edit = await getRenameEdits(otherDoc, new vscode.Position(2, 15), "New Header", new InMemoryWorkspaceMarkdownDocuments([
+				doc,
+				otherDoc
+			]));
+			assertEditsEqual(edit!, ...expectedEdits);
+		}
+	});
+
+	test('Rename on reference should rename references and definition', async () => {
 		const uri = workspacePath('doc.md');
 		const doc = new InMemoryDocument(uri, joinLines(
 			`[text][ref]`, // rename here
@@ -227,7 +273,7 @@ suite('markdown: rename', () => {
 		});
 	});
 
-	test('Rename on def should rename refs and def', async () => {
+	test('Rename on definition should rename references and definitions', async () => {
 		const uri = workspacePath('doc.md');
 		const doc = new InMemoryDocument(uri, joinLines(
 			`[text][ref]`,
@@ -246,6 +292,28 @@ suite('markdown: rename', () => {
 		});
 	});
 
+	test('Rename on definition entry should rename header and references', async () => {
+		const uri = workspacePath('doc.md');
+		const doc = new InMemoryDocument(uri, joinLines(
+			`# a B c`,
+			`[ref text][ref]`,
+			`[direct](#a-b-c)`,
+			`[ref]: #a-b-c`, // rename here
+		));
+
+		const preparedInfo = await prepareRename(doc, new vscode.Position(3, 10), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		assert.strictEqual(preparedInfo!.placeholder, 'a B c');
+		assertRangeEqual(preparedInfo!.range, new vscode.Range(3, 8, 3, 13));
+
+		const edit = await getRenameEdits(doc, new vscode.Position(3, 10), "x Y z", new InMemoryWorkspaceMarkdownDocuments([doc]));
+		assertEditsEqual(edit!, {
+			uri, edits: [
+				new vscode.TextEdit(new vscode.Range(0, 2, 0, 7), 'x Y z'),
+				new vscode.TextEdit(new vscode.Range(2, 10, 2, 15), 'x-y-z'),
+				new vscode.TextEdit(new vscode.Range(3, 8, 3, 13), 'x-y-z'),
+			]
+		});
+	});
 
 	test('Rename should not be supported on link text', async () => {
 		const uri = workspacePath('doc.md');
@@ -254,6 +322,38 @@ suite('markdown: rename', () => {
 			`[text](#header)`,
 		));
 
-		await assert.rejects(getRenameRange(doc, new vscode.Position(1, 2), new InMemoryWorkspaceMarkdownDocuments([doc])));
+		await assert.rejects(prepareRename(doc, new vscode.Position(1, 2), new InMemoryWorkspaceMarkdownDocuments([doc])));
+	});
+
+	test('Rename should not be supported on bare file link', async () => {
+		const uri = workspacePath('doc.md');
+		const doc = new InMemoryDocument(uri, joinLines(
+			`[text](./doc.md)`,
+			`[other](./doc.md)`,
+		));
+
+		await assert.rejects(prepareRename(doc, new vscode.Position(0, 10), new InMemoryWorkspaceMarkdownDocuments([doc])));
+	});
+
+	test('Rename should not be supported on bare file link in definition', async () => {
+		const uri = workspacePath('doc.md');
+		const doc = new InMemoryDocument(uri, joinLines(
+			`[text](./doc.md)`,
+			`[ref]: ./doc.md`,
+		));
+
+		await assert.rejects(prepareRename(doc, new vscode.Position(1, 10), new InMemoryWorkspaceMarkdownDocuments([doc])));
+	});
+
+	test('Rename on link should use header text as placeholder', async () => {
+		const uri = workspacePath('doc.md');
+		const doc = new InMemoryDocument(uri, joinLines(
+			`### a B c ###`,
+			`[text](#a-b-c)`,
+		));
+
+		const info = await prepareRename(doc, new vscode.Position(1, 10), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		assert.strictEqual(info!.placeholder, 'a B c');
+		assertRangeEqual(info!.range, new vscode.Range(1, 8, 1, 13));
 	});
 });
diff --git a/extensions/markdown-language-features/src/workspaceContents.ts b/extensions/markdown-language-features/src/workspaceContents.ts
index 43d9b9128f6..14609d29b5f 100644
--- a/extensions/markdown-language-features/src/workspaceContents.ts
+++ b/extensions/markdown-language-features/src/workspaceContents.ts
@@ -24,7 +24,7 @@ export interface SkinnyTextDocument {
 	readonly version: number;
 	readonly lineCount: number;
 
-	getText(): string;
+	getText(range?: vscode.Range): string;
 	lineAt(line: number): SkinnyTextLine;
 	positionAt(offset: number): vscode.Position;
 }
diff --git a/extensions/typescript-basics/snippets/typescript.code-snippets b/extensions/typescript-basics/snippets/typescript.code-snippets
index 49ebefbac9a..0162ef50975 100644
--- a/extensions/typescript-basics/snippets/typescript.code-snippets
+++ b/extensions/typescript-basics/snippets/typescript.code-snippets
@@ -44,12 +44,12 @@
 		],
 		"description": "Private Method Definition"
 	},
-	"Import external module.": {
-		"prefix": "import statement",
+	"Import Statement": {
+		"prefix": "import",
 		"body": [
 			"import { $0 } from \"${1:module}\";"
 		],
-		"description": "Import external module."
+		"description": "Import external module"
 	},
 	"Property getter": {
 		"prefix": "get",
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/commands.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/commands.test.ts
index dc839863d67..b241b7170ec 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/commands.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/commands.test.ts
@@ -112,15 +112,15 @@ suite('vscode API - commands', () => {
 
 		await commands.executeCommand('vscode.open', uri);
 		assert.strictEqual(window.activeTextEditor?.viewColumn, ViewColumn.One);
-		assert.strictEqual(window.tabGroups.groups[0].activeTab?.group.viewColumn, ViewColumn.One);
+		assert.strictEqual(window.tabGroups.all[0].activeTab?.group.viewColumn, ViewColumn.One);
 
 		await commands.executeCommand('vscode.open', uri, ViewColumn.Two);
 		assert.strictEqual(window.activeTextEditor?.viewColumn, ViewColumn.Two);
-		assert.strictEqual(window.tabGroups.groups[1].activeTab?.group.viewColumn, ViewColumn.Two);
+		assert.strictEqual(window.tabGroups.all[1].activeTab?.group.viewColumn, ViewColumn.Two);
 
 		await commands.executeCommand('vscode.open', uri, ViewColumn.One);
 		assert.strictEqual(window.activeTextEditor?.viewColumn, ViewColumn.One);
-		assert.strictEqual(window.tabGroups.groups[0].activeTab?.group.viewColumn, ViewColumn.One);
+		assert.strictEqual(window.tabGroups.all[0].activeTab?.group.viewColumn, ViewColumn.One);
 
 		let e1: Error | undefined = undefined;
 		try {
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.editor.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.editor.test.ts
index 0b62d4e0549..eeffb282f91 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.editor.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.editor.test.ts
@@ -107,8 +107,8 @@ import * as utils from '../utils';
 		assert.strictEqual(editor.document.uri.toString(), resource.toString());
 	});
 
-	test.skip('Active/Visible Editor', async function () { // TODO@rebornix https://github.com/microsoft/vscode/issues/139078
-		const firstEditorOpen = utils.asPromise(vscode.window.onDidChangeActiveNotebookEditor);
+	test('Active/Visible Editor', async function () {
+		const firstEditorOpen = onDidOpenNotebookEditor();
 		const resource = await utils.createRandomFile(undefined, undefined, '.nbdtest');
 		const firstEditor = await vscode.window.showNotebookDocument(resource);
 		await firstEditorOpen;
@@ -116,14 +116,16 @@ import * as utils from '../utils';
 		assert.strictEqual(vscode.window.visibleNotebookEditors.includes(firstEditor), true);
 
 		const secondEditor = await vscode.window.showNotebookDocument(resource, { viewColumn: vscode.ViewColumn.Beside });
-		assert.strictEqual(secondEditor === vscode.window.activeNotebookEditor, true);
+		// There is no guarantee that when `showNotebookDocument` resolves, the active notebook editor is already updated correctly.
+		// assert.strictEqual(secondEditor === vscode.window.activeNotebookEditor, true);
 		assert.notStrictEqual(firstEditor, secondEditor);
 		assert.strictEqual(vscode.window.visibleNotebookEditors.includes(secondEditor), true);
 		assert.strictEqual(vscode.window.visibleNotebookEditors.includes(firstEditor), true);
 		assert.strictEqual(vscode.window.visibleNotebookEditors.length, 2);
+		await utils.closeAllEditors();
 	});
 
-	test.skip('Notebook Editor Event - onDidChangeVisibleNotebookEditors on open/close', async function () { // TODO@rebornix https://github.com/microsoft/vscode/issues/139958
+	test('Notebook Editor Event - onDidChangeVisibleNotebookEditors on open/close', async function () {
 		const openedEditor = utils.asPromise(vscode.window.onDidChangeVisibleNotebookEditors);
 		const resource = await utils.createRandomFile(undefined, undefined, '.nbdtest');
 		await vscode.window.showNotebookDocument(resource);
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
index 299f7c7287c..463c78c40bb 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
@@ -383,12 +383,12 @@ suite('vscode API - window', () => {
 		await window.showTextDocument(docC, { viewColumn: ViewColumn.Two, preview: false });
 
 		const tabGroups = window.tabGroups;
-		assert.strictEqual(tabGroups.groups.length, 2);
+		assert.strictEqual(tabGroups.all.length, 2);
 
-		const group1Tabs = tabGroups.groups[0].tabs;
+		const group1Tabs = tabGroups.all[0].tabs;
 		assert.strictEqual(group1Tabs.length, 2);
 
-		const group2Tabs = tabGroups.groups[1].tabs;
+		const group2Tabs = tabGroups.all[1].tabs;
 		assert.strictEqual(group2Tabs.length, 1);
 
 		await tabGroups.move(group1Tabs[0], ViewColumn.One, 1);
@@ -398,7 +398,7 @@ suite('vscode API - window', () => {
 	test('Tabs - vscode.open & vscode.diff', async function () {
 		// Simple function to get the active tab
 		const getActiveTab = () => {
-			return window.tabGroups.groups.find(g => g.isActive)?.activeTab;
+			return window.tabGroups.all.find(g => g.isActive)?.activeTab;
 		};
 
 		const [docA, docB, docC] = await Promise.all([
@@ -421,7 +421,7 @@ suite('vscode API - window', () => {
 		await commands.executeCommand('vscode.diff', leftDiff, rightDiff, 'Diff', { viewColumn: ViewColumn.Four, preview: false });
 		assert.strictEqual(getActiveTab()?.group.viewColumn, ViewColumn.Four);
 
-		const tabs = window.tabGroups.groups.map(g => g.tabs).flat(1);
+		const tabs = window.tabGroups.all.map(g => g.tabs).flat(1);
 		assert.strictEqual(tabs.length, 5);
 		assert.ok(tabs[0].kind instanceof TabKindText);
 		assert.strictEqual(tabs[0].kind.uri.toString(), docA.uri.toString());
@@ -455,7 +455,7 @@ suite('vscode API - window', () => {
 		const rightDiff = await createRandomFile();
 		await commands.executeCommand('vscode.diff', leftDiff, rightDiff, 'Diff', { viewColumn: ViewColumn.Three, preview: false });
 
-		const tabs = window.tabGroups.groups.map(g => g.tabs).flat(1);
+		const tabs = window.tabGroups.all.map(g => g.tabs).flat(1);
 		assert.strictEqual(tabs.length, 5);
 
 		// All resources should match the text documents as they're the only tabs currently open
@@ -488,7 +488,7 @@ suite('vscode API - window', () => {
 
 		// Function to acquire the active tab within the active group
 		const getActiveTabInActiveGroup = () => {
-			const activeGroup = window.tabGroups.groups.filter(group => group.isActive)[0];
+			const activeGroup = window.tabGroups.all.filter(group => group.isActive)[0];
 			return activeGroup?.activeTab;
 		};
 
diff --git a/package.json b/package.json
index a6ef958814f..d64caa828e2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.67.0",
-  "distro": "7ee3b198b317d29648533b3713783234658d7968",
+  "distro": "cd09b5b6e923bac5a9d1a9db408c7e21f864e9ea",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -84,18 +84,18 @@
     "vscode-proxy-agent": "^0.12.0",
     "vscode-regexpp": "^3.1.0",
     "vscode-textmate": "6.0.0",
-    "xterm": "4.19.0-beta.17",
-    "xterm-addon-search": "0.9.0-beta.17",
-    "xterm-addon-serialize": "0.7.0-beta.11",
+    "xterm": "4.19.0-beta.20",
+    "xterm-addon-search": "0.9.0-beta.18",
+    "xterm-addon-serialize": "0.7.0-beta.12",
     "xterm-addon-unicode11": "0.4.0-beta.3",
-    "xterm-addon-webgl": "0.12.0-beta.25",
-    "xterm-headless": "4.19.0-beta.17",
+    "xterm-addon-webgl": "0.12.0-beta.27",
+    "xterm-headless": "4.19.0-beta.20",
     "yauzl": "^2.9.2",
     "yazl": "^2.4.3"
   },
   "devDependencies": {
     "7zip": "0.0.6",
-    "@playwright/test": "1.18.0",
+    "@playwright/test": "1.20.2",
     "@types/applicationinsights": "0.20.0",
     "@types/cookie": "^0.3.3",
     "@types/copy-webpack-plugin": "^6.0.3",
@@ -123,7 +123,7 @@
     "@types/yazl": "^2.4.2",
     "@typescript-eslint/eslint-plugin": "^5.10.0",
     "@typescript-eslint/parser": "^5.10.0",
-    "@vscode/telemetry-extractor": "^1.9.5",
+    "@vscode/telemetry-extractor": "^1.9.6",
     "@vscode/test-web": "^0.0.22",
     "ansi-colors": "^3.2.3",
     "asar": "^3.0.3",
@@ -135,7 +135,7 @@
     "cssnano": "^4.1.11",
     "debounce": "^1.0.0",
     "deemon": "^1.4.0",
-    "electron": "17.3.0",
+    "electron": "17.3.1",
     "eslint": "8.7.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-jsdoc": "^19.1.0",
diff --git a/product.json b/product.json
index 234b38250d6..ac6b2de18ac 100644
--- a/product.json
+++ b/product.json
@@ -31,7 +31,7 @@
 	"builtInExtensions": [
 		{
 			"name": "ms-vscode.references-view",
-			"version": "0.0.86",
+			"version": "0.0.89",
 			"repo": "https://github.com/microsoft/vscode-references-view",
 			"metadata": {
 				"id": "dc489f46-520d-4556-ae85-1f9eab3c412d",
diff --git a/remote/package.json b/remote/package.json
index 3ac3c183714..203c90916b6 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -24,12 +24,12 @@
     "vscode-proxy-agent": "^0.12.0",
     "vscode-regexpp": "^3.1.0",
     "vscode-textmate": "6.0.0",
-    "xterm": "4.19.0-beta.17",
-    "xterm-addon-search": "0.9.0-beta.17",
-    "xterm-addon-serialize": "0.7.0-beta.11",
+    "xterm": "4.19.0-beta.20",
+    "xterm-addon-search": "0.9.0-beta.18",
+    "xterm-addon-serialize": "0.7.0-beta.12",
     "xterm-addon-unicode11": "0.4.0-beta.3",
-    "xterm-addon-webgl": "0.12.0-beta.25",
-    "xterm-headless": "4.19.0-beta.17",
+    "xterm-addon-webgl": "0.12.0-beta.27",
+    "xterm-headless": "4.19.0-beta.20",
     "yauzl": "^2.9.2",
     "yazl": "^2.4.3"
   },
diff --git a/remote/web/package.json b/remote/web/package.json
index fb333057023..1d3e920919e 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -10,9 +10,9 @@
 		"tas-client-umd": "0.1.4",
 		"vscode-oniguruma": "1.6.1",
 		"vscode-textmate": "6.0.0",
-		"xterm": "4.19.0-beta.17",
-		"xterm-addon-search": "0.9.0-beta.17",
+		"xterm": "4.19.0-beta.20",
+		"xterm-addon-search": "0.9.0-beta.18",
 		"xterm-addon-unicode11": "0.4.0-beta.3",
-		"xterm-addon-webgl": "0.12.0-beta.25"
+		"xterm-addon-webgl": "0.12.0-beta.27"
 	}
 }
diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock
index 1185ff5dc1b..0fbfec54b2c 100644
--- a/remote/web/yarn.lock
+++ b/remote/web/yarn.lock
@@ -113,22 +113,22 @@ vscode-textmate@6.0.0:
   resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-6.0.0.tgz#a3777197235036814ac9a92451492f2748589210"
   integrity sha512-gu73tuZfJgu+mvCSy4UZwd2JXykjK9zAZsfmDeut5dx/1a7FeTk0XwJsSuqQn+cuMCGVbIBfl+s53X4T19DnzQ==
 
-xterm-addon-search@0.9.0-beta.17:
-  version "0.9.0-beta.17"
-  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.9.0-beta.17.tgz#4cd575fd67a010af3d0b224092527747bb87c219"
-  integrity sha512-/Q6xQ/HunP2BxJU4NTsLX9aH376tsT9dpcS+NFBDVbwB1iPF02JhedHmA4mxY3KGNyQflefhwyGGMKZfTau2iA==
+xterm-addon-search@0.9.0-beta.18:
+  version "0.9.0-beta.18"
+  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.9.0-beta.18.tgz#5317aed1dc747f468ccb7ecd151fb00d82a8a19d"
+  integrity sha512-SAeA3thc2WJNYXwjOEJFLpZ1ZVOs22RLmz9a6WcrzXkvCjLZRvbRGwX25Ms+Dd7dVDQNbKVUzUJohspP/vYr0Q==
 
 xterm-addon-unicode11@0.4.0-beta.3:
   version "0.4.0-beta.3"
   resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.3.tgz#f350184155fafd5ad0d6fbf31d13e6ca7dea1efa"
   integrity sha512-FryZAVwbUjKTmwXnm1trch/2XO60F5JsDvOkZhzobV1hm10sFLVuZpFyHXiUx7TFeeFsvNP+S77LAtWoeT5z+Q==
 
-xterm-addon-webgl@0.12.0-beta.25:
-  version "0.12.0-beta.25"
-  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.25.tgz#67fd222d245c4bf749b2abdf0acec640fb575bcd"
-  integrity sha512-QK0r6hi+plkMtHZrOlUO/IcDa9mnYxOKrqrmzbjxT6cuhXJf2EiWpBBY6Rkk0cVXtDOlkGO1b7hWvD3qeWeWvQ==
+xterm-addon-webgl@0.12.0-beta.27:
+  version "0.12.0-beta.27"
+  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.27.tgz#afc5bc01d1ef3af9005fb9f6325a4db9c92aa8d9"
+  integrity sha512-P948trotU8FMHtaA7C2x97VpLq6QLSjO53kWNvONS0/XwEKQBIYCI7Jfri2wcLgfQg6Cn4OQGLoj2YBK3MMyww==
 
-xterm@4.19.0-beta.17:
-  version "4.19.0-beta.17"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.19.0-beta.17.tgz#79b177eedd3bc835e1951f38318b5c0c04039896"
-  integrity sha512-NvfGJLfZa0SHGR6WttNfugRYizM20gVbWM/nVJAlyHruMZ/rfJj29MuPERJAZTNHtRnYplhAP8bSc3r7/2l+dg==
+xterm@4.19.0-beta.20:
+  version "4.19.0-beta.20"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.19.0-beta.20.tgz#d8e970d8a8460c1d1a5ec9866f78f607a44c1349"
+  integrity sha512-IYI4ngSWzpV4sJXLWGEDF7vgLuUHn0CUQ42+TGv4H/hCGo4uru4s/D3Yws0ETb3a9VwRpZEPsigULaWTnhFusg==
diff --git a/remote/yarn.lock b/remote/yarn.lock
index 2d50c3bc983..381610e5a8d 100644
--- a/remote/yarn.lock
+++ b/remote/yarn.lock
@@ -914,35 +914,35 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-xterm-addon-search@0.9.0-beta.17:
-  version "0.9.0-beta.17"
-  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.9.0-beta.17.tgz#4cd575fd67a010af3d0b224092527747bb87c219"
-  integrity sha512-/Q6xQ/HunP2BxJU4NTsLX9aH376tsT9dpcS+NFBDVbwB1iPF02JhedHmA4mxY3KGNyQflefhwyGGMKZfTau2iA==
+xterm-addon-search@0.9.0-beta.18:
+  version "0.9.0-beta.18"
+  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.9.0-beta.18.tgz#5317aed1dc747f468ccb7ecd151fb00d82a8a19d"
+  integrity sha512-SAeA3thc2WJNYXwjOEJFLpZ1ZVOs22RLmz9a6WcrzXkvCjLZRvbRGwX25Ms+Dd7dVDQNbKVUzUJohspP/vYr0Q==
 
-xterm-addon-serialize@0.7.0-beta.11:
-  version "0.7.0-beta.11"
-  resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.7.0-beta.11.tgz#d9d6a862b3d70fc6160e39bc235a2a9ef45e20d6"
-  integrity sha512-okirLeH8VpOxlnZkER2lN0emaTgWe/DHVGpY9ByfLIoYw506Ci2LRcOjyYwJBRTJcfLp3TGnwQSYfooCZHDndw==
+xterm-addon-serialize@0.7.0-beta.12:
+  version "0.7.0-beta.12"
+  resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.7.0-beta.12.tgz#4f845d8b1a9f9b7ae3f910455ce8c58b041babc7"
+  integrity sha512-b4Ug0B/RSJMux+KAcp+PXVqubVyXjN1yCQw1FOkgVYTpmd9AH/X+EcxKml5Lz8DsKmsXqfD9AlV3WpEeT+OtMw==
 
 xterm-addon-unicode11@0.4.0-beta.3:
   version "0.4.0-beta.3"
   resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.3.tgz#f350184155fafd5ad0d6fbf31d13e6ca7dea1efa"
   integrity sha512-FryZAVwbUjKTmwXnm1trch/2XO60F5JsDvOkZhzobV1hm10sFLVuZpFyHXiUx7TFeeFsvNP+S77LAtWoeT5z+Q==
 
-xterm-addon-webgl@0.12.0-beta.25:
-  version "0.12.0-beta.25"
-  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.25.tgz#67fd222d245c4bf749b2abdf0acec640fb575bcd"
-  integrity sha512-QK0r6hi+plkMtHZrOlUO/IcDa9mnYxOKrqrmzbjxT6cuhXJf2EiWpBBY6Rkk0cVXtDOlkGO1b7hWvD3qeWeWvQ==
+xterm-addon-webgl@0.12.0-beta.27:
+  version "0.12.0-beta.27"
+  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.27.tgz#afc5bc01d1ef3af9005fb9f6325a4db9c92aa8d9"
+  integrity sha512-P948trotU8FMHtaA7C2x97VpLq6QLSjO53kWNvONS0/XwEKQBIYCI7Jfri2wcLgfQg6Cn4OQGLoj2YBK3MMyww==
 
-xterm-headless@4.19.0-beta.17:
-  version "4.19.0-beta.17"
-  resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.19.0-beta.17.tgz#0540b4526f31f2aab6d026f91ac56475260d45e0"
-  integrity sha512-A6CbJauiCDur5BZ6kHOCJ3rPLPAdX4JHMGazt0UoYkgbi0xQun+3P2M8C7Ll/NS/zZtv6aPJHAHeXu2TWqV5Lg==
+xterm-headless@4.19.0-beta.20:
+  version "4.19.0-beta.20"
+  resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.19.0-beta.20.tgz#9e401920fcc24c2474e0bd45df932c62413594da"
+  integrity sha512-twp0vCyfdI4wVgDrwxaHk1FtC4UhTNNgbIPT6yVPjICOUkUTOvFjrQCNKHv2uMOJo9uAH2gyOsIqHdEP549rJA==
 
-xterm@4.19.0-beta.17:
-  version "4.19.0-beta.17"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.19.0-beta.17.tgz#79b177eedd3bc835e1951f38318b5c0c04039896"
-  integrity sha512-NvfGJLfZa0SHGR6WttNfugRYizM20gVbWM/nVJAlyHruMZ/rfJj29MuPERJAZTNHtRnYplhAP8bSc3r7/2l+dg==
+xterm@4.19.0-beta.20:
+  version "4.19.0-beta.20"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.19.0-beta.20.tgz#d8e970d8a8460c1d1a5ec9866f78f607a44c1349"
+  integrity sha512-IYI4ngSWzpV4sJXLWGEDF7vgLuUHn0CUQ42+TGv4H/hCGo4uru4s/D3Yws0ETb3a9VwRpZEPsigULaWTnhFusg==
 
 yallist@^4.0.0:
   version "4.0.0"
diff --git a/src/vs/base/common/glob.ts b/src/vs/base/common/glob.ts
index 3eb569d70e7..958eae2d839 100644
--- a/src/vs/base/common/glob.ts
+++ b/src/vs/base/common/glob.ts
@@ -584,13 +584,38 @@ function parsedExpression(expression: IExpression, options: IGlobOptions): Parse
 		}
 
 		const resultExpression: ParsedStringPattern = function (path: string, basename?: string) {
-			for (let i = 0, n = parsedPatterns.length; i < n; i++) {
+			let resultPromises: Promise<string | null>[] | undefined = undefined;
 
-				// Check if pattern matches path
+			for (let i = 0, n = parsedPatterns.length; i < n; i++) {
 				const result = parsedPatterns[i](path, basename);
-				if (result) {
-					return result;
+				if (typeof result === 'string') {
+					return result; // immediately return as soon as the first expression matches
 				}
+
+				// If the result is a promise, we have to keep it for
+				// later processing and await the result properly.
+				if (isThenable(result)) {
+					if (!resultPromises) {
+						resultPromises = [];
+					}
+
+					resultPromises.push(result);
+				}
+			}
+
+			// With result promises, we have to loop over each and
+			// await the result before we can return any result.
+			if (resultPromises) {
+				return (async () => {
+					for (const resultPromise of resultPromises) {
+						const result = await resultPromise;
+						if (typeof result === 'string') {
+							return result;
+						}
+					}
+
+					return null;
+				})();
 			}
 
 			return null;
@@ -611,6 +636,7 @@ function parsedExpression(expression: IExpression, options: IGlobOptions): Parse
 
 	const resultExpression: ParsedStringPattern = function (path: string, base?: string, hasSibling?: (name: string) => boolean | Promise<boolean>) {
 		let name: string | undefined = undefined;
+		let resultPromises: Promise<string | null>[] | undefined = undefined;
 
 		for (let i = 0, n = parsedPatterns.length; i < n; i++) {
 
@@ -627,9 +653,34 @@ function parsedExpression(expression: IExpression, options: IGlobOptions): Parse
 			}
 
 			const result = parsedPattern(path, base, name, hasSibling);
-			if (result) {
-				return result;
+			if (typeof result === 'string') {
+				return result; // immediately return as soon as the first expression matches
 			}
+
+			// If the result is a promise, we have to keep it for
+			// later processing and await the result properly.
+			if (isThenable(result)) {
+				if (!resultPromises) {
+					resultPromises = [];
+				}
+
+				resultPromises.push(result);
+			}
+		}
+
+		// With result promises, we have to loop over each and
+		// await the result before we can return any result.
+		if (resultPromises) {
+			return (async () => {
+				for (const resultPromise of resultPromises) {
+					const result = await resultPromise;
+					if (typeof result === 'string') {
+						return result;
+					}
+				}
+
+				return null;
+			})();
 		}
 
 		return null;
diff --git a/src/vs/base/parts/quickinput/browser/quickInput.ts b/src/vs/base/parts/quickinput/browser/quickInput.ts
index ee3543a2203..9eb6fa7e574 100644
--- a/src/vs/base/parts/quickinput/browser/quickInput.ts
+++ b/src/vs/base/parts/quickinput/browser/quickInput.ts
@@ -1249,7 +1249,6 @@ export class QuickInputController extends Disposable {
 
 		const inputBox = this._register(new QuickInputBox(filterContainer));
 		inputBox.setAttribute('aria-describedby', `${this.idPrefix}message`);
-		inputBox.setAttribute('aria-live', 'polite');
 
 		const visibleCountContainer = dom.append(filterContainer, $('.quick-input-visible-count'));
 		visibleCountContainer.setAttribute('aria-live', 'polite');
diff --git a/src/vs/base/test/common/glob.test.ts b/src/vs/base/test/common/glob.test.ts
index ba31ed0099c..bc70f0fa531 100644
--- a/src/vs/base/test/common/glob.test.ts
+++ b/src/vs/base/test/common/glob.test.ts
@@ -1099,4 +1099,19 @@ suite('Glob', () => {
 		let p = 'scheme:/**/*.md';
 		assertGlobMatch(p, URI.file('super/duper/long/some/file.md').with({ scheme: 'scheme' }).toString());
 	});
+
+	test('expression fails when siblings use promises (https://github.com/microsoft/vscode/issues/146294)', async function () {
+		let siblings = ['test.html', 'test.txt', 'test.ts'];
+		let hasSibling = (name: string) => Promise.resolve(siblings.indexOf(name) !== -1);
+
+		// { "**/*.js": { "when": "$(basename).ts" } }
+		let expression: glob.IExpression = {
+			'**/test.js': { when: '$(basename).js' },
+			'**/*.js': { when: '$(basename).ts' }
+		};
+
+		const parsedExpression = glob.parse(expression);
+
+		assert.strictEqual('**/*.js', await parsedExpression('test.js', undefined, hasSibling));
+	});
 });
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index d7459f90ea6..82260d4a427 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -524,7 +524,7 @@ export class CodeApplication extends Disposable {
 
 		// Create driver
 		if (this.environmentMainService.driverHandle) {
-			const server = await serveDriver(mainProcessElectronServer, this.environmentMainService.driverHandle, this.environmentMainService, appInstantiationService);
+			const server = await serveDriver(mainProcessElectronServer, this.environmentMainService.driverHandle, appInstantiationService);
 
 			this.logService.info('Driver started at:', this.environmentMainService.driverHandle);
 			this._register(server);
@@ -876,9 +876,21 @@ export class CodeApplication extends Disposable {
 					return true;
 				}
 
-				// If we have not yet handled the URI and we have no window opened (macOS only)
-				// we first open a window and then try to open that URI within that window
-				if (isMacintosh && windowsMainService.getWindowCount() === 0) {
+				// We should handle the URI in a new window if no window is open (macOS only)
+				let shouldOpenInNewWindow = isMacintosh && windowsMainService.getWindowCount() === 0;
+
+				// or if the URL contains `windowId=_blank`
+				if (!shouldOpenInNewWindow) {
+					const params = new URLSearchParams(uri.query);
+
+					if (params.get('windowId') === '_blank') {
+						params.delete('windowId');
+						uri = uri.with({ query: params.toString() });
+						shouldOpenInNewWindow = true;
+					}
+				}
+
+				if (shouldOpenInNewWindow) {
 					const [window] = windowsMainService.open({
 						context: OpenContext.API,
 						cli: { ...environmentService.args },
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 2d38b52d373..febb7dac4d6 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -2503,6 +2503,11 @@ export interface IEditorInlayHintsOptions {
 	 */
 	enabled?: boolean;
 
+	/**
+	 *
+	 */
+	toggle?: 'show' | 'hide' | null;
+
 	/**
 	 * Font size of inline hints.
 	 * Default to 90% of the editor font size.
@@ -2531,7 +2536,7 @@ export type EditorInlayHintsOptions = Readonly<Required<IEditorInlayHintsOptions
 class EditorInlayHints extends BaseEditorOption<EditorOption.inlayHints, IEditorInlayHintsOptions, EditorInlayHintsOptions> {
 
 	constructor() {
-		const defaults: EditorInlayHintsOptions = { enabled: true, fontSize: 0, fontFamily: '', displayStyle: 'compact' };
+		const defaults: EditorInlayHintsOptions = { enabled: true, toggle: null, fontSize: 0, fontFamily: '', displayStyle: 'compact' };
 		super(
 			EditorOption.inlayHints, 'inlayHints', defaults,
 			{
@@ -2540,6 +2545,16 @@ class EditorInlayHints extends BaseEditorOption<EditorOption.inlayHints, IEditor
 					default: defaults.enabled,
 					description: nls.localize('inlayHints.enable', "Enables the inlay hints in the editor.")
 				},
+				'editor.inlayHints.toggle': {
+					type: 'string',
+					enum: ['show', 'hide'],
+					markdownEnumDescriptions: [
+						nls.localize('toogle.show', "Inlay hints are hidden by default and only show when holding `Ctrl+Alt`"),
+						nls.localize('toogle.hide', "Inlay hints are showing by default and hide when holding `Ctrl+Alt`"),
+					],
+					default: defaults.toggle,
+					markdownDescription: nls.localize('inlayHints.toggle', "Control if inlay hints temporarily show or hide when `Ctrl+Alt` is pressed and held.")
+				},
 				'editor.inlayHints.fontSize': {
 					type: 'number',
 					default: defaults.fontSize,
@@ -2571,6 +2586,7 @@ class EditorInlayHints extends BaseEditorOption<EditorOption.inlayHints, IEditor
 		const input = _input as IEditorInlayHintsOptions;
 		return {
 			enabled: boolean(input.enabled, this.defaultValue.enabled),
+			toggle: stringSet<'show' | 'hide' | null>(input.toggle, this.defaultValue.toggle, ['show', 'hide']),
 			fontSize: EditorIntOption.clampedInt(input.fontSize, this.defaultValue.fontSize, 0, 100),
 			fontFamily: EditorStringOption.string(input.fontFamily, this.defaultValue.fontFamily),
 			displayStyle: stringSet<'standard' | 'compact'>(input.displayStyle, this.defaultValue.displayStyle, ['standard', 'compact'])
diff --git a/src/vs/editor/common/languages.ts b/src/vs/editor/common/languages.ts
index b46e402b0f4..de092a4d1be 100644
--- a/src/vs/editor/common/languages.ts
+++ b/src/vs/editor/common/languages.ts
@@ -1968,3 +1968,23 @@ export enum ExternalUriOpenerPriority {
 	Default = 2,
 	Preferred = 3,
 }
+
+/**
+ * @internal
+ */
+export interface IDataTransferItem {
+	asString(): Thenable<string>;
+	value: any;
+}
+
+/**
+ * @internal
+ */
+export type IDataTransfer = Map<string, IDataTransferItem>;
+
+/**
+ * @internal
+ */
+export interface DocumentOnDropEditProvider {
+	provideDocumentOnDropEdits(model: model.ITextModel, position: IPosition, dataTransfer: IDataTransfer, token: CancellationToken): ProviderResult<SnippetTextEdit>;
+}
diff --git a/src/vs/editor/common/services/languageFeatures.ts b/src/vs/editor/common/services/languageFeatures.ts
index 14bd7532635..e0ba2416582 100644
--- a/src/vs/editor/common/services/languageFeatures.ts
+++ b/src/vs/editor/common/services/languageFeatures.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { LanguageFeatureRegistry, NotebookInfoResolver } from 'vs/editor/common/languageFeatureRegistry';
-import { CodeActionProvider, CodeLensProvider, CompletionItemProvider, DeclarationProvider, DefinitionProvider, DocumentColorProvider, DocumentFormattingEditProvider, DocumentHighlightProvider, DocumentRangeFormattingEditProvider, DocumentRangeSemanticTokensProvider, DocumentSemanticTokensProvider, DocumentSymbolProvider, EvaluatableExpressionProvider, FoldingRangeProvider, HoverProvider, ImplementationProvider, InlayHintsProvider, InlineCompletionsProvider, InlineValuesProvider, LinkedEditingRangeProvider, LinkProvider, OnTypeFormattingEditProvider, ReferenceProvider, RenameProvider, SelectionRangeProvider, SignatureHelpProvider, TypeDefinitionProvider } from 'vs/editor/common/languages';
+import { CodeActionProvider, CodeLensProvider, CompletionItemProvider, DeclarationProvider, DefinitionProvider, DocumentColorProvider, DocumentFormattingEditProvider, DocumentHighlightProvider, DocumentOnDropEditProvider, DocumentRangeFormattingEditProvider, DocumentRangeSemanticTokensProvider, DocumentSemanticTokensProvider, DocumentSymbolProvider, EvaluatableExpressionProvider, FoldingRangeProvider, HoverProvider, ImplementationProvider, InlayHintsProvider, InlineCompletionsProvider, InlineValuesProvider, LinkedEditingRangeProvider, LinkProvider, OnTypeFormattingEditProvider, ReferenceProvider, RenameProvider, SelectionRangeProvider, SignatureHelpProvider, TypeDefinitionProvider } from 'vs/editor/common/languages';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 
 export const ILanguageFeaturesService = createDecorator<ILanguageFeaturesService>('ILanguageFeaturesService');
@@ -67,6 +67,8 @@ export interface ILanguageFeaturesService {
 
 	readonly evaluatableExpressionProvider: LanguageFeatureRegistry<EvaluatableExpressionProvider>;
 
+	readonly documentOnDropEditProvider: LanguageFeatureRegistry<DocumentOnDropEditProvider>;
+
 	// --
 
 	setNotebookTypeResolver(resolver: NotebookInfoResolver | undefined): void;
diff --git a/src/vs/editor/common/services/languageFeaturesService.ts b/src/vs/editor/common/services/languageFeaturesService.ts
index 92f57d892a7..2ed7cebcf62 100644
--- a/src/vs/editor/common/services/languageFeaturesService.ts
+++ b/src/vs/editor/common/services/languageFeaturesService.ts
@@ -5,7 +5,7 @@
 
 import { URI } from 'vs/base/common/uri';
 import { LanguageFeatureRegistry, NotebookInfo, NotebookInfoResolver } from 'vs/editor/common/languageFeatureRegistry';
-import { CodeActionProvider, CodeLensProvider, CompletionItemProvider, DeclarationProvider, DefinitionProvider, DocumentColorProvider, DocumentFormattingEditProvider, DocumentHighlightProvider, DocumentRangeFormattingEditProvider, DocumentRangeSemanticTokensProvider, DocumentSemanticTokensProvider, DocumentSymbolProvider, EvaluatableExpressionProvider, FoldingRangeProvider, HoverProvider, ImplementationProvider, InlayHintsProvider, InlineCompletionsProvider, InlineValuesProvider, LinkedEditingRangeProvider, LinkProvider, OnTypeFormattingEditProvider, ReferenceProvider, RenameProvider, SelectionRangeProvider, SignatureHelpProvider, TypeDefinitionProvider } from 'vs/editor/common/languages';
+import { CodeActionProvider, CodeLensProvider, CompletionItemProvider, DeclarationProvider, DefinitionProvider, DocumentColorProvider, DocumentFormattingEditProvider, DocumentHighlightProvider, DocumentOnDropEditProvider, DocumentRangeFormattingEditProvider, DocumentRangeSemanticTokensProvider, DocumentSemanticTokensProvider, DocumentSymbolProvider, EvaluatableExpressionProvider, FoldingRangeProvider, HoverProvider, ImplementationProvider, InlayHintsProvider, InlineCompletionsProvider, InlineValuesProvider, LinkedEditingRangeProvider, LinkProvider, OnTypeFormattingEditProvider, ReferenceProvider, RenameProvider, SelectionRangeProvider, SignatureHelpProvider, TypeDefinitionProvider } from 'vs/editor/common/languages';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
@@ -40,7 +40,7 @@ export class LanguageFeaturesService implements ILanguageFeaturesService {
 	readonly evaluatableExpressionProvider = new LanguageFeatureRegistry<EvaluatableExpressionProvider>(this._score.bind(this));
 	readonly documentRangeSemanticTokensProvider = new LanguageFeatureRegistry<DocumentRangeSemanticTokensProvider>(this._score.bind(this));
 	readonly documentSemanticTokensProvider = new LanguageFeatureRegistry<DocumentSemanticTokensProvider>(this._score.bind(this));
-
+	readonly documentOnDropEditProvider = new LanguageFeatureRegistry<DocumentOnDropEditProvider>(this._score.bind(this));
 
 	private _notebookTypeResolver?: NotebookInfoResolver;
 
diff --git a/src/vs/editor/common/viewLayout/viewLineRenderer.ts b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
index 61b0eec236e..1bb33b6cc48 100644
--- a/src/vs/editor/common/viewLayout/viewLineRenderer.ts
+++ b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
@@ -773,6 +773,18 @@ function _applyRenderWhitespace(input: RenderLineInput, lineContent: string, len
 			isInWhitespace = lineIsEmptyOrWhitespace || charIndex > lastNonWhitespaceIndex;
 		}
 
+		if (isInWhitespace && tokenContainsRTL) {
+			// If the token contains RTL text, breaking it up into multiple line parts
+			// to render whitespace might affect the browser's bidi layout.
+			//
+			// We render whitespace in such tokens only if the whitespace
+			// is the leading or the trailing whitespace of the line,
+			// which doesn't affect the browser's bidi layout.
+			if (charIndex >= firstNonWhitespaceIndex && charIndex <= lastNonWhitespaceIndex) {
+				isInWhitespace = false;
+			}
+		}
+
 		if (wasInWhitespace) {
 			// was in whitespace token
 			if (!isInWhitespace || (!useMonospaceOptimizations && tmpIndent >= tabSize)) {
@@ -959,7 +971,7 @@ function _renderLine(input: ResolvedRenderLineInput, sb: IStringBuilder): Render
 
 		sb.appendASCIIString('<span ');
 		if (partContainsRTL) {
-			sb.appendASCIIString('dir="auto" ');
+			sb.appendASCIIString('style="unicode-bidi:isolate" ');
 		}
 		sb.appendASCIIString('class="');
 		sb.appendASCIIString(partRendersWhitespaceWithWidth ? 'mtkz' : partType);
diff --git a/src/vs/editor/contrib/comment/test/browser/lineCommentCommand.test.ts b/src/vs/editor/contrib/comment/test/browser/lineCommentCommand.test.ts
index 4bce445798f..a451d61ecac 100644
--- a/src/vs/editor/contrib/comment/test/browser/lineCommentCommand.test.ts
+++ b/src/vs/editor/contrib/comment/test/browser/lineCommentCommand.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { Selection } from 'vs/editor/common/core/selection';
 import { ICommand } from 'vs/editor/common/editorCommon';
 import { EncodedTokenizationResult, ColorId, IState, MetadataConsts, TokenizationRegistry } from 'vs/editor/common/languages';
@@ -15,7 +15,6 @@ import { ILanguageService } from 'vs/editor/common/languages/language';
 import { ILinePreflightData, IPreflightData, ISimpleModel, LineCommentCommand, Type } from 'vs/editor/contrib/comment/browser/lineCommentCommand';
 import { testCommand } from 'vs/editor/test/browser/testCommand';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { MockMode } from 'vs/editor/test/common/mocks/mockMode';
 import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
 
 function createTestCommandHelper(commentsConfig: CommentRule, commandFactory: (accessor: ServicesAccessor, selection: Selection) => ICommand): (lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection) => void {
@@ -1083,13 +1082,15 @@ suite('Editor Contrib - Line Comment in mixed modes', () => {
 	const OUTER_LANGUAGE_ID = 'outerMode';
 	const INNER_LANGUAGE_ID = 'innerMode';
 
-	class OuterMode extends MockMode {
+	class OuterMode extends Disposable {
+		private readonly languageId = OUTER_LANGUAGE_ID;
 		constructor(
 			commentsConfig: CommentRule,
 			@ILanguageService languageService: ILanguageService,
 			@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService
 		) {
-			super(OUTER_LANGUAGE_ID);
+			super();
+			this._register(languageService.registerLanguage({ id: this.languageId }));
 			this._register(languageConfigurationService.register(this.languageId, {
 				comments: commentsConfig
 			}));
@@ -1115,12 +1116,15 @@ suite('Editor Contrib - Line Comment in mixed modes', () => {
 		}
 	}
 
-	class InnerMode extends MockMode {
+	class InnerMode extends Disposable {
+		private readonly languageId = INNER_LANGUAGE_ID;
 		constructor(
 			commentsConfig: CommentRule,
+			@ILanguageService languageService: ILanguageService,
 			@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService
 		) {
-			super(INNER_LANGUAGE_ID);
+			super();
+			this._register(languageService.registerLanguage({ id: this.languageId }));
 			this._register(languageConfigurationService.register(this.languageId, {
 				comments: commentsConfig
 			}));
diff --git a/src/vs/editor/contrib/folding/browser/folding.ts b/src/vs/editor/contrib/folding/browser/folding.ts
index 5efbf7963dc..bf6aaa8d8bd 100644
--- a/src/vs/editor/contrib/folding/browser/folding.ts
+++ b/src/vs/editor/contrib/folding/browser/folding.ts
@@ -472,7 +472,7 @@ export class FoldingController extends Disposable implements IEditorContribution
 	}
 
 	private onEditorMouseUp(e: IEditorMouseEvent): void {
-		const foldingModel = this.getFoldingModel();
+		const foldingModel = this.foldingModel;
 		if (!foldingModel || !this.mouseDownInfo || !e.target) {
 			return;
 		}
@@ -495,47 +495,43 @@ export class FoldingController extends Disposable implements IEditorContribution
 			}
 		}
 
-		foldingModel.then(foldingModel => {
-			if (foldingModel) {
-				let region = foldingModel.getRegionAtLine(lineNumber);
-				if (region && region.startLineNumber === lineNumber) {
-					let isCollapsed = region.isCollapsed;
-					if (iconClicked || isCollapsed) {
-						let surrounding = e.event.altKey;
-						let toToggle = [];
-						if (surrounding) {
-							let filter = (otherRegion: FoldingRegion) => !otherRegion.containedBy(region!) && !region!.containedBy(otherRegion);
-							let toMaybeToggle = foldingModel.getRegionsInside(null, filter);
-							for (const r of toMaybeToggle) {
-								if (r.isCollapsed) {
-									toToggle.push(r);
-								}
-							}
-							// if any surrounding regions are folded, unfold those. Otherwise, fold all surrounding
-							if (toToggle.length === 0) {
-								toToggle = toMaybeToggle;
-							}
+		let region = foldingModel.getRegionAtLine(lineNumber);
+		if (region && region.startLineNumber === lineNumber) {
+			let isCollapsed = region.isCollapsed;
+			if (iconClicked || isCollapsed) {
+				let surrounding = e.event.altKey;
+				let toToggle = [];
+				if (surrounding) {
+					let filter = (otherRegion: FoldingRegion) => !otherRegion.containedBy(region!) && !region!.containedBy(otherRegion);
+					let toMaybeToggle = foldingModel.getRegionsInside(null, filter);
+					for (const r of toMaybeToggle) {
+						if (r.isCollapsed) {
+							toToggle.push(r);
 						}
-						else {
-							let recursive = e.event.middleButton || e.event.shiftKey;
-							if (recursive) {
-								for (const r of foldingModel.getRegionsInside(region)) {
-									if (r.isCollapsed === isCollapsed) {
-										toToggle.push(r);
-									}
-								}
-							}
-							// when recursive, first only collapse all children. If all are already folded or there are no children, also fold parent.
-							if (isCollapsed || !recursive || toToggle.length === 0) {
-								toToggle.push(region);
-							}
-						}
-						foldingModel.toggleCollapseState(toToggle);
-						this.reveal({ lineNumber, column: 1 });
+					}
+					// if any surrounding regions are folded, unfold those. Otherwise, fold all surrounding
+					if (toToggle.length === 0) {
+						toToggle = toMaybeToggle;
 					}
 				}
+				else {
+					let recursive = e.event.middleButton || e.event.shiftKey;
+					if (recursive) {
+						for (const r of foldingModel.getRegionsInside(region)) {
+							if (r.isCollapsed === isCollapsed) {
+								toToggle.push(r);
+							}
+						}
+					}
+					// when recursive, first only collapse all children. If all are already folded or there are no children, also fold parent.
+					if (isCollapsed || !recursive || toToggle.length === 0) {
+						toToggle.push(region);
+					}
+				}
+				foldingModel.toggleCollapseState(toToggle);
+				this.reveal({ lineNumber, column: 1 });
 			}
-		}).then(undefined, onUnexpectedError);
+		}
 	}
 
 	public reveal(position: IPosition): void {
diff --git a/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts b/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts
index a1974f92176..fefb379f471 100644
--- a/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts
+++ b/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { ModifierKeyEmitter } from 'vs/base/browser/dom';
 import { isNonEmptyArray } from 'vs/base/common/arrays';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
@@ -19,7 +20,7 @@ import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { Range } from 'vs/editor/common/core/range';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import * as languages from 'vs/editor/common/languages';
-import { IModelDeltaDecoration, InjectedTextCursorStops, ITextModel, TrackedRangeStickiness } from 'vs/editor/common/model';
+import { IModelDeltaDecoration, InjectedTextCursorStops, InjectedTextOptions, ITextModel, TrackedRangeStickiness } from 'vs/editor/common/model';
 import { ModelDecorationInjectedTextOptions } from 'vs/editor/common/model/textModel';
 import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
@@ -80,6 +81,11 @@ class ActiveInlayHintInfo {
 	constructor(readonly part: RenderedInlayHintLabelPart, readonly hasTriggerModifier: boolean) { }
 }
 
+const enum InlayHintRenderMode {
+	InjectedText,
+	TrackingOnly
+}
+
 // --- controller
 
 export class InlayHintsController implements IEditorContribution {
@@ -98,6 +104,7 @@ export class InlayHintsController implements IEditorContribution {
 	private readonly _decorationsMetadata = new Map<string, { item: InlayHintItem; classNameRef: IDisposable }>();
 	private readonly _ruleFactory = new DynamicCssRules(this._editor);
 
+	private _renderMode = InlayHintRenderMode.InjectedText;
 	private _activeInlayHintPart?: ActiveInlayHintInfo;
 
 	constructor(
@@ -131,7 +138,8 @@ export class InlayHintsController implements IEditorContribution {
 		this._sessionDisposables.clear();
 		this._removeAllDecorations();
 
-		if (!this._editor.getOption(EditorOption.inlayHints).enabled) {
+		const options = this._editor.getOption(EditorOption.inlayHints);
+		if (!options.enabled) {
 			return;
 		}
 
@@ -215,6 +223,26 @@ export class InlayHintsController implements IEditorContribution {
 			scheduler.schedule(delay);
 		}));
 
+		if (!options.toggle) {
+			this._renderMode = InlayHintRenderMode.InjectedText;
+		} else {
+			let defaultMode: InlayHintRenderMode;
+			let altMode: InlayHintRenderMode;
+			if (options.toggle === 'show') {
+				defaultMode = InlayHintRenderMode.TrackingOnly;
+				altMode = InlayHintRenderMode.InjectedText;
+			} else {
+				defaultMode = InlayHintRenderMode.InjectedText;
+				altMode = InlayHintRenderMode.TrackingOnly;
+			}
+			this._renderMode = defaultMode;
+			this._sessionDisposables.add(ModifierKeyEmitter.getInstance().event(e => {
+				this._renderMode = e.altKey && e.ctrlKey ? altMode : defaultMode;
+				const ranges = this._getHintsRanges();
+				this._updateHintsDecorators(ranges, ranges.map(this._getInlineHintsForRange, this).flat());
+			}));
+		}
+
 		// mouse gestures
 		this._sessionDisposables.add(this._installLinkGesture());
 		this._sessionDisposables.add(this._installDblClickGesture());
@@ -253,16 +281,11 @@ export class InlayHintsController implements IEditorContribution {
 
 			const lineNumber = labelPart.item.hint.position.lineNumber;
 			const range = new Range(lineNumber, 1, lineNumber, model.getLineMaxColumn(lineNumber));
-			const lineHints = new Set<InlayHintItem>();
-			for (const data of this._decorationsMetadata.values()) {
-				if (range.containsRange(data.item.anchor.range)) {
-					lineHints.add(data.item);
-				}
-			}
-			this._updateHintsDecorators([range], Array.from(lineHints));
+			const lineHints = this._getInlineHintsForRange(range);
+			this._updateHintsDecorators([range], lineHints);
 			sessionStore.add(toDisposable(() => {
 				this._activeInlayHintPart = undefined;
-				this._updateHintsDecorators([range], Array.from(lineHints));
+				this._updateHintsDecorators([range], lineHints);
 			}));
 		}));
 		store.add(gesture.onCancel(() => sessionStore.clear()));
@@ -282,6 +305,16 @@ export class InlayHintsController implements IEditorContribution {
 		return store;
 	}
 
+	private _getInlineHintsForRange(range: Range) {
+		const lineHints = new Set<InlayHintItem>();
+		for (const data of this._decorationsMetadata.values()) {
+			if (range.containsRange(data.item.anchor.range)) {
+				lineHints.add(data.item);
+			}
+		}
+		return Array.from(lineHints);
+	}
+
 	private _installDblClickGesture(): IDisposable {
 		return this._editor.onMouseUp(async e => {
 			if (e.event.detail !== 2) {
@@ -376,6 +409,13 @@ export class InlayHintsController implements IEditorContribution {
 		// utils to collect/create injected text decorations
 		const newDecorationsData: { item: InlayHintItem; decoration: IModelDeltaDecoration; classNameRef: IDisposable }[] = [];
 		const addInjectedText = (item: InlayHintItem, ref: ClassNameReference, content: string, cursorStops: InjectedTextCursorStops, attachedData?: RenderedInlayHintLabelPart): void => {
+			const opts: InjectedTextOptions = {
+				content,
+				inlineClassNameAffectsLetterSpacing: true,
+				inlineClassName: ref.className,
+				cursorStops,
+				attachedData
+			};
 			newDecorationsData.push({
 				item,
 				classNameRef: ref,
@@ -387,13 +427,7 @@ export class InlayHintsController implements IEditorContribution {
 						showIfCollapsed: item.anchor.range.isEmpty(), // "original" range is empty
 						collapseOnReplaceEdit: !item.anchor.range.isEmpty(),
 						stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,
-						[item.anchor.direction]: {
-							content,
-							inlineClassNameAffectsLetterSpacing: true,
-							inlineClassName: ref.className,
-							cursorStops,
-							attachedData
-						}
+						[item.anchor.direction]: this._renderMode === InlayHintRenderMode.InjectedText ? opts : undefined
 					}
 				}
 			});
diff --git a/src/vs/editor/contrib/linesOperations/test/browser/moveLinesCommand.test.ts b/src/vs/editor/contrib/linesOperations/test/browser/moveLinesCommand.test.ts
index 6ad8ce59833..af1d85e4d31 100644
--- a/src/vs/editor/contrib/linesOperations/test/browser/moveLinesCommand.test.ts
+++ b/src/vs/editor/contrib/linesOperations/test/browser/moveLinesCommand.test.ts
@@ -2,13 +2,15 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+import { Disposable } from 'vs/base/common/lifecycle';
 import { EditorAutoIndentStrategy } from 'vs/editor/common/config/editorOptions';
 import { Selection } from 'vs/editor/common/core/selection';
+import { ILanguageService } from 'vs/editor/common/languages/language';
 import { IndentationRule } from 'vs/editor/common/languages/languageConfiguration';
 import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
+import { LanguageService } from 'vs/editor/common/services/languageService';
 import { MoveLinesCommand } from 'vs/editor/contrib/linesOperations/browser/moveLinesCommand';
 import { testCommand } from 'vs/editor/test/browser/testCommand';
-import { MockMode } from 'vs/editor/test/common/mocks/mockMode';
 import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
 
 function testMoveLinesDownCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection, languageConfigurationService = new TestLanguageConfigurationService()): void {
@@ -259,13 +261,15 @@ suite('Editor Contrib - Move Lines Command', () => {
 	});
 });
 
-class IndentRulesMode extends MockMode {
-	private static readonly _id = 'moveLinesIndentMode';
+class IndentRulesMode extends Disposable {
+	public readonly languageId = 'moveLinesIndentMode';
 	constructor(
 		indentationRules: IndentationRule,
+		@ILanguageService languageService: ILanguageService,
 		@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService
 	) {
-		super(IndentRulesMode._id);
+		super();
+		this._register(languageService.registerLanguage({ id: this.languageId }));
 		this._register(languageConfigurationService.register(this.languageId, {
 			indentationRules: indentationRules
 		}));
@@ -282,8 +286,9 @@ suite('Editor contrib - Move Lines Command honors Indentation Rules', () => {
 
 	// https://github.com/microsoft/vscode/issues/28552#issuecomment-307862797
 	test('first line indentation adjust to 0', () => {
+		const languageService = new LanguageService();
 		const languageConfigurationService = new TestLanguageConfigurationService();
-		const mode = new IndentRulesMode(indentRules, languageConfigurationService);
+		const mode = new IndentRulesMode(indentRules, languageService, languageConfigurationService);
 
 		testMoveLinesUpWithIndentCommand(
 			mode.languageId,
@@ -303,12 +308,14 @@ suite('Editor contrib - Move Lines Command honors Indentation Rules', () => {
 		);
 
 		mode.dispose();
+		languageService.dispose();
 	});
 
 	// https://github.com/microsoft/vscode/issues/28552#issuecomment-307867717
 	test('move lines across block', () => {
+		const languageService = new LanguageService();
 		const languageConfigurationService = new TestLanguageConfigurationService();
-		const mode = new IndentRulesMode(indentRules, languageConfigurationService);
+		const mode = new IndentRulesMode(indentRules, languageService, languageConfigurationService);
 
 		testMoveLinesDownWithIndentCommand(
 			mode.languageId,
@@ -334,6 +341,7 @@ suite('Editor contrib - Move Lines Command honors Indentation Rules', () => {
 		);
 
 		mode.dispose();
+		languageService.dispose();
 	});
 
 
@@ -360,12 +368,14 @@ suite('Editor contrib - Move Lines Command honors Indentation Rules', () => {
 	});
 });
 
-class EnterRulesMode extends MockMode {
-	private static readonly _id = 'moveLinesEnterMode';
+class EnterRulesMode extends Disposable {
+	public readonly languageId = 'moveLinesEnterMode';
 	constructor(
+		@ILanguageService languageService: ILanguageService,
 		@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService
 	) {
-		super(EnterRulesMode._id);
+		super();
+		this._register(languageService.registerLanguage({ id: this.languageId }));
 		this._register(languageConfigurationService.register(this.languageId, {
 			indentationRules: {
 				decreaseIndentPattern: /^\s*\[$/,
@@ -381,8 +391,9 @@ class EnterRulesMode extends MockMode {
 suite('Editor - contrib - Move Lines Command honors onEnter Rules', () => {
 
 	test('issue #54829. move block across block', () => {
+		const languageService = new LanguageService();
 		const languageConfigurationService = new TestLanguageConfigurationService();
-		const mode = new EnterRulesMode(languageConfigurationService);
+		const mode = new EnterRulesMode(languageService, languageConfigurationService);
 
 		testMoveLinesDownWithIndentCommand(
 			mode.languageId,
@@ -413,5 +424,6 @@ suite('Editor - contrib - Move Lines Command honors onEnter Rules', () => {
 		);
 
 		mode.dispose();
+		languageService.dispose();
 	});
 });
diff --git a/src/vs/editor/contrib/multicursor/browser/multicursor.ts b/src/vs/editor/contrib/multicursor/browser/multicursor.ts
index 574a5be3e99..7c658f0fa9b 100644
--- a/src/vs/editor/contrib/multicursor/browser/multicursor.ts
+++ b/src/vs/editor/contrib/multicursor/browser/multicursor.ts
@@ -1095,7 +1095,7 @@ export class FocusNextCursor extends EditorAction {
 	constructor() {
 		super({
 			id: 'editor.action.focusNextCursor',
-			label: nls.localize('mutlicursor.focusNextCursor', "Focus next cursor"),
+			label: nls.localize('mutlicursor.focusNextCursor', "Focus Next Cursor"),
 			description: {
 				description: nls.localize('mutlicursor.focusNextCursor.description', "Focuses the next cursor"),
 				args: [],
@@ -1134,7 +1134,7 @@ export class FocusPreviousCursor extends EditorAction {
 	constructor() {
 		super({
 			id: 'editor.action.focusPreviousCursor',
-			label: nls.localize('mutlicursor.focusPreviousCursor', "Focus previous cursor"),
+			label: nls.localize('mutlicursor.focusPreviousCursor', "Focus Previous Cursor"),
 			description: {
 				description: nls.localize('mutlicursor.focusPreviousCursor.description', "Focuses the previous cursor"),
 				args: [],
diff --git a/src/vs/editor/contrib/smartSelect/test/browser/smartSelect.test.ts b/src/vs/editor/contrib/smartSelect/test/browser/smartSelect.test.ts
index 3de4e65923c..462a79118df 100644
--- a/src/vs/editor/contrib/smartSelect/test/browser/smartSelect.test.ts
+++ b/src/vs/editor/contrib/smartSelect/test/browser/smartSelect.test.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import * as assert from 'assert';
 import { CancellationToken } from 'vs/base/common/cancellation';
+import { Event } from 'vs/base/common/event';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
 import { Position } from 'vs/editor/common/core/position';
@@ -15,10 +16,14 @@ import { BracketSelectionRangeProvider } from 'vs/editor/contrib/smartSelect/bro
 import { provideSelectionRanges } from 'vs/editor/contrib/smartSelect/browser/smartSelect';
 import { WordSelectionRangeProvider } from 'vs/editor/contrib/smartSelect/browser/wordSelections';
 import { createModelServices } from 'vs/editor/test/common/testTextModel';
-import { StaticLanguageSelector } from 'vs/editor/test/common/mocks/mockMode';
 import { javascriptOnEnterRules } from 'vs/editor/test/common/modes/supports/javascriptOnEnterRules';
 import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { ILanguageService } from 'vs/editor/common/languages/language';
+import { ILanguageSelection, ILanguageService } from 'vs/editor/common/languages/language';
+
+class StaticLanguageSelector implements ILanguageSelection {
+	readonly onDidChange: Event<string> = Event.None;
+	constructor(public readonly languageId: string) { }
+}
 
 suite('SmartSelect', () => {
 
diff --git a/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts b/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts
index 31966c9451c..5cee220319c 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts
@@ -5,26 +5,41 @@
 
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { FuzzyScore } from 'vs/base/common/filters';
+import { Iterable } from 'vs/base/common/iterator';
 import { IDisposable, RefCountedDisposable } from 'vs/base/common/lifecycle';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { EditorOption, FindComputedEditorOptionValueById } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
+import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
+import { IPosition, Position } from 'vs/editor/common/core/position';
+import { IRange, Range } from 'vs/editor/common/core/range';
 import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider } from 'vs/editor/common/languages';
+import { Command, CompletionItemProvider, CompletionTriggerKind, InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider } from 'vs/editor/common/languages';
 import { ITextModel } from 'vs/editor/common/model';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { CompletionItemInsertTextRule } from 'vs/editor/common/standalone/standaloneEnums';
 import { CompletionModel, LineContext } from 'vs/editor/contrib/suggest/browser/completionModel';
-import { CompletionItemModel, provideSuggestionItems, QuickSuggestionsOptions } from 'vs/editor/contrib/suggest/browser/suggest';
+import { CompletionItem, CompletionItemModel, CompletionOptions, provideSuggestionItems, QuickSuggestionsOptions } from 'vs/editor/contrib/suggest/browser/suggest';
+import { ISuggestMemoryService } from 'vs/editor/contrib/suggest/browser/suggestMemory';
 import { WordDistance } from 'vs/editor/contrib/suggest/browser/wordDistance';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
-class InlineCompletionResults extends RefCountedDisposable implements InlineCompletions {
+class SuggestInlineCompletion implements InlineCompletion {
+
+	constructor(
+		readonly range: IRange,
+		readonly insertText: string | { snippet: string },
+		readonly filterText: string,
+		readonly additionalTextEdits: ISingleEditOperation[] | undefined,
+		readonly command: Command | undefined,
+		readonly completion: CompletionItem,
+	) { }
+}
+
+class InlineCompletionResults extends RefCountedDisposable implements InlineCompletions<SuggestInlineCompletion> {
 
 	constructor(
 		readonly model: ITextModel,
@@ -32,6 +47,7 @@ class InlineCompletionResults extends RefCountedDisposable implements InlineComp
 		readonly word: IWordAtPosition,
 		readonly completionModel: CompletionModel,
 		completions: CompletionItemModel,
+		@ISuggestMemoryService private readonly _suggestMemoryService: ISuggestMemoryService,
 	) {
 		super(completions.disposable);
 	}
@@ -42,9 +58,17 @@ class InlineCompletionResults extends RefCountedDisposable implements InlineComp
 			&& this.completionModel.incomplete.size === 0; // no incomplete results
 	}
 
-	get items(): InlineCompletion[] {
-		const result: InlineCompletion[] = [];
-		for (const item of this.completionModel.items) {
+	get items(): SuggestInlineCompletion[] {
+		const result: SuggestInlineCompletion[] = [];
+
+		// Split items by preselected index. This ensures the memory-selected item shows first and that better/worst
+		// ranked items are before/after
+		const { items } = this.completionModel;
+		const selectedIndex = this._suggestMemoryService.select(this.model, { lineNumber: this.line, column: this.word.endColumn + this.completionModel.lineContext.characterCountDelta }, items);
+		const first = Iterable.slice(items, selectedIndex);
+		const second = Iterable.slice(items, 0, selectedIndex);
+
+		for (const item of Iterable.concat(first, second)) {
 
 			if (item.score === FuzzyScore.Default) {
 				// skip items that have no overlap
@@ -59,13 +83,14 @@ class InlineCompletionResults extends RefCountedDisposable implements InlineComp
 				? { snippet: item.completion.insertText }
 				: item.completion.insertText;
 
-			result.push({
+			result.push(new SuggestInlineCompletion(
 				range,
-				filterText: item.filterTextLow ?? item.labelLow,
 				insertText,
-				command: item.completion.command,
-				additionalTextEdits: item.completion.additionalTextEdits
-			});
+				item.filterTextLow ?? item.labelLow,
+				item.completion.additionalTextEdits,
+				item.completion.command,
+				item
+			));
 		}
 		return result;
 	}
@@ -80,6 +105,7 @@ class SuggestInlineCompletions implements InlineCompletionsProvider<InlineComple
 		private readonly _getEditorOption: <T extends EditorOption>(id: T, model: ITextModel) => FindComputedEditorOptionValueById<T>,
 		@ILanguageFeaturesService private readonly _languageFeatureService: ILanguageFeaturesService,
 		@IClipboardService private readonly _clipboardService: IClipboardService,
+		@ISuggestMemoryService private readonly _suggestMemoryService: ISuggestMemoryService,
 	) { }
 
 	async provideInlineCompletions(model: ITextModel, position: Position, context: InlineCompletionContext, token: CancellationToken): Promise<InlineCompletionResults | undefined> {
@@ -102,15 +128,24 @@ class SuggestInlineCompletions implements InlineCompletionsProvider<InlineComple
 			return undefined;
 		}
 
-		const wordInfo = model.getWordAtPosition(position);
-		if (!wordInfo || wordInfo.word.length === 0 || wordInfo.endColumn !== position.column) {
-			// not without true prefix, not inside word
+
+		// We consider non-empty leading words and trigger characters. The latter only
+		// when no word is being typed (word characters superseed trigger characters)
+		let wordInfo = model.getWordUntilPosition(position);
+		let triggerCharacterInfo: { ch: string; providers: Set<CompletionItemProvider> } | undefined;
+
+		if (!wordInfo.word) {
+			triggerCharacterInfo = this._getTriggerCharacterInfo(model, position);
+		}
+
+		if (!wordInfo.word && !triggerCharacterInfo) {
+			// not at word, not a trigger character
 			return;
 		}
 
 		let result: InlineCompletionResults;
 		const leadingLineContents = model.getValueInRange(new Range(position.lineNumber, 1, position.lineNumber, position.column));
-		if (this._lastResult?.canBeReused(model, position.lineNumber, wordInfo)) {
+		if (!triggerCharacterInfo && this._lastResult?.canBeReused(model, position.lineNumber, wordInfo)) {
 			// reuse a previous result iff possible, only a refilter is needed
 			// TODO@jrieken this can be improved further and only incomplete results can be updated
 			// console.log(`REUSE with ${wordInfo.word}`);
@@ -124,8 +159,8 @@ class SuggestInlineCompletions implements InlineCompletionsProvider<InlineComple
 			const completions = await provideSuggestionItems(
 				this._languageFeatureService.completionProvider,
 				model, position,
-				undefined,
-				undefined,
+				new CompletionOptions(undefined, undefined, triggerCharacterInfo?.providers),
+				triggerCharacterInfo && { triggerKind: CompletionTriggerKind.TriggerCharacter, triggerCharacter: triggerCharacterInfo.ch },
 				token
 			);
 
@@ -143,16 +178,34 @@ class SuggestInlineCompletions implements InlineCompletionsProvider<InlineComple
 				this._getEditorOption(EditorOption.snippetSuggestions, model),
 				clipboardText
 			);
-			result = new InlineCompletionResults(model, position.lineNumber, wordInfo, completionModel, completions);
+			result = new InlineCompletionResults(model, position.lineNumber, wordInfo, completionModel, completions, this._suggestMemoryService);
 		}
 
 		this._lastResult = result;
 		return result;
 	}
 
+	handleItemDidShow(_completions: InlineCompletionResults, item: SuggestInlineCompletion): void {
+		item.completion.resolve(CancellationToken.None);
+	}
+
 	freeInlineCompletions(result: InlineCompletionResults): void {
 		result.release();
 	}
+
+	private _getTriggerCharacterInfo(model: ITextModel, position: IPosition) {
+		const ch = model.getValueInRange(Range.fromPositions({ lineNumber: position.lineNumber, column: position.column - 1 }, position));
+		const providers = new Set<CompletionItemProvider>();
+		for (const provider of this._languageFeatureService.completionProvider.all(model)) {
+			if (provider.triggerCharacters?.includes(ch)) {
+				providers.add(provider);
+			}
+		}
+		if (providers.size === 0) {
+			return undefined;
+		}
+		return { providers, ch };
+	}
 }
 
 class EditorContribution implements IEditorContribution {
diff --git a/src/vs/editor/contrib/suggest/test/browser/suggestModel.test.ts b/src/vs/editor/contrib/suggest/test/browser/suggestModel.test.ts
index 2e2864340dd..b81acc2c6cc 100644
--- a/src/vs/editor/contrib/suggest/test/browser/suggestModel.test.ts
+++ b/src/vs/editor/contrib/suggest/test/browser/suggestModel.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import * as assert from 'assert';
 import { Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
 import { mock } from 'vs/base/test/common/mock';
 import { CoreEditingCommands } from 'vs/editor/browser/coreCommands';
@@ -26,7 +26,6 @@ import { LineContext, SuggestModel } from 'vs/editor/contrib/suggest/browser/sug
 import { ISelectedSuggestion } from 'vs/editor/contrib/suggest/browser/suggestWidget';
 import { createTestCodeEditor, ITestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { createModelServices, createTextModel, instantiateTextModel } from 'vs/editor/test/common/testTextModel';
-import { MockMode } from 'vs/editor/test/common/mocks/mockMode';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { MockKeybindingService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
@@ -68,12 +67,14 @@ suite('SuggestModel - Context', function () {
 	const OUTER_LANGUAGE_ID = 'outerMode';
 	const INNER_LANGUAGE_ID = 'innerMode';
 
-	class OuterMode extends MockMode {
+	class OuterMode extends Disposable {
+		public readonly languageId = OUTER_LANGUAGE_ID;
 		constructor(
 			@ILanguageService languageService: ILanguageService,
 			@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService,
 		) {
-			super(OUTER_LANGUAGE_ID);
+			super();
+			this._register(languageService.registerLanguage({ id: this.languageId }));
 			this._register(languageConfigurationService.register(this.languageId, {}));
 
 			this._register(TokenizationRegistry.register(this.languageId, {
@@ -102,11 +103,14 @@ suite('SuggestModel - Context', function () {
 		}
 	}
 
-	class InnerMode extends MockMode {
+	class InnerMode extends Disposable {
+		public readonly languageId = INNER_LANGUAGE_ID;
 		constructor(
+			@ILanguageService languageService: ILanguageService,
 			@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService
 		) {
-			super(INNER_LANGUAGE_ID);
+			super();
+			this._register(languageService.registerLanguage({ id: this.languageId }));
 			this._register(languageConfigurationService.register(this.languageId, {}));
 		}
 	}
diff --git a/src/vs/editor/standalone/browser/standaloneLanguages.ts b/src/vs/editor/standalone/browser/standaloneLanguages.ts
index ca8a3522845..f738b97ed24 100644
--- a/src/vs/editor/standalone/browser/standaloneLanguages.ts
+++ b/src/vs/editor/standalone/browser/standaloneLanguages.ts
@@ -28,6 +28,8 @@ import { LanguageSelector } from 'vs/editor/common/languageSelector';
  * Register information about a new language.
  */
 export function register(language: ILanguageExtensionPoint): void {
+	// Intentionally using the `ModesRegistry` here to avoid
+	// instantiating services too quickly in the standalone editor.
 	ModesRegistry.registerLanguage(language);
 }
 
diff --git a/src/vs/editor/test/browser/commands/shiftCommand.test.ts b/src/vs/editor/test/browser/commands/shiftCommand.test.ts
index 6f29362117e..0bf090ab53d 100644
--- a/src/vs/editor/test/browser/commands/shiftCommand.test.ts
+++ b/src/vs/editor/test/browser/commands/shiftCommand.test.ts
@@ -10,11 +10,13 @@ import { Selection } from 'vs/editor/common/core/selection';
 import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
 import { getEditOperation, testCommand } from 'vs/editor/test/browser/testCommand';
 import { withEditorModel } from 'vs/editor/test/common/testTextModel';
-import { MockMode } from 'vs/editor/test/common/mocks/mockMode';
 import { javascriptOnEnterRules } from 'vs/editor/test/common/modes/supports/javascriptOnEnterRules';
 import { EditorAutoIndentStrategy } from 'vs/editor/common/config/editorOptions';
 import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
 import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
+import { ILanguageService } from 'vs/editor/common/languages/language';
+import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 
 /**
  * Create single edit operation
@@ -27,14 +29,17 @@ export function createSingleEditOp(text: string, positionLineNumber: number, pos
 	};
 }
 
-class DocBlockCommentMode extends MockMode {
+class DocBlockCommentMode extends Disposable {
 
-	private static readonly _id = 'commentMode';
+	public static languageId = 'commentMode';
+	public readonly languageId = DocBlockCommentMode.languageId;
 
 	constructor(
+		@ILanguageService languageService: ILanguageService,
 		@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService
 	) {
-		super(DocBlockCommentMode._id);
+		super();
+		this._register(languageService.registerLanguage({ id: this.languageId }));
 		this._register(languageConfigurationService.register(this.languageId, {
 			brackets: [
 				['(', ')'],
@@ -47,7 +52,7 @@ class DocBlockCommentMode extends MockMode {
 	}
 }
 
-function testShiftCommand(lines: string[], languageId: string | null, useTabStops: boolean, selection: Selection, expectedLines: string[], expectedSelection: Selection, languageConfigurationService = new TestLanguageConfigurationService()): void {
+function testShiftCommand(lines: string[], languageId: string | null, useTabStops: boolean, selection: Selection, expectedLines: string[], expectedSelection: Selection, prepare?: (accessor: ServicesAccessor, disposables: DisposableStore) => void): void {
 	testCommand(lines, languageId, selection, (accessor, sel) => new ShiftCommand(sel, {
 		isUnshift: false,
 		tabSize: 4,
@@ -55,10 +60,10 @@ function testShiftCommand(lines: string[], languageId: string | null, useTabStop
 		insertSpaces: false,
 		useTabStops: useTabStops,
 		autoIndent: EditorAutoIndentStrategy.Full,
-	}, languageConfigurationService), expectedLines, expectedSelection);
+	}, accessor.get(ILanguageConfigurationService)), expectedLines, expectedSelection, undefined, prepare);
 }
 
-function testUnshiftCommand(lines: string[], languageId: string | null, useTabStops: boolean, selection: Selection, expectedLines: string[], expectedSelection: Selection, languageConfigurationService = new TestLanguageConfigurationService()): void {
+function testUnshiftCommand(lines: string[], languageId: string | null, useTabStops: boolean, selection: Selection, expectedLines: string[], expectedSelection: Selection, prepare?: (accessor: ServicesAccessor, disposables: DisposableStore) => void): void {
 	testCommand(lines, languageId, selection, (accessor, sel) => new ShiftCommand(sel, {
 		isUnshift: true,
 		tabSize: 4,
@@ -66,14 +71,13 @@ function testUnshiftCommand(lines: string[], languageId: string | null, useTabSt
 		insertSpaces: false,
 		useTabStops: useTabStops,
 		autoIndent: EditorAutoIndentStrategy.Full,
-	}, languageConfigurationService), expectedLines, expectedSelection);
+	}, accessor.get(ILanguageConfigurationService)), expectedLines, expectedSelection, undefined, prepare);
 }
 
-function withDockBlockCommentMode(callback: (mode: DocBlockCommentMode, languageConfigurationService: TestLanguageConfigurationService) => void): void {
-	const languageConfigurationService = new TestLanguageConfigurationService();
-	let mode = new DocBlockCommentMode(languageConfigurationService);
-	callback(mode, languageConfigurationService);
-	mode.dispose();
+function prepareDocBlockCommentLanguage(accessor: ServicesAccessor, disposables: DisposableStore) {
+	const languageConfigurationService = accessor.get(ILanguageConfigurationService);
+	const languageService = accessor.get(ILanguageService);
+	disposables.add(new DocBlockCommentMode(languageService, languageConfigurationService));
 }
 
 suite('Editor Commands - ShiftCommand', () => {
@@ -558,105 +562,99 @@ suite('Editor Commands - ShiftCommand', () => {
 	});
 
 	test('issue #348: indenting around doc block comments', () => {
-		withDockBlockCommentMode((mode, languageConfigurationService) => {
+		testShiftCommand(
+			[
+				'',
+				'/**',
+				' * a doc comment',
+				' */',
+				'function hello() {}'
+			],
+			DocBlockCommentMode.languageId,
+			true,
+			new Selection(1, 1, 5, 20),
+			[
+				'',
+				'\t/**',
+				'\t * a doc comment',
+				'\t */',
+				'\tfunction hello() {}'
+			],
+			new Selection(1, 1, 5, 21),
+			prepareDocBlockCommentLanguage
+		);
 
-			testShiftCommand(
-				[
-					'',
-					'/**',
-					' * a doc comment',
-					' */',
-					'function hello() {}'
-				],
-				mode.languageId,
-				true,
-				new Selection(1, 1, 5, 20),
-				[
-					'',
-					'\t/**',
-					'\t * a doc comment',
-					'\t */',
-					'\tfunction hello() {}'
-				],
-				new Selection(1, 1, 5, 21),
-				languageConfigurationService
-			);
+		testUnshiftCommand(
+			[
+				'',
+				'/**',
+				' * a doc comment',
+				' */',
+				'function hello() {}'
+			],
+			DocBlockCommentMode.languageId,
+			true,
+			new Selection(1, 1, 5, 20),
+			[
+				'',
+				'/**',
+				' * a doc comment',
+				' */',
+				'function hello() {}'
+			],
+			new Selection(1, 1, 5, 20),
+			prepareDocBlockCommentLanguage
+		);
 
-			testUnshiftCommand(
-				[
-					'',
-					'/**',
-					' * a doc comment',
-					' */',
-					'function hello() {}'
-				],
-				mode.languageId,
-				true,
-				new Selection(1, 1, 5, 20),
-				[
-					'',
-					'/**',
-					' * a doc comment',
-					' */',
-					'function hello() {}'
-				],
-				new Selection(1, 1, 5, 20),
-				languageConfigurationService
-			);
-
-			testUnshiftCommand(
-				[
-					'\t',
-					'\t/**',
-					'\t * a doc comment',
-					'\t */',
-					'\tfunction hello() {}'
-				],
-				mode.languageId,
-				true,
-				new Selection(1, 1, 5, 21),
-				[
-					'',
-					'/**',
-					' * a doc comment',
-					' */',
-					'function hello() {}'
-				],
-				new Selection(1, 1, 5, 20),
-				languageConfigurationService
-			);
-
-		});
+		testUnshiftCommand(
+			[
+				'\t',
+				'\t/**',
+				'\t * a doc comment',
+				'\t */',
+				'\tfunction hello() {}'
+			],
+			DocBlockCommentMode.languageId,
+			true,
+			new Selection(1, 1, 5, 21),
+			[
+				'',
+				'/**',
+				' * a doc comment',
+				' */',
+				'function hello() {}'
+			],
+			new Selection(1, 1, 5, 20),
+			prepareDocBlockCommentLanguage
+		);
 	});
 
 	test('issue #1609: Wrong indentation of block comments', () => {
-		withDockBlockCommentMode((mode, languageConfigurationService) => {
-			testShiftCommand(
-				[
-					'',
-					'/**',
-					' * test',
-					' *',
-					' * @type {number}',
-					' */',
-					'var foo = 0;'
-				],
-				mode.languageId,
-				true,
-				new Selection(1, 1, 7, 13),
-				[
-					'',
-					'\t/**',
-					'\t * test',
-					'\t *',
-					'\t * @type {number}',
-					'\t */',
-					'\tvar foo = 0;'
-				],
-				new Selection(1, 1, 7, 14),
-				languageConfigurationService
-			);
-		});
+		testShiftCommand(
+			[
+				'',
+				'/**',
+				' * test',
+				' *',
+				' * @type {number}',
+				' */',
+				'var foo = 0;'
+			],
+			DocBlockCommentMode.languageId,
+			true,
+			new Selection(1, 1, 7, 13),
+			[
+				'',
+				'\t/**',
+				'\t * test',
+				'\t *',
+				'\t * @type {number}',
+				'\t */',
+				'\tvar foo = 0;'
+			],
+			new Selection(1, 1, 7, 14),
+			prepareDocBlockCommentLanguage
+		);
 	});
 
 	test('issue #1620: a) Line indent doesn\'t handle leading whitespace properly', () => {
diff --git a/src/vs/editor/test/common/mocks/mockMode.ts b/src/vs/editor/test/common/mocks/mockMode.ts
deleted file mode 100644
index 4ad2a686fbb..00000000000
--- a/src/vs/editor/test/common/mocks/mockMode.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { ModesRegistry } from 'vs/editor/common/languages/modesRegistry';
-import { ILanguageSelection } from 'vs/editor/common/languages/language';
-
-export class MockMode extends Disposable {
-	constructor(
-		public readonly languageId: string
-	) {
-		super();
-		this._register(ModesRegistry.registerLanguage({ id: languageId }));
-	}
-}
-
-export class StaticLanguageSelector implements ILanguageSelection {
-	readonly onDidChange: Event<string> = Event.None;
-	constructor(public readonly languageId: string) { }
-}
diff --git a/src/vs/editor/test/common/model/model.test.ts b/src/vs/editor/test/common/model/model.test.ts
index 1b1f31881be..96fe698cb1b 100644
--- a/src/vs/editor/test/common/model/model.test.ts
+++ b/src/vs/editor/test/common/model/model.test.ts
@@ -13,7 +13,6 @@ import { InternalModelContentChangeEvent, ModelRawContentChangedEvent, ModelRawF
 import { EncodedTokenizationResult, IState, MetadataConsts, TokenizationRegistry } from 'vs/editor/common/languages';
 import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
 import { NullState } from 'vs/editor/common/languages/nullTokenize';
-import { MockMode } from 'vs/editor/test/common/mocks/mockMode';
 import { createModelServices, createTextModel, instantiateTextModel } from 'vs/editor/test/common/testTextModel';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 
@@ -381,16 +380,19 @@ suite('Editor Model - Words', () => {
 	const OUTER_LANGUAGE_ID = 'outerMode';
 	const INNER_LANGUAGE_ID = 'innerMode';
 
-	class OuterMode extends MockMode {
+	class OuterMode extends Disposable {
+
+		public readonly languageId = OUTER_LANGUAGE_ID;
+
 		constructor(
 			@ILanguageService languageService: ILanguageService,
 			@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService
 		) {
-			super(OUTER_LANGUAGE_ID);
-			const languageIdCodec = languageService.languageIdCodec;
-
+			super();
+			this._register(languageService.registerLanguage({ id: this.languageId }));
 			this._register(languageConfigurationService.register(this.languageId, {}));
 
+			const languageIdCodec = languageService.languageIdCodec;
 			this._register(TokenizationRegistry.register(this.languageId, {
 				getInitialState: (): IState => NullState,
 				tokenize: undefined!,
@@ -417,11 +419,16 @@ suite('Editor Model - Words', () => {
 		}
 	}
 
-	class InnerMode extends MockMode {
+	class InnerMode extends Disposable {
+
+		public readonly languageId = INNER_LANGUAGE_ID;
+
 		constructor(
+			@ILanguageService languageService: ILanguageService,
 			@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService
 		) {
-			super(INNER_LANGUAGE_ID);
+			super();
+			this._register(languageService.registerLanguage({ id: this.languageId }));
 			this._register(languageConfigurationService.register(this.languageId, {}));
 		}
 	}
diff --git a/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts b/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts
index ffd333033f0..e49e06d804b 100644
--- a/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts
+++ b/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts
@@ -4,20 +4,36 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { EncodedTokenizationResult, ColorId, FontStyle, IState, MetadataConsts, TokenizationRegistry } from 'vs/editor/common/languages';
+import { ILanguageService } from 'vs/editor/common/languages/language';
 import { tokenizeLineToHTML, _tokenizeToString } from 'vs/editor/common/languages/textToHtmlTokenizer';
 import { LanguageIdCodec } from 'vs/editor/common/services/languagesRegistry';
 import { TestLineToken, TestLineTokens } from 'vs/editor/test/common/core/testLineToken';
-import { MockMode } from 'vs/editor/test/common/mocks/mockMode';
+import { createModelServices } from 'vs/editor/test/common/testTextModel';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 
 suite('Editor Modes - textToHtmlTokenizer', () => {
+
+	let disposables: DisposableStore;
+	let instantiationService: TestInstantiationService;
+
+	setup(() => {
+		disposables = new DisposableStore();
+		instantiationService = createModelServices(disposables);
+	});
+
+	teardown(() => {
+		disposables.dispose();
+	});
+
 	function toStr(pieces: { className: string; text: string }[]): string {
 		let resultArr = pieces.map((t) => `<span class="${t.className}">${t.text}</span>`);
 		return resultArr.join('');
 	}
 
 	test('TextToHtmlTokenizer 1', () => {
-		let mode = new Mode();
+		const mode = disposables.add(instantiationService.createInstance(Mode));
 		let support = TokenizationRegistry.get(mode.languageId)!;
 
 		let actual = _tokenizeToString('.abc..def...gh', new LanguageIdCodec(), support);
@@ -32,12 +48,10 @@ suite('Editor Modes - textToHtmlTokenizer', () => {
 		let expectedStr = `<div class="monaco-tokenized-source">${toStr(expected)}</div>`;
 
 		assert.strictEqual(actual, expectedStr);
-
-		mode.dispose();
 	});
 
 	test('TextToHtmlTokenizer 2', () => {
-		let mode = new Mode();
+		const mode = disposables.add(instantiationService.createInstance(Mode));
 		let support = TokenizationRegistry.get(mode.languageId)!;
 
 		let actual = _tokenizeToString('.abc..def...gh\n.abc..def...gh', new LanguageIdCodec(), support);
@@ -62,8 +76,6 @@ suite('Editor Modes - textToHtmlTokenizer', () => {
 		let expectedStr = `<div class="monaco-tokenized-source">${expectedStr1}<br/>${expectedStr2}</div>`;
 
 		assert.strictEqual(actual, expectedStr);
-
-		mode.dispose();
 	});
 
 	test('tokenizeLineToHTML', () => {
@@ -278,12 +290,15 @@ suite('Editor Modes - textToHtmlTokenizer', () => {
 
 });
 
-class Mode extends MockMode {
+class Mode extends Disposable {
 
-	private static readonly _id = 'textToHtmlTokenizerMode';
+	private readonly languageId = 'textToHtmlTokenizerMode';
 
-	constructor() {
-		super(Mode._id);
+	constructor(
+		@ILanguageService languageService: ILanguageService
+	) {
+		super();
+		this._register(languageService.registerLanguage({ id: this.languageId }));
 		this._register(TokenizationRegistry.register(this.languageId, {
 			getInitialState: (): IState => null!,
 			tokenize: undefined!,
diff --git a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
index 8dd03f9c013..4264f60e47e 100644
--- a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
+++ b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
@@ -465,8 +465,8 @@ suite('viewLineRenderer.renderLine', () => {
 
 		const expectedOutput = [
 			'<span class="mtk6">var</span>',
-			'<span dir="auto" class="mtk1">\u00a0קודמות\u00a0=\u00a0</span>',
-			'<span dir="auto" class="mtk20">"מיותר\u00a0קודמות\u00a0צ\'ט\u00a0של,\u00a0אם\u00a0לשון\u00a0העברית\u00a0שינויים\u00a0ויש,\u00a0אם"</span>',
+			'<span style="unicode-bidi:isolate" class="mtk1">\u00a0קודמות\u00a0=\u00a0</span>',
+			'<span style="unicode-bidi:isolate" class="mtk20">"מיותר\u00a0קודמות\u00a0צ\'ט\u00a0של,\u00a0אם\u00a0לשון\u00a0העברית\u00a0שינויים\u00a0ויש,\u00a0אם"</span>',
 			'<span class="mtk1">;</span>'
 		].join('');
 
@@ -519,9 +519,9 @@ suite('viewLineRenderer.renderLine', () => {
 			'<span class="mtk4">\u00a0</span>',
 			'<span class="mtk5">value</span>',
 			'<span class="mtk4">=</span>',
-			'<span dir="auto" class="mtk6">"العربية"</span>',
+			'<span style="unicode-bidi:isolate" class="mtk6">"العربية"</span>',
 			'<span class="mtk2">&gt;</span>',
-			'<span dir="auto" class="mtk4">العربية</span>',
+			'<span style="unicode-bidi:isolate" class="mtk4">العربية</span>',
 			'<span class="mtk2">&lt;/</span>',
 			'<span class="mtk3">option</span>',
 			'<span class="mtk2">&gt;</span>',
@@ -553,6 +553,52 @@ suite('viewLineRenderer.renderLine', () => {
 		assert.strictEqual(_actual.containsRTL, true);
 	});
 
+	test('issue #99589: Rendering whitespace influences bidi layout', () => {
+		const lineText = '    [\"🖨️ چاپ فاکتور\",\"🎨 تنظیمات\"]';
+
+		const lineParts = createViewLineTokens([
+			createPart(5, 2),
+			createPart(21, 3),
+			createPart(22, 2),
+			createPart(34, 3),
+			createPart(35, 2),
+		]);
+
+		const expectedOutput = [
+			'<span class="mtkw">\u00b7\u00b7\u00b7\u00b7</span>',
+			'<span class="mtk2">[</span>',
+			'<span style="unicode-bidi:isolate" class="mtk3">"🖨️\u00a0چاپ\u00a0فاکتور"</span>',
+			'<span class="mtk2">,</span>',
+			'<span style="unicode-bidi:isolate" class="mtk3">"🎨\u00a0تنظیمات"</span>',
+			'<span class="mtk2">]</span>'
+		].join('');
+
+		const _actual = renderViewLine(new RenderLineInput(
+			true,
+			true,
+			lineText,
+			false,
+			false,
+			true,
+			0,
+			lineParts,
+			[],
+			4,
+			0,
+			10,
+			10,
+			10,
+			-1,
+			'all',
+			false,
+			false,
+			null
+		));
+
+		assert.strictEqual(_actual.html, '<span dir="ltr">' + expectedOutput + '</span>');
+		assert.strictEqual(_actual.containsRTL, true);
+	});
+
 	test('issue #6885: Splits large tokens', () => {
 		//                                                                                                                  1         1         1
 		//                        1         2         3         4         5         6         7         8         9         0         1         2
@@ -738,7 +784,7 @@ suite('viewLineRenderer.renderLine', () => {
 		const lineText = 'את גרמנית בהתייחסות שמו, שנתי המשפט אל חפש, אם כתב אחרים ולחבר. של התוכן אודות בויקיפדיה כלל, של עזרה כימיה היא. על עמוד יוצרים מיתולוגיה סדר, אם שכל שתפו לעברית שינויים, אם שאלות אנגלית עזה. שמות בקלות מה סדר.';
 		const lineParts = createViewLineTokens([createPart(lineText.length, 1)]);
 		const expectedOutput = [
-			'<span dir="auto" class="mtk1">את\u00a0גרמנית\u00a0בהתייחסות\u00a0שמו,\u00a0שנתי\u00a0המשפט\u00a0אל\u00a0חפש,\u00a0אם\u00a0כתב\u00a0אחרים\u00a0ולחבר.\u00a0של\u00a0התוכן\u00a0אודות\u00a0בויקיפדיה\u00a0כלל,\u00a0של\u00a0עזרה\u00a0כימיה\u00a0היא.\u00a0על\u00a0עמוד\u00a0יוצרים\u00a0מיתולוגיה\u00a0סדר,\u00a0אם\u00a0שכל\u00a0שתפו\u00a0לעברית\u00a0שינויים,\u00a0אם\u00a0שאלות\u00a0אנגלית\u00a0עזה.\u00a0שמות\u00a0בקלות\u00a0מה\u00a0סדר.</span>'
+			'<span style="unicode-bidi:isolate" class="mtk1">את\u00a0גרמנית\u00a0בהתייחסות\u00a0שמו,\u00a0שנתי\u00a0המשפט\u00a0אל\u00a0חפש,\u00a0אם\u00a0כתב\u00a0אחרים\u00a0ולחבר.\u00a0של\u00a0התוכן\u00a0אודות\u00a0בויקיפדיה\u00a0כלל,\u00a0של\u00a0עזרה\u00a0כימיה\u00a0היא.\u00a0על\u00a0עמוד\u00a0יוצרים\u00a0מיתולוגיה\u00a0סדר,\u00a0אם\u00a0שכל\u00a0שתפו\u00a0לעברית\u00a0שינויים,\u00a0אם\u00a0שאלות\u00a0אנגלית\u00a0עזה.\u00a0שמות\u00a0בקלות\u00a0מה\u00a0סדר.</span>'
 		];
 		const actual = renderViewLine(new RenderLineInput(
 			false,
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 4ce9d88a0d8..c3dab93ceb4 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -3722,6 +3722,10 @@ declare namespace monaco.editor {
 		 * Defaults to true.
 		 */
 		enabled?: boolean;
+		/**
+		 *
+		 */
+		toggle?: 'show' | 'hide' | null;
 		/**
 		 * Font size of inline hints.
 		 * Default to 90% of the editor font size.
diff --git a/src/vs/platform/driver/browser/baseDriver.ts b/src/vs/platform/driver/browser/baseDriver.ts
deleted file mode 100644
index 9875672768a..00000000000
--- a/src/vs/platform/driver/browser/baseDriver.ts
+++ /dev/null
@@ -1,205 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { getClientArea, getTopLeftOffset } from 'vs/base/browser/dom';
-import { coalesce } from 'vs/base/common/arrays';
-import { language, locale } from 'vs/base/common/platform';
-import { IElement, ILocaleInfo, ILocalizedStrings, IWindowDriver } from 'vs/platform/driver/common/driver';
-import localizedStrings from 'vs/platform/localizations/common/localizedStrings';
-
-export abstract class BaseWindowDriver implements IWindowDriver {
-
-	abstract click(selector: string, xoffset?: number, yoffset?: number): Promise<void>;
-	abstract doubleClick(selector: string): Promise<void>;
-
-	async setValue(selector: string, text: string): Promise<void> {
-		const element = document.querySelector(selector);
-
-		if (!element) {
-			return Promise.reject(new Error(`Element not found: ${selector}`));
-		}
-
-		const inputElement = element as HTMLInputElement;
-		inputElement.value = text;
-
-		const event = new Event('input', { bubbles: true, cancelable: true });
-		inputElement.dispatchEvent(event);
-	}
-
-	async getTitle(): Promise<string> {
-		return document.title;
-	}
-
-	async isActiveElement(selector: string): Promise<boolean> {
-		const element = document.querySelector(selector);
-
-		if (element !== document.activeElement) {
-			const chain: string[] = [];
-			let el = document.activeElement;
-
-			while (el) {
-				const tagName = el.tagName;
-				const id = el.id ? `#${el.id}` : '';
-				const classes = coalesce(el.className.split(/\s+/g).map(c => c.trim())).map(c => `.${c}`).join('');
-				chain.unshift(`${tagName}${id}${classes}`);
-
-				el = el.parentElement;
-			}
-
-			throw new Error(`Active element not found. Current active element is '${chain.join(' > ')}'. Looking for ${selector}`);
-		}
-
-		return true;
-	}
-
-	async getElements(selector: string, recursive: boolean): Promise<IElement[]> {
-		const query = document.querySelectorAll(selector);
-		const result: IElement[] = [];
-		for (let i = 0; i < query.length; i++) {
-			const element = query.item(i);
-			result.push(this.serializeElement(element, recursive));
-		}
-
-		return result;
-	}
-
-	private serializeElement(element: Element, recursive: boolean): IElement {
-		const attributes = Object.create(null);
-
-		for (let j = 0; j < element.attributes.length; j++) {
-			const attr = element.attributes.item(j);
-			if (attr) {
-				attributes[attr.name] = attr.value;
-			}
-		}
-
-		const children: IElement[] = [];
-
-		if (recursive) {
-			for (let i = 0; i < element.children.length; i++) {
-				const child = element.children.item(i);
-				if (child) {
-					children.push(this.serializeElement(child, true));
-				}
-			}
-		}
-
-		const { left, top } = getTopLeftOffset(element as HTMLElement);
-
-		return {
-			tagName: element.tagName,
-			className: element.className,
-			textContent: element.textContent || '',
-			attributes,
-			children,
-			left,
-			top
-		};
-	}
-
-	async getElementXY(selector: string, xoffset?: number, yoffset?: number): Promise<{ x: number; y: number }> {
-		const offset = typeof xoffset === 'number' && typeof yoffset === 'number' ? { x: xoffset, y: yoffset } : undefined;
-		return this._getElementXY(selector, offset);
-	}
-
-	async typeInEditor(selector: string, text: string): Promise<void> {
-		const element = document.querySelector(selector);
-
-		if (!element) {
-			throw new Error(`Editor not found: ${selector}`);
-		}
-
-		const textarea = element as HTMLTextAreaElement;
-		const start = textarea.selectionStart;
-		const newStart = start + text.length;
-		const value = textarea.value;
-		const newValue = value.substr(0, start) + text + value.substr(start);
-
-		textarea.value = newValue;
-		textarea.setSelectionRange(newStart, newStart);
-
-		const event = new Event('input', { 'bubbles': true, 'cancelable': true });
-		textarea.dispatchEvent(event);
-	}
-
-	async getTerminalBuffer(selector: string): Promise<string[]> {
-		const element = document.querySelector(selector);
-
-		if (!element) {
-			throw new Error(`Terminal not found: ${selector}`);
-		}
-
-		const xterm = (element as any).xterm;
-
-		if (!xterm) {
-			throw new Error(`Xterm not found: ${selector}`);
-		}
-
-		const lines: string[] = [];
-		for (let i = 0; i < xterm.buffer.active.length; i++) {
-			lines.push(xterm.buffer.active.getLine(i)!.translateToString(true));
-		}
-
-		return lines;
-	}
-
-	async writeInTerminal(selector: string, text: string): Promise<void> {
-		const element = document.querySelector(selector);
-
-		if (!element) {
-			throw new Error(`Element not found: ${selector}`);
-		}
-
-		const xterm = (element as any).xterm;
-
-		if (!xterm) {
-			throw new Error(`Xterm not found: ${selector}`);
-		}
-
-		xterm._core.coreService.triggerDataEvent(text);
-	}
-
-	getLocaleInfo(): Promise<ILocaleInfo> {
-		return Promise.resolve({
-			language: language,
-			locale: locale
-		});
-	}
-
-	getLocalizedStrings(): Promise<ILocalizedStrings> {
-		return Promise.resolve({
-			open: localizedStrings.open,
-			close: localizedStrings.close,
-			find: localizedStrings.find
-		});
-	}
-
-	protected async _getElementXY(selector: string, offset?: { x: number; y: number }): Promise<{ x: number; y: number }> {
-		const element = document.querySelector(selector);
-
-		if (!element) {
-			return Promise.reject(new Error(`Element not found: ${selector}`));
-		}
-
-		const { left, top } = getTopLeftOffset(element as HTMLElement);
-		const { width, height } = getClientArea(element as HTMLElement);
-		let x: number, y: number;
-
-		if (offset) {
-			x = left + offset.x;
-			y = top + offset.y;
-		} else {
-			x = left + (width / 2);
-			y = top + (height / 2);
-		}
-
-		x = Math.round(x);
-		y = Math.round(y);
-
-		return { x, y };
-	}
-
-	abstract openDevTools(): Promise<void>;
-}
diff --git a/src/vs/platform/driver/browser/driver.ts b/src/vs/platform/driver/browser/driver.ts
index 7027a0d37b6..c57855c3828 100644
--- a/src/vs/platform/driver/browser/driver.ts
+++ b/src/vs/platform/driver/browser/driver.ts
@@ -3,23 +3,210 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { BaseWindowDriver } from 'vs/platform/driver/browser/baseDriver';
+import { getClientArea, getTopLeftOffset } from 'vs/base/browser/dom';
+import { coalesce } from 'vs/base/common/arrays';
+import { language, locale } from 'vs/base/common/platform';
+import { IElement, ILocaleInfo, ILocalizedStrings, IWindowDriver } from 'vs/platform/driver/common/driver';
+import localizedStrings from 'vs/platform/localizations/common/localizedStrings';
 
-class BrowserWindowDriver extends BaseWindowDriver {
-	click(selector: string, xoffset?: number | undefined, yoffset?: number | undefined): Promise<void> {
-		throw new Error('Method not implemented.');
+export class BrowserWindowDriver implements IWindowDriver {
+
+	async setValue(selector: string, text: string): Promise<void> {
+		const element = document.querySelector(selector);
+
+		if (!element) {
+			return Promise.reject(new Error(`Element not found: ${selector}`));
+		}
+
+		const inputElement = element as HTMLInputElement;
+		inputElement.value = text;
+
+		const event = new Event('input', { bubbles: true, cancelable: true });
+		inputElement.dispatchEvent(event);
 	}
-	doubleClick(selector: string): Promise<void> {
-		throw new Error('Method not implemented.');
+
+	async getTitle(): Promise<string> {
+		return document.title;
 	}
-	openDevTools(): Promise<void> {
+
+	async isActiveElement(selector: string): Promise<boolean> {
+		const element = document.querySelector(selector);
+
+		if (element !== document.activeElement) {
+			const chain: string[] = [];
+			let el = document.activeElement;
+
+			while (el) {
+				const tagName = el.tagName;
+				const id = el.id ? `#${el.id}` : '';
+				const classes = coalesce(el.className.split(/\s+/g).map(c => c.trim())).map(c => `.${c}`).join('');
+				chain.unshift(`${tagName}${id}${classes}`);
+
+				el = el.parentElement;
+			}
+
+			throw new Error(`Active element not found. Current active element is '${chain.join(' > ')}'. Looking for ${selector}`);
+		}
+
+		return true;
+	}
+
+	async getElements(selector: string, recursive: boolean): Promise<IElement[]> {
+		const query = document.querySelectorAll(selector);
+		const result: IElement[] = [];
+		for (let i = 0; i < query.length; i++) {
+			const element = query.item(i);
+			result.push(this.serializeElement(element, recursive));
+		}
+
+		return result;
+	}
+
+	private serializeElement(element: Element, recursive: boolean): IElement {
+		const attributes = Object.create(null);
+
+		for (let j = 0; j < element.attributes.length; j++) {
+			const attr = element.attributes.item(j);
+			if (attr) {
+				attributes[attr.name] = attr.value;
+			}
+		}
+
+		const children: IElement[] = [];
+
+		if (recursive) {
+			for (let i = 0; i < element.children.length; i++) {
+				const child = element.children.item(i);
+				if (child) {
+					children.push(this.serializeElement(child, true));
+				}
+			}
+		}
+
+		const { left, top } = getTopLeftOffset(element as HTMLElement);
+
+		return {
+			tagName: element.tagName,
+			className: element.className,
+			textContent: element.textContent || '',
+			attributes,
+			children,
+			left,
+			top
+		};
+	}
+
+	async getElementXY(selector: string, xoffset?: number, yoffset?: number): Promise<{ x: number; y: number }> {
+		const offset = typeof xoffset === 'number' && typeof yoffset === 'number' ? { x: xoffset, y: yoffset } : undefined;
+		return this._getElementXY(selector, offset);
+	}
+
+	async typeInEditor(selector: string, text: string): Promise<void> {
+		const element = document.querySelector(selector);
+
+		if (!element) {
+			throw new Error(`Editor not found: ${selector}`);
+		}
+
+		const textarea = element as HTMLTextAreaElement;
+		const start = textarea.selectionStart;
+		const newStart = start + text.length;
+		const value = textarea.value;
+		const newValue = value.substr(0, start) + text + value.substr(start);
+
+		textarea.value = newValue;
+		textarea.setSelectionRange(newStart, newStart);
+
+		const event = new Event('input', { 'bubbles': true, 'cancelable': true });
+		textarea.dispatchEvent(event);
+	}
+
+	async getTerminalBuffer(selector: string): Promise<string[]> {
+		const element = document.querySelector(selector);
+
+		if (!element) {
+			throw new Error(`Terminal not found: ${selector}`);
+		}
+
+		const xterm = (element as any).xterm;
+
+		if (!xterm) {
+			throw new Error(`Xterm not found: ${selector}`);
+		}
+
+		const lines: string[] = [];
+		for (let i = 0; i < xterm.buffer.active.length; i++) {
+			lines.push(xterm.buffer.active.getLine(i)!.translateToString(true));
+		}
+
+		return lines;
+	}
+
+	async writeInTerminal(selector: string, text: string): Promise<void> {
+		const element = document.querySelector(selector);
+
+		if (!element) {
+			throw new Error(`Element not found: ${selector}`);
+		}
+
+		const xterm = (element as any).xterm;
+
+		if (!xterm) {
+			throw new Error(`Xterm not found: ${selector}`);
+		}
+
+		xterm._core.coreService.triggerDataEvent(text);
+	}
+
+	getLocaleInfo(): Promise<ILocaleInfo> {
+		return Promise.resolve({
+			language: language,
+			locale: locale
+		});
+	}
+
+	getLocalizedStrings(): Promise<ILocalizedStrings> {
+		return Promise.resolve({
+			open: localizedStrings.open,
+			close: localizedStrings.close,
+			find: localizedStrings.find
+		});
+	}
+
+	protected async _getElementXY(selector: string, offset?: { x: number; y: number }): Promise<{ x: number; y: number }> {
+		const element = document.querySelector(selector);
+
+		if (!element) {
+			return Promise.reject(new Error(`Element not found: ${selector}`));
+		}
+
+		const { left, top } = getTopLeftOffset(element as HTMLElement);
+		const { width, height } = getClientArea(element as HTMLElement);
+		let x: number, y: number;
+
+		if (offset) {
+			x = left + offset.x;
+			y = top + offset.y;
+		} else {
+			x = left + (width / 2);
+			y = top + (height / 2);
+		}
+
+		x = Math.round(x);
+		y = Math.round(y);
+
+		return { x, y };
+	}
+
+	click(selector: string, xoffset?: number, yoffset?: number): Promise<void> {
+
+		// This is actually not used in the playwright drivers
+		// that can implement `click` natively via the driver
+
 		throw new Error('Method not implemented.');
 	}
 }
 
-export async function registerWindowDriver(): Promise<IDisposable> {
-	(<any>window).driver = new BrowserWindowDriver();
-
-	return Disposable.None;
+export function registerWindowDriver(): void {
+	Object.assign(window, { driver: new BrowserWindowDriver() });
 }
diff --git a/src/vs/platform/driver/common/driver.ts b/src/vs/platform/driver/common/driver.ts
index ca36bc4409b..264ed83ec8b 100644
--- a/src/vs/platform/driver/common/driver.ts
+++ b/src/vs/platform/driver/common/driver.ts
@@ -40,14 +40,11 @@ export interface IDriver {
 	readonly _serviceBrand: undefined;
 
 	getWindowIds(): Promise<number[]>;
-	capturePage(windowId: number): Promise<string>;
 	startTracing(windowId: number, name: string): Promise<void>;
 	stopTracing(windowId: number, name: string, persist: boolean): Promise<void>;
-	reloadWindow(windowId: number): Promise<void>;
-	exitApplication(): Promise<boolean>;
+	exitApplication(): Promise<number /* main PID */>;
 	dispatchKeybinding(windowId: number, keybinding: string): Promise<void>;
 	click(windowId: number, selector: string, xoffset?: number | undefined, yoffset?: number | undefined): Promise<void>;
-	doubleClick(windowId: number, selector: string): Promise<void>;
 	setValue(windowId: number, selector: string, text: string): Promise<void>;
 	getTitle(windowId: number): Promise<string>;
 	isActiveElement(windowId: number, selector: string): Promise<boolean>;
@@ -62,7 +59,6 @@ export interface IDriver {
 
 export interface IWindowDriver {
 	click(selector: string, xoffset?: number | undefined, yoffset?: number | undefined): Promise<void>;
-	doubleClick(selector: string): Promise<void>;
 	setValue(selector: string, text: string): Promise<void>;
 	getTitle(): Promise<string>;
 	isActiveElement(selector: string): Promise<boolean>;
@@ -79,11 +75,7 @@ export interface IWindowDriver {
 export const ID = 'driverService';
 export const IDriver = createDecorator<IDriver>(ID);
 
-export interface IDriverOptions {
-	verbose: boolean;
-}
-
 export interface IWindowDriverRegistry {
-	registerWindowDriver(windowId: number): Promise<IDriverOptions>;
+	registerWindowDriver(windowId: number): Promise<void>;
 	reloadWindowDriver(windowId: number): Promise<void>;
 }
diff --git a/src/vs/platform/driver/common/driverIpc.ts b/src/vs/platform/driver/common/driverIpc.ts
index 49593c75882..6d5ed5e55c4 100644
--- a/src/vs/platform/driver/common/driverIpc.ts
+++ b/src/vs/platform/driver/common/driverIpc.ts
@@ -5,7 +5,7 @@
 
 import { Event } from 'vs/base/common/event';
 import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IDriverOptions, IElement, ILocaleInfo, ILocalizedStrings as ILocalizedStrings, IWindowDriver, IWindowDriverRegistry } from 'vs/platform/driver/common/driver';
+import { IElement, ILocaleInfo, ILocalizedStrings as ILocalizedStrings, IWindowDriver, IWindowDriverRegistry } from 'vs/platform/driver/common/driver';
 
 export class WindowDriverChannel implements IServerChannel {
 
@@ -18,7 +18,6 @@ export class WindowDriverChannel implements IServerChannel {
 	call(_: unknown, command: string, arg?: any): Promise<any> {
 		switch (command) {
 			case 'click': return this.driver.click(arg[0], arg[1], arg[2]);
-			case 'doubleClick': return this.driver.doubleClick(arg);
 			case 'setValue': return this.driver.setValue(arg[0], arg[1]);
 			case 'getTitle': return this.driver.getTitle();
 			case 'isActiveElement': return this.driver.isActiveElement(arg);
@@ -45,10 +44,6 @@ export class WindowDriverChannelClient implements IWindowDriver {
 		return this.channel.call('click', [selector, xoffset, yoffset]);
 	}
 
-	doubleClick(selector: string): Promise<void> {
-		return this.channel.call('doubleClick', selector);
-	}
-
 	setValue(selector: string, text: string): Promise<void> {
 		return this.channel.call('setValue', [selector, text]);
 	}
@@ -96,7 +91,7 @@ export class WindowDriverRegistryChannelClient implements IWindowDriverRegistry
 
 	constructor(private channel: IChannel) { }
 
-	registerWindowDriver(windowId: number): Promise<IDriverOptions> {
+	registerWindowDriver(windowId: number): Promise<void> {
 		return this.channel.call('registerWindowDriver', windowId);
 	}
 
diff --git a/src/vs/platform/driver/electron-main/driver.ts b/src/vs/platform/driver/electron-main/driver.ts
index aa1e5f6ee79..c071bf0cf1c 100644
--- a/src/vs/platform/driver/electron-main/driver.ts
+++ b/src/vs/platform/driver/electron-main/driver.ts
@@ -12,7 +12,7 @@ import { combinedDisposable, IDisposable } from 'vs/base/common/lifecycle';
 import { OS } from 'vs/base/common/platform';
 import { IPCServer, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
 import { serve as serveNet } from 'vs/base/parts/ipc/node/ipc.net';
-import { IDriver, IDriverOptions, IElement, ILocaleInfo, ILocalizedStrings, IWindowDriver, IWindowDriverRegistry } from 'vs/platform/driver/common/driver';
+import { IDriver, IElement, ILocaleInfo, ILocalizedStrings, IWindowDriver, IWindowDriverRegistry } from 'vs/platform/driver/common/driver';
 import { WindowDriverChannelClient } from 'vs/platform/driver/common/driverIpc';
 import { DriverChannel, WindowDriverRegistryChannel } from 'vs/platform/driver/node/driver';
 import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
@@ -40,7 +40,6 @@ export class Driver implements IDriver, IWindowDriverRegistry {
 
 	constructor(
 		private windowServer: IPCServer,
-		private options: IDriverOptions,
 		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
 		@ILifecycleMainService private readonly lifecycleMainService: ILifecycleMainService,
 		@IFileService private readonly fileService: IFileService,
@@ -48,13 +47,12 @@ export class Driver implements IDriver, IWindowDriverRegistry {
 		@ILogService private readonly logService: ILogService
 	) { }
 
-	async registerWindowDriver(windowId: number): Promise<IDriverOptions> {
+	async registerWindowDriver(windowId: number): Promise<void> {
 		this.logService.info(`[driver] registerWindowDriver(${windowId})`);
 
 		this.registeredWindowIds.add(windowId);
 		this.reloadingWindowIds.delete(windowId);
 		this.onDidReloadingChange.fire();
-		return this.options;
 	}
 
 	async reloadWindowDriver(windowId: number): Promise<void> {
@@ -71,16 +69,6 @@ export class Driver implements IDriver, IWindowDriverRegistry {
 		return windowIds;
 	}
 
-	async capturePage(windowId: number): Promise<string> {
-		const window = this.windowsMainService.getWindowById(windowId) ?? this.windowsMainService.getLastActiveWindow(); // fallback to active window to ensure we capture window
-		if (!window?.win) {
-			throw new Error('Invalid window');
-		}
-
-		const webContents = window.win.webContents;
-		const image = await webContents.capturePage();
-		return image.toPNG().toString('base64');
-	}
 
 	async startTracing(windowId: number, name: string): Promise<void> {
 		// ignore - tracing is not implemented yet
@@ -97,24 +85,23 @@ export class Driver implements IDriver, IWindowDriverRegistry {
 		await this.fileService.writeFile(URI.file(join(this.environmentMainService.logsPath, `${name}.png`)), VSBuffer.wrap(buffer));
 	}
 
-	async reloadWindow(windowId: number): Promise<void> {
-		this.logService.info(`[driver] reloadWindow(${windowId})`);
-
-		await this.whenUnfrozen(windowId);
-
-		const window = this.windowsMainService.getWindowById(windowId);
-		if (!window) {
+	private async capturePage(windowId: number): Promise<string> {
+		const window = this.windowsMainService.getWindowById(windowId) ?? this.windowsMainService.getLastActiveWindow(); // fallback to active window to ensure we capture window
+		if (!window?.win) {
 			throw new Error('Invalid window');
 		}
 
-		this.reloadingWindowIds.add(windowId);
-		this.lifecycleMainService.reload(window);
+		const webContents = window.win.webContents;
+		const image = await webContents.capturePage();
+		return image.toPNG().toString('base64');
 	}
 
-	exitApplication(): Promise<boolean> {
+	async exitApplication(): Promise<number> {
 		this.logService.info(`[driver] exitApplication()`);
 
-		return this.lifecycleMainService.quit();
+		this.lifecycleMainService.quit();
+
+		return process.pid;
 	}
 
 	async dispatchKeybinding(windowId: number, keybinding: string): Promise<void> {
@@ -175,11 +162,6 @@ export class Driver implements IDriver, IWindowDriverRegistry {
 		await windowDriver.click(selector, xoffset, yoffset);
 	}
 
-	async doubleClick(windowId: number, selector: string): Promise<void> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		await windowDriver.doubleClick(selector);
-	}
-
 	async setValue(windowId: number, selector: string, text: string): Promise<void> {
 		const windowDriver = await this.getWindowDriver(windowId);
 		await windowDriver.setValue(selector, text);
@@ -249,11 +231,9 @@ export class Driver implements IDriver, IWindowDriverRegistry {
 export async function serve(
 	windowServer: IPCServer,
 	handle: string,
-	environmentMainService: IEnvironmentMainService,
 	instantiationService: IInstantiationService
 ): Promise<IDisposable> {
-	const verbose = environmentMainService.driverVerbose;
-	const driver = instantiationService.createInstance(Driver, windowServer, { verbose });
+	const driver = instantiationService.createInstance(Driver, windowServer);
 
 	const windowDriverRegistryChannel = new WindowDriverRegistryChannel(driver);
 	windowServer.registerChannel('windowDriverRegistry', windowDriverRegistryChannel);
diff --git a/src/vs/platform/driver/electron-sandbox/driver.ts b/src/vs/platform/driver/electron-sandbox/driver.ts
index 84bc965bd9b..bc2e4c9ae38 100644
--- a/src/vs/platform/driver/electron-sandbox/driver.ts
+++ b/src/vs/platform/driver/electron-sandbox/driver.ts
@@ -5,13 +5,32 @@
 
 import { timeout } from 'vs/base/common/async';
 import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { BaseWindowDriver } from 'vs/platform/driver/browser/baseDriver';
+import { BrowserWindowDriver } from 'vs/platform/driver/browser/driver';
 import { WindowDriverChannel, WindowDriverRegistryChannelClient } from 'vs/platform/driver/common/driverIpc';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services';
 import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
 
-class WindowDriver extends BaseWindowDriver {
+interface INativeWindowDriverHelper {
+	exitApplication(): Promise<number /* main process PID */>;
+}
+
+class NativeWindowDriver extends BrowserWindowDriver {
+
+	constructor(private readonly helper: INativeWindowDriverHelper) {
+		super();
+	}
+
+	exitApplication(): Promise<number> {
+		return this.helper.exitApplication();
+	}
+}
+
+export function registerWindowDriver(helper: INativeWindowDriverHelper): void {
+	Object.assign(window, { driver: new NativeWindowDriver(helper) });
+}
+
+class LegacyNativeWindowDriver extends BrowserWindowDriver {
 
 	constructor(
 		@INativeHostService private readonly nativeHostService: INativeHostService
@@ -19,16 +38,13 @@ class WindowDriver extends BaseWindowDriver {
 		super();
 	}
 
-	click(selector: string, xoffset?: number, yoffset?: number): Promise<void> {
+	override click(selector: string, xoffset?: number, yoffset?: number): Promise<void> {
 		const offset = typeof xoffset === 'number' && typeof yoffset === 'number' ? { x: xoffset, y: yoffset } : undefined;
-		return this._click(selector, 1, offset);
+
+		return this.doClick(selector, 1, offset);
 	}
 
-	doubleClick(selector: string): Promise<void> {
-		return this._click(selector, 2);
-	}
-
-	private async _click(selector: string, clickCount: number, offset?: { x: number; y: number }): Promise<void> {
+	private async doClick(selector: string, clickCount: number, offset?: { x: number; y: number }): Promise<void> {
 		const { x, y } = await this._getElementXY(selector, offset);
 
 		await this.nativeHostService.sendInputEvent({ type: 'mouseDown', x, y, button: 'left', clickCount } as any);
@@ -37,17 +53,19 @@ class WindowDriver extends BaseWindowDriver {
 		await this.nativeHostService.sendInputEvent({ type: 'mouseUp', x, y, button: 'left', clickCount } as any);
 		await timeout(100);
 	}
-
-	async openDevTools(): Promise<void> {
-		await this.nativeHostService.openDevTools({ mode: 'detach' });
-	}
 }
 
-export async function registerWindowDriver(accessor: ServicesAccessor, windowId: number): Promise<IDisposable> {
+/**
+ * Old school window driver that is implemented by us
+ * from the main process.
+ *
+ * @deprecated
+ */
+export async function registerLegacyWindowDriver(accessor: ServicesAccessor, windowId: number): Promise<IDisposable> {
 	const instantiationService = accessor.get(IInstantiationService);
 	const mainProcessService = accessor.get(IMainProcessService);
 
-	const windowDriver = instantiationService.createInstance(WindowDriver);
+	const windowDriver = instantiationService.createInstance(LegacyNativeWindowDriver);
 	const windowDriverChannel = new WindowDriverChannel(windowDriver);
 	mainProcessService.registerChannel('windowDriver', windowDriverChannel);
 
diff --git a/src/vs/platform/driver/node/driver.ts b/src/vs/platform/driver/node/driver.ts
index 4e56bc540e4..1542e503f1d 100644
--- a/src/vs/platform/driver/node/driver.ts
+++ b/src/vs/platform/driver/node/driver.ts
@@ -20,14 +20,11 @@ export class DriverChannel implements IServerChannel {
 	call(_: unknown, command: string, arg?: any): Promise<any> {
 		switch (command) {
 			case 'getWindowIds': return this.driver.getWindowIds();
-			case 'capturePage': return this.driver.capturePage(arg);
 			case 'startTracing': return this.driver.startTracing(arg[0], arg[1]);
 			case 'stopTracing': return this.driver.stopTracing(arg[0], arg[1], arg[2]);
-			case 'reloadWindow': return this.driver.reloadWindow(arg);
 			case 'exitApplication': return this.driver.exitApplication();
 			case 'dispatchKeybinding': return this.driver.dispatchKeybinding(arg[0], arg[1]);
 			case 'click': return this.driver.click(arg[0], arg[1], arg[2], arg[3]);
-			case 'doubleClick': return this.driver.doubleClick(arg[0], arg[1]);
 			case 'setValue': return this.driver.setValue(arg[0], arg[1], arg[2]);
 			case 'getTitle': return this.driver.getTitle(arg[0]);
 			case 'isActiveElement': return this.driver.isActiveElement(arg[0], arg[1]);
@@ -54,10 +51,6 @@ export class DriverChannelClient implements IDriver {
 		return this.channel.call('getWindowIds');
 	}
 
-	capturePage(windowId: number): Promise<string> {
-		return this.channel.call('capturePage', windowId);
-	}
-
 	startTracing(windowId: number, name: string): Promise<void> {
 		return this.channel.call('startTracing', [windowId, name]);
 	}
@@ -66,11 +59,7 @@ export class DriverChannelClient implements IDriver {
 		return this.channel.call('stopTracing', [windowId, name, persist]);
 	}
 
-	reloadWindow(windowId: number): Promise<void> {
-		return this.channel.call('reloadWindow', windowId);
-	}
-
-	exitApplication(): Promise<boolean> {
+	exitApplication(): Promise<number> {
 		return this.channel.call('exitApplication');
 	}
 
@@ -82,10 +71,6 @@ export class DriverChannelClient implements IDriver {
 		return this.channel.call('click', [windowId, selector, xoffset, yoffset]);
 	}
 
-	doubleClick(windowId: number, selector: string): Promise<void> {
-		return this.channel.call('doubleClick', [windowId, selector]);
-	}
-
 	setValue(windowId: number, selector: string, text: string): Promise<void> {
 		return this.channel.call('setValue', [windowId, selector, text]);
 	}
diff --git a/src/vs/platform/environment/common/argv.ts b/src/vs/platform/environment/common/argv.ts
index 4815b4a2888..ccac10545b5 100644
--- a/src/vs/platform/environment/common/argv.ts
+++ b/src/vs/platform/environment/common/argv.ts
@@ -79,8 +79,11 @@ export interface NativeParsedArgs {
 	'max-memory'?: string;
 	'file-write'?: boolean;
 	'file-chmod'?: boolean;
+	/**
+	 * @deprecated use `enable-smoke-test-driver`
+	 */
 	'driver'?: string;
-	'driver-verbose'?: boolean;
+	'enable-smoke-test-driver'?: boolean;
 	'remote'?: string;
 	'force'?: boolean;
 	'do-not-sync'?: boolean;
diff --git a/src/vs/platform/environment/electron-main/environmentMainService.ts b/src/vs/platform/environment/electron-main/environmentMainService.ts
index beb1896fa2b..6834b8115fe 100644
--- a/src/vs/platform/environment/electron-main/environmentMainService.ts
+++ b/src/vs/platform/environment/electron-main/environmentMainService.ts
@@ -35,7 +35,6 @@ export interface IEnvironmentMainService extends INativeEnvironmentService {
 
 	// --- config
 	sandbox: boolean;
-	driverVerbose: boolean;
 	disableUpdates: boolean;
 }
 
@@ -59,9 +58,6 @@ export class EnvironmentMainService extends NativeEnvironmentService implements
 	@memoize
 	get sandbox(): boolean { return !!this.args['__sandbox']; }
 
-	@memoize
-	get driverVerbose(): boolean { return !!this.args['driver-verbose']; }
-
 	@memoize
 	get disableUpdates(): boolean { return !!this.args['disable-updates']; }
 
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
index c671917d1a4..1d7aadc1f14 100644
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -99,6 +99,7 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'export-default-configuration': { type: 'string' },
 	'install-source': { type: 'string' },
 	'driver': { type: 'string' },
+	'enable-smoke-test-driver': { type: 'boolean' },
 	'logExtensionHostCommunication': { type: 'boolean' },
 	'skip-release-notes': { type: 'boolean' },
 	'skip-welcome': { type: 'boolean' },
@@ -114,7 +115,6 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'open-url': { type: 'boolean' },
 	'file-write': { type: 'boolean' },
 	'file-chmod': { type: 'boolean' },
-	'driver-verbose': { type: 'boolean' },
 	'install-builtin-extension': { type: 'string[]' },
 	'force': { type: 'boolean' },
 	'do-not-sync': { type: 'boolean' },
diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index 1b75291e899..028d33a315c 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -238,7 +238,7 @@ export interface IFileService {
 	 * Note: recursive file watching is not supported from this method. Only events from files
 	 * that are direct children of the provided resource will be reported.
 	 */
-	watch(resource: URI): IDisposable;
+	watch(resource: URI, options?: IWatchOptions): IDisposable;
 
 	/**
 	 * Frees up any resources occupied by this service.
diff --git a/src/vs/platform/terminal/common/terminalProfiles.ts b/src/vs/platform/terminal/common/terminalProfiles.ts
index 1b4d411e501..37b166d82c1 100644
--- a/src/vs/platform/terminal/common/terminalProfiles.ts
+++ b/src/vs/platform/terminal/common/terminalProfiles.ts
@@ -5,19 +5,24 @@
 
 import { Codicon } from 'vs/base/common/codicons';
 import { URI, UriComponents } from 'vs/base/common/uri';
+import { localize } from 'vs/nls';
 import { IExtensionTerminalProfile, ITerminalProfile, TerminalIcon } from 'vs/platform/terminal/common/terminal';
 import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 
 export function createProfileSchemaEnums(detectedProfiles: ITerminalProfile[], extensionProfiles?: readonly IExtensionTerminalProfile[]): {
-	values: string[] | undefined;
+	values: (string | null)[] | undefined;
 	markdownDescriptions: string[] | undefined;
 } {
-	const result = detectedProfiles.map(e => {
+	const result: { name: string | null; description: string }[] = [{
+		name: null,
+		description: localize('terminalAutomaticProfile', 'Automatically detect the default')
+	}];
+	result.push(...detectedProfiles.map(e => {
 		return {
 			name: e.profileName,
 			description: createProfileDescription(e)
 		};
-	});
+	}));
 	if (extensionProfiles) {
 		result.push(...extensionProfiles.map(extensionProfile => {
 			return {
diff --git a/src/vs/platform/terminal/test/common/terminalProfiles.test.ts b/src/vs/platform/terminal/test/common/terminalProfiles.test.ts
index c6f7520c0ed..4720794b4f8 100644
--- a/src/vs/platform/terminal/test/common/terminalProfiles.test.ts
+++ b/src/vs/platform/terminal/test/common/terminalProfiles.test.ts
@@ -12,8 +12,12 @@ suite('terminalProfiles', () => {
 	suite('createProfileSchemaEnums', () => {
 		test('should return an empty array when there are no profiles', () => {
 			deepStrictEqual(createProfileSchemaEnums([]), {
-				values: [],
-				markdownDescriptions: []
+				values: [
+					null
+				],
+				markdownDescriptions: [
+					'Automatically detect the default'
+				]
 			});
 		});
 		test('should return a single entry when there is one profile', () => {
@@ -23,8 +27,14 @@ suite('terminalProfiles', () => {
 				isDefault: true
 			};
 			deepStrictEqual(createProfileSchemaEnums([profile]), {
-				values: ['name'],
-				markdownDescriptions: ['$(terminal) name\n- path: path']
+				values: [
+					null,
+					'name'
+				],
+				markdownDescriptions: [
+					'Automatically detect the default',
+					'$(terminal) name\n- path: path'
+				]
 			});
 		});
 		test('should show all profile information', () => {
@@ -42,8 +52,14 @@ suite('terminalProfiles', () => {
 				overrideName: true
 			};
 			deepStrictEqual(createProfileSchemaEnums([profile]), {
-				values: ['name'],
-				markdownDescriptions: [`$(zap) name\n- path: path\n- args: ['a','b']\n- overrideName: true\n- color: terminal.ansiRed\n- env: {\"c\":\"d\",\"e\":\"f\"}`]
+				values: [
+					null,
+					'name'
+				],
+				markdownDescriptions: [
+					'Automatically detect the default',
+					`$(zap) name\n- path: path\n- args: ['a','b']\n- overrideName: true\n- color: terminal.ansiRed\n- env: {\"c\":\"d\",\"e\":\"f\"}`
+				]
 			});
 		});
 		test('should return a multiple entries when there are multiple profiles', () => {
@@ -58,8 +74,13 @@ suite('terminalProfiles', () => {
 				isDefault: false
 			};
 			deepStrictEqual(createProfileSchemaEnums([profile1, profile2]), {
-				values: ['name', 'foo'],
+				values: [
+					null,
+					'name',
+					'foo'
+				],
 				markdownDescriptions: [
+					'Automatically detect the default',
 					'$(terminal) name\n- path: path',
 					'$(terminal) foo\n- path: bar'
 				]
diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts
index a75435972fc..caf8e6786d8 100644
--- a/src/vs/platform/theme/common/colorRegistry.ts
+++ b/src/vs/platform/theme/common/colorRegistry.ts
@@ -289,7 +289,7 @@ export const editorErrorForeground = registerColor('editorError.foreground', { d
 export const editorErrorBorder = registerColor('editorError.border', { dark: null, light: null, hcDark: Color.fromHex('#E47777').transparent(0.8), hcLight: '#B5200D' }, nls.localize('errorBorder', 'Border color of error boxes in the editor.'));
 
 export const editorWarningBackground = registerColor('editorWarning.background', { dark: null, light: null, hcDark: null, hcLight: null }, nls.localize('editorWarning.background', 'Background color of warning text in the editor. The color must not be opaque so as not to hide underlying decorations.'), true);
-export const editorWarningForeground = registerColor('editorWarning.foreground', { dark: '#CCA700', light: '#BF8803', hcDark: '#FFD3700', hcLight: '#895503' }, nls.localize('editorWarning.foreground', 'Foreground color of warning squigglies in the editor.'));
+export const editorWarningForeground = registerColor('editorWarning.foreground', { dark: '#CCA700', light: '#BF8803', hcDark: '#FFD37', hcLight: '#895503' }, nls.localize('editorWarning.foreground', 'Foreground color of warning squigglies in the editor.'));
 export const editorWarningBorder = registerColor('editorWarning.border', { dark: null, light: null, hcDark: Color.fromHex('#FFCC00').transparent(0.8), hcLight: '#' }, nls.localize('warningBorder', 'Border color of warning boxes in the editor.'));
 
 export const editorInfoBackground = registerColor('editorInfo.background', { dark: null, light: null, hcDark: null, hcLight: null }, nls.localize('editorInfo.background', 'Background color of info text in the editor. The color must not be opaque so as not to hide underlying decorations.'), true);
diff --git a/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts b/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts
index 8c2a77ecd84..12b5786f94f 100644
--- a/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts
@@ -304,7 +304,7 @@ export class MainThreadDocumentsAndEditors {
 		this._mainThreadDocuments = this._toDispose.add(new MainThreadDocuments(extHostContext, this._modelService, this._textFileService, fileService, textModelResolverService, environmentService, uriIdentityService, workingCopyFileService, pathService));
 		extHostContext.set(MainContext.MainThreadDocuments, this._mainThreadDocuments);
 
-		this._mainThreadEditors = this._toDispose.add(new MainThreadTextEditors(this, extHostContext, codeEditorService, this._editorService, this._editorGroupService, instantiationService));
+		this._mainThreadEditors = this._toDispose.add(new MainThreadTextEditors(this, extHostContext, codeEditorService, this._editorService, this._editorGroupService));
 		extHostContext.set(MainContext.MainThreadTextEditors, this._mainThreadEditors);
 
 		// It is expected that the ctor of the state computer calls our `_onDelta`.
diff --git a/src/vs/workbench/api/browser/mainThreadEditorTabs.ts b/src/vs/workbench/api/browser/mainThreadEditorTabs.ts
index f3677aec085..87874ba6c8e 100644
--- a/src/vs/workbench/api/browser/mainThreadEditorTabs.ts
+++ b/src/vs/workbench/api/browser/mainThreadEditorTabs.ts
@@ -561,5 +561,22 @@ export class MainThreadEditorTabs implements MainThreadEditorTabsShape {
 		// TODO @jrieken This isn't quite right how can we say true for some but not others?
 		return results.every(result => result);
 	}
+
+	async $closeGroup(groupIds: number[], preserveFocus?: boolean): Promise<boolean> {
+		const groupCloseResults: boolean[] = [];
+		for (const groupId of groupIds) {
+			const group = this._editorGroupsService.getGroup(groupId);
+			if (group) {
+				// TODO @lramos15 change this to use group.closeAllEditors once it
+				// is enriched to return a boolean
+				groupCloseResults.push(await group.closeEditors([...group.editors], { preserveFocus }));
+				// Make sure group is empty but still there before removing it
+				if (group.count === 0 && this._editorGroupsService.getGroup(group.id)) {
+					this._editorGroupsService.removeGroup(group);
+				}
+			}
+		}
+		return groupCloseResults.every(result => result);
+	}
 	//#endregion
 }
diff --git a/src/vs/workbench/api/browser/mainThreadEditors.ts b/src/vs/workbench/api/browser/mainThreadEditors.ts
index e44487a63f7..80babfd1c70 100644
--- a/src/vs/workbench/api/browser/mainThreadEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadEditors.ts
@@ -14,7 +14,7 @@ import { IDecorationOptions, IDecorationRenderOptions } from 'vs/editor/common/e
 import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { ITextEditorOptions, IResourceEditorInput, EditorActivation, EditorResolution } from 'vs/platform/editor/common/editor';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { MainThreadTextEditor } from 'vs/workbench/api/browser/mainThreadEditor';
 import { ExtHostContext, ExtHostEditorsShape, IApplyEditsOptions, ITextDocumentShowOptions, ITextEditorConfigurationUpdate, ITextEditorPositionData, IUndoStopOptions, MainThreadTextEditorsShape, TextEditorRevealType } from 'vs/workbench/api/common/extHost.protocol';
 import { editorGroupToColumn, columnToEditorGroup, EditorGroupColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
@@ -27,13 +27,6 @@ import { ILineChange } from 'vs/editor/common/diff/diffComputer';
 import { IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
 import { IEditorControl } from 'vs/workbench/common/editor';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { DataTransferConverter } from 'vs/workbench/api/common/shared/dataTransfer';
-import { IPosition } from 'vs/editor/common/core/position';
-import { IDataTransfer, IDataTransferItem } from 'vs/workbench/common/dnd';
-import { extractEditorsDropData } from 'vs/workbench/browser/dnd';
-import { Mimes } from 'vs/base/common/mime';
-import { distinct } from 'vs/base/common/arrays';
-import { performSnippetEdit } from 'vs/editor/contrib/snippet/browser/snippetController2';
 
 export interface IMainThreadEditorLocator {
 	getEditor(id: string): MainThreadTextEditor | undefined;
@@ -51,7 +44,6 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 	private _textEditorsListenersMap: { [editorId: string]: IDisposable[] };
 	private _editorPositionData: ITextEditorPositionData | null;
 	private _registeredDecorationTypes: { [decorationType: string]: boolean };
-	private readonly _dropIntoEditorListeners = new Map<ICodeEditor, IDisposable>();
 
 	constructor(
 		private readonly _editorLocator: IMainThreadEditorLocator,
@@ -59,7 +51,6 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
 		@IEditorService private readonly _editorService: IEditorService,
 		@IEditorGroupsService private readonly _editorGroupService: IEditorGroupsService,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
 		this._instanceId = String(++MainThreadTextEditors.INSTANCE_COUNT);
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostEditors);
@@ -71,22 +62,6 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		this._toDispose.add(this._editorGroupService.onDidRemoveGroup(() => this._updateActiveAndVisibleTextEditors()));
 		this._toDispose.add(this._editorGroupService.onDidMoveGroup(() => this._updateActiveAndVisibleTextEditors()));
 
-		const registerDropListenerOnEditor = (editor: ICodeEditor) => {
-			this._dropIntoEditorListeners.get(editor)?.dispose();
-			this._dropIntoEditorListeners.set(editor, editor.onDropIntoEditor(e => this.onDropIntoEditor(editor, e.position, e.event)));
-		};
-
-		this._toDispose.add(_codeEditorService.onCodeEditorAdd(registerDropListenerOnEditor));
-
-		this._toDispose.add(_codeEditorService.onCodeEditorRemove(editor => {
-			this._dropIntoEditorListeners.get(editor)?.dispose();
-			this._dropIntoEditorListeners.delete(editor);
-		}));
-
-		for (const editor of this._codeEditorService.listCodeEditors()) {
-			registerDropListenerOnEditor(editor);
-		}
-
 		this._registeredDecorationTypes = Object.create(null);
 	}
 
@@ -99,8 +74,6 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		for (let decorationType in this._registeredDecorationTypes) {
 			this._codeEditorService.removeDecorationType(decorationType);
 		}
-		dispose(this._dropIntoEditorListeners.values());
-		this._dropIntoEditorListeners.clear();
 		this._registeredDecorationTypes = Object.create(null);
 	}
 
@@ -140,59 +113,6 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		return result;
 	}
 
-	private async onDropIntoEditor(editor: ICodeEditor, position: IPosition, dragEvent: DragEvent) {
-		if (!dragEvent.dataTransfer || !editor.hasModel()) {
-			return;
-		}
-		const id = this._editorLocator.getIdOfCodeEditor(editor);
-		if (typeof id !== 'string') {
-			return;
-		}
-
-		const modelVersionNow = editor.getModel().getVersionId();
-
-		const textEditorDataTransfer: IDataTransfer = new Map<string, IDataTransferItem>();
-		for (const item of dragEvent.dataTransfer.items) {
-			if (item.kind === 'string') {
-				const type = item.type;
-				const asStringValue = new Promise<string>(resolve => item.getAsString(resolve));
-				textEditorDataTransfer.set(type, {
-					asString: () => asStringValue,
-					value: undefined
-				});
-			}
-		}
-
-		if (!textEditorDataTransfer.has(Mimes.uriList.toLowerCase())) {
-			const editorData = (await this._instantiationService.invokeFunction(extractEditorsDropData, dragEvent))
-				.filter(input => input.resource)
-				.map(input => input.resource!.toString());
-
-			if (editorData.length) {
-				const str = distinct(editorData).join('\n');
-				textEditorDataTransfer.set(Mimes.uriList.toLowerCase(), {
-					asString: () => Promise.resolve(str),
-					value: undefined
-				});
-			}
-		}
-
-		if (textEditorDataTransfer.size === 0) {
-			return;
-		}
-
-		const dataTransferDto = await DataTransferConverter.toDataTransferDTO(textEditorDataTransfer);
-		const edits = await this._proxy.$textEditorHandleDrop(id, position, dataTransferDto);
-		if (edits.length === 0) {
-			return;
-		}
-
-		if (editor.getModel().getVersionId() === modelVersionNow) {
-			const [first] = edits; // TODO@jrieken define how to pick the "one snippet edit";
-			performSnippetEdit(editor, first);
-		}
-	}
-
 	// --- from extension host process
 
 	async $tryShowTextDocument(resource: UriComponents, options: ITextDocumentShowOptions): Promise<string | undefined> {
diff --git a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
index a4c3cfbc729..95716c771fb 100644
--- a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
+++ b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
@@ -3,43 +3,49 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Emitter, Event } from 'vs/base/common/event';
-import { ITextModel } from 'vs/editor/common/model';
-import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
-import * as languages from 'vs/editor/common/languages';
-import * as search from 'vs/workbench/contrib/search/common/search';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { Position as EditorPosition } from 'vs/editor/common/core/position';
-import { Range as EditorRange, IRange } from 'vs/editor/common/core/range';
-import { ExtHostContext, MainThreadLanguageFeaturesShape, ExtHostLanguageFeaturesShape, MainContext, ILanguageConfigurationDto, IRegExpDto, IIndentationRuleDto, IOnEnterRuleDto, ILocationDto, IWorkspaceSymbolDto, reviveWorkspaceEditDto, IDocumentFilterDto, ILocationLinkDto, ISignatureHelpProviderMetadataDto, ILinkDto, ICallHierarchyItemDto, ISuggestDataDto, ICodeActionDto, ISuggestDataDtoField, ISuggestResultDtoField, ICodeActionProviderMetadataDto, ILanguageWordDefinitionDto, IdentifiableInlineCompletions, IdentifiableInlineCompletion, ITypeHierarchyItemDto, IInlayHintDto } from '../common/extHost.protocol';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { LanguageConfiguration, IndentationRule, OnEnterRule } from 'vs/editor/common/languages/languageConfiguration';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { URI } from 'vs/base/common/uri';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import * as callh from 'vs/workbench/contrib/callHierarchy/common/callHierarchy';
-import * as typeh from 'vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
-import { mixin } from 'vs/base/common/objects';
-import { decodeSemanticTokensDto } from 'vs/editor/common/services/semanticTokensDto';
-import { revive } from 'vs/base/common/marshalling';
 import { CancellationError } from 'vs/base/common/errors';
+import { Emitter, Event } from 'vs/base/common/event';
+import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { revive } from 'vs/base/common/marshalling';
+import { mixin } from 'vs/base/common/objects';
+import { URI } from 'vs/base/common/uri';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
+import { Position as EditorPosition } from 'vs/editor/common/core/position';
+import { IRange, Range as EditorRange } from 'vs/editor/common/core/range';
+import { Selection } from 'vs/editor/common/core/selection';
+import * as languages from 'vs/editor/common/languages';
+import { ILanguageService } from 'vs/editor/common/languages/language';
+import { IndentationRule, LanguageConfiguration, OnEnterRule } from 'vs/editor/common/languages/languageConfiguration';
+import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
+import { ITextModel } from 'vs/editor/common/model';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { decodeSemanticTokensDto } from 'vs/editor/common/services/semanticTokensDto';
+import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
+import { DataTransferConverter } from 'vs/workbench/api/common/shared/dataTransfer';
+import * as callh from 'vs/workbench/contrib/callHierarchy/common/callHierarchy';
+import * as search from 'vs/workbench/contrib/search/common/search';
+import * as typeh from 'vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
+import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
+import { ExtHostContext, ExtHostLanguageFeaturesShape, ICallHierarchyItemDto, ICodeActionDto, ICodeActionProviderMetadataDto, IdentifiableInlineCompletion, IdentifiableInlineCompletions, IDocumentFilterDto, IIndentationRuleDto, IInlayHintDto, ILanguageConfigurationDto, ILanguageWordDefinitionDto, ILinkDto, ILocationDto, ILocationLinkDto, IOnEnterRuleDto, IRegExpDto, ISignatureHelpProviderMetadataDto, ISuggestDataDto, ISuggestDataDtoField, ISuggestResultDtoField, ITypeHierarchyItemDto, IWorkspaceSymbolDto, MainContext, MainThreadLanguageFeaturesShape, reviveWorkspaceEditDto } from '../common/extHost.protocol';
 
 @extHostNamedCustomer(MainContext.MainThreadLanguageFeatures)
-export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesShape {
+export class MainThreadLanguageFeatures extends Disposable implements MainThreadLanguageFeaturesShape {
 
 	private readonly _proxy: ExtHostLanguageFeaturesShape;
 	private readonly _registrations = new Map<number, IDisposable>();
 
+	private readonly _dropIntoEditorListeners = new Map<ICodeEditor, IDisposable>();
+
 	constructor(
 		extHostContext: IExtHostContext,
 		@ILanguageService private readonly _languageService: ILanguageService,
 		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
 		@ILanguageFeaturesService private readonly _languageFeaturesService: ILanguageFeaturesService,
 	) {
+		super();
+
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostLanguageFeatures);
 
 		if (this._languageService) {
@@ -71,11 +77,16 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 		}
 	}
 
-	dispose(): void {
+	override dispose(): void {
 		for (const registration of this._registrations.values()) {
 			registration.dispose();
 		}
 		this._registrations.clear();
+
+		dispose(this._dropIntoEditorListeners.values());
+		this._dropIntoEditorListeners.clear();
+
+		super.dispose();
 	}
 
 	$unregister(handle: number): void {
@@ -850,6 +861,17 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 		}));
 	}
 
+
+	// --- document drop Edits
+
+	$registerDocumentOnDropProvider(handle: number, selector: IDocumentFilterDto[]): void {
+		this._registrations.set(handle, this._languageFeaturesService.documentOnDropEditProvider.register(selector, {
+			provideDocumentOnDropEdits: async (model, position, dataTransfer, token) => {
+				const dataTransferDto = await DataTransferConverter.toDataTransferDTO(dataTransfer);
+				return this._proxy.$provideDocumentOnDropEdits(handle, model.uri, position, dataTransferDto, token);
+			}
+		}));
+	}
 }
 
 export class MainThreadDocumentSemanticTokensProvider implements languages.DocumentSemanticTokensProvider {
diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
index f839ed68780..489f34bb0fd 100644
--- a/src/vs/workbench/api/browser/viewsExtensionPoint.ts
+++ b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
@@ -510,7 +510,7 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
 						containerTitle: item.contextualTitle || viewContainer?.title,
 						canToggleVisibility: true,
 						canMoveView: viewContainer?.id !== REMOTE,
-						treeView: type === ViewType.Tree ? this.instantiationService.createInstance(CustomTreeView, item.id, item.name) : undefined,
+						treeView: type === ViewType.Tree ? this.instantiationService.createInstance(CustomTreeView, item.id, item.name, extension.description.identifier.value) : undefined,
 						collapsed: this.showCollapsed(container) || initialVisibility === InitialVisibility.Collapsed,
 						order: order,
 						extensionId: extension.description.identifier,
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index bcdf64ad6bc..acdf0672025 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -532,6 +532,10 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			},
 			createLanguageStatusItem(id: string, selector: vscode.DocumentSelector): vscode.LanguageStatusItem {
 				return extHostLanguages.createLanguageStatusItem(extension, id, selector);
+			},
+			registerDocumentOnDropProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentOnDropProvider): vscode.Disposable {
+				checkProposedApiEnabled(extension, 'textEditorDrop');
+				return extHostLanguageFeatures.registerDocumentOnDropProvider(extension, selector, provider);
 			}
 		};
 
@@ -669,7 +673,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkProposedApiEnabled(extension, 'editorInsets');
 				return extHostEditorInsets.createWebviewEditorInset(editor, line, height, options, extension);
 			},
-			createTerminal(nameOrOptions?: vscode.TerminalOptions | vscode.ExtensionTerminalOptions | string, shellPath?: string, shellArgs?: string[] | string): vscode.Terminal {
+			createTerminal(nameOrOptions?: vscode.TerminalOptions | vscode.ExtensionTerminalOptions | string, shellPath?: string, shellArgs?: readonly string[] | string): vscode.Terminal {
 				if (typeof nameOrOptions === 'object') {
 					if ('pty' in nameOrOptions) {
 						return extHostTerminalService.createExtensionTerminal(nameOrOptions);
@@ -872,10 +876,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			onWillSaveTextDocument: (listener, thisArgs?, disposables?) => {
 				return extHostDocumentSaveParticipant.getOnWillSaveTextDocumentEvent(extension)(listener, thisArgs, disposables);
 			},
-			onWillDropOnTextEditor: (listener, thisArgs?, disposables?) => {
-				checkProposedApiEnabled(extension, 'textEditorDrop');
-				return extHostEditors.onWillDropOnTextEditor(listener, thisArgs, disposables);
-			},
 			get notebookDocuments(): vscode.NotebookDocument[] {
 				return extHostNotebook.notebookDocuments.map(d => d.apiNotebook);
 			},
@@ -1131,6 +1131,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			},
 			createConcatTextDocument(notebook, selector) {
 				checkProposedApiEnabled(extension, 'notebookConcatTextDocument');
+				extHostApiDeprecation.report('notebookConcatTextDocument', extension, 'This proposal is not on track for finalization and will be removed.');
 				return new ExtHostNotebookConcatDocument(extHostNotebookDocuments, extHostDocuments, notebook, selector);
 			},
 		};
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index c5e114a3f3b..86d8dde204b 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -257,7 +257,7 @@ export interface MainThreadTextEditorsShape extends IDisposable {
 }
 
 export interface MainThreadTreeViewsShape extends IDisposable {
-	$registerTreeViewDataProvider(treeViewId: string, options: { showCollapseAll: boolean; canSelectMany: boolean; dropMimeTypes: string[]; dragMimeTypes: string[]; hasHandleDrag: boolean; hasHandleDrop: boolean }): Promise<void>;
+	$registerTreeViewDataProvider(treeViewId: string, options: { showCollapseAll: boolean; canSelectMany: boolean; dropMimeTypes: readonly string[]; dragMimeTypes: readonly string[]; hasHandleDrag: boolean; hasHandleDrop: boolean }): Promise<void>;
 	$refresh(treeViewId: string, itemsToRefresh?: { [treeItemHandle: string]: ITreeItem }): Promise<void>;
 	$reveal(treeViewId: string, itemInfo: { item: ITreeItem; parentChain: ITreeItem[] } | undefined, options: IRevealOptions): Promise<void>;
 	$setMessage(treeViewId: string, message: string): void;
@@ -390,6 +390,7 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable {
 	$registerSelectionRangeProvider(handle: number, selector: IDocumentFilterDto[]): void;
 	$registerCallHierarchyProvider(handle: number, selector: IDocumentFilterDto[]): void;
 	$registerTypeHierarchyProvider(handle: number, selector: IDocumentFilterDto[]): void;
+	$registerDocumentOnDropProvider(handle: number, selector: IDocumentFilterDto[]): void;
 	$setLanguageConfiguration(handle: number, languageId: string, configuration: ILanguageConfigurationDto): void;
 }
 
@@ -676,6 +677,7 @@ export interface MainThreadEditorTabsShape extends IDisposable {
 	// manage tabs: move, close, rearrange etc
 	$moveTab(tabId: string, index: number, viewColumn: EditorGroupColumn, preserveFocus?: boolean): void;
 	$closeTab(tabIds: string[], preserveFocus?: boolean): Promise<boolean>;
+	$closeGroup(groupIds: number[], preservceFocus?: boolean): Promise<boolean>;
 }
 
 export interface IEditorTabGroupDto {
@@ -1329,7 +1331,6 @@ export interface ISelectionChangeEvent {
 export interface ExtHostEditorsShape {
 	$acceptEditorPropertiesChanged(id: string, props: IEditorPropertiesChangeData): void;
 	$acceptEditorPositionData(data: ITextEditorPositionData): void;
-	$textEditorHandleDrop(id: string, position: IPosition, dataTransferDto: DataTransferDTO): Promise<Dto<languages.SnippetTextEdit[]>>;
 }
 
 export interface IDocumentsAndEditorsDelta {
@@ -1734,6 +1735,7 @@ export interface ExtHostLanguageFeaturesShape {
 	$provideTypeHierarchySupertypes(handle: number, sessionId: string, itemId: string, token: CancellationToken): Promise<ITypeHierarchyItemDto[] | undefined>;
 	$provideTypeHierarchySubtypes(handle: number, sessionId: string, itemId: string, token: CancellationToken): Promise<ITypeHierarchyItemDto[] | undefined>;
 	$releaseTypeHierarchy(handle: number, sessionId: string): void;
+	$provideDocumentOnDropEdits(handle: number, resource: UriComponents, position: IPosition, dataTransferDto: DataTransferDTO, token: CancellationToken): Promise<Dto<languages.SnippetTextEdit> | undefined>;
 }
 
 export interface ExtHostQuickOpenShape {
diff --git a/src/vs/workbench/api/common/extHostDebugService.ts b/src/vs/workbench/api/common/extHostDebugService.ts
index 228920010ae..1db3ef2485d 100644
--- a/src/vs/workbench/api/common/extHostDebugService.ts
+++ b/src/vs/workbench/api/common/extHostDebugService.ts
@@ -953,7 +953,7 @@ export class ExtHostVariableResolverService extends AbstractVariableResolverServ
 				if (activeEditor) {
 					return activeEditor.document.uri;
 				}
-				const activeTab = editorTabs.tabGroups.groups.find(group => group.isActive)?.activeTab;
+				const activeTab = editorTabs.tabGroups.all.find(group => group.isActive)?.activeTab;
 				if (activeTab !== undefined) {
 					// Resolve a resource from the tab
 					if (activeTab.kind instanceof TextDiffTabInput || activeTab.kind instanceof NotebookDiffEditorTabInput) {
diff --git a/src/vs/workbench/api/common/extHostEditorTabs.ts b/src/vs/workbench/api/common/extHostEditorTabs.ts
index 18edeb5c4d1..b699b4c752d 100644
--- a/src/vs/workbench/api/common/extHostEditorTabs.ts
+++ b/src/vs/workbench/api/common/extHostEditorTabs.ts
@@ -36,9 +36,9 @@ class ExtHostEditorTab {
 	}
 
 	get apiObject(): vscode.Tab {
-		// Don't want to lose reference to parent `this` in the getters
-		const that = this;
 		if (!this._apiObject) {
+			// Don't want to lose reference to parent `this` in the getters
+			const that = this;
 			const obj: vscode.Tab = {
 				get isActive() {
 					// We use a getter function here to always ensure at most 1 active tab per group and prevent iteration for being required
@@ -120,9 +120,9 @@ class ExtHostEditorTabGroup {
 	}
 
 	get apiObject(): vscode.TabGroup {
-		// Don't want to lose reference to parent `this` in the getters
-		const that = this;
 		if (!this._apiObject) {
+			// Don't want to lose reference to parent `this` in the getters
+			const that = this;
 			const obj: vscode.TabGroup = {
 				get isActive() {
 					// We use a getter function here to always ensure at most 1 active group and prevent iteration for being required
@@ -201,10 +201,8 @@ export class ExtHostEditorTabs implements IExtHostEditorTabs {
 	readonly _serviceBrand: undefined;
 
 	private readonly _proxy: MainThreadEditorTabsShape;
-	private readonly _onDidChangeTabs = new Emitter<vscode.Tab[]>();
-	private readonly _onDidChangeActiveTab = new Emitter<vscode.Tab>();
+	private readonly _onDidChangeTabs = new Emitter<vscode.TabChangeEvent>();
 	private readonly _onDidChangeTabGroups = new Emitter<vscode.TabGroup[]>();
-	private readonly _onDidChangeActiveTabGroup = new Emitter<vscode.TabGroup>();
 
 	// Have to use ! because this gets initialized via an RPC proxy
 	private _activeGroupId!: number;
@@ -223,11 +221,9 @@ export class ExtHostEditorTabs implements IExtHostEditorTabs {
 			const obj: vscode.TabGroups = {
 				// never changes -> simple value
 				onDidChangeTabGroups: that._onDidChangeTabGroups.event,
-				onDidChangeActiveTabGroup: that._onDidChangeActiveTabGroup.event,
 				onDidChangeTabs: that._onDidChangeTabs.event,
-				onDidChangeActiveTab: that._onDidChangeActiveTab.event,
 				// dynamic -> getters
-				get groups() {
+				get all() {
 					return Object.freeze(that._extHostTabGroups.map(group => group.apiObject));
 				},
 				get activeTabGroup() {
@@ -235,17 +231,18 @@ export class ExtHostEditorTabs implements IExtHostEditorTabs {
 					const activeTabGroup = assertIsDefined(that._extHostTabGroups.find(candidate => candidate.groupId === activeTabGroupId)?.apiObject);
 					return activeTabGroup;
 				},
-				close: async (tab: vscode.Tab | vscode.Tab[], preserveFocus?: boolean) => {
-					const tabs = Array.isArray(tab) ? tab : [tab];
-					const extHostTabIds: string[] = [];
-					for (const tab of tabs) {
-						const extHostTab = this._findExtHostTabFromApi(tab);
-						if (!extHostTab) {
-							throw new Error('Tab close: Invalid tab not found!');
-						}
-						extHostTabIds.push(extHostTab.tabId);
+				close: async (tabOrTabGroup: vscode.Tab | readonly vscode.Tab[] | vscode.TabGroup | readonly vscode.TabGroup[], preserveFocus?: boolean) => {
+					const tabsOrTabGroups = Array.isArray(tabOrTabGroup) ? tabOrTabGroup : [tabOrTabGroup];
+					if (!tabsOrTabGroups.length) {
+						return true;
+					}
+					// Check which type was passed in and call the appropriate close
+					// Casting is needed as typescript doesn't seem to infer enough from this
+					if (isTabGroup(tabsOrTabGroups[0])) {
+						return this._closeGroups(tabsOrTabGroups as vscode.TabGroup[], preserveFocus);
+					} else {
+						return this._closeTabs(tabsOrTabGroups as vscode.Tab[], preserveFocus);
 					}
-					return this._proxy.$closeTab(extHostTabIds, preserveFocus);
 				},
 				move: async (tab: vscode.Tab, viewColumn: ViewColumn, index: number, preservceFocus?: boolean) => {
 					const extHostTab = this._findExtHostTabFromApi(tab);
@@ -261,17 +258,6 @@ export class ExtHostEditorTabs implements IExtHostEditorTabs {
 		return this._apiObject;
 	}
 
-	private _findExtHostTabFromApi(apiTab: vscode.Tab): ExtHostEditorTab | undefined {
-		for (const group of this._extHostTabGroups) {
-			for (const tab of group.tabs) {
-				if (tab.apiObject === apiTab) {
-					return tab;
-				}
-			}
-		}
-		return;
-	}
-
 	$acceptEditorTabModel(tabGroups: IEditorTabGroupDto[]): void {
 
 		this._extHostTabGroups = tabGroups.map(tabGroup => {
@@ -283,7 +269,6 @@ export class ExtHostEditorTabs implements IExtHostEditorTabs {
 		const activeTabGroupId = assertIsDefined(tabGroups.find(group => group.isActive === true)?.groupId);
 		if (activeTabGroupId !== undefined && this._activeGroupId !== activeTabGroupId) {
 			this._activeGroupId = activeTabGroupId;
-			this._onDidChangeActiveTabGroup.fire(this.tabGroups.activeTabGroup);
 		}
 		this._onDidChangeTabGroups.fire(this._extHostTabGroups.map(g => g.apiObject));
 	}
@@ -295,11 +280,7 @@ export class ExtHostEditorTabs implements IExtHostEditorTabs {
 		}
 		group.acceptGroupDtoUpdate(groupDto);
 		if (groupDto.isActive) {
-			const oldActiveGroupId = this._activeGroupId;
 			this._activeGroupId = groupDto.groupId;
-			if (oldActiveGroupId !== this._activeGroupId) {
-				this._onDidChangeActiveTabGroup.fire(group.apiObject);
-			}
 		}
 		this._onDidChangeTabGroups.fire([group.apiObject]);
 	}
@@ -310,12 +291,79 @@ export class ExtHostEditorTabs implements IExtHostEditorTabs {
 			throw new Error('Update Tabs IPC call received before group creation.');
 		}
 		const tab = group.acceptTabOperation(operation);
-		// We don't want to fire a change event with a closed tab to prevent an invalid tabs from being received
-		if (operation.kind !== TabModelOperationKind.TAB_CLOSE) {
-			this._onDidChangeTabs.fire([tab.apiObject]);
-			if (tab.apiObject.isActive) {
-				this._onDidChangeActiveTab.fire(tab.apiObject);
-			}
+
+		// Construct the tab change event based on the operation
+		switch (operation.kind) {
+			case TabModelOperationKind.TAB_OPEN:
+				this._onDidChangeTabs.fire({
+					added: [tab.apiObject],
+					removed: [],
+					changed: []
+				});
+				return;
+			case TabModelOperationKind.TAB_CLOSE:
+				this._onDidChangeTabs.fire({
+					added: [],
+					removed: [tab.apiObject],
+					changed: []
+				});
+				return;
+			case TabModelOperationKind.TAB_UPDATE:
+				this._onDidChangeTabs.fire({
+					added: [],
+					removed: [],
+					changed: [tab.apiObject]
+				});
+				return;
 		}
 	}
+
+	private _findExtHostTabFromApi(apiTab: vscode.Tab): ExtHostEditorTab | undefined {
+		for (const group of this._extHostTabGroups) {
+			for (const tab of group.tabs) {
+				if (tab.apiObject === apiTab) {
+					return tab;
+				}
+			}
+		}
+		return;
+	}
+
+	private _findExtHostTabGroupFromApi(apiTabGroup: vscode.TabGroup): ExtHostEditorTabGroup | undefined {
+		return this._extHostTabGroups.find(candidate => candidate.apiObject === apiTabGroup);
+	}
+
+	private async _closeTabs(tabs: vscode.Tab[], preserveFocus?: boolean): Promise<boolean> {
+		const extHostTabIds: string[] = [];
+		for (const tab of tabs) {
+			const extHostTab = this._findExtHostTabFromApi(tab);
+			if (!extHostTab) {
+				throw new Error('Tab close: Invalid tab not found!');
+			}
+			extHostTabIds.push(extHostTab.tabId);
+		}
+		return this._proxy.$closeTab(extHostTabIds, preserveFocus);
+	}
+
+	private async _closeGroups(groups: vscode.TabGroup[], preserverFoucs?: boolean): Promise<boolean> {
+		const extHostGroupIds: number[] = [];
+		for (const group of groups) {
+			const extHostGroup = this._findExtHostTabGroupFromApi(group);
+			if (!extHostGroup) {
+				throw new Error('Group close: Invalid group not found!');
+			}
+			extHostGroupIds.push(extHostGroup.groupId);
+		}
+		return this._proxy.$closeGroup(extHostGroupIds, preserverFoucs);
+	}
 }
+
+//#region Utils
+function isTabGroup(obj: unknown): obj is vscode.TabGroup {
+	const tabGroup = obj as vscode.TabGroup;
+	if (tabGroup.tabs !== undefined) {
+		return true;
+	}
+	return false;
+}
+//#endregion
diff --git a/src/vs/workbench/api/common/extHostLanguageFeatures.ts b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
index e5ca7469fb0..2cc57319c69 100644
--- a/src/vs/workbench/api/common/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
@@ -35,6 +35,8 @@ import { isCancellationError } from 'vs/base/common/errors';
 import { Emitter } from 'vs/base/common/event';
 import { raceCancellationError } from 'vs/base/common/async';
 import { isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
+import { DataTransferConverter, DataTransferDTO } from 'vs/workbench/api/common/shared/dataTransfer';
+import { Dto } from 'vs/workbench/services/extensions/common/proxyIdentifier';
 
 // --- adapter
 
@@ -1712,6 +1714,27 @@ class TypeHierarchyAdapter {
 		return map?.get(itemId);
 	}
 }
+
+class DocumentOnDropAdapter {
+
+	constructor(
+		private readonly _documents: ExtHostDocuments,
+		private readonly _provider: vscode.DocumentOnDropProvider
+	) { }
+
+	async provideDocumentOnDropEdits(uri: URI, position: IPosition, dataTransferDto: DataTransferDTO, token: CancellationToken): Promise<Dto<languages.SnippetTextEdit> | undefined> {
+		const doc = this._documents.getDocument(uri);
+		const pos = typeConvert.Position.to(position);
+		const dataTransfer = DataTransferConverter.toDataTransfer(dataTransferDto);
+
+		const edit = await this._provider.provideDocumentOnDropEdits(doc, pos, dataTransfer, token);
+		if (!edit) {
+			return undefined;
+		}
+		return typeConvert.SnippetTextEdit.from(edit);
+	}
+}
+
 type Adapter = DocumentSymbolAdapter | CodeLensAdapter | DefinitionAdapter | HoverAdapter
 	| DocumentHighlightAdapter | ReferenceAdapter | CodeActionAdapter | DocumentFormattingAdapter
 	| RangeFormattingAdapter | OnTypeFormattingAdapter | NavigateTypeAdapter | RenameAdapter
@@ -1720,7 +1743,8 @@ type Adapter = DocumentSymbolAdapter | CodeLensAdapter | DefinitionAdapter | Hov
 	| SelectionRangeAdapter | CallHierarchyAdapter | TypeHierarchyAdapter
 	| DocumentSemanticTokensAdapter | DocumentRangeSemanticTokensAdapter
 	| EvaluatableExpressionAdapter | InlineValuesAdapter
-	| LinkedEditingRangeAdapter | InlayHintsAdapter | InlineCompletionAdapter | InlineCompletionAdapterNew;
+	| LinkedEditingRangeAdapter | InlayHintsAdapter | InlineCompletionAdapter | InlineCompletionAdapterNew
+	| DocumentOnDropAdapter;
 
 class AdapterData {
 	constructor(
@@ -2341,6 +2365,18 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
 		this._withAdapter(handle, TypeHierarchyAdapter, adapter => Promise.resolve(adapter.releaseSession(sessionId)), undefined, undefined);
 	}
 
+	// --- Document on drop
+
+	registerDocumentOnDropProvider(extension: IExtensionDescription, selector: vscode.DocumentSelector, provider: vscode.DocumentOnDropProvider) {
+		const handle = this._addNewAdapter(new DocumentOnDropAdapter(this._documents, provider), extension);
+		this._proxy.$registerDocumentOnDropProvider(handle, this._transformDocumentSelector(selector));
+		return this._createDisposable(handle);
+	}
+
+	$provideDocumentOnDropEdits(handle: number, resource: UriComponents, position: IPosition, dataTransferDto: DataTransferDTO, token: CancellationToken): Promise<Dto<languages.SnippetTextEdit> | undefined> {
+		return this._withAdapter(handle, DocumentOnDropAdapter, adapter => Promise.resolve(adapter.provideDocumentOnDropEdits(URI.revive(resource), position, dataTransferDto, token)), undefined, undefined);
+	}
+
 	// --- configuration
 
 	private static _serializeRegExp(regExp: RegExp): extHostProtocol.IRegExpDto {
diff --git a/src/vs/workbench/api/common/extHostTerminalService.ts b/src/vs/workbench/api/common/extHostTerminalService.ts
index 12643cef941..1aa1e678e00 100644
--- a/src/vs/workbench/api/common/extHostTerminalService.ts
+++ b/src/vs/workbench/api/common/extHostTerminalService.ts
@@ -38,7 +38,7 @@ export interface IExtHostTerminalService extends ExtHostTerminalServiceShape, ID
 	onDidChangeTerminalState: Event<vscode.Terminal>;
 	onDidWriteTerminalData: Event<vscode.TerminalDataWriteEvent>;
 
-	createTerminal(name?: string, shellPath?: string, shellArgs?: string[] | string): vscode.Terminal;
+	createTerminal(name?: string, shellPath?: string, shellArgs?: readonly string[] | string): vscode.Terminal;
 	createTerminalFromOptions(options: vscode.TerminalOptions, internalOptions?: ITerminalInternalOptions): vscode.Terminal;
 	createExtensionTerminal(options: vscode.ExtensionTerminalOptions): vscode.Terminal;
 	attachPtyToTerminal(id: number, pty: vscode.Pseudoterminal): void;
diff --git a/src/vs/workbench/api/common/extHostTextEditors.ts b/src/vs/workbench/api/common/extHostTextEditors.ts
index e5373fe549c..b221ea9710c 100644
--- a/src/vs/workbench/api/common/extHostTextEditors.ts
+++ b/src/vs/workbench/api/common/extHostTextEditors.ts
@@ -3,20 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AsyncEmitter, Emitter, Event } from 'vs/base/common/event';
 import * as arrays from 'vs/base/common/arrays';
+import { Emitter, Event } from 'vs/base/common/event';
+import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { ExtHostEditorsShape, IEditorPropertiesChangeData, IMainContext, ITextDocumentShowOptions, ITextEditorPositionData, MainContext, MainThreadTextEditorsShape } from 'vs/workbench/api/common/extHost.protocol';
 import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
 import { ExtHostTextEditor, TextEditorDecorationType } from 'vs/workbench/api/common/extHostTextEditor';
 import * as TypeConverters from 'vs/workbench/api/common/extHostTypeConverters';
-import { SnippetTextEdit, TextEditorSelectionChangeKind } from 'vs/workbench/api/common/extHostTypes';
+import { TextEditorSelectionChangeKind } from 'vs/workbench/api/common/extHostTypes';
 import * as vscode from 'vscode';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { DataTransferConverter, DataTransferDTO } from 'vs/workbench/api/common/shared/dataTransfer';
-import { IPosition } from 'vs/editor/common/core/position';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Dto } from 'vs/workbench/services/extensions/common/proxyIdentifier';
-import * as languages from 'vs/editor/common/languages';
 
 export class ExtHostEditors implements ExtHostEditorsShape {
 
@@ -26,7 +21,6 @@ export class ExtHostEditors implements ExtHostEditorsShape {
 	private readonly _onDidChangeTextEditorViewColumn = new Emitter<vscode.TextEditorViewColumnChangeEvent>();
 	private readonly _onDidChangeActiveTextEditor = new Emitter<vscode.TextEditor | undefined>();
 	private readonly _onDidChangeVisibleTextEditors = new Emitter<vscode.TextEditor[]>();
-	private readonly _onWillDropOnTextEditor = new AsyncEmitter<vscode.TextEditorDropEvent>();
 
 	readonly onDidChangeTextEditorSelection: Event<vscode.TextEditorSelectionChangeEvent> = this._onDidChangeTextEditorSelection.event;
 	readonly onDidChangeTextEditorOptions: Event<vscode.TextEditorOptionsChangeEvent> = this._onDidChangeTextEditorOptions.event;
@@ -34,7 +28,6 @@ export class ExtHostEditors implements ExtHostEditorsShape {
 	readonly onDidChangeTextEditorViewColumn: Event<vscode.TextEditorViewColumnChangeEvent> = this._onDidChangeTextEditorViewColumn.event;
 	readonly onDidChangeActiveTextEditor: Event<vscode.TextEditor | undefined> = this._onDidChangeActiveTextEditor.event;
 	readonly onDidChangeVisibleTextEditors: Event<vscode.TextEditor[]> = this._onDidChangeVisibleTextEditors.event;
-	readonly onWillDropOnTextEditor: Event<vscode.TextEditorDropEvent> = this._onWillDropOnTextEditor.event;
 
 	private readonly _proxy: MainThreadTextEditorsShape;
 
@@ -166,33 +159,4 @@ export class ExtHostEditors implements ExtHostEditorsShape {
 	getDiffInformation(id: string): Promise<vscode.LineChange[]> {
 		return Promise.resolve(this._proxy.$getDiffInformation(id));
 	}
-
-	// --- Text editor drag and drop
-
-	async $textEditorHandleDrop(id: string, position: IPosition, dataTransferDto: DataTransferDTO): Promise<Dto<languages.SnippetTextEdit[]>> {
-		const textEditor = this._extHostDocumentsAndEditors.getEditor(id);
-		if (!textEditor) {
-			throw new Error('Unknown text editor');
-		}
-
-		const pos = TypeConverters.Position.to(position);
-		const dataTransfer = DataTransferConverter.toDataTransfer(dataTransferDto);
-
-		const event = Object.freeze({
-			editor: textEditor.value,
-			position: pos,
-			dataTransfer: dataTransfer
-		});
-
-		const edits: SnippetTextEdit[] = [];
-
-		await this._onWillDropOnTextEditor.fireAsync(event, CancellationToken.None, async p => {
-			const value = await p;
-			if (value instanceof SnippetTextEdit) {
-				edits.push(value);
-			}
-		});
-
-		return edits.map(TypeConverters.SnippetTextEdit.from);
-	}
 }
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index ca19cdc010c..8ed1d005b1a 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -1594,7 +1594,10 @@ export class CompletionList {
 
 @es5ClassCompat
 export class InlineSuggestion implements vscode.InlineCompletionItem {
-	insertText?: string;
+
+	insertText?: string | SnippetString;
+
+	filterText?: string;
 
 	/**
 	 * @deprecated Use `insertText` instead. Will be removed eventually.
@@ -1604,7 +1607,7 @@ export class InlineSuggestion implements vscode.InlineCompletionItem {
 	range?: Range;
 	command?: vscode.Command;
 
-	constructor(insertText: string, range?: Range, command?: vscode.Command) {
+	constructor(insertText: string | SnippetString, range?: Range, command?: vscode.Command) {
 		this.insertText = insertText;
 		this.range = range;
 		this.command = command;
diff --git a/src/vs/workbench/api/test/browser/extHostEditorTabs.test.ts b/src/vs/workbench/api/test/browser/extHostEditorTabs.test.ts
index c9fe89b33c7..67903bab953 100644
--- a/src/vs/workbench/api/test/browser/extHostEditorTabs.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostEditorTabs.test.ts
@@ -35,7 +35,7 @@ suite('ExtHostEditorTabs', function () {
 			})
 		);
 
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.length, 0);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.length, 0);
 		// Active group should never be undefined (there is always an active group). Ensure accessing it undefined throws.
 		// TODO @lramos15 Add a throw on the main side when a model is sent without an active group
 		assert.throws(() => extHostEditorTabs.tabGroups.activeTabGroup);
@@ -63,8 +63,8 @@ suite('ExtHostEditorTabs', function () {
 			groupId: 12,
 			tabs: [tab]
 		}]);
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.length, 1);
-		const [first] = extHostEditorTabs.tabGroups.groups;
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.length, 1);
+		const [first] = extHostEditorTabs.tabGroups.all;
 		assert.ok(first.activeTab);
 		assert.strictEqual(first.tabs.indexOf(first.activeTab), 0);
 
@@ -75,8 +75,8 @@ suite('ExtHostEditorTabs', function () {
 				groupId: 12,
 				tabs: [tab]
 			}]);
-			assert.strictEqual(extHostEditorTabs.tabGroups.groups.length, 1);
-			const [first] = extHostEditorTabs.tabGroups.groups;
+			assert.strictEqual(extHostEditorTabs.tabGroups.all.length, 1);
+			const [first] = extHostEditorTabs.tabGroups.all;
 			assert.ok(first.activeTab);
 			assert.strictEqual(first.tabs.indexOf(first.activeTab), 0);
 		}
@@ -95,8 +95,8 @@ suite('ExtHostEditorTabs', function () {
 			groupId: 12,
 			tabs: []
 		}]);
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.length, 1);
-		const [first] = extHostEditorTabs.tabGroups.groups;
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.length, 1);
+		const [first] = extHostEditorTabs.tabGroups.all;
 		assert.strictEqual(first.activeTab, undefined);
 		assert.strictEqual(first.tabs.length, 0);
 	});
@@ -121,7 +121,7 @@ suite('ExtHostEditorTabs', function () {
 		}]);
 		assert.ok(extHostEditorTabs.tabGroups.activeTabGroup);
 		const activeTabGroup: vscode.TabGroup = extHostEditorTabs.tabGroups.activeTabGroup;
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.length, 1);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.length, 1);
 		assert.strictEqual(activeTabGroup.tabs.length, 0);
 		assert.strictEqual(count, 1);
 	});
@@ -147,76 +147,14 @@ suite('ExtHostEditorTabs', function () {
 			groupId: 12,
 			tabs: [tab]
 		}]);
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.length, 1);
-		const [first] = extHostEditorTabs.tabGroups.groups;
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.length, 1);
+		const [first] = extHostEditorTabs.tabGroups.all;
 		assert.ok(first.activeTab);
 		assert.strictEqual(first.tabs.indexOf(first.activeTab), 0);
 		assert.strictEqual(first.activeTab, first.tabs[0]);
 		assert.strictEqual(extHostEditorTabs.tabGroups.activeTabGroup, first);
 	});
 
-	// TODO @lramos15 Change this test because now it only fires when id changes
-	test.skip('onDidChangeActiveTabGroup fires properly', function () {
-		const extHostEditorTabs = new ExtHostEditorTabs(
-			SingleProxyRPCProtocol(new class extends mock<MainThreadEditorTabsShape>() {
-				// override/implement $moveTab or $closeTab
-			})
-		);
-
-		let count = 0;
-		let activeTabGroupFromEvent: vscode.TabGroup | undefined = undefined;
-		extHostEditorTabs.tabGroups.onDidChangeActiveTabGroup((tabGroup) => {
-			count++;
-			activeTabGroupFromEvent = tabGroup;
-		});
-
-
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.length, 0);
-		assert.strictEqual(extHostEditorTabs.tabGroups.activeTabGroup, undefined);
-		assert.strictEqual(count, 0);
-		const tabModel = [{
-			isActive: true,
-			viewColumn: 0,
-			groupId: 12,
-			tabs: [],
-			activeTab: undefined
-		}];
-		extHostEditorTabs.$acceptEditorTabModel(tabModel);
-		assert.ok(extHostEditorTabs.tabGroups.activeTabGroup);
-		let activeTabGroup: vscode.TabGroup = extHostEditorTabs.tabGroups.activeTabGroup;
-		assert.strictEqual(count, 1);
-		assert.strictEqual(activeTabGroup, activeTabGroupFromEvent);
-		// Firing again with same model shouldn't cause a change
-		extHostEditorTabs.$acceptEditorTabModel(tabModel);
-		assert.strictEqual(count, 1);
-		// Changing a property should fire a change
-		tabModel[0].viewColumn = 1;
-		extHostEditorTabs.$acceptEditorTabModel(tabModel);
-		assert.strictEqual(count, 2);
-		activeTabGroup = extHostEditorTabs.tabGroups.activeTabGroup;
-		assert.strictEqual(activeTabGroup, activeTabGroupFromEvent);
-		// Changing the active tab group should fire a change
-		tabModel[0].isActive = false;
-		tabModel.push({
-			isActive: true,
-			viewColumn: 0,
-			groupId: 13,
-			tabs: [],
-			activeTab: undefined
-		});
-		extHostEditorTabs.$acceptEditorTabModel(tabModel);
-		assert.strictEqual(count, 3);
-		activeTabGroup = extHostEditorTabs.tabGroups.activeTabGroup;
-		assert.strictEqual(activeTabGroup, activeTabGroupFromEvent);
-
-		// Empty tab model should fire a change and return undefined
-		extHostEditorTabs.$acceptEditorTabModel([]);
-		assert.strictEqual(count, 4);
-		activeTabGroup = extHostEditorTabs.tabGroups.activeTabGroup;
-		assert.strictEqual(activeTabGroup, undefined);
-		assert.strictEqual(activeTabGroup, activeTabGroupFromEvent);
-	});
-
 	test('Ensure reference stability', function () {
 
 		const extHostEditorTabs = new ExtHostEditorTabs(
@@ -234,7 +172,7 @@ suite('ExtHostEditorTabs', function () {
 			groupId: 12,
 			tabs: [tabDto]
 		}]);
-		let all = extHostEditorTabs.tabGroups.groups.map(group => group.tabs).flat();
+		let all = extHostEditorTabs.tabGroups.all.map(group => group.tabs).flat();
 		assert.strictEqual(all.length, 1);
 		const apiTab1 = all[0];
 		assert.ok(apiTab1.kind instanceof TextTabInput);
@@ -255,7 +193,7 @@ suite('ExtHostEditorTabs', function () {
 			groupId: 12
 		});
 
-		all = extHostEditorTabs.tabGroups.groups.map(group => group.tabs).flat();
+		all = extHostEditorTabs.tabGroups.all.map(group => group.tabs).flat();
 		assert.strictEqual(all.length, 1);
 		const apiTab2 = all[0];
 		assert.ok(apiTab1.kind instanceof TextTabInput);
@@ -301,7 +239,7 @@ suite('ExtHostEditorTabs', function () {
 			tabs: [tabDtoAAA, tabDtoBBB]
 		}]);
 
-		let all = extHostEditorTabs.tabGroups.groups.map(group => group.tabs).flat();
+		let all = extHostEditorTabs.tabGroups.all.map(group => group.tabs).flat();
 		assert.strictEqual(all.length, 2);
 
 		const activeTab1 = extHostEditorTabs.tabGroups.activeTabGroup?.activeTab;
@@ -341,7 +279,7 @@ suite('ExtHostEditorTabs', function () {
 		});
 		assert.throws(() => {
 			// @ts-expect-error write to readonly prop
-			extHostEditorTabs.tabGroups.groups.length = 0;
+			extHostEditorTabs.tabGroups.all.length = 0;
 		});
 		assert.throws(() => {
 			// @ts-expect-error write to readonly prop
@@ -379,7 +317,7 @@ suite('ExtHostEditorTabs', function () {
 			groupId: 12,
 			tabs: [tab]
 		}]);
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.length, 1);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.length, 1);
 		const activeTab = extHostEditorTabs.tabGroups.activeTabGroup?.activeTab;
 		assert.ok(activeTab);
 		extHostEditorTabs.tabGroups.close(activeTab, false);
@@ -418,12 +356,12 @@ suite('ExtHostEditorTabs', function () {
 			tabs: [tabDto]
 		}]);
 
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.length, 1);
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.map(g => g.tabs).flat().length, 1);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.length, 1);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.map(g => g.tabs).flat().length, 1);
 
-		const tab = extHostEditorTabs.tabGroups.groups[0].tabs[0];
+		const tab = extHostEditorTabs.tabGroups.all[0].tabs[0];
 
-		const p = new Promise<vscode.Tab[]>(resolve => extHostEditorTabs.tabGroups.onDidChangeTabs(resolve));
+		const p = new Promise<vscode.TabChangeEvent>(resolve => extHostEditorTabs.tabGroups.onDidChangeTabs(resolve));
 
 		extHostEditorTabs.$acceptTabOperation({
 			groupId: 12,
@@ -432,7 +370,7 @@ suite('ExtHostEditorTabs', function () {
 			tabDto: { ...tabDto, label: 'NEW LABEL' }
 		});
 
-		const changedTab = (await p)[0];
+		const changedTab = (await p).changed[0];
 
 		assert.ok(tab === changedTab);
 		assert.strictEqual(changedTab.label, 'NEW LABEL');
@@ -472,8 +410,8 @@ suite('ExtHostEditorTabs', function () {
 			tabs: [tab1, tab2, tab3]
 		}]);
 
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.length, 1);
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.map(g => g.tabs).flat().length, 3);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.length, 1);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.map(g => g.tabs).flat().length, 3);
 
 		// Active tab is correct
 		assert.strictEqual(extHostEditorTabs.tabGroups.activeTabGroup?.activeTab, extHostEditorTabs.tabGroups.activeTabGroup?.tabs[0]);
@@ -503,8 +441,8 @@ suite('ExtHostEditorTabs', function () {
 			groupId: 12,
 			tabs: [tab3]
 		}]);
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.length, 1);
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.map(g => g.tabs).flat().length, 1);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.length, 1);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.map(g => g.tabs).flat().length, 1);
 		assert.strictEqual(extHostEditorTabs.tabGroups.activeTabGroup?.activeTab, extHostEditorTabs.tabGroups.activeTabGroup?.tabs[0]);
 
 		// Closing out all tabs returns undefine active tab
@@ -514,94 +452,11 @@ suite('ExtHostEditorTabs', function () {
 			groupId: 12,
 			tabs: []
 		}]);
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.length, 1);
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.map(g => g.tabs).flat().length, 0);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.length, 1);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.map(g => g.tabs).flat().length, 0);
 		assert.strictEqual(extHostEditorTabs.tabGroups.activeTabGroup?.activeTab, undefined);
 	});
 
-	test('Active tab change event', function () {
-
-		const extHostEditorTabs = new ExtHostEditorTabs(
-			SingleProxyRPCProtocol(new class extends mock<MainThreadEditorTabsShape>() {
-				// override/implement $moveTab or $closeTab
-			})
-		);
-
-		let activeTabChangeCount = 0;
-		extHostEditorTabs.tabGroups.onDidChangeActiveTab((activeTab) => {
-			if (activeTab.isActive === false) {
-				throw new Error('Active tab changed fired on inactive tab');
-			}
-			activeTabChangeCount++;
-		});
-
-		const tab1: IEditorTabDto = createTabDto({
-			id: 'uniquestring',
-			isActive: true,
-			label: 'label1',
-		});
-
-		const tab2: IEditorTabDto = createTabDto({
-			isActive: false,
-			id: 'uniquestring2',
-			label: 'label2',
-		});
-
-		const tab3: IEditorTabDto = createTabDto({
-			isActive: false,
-			id: 'uniquestring3',
-			label: 'label3',
-		});
-
-		extHostEditorTabs.$acceptEditorTabModel([{
-			isActive: true,
-			viewColumn: 0,
-			groupId: 12,
-			tabs: [tab1, tab2, tab3]
-		}]);
-
-		// Accepting a model doesn't fire an active tab change event
-		assert.strictEqual(activeTabChangeCount, 0);
-
-		// Switching active tab works
-		tab1.isActive = false;
-		tab2.isActive = true;
-
-		extHostEditorTabs.$acceptTabOperation({
-			groupId: 12,
-			index: 0,
-			kind: TabModelOperationKind.TAB_UPDATE,
-			tabDto: tab1
-		});
-		extHostEditorTabs.$acceptTabOperation({
-			groupId: 12,
-			index: 1,
-			kind: TabModelOperationKind.TAB_UPDATE,
-			tabDto: tab2
-		});
-		// The active tab changed so it is fired once
-		assert.strictEqual(activeTabChangeCount, 1);
-
-		//Closing tabs out works
-		tab3.isActive = true;
-		extHostEditorTabs.$acceptEditorTabModel([{
-			isActive: true,
-			viewColumn: 0,
-			groupId: 12,
-			tabs: [tab3]
-		}]);
-		// Accepting a model doesn't fire an active tab change event
-		assert.strictEqual(activeTabChangeCount, 1);
-		tab3.label = 'Foobar';
-		extHostEditorTabs.$acceptTabOperation({
-			groupId: 12,
-			index: 0,
-			kind: TabModelOperationKind.TAB_UPDATE,
-			tabDto: tab3
-		});
-		// Something related to the active tab changed
-		assert.strictEqual(activeTabChangeCount, 2);
-	});
 	test('Tab operations patches open and close correctly', function () {
 		const extHostEditorTabs = new ExtHostEditorTabs(
 			SingleProxyRPCProtocol(new class extends mock<MainThreadEditorTabsShape>() {
@@ -634,8 +489,8 @@ suite('ExtHostEditorTabs', function () {
 			tabs: [tab1, tab2, tab3]
 		}]);
 
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.length, 1);
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.map(g => g.tabs).flat().length, 3);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.length, 1);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.map(g => g.tabs).flat().length, 3);
 
 		// Close tab 2
 		extHostEditorTabs.$acceptTabOperation({
@@ -644,8 +499,8 @@ suite('ExtHostEditorTabs', function () {
 			kind: TabModelOperationKind.TAB_CLOSE,
 			tabDto: tab2
 		});
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.length, 1);
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.map(g => g.tabs).flat().length, 2);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.length, 1);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.map(g => g.tabs).flat().length, 2);
 
 		// Close active tab and update tab 3 to be active
 		extHostEditorTabs.$acceptTabOperation({
@@ -654,8 +509,8 @@ suite('ExtHostEditorTabs', function () {
 			kind: TabModelOperationKind.TAB_CLOSE,
 			tabDto: tab1
 		});
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.length, 1);
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.map(g => g.tabs).flat().length, 1);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.length, 1);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.map(g => g.tabs).flat().length, 1);
 		tab3.isActive = true;
 		extHostEditorTabs.$acceptTabOperation({
 			groupId: 12,
@@ -663,9 +518,9 @@ suite('ExtHostEditorTabs', function () {
 			kind: TabModelOperationKind.TAB_UPDATE,
 			tabDto: tab3
 		});
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.length, 1);
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.map(g => g.tabs).flat().length, 1);
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups[0]?.activeTab?.label, 'label3');
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.length, 1);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.map(g => g.tabs).flat().length, 1);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all[0]?.activeTab?.label, 'label3');
 
 		// Open tab 2 back
 		extHostEditorTabs.$acceptTabOperation({
@@ -674,8 +529,8 @@ suite('ExtHostEditorTabs', function () {
 			kind: TabModelOperationKind.TAB_OPEN,
 			tabDto: tab2
 		});
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.length, 1);
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups.map(g => g.tabs).flat().length, 2);
-		assert.strictEqual(extHostEditorTabs.tabGroups.groups[0]?.tabs[1]?.label, 'label2');
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.length, 1);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all.map(g => g.tabs).flat().length, 2);
+		assert.strictEqual(extHostEditorTabs.tabGroups.all[0]?.tabs[1]?.label, 'label2');
 	});
 });
diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts
index cb67d57d434..3624936e41f 100644
--- a/src/vs/workbench/browser/parts/editor/editorCommands.ts
+++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts
@@ -844,7 +844,8 @@ function registerCloseEditorCommands() {
 		handler: (accessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
 			return Promise.all(getEditorsContext(accessor, resourceOrContext, context).groups.map(async group => {
 				if (group) {
-					return group.closeAllEditors({ excludeSticky: true });
+					await group.closeAllEditors({ excludeSticky: true });
+					return;
 				}
 			}));
 		}
diff --git a/src/vs/workbench/browser/parts/editor/editorDropTarget.ts b/src/vs/workbench/browser/parts/editor/editorDropTarget.ts
index 2fa3f3998d6..e3d008f61cc 100644
--- a/src/vs/workbench/browser/parts/editor/editorDropTarget.ts
+++ b/src/vs/workbench/browser/parts/editor/editorDropTarget.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./media/editordroptarget';
+import { localize } from 'vs/nls';
 import { Extensions as DragAndDropExtensions, LocalSelectionTransfer, DraggedEditorIdentifier, ResourcesDropHandler, DraggedEditorGroupIdentifier, containsDragType, CodeDataTransfers, DraggedTreeItemsIdentifier, extractTreeDropData, IDragAndDropContributionRegistry } from 'vs/workbench/browser/dnd';
 import { addDisposableListener, EventType, EventHelper, isAncestor, DragAndDropObserver } from 'vs/base/browser/dom';
 import { IEditorGroupsAccessor, IEditorGroupView, fillActiveEditorViewState } from 'vs/workbench/browser/parts/editor/editor';
@@ -28,11 +29,12 @@ interface IDropOperation {
 	splitDirection?: GroupDirection;
 }
 
+function isDropIntoEditorEnabled(configurationService: IConfigurationService) {
+	return configurationService.getValue<boolean>('workbench.editor.dropIntoEditor.enabled');
+}
+
 function isDragIntoEditorEvent(configurationService: IConfigurationService, e: DragEvent): boolean {
-	if (!configurationService.getValue<boolean>('workbench.experimental.editor.dragAndDropIntoEditor.enabled')) {
-		return false;
-	}
-	return e.shiftKey;
+	return isDropIntoEditorEnabled(configurationService) && e.shiftKey;
 }
 
 class DropOverlay extends Themable {
@@ -41,6 +43,7 @@ class DropOverlay extends Themable {
 
 	private container: HTMLElement | undefined;
 	private overlay: HTMLElement | undefined;
+	private dropIntoPromptElement?: HTMLSpanElement;
 
 	private currentDropOperation: IDropOperation | undefined;
 	private _disposed: boolean | undefined;
@@ -94,6 +97,13 @@ class DropOverlay extends Themable {
 		this.overlay.classList.add('editor-group-overlay-indicator');
 		container.appendChild(this.overlay);
 
+		if (isDropIntoEditorEnabled(this.configurationService)) {
+			this.dropIntoPromptElement = document.createElement('span');
+			this.dropIntoPromptElement.classList.add('editor-group-overlay-drop-into-prompt');
+			this.dropIntoPromptElement.textContent = localize('dropIntoEditorPrompt', "Hold shift to drop into editor");
+			this.overlay.appendChild(this.dropIntoPromptElement);
+		}
+
 		// Overlay Event Handling
 		this.registerListeners(container);
 
@@ -444,18 +454,23 @@ class DropOverlay extends Themable {
 		switch (splitDirection) {
 			case GroupDirection.UP:
 				this.doPositionOverlay({ top: '0', left: '0', width: '100%', height: '50%' });
+				this.toggleDropIntoPrompt(false);
 				break;
 			case GroupDirection.DOWN:
 				this.doPositionOverlay({ top: '50%', left: '0', width: '100%', height: '50%' });
+				this.toggleDropIntoPrompt(false);
 				break;
 			case GroupDirection.LEFT:
 				this.doPositionOverlay({ top: '0', left: '0', width: '50%', height: '100%' });
+				this.toggleDropIntoPrompt(false);
 				break;
 			case GroupDirection.RIGHT:
 				this.doPositionOverlay({ top: '0', left: '50%', width: '50%', height: '100%' });
+				this.toggleDropIntoPrompt(false);
 				break;
 			default:
 				this.doPositionOverlay({ top: '0', left: '0', width: '100%', height: '100%' });
+				this.toggleDropIntoPrompt(true);
 		}
 
 		// Make sure the overlay is visible now
@@ -510,6 +525,13 @@ class DropOverlay extends Themable {
 		this.currentDropOperation = undefined;
 	}
 
+	private toggleDropIntoPrompt(showing: boolean) {
+		if (!this.dropIntoPromptElement) {
+			return;
+		}
+		this.dropIntoPromptElement.style.opacity = showing ? '1' : '0';
+	}
+
 	contains(element: HTMLElement): boolean {
 		return element === this.container || element === this.overlay;
 	}
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
index 0286fc0b08f..b4334ffd1f6 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
@@ -1786,7 +1786,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 
 	//#region closeAllEditors()
 
-	async closeAllEditors(options?: ICloseAllEditorsOptions): Promise<void> {
+	async closeAllEditors(options?: ICloseAllEditorsOptions): Promise<boolean> {
 		if (this.isEmpty) {
 
 			// If the group is empty and the request is to close all editors, we still close
@@ -1796,17 +1796,19 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 				this.accessor.removeGroup(this);
 			}
 
-			return;
+			return true;
 		}
 
 		// Check for dirty and veto
 		const veto = await this.handleDirtyClosing(this.model.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, options));
 		if (veto) {
-			return;
+			return false;
 		}
 
 		// Do close
 		this.doCloseAllEditors(options);
+
+		return true;
 	}
 
 	private doCloseAllEditors(options?: ICloseAllEditorsOptions): void {
diff --git a/src/vs/workbench/browser/parts/editor/media/editordroptarget.css b/src/vs/workbench/browser/parts/editor/media/editordroptarget.css
index d21f31445b3..812d42d7611 100644
--- a/src/vs/workbench/browser/parts/editor/media/editordroptarget.css
+++ b/src/vs/workbench/browser/parts/editor/media/editordroptarget.css
@@ -20,6 +20,17 @@
 	pointer-events: none; /* very important to not take events away from the parent */
 	opacity: 0; /* hidden initially */
 	transition: opacity 150ms ease-out;
+
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+#monaco-workbench-editor-drop-overlay .editor-group-overlay-drop-into-prompt {
+	text-align: center;
+	padding: 1em;
+	opacity: 0; /* hidden initially */
+	transition: opacity 150ms ease-out;
 }
 
 #monaco-workbench-editor-drop-overlay > .editor-group-overlay-indicator.overlay-move-transition {
diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts
index 91df2786f62..e57af762d28 100644
--- a/src/vs/workbench/browser/parts/views/treeView.ts
+++ b/src/vs/workbench/browser/parts/views/treeView.ts
@@ -65,6 +65,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { Mimes } from 'vs/base/common/mime';
 import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
 import { IDataTransfer } from 'vs/workbench/common/dnd';
+import { ThemeSettings } from 'vs/workbench/services/themes/common/workbenchThemeService';
 
 export class TreeViewPane extends ViewPane {
 
@@ -1018,13 +1019,14 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 		templateData.actionBar.clear();
 		templateData.icon.style.color = '';
 
-		if (resource || this.isFileKindThemeIcon(node.themeIcon)) {
+
+		if (resource) {
 			const fileDecorations = this.configurationService.getValue<{ colors: boolean; badges: boolean }>('explorer.decorations');
 			const labelResource = resource ? resource : URI.parse('missing:_icon_resource');
 			templateData.resourceLabel.setResource({ name: label, description, resource: labelResource }, {
 				fileKind: this.getFileKind(node),
 				title,
-				hideIcon: !!iconUrl || !!node.themeIcon,
+				hideIcon: !!iconUrl || this.shouldShowThemeIcon(!!resource, node.themeIcon),
 				fileDecorations,
 				extraClasses: ['custom-view-tree-node-item-resourceLabel'],
 				matches: matches ? matches : createMatches(element.filterData),
@@ -1047,7 +1049,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 			let iconClass: string | undefined;
 			// If there is a resource for this tree item then we should respect the file icon theme's choice about
 			// whether to show a folder icon.
-			if (node.themeIcon && (!resource || !this.isFolderThemeIcon(node.themeIcon) || this.themeService.getFileIconTheme().hasFolderIcons)) {
+			if (this.shouldShowThemeIcon(!!resource, node.themeIcon)) {
 				iconClass = ThemeIcon.asClassName(node.themeIcon);
 				if (node.themeIcon.color) {
 					templateData.icon.style.color = this.themeService.getColorTheme().getColor(node.themeIcon.color.id)?.toString() ?? '';
@@ -1080,6 +1082,27 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 		container.parentElement!.classList.toggle('align-icon-with-twisty', this.aligner.alignIconWithTwisty(treeItem));
 	}
 
+	private shouldShowThemeIcon(hasResource: boolean, icon: ThemeIcon | undefined): icon is ThemeIcon {
+		if (!icon) {
+			return false;
+		}
+
+		if (hasResource && (this.isFileKindThemeIcon(icon) || !this.shouldShowFileIcons())) {
+			return false;
+		} else if (hasResource && (this.isFolderThemeIcon(icon) || !this.shouldShowFolderIcons())) {
+			return false;
+		}
+		return true;
+	}
+
+	private shouldShowFileIcons(): boolean {
+		return this.configurationService.getValue(ThemeSettings.FILE_ICON_THEME);
+	}
+
+	private shouldShowFolderIcons(): boolean {
+		return this.themeService.getFileIconTheme().hasFolderIcons && this.shouldShowFileIcons();
+	}
+
 	private isFolderThemeIcon(icon: ThemeIcon | undefined): boolean {
 		return icon?.id === FolderThemeIcon.id;
 	}
@@ -1253,6 +1276,7 @@ export class CustomTreeView extends AbstractTreeView {
 	constructor(
 		id: string,
 		title: string,
+		private readonly extensionId: string,
 		@IThemeService themeService: IThemeService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ICommandService commandService: ICommandService,
@@ -1265,13 +1289,26 @@ export class CustomTreeView extends AbstractTreeView {
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IHoverService hoverService: IHoverService,
 		@IExtensionService private readonly extensionService: IExtensionService,
-		@IActivityService activityService: IActivityService
+		@IActivityService activityService: IActivityService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService
 	) {
 		super(id, title, themeService, instantiationService, commandService, configurationService, progressService, contextMenuService, keybindingService, notificationService, viewDescriptorService, hoverService, contextKeyService, activityService);
 	}
 
 	protected activate() {
 		if (!this.activated) {
+			type ExtensionViewTelemetry = {
+				extensionId: string;
+				id: string;
+			};
+			type ExtensionViewTelemetryMeta = {
+				extensionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; owner: 'digitarald'; comment: 'Id of the extension' };
+				id: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; owner: 'digitarald'; comment: 'Id of the view' };
+			};
+			this.telemetryService.publicLog2<ExtensionViewTelemetry, ExtensionViewTelemetryMeta>('Extension:ViewActivate', {
+				extensionId: this.extensionId,
+				id: this.id,
+			});
 			this.createTree();
 			this.progressService.withProgress({ location: this.id }, () => this.extensionService.activateByEvent(`onView:${this.id}`))
 				.then(() => timeout(2000))
@@ -1391,13 +1428,7 @@ export class CustomTreeViewDragAndDrop implements ITreeDragAndDrop<ITreeItem> {
 		}
 	}
 
-	private debugLog(originalEvent: DragEvent) {
-		const types: Set<string> = new Set();
-		originalEvent.dataTransfer?.types.forEach((value, index) => {
-			if ((originalEvent.dataTransfer?.items[index].kind === 'string') && (INTERNAL_MIME_TYPES.indexOf(value) < 0)) {
-				types.add(this.convertKnownMimes(value).type);
-			}
-		});
+	private debugLog(types: Set<string>) {
 		if (types.size) {
 			this.logService.debug(`TreeView dragged mime types: ${Array.from(types).join(', ')}`);
 		} else {
@@ -1406,12 +1437,19 @@ export class CustomTreeViewDragAndDrop implements ITreeDragAndDrop<ITreeItem> {
 	}
 
 	onDragOver(data: IDragAndDropData, targetElement: ITreeItem, targetIndex: number, originalEvent: DragEvent): boolean | ITreeDragOverReaction {
-		this.debugLog(originalEvent);
+		const types: Set<string> = new Set();
+		originalEvent.dataTransfer?.types.forEach((value, index) => {
+			if (INTERNAL_MIME_TYPES.indexOf(value) < 0) {
+				types.add(this.convertKnownMimes(value).type);
+			}
+		});
+
+		this.debugLog(types);
 		const dndController = this.dndController;
 		if (!dndController || !originalEvent.dataTransfer || (dndController.dropMimeTypes.length === 0)) {
 			return false;
 		}
-		const dragContainersSupportedType = originalEvent.dataTransfer.types.some((value, index) => {
+		const dragContainersSupportedType = Array.from(types).some((value, index) => {
 			if (value === this.treeMimeType) {
 				return true;
 			} else {
@@ -1442,15 +1480,20 @@ export class CustomTreeViewDragAndDrop implements ITreeDragAndDrop<ITreeItem> {
 		return element.label ? element.label.label : (element.resourceUri ? this.labelService.getUriLabel(URI.revive(element.resourceUri)) : undefined);
 	}
 
-	private convertKnownMimes(type: string, value?: string): { type: string; value?: string } {
-		let convertedValue = value;
+	private convertKnownMimes(type: string, value?: string | FileSystemHandle): { type: string; value?: string } {
+		let convertedValue = undefined;
 		let convertedType = type;
 		switch (type) {
 			case DataTransfers.RESOURCES.toLowerCase(): {
-				convertedValue = value ? convertResourceUrlsToUriList(value) : undefined;
+				convertedValue = value ? convertResourceUrlsToUriList(value as string) : undefined;
 				convertedType = Mimes.uriList;
 				break;
 			}
+			case 'Files': {
+				convertedType = Mimes.uriList;
+				convertedValue = value ? (value as FileSystemHandle).name : undefined;
+				break;
+			}
 		}
 		return { type: convertedType, value: convertedValue };
 	}
@@ -1461,8 +1504,9 @@ export class CustomTreeViewDragAndDrop implements ITreeDragAndDrop<ITreeItem> {
 			return;
 		}
 		const treeDataTransfer: IDataTransfer = new Map();
-		let stringCount = Array.from(originalEvent.dataTransfer.items).reduce((previous, current) => {
-			if (current.kind === 'string') {
+		const uris: URI[] = [];
+		let itemsCount = Array.from(originalEvent.dataTransfer.items).reduce((previous, current) => {
+			if ((current.kind === 'string') || (current.kind === 'file')) {
 				return previous + 1;
 			}
 			return previous;
@@ -1475,8 +1519,15 @@ export class CustomTreeViewDragAndDrop implements ITreeDragAndDrop<ITreeItem> {
 		}
 		await new Promise<void>(resolve => {
 			function decrementStringCount() {
-				stringCount--;
-				if (stringCount === 0) {
+				itemsCount--;
+				if (itemsCount === 0) {
+					// Check if there are uris to add and add them
+					if (uris.length) {
+						treeDataTransfer.set(Mimes.uriList, {
+							asString: () => Promise.resolve(uris.map(uri => uri.toString()).join('\n')),
+							value: undefined
+						});
+					}
 					resolve();
 				}
 			}
@@ -1487,15 +1538,14 @@ export class CustomTreeViewDragAndDrop implements ITreeDragAndDrop<ITreeItem> {
 			for (const dataItem of originalEvent.dataTransfer.items) {
 				const type = dataItem.type;
 				const convertedType = this.convertKnownMimes(type).type;
-				if (dataItem.kind === 'string') {
-					if ((convertedType === this.treeMimeType) || (dndController.dropMimeTypes.indexOf(convertedType) >= 0)) {
+				if ((INTERNAL_MIME_TYPES.indexOf(convertedType) < 0)
+					&& (convertedType === this.treeMimeType) || (dndController.dropMimeTypes.indexOf(convertedType) >= 0)) {
+					if (dataItem.kind === 'string') {
 						dataItem.getAsString(dataValue => {
 							if (convertedType === this.treeMimeType) {
 								treeSourceInfo = JSON.parse(dataValue);
 							}
-							if (dataValue
-								&& (INTERNAL_MIME_TYPES.indexOf(convertedType) < 0)
-								&& ((convertedType === this.treeMimeType) || (dndController.dropMimeTypes.indexOf(convertedType) >= 0))) {
+							if (dataValue) {
 								const converted = this.convertKnownMimes(type, dataValue);
 								treeDataTransfer.set(converted.type, {
 									asString: () => Promise.resolve(converted.value!),
@@ -1504,6 +1554,12 @@ export class CustomTreeViewDragAndDrop implements ITreeDragAndDrop<ITreeItem> {
 							}
 							decrementStringCount();
 						});
+					} else if (dataItem.kind === 'file') {
+						const dataValue = dataItem.getAsFile();
+						if (dataValue) {
+							uris.push(URI.file(dataValue.path));
+						}
+						decrementStringCount();
 					} else {
 						decrementStringCount();
 					}
diff --git a/src/vs/workbench/browser/window.ts b/src/vs/workbench/browser/window.ts
index cbcbac8602c..5e94ea2bba1 100644
--- a/src/vs/workbench/browser/window.ts
+++ b/src/vs/workbench/browser/window.ts
@@ -112,16 +112,20 @@ export class BrowserWindow extends Disposable {
 
 	private create(): void {
 
-		// Driver
-		if (this.environmentService.options?.developmentOptions?.enableSmokeTestDriver) {
-			(async () => this._register(await registerWindowDriver()))();
-		}
-
 		// Handle open calls
 		this.setupOpenHandlers();
 
 		// Label formatting
 		this.registerLabelFormatters();
+
+		// Smoke Test Driver
+		this.setupDriver();
+	}
+
+	private setupDriver(): void {
+		if (this.environmentService.options?.developmentOptions?.enableSmokeTestDriver) {
+			registerWindowDriver();
+		}
 	}
 
 	private setupOpenHandlers(): void {
diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
index 5d43bf45a05..bd7b4b48783 100644
--- a/src/vs/workbench/browser/workbench.contribution.ts
+++ b/src/vs/workbench/browser/workbench.contribution.ts
@@ -464,11 +464,10 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 				'description': localize('layoutControlType', "Controls whether the layout control in the custom title bar is displayed as a single menu button or with multiple UI toggles."),
 				'markdownDeprecationMessage': localize({ key: 'layoutControlTypeDeprecation', comment: ['{0} is a placeholder for a setting identifier.'] }, "This setting has been deprecated in favor of {0}", '`#workbench.layoutControl.type#`')
 			},
-			'workbench.experimental.editor.dragAndDropIntoEditor.enabled': {
+			'workbench.editor.dropIntoEditor.enabled': {
 				'type': 'boolean',
-				'tags': ['experimental'],
-				'default': false,
-				'description': localize('dragAndDropIntoEditor', "Controls whether you can drag and drop a file into an editor by holding down shift (instead of opening the file in an editor)."),
+				'default': true,
+				'markdownDescription': localize('dropIntoEditor', "Controls whether you can drag and drop a file into a text editor by holding down `shift` (instead of opening the file in an editor)."),
 			}
 		}
 	});
diff --git a/src/vs/workbench/contrib/comments/browser/commentColors.ts b/src/vs/workbench/contrib/comments/browser/commentColors.ts
index 3fc12217f70..0ae19209c29 100644
--- a/src/vs/workbench/contrib/comments/browser/commentColors.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentColors.ts
@@ -5,12 +5,13 @@
 
 import { Color } from 'vs/base/common/color';
 import * as languages from 'vs/editor/common/languages';
+import { peekViewBorder } from 'vs/editor/contrib/peekView/browser/peekView';
 import * as nls from 'vs/nls';
-import { contrastBorder, editorWarningForeground, editorWidgetForeground, registerColor } from 'vs/platform/theme/common/colorRegistry';
+import { contrastBorder, disabledForeground, registerColor } from 'vs/platform/theme/common/colorRegistry';
 import { IColorTheme } from 'vs/platform/theme/common/themeService';
 
-export const resolvedCommentBorder = registerColor('comments.resolved.border', { dark: editorWidgetForeground, light: editorWidgetForeground, hcDark: contrastBorder, hcLight: contrastBorder }, nls.localize('resolvedCommentBorder', 'Color of borders and arrow for resolved comments.'));
-export const unresolvedCommentBorder = registerColor('comments.unresolved.border', { dark: editorWarningForeground, light: editorWarningForeground, hcDark: contrastBorder, hcLight: contrastBorder }, nls.localize('unresolvedCommentBorder', 'Color of borders and arrow for unresolved comments.'));
+const resolvedCommentBorder = registerColor('comments.resolved.border', { dark: disabledForeground, light: disabledForeground, hcDark: contrastBorder, hcLight: contrastBorder }, nls.localize('resolvedCommentBorder', 'Color of borders and arrow for resolved comments.'));
+const unresolvedCommentBorder = registerColor('comments.unresolved.border', { dark: peekViewBorder, light: peekViewBorder, hcDark: contrastBorder, hcLight: contrastBorder }, nls.localize('unresolvedCommentBorder', 'Color of borders and arrow for unresolved comments.'));
 
 const commentThreadStateColors = new Map([
 	[languages.CommentThreadState.Unresolved, unresolvedCommentBorder],
@@ -18,8 +19,10 @@ const commentThreadStateColors = new Map([
 ]);
 
 export const commentThreadStateColorVar = '--comment-thread-state-color';
+export const commentViewThreadStateColorVar = '--comment-view-thread-state-color';
+export const commentThreadStateBackgroundColorVar = '--comment-thread-state-background-color';
 
-export function getCommentThreadStateColor(thread: languages.CommentThread, theme: IColorTheme): Color | undefined {
-	const colorId = thread.state !== undefined ? commentThreadStateColors.get(thread.state) : undefined;
-	return colorId !== undefined ? theme.getColor(colorId) : undefined;
+export function getCommentThreadStateColor(state: languages.CommentThreadState | undefined, theme: IColorTheme): Color | undefined {
+	const colorId = (state !== undefined) ? commentThreadStateColors.get(state) : undefined;
+	return (colorId !== undefined) ? theme.getColor(colorId) : undefined;
 }
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
index b4989b77691..0f9f5fd1500 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
@@ -24,7 +24,7 @@ import { IColorTheme } from 'vs/platform/theme/common/themeService';
 import { contrastBorder, focusBorder, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground, textBlockQuoteBackground, textBlockQuoteBorder, textLinkActiveForeground, textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
 import { PANEL_BORDER } from 'vs/workbench/common/theme';
 import { IRange } from 'vs/editor/common/core/range';
-import { commentThreadStateColorVar } from 'vs/workbench/contrib/comments/browser/commentColors';
+import { commentThreadStateBackgroundColorVar, commentThreadStateColorVar } from 'vs/workbench/contrib/comments/browser/commentColors';
 import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
 import { FontInfo } from 'vs/editor/common/config/fontInfo';
 
@@ -248,6 +248,7 @@ export class CommentThreadWidget<T extends IRange | ICellRange = IRange> extends
 		const content: string[] = [];
 
 		content.push(`.monaco-editor .review-widget > .body { border-top: 1px solid var(${commentThreadStateColorVar}) }`);
+		content.push(`.monaco-editor .review-widget > .head { background-color: var(${commentThreadStateBackgroundColorVar}) }`);
 
 		const linkColor = theme.getColor(textLinkForeground);
 		if (linkColor) {
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
index 151a49ffbb6..d7832f4c718 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
@@ -23,10 +23,10 @@ import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { CommentThreadWidget } from 'vs/workbench/contrib/comments/browser/commentThreadWidget';
 import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { commentThreadStateColorVar, getCommentThreadStateColor } from 'vs/workbench/contrib/comments/browser/commentColors';
+import { commentThreadStateBackgroundColorVar, commentThreadStateColorVar, getCommentThreadStateColor } from 'vs/workbench/contrib/comments/browser/commentColors';
 import { peekViewBorder } from 'vs/editor/contrib/peekView/browser/peekView';
 
-export function getCommentThreadWidgetStateColor(thread: languages.CommentThread, theme: IColorTheme): Color | undefined {
+export function getCommentThreadWidgetStateColor(thread: languages.CommentThreadState | undefined, theme: IColorTheme): Color | undefined {
 	return getCommentThreadStateColor(thread, theme) ?? theme.getColor(peekViewBorder);
 }
 
@@ -85,7 +85,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 	private readonly _globalToDispose = new DisposableStore();
 	private _commentThreadDisposables: IDisposable[] = [];
 	private _contextKeyService: IContextKeyService;
-	private _scopedInstatiationService: IInstantiationService;
+	private _scopedInstantiationService: IInstantiationService;
 
 	public get owner(): string {
 		return this._owner;
@@ -109,7 +109,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 		super(editor, { keepEditorSelection: true });
 		this._contextKeyService = contextKeyService.createScoped(this.domNode);
 
-		this._scopedInstatiationService = instantiationService.createChild(new ServiceCollection(
+		this._scopedInstantiationService = instantiationService.createChild(new ServiceCollection(
 			[IContextKeyService, this._contextKeyService]
 		));
 
@@ -184,13 +184,13 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 
 	protected _fillContainer(container: HTMLElement): void {
 		this.setCssClass('review-widget');
-		this._commentThreadWidget = this._scopedInstatiationService.createInstance(
+		this._commentThreadWidget = this._scopedInstantiationService.createInstance(
 			CommentThreadWidget,
 			container,
 			this._owner,
 			this.editor.getModel()!.uri,
 			this._contextKeyService,
-			this._scopedInstatiationService,
+			this._scopedInstantiationService,
 			this._commentThread as unknown as languages.CommentThread<IRange | ICellRange>,
 			this._pendingComment,
 			{ editor: this.editor },
@@ -344,12 +344,13 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 
 		this._commentThreadDisposables.push(this._commentThread.onDidChangeState(() => {
 			const borderColor =
-				getCommentThreadWidgetStateColor(this._commentThread, this.themeService.getColorTheme()) || Color.transparent;
+				getCommentThreadWidgetStateColor(this._commentThread.state, this.themeService.getColorTheme()) || Color.transparent;
 			this.style({
 				frameColor: borderColor,
 				arrowColor: borderColor,
 			});
 			this.container?.style.setProperty(commentThreadStateColorVar, `${borderColor}`);
+			this.container?.style.setProperty(commentThreadStateBackgroundColorVar, `${borderColor.transparent(.1)}`);
 		}));
 	}
 
@@ -410,7 +411,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 	}
 
 	private _applyTheme(theme: IColorTheme) {
-		const borderColor = getCommentThreadWidgetStateColor(this._commentThread, this.themeService.getColorTheme()) || Color.transparent;
+		const borderColor = getCommentThreadWidgetStateColor(this._commentThread.state, this.themeService.getColorTheme()) || Color.transparent;
 		this.style({
 			arrowColor: borderColor,
 			frameColor: borderColor
diff --git a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
index e291c7d32de..ebe8b7b9de2 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
@@ -18,12 +18,15 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { WorkbenchAsyncDataTree, IListService, IWorkbenchAsyncDataTreeOptions } from 'vs/platform/list/browser/listService';
-import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { IColorTheme, IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IColorMapping } from 'vs/platform/theme/common/styler';
 import { TimestampWidget } from 'vs/workbench/contrib/comments/browser/timestamp';
 import { Codicon } from 'vs/base/common/codicons';
 import { IMarkdownString } from 'vs/base/common/htmlContent';
+import { commentViewThreadStateColorVar, getCommentThreadStateColor } from 'vs/workbench/contrib/comments/browser/commentColors';
+import { CommentThreadState } from 'vs/editor/common/languages';
+import { Color } from 'vs/base/common/color';
 
 export const COMMENTS_VIEW_ID = 'workbench.panel.comments';
 export const COMMENTS_VIEW_TITLE = 'Comments';
@@ -50,7 +53,7 @@ interface IResourceTemplateData {
 
 interface ICommentThreadTemplateData {
 	threadMetadata: {
-		icon?: HTMLElement;
+		icon: HTMLElement;
 		userNames: HTMLSpanElement;
 		timestamp: TimestampWidget;
 		separator: HTMLElement;
@@ -121,7 +124,8 @@ export class CommentNodeRenderer implements IListRenderer<ITreeNode<CommentNode>
 
 	constructor(
 		@IOpenerService private readonly openerService: IOpenerService,
-		@IConfigurationService private readonly configurationService: IConfigurationService
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IThemeService private themeService: IThemeService
 	) { }
 
 	renderTemplate(container: HTMLElement) {
@@ -185,6 +189,11 @@ export class CommentNodeRenderer implements IListRenderer<ITreeNode<CommentNode>
 	renderElement(node: ITreeNode<CommentNode>, index: number, templateData: ICommentThreadTemplateData, height: number | undefined): void {
 		const commentCount = node.element.replies.length + 1;
 		templateData.threadMetadata.icon?.classList.add(...ThemeIcon.asClassNameArray((commentCount === 1) ? Codicon.comment : Codicon.commentDiscussion));
+		if (node.element.threadState !== undefined) {
+			const color = this.getCommentThreadWidgetStateColor(node.element.threadState, this.themeService.getColorTheme());
+			templateData.threadMetadata.icon.style.setProperty(commentViewThreadStateColorVar, `${color}`);
+			templateData.threadMetadata.icon.style.color = `var(${commentViewThreadStateColorVar}`;
+		}
 		templateData.threadMetadata.userNames.textContent = node.element.comment.userName;
 		templateData.threadMetadata.timestamp.setTimestamp(node.element.comment.timestamp ? new Date(node.element.comment.timestamp) : undefined);
 		const originalComment = node.element;
@@ -213,6 +222,10 @@ export class CommentNodeRenderer implements IListRenderer<ITreeNode<CommentNode>
 
 	}
 
+	private getCommentThreadWidgetStateColor(state: CommentThreadState | undefined, theme: IColorTheme): Color | undefined {
+		return (state !== undefined) ? getCommentThreadStateColor(state, theme) : undefined;
+	}
+
 	disposeTemplate(templateData: ICommentThreadTemplateData): void {
 		templateData.disposables.forEach(disposeable => disposeable.dispose());
 	}
diff --git a/src/vs/workbench/contrib/comments/common/commentModel.ts b/src/vs/workbench/contrib/comments/common/commentModel.ts
index d8f97430b4b..06ec27f01c3 100644
--- a/src/vs/workbench/contrib/comments/common/commentModel.ts
+++ b/src/vs/workbench/contrib/comments/common/commentModel.ts
@@ -5,7 +5,7 @@
 
 import { URI } from 'vs/base/common/uri';
 import { IRange } from 'vs/editor/common/core/range';
-import { Comment, CommentThread, CommentThreadChangedEvent } from 'vs/editor/common/languages';
+import { Comment, CommentThread, CommentThreadChangedEvent, CommentThreadState } from 'vs/editor/common/languages';
 import { groupBy } from 'vs/base/common/arrays';
 import { localize } from 'vs/nls';
 
@@ -21,14 +21,16 @@ export class CommentNode {
 	replies: CommentNode[] = [];
 	resource: URI;
 	isRoot: boolean;
+	threadState?: CommentThreadState;
 
-	constructor(owner: string, threadId: string, resource: URI, comment: Comment, range: IRange) {
+	constructor(owner: string, threadId: string, resource: URI, comment: Comment, range: IRange, threadState: CommentThreadState | undefined) {
 		this.owner = owner;
 		this.threadId = threadId;
 		this.comment = comment;
 		this.resource = resource;
 		this.range = range;
 		this.isRoot = false;
+		this.threadState = threadState;
 	}
 
 	hasReply(): boolean {
@@ -51,7 +53,7 @@ export class ResourceWithCommentThreads {
 
 	public static createCommentNode(owner: string, resource: URI, commentThread: CommentThread): CommentNode {
 		const { threadId, comments, range } = commentThread;
-		const commentNodes: CommentNode[] = comments!.map(comment => new CommentNode(owner, threadId!, resource, comment, range));
+		const commentNodes: CommentNode[] = comments!.map(comment => new CommentNode(owner, threadId!, resource, comment, range, commentThread.state));
 		if (commentNodes.length > 1) {
 			commentNodes[0].replies = commentNodes.slice(1, commentNodes.length);
 		}
diff --git a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
index 11f4ef0ce63..c9e21957b98 100644
--- a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
@@ -418,8 +418,8 @@ configurationRegistry.registerConfiguration({
 			default: false
 		},
 		'debug.inlineValues': {
-			type: ['boolean', 'string'],
-			'enum': [true, false, 'auto'],
+			type: 'string',
+			'enum': ['on', 'off', 'auto'],
 			description: nls.localize({ comment: ['This is the description for a setting'], key: 'inlineValues' }, "Show variable values inline in editor while debugging."),
 			'enumDescriptions': [
 				nls.localize('inlineValues.on', 'Always show variable values inline in editor while debugging.'),
diff --git a/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
index ee581fd735b..848242efad6 100644
--- a/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
@@ -627,7 +627,7 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 
 		const model = this.editor.getModel();
 		const inlineValuesSetting = this.configurationService.getValue<IDebugConfiguration>('debug').inlineValues;
-		const inlineValuesTurnedOn = inlineValuesSetting === true || (inlineValuesSetting === 'auto' && model && this.languageFeaturesService.inlineValuesProvider.has(model));
+		const inlineValuesTurnedOn = inlineValuesSetting === true || inlineValuesSetting === 'on' || (inlineValuesSetting === 'auto' && model && this.languageFeaturesService.inlineValuesProvider.has(model));
 		if (!inlineValuesTurnedOn || !model || !stackFrame || model.uri.toString() !== stackFrame.source.uri.toString()) {
 			if (!this.removeInlineValuesScheduler.isScheduled()) {
 				this.removeInlineValuesScheduler.schedule();
diff --git a/src/vs/workbench/contrib/debug/common/debug.ts b/src/vs/workbench/contrib/debug/common/debug.ts
index 7fd322d2d11..a811d3c40e8 100644
--- a/src/vs/workbench/contrib/debug/common/debug.ts
+++ b/src/vs/workbench/contrib/debug/common/debug.ts
@@ -611,7 +611,7 @@ export interface IDebugConfiguration {
 	allowBreakpointsEverywhere: boolean;
 	openDebug: 'neverOpen' | 'openOnSessionStart' | 'openOnFirstSessionStart' | 'openOnDebugBreak';
 	openExplorerOnEnd: boolean;
-	inlineValues: boolean | 'auto';
+	inlineValues: boolean | 'auto' | 'on' | 'off'; // boolean for back-compat
 	toolBarLocation: 'floating' | 'docked' | 'hidden';
 	showInStatusBar: 'never' | 'always' | 'onFirstSessionStart';
 	internalConsoleOptions: 'neverOpen' | 'openOnSessionStart' | 'openOnFirstSessionStart';
diff --git a/src/vs/workbench/contrib/dropIntoEditor/browser/dropIntoEditor.contibution.ts b/src/vs/workbench/contrib/dropIntoEditor/browser/dropIntoEditor.contibution.ts
new file mode 100644
index 00000000000..7e1380f1d1f
--- /dev/null
+++ b/src/vs/workbench/contrib/dropIntoEditor/browser/dropIntoEditor.contibution.ts
@@ -0,0 +1,151 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { distinct } from 'vs/base/common/arrays';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { Mimes } from 'vs/base/common/mime';
+import { relativePath } from 'vs/base/common/resources';
+import { URI } from 'vs/base/common/uri';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
+import { IPosition } from 'vs/editor/common/core/position';
+import { Range } from 'vs/editor/common/core/range';
+import { IEditorContribution } from 'vs/editor/common/editorCommon';
+import { IDataTransferItem } from 'vs/editor/common/languages';
+import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { performSnippetEdit } from 'vs/editor/contrib/snippet/browser/snippetController2';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { extractEditorsDropData } from 'vs/workbench/browser/dnd';
+import { IDataTransfer } from 'vs/workbench/common/dnd';
+
+
+export class DropIntoEditorController extends Disposable implements IEditorContribution {
+
+	public static readonly ID = 'editor.contrib.dropIntoEditorController';
+
+	constructor(
+		editor: ICodeEditor,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ILanguageFeaturesService private readonly _languageFeaturesService: ILanguageFeaturesService,
+		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
+	) {
+		super();
+
+		editor.onDropIntoEditor(e => this.onDropIntoEditor(editor, e.position, e.event));
+	}
+
+	private async onDropIntoEditor(editor: ICodeEditor, position: IPosition, dragEvent: DragEvent) {
+		if (!dragEvent.dataTransfer || !editor.hasModel()) {
+			return;
+		}
+
+		const model = editor.getModel();
+		const modelVersionNow = model.getVersionId();
+
+		const textEditorDataTransfer: IDataTransfer = new Map<string, IDataTransferItem>();
+		for (const item of dragEvent.dataTransfer.items) {
+			if (item.kind === 'string') {
+				const type = item.type;
+				const asStringValue = new Promise<string>(resolve => item.getAsString(resolve));
+				textEditorDataTransfer.set(type, {
+					asString: () => asStringValue,
+					value: undefined
+				});
+			}
+		}
+
+		if (!textEditorDataTransfer.has(Mimes.uriList.toLowerCase())) {
+			const editorData = (await this._instantiationService.invokeFunction(extractEditorsDropData, dragEvent))
+				.filter(input => input.resource)
+				.map(input => input.resource!.toString());
+
+			if (editorData.length) {
+				const str = distinct(editorData).join('\n');
+				textEditorDataTransfer.set(Mimes.uriList.toLowerCase(), {
+					asString: () => Promise.resolve(str),
+					value: undefined
+				});
+			}
+		}
+
+		if (textEditorDataTransfer.size === 0) {
+			return;
+		}
+
+		if (editor.getModel().getVersionId() !== modelVersionNow) {
+			return;
+		}
+
+		const cts = new CancellationTokenSource();
+		editor.onDidDispose(() => cts.cancel());
+		model.onDidChangeContent(() => cts.cancel());
+
+		const ordered = this._languageFeaturesService.documentOnDropEditProvider.ordered(model);
+		for (const provider of ordered) {
+			const edit = await provider.provideDocumentOnDropEdits(model, position, textEditorDataTransfer, cts.token);
+			if (cts.token.isCancellationRequested || editor.getModel().getVersionId() !== modelVersionNow) {
+				return;
+			}
+
+			if (edit) {
+				performSnippetEdit(editor, edit);
+				return;
+			}
+		}
+
+		return this.doDefaultDrop(editor, position, textEditorDataTransfer, cts.token);
+	}
+
+	private async doDefaultDrop(editor: ICodeEditor, position: IPosition, textEditorDataTransfer: IDataTransfer, token: CancellationToken): Promise<void> {
+		const range = new Range(position.lineNumber, position.column, position.lineNumber, position.column);
+
+		const urlListEntry = textEditorDataTransfer.get('text/uri-list');
+		if (urlListEntry) {
+			const urlList = await urlListEntry.asString();
+			return this.doUriListDrop(editor, range, urlList, token);
+		}
+
+		const textEntry = textEditorDataTransfer.get('text') ?? textEditorDataTransfer.get(Mimes.text);
+		if (textEntry) {
+			const text = await textEntry.asString();
+			performSnippetEdit(editor, { range, snippet: text });
+		}
+	}
+
+	private async doUriListDrop(editor: ICodeEditor, range: Range, urlList: string, token: CancellationToken): Promise<void> {
+		const uris: URI[] = [];
+		for (const resource of urlList.split('\n')) {
+			try {
+				uris.push(URI.parse(resource));
+			} catch {
+				// noop
+			}
+		}
+
+		if (!uris.length) {
+			return;
+		}
+
+		const snippet = uris
+			.map(uri => {
+				const root = this._workspaceContextService.getWorkspaceFolder(uri);
+				if (root) {
+					const rel = relativePath(root.uri, uri);
+					if (rel) {
+						return rel;
+					}
+				}
+				return uri.fsPath;
+			})
+			.join(' ');
+
+		performSnippetEdit(editor, { range, snippet });
+	}
+}
+
+
+registerEditorContribution(DropIntoEditorController.ID, DropIntoEditorController);
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts
index 76eebf9ffe3..662b1929a2e 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts
@@ -41,6 +41,7 @@ import { isEqual } from 'vs/base/common/resources';
 const FIND_HIDE_TRANSITION = 'find-hide-transition';
 const FIND_SHOW_TRANSITION = 'find-show-transition';
 let MAX_MATCHES_COUNT_WIDTH = 69;
+const PROGRESS_BAR_DELAY = 200; // show progress for at least 200ms
 
 export class NotebookFindWidget extends SimpleFindReplaceWidget implements INotebookEditorContribution {
 	static id: string = 'workbench.notebook.find';
@@ -76,9 +77,9 @@ export class NotebookFindWidget extends SimpleFindReplaceWidget implements INote
 
 			if (e.isSearching) {
 				if (this._state.isSearching) {
-					this._progressBar.infinite().show();
+					this._progressBar.infinite().show(PROGRESS_BAR_DELAY);
 				} else {
-					this._progressBar.stop();
+					this._progressBar.stop().hide();
 				}
 			}
 
@@ -148,7 +149,7 @@ export class NotebookFindWidget extends SimpleFindReplaceWidget implements INote
 		if (currentMatch.isModelMatch) {
 			const match = currentMatch.match as FindMatch;
 
-			this._progressBar.infinite().show();
+			this._progressBar.infinite().show(PROGRESS_BAR_DELAY);
 
 			const replacePattern = this.replacePattern;
 			const replaceString = replacePattern.buildReplaceString(match.matches, this._state.preserveCase);
@@ -168,7 +169,7 @@ export class NotebookFindWidget extends SimpleFindReplaceWidget implements INote
 			return;
 		}
 
-		this._progressBar.infinite().show();
+		this._progressBar.infinite().show(PROGRESS_BAR_DELAY);
 
 		const replacePattern = this.replacePattern;
 
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts
index 38c9042b175..9e7e660b6b0 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts
@@ -34,6 +34,7 @@ import { DropdownMenuActionViewItem } from 'vs/base/browser/ui/dropdown/dropdown
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { filterIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
 import { NotebookFindFilters } from 'vs/workbench/contrib/notebook/browser/contrib/find/findFilters';
+import { isSafari } from 'vs/base/common/platform';
 
 const NLS_FIND_INPUT_LABEL = nls.localize('label.find', "Find");
 const NLS_FIND_INPUT_PLACEHOLDER = nls.localize('placeholder.find', "Find");
@@ -73,57 +74,73 @@ class NotebookFindFilterActionViewItem extends DropdownMenuActionViewItem {
 	}
 
 	private getActions(): IAction[] {
-		return [
-			{
-				checked: this.filters.markupInput,
-				class: undefined,
-				enabled: !this.filters.markupPreview,
-				id: 'findInMarkdownInput',
-				label: NOTEBOOK_FIND_IN_MARKUP_INPUT,
-				run: async () => {
-					this.filters.markupInput = !this.filters.markupInput;
-				},
-				tooltip: '',
-				dispose: () => null
+		const markdownInput: IAction = {
+			checked: this.filters.markupInput,
+			class: undefined,
+			enabled: !this.filters.markupPreview,
+			id: 'findInMarkdownInput',
+			label: NOTEBOOK_FIND_IN_MARKUP_INPUT,
+			run: async () => {
+				this.filters.markupInput = !this.filters.markupInput;
 			},
-			{
-				checked: this.filters.markupPreview,
-				class: undefined,
-				enabled: true,
-				id: 'findInMarkdownInput',
-				label: NOTEBOOK_FIND_IN_MARKUP_PREVIEW,
-				run: async () => {
-					this.filters.markupPreview = !this.filters.markupPreview;
-				},
-				tooltip: '',
-				dispose: () => null
+			tooltip: '',
+			dispose: () => null
+		};
+
+		const markdownPreview: IAction = {
+			checked: this.filters.markupPreview,
+			class: undefined,
+			enabled: true,
+			id: 'findInMarkdownInput',
+			label: NOTEBOOK_FIND_IN_MARKUP_PREVIEW,
+			run: async () => {
+				this.filters.markupPreview = !this.filters.markupPreview;
 			},
-			new Separator(),
-			{
-				checked: this.filters.codeInput,
-				class: undefined,
-				enabled: true,
-				id: 'findInCodeInput',
-				label: NOTEBOOK_FIND_IN_CODE_INPUT,
-				run: async () => {
-					this.filters.codeInput = !this.filters.codeInput;
-				},
-				tooltip: '',
-				dispose: () => null
+			tooltip: '',
+			dispose: () => null
+		};
+
+		const codeInput: IAction = {
+			checked: this.filters.codeInput,
+			class: undefined,
+			enabled: true,
+			id: 'findInCodeInput',
+			label: NOTEBOOK_FIND_IN_CODE_INPUT,
+			run: async () => {
+				this.filters.codeInput = !this.filters.codeInput;
 			},
-			{
-				checked: this.filters.codeOutput,
-				class: undefined,
-				enabled: true,
-				id: 'findInCodeOutput',
-				label: NOTEBOOK_FIND_IN_CODE_OUTPUT,
-				run: async () => {
-					this.filters.codeOutput = !this.filters.codeOutput;
-				},
-				tooltip: '',
-				dispose: () => null
+			tooltip: '',
+			dispose: () => null
+		};
+
+		const codeOutput = {
+			checked: this.filters.codeOutput,
+			class: undefined,
+			enabled: true,
+			id: 'findInCodeOutput',
+			label: NOTEBOOK_FIND_IN_CODE_OUTPUT,
+			run: async () => {
+				this.filters.codeOutput = !this.filters.codeOutput;
 			},
-		];
+			tooltip: '',
+			dispose: () => null
+		};
+
+		if (isSafari) {
+			return [
+				markdownInput,
+				codeInput
+			];
+		} else {
+			return [
+				markdownInput,
+				markdownPreview,
+				new Separator(),
+				codeInput,
+				codeOutput,
+			];
+		}
+
 	}
 
 	override updateChecked(): void {
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
index aed8ee62af8..7153bcfe26c 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
@@ -26,6 +26,7 @@ import { INotebookKernel } from 'vs/workbench/contrib/notebook/common/notebookKe
 import { NotebookOptions } from 'vs/workbench/contrib/notebook/common/notebookOptions';
 import { cellRangesToIndexes, ICellRange, reduceCellRanges } from 'vs/workbench/contrib/notebook/common/notebookRange';
 import { IWebview } from 'vs/workbench/contrib/webview/browser/webview';
+import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 
 //#region Shared commands
 export const EXPAND_CELL_INPUT_COMMAND_ID = 'notebook.cell.expandCellInput';
@@ -628,6 +629,11 @@ export interface IActiveNotebookEditor extends INotebookEditor {
 	getNextVisibleCellIndex(index: number): number;
 }
 
+export interface IBaseCellEditorOptions extends IDisposable {
+	readonly value: IEditorOptions;
+	readonly onDidChange: Event<void>;
+}
+
 /**
  * A mix of public interface and internal one (used by internal rendering code, e.g., cellRenderer)
  */
@@ -637,6 +643,7 @@ export interface INotebookEditorDelegate extends INotebookEditor {
 	readonly creationOptions: INotebookEditorCreationOptions;
 	readonly onDidChangeOptions: Event<void>;
 	readonly onDidChangeDecorations: Event<void>;
+	getBaseCellEditorOptions(language: string): IBaseCellEditorOptions;
 	createMarkupPreview(cell: ICellViewModel): Promise<void>;
 	unhideMarkupPreviews(cells: readonly ICellViewModel[]): Promise<void>;
 	hideMarkupPreviews(cells: readonly ICellViewModel[]): Promise<void>;
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
index 6d01c4d0220..aa1bcc7853f 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
@@ -21,6 +21,7 @@ import { Color, RGBA } from 'vs/base/common/color';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { combinedDisposable, Disposable, DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { deepClone } from 'vs/base/common/objects';
 import { setTimeout0 } from 'vs/base/common/platform';
 import { extname, isEqual } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
@@ -48,7 +49,7 @@ import { contrastBorder, diffInserted, diffRemoved, editorBackground, errorForeg
 import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { PANEL_BORDER, SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
 import { debugIconStartForeground } from 'vs/workbench/contrib/debug/browser/debugColors';
-import { CellEditState, CellFindMatchWithIndex, CellFocusMode, CellLayoutContext, IActiveNotebookEditorDelegate, ICellOutputViewModel, ICellViewModel, ICommonCellInfo, IDisplayOutputLayoutUpdateRequest, IFocusNotebookCellOptions, IInsetRenderOutput, IModelDecorationsChangeAccessor, INotebookDeltaDecoration, INotebookEditor, INotebookEditorContribution, INotebookEditorContributionDescription, INotebookEditorCreationOptions, INotebookEditorDelegate, INotebookEditorMouseEvent, INotebookEditorOptions, INotebookEditorViewState, INotebookViewCellsUpdateEvent, INotebookWebviewMessage, RenderOutputType } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState, CellFindMatchWithIndex, CellFocusMode, CellLayoutContext, IActiveNotebookEditorDelegate, IBaseCellEditorOptions, ICellOutputViewModel, ICellViewModel, ICommonCellInfo, IDisplayOutputLayoutUpdateRequest, IFocusNotebookCellOptions, IInsetRenderOutput, IModelDecorationsChangeAccessor, INotebookDeltaDecoration, INotebookEditor, INotebookEditorContribution, INotebookEditorContributionDescription, INotebookEditorCreationOptions, INotebookEditorDelegate, INotebookEditorMouseEvent, INotebookEditorOptions, INotebookEditorViewState, INotebookViewCellsUpdateEvent, INotebookWebviewMessage, RenderOutputType } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NotebookEditorExtensionsRegistry } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/notebookEditorService';
 import { notebookDebug } from 'vs/workbench/contrib/notebook/browser/notebookLogger';
@@ -87,6 +88,100 @@ import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
 
 const $ = DOM.$;
 
+export class BaseCellEditorOptions extends Disposable implements IBaseCellEditorOptions {
+	private static fixedEditorOptions: IEditorOptions = {
+		scrollBeyondLastLine: false,
+		scrollbar: {
+			verticalScrollbarSize: 14,
+			horizontal: 'auto',
+			useShadows: true,
+			verticalHasArrows: false,
+			horizontalHasArrows: false,
+			alwaysConsumeMouseWheel: false
+		},
+		renderLineHighlightOnlyWhenFocus: true,
+		overviewRulerLanes: 0,
+		selectOnLineNumbers: false,
+		lineNumbers: 'off',
+		lineDecorationsWidth: 0,
+		folding: true,
+		fixedOverflowWidgets: true,
+		minimap: { enabled: false },
+		renderValidationDecorations: 'on',
+		lineNumbersMinChars: 3
+	};
+
+	private _localDisposableStore = this._register(new DisposableStore());
+	private readonly _onDidChange = this._register(new Emitter<void>());
+	readonly onDidChange: Event<void> = this._onDidChange.event;
+	private _value: IEditorOptions;
+
+	get value(): Readonly<IEditorOptions> {
+		return this._value;
+	}
+
+	constructor(readonly notebookEditor: INotebookEditorDelegate, readonly notebookOptions: NotebookOptions, readonly configurationService: IConfigurationService, readonly language: string) {
+		super();
+		this._register(configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('editor') || e.affectsConfiguration('notebook')) {
+				this._recomputeOptions();
+			}
+		}));
+
+		this._register(notebookOptions.onDidChangeOptions(e => {
+			if (e.cellStatusBarVisibility || e.editorTopPadding || e.editorOptionsCustomizations) {
+				this._recomputeOptions();
+			}
+		}));
+
+		this._register(this.notebookEditor.onDidChangeModel(() => {
+			this._localDisposableStore.clear();
+
+			if (this.notebookEditor.hasModel()) {
+				this._localDisposableStore.add(this.notebookEditor.onDidChangeOptions(() => {
+					this._recomputeOptions();
+				}));
+
+				this._recomputeOptions();
+			}
+		}));
+
+		if (this.notebookEditor.hasModel()) {
+			this._localDisposableStore.add(this.notebookEditor.onDidChangeOptions(() => {
+				this._recomputeOptions();
+			}));
+		}
+
+		this._value = this._computeEditorOptions();
+	}
+
+	private _recomputeOptions(): void {
+		this._value = this._computeEditorOptions();
+		this._onDidChange.fire();
+	}
+
+	private _computeEditorOptions() {
+		const editorOptions = deepClone(this.configurationService.getValue<IEditorOptions>('editor', { overrideIdentifier: this.language }));
+		const layoutConfig = this.notebookOptions.getLayoutConfiguration();
+		const editorOptionsOverrideRaw = layoutConfig.editorOptionsCustomizations ?? {};
+		const editorOptionsOverride: { [key: string]: any } = {};
+		for (const key in editorOptionsOverrideRaw) {
+			if (key.indexOf('editor.') === 0) {
+				editorOptionsOverride[key.substring(7)] = editorOptionsOverrideRaw[key];
+			}
+		}
+		const computed = Object.freeze({
+			...editorOptions,
+			...BaseCellEditorOptions.fixedEditorOptions,
+			...editorOptionsOverride,
+			...{ padding: { top: 12, bottom: 12 } },
+			readOnly: this.notebookEditor.isReadOnly
+		});
+
+		return computed;
+	}
+}
+
 export function getDefaultNotebookCreationOptions(): INotebookEditorCreationOptions {
 	// We inlined the id to avoid loading comment contrib in tests
 	const skipContributions = ['editor.contrib.review'];
@@ -229,6 +324,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		return this._list.visibleRanges || [];
 	}
 
+	private _baseCellEditorOptions = new Map<string, IBaseCellEditorOptions>();
+
 	readonly isEmbedded: boolean;
 	private _readOnly: boolean;
 
@@ -452,6 +549,19 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 	}
 
 	//#region Editor Core
+
+	getBaseCellEditorOptions(language: string): IBaseCellEditorOptions {
+		const existingOptions = this._baseCellEditorOptions.get(language);
+
+		if (existingOptions) {
+			return existingOptions;
+		} else {
+			const options = new BaseCellEditorOptions(this, this.notebookOptions, this.configurationService, language);
+			this._baseCellEditorOptions.set(language, options);
+			return options;
+		}
+	}
+
 	private _updateForNotebookConfiguration() {
 		if (!this._overlayContainer) {
 			return;
@@ -2810,6 +2920,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		this.viewModel?.dispose();
 
 		this._renderedEditors.clear();
+		this._baseCellEditorOptions.forEach(v => v.dispose());
+		this._baseCellEditorOptions.clear();
 
 		super.dispose();
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts
index 00d68c38911..3059080c7d5 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts
@@ -4,8 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { deepClone } from 'vs/base/common/objects';
 import { URI } from 'vs/base/common/uri';
 import { IEditorOptions, LineNumbersType } from 'vs/editor/common/config/editorOptions';
 import { localize } from 'vs/nls';
@@ -17,7 +15,7 @@ import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ActiveEditorContext } from 'vs/workbench/common/contextkeys';
 import { INotebookCellToolbarActionContext, INotebookCommandContext, NotebookMultiCellAction, NOTEBOOK_ACTIONS_CATEGORY } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { ICellViewModel, INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { IBaseCellEditorOptions, ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NOTEBOOK_CELL_LINE_NUMBERS, NOTEBOOK_EDITOR_FOCUSED } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { CellPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
 import { NotebookCellInternalMetadata, NOTEBOOK_EDITOR_ID } from 'vs/workbench/contrib/notebook/common/notebookCommon';
@@ -25,66 +23,18 @@ import { NotebookOptions } from 'vs/workbench/contrib/notebook/common/notebookOp
 import { CellViewModelStateChangeEvent } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
 
 export class CellEditorOptions extends CellPart {
-	private static fixedEditorOptions: IEditorOptions = {
-		scrollBeyondLastLine: false,
-		scrollbar: {
-			verticalScrollbarSize: 14,
-			horizontal: 'auto',
-			useShadows: true,
-			verticalHasArrows: false,
-			horizontalHasArrows: false,
-			alwaysConsumeMouseWheel: false
-		},
-		renderLineHighlightOnlyWhenFocus: true,
-		overviewRulerLanes: 0,
-		selectOnLineNumbers: false,
-		lineNumbers: 'off',
-		lineDecorationsWidth: 0,
-		folding: true,
-		fixedOverflowWidgets: true,
-		minimap: { enabled: false },
-		renderValidationDecorations: 'on',
-		lineNumbersMinChars: 3
-	};
-
-	private _value: IEditorOptions;
 	private _lineNumbers: 'on' | 'off' | 'inherit' = 'inherit';
 	private readonly _onDidChange = this._register(new Emitter<void>());
 	readonly onDidChange: Event<void> = this._onDidChange.event;
-	private _localDisposableStore = this._register(new DisposableStore());
+	private _value: IEditorOptions;
 
-	constructor(readonly notebookEditor: INotebookEditorDelegate, readonly notebookOptions: NotebookOptions, readonly configurationService: IConfigurationService, readonly language: string) {
+	constructor(private readonly base: IBaseCellEditorOptions, readonly notebookOptions: NotebookOptions, readonly configurationService: IConfigurationService) {
 		super();
-		this._register(configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration('editor') || e.affectsConfiguration('notebook')) {
-				this._recomputeOptions();
-			}
+
+		this._register(base.onDidChange(() => {
+			this._recomputeOptions();
 		}));
 
-		this._register(notebookOptions.onDidChangeOptions(e => {
-			if (e.cellStatusBarVisibility || e.editorTopPadding || e.editorOptionsCustomizations) {
-				this._recomputeOptions();
-			}
-		}));
-
-		this._register(this.notebookEditor.onDidChangeModel(() => {
-			this._localDisposableStore.clear();
-
-			if (this.notebookEditor.hasModel()) {
-				this._localDisposableStore.add(this.notebookEditor.onDidChangeOptions(() => {
-					this._recomputeOptions();
-				}));
-
-				this._recomputeOptions();
-			}
-		}));
-
-		if (this.notebookEditor.hasModel()) {
-			this._localDisposableStore.add(this.notebookEditor.onDidChangeOptions(() => {
-				this._recomputeOptions();
-			}));
-		}
-
 		this._value = this._computeEditorOptions();
 	}
 
@@ -102,25 +52,17 @@ export class CellEditorOptions extends CellPart {
 	private _computeEditorOptions() {
 		const renderLineNumbers = this.configurationService.getValue<'on' | 'off'>('notebook.lineNumbers') === 'on';
 		const lineNumbers: LineNumbersType = renderLineNumbers ? 'on' : 'off';
-		const editorOptions = deepClone(this.configurationService.getValue<IEditorOptions>('editor', { overrideIdentifier: this.language }));
-		const layoutConfig = this.notebookOptions.getLayoutConfiguration();
-		const editorOptionsOverrideRaw = layoutConfig.editorOptionsCustomizations ?? {};
-		const editorOptionsOverride: { [key: string]: any } = {};
-		for (const key in editorOptionsOverrideRaw) {
-			if (key.indexOf('editor.') === 0) {
-				editorOptionsOverride[key.substring(7)] = editorOptionsOverrideRaw[key];
-			}
-		}
-		const computed = {
-			...editorOptions,
-			...CellEditorOptions.fixedEditorOptions,
-			... { lineNumbers },
-			...editorOptionsOverride,
-			...{ padding: { top: 12, bottom: 12 } },
-			readOnly: this.notebookEditor.isReadOnly
-		};
 
-		return computed;
+		const value = this.base.value;
+
+		if (value.lineNumbers !== lineNumbers) {
+			return {
+				...value,
+				...{ lineNumbers }
+			};
+		} else {
+			return Object.assign({}, value);
+		}
 	}
 
 	getUpdatedValue(internalMetadata: NotebookCellInternalMetadata, cellUri: URI): IEditorOptions {
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts
index 41083dab251..3f2df96e305 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts
@@ -53,7 +53,7 @@ export class CodeCell extends Disposable {
 	) {
 		super();
 
-		const cellEditorOptions = this._register(new CellEditorOptions(this.notebookEditor, this.notebookEditor.notebookOptions, this.configurationService, this.viewCell.language));
+		const cellEditorOptions = this._register(new CellEditorOptions(this.notebookEditor.getBaseCellEditorOptions(viewCell.language), this.notebookEditor.notebookOptions, this.configurationService));
 		this._outputContainerRenderer = this.instantiationService.createInstance(CellOutputContainer, notebookEditor, viewCell, templateData, { limit: 500 });
 		this.cellParts = [...templateData.cellParts, cellEditorOptions, this._outputContainerRenderer];
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/markdownCell.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/markdownCell.ts
index b1b5077afea..bf119feb15c 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/markdownCell.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/markdownCell.ts
@@ -59,8 +59,7 @@ export class StatefulMarkdownCell extends Disposable {
 
 		this.constructDOM();
 		this.editorPart = templateData.editorPart;
-
-		this.cellEditorOptions = this._register(new CellEditorOptions(this.notebookEditor, this.notebookEditor.notebookOptions, this.configurationService, this.viewCell.language));
+		this.cellEditorOptions = this._register(new CellEditorOptions(this.notebookEditor.getBaseCellEditorOptions(viewCell.language), this.notebookEditor.notebookOptions, this.configurationService));
 		this.cellEditorOptions.setLineNumbers(this.viewCell.lineNumbers);
 		this.editorOptions = this.cellEditorOptions.getValue(this.viewCell.internalMetadata, this.viewCell.uri);
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
index 1beeb548519..39026ca2aca 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
@@ -98,7 +98,7 @@ abstract class AbstractCellRenderer {
 		language: string,
 		protected dndController: CellDragAndDropController | undefined
 	) {
-		this.editorOptions = new CellEditorOptions(notebookEditor, notebookEditor.notebookOptions, configurationService, language);
+		this.editorOptions = new CellEditorOptions(this.notebookEditor.getBaseCellEditorOptions(language), this.notebookEditor.notebookOptions, configurationService);
 	}
 
 	dispose() {
@@ -168,7 +168,7 @@ export class MarkupCellRenderer extends AbstractCellRenderer implements IListRen
 			templateDisposables.add(scopedInstaService.createInstance(BetweenCellToolbar, this.notebookEditor, titleToolbarContainer, bottomCellContainer)),
 			templateDisposables.add(scopedInstaService.createInstance(CellEditorStatusBar, this.notebookEditor, container, editorPart, undefined)),
 			templateDisposables.add(new CellFocusIndicator(this.notebookEditor, titleToolbar, focusIndicatorTop, focusIndicatorLeft, focusIndicatorRight, focusIndicatorBottom)),
-			templateDisposables.add(scopedInstaService.createInstance(FoldedCellHint, this.notebookEditor, DOM.append(container, $('.notebook-folded-hint')))),
+			templateDisposables.add(new FoldedCellHint(this.notebookEditor, DOM.append(container, $('.notebook-folded-hint')))),
 			templateDisposables.add(new CellDecorations(rootContainer, decorationContainer)),
 			templateDisposables.add(scopedInstaService.createInstance(CellComments, this.notebookEditor, cellCommentPartContainer)),
 			templateDisposables.add(new CollapsedCellInput(this.notebookEditor, cellInputCollapsedContainer)),
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
index d631ff74b4a..9d2c8958ba0 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
@@ -145,7 +145,7 @@ export const tocData: ITOCEntry<string> = {
 				},
 				{
 					id: 'features/scm',
-					label: localize('scm', "SCM"),
+					label: localize('scm', "Source Control"),
 					settings: ['scm.*']
 				},
 				{
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
index f4b4b41ad94..7b551ab1466 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -2234,13 +2234,6 @@ export class SettingsTreeFilter implements ITreeFilter<SettingsTreeElement> {
 			}
 		}
 
-		// @modified or tag
-		if (element instanceof SettingsTreeSettingElement && this.viewState.tagFilters) {
-			if (!element.matchesAllTags(this.viewState.tagFilters)) {
-				return false;
-			}
-		}
-
 		// Group with no visible children
 		if (element instanceof SettingsTreeGroupElement) {
 			if (typeof element.count === 'number') {
diff --git a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
index 055172e9e9b..8bae9fbc794 100644
--- a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
+++ b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
@@ -20,7 +20,7 @@ import { URI } from 'vs/base/common/uri';
 import { ISCMService, ISCMRepository, ISCMProvider } from 'vs/workbench/contrib/scm/common/scm';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { registerThemingParticipant, IColorTheme, ICssStyleCollector, themeColorFromId, IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
-import { editorBackground, editorErrorForeground, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
+import { editorErrorForeground, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
 import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
 import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction } from 'vs/editor/browser/editorExtensions';
 import { PeekViewWidget, getOuterEditor, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground } from 'vs/editor/contrib/peekView/browser/peekView';
@@ -52,6 +52,7 @@ import { TextCompareEditorActiveContext } from 'vs/workbench/common/contextkeys'
 import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
 import { IChange } from 'vs/editor/common/diff/diffComputer';
 import { Color } from 'vs/base/common/color';
+import { editorGutter } from 'vs/editor/common/core/editorColorRegistry';
 
 class DiffActionRunner extends ActionRunner {
 
@@ -923,8 +924,10 @@ class DirtyDiffDecorator extends Disposable {
 		return ModelDecorationOptions.createDynamic(decorationOptions);
 	}
 
-	private modifiedOptions: ModelDecorationOptions;
 	private addedOptions: ModelDecorationOptions;
+	private addedPatternOptions: ModelDecorationOptions;
+	private modifiedOptions: ModelDecorationOptions;
+	private modifiedPatternOptions: ModelDecorationOptions;
 	private deletedOptions: ModelDecorationOptions;
 	private decorations: string[] = [];
 	private editorModel: ITextModel | null;
@@ -932,25 +935,38 @@ class DirtyDiffDecorator extends Disposable {
 	constructor(
 		editorModel: ITextModel,
 		private model: DirtyDiffModel,
-		@IConfigurationService configurationService: IConfigurationService
+		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		super();
 		this.editorModel = editorModel;
+
 		const decorations = configurationService.getValue<string>('scm.diffDecorations');
 		const gutter = decorations === 'all' || decorations === 'gutter';
 		const overview = decorations === 'all' || decorations === 'overview';
 		const minimap = decorations === 'all' || decorations === 'minimap';
 
+		this.addedOptions = DirtyDiffDecorator.createDecoration('dirty-diff-added', {
+			gutter,
+			overview: { active: overview, color: overviewRulerAddedForeground },
+			minimap: { active: minimap, color: minimapGutterAddedBackground },
+			isWholeLine: true
+		});
+		this.addedPatternOptions = DirtyDiffDecorator.createDecoration('dirty-diff-added-pattern', {
+			gutter,
+			overview: { active: overview, color: overviewRulerAddedForeground },
+			minimap: { active: minimap, color: minimapGutterAddedBackground },
+			isWholeLine: true
+		});
 		this.modifiedOptions = DirtyDiffDecorator.createDecoration('dirty-diff-modified', {
 			gutter,
 			overview: { active: overview, color: overviewRulerModifiedForeground },
 			minimap: { active: minimap, color: minimapGutterModifiedBackground },
 			isWholeLine: true
 		});
-		this.addedOptions = DirtyDiffDecorator.createDecoration('dirty-diff-added', {
+		this.modifiedPatternOptions = DirtyDiffDecorator.createDecoration('dirty-diff-modified-pattern', {
 			gutter,
-			overview: { active: overview, color: overviewRulerAddedForeground },
-			minimap: { active: minimap, color: minimapGutterAddedBackground },
+			overview: { active: overview, color: overviewRulerModifiedForeground },
+			minimap: { active: minimap, color: minimapGutterModifiedBackground },
 			isWholeLine: true
 		});
 		this.deletedOptions = DirtyDiffDecorator.createDecoration('dirty-diff-deleted', {
@@ -960,6 +976,12 @@ class DirtyDiffDecorator extends Disposable {
 			isWholeLine: false
 		});
 
+		this._register(configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('scm.diffDecorationsGutterPattern')) {
+				this.onDidChange();
+			}
+		}));
+
 		this._register(model.onDidChange(this.onDidChange, this));
 	}
 
@@ -967,6 +989,8 @@ class DirtyDiffDecorator extends Disposable {
 		if (!this.editorModel) {
 			return;
 		}
+
+		const pattern = this.configurationService.getValue<{ added: boolean; modified: boolean }>('scm.diffDecorationsGutterPattern');
 		const decorations = this.model.changes.map((change) => {
 			const changeType = getChangeType(change);
 			const startLineNumber = change.modifiedStartLineNumber;
@@ -979,7 +1003,7 @@ class DirtyDiffDecorator extends Disposable {
 							startLineNumber: startLineNumber, startColumn: 1,
 							endLineNumber: endLineNumber, endColumn: 1
 						},
-						options: this.addedOptions
+						options: pattern.added ? this.addedPatternOptions : this.addedOptions
 					};
 				case ChangeType.Delete:
 					return {
@@ -995,7 +1019,7 @@ class DirtyDiffDecorator extends Disposable {
 							startLineNumber: startLineNumber, startColumn: 1,
 							endLineNumber: endLineNumber, endColumn: 1
 						},
-						options: this.modifiedOptions
+						options: pattern.modified ? this.modifiedPatternOptions : this.modifiedOptions
 					};
 			}
 		});
@@ -1371,8 +1395,21 @@ export class DirtyDiffWorkbenchController extends Disposable implements ext.IWor
 	private setViewState(state: IViewState): void {
 		this.viewState = state;
 		this.stylesheet.textContent = `
-			.monaco-editor .dirty-diff-modified,.monaco-editor .dirty-diff-added{border-left-width:${state.width}px;}
-			.monaco-editor .dirty-diff-modified, .monaco-editor .dirty-diff-added, .monaco-editor .dirty-diff-deleted {
+			.monaco-editor .dirty-diff-added,
+			.monaco-editor .dirty-diff-modified {
+				border-left-width:${state.width}px;
+			}
+			.monaco-editor .dirty-diff-added-pattern,
+			.monaco-editor .dirty-diff-added-pattern:before,
+			.monaco-editor .dirty-diff-modified-pattern,
+			.monaco-editor .dirty-diff-modified-pattern:before {
+				background-size: ${state.width}px ${state.width}px;
+			}
+			.monaco-editor .dirty-diff-added,
+			.monaco-editor .dirty-diff-added-pattern,
+			.monaco-editor .dirty-diff-modified,
+			.monaco-editor .dirty-diff-modified-pattern,
+			.monaco-editor .dirty-diff-deleted {
 				opacity: ${state.visibility === 'always' ? 1 : 0};
 			}
 		`;
@@ -1467,40 +1504,61 @@ export class DirtyDiffWorkbenchController extends Disposable implements ext.IWor
 registerEditorContribution(DirtyDiffController.ID, DirtyDiffController);
 
 registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
-	const editorBackgroundColor = theme.getColor(editorBackground);
+	const editorGutterBackgroundColor = theme.getColor(editorGutter);
 	const editorGutterModifiedBackgroundColor = theme.getColor(editorGutterModifiedBackground);
-	const linearGradient = `-45deg, ${editorGutterModifiedBackgroundColor} 25%, ${editorBackgroundColor} 25%, ${editorBackgroundColor} 50%, ${editorGutterModifiedBackgroundColor} 50%, ${editorGutterModifiedBackgroundColor} 75%, ${editorBackgroundColor} 75%, ${editorBackgroundColor}`;
 
-	if (editorGutterModifiedBackgroundColor) {
+	const getLinearGradient = (color: Color): string => {
+		return `-45deg, ${color} 25%, ${editorGutterBackgroundColor} 25%, ${editorGutterBackgroundColor} 50%, ${color} 50%, ${color} 75%, ${editorGutterBackgroundColor} 75%, ${editorGutterBackgroundColor}`;
+	};
+
+	if (editorGutterBackgroundColor && editorGutterModifiedBackgroundColor) {
 		collector.addRule(`
 			.monaco-editor .dirty-diff-modified {
-				background-size: 3px 4.5px;
-				background-repeat-x: no-repeat;
-				background-image: linear-gradient(${linearGradient});
+				border-left-color: ${editorGutterModifiedBackgroundColor};
+				border-left-style: solid;
 				transition: opacity 0.5s;
 			}
 			.monaco-editor .dirty-diff-modified:before {
-				transform: translateX(3px);
-				background-size: 3px 3px;
-				background-image: linear-gradient(${linearGradient});
+				background: ${editorGutterModifiedBackgroundColor};
 			}
-			.monaco-editor .margin:hover .dirty-diff-modified {
+			.monaco-editor .dirty-diff-modified-pattern {
+				background-image: linear-gradient(${getLinearGradient(editorGutterModifiedBackgroundColor)});
+				background-repeat: repeat-y;
+				transition: opacity 0.5s;
+			}
+			.monaco-editor .dirty-diff-modified-pattern:before {
+				background-image: linear-gradient(${getLinearGradient(editorGutterModifiedBackgroundColor)});
+				transform: translateX(3px);
+			}
+			.monaco-editor .margin:hover .dirty-diff-modified,
+			.monaco-editor .margin:hover .dirty-diff-modified-pattern {
 				opacity: 1;
 			}
 		`);
 	}
 
 	const editorGutterAddedBackgroundColor = theme.getColor(editorGutterAddedBackground);
-	if (editorGutterAddedBackgroundColor) {
+	if (editorGutterBackgroundColor && editorGutterAddedBackgroundColor) {
 		collector.addRule(`
 			.monaco-editor .dirty-diff-added {
-				border-left: 3px solid ${editorGutterAddedBackgroundColor};
+				border-left-color: ${editorGutterAddedBackgroundColor};
+				border-left-style: solid;
 				transition: opacity 0.5s;
 			}
 			.monaco-editor .dirty-diff-added:before {
 				background: ${editorGutterAddedBackgroundColor};
 			}
-			.monaco-editor .margin:hover .dirty-diff-added {
+			.monaco-editor .dirty-diff-added-pattern {
+				background-image: linear-gradient(${getLinearGradient(editorGutterAddedBackgroundColor)});
+				background-repeat: repeat-y;
+				transition: opacity 0.5s;
+			}
+			.monaco-editor .dirty-diff-added-pattern:before {
+				background-image: linear-gradient(${getLinearGradient(editorGutterAddedBackgroundColor)});
+				transform: translateX(3px);
+			}
+			.monaco-editor .margin:hover .dirty-diff-added,
+			.monaco-editor .margin:hover .dirty-diff-added-pattern {
 				opacity: 1;
 			}
 		`);
diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
index 27fa26a947d..2b5f202e350 100644
--- a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
+++ b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
@@ -83,7 +83,7 @@ viewsRegistry.registerViews([{
 	containerIcon: sourceControlViewIcon,
 	openCommandActionDescriptor: {
 		id: viewContainer.id,
-		mnemonicTitle: localize({ key: 'miViewSCM', comment: ['&& denotes a mnemonic'] }, "S&&CM"),
+		mnemonicTitle: localize({ key: 'miViewSCM', comment: ['&& denotes a mnemonic'] }, "Source &&Control"),
 		keybindings: {
 			primary: 0,
 			win: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG },
@@ -118,7 +118,7 @@ Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
 Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
 	id: 'scm',
 	order: 5,
-	title: localize('scmConfigurationTitle', "SCM"),
+	title: localize('scmConfigurationTitle', "Source Control"),
 	type: 'object',
 	scope: ConfigurationScope.RESOURCE,
 	properties: {
@@ -161,6 +161,25 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 			description: localize('scm.diffDecorationsGutterAction', "Controls the behavior of Source Control diff gutter decorations."),
 			default: 'diff'
 		},
+		'scm.diffDecorationsGutterPattern': {
+			type: 'object',
+			description: localize('diffGutterPattern', "Controls whether a pattern is used for the diff decorations in gutter."),
+			additionalProperties: false,
+			properties: {
+				'added': {
+					type: 'boolean',
+					description: localize('diffGutterPatternAdded', "Use pattern for the diff decorations in gutter for added lines."),
+				},
+				'modified': {
+					type: 'boolean',
+					description: localize('diffGutterPatternModifed', "Use pattern for the diff decorations in gutter for modified lines."),
+				},
+			},
+			default: {
+				'added': false,
+				'modified': true
+			}
+		},
 		'scm.diffDecorationsIgnoreTrimWhitespace': {
 			type: 'string',
 			enum: ['true', 'false', 'inherit'],
@@ -215,14 +234,14 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 			enumDescriptions: [
 				localize('scm.defaultViewSortKey.name', "Sort the repository changes by file name."),
 				localize('scm.defaultViewSortKey.path', "Sort the repository changes by path."),
-				localize('scm.defaultViewSortKey.status', "Sort the repository changes by SCM status.")
+				localize('scm.defaultViewSortKey.status', "Sort the repository changes by Source Control status.")
 			],
 			description: localize('scm.defaultViewSortKey', "Controls the default Source Control repository sort mode."),
 			default: 'path'
 		},
 		'scm.autoReveal': {
 			type: 'boolean',
-			description: localize('autoReveal', "Controls whether the SCM view should automatically reveal and select files when opening them."),
+			description: localize('autoReveal', "Controls whether the Source Control view should automatically reveal and select files when opening them."),
 			default: true
 		},
 		'scm.inputFontFamily': {
@@ -237,7 +256,7 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 		},
 		'scm.alwaysShowRepositories': {
 			type: 'boolean',
-			markdownDescription: localize('alwaysShowRepository', "Controls whether repositories should always be visible in the SCM view."),
+			markdownDescription: localize('alwaysShowRepository', "Controls whether repositories should always be visible in the Source Control view."),
 			default: false
 		},
 		'scm.repositories.visible': {
@@ -247,7 +266,7 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 		},
 		'scm.showActionButton': {
 			type: 'boolean',
-			markdownDescription: localize('showActionButton', "Controls whether an action button can be shown in the SCM view."),
+			markdownDescription: localize('showActionButton', "Controls whether an action button can be shown in the Source Control view."),
 			default: true
 		}
 	}
@@ -255,7 +274,7 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'scm.acceptInput',
-	description: { description: localize('scm accept', "SCM: Accept Input"), args: [] },
+	description: { description: localize('scm accept', "Source Control: Accept Input"), args: [] },
 	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.has('scmRepository'),
 	primary: KeyMod.CtrlCmd | KeyCode.Enter,
@@ -276,7 +295,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 
 const viewNextCommitCommand = {
-	description: { description: localize('scm view next commit', "SCM: View Next Commit"), args: [] },
+	description: { description: localize('scm view next commit', "Source Control: View Next Commit"), args: [] },
 	weight: KeybindingWeight.WorkbenchContrib,
 	handler: (accessor: ServicesAccessor) => {
 		const contextKeyService = accessor.get(IContextKeyService);
@@ -287,7 +306,7 @@ const viewNextCommitCommand = {
 };
 
 const viewPreviousCommitCommand = {
-	description: { description: localize('scm view previous commit', "SCM: View Previous Commit"), args: [] },
+	description: { description: localize('scm view previous commit', "Source Control: View Previous Commit"), args: [] },
 	weight: KeybindingWeight.WorkbenchContrib,
 	handler: (accessor: ServicesAccessor) => {
 		const contextKeyService = accessor.get(IContextKeyService);
diff --git a/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts b/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts
index 540e3fce155..9a602558814 100644
--- a/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts
+++ b/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts
@@ -6,15 +6,15 @@
 import * as assert from 'assert';
 import { SnippetCompletion, SnippetCompletionProvider } from 'vs/workbench/contrib/snippets/browser/snippetCompletionProvider';
 import { Position } from 'vs/editor/common/core/position';
-import { ModesRegistry } from 'vs/editor/common/languages/modesRegistry';
-import { LanguageService } from 'vs/editor/common/services/languageService';
-import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { createModelServices, instantiateTextModel } from 'vs/editor/test/common/testTextModel';
 import { ISnippetsService } from 'vs/workbench/contrib/snippets/browser/snippets.contribution';
 import { Snippet, SnippetSource } from 'vs/workbench/contrib/snippets/browser/snippetsFile';
 import { CompletionContext, CompletionItemLabel, CompletionItemRanges, CompletionTriggerKind } from 'vs/editor/common/languages';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { ILanguageService } from 'vs/editor/common/languages/language';
 
 class SimpleSnippetService implements ISnippetsService {
 	declare readonly _serviceBrand: undefined;
@@ -37,27 +37,21 @@ class SimpleSnippetService implements ISnippetsService {
 }
 
 suite('SnippetsService', function () {
-	const disposableStore: DisposableStore = new DisposableStore();
 	const context: CompletionContext = { triggerKind: CompletionTriggerKind.Invoke };
 
-	suiteSetup(function () {
-		disposableStore.add(ModesRegistry.registerLanguage({
-			id: 'fooLang',
-			extensions: ['.fooLang',]
-		}));
-	});
-
-	suiteTeardown(function () {
-		disposableStore.dispose();
-	});
-
 	let disposables: DisposableStore;
-	let languageService: LanguageService;
+	let instantiationService: TestInstantiationService;
+	let languageService: ILanguageService;
 	let snippetService: ISnippetsService;
 
 	setup(function () {
 		disposables = new DisposableStore();
-		languageService = disposables.add(new LanguageService());
+		instantiationService = createModelServices(disposables);
+		languageService = instantiationService.get(ILanguageService);
+		disposables.add(languageService.registerLanguage({
+			id: 'fooLang',
+			extensions: ['.fooLang',]
+		}));
 		snippetService = new SimpleSnippetService([new Snippet(
 			['fooLang'],
 			'barTest',
@@ -84,7 +78,7 @@ suite('SnippetsService', function () {
 	test('snippet completions - simple', function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
-		const model = disposables.add(createTextModel('', 'fooLang'));
+		const model = disposables.add(instantiateTextModel(instantiationService, '', 'fooLang'));
 
 		return provider.provideCompletionItems(model, new Position(1, 1), context)!.then(result => {
 			assert.strictEqual(result.incomplete, undefined);
@@ -95,7 +89,7 @@ suite('SnippetsService', function () {
 	test('snippet completions - simple 2', async function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
-		const model = disposables.add(createTextModel('hello ', 'fooLang'));
+		const model = disposables.add(instantiateTextModel(instantiationService, 'hello ', 'fooLang'));
 
 		await provider.provideCompletionItems(model, new Position(1, 6) /* hello| */, context)!.then(result => {
 			assert.strictEqual(result.incomplete, undefined);
@@ -111,7 +105,7 @@ suite('SnippetsService', function () {
 	test('snippet completions - with prefix', function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
-		const model = disposables.add(createTextModel('bar', 'fooLang'));
+		const model = disposables.add(instantiateTextModel(instantiationService, 'bar', 'fooLang'));
 
 		return provider.provideCompletionItems(model, new Position(1, 4), context)!.then(result => {
 			assert.strictEqual(result.incomplete, undefined);
@@ -146,7 +140,7 @@ suite('SnippetsService', function () {
 		)]);
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
-		const model = disposables.add(createTextModel('bar-bar', 'fooLang'));
+		const model = disposables.add(instantiateTextModel(instantiationService, 'bar-bar', 'fooLang'));
 
 		await provider.provideCompletionItems(model, new Position(1, 3), context)!.then(result => {
 			assert.strictEqual(result.incomplete, undefined);
@@ -217,19 +211,19 @@ suite('SnippetsService', function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
 
-		let model = createTextModel('\t<?php', 'fooLang');
+		let model = instantiateTextModel(instantiationService, '\t<?php', 'fooLang');
 		return provider.provideCompletionItems(model, new Position(1, 7), context)!.then(result => {
 			assert.strictEqual(result.suggestions.length, 1);
 			model.dispose();
 
-			model = createTextModel('\t<?', 'fooLang');
+			model = instantiateTextModel(instantiationService, '\t<?', 'fooLang');
 			return provider.provideCompletionItems(model, new Position(1, 4), context)!;
 		}).then(result => {
 			assert.strictEqual(result.suggestions.length, 1);
 			assert.strictEqual((result.suggestions[0].range as any).insert.startColumn, 2);
 			model.dispose();
 
-			model = createTextModel('a<?', 'fooLang');
+			model = instantiateTextModel(instantiationService, 'a<?', 'fooLang');
 			return provider.provideCompletionItems(model, new Position(1, 4), context)!;
 		}).then(result => {
 			assert.strictEqual(result.suggestions.length, 1);
@@ -252,7 +246,7 @@ suite('SnippetsService', function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
 
-		let model = disposables.add(createTextModel('<head>\n\t\n>/head>', 'fooLang'));
+		let model = disposables.add(instantiateTextModel(instantiationService, '<head>\n\t\n>/head>', 'fooLang'));
 		return provider.provideCompletionItems(model, new Position(1, 1), context)!.then(result => {
 			assert.strictEqual(result.suggestions.length, 1);
 			return provider.provideCompletionItems(model, new Position(2, 2), context)!;
@@ -282,7 +276,7 @@ suite('SnippetsService', function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
 
-		let model = disposables.add(createTextModel('', 'fooLang'));
+		let model = disposables.add(instantiateTextModel(instantiationService, '', 'fooLang'));
 		return provider.provideCompletionItems(model, new Position(1, 1), context)!.then(result => {
 			assert.strictEqual(result.suggestions.length, 2);
 			let [first, second] = result.suggestions;
@@ -309,7 +303,7 @@ suite('SnippetsService', function () {
 		)]);
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
 
-		let model = disposables.add(createTextModel('p-', 'fooLang'));
+		let model = disposables.add(instantiateTextModel(instantiationService, 'p-', 'fooLang'));
 
 		let result = await provider.provideCompletionItems(model, new Position(1, 2), context)!;
 		assert.strictEqual(result.suggestions.length, 1);
@@ -334,7 +328,7 @@ suite('SnippetsService', function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
 
-		let model = disposables.add(createTextModel('Thisisaverylonglinegoingwithmore100bcharactersandthismakesintellisensebecomea Thisisaverylonglinegoingwithmore100bcharactersandthismakesintellisensebecomea b', 'fooLang'));
+		let model = disposables.add(instantiateTextModel(instantiationService, 'Thisisaverylonglinegoingwithmore100bcharactersandthismakesintellisensebecomea Thisisaverylonglinegoingwithmore100bcharactersandthismakesintellisensebecomea b', 'fooLang'));
 		let result = await provider.provideCompletionItems(model, new Position(1, 158), context)!;
 
 		assert.strictEqual(result.suggestions.length, 1);
@@ -353,7 +347,7 @@ suite('SnippetsService', function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
 
-		let model = disposables.add(createTextModel(':', 'fooLang'));
+		let model = disposables.add(instantiateTextModel(instantiationService, ':', 'fooLang'));
 		let result = await provider.provideCompletionItems(model, new Position(1, 2), context)!;
 
 		assert.strictEqual(result.suggestions.length, 0);
@@ -372,7 +366,7 @@ suite('SnippetsService', function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
 
-		let model = disposables.add(createTextModel('template', 'fooLang'));
+		let model = disposables.add(instantiateTextModel(instantiationService, 'template', 'fooLang'));
 		let result = await provider.provideCompletionItems(model, new Position(1, 9), context)!;
 
 		assert.strictEqual(result.suggestions.length, 1);
@@ -395,7 +389,7 @@ suite('SnippetsService', function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
 
-		let model = disposables.add(createTextModel('Thisisaverylonglinegoingwithmore100bcharactersandthismakesintellisensebecomea Thisisaverylonglinegoingwithmore100bcharactersandthismakesintellisensebecomea b text_after_b', 'fooLang'));
+		let model = disposables.add(instantiateTextModel(instantiationService, 'Thisisaverylonglinegoingwithmore100bcharactersandthismakesintellisensebecomea Thisisaverylonglinegoingwithmore100bcharactersandthismakesintellisensebecomea b text_after_b', 'fooLang'));
 		let result = await provider.provideCompletionItems(model, new Position(1, 158), context)!;
 
 		assert.strictEqual(result.suggestions.length, 1);
@@ -403,7 +397,7 @@ suite('SnippetsService', function () {
 
 	test('issue #61296: VS code freezes when editing CSS file with emoji', async function () {
 		const languageConfigurationService = new TestLanguageConfigurationService();
-		disposableStore.add(languageConfigurationService.register('fooLang', {
+		disposables.add(languageConfigurationService.register('fooLang', {
 			wordPattern: /(#?-?\d*\.\d\w*%?)|(::?[\w-]*(?=[^,{;]*[,{]))|(([@#.!])?[\w-?]+%?|[@#!.])/g
 		}));
 
@@ -419,7 +413,7 @@ suite('SnippetsService', function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, languageConfigurationService);
 
-		let model = disposables.add(createTextModel('.🐷-a-b', 'fooLang'));
+		let model = disposables.add(instantiateTextModel(instantiationService, '.🐷-a-b', 'fooLang'));
 		let result = await provider.provideCompletionItems(model, new Position(1, 8), context)!;
 
 		assert.strictEqual(result.suggestions.length, 1);
@@ -438,7 +432,7 @@ suite('SnippetsService', function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
 
-		let model = disposables.add(createTextModel('a ', 'fooLang'));
+		let model = disposables.add(instantiateTextModel(instantiationService, 'a ', 'fooLang'));
 		let result = await provider.provideCompletionItems(model, new Position(1, 3), context)!;
 
 		assert.strictEqual(result.suggestions.length, 1);
@@ -465,7 +459,7 @@ suite('SnippetsService', function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
 
-		let model = createTextModel(' <', 'fooLang');
+		let model = instantiateTextModel(instantiationService, ' <', 'fooLang');
 		let result = await provider.provideCompletionItems(model, new Position(1, 3), context)!;
 
 		assert.strictEqual(result.suggestions.length, 1);
@@ -473,7 +467,7 @@ suite('SnippetsService', function () {
 		assert.strictEqual((first.range as any).insert.startColumn, 2);
 		model.dispose();
 
-		model = createTextModel('1', 'fooLang');
+		model = instantiateTextModel(instantiationService, '1', 'fooLang');
 		result = await provider.provideCompletionItems(model, new Position(1, 2), context)!;
 
 		assert.strictEqual(result.suggestions.length, 1);
@@ -495,7 +489,7 @@ suite('SnippetsService', function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
 
-		let model = createTextModel('not wordFoo bar', 'fooLang');
+		let model = instantiateTextModel(instantiationService, 'not wordFoo bar', 'fooLang');
 		let result = await provider.provideCompletionItems(model, new Position(1, 3), context)!;
 
 		assert.strictEqual(result.suggestions.length, 1);
@@ -504,7 +498,7 @@ suite('SnippetsService', function () {
 		assert.strictEqual((first.range as any).replace.endColumn, 9);
 		model.dispose();
 
-		model = createTextModel('not woFoo bar', 'fooLang');
+		model = instantiateTextModel(instantiationService, 'not woFoo bar', 'fooLang');
 		result = await provider.provideCompletionItems(model, new Position(1, 3), context)!;
 
 		assert.strictEqual(result.suggestions.length, 1);
@@ -513,7 +507,7 @@ suite('SnippetsService', function () {
 		assert.strictEqual((first.range as any).replace.endColumn, 3);
 		model.dispose();
 
-		model = createTextModel('not word', 'fooLang');
+		model = instantiateTextModel(instantiationService, 'not word', 'fooLang');
 		result = await provider.provideCompletionItems(model, new Position(1, 1), context)!;
 
 		assert.strictEqual(result.suggestions.length, 1);
@@ -537,7 +531,7 @@ suite('SnippetsService', function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
 
-		let model = createTextModel('filler e KEEP ng filler', 'fooLang');
+		let model = instantiateTextModel(instantiationService, 'filler e KEEP ng filler', 'fooLang');
 		let result = await provider.provideCompletionItems(model, new Position(1, 9), context)!;
 
 		assert.strictEqual(result.suggestions.length, 1);
@@ -549,7 +543,7 @@ suite('SnippetsService', function () {
 
 	test('Snippet will replace auto-closing pair if specified in prefix', async function () {
 		const languageConfigurationService = new TestLanguageConfigurationService();
-		disposableStore.add(languageConfigurationService.register('fooLang', {
+		disposables.add(languageConfigurationService.register('fooLang', {
 			brackets: [
 				['{', '}'],
 				['[', ']'],
@@ -569,7 +563,7 @@ suite('SnippetsService', function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, languageConfigurationService);
 
-		let model = createTextModel('[psc]', 'fooLang');
+		let model = instantiateTextModel(instantiationService, '[psc]', 'fooLang');
 		let result = await provider.provideCompletionItems(model, new Position(1, 5), context)!;
 
 		assert.strictEqual(result.suggestions.length, 1);
@@ -594,7 +588,7 @@ suite('SnippetsService', function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
 
-		let model = createTextModel(' ci', 'fooLang');
+		let model = instantiateTextModel(instantiationService, ' ci', 'fooLang');
 		let result = await provider.provideCompletionItems(model, new Position(1, 4), context)!;
 
 		assert.strictEqual(result.suggestions.length, 1);
@@ -615,7 +609,7 @@ suite('SnippetsService', function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
 
-		let model = createTextModel('\'\'', 'fooLang');
+		let model = instantiateTextModel(instantiationService, '\'\'', 'fooLang');
 		let result = await provider.provideCompletionItems(
 			model,
 			new Position(1, 2),
@@ -637,7 +631,7 @@ suite('SnippetsService', function () {
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
 
-		let model = createTextModel('\'\'', 'fooLang');
+		let model = instantiateTextModel(instantiationService, '\'\'', 'fooLang');
 
 		let result = await provider.provideCompletionItems(
 			model,
@@ -657,7 +651,7 @@ suite('SnippetsService', function () {
 		]);
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
-		let model = createTextModel('\'hellot\'', 'fooLang');
+		let model = instantiateTextModel(instantiationService, '\'hellot\'', 'fooLang');
 
 		let result = await provider.provideCompletionItems(
 			model,
@@ -678,7 +672,7 @@ suite('SnippetsService', function () {
 		]);
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
-		let model = createTextModel(')*&^', 'fooLang');
+		let model = instantiateTextModel(instantiationService, ')*&^', 'fooLang');
 
 		let result = await provider.provideCompletionItems(
 			model,
@@ -698,7 +692,7 @@ suite('SnippetsService', function () {
 		]);
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
-		let model = createTextModel('foobar', 'fooLang');
+		let model = instantiateTextModel(instantiationService, 'foobar', 'fooLang');
 
 		let result = await provider.provideCompletionItems(
 			model,
@@ -718,7 +712,7 @@ suite('SnippetsService', function () {
 
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
-		let model = createTextModel('function abc(w)', 'fooLang');
+		let model = instantiateTextModel(instantiationService, 'function abc(w)', 'fooLang');
 		let result = await provider.provideCompletionItems(
 			model,
 			new Position(1, 15),
@@ -737,7 +731,7 @@ suite('SnippetsService', function () {
 		]);
 
 		const provider = new SnippetCompletionProvider(languageService, snippetService, new TestLanguageConfigurationService());
-		let model = createTextModel('di', 'fooLang');
+		let model = instantiateTextModel(instantiationService, 'di', 'fooLang');
 		let result = await provider.provideCompletionItems(
 			model,
 			new Position(1, 3),
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
index 5b7471bb284..f50ca67b01d 100755
--- a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
+++ b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
@@ -21,48 +21,48 @@ else
 fi
 
 if [[ "$PROMPT_COMMAND" =~ .*(' '.*\;)|(\;.*' ').* ]]; then
-	echo -e "\033[1;33mShell integration cannot be activated due to complex PROMPT_COMMAND: $PROMPT_COMMAND\033[0m"
+	builtin echo -e "\033[1;33mShell integration cannot be activated due to complex PROMPT_COMMAND: $PROMPT_COMMAND\033[0m"
 	VSCODE_SHELL_HIDE_WELCOME=""
-	return;
+	builtin return
 fi
 
 if [ -z "$VSCODE_SHELL_INTEGRATION" ]; then
-	return
+	builtin return
 fi
 
 __vsc_in_command_execution="1"
 __vsc_last_history_id=$(history 1 | awk '{print $1;}')
 
 __vsc_prompt_start() {
-	printf "\033]633;A\007"
+	builtin printf "\033]633;A\007"
 }
 
 __vsc_prompt_end() {
-	printf "\033]633;B\007"
+	builtin printf "\033]633;B\007"
 }
 
 __vsc_update_cwd() {
-	printf "\033]633;P;Cwd=%s\007" "$PWD"
+	builtin printf "\033]633;P;Cwd=%s\007" "$PWD"
 }
 
 __vsc_command_output_start() {
-	printf "\033]633;C\007"
+	builtin printf "\033]633;C\007"
 }
 
 __vsc_continuation_start() {
-	printf "\033]633;F\007"
+	builtin printf "\033]633;F\007"
 }
 
 __vsc_continuation_end() {
-	printf "\033]633;G\007"
+	builtin printf "\033]633;G\007"
 }
 
 __vsc_command_complete() {
-	local __vsc_history_id=$(history 1 | awk '{print $1;}')
+	local __vsc_history_id=$(builtin history 1 | awk '{print $1;}')
 	if [[ "$__vsc_history_id" == "$__vsc_last_history_id" ]]; then
-		printf "\033]633;D\007"
+		builtin printf "\033]633;D\007"
 	else
-		printf "\033]633;D;%s\007" "$__vsc_status"
+		builtin printf "\033]633;D;%s\007" "$__vsc_status"
 		__vsc_last_history_id=$__vsc_history_id
 	fi
 	__vsc_update_cwd
@@ -101,9 +101,9 @@ __vsc_prompt_cmd_original() {
 	else
 		IFS=' '
 	fi
-	read -ra ADDR <<<"$__vsc_original_prompt_command"
+	builtin read -ra ADDR <<<"$__vsc_original_prompt_command"
 	for ((i = 0; i < ${#ADDR[@]}; i++)); do
-		eval ${ADDR[i]}
+		builtin eval ${ADDR[i]}
 	done
 	IFS=''
 	__vsc_precmd
@@ -130,7 +130,7 @@ fi
 
 trap '__vsc_preexec' DEBUG
 if [ -z "$VSCODE_SHELL_HIDE_WELCOME" ]; then
-	echo -e "\033[1;32mShell integration activated\033[0m"
+	builtin echo -e "\033[1;32mShell integration activated\033[0m"
 else
 	VSCODE_SHELL_HIDE_WELCOME=""
 fi
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.zsh b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.zsh
index be84dc9674f..cfba2786a3e 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.zsh
+++ b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.zsh
@@ -2,11 +2,11 @@
 #   Copyright (c) Microsoft Corporation. All rights reserved.
 #   Licensed under the MIT License. See License.txt in the project root for license information.
 # ---------------------------------------------------------------------------------------------
-autoload -Uz add-zsh-hook
+builtin autoload -Uz add-zsh-hook
 
 # Now that the init script is running, unset ZDOTDIR to ensure ~/.zlogout runs as expected as well
 # as prevent problems that may occur if the user's init scripts depend on ZDOTDIR not being set.
-unset ZDOTDIR
+builtin unset ZDOTDIR
 
 # This variable allows the shell to both detect that VS Code's shell integration is enabled as well
 # as disable it by unsetting the variable.
@@ -25,50 +25,50 @@ fi
 # Shell integration was disabled by the shell, exit without warning assuming either the shell has
 # explicitly disabled shell integration as it's incompatible or it implements the protocol.
 if [ -z "$VSCODE_SHELL_INTEGRATION" ]; then
-	return
+	builtin return
 fi
 
 __vsc_in_command_execution="1"
 __vsc_last_history_id=0
 
 __vsc_prompt_start() {
-	printf "\033]633;A\007"
+	builtin printf "\033]633;A\007"
 }
 
 __vsc_prompt_end() {
-	printf "\033]633;B\007"
+	builtin printf "\033]633;B\007"
 }
 
 __vsc_update_cwd() {
-	printf "\033]633;P;Cwd=%s\007" "$PWD"
+	builtin printf "\033]633;P;Cwd=%s\007" "$PWD"
 }
 
 __vsc_command_output_start() {
-	printf "\033]633;C\007"
+	builtin printf "\033]633;C\007"
 }
 
 __vsc_continuation_start() {
-	printf "\033]633;F\007"
+	builtin printf "\033]633;F\007"
 }
 
 __vsc_continuation_end() {
-	printf "\033]633;G\007"
+	builtin printf "\033]633;G\007"
 }
 
 __vsc_right_prompt_start() {
-	printf "\033]633;H\007"
+	builtin printf "\033]633;H\007"
 }
 
 __vsc_right_prompt_end() {
-	printf "\033]633;I\007"
+	builtin printf "\033]633;I\007"
 }
 
 __vsc_command_complete() {
-	local __vsc_history_id=$(history | tail -n1 | awk '{print $1;}')
+	builtin local __vsc_history_id=$(builtin history | tail -n1 | awk '{print $1;}')
 	if [[ "$__vsc_history_id" == "$__vsc_last_history_id" ]]; then
-		printf "\033]633;D\007"
+		builtin printf "\033]633;D\007"
 	else
-		printf "\033]633;D;%s\007" "$__vsc_status"
+		builtin printf "\033]633;D;%s\007" "$__vsc_status"
 		__vsc_last_history_id=$__vsc_history_id
 	fi
 	__vsc_update_cwd
@@ -114,7 +114,7 @@ add-zsh-hook preexec __vsc_preexec
 
 # Show the welcome message
 if [ -z "${VSCODE_SHELL_HIDE_WELCOME-}" ]; then
-	echo "\033[1;32mShell integration activated\033[0m"
+	builtin echo "\033[1;32mShell integration activated\033[0m"
 else
 	VSCODE_SHELL_HIDE_WELCOME=""
 fi
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.ts b/src/vs/workbench/contrib/terminal/browser/terminal.ts
index 4f75519bfd9..c48979fa4d6 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.ts
@@ -146,6 +146,7 @@ export interface ITerminalService extends ITerminalInstanceHost {
 	onDidInputInstanceData: Event<ITerminalInstance>;
 	onDidRegisterProcessSupport: Event<void>;
 	onDidChangeConnectionState: Event<void>;
+	onDidRequestHideFindWidget: Event<void>;
 
 	/**
 	 * Creates a terminal.
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts b/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
index c5701e6d38d..71eeff2a7ac 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
@@ -75,6 +75,7 @@ export class TerminalEditor extends EditorPane {
 		this._findWidget = instantiationService.createInstance(TerminalFindWidget, this._findState);
 		this._dropdownMenu = this._register(menuService.createMenu(MenuId.TerminalNewDropdownContext, _contextKeyService));
 		this._instanceMenu = this._register(menuService.createMenu(MenuId.TerminalEditorInstanceContext, _contextKeyService));
+		this._register(this._terminalService.onDidRequestHideFindWidget(() => this.hideFindWidget()));
 	}
 
 	override async setInput(newInput: TerminalEditorInput, options: IEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken) {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalService.ts b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
index 31995a09e77..8402e0e5362 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
@@ -141,6 +141,8 @@ export class TerminalService implements ITerminalService {
 	get onDidRegisterProcessSupport(): Event<void> { return this._onDidRegisterProcessSupport.event; }
 	private readonly _onDidChangeConnectionState = new Emitter<void>();
 	get onDidChangeConnectionState(): Event<void> { return this._onDidChangeConnectionState.event; }
+	private readonly _onDidRequestHideFindWidget = new Emitter<void>();
+	get onDidRequestHideFindWidget(): Event<void> { return this._onDidRequestHideFindWidget.event; }
 
 	constructor(
 		@IContextKeyService private _contextKeyService: IContextKeyService,
@@ -720,6 +722,7 @@ export class TerminalService implements ITerminalService {
 		}
 		sourceGroup.removeInstance(source);
 		this._terminalEditorService.openEditor(source);
+		this._onDidRequestHideFindWidget.fire();
 	}
 
 	async moveToTerminalView(source?: ITerminalInstance, target?: ITerminalInstance, side?: 'before' | 'after'): Promise<void> {
@@ -766,6 +769,7 @@ export class TerminalService implements ITerminalService {
 		this._onDidChangeInstances.fire();
 		this._onDidChangeActiveGroup.fire(this._terminalGroupService.activeGroup);
 		this._terminalGroupService.showPanel(true);
+		this._onDidRequestHideFindWidget.fire();
 	}
 
 	protected _initInstanceListeners(instance: ITerminalInstance): void {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
index 19c33f1825a..eec5a502976 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
@@ -133,6 +133,7 @@ export class TerminalTabbedView extends Disposable {
 		this._register(this._terminalGroupService.onDidChangeInstances(() => this._refreshShowTabs()));
 		this._register(this._terminalGroupService.onDidChangeGroups(() => this._refreshShowTabs()));
 		this._register(this._themeService.onDidColorThemeChange(theme => this._updateTheme(theme)));
+		this._register(this._terminalService.onDidRequestHideFindWidget(() => this.hideFindWidget()));
 		this._updateTheme();
 
 		this._findWidget.focusTracker.onDidFocus(() => this._terminalContainer.classList.add(CssClass.FindFocus));
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/commandNavigationAddon.ts b/src/vs/workbench/contrib/terminal/browser/xterm/commandNavigationAddon.ts
index c7b911c633d..60d82f8436d 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm/commandNavigationAddon.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/commandNavigationAddon.ts
@@ -34,6 +34,9 @@ export class CommandNavigationAddon extends Disposable implements ICommandTracke
 
 	activate(terminal: Terminal): void {
 		this._terminal = terminal;
+		this._terminal.onData(() => {
+			this._currentMarker = Boundary.Bottom;
+		});
 	}
 
 	constructor(
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
index 9784e9f9fd2..6f8b332a0d0 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
@@ -100,11 +100,13 @@ const parsedStartEntries: IWelcomePageStartEntry[] = startEntries.map((e, i) =>
 
 type GettingStartedActionClassification = {
 	command: { classification: 'PublicNonPersonalData'; purpose: 'FeatureInsight'; owner: 'JacksonKearl'; comment: 'Help understand what actions are most commonly taken on the getting started page' };
+	walkthroughId: { classification: 'PublicNonPersonalData'; purpose: 'FeatureInsight'; owner: 'JacksonKearl'; comment: 'As above' };
 	argument: { classification: 'PublicNonPersonalData'; purpose: 'FeatureInsight'; owner: 'JacksonKearl'; comment: 'As above' };
 };
 
 type GettingStartedActionEvent = {
 	command: string;
+	walkthroughId: string | undefined;
 	argument: string | undefined;
 };
 
@@ -343,7 +345,7 @@ export class GettingStartedPage extends EditorPane {
 
 	private async runDispatchCommand(command: string, argument: string) {
 		this.commandService.executeCommand('workbench.action.keepEditor');
-		this.telemetryService.publicLog2<GettingStartedActionEvent, GettingStartedActionClassification>('gettingStarted.ActionExecuted', { command, argument });
+		this.telemetryService.publicLog2<GettingStartedActionEvent, GettingStartedActionClassification>('gettingStarted.ActionExecuted', { command, argument, walkthroughId: this.currentWalkthrough?.id });
 		switch (command) {
 			case 'scrollPrev': {
 				this.scrollPrev();
@@ -511,7 +513,7 @@ export class GettingStartedPage extends EditorPane {
 				if (hrefs.length === 1) {
 					const href = hrefs[0];
 					if (href.startsWith('http')) {
-						this.telemetryService.publicLog2<GettingStartedActionEvent, GettingStartedActionClassification>('gettingStarted.ActionExecuted', { command: 'runStepAction', argument: href });
+						this.telemetryService.publicLog2<GettingStartedActionEvent, GettingStartedActionClassification>('gettingStarted.ActionExecuted', { command: 'runStepAction', argument: href, walkthroughId: this.currentWalkthrough?.id });
 						this.openerService.open(href);
 					}
 				}
@@ -546,7 +548,7 @@ export class GettingStartedPage extends EditorPane {
 				if (hrefs.length === 1) {
 					const href = hrefs[0];
 					if (href.startsWith('http')) {
-						this.telemetryService.publicLog2<GettingStartedActionEvent, GettingStartedActionClassification>('gettingStarted.ActionExecuted', { command: 'runStepAction', argument: href });
+						this.telemetryService.publicLog2<GettingStartedActionEvent, GettingStartedActionClassification>('gettingStarted.ActionExecuted', { command: 'runStepAction', argument: href, walkthroughId: this.currentWalkthrough?.id });
 						this.openerService.open(href);
 					}
 				}
@@ -723,10 +725,10 @@ export class GettingStartedPage extends EditorPane {
 		const showOnStartupLabel = $('label.caption', { for: 'showOnStartup' }, localize('welcomePage.showOnStartup', "Show welcome page on startup"));
 		const onShowOnStartupChanged = () => {
 			if (showOnStartupCheckbox.checked) {
-				this.telemetryService.publicLog2<GettingStartedActionEvent, GettingStartedActionClassification>('gettingStarted.ActionExecuted', { command: 'showOnStartupChecked', argument: undefined });
+				this.telemetryService.publicLog2<GettingStartedActionEvent, GettingStartedActionClassification>('gettingStarted.ActionExecuted', { command: 'showOnStartupChecked', argument: undefined, walkthroughId: this.currentWalkthrough?.id });
 				this.configurationService.updateValue(configurationKey, 'welcomePage');
 			} else {
-				this.telemetryService.publicLog2<GettingStartedActionEvent, GettingStartedActionClassification>('gettingStarted.ActionExecuted', { command: 'showOnStartupUnchecked', argument: undefined });
+				this.telemetryService.publicLog2<GettingStartedActionEvent, GettingStartedActionClassification>('gettingStarted.ActionExecuted', { command: 'showOnStartupUnchecked', argument: undefined, walkthroughId: this.currentWalkthrough?.id });
 				this.configurationService.updateValue(configurationKey, 'none');
 			}
 		};
@@ -852,7 +854,7 @@ export class GettingStartedPage extends EditorPane {
 			link.title = fullPath;
 			link.setAttribute('aria-label', localize('welcomePage.openFolderWithPath', "Open folder {0} with path {1}", name, parentPath));
 			link.addEventListener('click', e => {
-				this.telemetryService.publicLog2<GettingStartedActionEvent, GettingStartedActionClassification>('gettingStarted.ActionExecuted', { command: 'openRecent', argument: undefined });
+				this.telemetryService.publicLog2<GettingStartedActionEvent, GettingStartedActionClassification>('gettingStarted.ActionExecuted', { command: 'openRecent', argument: undefined, walkthroughId: this.currentWalkthrough?.id });
 				this.hostService.openWindow([windowOpenable], {
 					forceNewWindow: e.ctrlKey || e.metaKey,
 					remoteAuthority: recent.remoteAuthority || null // local window if remoteAuthority is not set or can not be deducted from the openable
@@ -1092,7 +1094,7 @@ export class GettingStartedPage extends EditorPane {
 		const toSide = href.startsWith('command:toSide:');
 		const command = href.replace(/command:(toSide:)?/, 'command:');
 
-		this.telemetryService.publicLog2<GettingStartedActionEvent, GettingStartedActionClassification>('gettingStarted.ActionExecuted', { command: 'runStepAction', argument: href });
+		this.telemetryService.publicLog2<GettingStartedActionEvent, GettingStartedActionClassification>('gettingStarted.ActionExecuted', { command: 'runStepAction', argument: href, walkthroughId: this.currentWalkthrough?.id });
 
 		const fullSize = this.groupsService.contentDimension;
 
diff --git a/src/vs/workbench/electron-sandbox/desktop.main.ts b/src/vs/workbench/electron-sandbox/desktop.main.ts
index e4c63f35ce9..6a78e65d27c 100644
--- a/src/vs/workbench/electron-sandbox/desktop.main.ts
+++ b/src/vs/workbench/electron-sandbox/desktop.main.ts
@@ -43,7 +43,6 @@ import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
 import { NativeLogService } from 'vs/workbench/services/log/electron-sandbox/logService';
 import { WorkspaceTrustEnablementService, WorkspaceTrustManagementService } from 'vs/workbench/services/workspaces/common/workspaceTrust';
 import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
-import { registerWindowDriver } from 'vs/platform/driver/electron-sandbox/driver';
 import { safeStringify } from 'vs/base/common/objects';
 import { ISharedProcessWorkerWorkbenchService, SharedProcessWorkerWorkbenchService } from 'vs/workbench/services/sharedProcess/electron-sandbox/sharedProcessWorkerWorkbenchService';
 import { isCI, isMacintosh } from 'vs/base/common/platform';
@@ -115,11 +114,6 @@ export class DesktopMain extends Disposable {
 
 		// Window
 		this._register(instantiationService.createInstance(NativeWindow));
-
-		// Driver
-		if (this.configuration.driver) {
-			instantiationService.invokeFunction(async accessor => this._register(await registerWindowDriver(accessor, this.configuration.windowId)));
-		}
 	}
 
 	private getExtraClasses(): string[] {
diff --git a/src/vs/workbench/electron-sandbox/window.ts b/src/vs/workbench/electron-sandbox/window.ts
index 816fe88f29e..389c1218e67 100644
--- a/src/vs/workbench/electron-sandbox/window.ts
+++ b/src/vs/workbench/electron-sandbox/window.ts
@@ -63,6 +63,7 @@ import { whenEditorClosed } from 'vs/workbench/browser/editor';
 import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
 import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
+import { registerLegacyWindowDriver, registerWindowDriver } from 'vs/platform/driver/electron-sandbox/driver';
 
 export class NativeWindow extends Disposable {
 
@@ -570,6 +571,29 @@ export class NativeWindow extends Disposable {
 				this.nativeHostService.openDevTools();
 			}
 		}
+
+		// Smoke Test Driver
+		this.setupDriver();
+	}
+
+	private setupDriver(): void {
+
+		// Browser Driver
+		if (this.environmentService.args['enable-smoke-test-driver']) {
+			const that = this;
+			registerWindowDriver({
+				async exitApplication(): Promise<number> {
+					that.nativeHostService.quit();
+
+					return that.environmentService.mainPid;
+				}
+			});
+		}
+
+		// Legacy Driver (TODO@bpasero remove me eventually)
+		else if (this.environmentService.args.driver) {
+			this.instantiationService.invokeFunction(async accessor => this._register(await registerLegacyWindowDriver(accessor, this.nativeHostService.windowId)));
+		}
 	}
 
 	private setupOpenHandlers(): void {
diff --git a/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts b/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
new file mode 100644
index 00000000000..f6f0d6fa353
--- /dev/null
+++ b/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
@@ -0,0 +1,369 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { URI as uri } from 'vs/base/common/uri';
+import * as nls from 'vs/nls';
+import * as Types from 'vs/base/common/types';
+import { Schemas } from 'vs/base/common/network';
+import { SideBySideEditor, EditorResourceAccessor } from 'vs/workbench/common/editor';
+import { IStringDictionary, forEach, fromMap } from 'vs/base/common/collections';
+import { IConfigurationService, IConfigurationOverrides, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IWorkspaceFolder, IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/common/variableResolver';
+import { ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
+import { IQuickInputService, IInputOptions, IQuickPickItem, IPickOptions } from 'vs/platform/quickinput/common/quickInput';
+import { ConfiguredInput } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
+import { IProcessEnvironment } from 'vs/base/common/platform';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { IPathService } from 'vs/workbench/services/path/common/pathService';
+
+export abstract class BaseConfigurationResolverService extends AbstractVariableResolverService {
+
+	static readonly INPUT_OR_COMMAND_VARIABLES_PATTERN = /\${((input|command):(.*?))}/g;
+
+	constructor(
+		context: {
+			getAppRoot: () => string | undefined;
+			getExecPath: () => string | undefined;
+		},
+		envVariablesPromise: Promise<IProcessEnvironment>,
+		editorService: IEditorService,
+		private readonly configurationService: IConfigurationService,
+		private readonly commandService: ICommandService,
+		private readonly workspaceContextService: IWorkspaceContextService,
+		private readonly quickInputService: IQuickInputService,
+		private readonly labelService: ILabelService,
+		private readonly pathService: IPathService
+	) {
+		super({
+			getFolderUri: (folderName: string): uri | undefined => {
+				const folder = workspaceContextService.getWorkspace().folders.filter(f => f.name === folderName).pop();
+				return folder ? folder.uri : undefined;
+			},
+			getWorkspaceFolderCount: (): number => {
+				return workspaceContextService.getWorkspace().folders.length;
+			},
+			getConfigurationValue: (folderUri: uri | undefined, suffix: string): string | undefined => {
+				return configurationService.getValue<string>(suffix, folderUri ? { resource: folderUri } : {});
+			},
+			getAppRoot: (): string | undefined => {
+				return context.getAppRoot();
+			},
+			getExecPath: (): string | undefined => {
+				return context.getExecPath();
+			},
+			getFilePath: (): string | undefined => {
+				const fileResource = EditorResourceAccessor.getOriginalUri(editorService.activeEditor, {
+					supportSideBySide: SideBySideEditor.PRIMARY,
+					filterByScheme: [Schemas.file, Schemas.vscodeUserData, this.pathService.defaultUriScheme]
+				});
+				if (!fileResource) {
+					return undefined;
+				}
+				return this.labelService.getUriLabel(fileResource, { noPrefix: true });
+			},
+			getWorkspaceFolderPathForFile: (): string | undefined => {
+				const fileResource = EditorResourceAccessor.getOriginalUri(editorService.activeEditor, {
+					supportSideBySide: SideBySideEditor.PRIMARY,
+					filterByScheme: [Schemas.file, Schemas.vscodeUserData, this.pathService.defaultUriScheme]
+				});
+				if (!fileResource) {
+					return undefined;
+				}
+				const wsFolder = workspaceContextService.getWorkspaceFolder(fileResource);
+				if (!wsFolder) {
+					return undefined;
+				}
+				return this.labelService.getUriLabel(wsFolder.uri, { noPrefix: true });
+			},
+			getSelectedText: (): string | undefined => {
+				const activeTextEditorControl = editorService.activeTextEditorControl;
+
+				let activeControl: ICodeEditor | null = null;
+
+				if (isCodeEditor(activeTextEditorControl)) {
+					activeControl = activeTextEditorControl;
+				} else if (isDiffEditor(activeTextEditorControl)) {
+					const original = activeTextEditorControl.getOriginalEditor();
+					const modified = activeTextEditorControl.getModifiedEditor();
+					activeControl = original.hasWidgetFocus() ? original : modified;
+				}
+
+				const activeModel = activeControl?.getModel();
+				const activeSelection = activeControl?.getSelection();
+				if (activeModel && activeSelection) {
+					return activeModel.getValueInRange(activeSelection);
+				}
+				return undefined;
+			},
+			getLineNumber: (): string | undefined => {
+				const activeTextEditorControl = editorService.activeTextEditorControl;
+				if (isCodeEditor(activeTextEditorControl)) {
+					const selection = activeTextEditorControl.getSelection();
+					if (selection) {
+						const lineNumber = selection.positionLineNumber;
+						return String(lineNumber);
+					}
+				}
+				return undefined;
+			}
+		}, labelService, pathService.userHome().then(home => home.path), envVariablesPromise);
+	}
+
+	public override async resolveWithInteractionReplace(folder: IWorkspaceFolder | undefined, config: any, section?: string, variables?: IStringDictionary<string>, target?: ConfigurationTarget): Promise<any> {
+		// resolve any non-interactive variables and any contributed variables
+		config = await this.resolveAnyAsync(folder, config);
+
+		// resolve input variables in the order in which they are encountered
+		return this.resolveWithInteraction(folder, config, section, variables, target).then(mapping => {
+			// finally substitute evaluated command variables (if there are any)
+			if (!mapping) {
+				return null;
+			} else if (mapping.size > 0) {
+				return this.resolveAnyAsync(folder, config, fromMap(mapping));
+			} else {
+				return config;
+			}
+		});
+	}
+
+	public override async resolveWithInteraction(folder: IWorkspaceFolder | undefined, config: any, section?: string, variables?: IStringDictionary<string>, target?: ConfigurationTarget): Promise<Map<string, string> | undefined> {
+		// resolve any non-interactive variables and any contributed variables
+		const resolved = await this.resolveAnyMap(folder, config);
+		config = resolved.newConfig;
+		const allVariableMapping: Map<string, string> = resolved.resolvedVariables;
+
+		// resolve input and command variables in the order in which they are encountered
+		return this.resolveWithInputAndCommands(folder, config, variables, section, target).then(inputOrCommandMapping => {
+			if (this.updateMapping(inputOrCommandMapping, allVariableMapping)) {
+				return allVariableMapping;
+			}
+			return undefined;
+		});
+	}
+
+	/**
+	 * Add all items from newMapping to fullMapping. Returns false if newMapping is undefined.
+	 */
+	private updateMapping(newMapping: IStringDictionary<string> | undefined, fullMapping: Map<string, string>): boolean {
+		if (!newMapping) {
+			return false;
+		}
+		forEach(newMapping, (entry) => {
+			fullMapping.set(entry.key, entry.value);
+		});
+		return true;
+	}
+
+	/**
+	 * Finds and executes all input and command variables in the given configuration and returns their values as a dictionary.
+	 * Please note: this method does not substitute the input or command variables (so the configuration is not modified).
+	 * The returned dictionary can be passed to "resolvePlatform" for the actual substitution.
+	 * See #6569.
+	 *
+	 * @param variableToCommandMap Aliases for commands
+	 */
+	private async resolveWithInputAndCommands(folder: IWorkspaceFolder | undefined, configuration: any, variableToCommandMap?: IStringDictionary<string>, section?: string, target?: ConfigurationTarget): Promise<IStringDictionary<string> | undefined> {
+
+		if (!configuration) {
+			return Promise.resolve(undefined);
+		}
+
+		// get all "inputs"
+		let inputs: ConfiguredInput[] = [];
+		if (this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY && section) {
+			const overrides: IConfigurationOverrides = folder ? { resource: folder.uri } : {};
+			let result = this.configurationService.inspect(section, overrides);
+			if (result && (result.userValue || result.workspaceValue || result.workspaceFolderValue)) {
+				switch (target) {
+					case ConfigurationTarget.USER: inputs = (<any>result.userValue)?.inputs; break;
+					case ConfigurationTarget.WORKSPACE: inputs = (<any>result.workspaceValue)?.inputs; break;
+					default: inputs = (<any>result.workspaceFolderValue)?.inputs;
+				}
+			} else {
+				const valueResult = this.configurationService.getValue<any>(section, overrides);
+				if (valueResult) {
+					inputs = valueResult.inputs;
+				}
+			}
+		}
+
+		// extract and dedupe all "input" and "command" variables and preserve their order in an array
+		const variables: string[] = [];
+		this.findVariables(configuration, variables);
+
+		const variableValues: IStringDictionary<string> = Object.create(null);
+
+		for (const variable of variables) {
+
+			const [type, name] = variable.split(':', 2);
+
+			let result: string | undefined;
+
+			switch (type) {
+
+				case 'input':
+					result = await this.showUserInput(name, inputs);
+					break;
+
+				case 'command': {
+					// use the name as a command ID #12735
+					const commandId = (variableToCommandMap ? variableToCommandMap[name] : undefined) || name;
+					result = await this.commandService.executeCommand(commandId, configuration);
+					if (typeof result !== 'string' && !Types.isUndefinedOrNull(result)) {
+						throw new Error(nls.localize('commandVariable.noStringType', "Cannot substitute command variable '{0}' because command did not return a result of type string.", commandId));
+					}
+					break;
+				}
+				default:
+					// Try to resolve it as a contributed variable
+					if (this._contributedVariables.has(variable)) {
+						result = await this._contributedVariables.get(variable)!();
+					}
+			}
+
+			if (typeof result === 'string') {
+				variableValues[variable] = result;
+			} else {
+				return undefined;
+			}
+		}
+
+		return variableValues;
+	}
+
+	/**
+	 * Recursively finds all command or input variables in object and pushes them into variables.
+	 * @param object object is searched for variables.
+	 * @param variables All found variables are returned in variables.
+	 */
+	private findVariables(object: any, variables: string[]) {
+		if (typeof object === 'string') {
+			let matches;
+			while ((matches = BaseConfigurationResolverService.INPUT_OR_COMMAND_VARIABLES_PATTERN.exec(object)) !== null) {
+				if (matches.length === 4) {
+					const command = matches[1];
+					if (variables.indexOf(command) < 0) {
+						variables.push(command);
+					}
+				}
+			}
+			this._contributedVariables.forEach((value, contributed: string) => {
+				if ((variables.indexOf(contributed) < 0) && (object.indexOf('${' + contributed + '}') >= 0)) {
+					variables.push(contributed);
+				}
+			});
+		} else if (Types.isArray(object)) {
+			object.forEach(value => {
+				this.findVariables(value, variables);
+			});
+		} else if (object) {
+			Object.keys(object).forEach(key => {
+				const value = object[key];
+				this.findVariables(value, variables);
+			});
+		}
+	}
+
+	/**
+	 * Takes the provided input info and shows the quick pick so the user can provide the value for the input
+	 * @param variable Name of the input variable.
+	 * @param inputInfos Information about each possible input variable.
+	 */
+	private showUserInput(variable: string, inputInfos: ConfiguredInput[]): Promise<string | undefined> {
+
+		if (!inputInfos) {
+			return Promise.reject(new Error(nls.localize('inputVariable.noInputSection', "Variable '{0}' must be defined in an '{1}' section of the debug or task configuration.", variable, 'input')));
+		}
+
+		// find info for the given input variable
+		const info = inputInfos.filter(item => item.id === variable).pop();
+		if (info) {
+
+			const missingAttribute = (attrName: string) => {
+				throw new Error(nls.localize('inputVariable.missingAttribute', "Input variable '{0}' is of type '{1}' and must include '{2}'.", variable, info.type, attrName));
+			};
+
+			switch (info.type) {
+
+				case 'promptString': {
+					if (!Types.isString(info.description)) {
+						missingAttribute('description');
+					}
+					const inputOptions: IInputOptions = { prompt: info.description, ignoreFocusLost: true };
+					if (info.default) {
+						inputOptions.value = info.default;
+					}
+					if (info.password) {
+						inputOptions.password = info.password;
+					}
+					return this.quickInputService.input(inputOptions).then(resolvedInput => {
+						return resolvedInput;
+					});
+				}
+
+				case 'pickString': {
+					if (!Types.isString(info.description)) {
+						missingAttribute('description');
+					}
+					if (Types.isArray(info.options)) {
+						info.options.forEach(pickOption => {
+							if (!Types.isString(pickOption) && !Types.isString(pickOption.value)) {
+								missingAttribute('value');
+							}
+						});
+					} else {
+						missingAttribute('options');
+					}
+					interface PickStringItem extends IQuickPickItem {
+						value: string;
+					}
+					const picks = new Array<PickStringItem>();
+					info.options.forEach(pickOption => {
+						const value = Types.isString(pickOption) ? pickOption : pickOption.value;
+						const label = Types.isString(pickOption) ? undefined : pickOption.label;
+
+						// If there is no label defined, use value as label
+						const item: PickStringItem = {
+							label: label ? `${label}: ${value}` : value,
+							value: value
+						};
+
+						if (value === info.default) {
+							item.description = nls.localize('inputVariable.defaultInputValue', "(Default)");
+							picks.unshift(item);
+						} else {
+							picks.push(item);
+						}
+					});
+					const pickOptions: IPickOptions<PickStringItem> = { placeHolder: info.description, matchOnDetail: true, ignoreFocusLost: true };
+					return this.quickInputService.pick(picks, pickOptions, undefined).then(resolvedInput => {
+						if (resolvedInput) {
+							return resolvedInput.value;
+						}
+						return undefined;
+					});
+				}
+
+				case 'command': {
+					if (!Types.isString(info.command)) {
+						missingAttribute('command');
+					}
+					return this.commandService.executeCommand<string>(info.command, info.args).then(result => {
+						if (typeof result === 'string' || Types.isUndefinedOrNull(result)) {
+							return result;
+						}
+						throw new Error(nls.localize('inputVariable.command.noStringType', "Cannot substitute input variable '{0}' because command '{1}' did not return a result of type string.", variable, info.command));
+					});
+				}
+
+				default:
+					throw new Error(nls.localize('inputVariable.unknownType', "Input variable '{0}' can only be of type 'promptString', 'pickString', or 'command'.", variable));
+			}
+		}
+		return Promise.reject(new Error(nls.localize('inputVariable.undefinedVariable', "Undefined input variable '{0}' encountered. Remove or define '{0}' to continue.", variable)));
+	}
+}
diff --git a/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts
index acbac82cf51..c4de8509832 100644
--- a/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts
@@ -3,371 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI as uri } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
-import * as Types from 'vs/base/common/types';
-import { Schemas } from 'vs/base/common/network';
-import { SideBySideEditor, EditorResourceAccessor } from 'vs/workbench/common/editor';
-import { IStringDictionary, forEach, fromMap } from 'vs/base/common/collections';
-import { IConfigurationService, IConfigurationOverrides, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IWorkspaceFolder, IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/common/variableResolver';
-import { ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { IQuickInputService, IInputOptions, IQuickPickItem, IPickOptions } from 'vs/platform/quickinput/common/quickInput';
-import { ConfiguredInput } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IProcessEnvironment } from 'vs/base/common/platform';
+import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
+import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
-
-export abstract class BaseConfigurationResolverService extends AbstractVariableResolverService {
-
-	static readonly INPUT_OR_COMMAND_VARIABLES_PATTERN = /\${((input|command):(.*?))}/g;
-
-	constructor(
-		context: {
-			getAppRoot: () => string | undefined;
-			getExecPath: () => string | undefined;
-		},
-		envVariablesPromise: Promise<IProcessEnvironment>,
-		editorService: IEditorService,
-		private readonly configurationService: IConfigurationService,
-		private readonly commandService: ICommandService,
-		private readonly workspaceContextService: IWorkspaceContextService,
-		private readonly quickInputService: IQuickInputService,
-		private readonly labelService: ILabelService,
-		private readonly pathService: IPathService
-	) {
-		super({
-			getFolderUri: (folderName: string): uri | undefined => {
-				const folder = workspaceContextService.getWorkspace().folders.filter(f => f.name === folderName).pop();
-				return folder ? folder.uri : undefined;
-			},
-			getWorkspaceFolderCount: (): number => {
-				return workspaceContextService.getWorkspace().folders.length;
-			},
-			getConfigurationValue: (folderUri: uri | undefined, suffix: string): string | undefined => {
-				return configurationService.getValue<string>(suffix, folderUri ? { resource: folderUri } : {});
-			},
-			getAppRoot: (): string | undefined => {
-				return context.getAppRoot();
-			},
-			getExecPath: (): string | undefined => {
-				return context.getExecPath();
-			},
-			getFilePath: (): string | undefined => {
-				const fileResource = EditorResourceAccessor.getOriginalUri(editorService.activeEditor, {
-					supportSideBySide: SideBySideEditor.PRIMARY,
-					filterByScheme: [Schemas.file, Schemas.vscodeUserData, this.pathService.defaultUriScheme]
-				});
-				if (!fileResource) {
-					return undefined;
-				}
-				return this.labelService.getUriLabel(fileResource, { noPrefix: true });
-			},
-			getWorkspaceFolderPathForFile: (): string | undefined => {
-				const fileResource = EditorResourceAccessor.getOriginalUri(editorService.activeEditor, {
-					supportSideBySide: SideBySideEditor.PRIMARY,
-					filterByScheme: [Schemas.file, Schemas.vscodeUserData, this.pathService.defaultUriScheme]
-				});
-				if (!fileResource) {
-					return undefined;
-				}
-				const wsFolder = workspaceContextService.getWorkspaceFolder(fileResource);
-				if (!wsFolder) {
-					return undefined;
-				}
-				return this.labelService.getUriLabel(wsFolder.uri, { noPrefix: true });
-			},
-			getSelectedText: (): string | undefined => {
-				const activeTextEditorControl = editorService.activeTextEditorControl;
-
-				let activeControl: ICodeEditor | null = null;
-
-				if (isCodeEditor(activeTextEditorControl)) {
-					activeControl = activeTextEditorControl;
-				} else if (isDiffEditor(activeTextEditorControl)) {
-					const original = activeTextEditorControl.getOriginalEditor();
-					const modified = activeTextEditorControl.getModifiedEditor();
-					activeControl = original.hasWidgetFocus() ? original : modified;
-				}
-
-				const activeModel = activeControl?.getModel();
-				const activeSelection = activeControl?.getSelection();
-				if (activeModel && activeSelection) {
-					return activeModel.getValueInRange(activeSelection);
-				}
-				return undefined;
-			},
-			getLineNumber: (): string | undefined => {
-				const activeTextEditorControl = editorService.activeTextEditorControl;
-				if (isCodeEditor(activeTextEditorControl)) {
-					const selection = activeTextEditorControl.getSelection();
-					if (selection) {
-						const lineNumber = selection.positionLineNumber;
-						return String(lineNumber);
-					}
-				}
-				return undefined;
-			}
-		}, labelService, pathService.userHome().then(home => home.path), envVariablesPromise);
-	}
-
-	public override async resolveWithInteractionReplace(folder: IWorkspaceFolder | undefined, config: any, section?: string, variables?: IStringDictionary<string>, target?: ConfigurationTarget): Promise<any> {
-		// resolve any non-interactive variables and any contributed variables
-		config = await this.resolveAnyAsync(folder, config);
-
-		// resolve input variables in the order in which they are encountered
-		return this.resolveWithInteraction(folder, config, section, variables, target).then(mapping => {
-			// finally substitute evaluated command variables (if there are any)
-			if (!mapping) {
-				return null;
-			} else if (mapping.size > 0) {
-				return this.resolveAnyAsync(folder, config, fromMap(mapping));
-			} else {
-				return config;
-			}
-		});
-	}
-
-	public override async resolveWithInteraction(folder: IWorkspaceFolder | undefined, config: any, section?: string, variables?: IStringDictionary<string>, target?: ConfigurationTarget): Promise<Map<string, string> | undefined> {
-		// resolve any non-interactive variables and any contributed variables
-		const resolved = await this.resolveAnyMap(folder, config);
-		config = resolved.newConfig;
-		const allVariableMapping: Map<string, string> = resolved.resolvedVariables;
-
-		// resolve input and command variables in the order in which they are encountered
-		return this.resolveWithInputAndCommands(folder, config, variables, section, target).then(inputOrCommandMapping => {
-			if (this.updateMapping(inputOrCommandMapping, allVariableMapping)) {
-				return allVariableMapping;
-			}
-			return undefined;
-		});
-	}
-
-	/**
-	 * Add all items from newMapping to fullMapping. Returns false if newMapping is undefined.
-	 */
-	private updateMapping(newMapping: IStringDictionary<string> | undefined, fullMapping: Map<string, string>): boolean {
-		if (!newMapping) {
-			return false;
-		}
-		forEach(newMapping, (entry) => {
-			fullMapping.set(entry.key, entry.value);
-		});
-		return true;
-	}
-
-	/**
-	 * Finds and executes all input and command variables in the given configuration and returns their values as a dictionary.
-	 * Please note: this method does not substitute the input or command variables (so the configuration is not modified).
-	 * The returned dictionary can be passed to "resolvePlatform" for the actual substitution.
-	 * See #6569.
-	 *
-	 * @param variableToCommandMap Aliases for commands
-	 */
-	private async resolveWithInputAndCommands(folder: IWorkspaceFolder | undefined, configuration: any, variableToCommandMap?: IStringDictionary<string>, section?: string, target?: ConfigurationTarget): Promise<IStringDictionary<string> | undefined> {
-
-		if (!configuration) {
-			return Promise.resolve(undefined);
-		}
-
-		// get all "inputs"
-		let inputs: ConfiguredInput[] = [];
-		if (this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY && section) {
-			const overrides: IConfigurationOverrides = folder ? { resource: folder.uri } : {};
-			let result = this.configurationService.inspect(section, overrides);
-			if (result && (result.userValue || result.workspaceValue || result.workspaceFolderValue)) {
-				switch (target) {
-					case ConfigurationTarget.USER: inputs = (<any>result.userValue)?.inputs; break;
-					case ConfigurationTarget.WORKSPACE: inputs = (<any>result.workspaceValue)?.inputs; break;
-					default: inputs = (<any>result.workspaceFolderValue)?.inputs;
-				}
-			} else {
-				const valueResult = this.configurationService.getValue<any>(section, overrides);
-				if (valueResult) {
-					inputs = valueResult.inputs;
-				}
-			}
-		}
-
-		// extract and dedupe all "input" and "command" variables and preserve their order in an array
-		const variables: string[] = [];
-		this.findVariables(configuration, variables);
-
-		const variableValues: IStringDictionary<string> = Object.create(null);
-
-		for (const variable of variables) {
-
-			const [type, name] = variable.split(':', 2);
-
-			let result: string | undefined;
-
-			switch (type) {
-
-				case 'input':
-					result = await this.showUserInput(name, inputs);
-					break;
-
-				case 'command': {
-					// use the name as a command ID #12735
-					const commandId = (variableToCommandMap ? variableToCommandMap[name] : undefined) || name;
-					result = await this.commandService.executeCommand(commandId, configuration);
-					if (typeof result !== 'string' && !Types.isUndefinedOrNull(result)) {
-						throw new Error(nls.localize('commandVariable.noStringType', "Cannot substitute command variable '{0}' because command did not return a result of type string.", commandId));
-					}
-					break;
-				}
-				default:
-					// Try to resolve it as a contributed variable
-					if (this._contributedVariables.has(variable)) {
-						result = await this._contributedVariables.get(variable)!();
-					}
-			}
-
-			if (typeof result === 'string') {
-				variableValues[variable] = result;
-			} else {
-				return undefined;
-			}
-		}
-
-		return variableValues;
-	}
-
-	/**
-	 * Recursively finds all command or input variables in object and pushes them into variables.
-	 * @param object object is searched for variables.
-	 * @param variables All found variables are returned in variables.
-	 */
-	private findVariables(object: any, variables: string[]) {
-		if (typeof object === 'string') {
-			let matches;
-			while ((matches = BaseConfigurationResolverService.INPUT_OR_COMMAND_VARIABLES_PATTERN.exec(object)) !== null) {
-				if (matches.length === 4) {
-					const command = matches[1];
-					if (variables.indexOf(command) < 0) {
-						variables.push(command);
-					}
-				}
-			}
-			this._contributedVariables.forEach((value, contributed: string) => {
-				if ((variables.indexOf(contributed) < 0) && (object.indexOf('${' + contributed + '}') >= 0)) {
-					variables.push(contributed);
-				}
-			});
-		} else if (Types.isArray(object)) {
-			object.forEach(value => {
-				this.findVariables(value, variables);
-			});
-		} else if (object) {
-			Object.keys(object).forEach(key => {
-				const value = object[key];
-				this.findVariables(value, variables);
-			});
-		}
-	}
-
-	/**
-	 * Takes the provided input info and shows the quick pick so the user can provide the value for the input
-	 * @param variable Name of the input variable.
-	 * @param inputInfos Information about each possible input variable.
-	 */
-	private showUserInput(variable: string, inputInfos: ConfiguredInput[]): Promise<string | undefined> {
-
-		if (!inputInfos) {
-			return Promise.reject(new Error(nls.localize('inputVariable.noInputSection', "Variable '{0}' must be defined in an '{1}' section of the debug or task configuration.", variable, 'input')));
-		}
-
-		// find info for the given input variable
-		const info = inputInfos.filter(item => item.id === variable).pop();
-		if (info) {
-
-			const missingAttribute = (attrName: string) => {
-				throw new Error(nls.localize('inputVariable.missingAttribute', "Input variable '{0}' is of type '{1}' and must include '{2}'.", variable, info.type, attrName));
-			};
-
-			switch (info.type) {
-
-				case 'promptString': {
-					if (!Types.isString(info.description)) {
-						missingAttribute('description');
-					}
-					const inputOptions: IInputOptions = { prompt: info.description, ignoreFocusLost: true };
-					if (info.default) {
-						inputOptions.value = info.default;
-					}
-					if (info.password) {
-						inputOptions.password = info.password;
-					}
-					return this.quickInputService.input(inputOptions).then(resolvedInput => {
-						return resolvedInput;
-					});
-				}
-
-				case 'pickString': {
-					if (!Types.isString(info.description)) {
-						missingAttribute('description');
-					}
-					if (Types.isArray(info.options)) {
-						info.options.forEach(pickOption => {
-							if (!Types.isString(pickOption) && !Types.isString(pickOption.value)) {
-								missingAttribute('value');
-							}
-						});
-					} else {
-						missingAttribute('options');
-					}
-					interface PickStringItem extends IQuickPickItem {
-						value: string;
-					}
-					const picks = new Array<PickStringItem>();
-					info.options.forEach(pickOption => {
-						const value = Types.isString(pickOption) ? pickOption : pickOption.value;
-						const label = Types.isString(pickOption) ? undefined : pickOption.label;
-
-						// If there is no label defined, use value as label
-						const item: PickStringItem = {
-							label: label ? `${label}: ${value}` : value,
-							value: value
-						};
-
-						if (value === info.default) {
-							item.description = nls.localize('inputVariable.defaultInputValue', "(Default)");
-							picks.unshift(item);
-						} else {
-							picks.push(item);
-						}
-					});
-					const pickOptions: IPickOptions<PickStringItem> = { placeHolder: info.description, matchOnDetail: true, ignoreFocusLost: true };
-					return this.quickInputService.pick(picks, pickOptions, undefined).then(resolvedInput => {
-						if (resolvedInput) {
-							return resolvedInput.value;
-						}
-						return undefined;
-					});
-				}
-
-				case 'command': {
-					if (!Types.isString(info.command)) {
-						missingAttribute('command');
-					}
-					return this.commandService.executeCommand<string>(info.command, info.args).then(result => {
-						if (typeof result === 'string' || Types.isUndefinedOrNull(result)) {
-							return result;
-						}
-						throw new Error(nls.localize('inputVariable.command.noStringType', "Cannot substitute input variable '{0}' because command '{1}' did not return a result of type string.", variable, info.command));
-					});
-				}
-
-				default:
-					throw new Error(nls.localize('inputVariable.unknownType', "Input variable '{0}' can only be of type 'promptString', 'pickString', or 'command'.", variable));
-			}
-		}
-		return Promise.reject(new Error(nls.localize('inputVariable.undefinedVariable', "Undefined input variable '{0}' encountered. Remove or define '{0}' to continue.", variable)));
-	}
-}
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { BaseConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService';
 
 export class ConfigurationResolverService extends BaseConfigurationResolverService {
 
@@ -385,3 +30,5 @@ export class ConfigurationResolverService extends BaseConfigurationResolverServi
 			commandService, workspaceContextService, quickInputService, labelService, pathService);
 	}
 }
+
+registerSingleton(IConfigurationResolverService, ConfigurationResolverService, true);
diff --git a/src/vs/workbench/services/configurationResolver/electron-sandbox/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/electron-sandbox/configurationResolverService.ts
index b98d3a68357..f4fcf389c87 100644
--- a/src/vs/workbench/services/configurationResolver/electron-sandbox/configurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/electron-sandbox/configurationResolverService.ts
@@ -11,7 +11,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { BaseConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/configurationResolverService';
+import { BaseConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { IShellEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/shellEnvironmentService';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
diff --git a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
index 014d9f42c43..ed179a4847b 100644
--- a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
+++ b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
@@ -19,7 +19,7 @@ import { TestConfigurationService } from 'vs/platform/configuration/test/common/
 import { IFormatterChangeEvent, ILabelService, ResourceLabelFormatter } from 'vs/platform/label/common/label';
 import { IWorkspace, IWorkspaceFolder, IWorkspaceIdentifier, Workspace } from 'vs/platform/workspace/common/workspace';
 import { testWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { BaseConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/configurationResolverService';
+import { BaseConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService';
 import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
 import { NativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
diff --git a/src/vs/workbench/services/editor/common/editorGroupsService.ts b/src/vs/workbench/services/editor/common/editorGroupsService.ts
index bdea82e86be..0802cbd5acf 100644
--- a/src/vs/workbench/services/editor/common/editorGroupsService.ts
+++ b/src/vs/workbench/services/editor/common/editorGroupsService.ts
@@ -652,7 +652,7 @@ export interface IEditorGroup {
 	 *
 	 * @returns a promise when all editors are closed.
 	 */
-	closeAllEditors(options?: ICloseAllEditorsOptions): Promise<void>;
+	closeAllEditors(options?: ICloseAllEditorsOptions): Promise<boolean>;
 
 	/**
 	 * Replaces editors in this group with the provided replacement.
diff --git a/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts b/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts
index c52507b6659..83497325fa8 100644
--- a/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts
+++ b/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts
@@ -894,6 +894,7 @@ suite('EditorGroupsService', () => {
 
 	test('closeAllEditors - dirty editor handling', async () => {
 		const [part, instantiationService] = await createPart();
+		let closeResult = true;
 
 		const accessor = instantiationService.createInstance(TestServiceAccessor);
 		accessor.fileDialogService.setConfirmResult(ConfirmResult.DONT_SAVE);
@@ -909,14 +910,16 @@ suite('EditorGroupsService', () => {
 		await group.openEditor(input2);
 
 		accessor.fileDialogService.setConfirmResult(ConfirmResult.CANCEL);
-		await group.closeAllEditors();
+		closeResult = await group.closeAllEditors();
 
+		assert.strictEqual(closeResult, false);
 		assert.ok(!input1.gotDisposed);
 		assert.ok(!input2.gotDisposed);
 
 		accessor.fileDialogService.setConfirmResult(ConfirmResult.DONT_SAVE);
-		await group.closeAllEditors();
+		closeResult = await group.closeAllEditors();
 
+		assert.strictEqual(closeResult, true);
 		assert.ok(input1.gotDisposed);
 		assert.ok(input2.gotDisposed);
 	});
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
index f57e3cb5db6..1040b35beff 100644
--- a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
@@ -182,6 +182,11 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 	}
 
 	async setEnablement(extensions: IExtension[], newState: EnablementState): Promise<boolean[]> {
+		await this.extensionsManager.whenInitialized();
+
+		if (newState === EnablementState.EnabledGlobally || newState === EnablementState.EnabledWorkspace) {
+			extensions.push(...this.getExtensionsToEnableRecursively(extensions, this.extensionsManager.extensions, newState, { dependencies: true, pack: true }));
+		}
 
 		const workspace = newState === EnablementState.DisabledWorkspace || newState === EnablementState.EnabledWorkspace;
 		for (const extension of extensions) {
@@ -213,6 +218,33 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		return result;
 	}
 
+	private getExtensionsToEnableRecursively(extensions: IExtension[], allExtensions: ReadonlyArray<IExtension>, enablementState: EnablementState, options: { dependencies: boolean; pack: boolean }, checked: IExtension[] = []): IExtension[] {
+		const toCheck = extensions.filter(e => checked.indexOf(e) === -1);
+		if (toCheck.length) {
+			for (const extension of toCheck) {
+				checked.push(extension);
+			}
+			const extensionsToDisable = allExtensions.filter(i => {
+				if (checked.indexOf(i) !== -1) {
+					return false;
+				}
+				if (this.getEnablementState(i) === enablementState) {
+					return false;
+				}
+				return (options.dependencies || options.pack)
+					&& extensions.some(extension =>
+						(options.dependencies && extension.manifest.extensionDependencies?.some(id => areSameExtensions({ id }, i.identifier)))
+						|| (options.pack && extension.manifest.extensionPack?.some(id => areSameExtensions({ id }, i.identifier)))
+					);
+			});
+			if (extensionsToDisable.length) {
+				extensionsToDisable.push(...this.getExtensionsToEnableRecursively(extensionsToDisable, allExtensions, enablementState, options, checked));
+			}
+			return extensionsToDisable;
+		}
+		return [];
+	}
+
 	private _setUserEnablementState(extension: IExtension, newState: EnablementState): Promise<boolean> {
 
 		const currentState = this._getUserEnablementState(extension.identifier);
diff --git a/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts b/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
index 894fc37142d..660c2fcd2e7 100644
--- a/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
+++ b/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
@@ -386,6 +386,31 @@ suite('ExtensionEnablementService Test', () => {
 		assert.strictEqual(testObject.getEnablementState(extension), EnablementState.EnabledGlobally);
 	});
 
+	test('test enable an extension also enables dependencies', async () => {
+		installed.push(...[aLocalExtension2('pub.a', { extensionDependencies: ['pub.b'] }), aLocalExtension('pub.b')]);
+		const target = installed[0];
+		const dep = installed[1];
+		await (<TestExtensionEnablementService>testObject).waitUntilInitialized();
+		await testObject.setEnablement([dep, target], EnablementState.DisabledGlobally);
+		await testObject.setEnablement([target], EnablementState.EnabledGlobally);
+		assert.ok(testObject.isEnabled(target));
+		assert.ok(testObject.isEnabled(dep));
+		assert.strictEqual(testObject.getEnablementState(target), EnablementState.EnabledGlobally);
+		assert.strictEqual(testObject.getEnablementState(dep), EnablementState.EnabledGlobally);
+	});
+
+	test('test enable an extension also enables packed extensions', async () => {
+		installed.push(...[aLocalExtension2('pub.a', { extensionPack: ['pub.b'] }), aLocalExtension('pub.b')]);
+		const target = installed[0];
+		const dep = installed[1];
+		await testObject.setEnablement([dep, target], EnablementState.DisabledGlobally);
+		await testObject.setEnablement([target], EnablementState.EnabledGlobally);
+		assert.ok(testObject.isEnabled(target));
+		assert.ok(testObject.isEnabled(dep));
+		assert.strictEqual(testObject.getEnablementState(target), EnablementState.EnabledGlobally);
+		assert.strictEqual(testObject.getEnablementState(dep), EnablementState.EnabledGlobally);
+	});
+
 	test('test remove an extension from disablement list when uninstalled', async () => {
 		const extension = aLocalExtension('pub.a');
 		installed.push(extension);
@@ -513,7 +538,7 @@ suite('ExtensionEnablementService Test', () => {
 		const extension = aLocalExtension('pub.a');
 		installed.push(extension);
 
-		testObject.setEnablement([extension], EnablementState.EnabledWorkspace);
+		await testObject.setEnablement([extension], EnablementState.EnabledWorkspace);
 		instantiationService.stub(IWorkbenchEnvironmentService, { enableExtensions: <readonly string[]>['pub.a'] } as IWorkbenchEnvironmentService);
 		testObject = new TestExtensionEnablementService(instantiationService);
 
@@ -525,7 +550,7 @@ suite('ExtensionEnablementService Test', () => {
 		const extension = aLocalExtension('pub.a');
 		installed.push(extension);
 
-		testObject.setEnablement([extension], EnablementState.DisabledGlobally);
+		await testObject.setEnablement([extension], EnablementState.DisabledGlobally);
 		instantiationService.stub(IWorkbenchEnvironmentService, { enableExtensions: <readonly string[]>['pub.a'] } as IWorkbenchEnvironmentService);
 		testObject = new TestExtensionEnablementService(instantiationService);
 
@@ -537,7 +562,7 @@ suite('ExtensionEnablementService Test', () => {
 		const extension = aLocalExtension('pub.a');
 		installed.push(extension);
 
-		testObject.setEnablement([extension], EnablementState.DisabledWorkspace);
+		await testObject.setEnablement([extension], EnablementState.DisabledWorkspace);
 		instantiationService.stub(IWorkbenchEnvironmentService, { enableExtensions: <readonly string[]>['pub.a'] } as IWorkbenchEnvironmentService);
 		testObject = new TestExtensionEnablementService(instantiationService);
 
diff --git a/src/vs/workbench/services/search/common/fileSearchManager.ts b/src/vs/workbench/services/search/common/fileSearchManager.ts
index 27453fd8138..c5c8b2d10b4 100644
--- a/src/vs/workbench/services/search/common/fileSearchManager.ts
+++ b/src/vs/workbench/services/search/common/fileSearchManager.ts
@@ -224,8 +224,8 @@ class FileSearchEngine {
 
 				// Check exclude pattern
 				// If the user searches for the exact file name, we adjust the glob matching
-				// to ignore filtering by siblings because the user seems to know what she
-				// is searching for and we want to include the result in that case anyway
+				// to ignore filtering by siblings because the user seems to know what they
+				// are searching for and we want to include the result in that case anyway
 				if (queryTester.matchesExcludesSync(relativePath, basename, filePattern !== basename ? hasSibling : undefined)) {
 					continue;
 				}
diff --git a/src/vs/workbench/services/search/node/fileSearch.ts b/src/vs/workbench/services/search/node/fileSearch.ts
index 60719151216..e6b9bb1633c 100644
--- a/src/vs/workbench/services/search/node/fileSearch.ts
+++ b/src/vs/workbench/services/search/node/fileSearch.ts
@@ -429,8 +429,8 @@ export class FileWalker {
 
 				// Check exclude pattern
 				// If the user searches for the exact file name, we adjust the glob matching
-				// to ignore filtering by siblings because the user seems to know what she
-				// is searching for and we want to include the result in that case anyway
+				// to ignore filtering by siblings because the user seems to know what they
+				// are searching for and we want to include the result in that case anyway
 				if (excludePattern.test(relativePath, basename, filePattern !== basename ? hasSibling : undefined)) {
 					continue;
 				}
@@ -479,8 +479,8 @@ export class FileWalker {
 
 			// Check exclude pattern
 			// If the user searches for the exact file name, we adjust the glob matching
-			// to ignore filtering by siblings because the user seems to know what she
-			// is searching for and we want to include the result in that case anyway
+			// to ignore filtering by siblings because the user seems to know what they
+			// are searching for and we want to include the result in that case anyway
 			const currentRelativePath = relativeParentPath ? [relativeParentPath, file].join(path.sep) : file;
 			if (this.folderExcludePatterns.get(folderQuery.folder.fsPath)!.test(currentRelativePath, file, this.config.filePattern !== file ? hasSibling : undefined)) {
 				return clb(null);
diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncEnablementService.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncEnablementService.ts
index bfc01daa46e..8c815116f35 100644
--- a/src/vs/workbench/services/userDataSync/browser/userDataSyncEnablementService.ts
+++ b/src/vs/workbench/services/userDataSync/browser/userDataSyncEnablementService.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IUserDataSyncEnablementService, SyncResource } from 'vs/platform/userDataSync/common/userDataSync';
 import { UserDataSyncEnablementService as BaseUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSyncEnablementService';
 import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
@@ -17,46 +18,4 @@ export class UserDataSyncEnablementService extends BaseUserDataSyncEnablementSer
 
 }
 
-export class WebUserDataSyncEnablementService extends UserDataSyncEnablementService implements IUserDataSyncEnablementService {
-
-	private enabled: boolean | undefined = undefined;
-
-	override canToggleEnablement(): boolean {
-		return this.isTrusted() && super.canToggleEnablement();
-	}
-
-	override isEnabled(): boolean {
-		if (!this.isTrusted()) {
-			return false;
-		}
-		if (this.enabled === undefined) {
-			this.enabled = this.workbenchEnvironmentService.options?.settingsSyncOptions?.enabled;
-		}
-		if (this.enabled === undefined) {
-			this.enabled = super.isEnabled();
-		}
-		return this.enabled;
-	}
-
-	override setEnablement(enabled: boolean) {
-		if (enabled && !this.canToggleEnablement()) {
-			return;
-		}
-		if (this.enabled !== enabled) {
-			this.enabled = enabled;
-			super.setEnablement(enabled);
-			if (this.workbenchEnvironmentService.options?.settingsSyncOptions?.enablementHandler) {
-				this.workbenchEnvironmentService.options.settingsSyncOptions.enablementHandler(this.enabled);
-			}
-		}
-	}
-
-	override getResourceSyncStateVersion(resource: SyncResource): string | undefined {
-		return resource === SyncResource.Extensions ? this.workbenchEnvironmentService.options?.settingsSyncOptions?.extensionsSyncStateVersion : undefined;
-	}
-
-	private isTrusted(): boolean {
-		return !!this.workbenchEnvironmentService.options?.workspaceProvider?.trusted;
-	}
-
-}
+registerSingleton(IUserDataSyncEnablementService, UserDataSyncEnablementService);
diff --git a/src/vs/workbench/services/userDataSync/browser/webUserDataSyncEnablementService.ts b/src/vs/workbench/services/userDataSync/browser/webUserDataSyncEnablementService.ts
new file mode 100644
index 00000000000..1224476ffdc
--- /dev/null
+++ b/src/vs/workbench/services/userDataSync/browser/webUserDataSyncEnablementService.ts
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { IUserDataSyncEnablementService, SyncResource } from 'vs/platform/userDataSync/common/userDataSync';
+import { UserDataSyncEnablementService } from 'vs/workbench/services/userDataSync/browser/userDataSyncEnablementService';
+
+export class WebUserDataSyncEnablementService extends UserDataSyncEnablementService implements IUserDataSyncEnablementService {
+
+	private enabled: boolean | undefined = undefined;
+
+	override canToggleEnablement(): boolean {
+		return this.isTrusted() && super.canToggleEnablement();
+	}
+
+	override isEnabled(): boolean {
+		if (!this.isTrusted()) {
+			return false;
+		}
+		if (this.enabled === undefined) {
+			this.enabled = this.workbenchEnvironmentService.options?.settingsSyncOptions?.enabled;
+		}
+		if (this.enabled === undefined) {
+			this.enabled = super.isEnabled();
+		}
+		return this.enabled;
+	}
+
+	override setEnablement(enabled: boolean) {
+		if (enabled && !this.canToggleEnablement()) {
+			return;
+		}
+		if (this.enabled !== enabled) {
+			this.enabled = enabled;
+			super.setEnablement(enabled);
+			if (this.workbenchEnvironmentService.options?.settingsSyncOptions?.enablementHandler) {
+				this.workbenchEnvironmentService.options.settingsSyncOptions.enablementHandler(this.enabled);
+			}
+		}
+	}
+
+	override getResourceSyncStateVersion(resource: SyncResource): string | undefined {
+		return resource === SyncResource.Extensions ? this.workbenchEnvironmentService.options?.settingsSyncOptions?.extensionsSyncStateVersion : undefined;
+	}
+
+	private isTrusted(): boolean {
+		return !!this.workbenchEnvironmentService.options?.workspaceProvider?.trusted;
+	}
+
+}
+
+registerSingleton(IUserDataSyncEnablementService, WebUserDataSyncEnablementService);
diff --git a/src/vs/workbench/services/workingCopy/browser/workingCopyHistoryService.ts b/src/vs/workbench/services/workingCopy/browser/workingCopyHistoryService.ts
index 2ada834a567..5b620f0b1e8 100644
--- a/src/vs/workbench/services/workingCopy/browser/workingCopyHistoryService.ts
+++ b/src/vs/workbench/services/workingCopy/browser/workingCopyHistoryService.ts
@@ -3,54 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { SaveSource } from 'vs/workbench/common/editor';
-import { CancellationToken } from 'vs/base/common/cancellation';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { WorkingCopyHistoryModel, WorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/common/workingCopyHistoryService';
+import { IWorkingCopyHistoryModelOptions, WorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/common/workingCopyHistoryService';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IWorkingCopyHistoryEntry, IWorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/common/workingCopyHistory';
-
-class BrowserWorkingCopyHistoryModel extends WorkingCopyHistoryModel {
-
-	override async addEntry(source: SaveSource, timestamp: number, token: CancellationToken): Promise<IWorkingCopyHistoryEntry> {
-		const entry = await super.addEntry(source, timestamp, token);
-		if (!token.isCancellationRequested) {
-			await this.store(token); // need to store on each add because we do not have long running shutdown support in web
-		}
-
-		return entry;
-	}
-
-	override async updateEntry(entry: IWorkingCopyHistoryEntry, properties: { source: SaveSource }, token: CancellationToken): Promise<void> {
-		await super.updateEntry(entry, properties, token);
-		if (!token.isCancellationRequested) {
-			await this.store(token); // need to store on each remove because we do not have long running shutdown support in web
-		}
-	}
-
-	override async removeEntry(entry: IWorkingCopyHistoryEntry, token: CancellationToken): Promise<boolean> {
-		const removed = await super.removeEntry(entry, token);
-		if (removed && !token.isCancellationRequested) {
-			await this.store(token); // need to store on each remove because we do not have long running shutdown support in web
-		}
-
-		return removed;
-	}
-}
+import { IWorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/common/workingCopyHistory';
 
 export class BrowserWorkingCopyHistoryService extends WorkingCopyHistoryService {
 
 	constructor(
 		@IFileService fileService: IFileService,
 		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
-		@IEnvironmentService environmentService: IEnvironmentService,
+		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
 		@IUriIdentityService uriIdentityService: IUriIdentityService,
 		@ILabelService labelService: ILabelService,
 		@ILogService logService: ILogService,
@@ -59,8 +28,8 @@ export class BrowserWorkingCopyHistoryService extends WorkingCopyHistoryService
 		super(fileService, remoteAgentService, environmentService, uriIdentityService, labelService, logService, configurationService);
 	}
 
-	protected override createModel(resource: URI, historyHome: URI): WorkingCopyHistoryModel {
-		return new BrowserWorkingCopyHistoryModel(resource, historyHome, this._onDidAddEntry, this._onDidChangeEntry, this._onDidReplaceEntry, this._onDidRemoveEntry, this.fileService, this.labelService, this.logService, this.configurationService);
+	protected getModelOptions(): IWorkingCopyHistoryModelOptions {
+		return { flushOnChange: true /* because browsers support no long running shutdown */ };
 	}
 }
 
diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyHistoryService.ts b/src/vs/workbench/services/workingCopy/common/workingCopyHistoryService.ts
index 946c595596d..c38a73c7699 100644
--- a/src/vs/workbench/services/workingCopy/common/workingCopyHistoryService.ts
+++ b/src/vs/workbench/services/workingCopy/common/workingCopyHistoryService.ts
@@ -17,7 +17,7 @@ import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteA
 import { URI } from 'vs/base/common/uri';
 import { DeferredPromise, Limiter } from 'vs/base/common/async';
 import { dirname, extname, isEqual, joinPath } from 'vs/base/common/resources';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { hash } from 'vs/base/common/hash';
 import { indexOfPath, randomPath } from 'vs/base/common/extpath';
 import { CancellationToken } from 'vs/base/common/cancellation';
@@ -42,6 +42,17 @@ interface ISerializedWorkingCopyHistoryModelEntry {
 	readonly source?: SaveSource;
 }
 
+
+export interface IWorkingCopyHistoryModelOptions {
+
+	/**
+	 * Whether to flush when the model changes. If not
+	 * configured, `model.store()` has to be called
+	 * explicitly.
+	 */
+	flushOnChange: boolean;
+}
+
 export class WorkingCopyHistoryModel {
 
 	static readonly ENTRIES_FILE = 'entries.json';
@@ -74,6 +85,7 @@ export class WorkingCopyHistoryModel {
 		private readonly entryChangedEmitter: Emitter<IWorkingCopyHistoryEvent>,
 		private readonly entryReplacedEmitter: Emitter<IWorkingCopyHistoryEvent>,
 		private readonly entryRemovedEmitter: Emitter<IWorkingCopyHistoryEvent>,
+		private readonly options: IWorkingCopyHistoryModelOptions,
 		private readonly fileService: IFileService,
 		private readonly labelService: ILabelService,
 		private readonly logService: ILogService,
@@ -118,15 +130,24 @@ export class WorkingCopyHistoryModel {
 			}
 		}
 
+		let entry: IWorkingCopyHistoryEntry;
+
 		// Replace lastest entry in history
 		if (entryToReplace) {
-			return this.doReplaceEntry(entryToReplace, timestamp, token);
+			entry = await this.doReplaceEntry(entryToReplace, timestamp, token);
 		}
 
 		// Add entry to history
 		else {
-			return this.doAddEntry(source, timestamp, token);
+			entry = await this.doAddEntry(source, timestamp, token);
 		}
+
+		// Flush now if configured
+		if (this.options.flushOnChange && !token.isCancellationRequested) {
+			await this.store(token);
+		}
+
+		return entry;
 	}
 
 	private async doAddEntry(source: SaveSource, timestamp: number, token: CancellationToken): Promise<IWorkingCopyHistoryEntry> {
@@ -202,6 +223,11 @@ export class WorkingCopyHistoryModel {
 		// Events
 		this.entryRemovedEmitter.fire({ entry });
 
+		// Flush now if configured
+		if (this.options.flushOnChange && !token.isCancellationRequested) {
+			await this.store(token);
+		}
+
 		return true;
 	}
 
@@ -227,6 +253,11 @@ export class WorkingCopyHistoryModel {
 
 		// Events
 		this.entryChangedEmitter.fire({ entry });
+
+		// Flush now if configured
+		if (this.options.flushOnChange && !token.isCancellationRequested) {
+			await this.store(token);
+		}
 	}
 
 	async getEntries(): Promise<readonly IWorkingCopyHistoryEntry[]> {
@@ -516,7 +547,7 @@ export abstract class WorkingCopyHistoryService extends Disposable implements IW
 	constructor(
 		@IFileService protected readonly fileService: IFileService,
 		@IRemoteAgentService protected readonly remoteAgentService: IRemoteAgentService,
-		@IEnvironmentService protected readonly environmentService: IEnvironmentService,
+		@IWorkbenchEnvironmentService protected readonly environmentService: IWorkbenchEnvironmentService,
 		@IUriIdentityService protected readonly uriIdentityService: IUriIdentityService,
 		@ILabelService protected readonly labelService: ILabelService,
 		@ILogService protected readonly logService: ILogService,
@@ -722,16 +753,15 @@ export abstract class WorkingCopyHistoryService extends Disposable implements IW
 
 		let model = this.models.get(resource);
 		if (!model) {
-			model = this.createModel(resource, historyHome);
+			model = new WorkingCopyHistoryModel(resource, historyHome, this._onDidAddEntry, this._onDidChangeEntry, this._onDidReplaceEntry, this._onDidRemoveEntry, this.getModelOptions(), this.fileService, this.labelService, this.logService, this.configurationService);
 			this.models.set(resource, model);
 		}
 
 		return model;
 	}
 
-	protected createModel(resource: URI, historyHome: URI): WorkingCopyHistoryModel {
-		return new WorkingCopyHistoryModel(resource, historyHome, this._onDidAddEntry, this._onDidChangeEntry, this._onDidReplaceEntry, this._onDidRemoveEntry, this.fileService, this.labelService, this.logService, this.configurationService);
-	}
+	protected abstract getModelOptions(): IWorkingCopyHistoryModelOptions;
+
 }
 
 // Register History Tracker
diff --git a/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyHistoryService.ts b/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyHistoryService.ts
index 36aae715453..a252865a59a 100644
--- a/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyHistoryService.ts
+++ b/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyHistoryService.ts
@@ -7,21 +7,23 @@ import { Limiter } from 'vs/base/common/async';
 import { ILifecycleService, WillShutdownEvent } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { WorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/common/workingCopyHistoryService';
+import { IWorkingCopyHistoryModelOptions, WorkingCopyHistoryService } from 'vs/workbench/services/workingCopy/common/workingCopyHistoryService';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IWorkingCopyHistoryService, MAX_PARALLEL_HISTORY_IO_OPS } from 'vs/workbench/services/workingCopy/common/workingCopyHistory';
 
 export class NativeWorkingCopyHistoryService extends WorkingCopyHistoryService {
 
+	private readonly isRemotelyStored = typeof this.environmentService.remoteAuthority === 'string';
+
 	constructor(
 		@IFileService fileService: IFileService,
 		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
-		@IEnvironmentService environmentService: IEnvironmentService,
+		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
 		@IUriIdentityService uriIdentityService: IUriIdentityService,
 		@ILabelService labelService: ILabelService,
 		@ILifecycleService private readonly lifecycleService: ILifecycleService,
@@ -30,7 +32,14 @@ export class NativeWorkingCopyHistoryService extends WorkingCopyHistoryService {
 	) {
 		super(fileService, remoteAgentService, environmentService, uriIdentityService, labelService, logService, configurationService);
 
-		this.lifecycleService.onWillShutdown(e => this.onWillShutdown(e));
+		// When local, delay the flushing until shutdown
+		if (!this.isRemotelyStored) {
+			this.lifecycleService.onWillShutdown(e => this.onWillShutdown(e));
+		}
+	}
+
+	protected getModelOptions(): IWorkingCopyHistoryModelOptions {
+		return { flushOnChange: this.isRemotelyStored /* because the connection might drop anytime */ };
 	}
 
 	private onWillShutdown(e: WillShutdownEvent): void {
diff --git a/src/vs/workbench/test/browser/workbenchTestServices.ts b/src/vs/workbench/test/browser/workbenchTestServices.ts
index fbd98039411..3dcb9b71147 100644
--- a/src/vs/workbench/test/browser/workbenchTestServices.ts
+++ b/src/vs/workbench/test/browser/workbenchTestServices.ts
@@ -865,7 +865,7 @@ export class TestEditorGroupView implements IEditorGroupView {
 	copyEditors(_editors: EditorInputWithOptions[], _target: IEditorGroup): void { }
 	async closeEditor(_editor?: EditorInput, options?: ICloseEditorOptions): Promise<boolean> { return true; }
 	async closeEditors(_editors: EditorInput[] | ICloseEditorsFilter, options?: ICloseEditorOptions): Promise<boolean> { return true; }
-	async closeAllEditors(options?: ICloseAllEditorsOptions): Promise<void> { }
+	async closeAllEditors(options?: ICloseAllEditorsOptions): Promise<boolean> { return true; }
 	async replaceEditors(_editors: IEditorReplacement[]): Promise<void> { }
 	pinEditor(_editor?: EditorInput): void { }
 	stickEditor(editor?: EditorInput | undefined): void { }
diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts
index dfc2bcadef0..295189cbf37 100644
--- a/src/vs/workbench/workbench.common.main.ts
+++ b/src/vs/workbench/workbench.common.main.ts
@@ -336,4 +336,7 @@ import 'vs/workbench/contrib/list/browser/list.contribution';
 // Audio Cues
 import 'vs/workbench/contrib/audioCues/browser/audioCues.contribution';
 
+// Drop into editor
+import 'vs/workbench/contrib/dropIntoEditor/browser/dropIntoEditor.contibution';
+
 //#endregion
diff --git a/src/vs/workbench/workbench.sandbox.main.ts b/src/vs/workbench/workbench.sandbox.main.ts
index 2150dd3f14b..87f933f5fe0 100644
--- a/src/vs/workbench/workbench.sandbox.main.ts
+++ b/src/vs/workbench/workbench.sandbox.main.ts
@@ -81,14 +81,12 @@ import 'vs/platform/telemetry/electron-sandbox/customEndpointTelemetryService';
 import 'vs/workbench/services/files/electron-sandbox/elevatedFileService';
 import 'vs/workbench/services/search/electron-sandbox/searchService';
 import 'vs/workbench/services/workingCopy/electron-sandbox/workingCopyHistoryService';
+import 'vs/workbench/services/userDataSync/browser/userDataSyncEnablementService';
 
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IUserDataInitializationService, UserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit';
-import { IUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
-import { UserDataSyncEnablementService } from 'vs/workbench/services/userDataSync/browser/userDataSyncEnablementService';
 
 registerSingleton(IUserDataInitializationService, UserDataInitializationService);
-registerSingleton(IUserDataSyncEnablementService, UserDataSyncEnablementService);
 
 //#endregion
 
diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts
index cb8ee5c4ce7..b4b1806ff41 100644
--- a/src/vs/workbench/workbench.web.main.ts
+++ b/src/vs/workbench/workbench.web.main.ts
@@ -60,6 +60,8 @@ import 'vs/workbench/services/workingCopy/browser/workingCopyBackupService';
 import 'vs/workbench/services/tunnel/browser/tunnelService';
 import 'vs/workbench/services/files/browser/elevatedFileService';
 import 'vs/workbench/services/workingCopy/browser/workingCopyHistoryService';
+import 'vs/workbench/services/userDataSync/browser/webUserDataSyncEnablementService';
+import 'vs/workbench/services/configurationResolver/browser/configurationResolverService';
 
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
@@ -72,7 +74,7 @@ import { ExtensionManagementService } from 'vs/workbench/services/extensionManag
 import { ILoggerService, LogLevel } from 'vs/platform/log/common/log';
 import { FileLoggerService } from 'vs/platform/log/common/fileLog';
 import { UserDataSyncMachinesService, IUserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines';
-import { IUserDataSyncStoreService, IUserDataSyncService, IUserDataAutoSyncService, IUserDataSyncBackupStoreService, IUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
+import { IUserDataSyncStoreService, IUserDataSyncService, IUserDataAutoSyncService, IUserDataSyncBackupStoreService } from 'vs/platform/userDataSync/common/userDataSync';
 import { UserDataSyncStoreService } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
 import { UserDataSyncBackupStoreService } from 'vs/platform/userDataSync/common/userDataSyncBackupStoreService';
 import { UserDataSyncService } from 'vs/platform/userDataSync/common/userDataSyncService';
@@ -84,12 +86,8 @@ import { NullEndpointTelemetryService } from 'vs/platform/telemetry/common/telem
 import { ITitleService } from 'vs/workbench/services/title/common/titleService';
 import { TitlebarPart } from 'vs/workbench/browser/parts/titlebar/titlebarPart';
 import { ITimerService, TimerService } from 'vs/workbench/services/timer/browser/timerService';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { ConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/configurationResolverService';
 import { IDiagnosticsService, NullDiagnosticsService } from 'vs/platform/diagnostics/common/diagnostics';
-import { WebUserDataSyncEnablementService } from 'vs/workbench/services/userDataSync/browser/userDataSyncEnablementService';
 
-registerSingleton(IUserDataSyncEnablementService, WebUserDataSyncEnablementService);
 registerSingleton(IWorkbenchExtensionManagementService, ExtensionManagementService);
 registerSingleton(IAccessibilityService, AccessibilityService, true);
 registerSingleton(IContextMenuService, ContextMenuService);
@@ -103,7 +101,6 @@ registerSingleton(IUserDataAutoSyncService, UserDataAutoSyncService);
 registerSingleton(ITitleService, TitlebarPart);
 registerSingleton(IExtensionTipsService, ExtensionTipsService);
 registerSingleton(ITimerService, TimerService);
-registerSingleton(IConfigurationResolverService, ConfigurationResolverService, true);
 registerSingleton(ICustomEndpointTelemetryService, NullEndpointTelemetryService, true);
 registerSingleton(IDiagnosticsService, NullDiagnosticsService, true);
 
diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts
index 34c0b1e1a50..d99d78c8c89 100644
--- a/src/vscode-dts/vscode.d.ts
+++ b/src/vscode-dts/vscode.d.ts
@@ -3530,7 +3530,7 @@ declare module 'vscode' {
 		 * value starting at 1.
 		 * @return This snippet string.
 		 */
-		appendChoice(values: string[], number?: number): SnippetString;
+		appendChoice(values: readonly string[], number?: number): SnippetString;
 
 		/**
 		 * Builder-function that appends a variable (`${VAR}`) to
@@ -3568,7 +3568,7 @@ declare module 'vscode' {
 		 * be a range or a range and a placeholder text. The placeholder text should be the identifier of the symbol
 		 * which is being renamed - when omitted the text in the returned range is used.
 		 *
-		 * *Note: * This function should throw an error or return a rejected thenable when the provided location
+		 * *Note:* This function should throw an error or return a rejected thenable when the provided location
 		 * doesn't allow for a rename.
 		 *
 		 * @param document The document in which rename will be invoked.
@@ -3622,7 +3622,7 @@ declare module 'vscode' {
 		 * @param tokenType The token type.
 		 * @param tokenModifiers The token modifiers.
 		 */
-		push(range: Range, tokenType: string, tokenModifiers?: string[]): void;
+		push(range: Range, tokenType: string, tokenModifiers?: readonly string[]): void;
 
 		/**
 		 * Finish and create a `SemanticTokens` instance.
@@ -4893,7 +4893,7 @@ declare module 'vscode' {
 		 * @return Selection ranges or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined` or `null`.
 		 */
-		provideSelectionRanges(document: TextDocument, positions: Position[], token: CancellationToken): ProviderResult<SelectionRange[]>;
+		provideSelectionRanges(document: TextDocument, positions: readonly Position[], token: CancellationToken): ProviderResult<SelectionRange[]>;
 	}
 
 	/**
@@ -9522,7 +9522,7 @@ declare module 'vscode' {
 		 * @return A new Terminal.
 		 * @throws When running in an environment where a new process cannot be started.
 		 */
-		export function createTerminal(name?: string, shellPath?: string, shellArgs?: string[] | string): Terminal;
+		export function createTerminal(name?: string, shellPath?: string, shellArgs?: readonly string[] | string): Terminal;
 
 		/**
 		 * Creates a {@link Terminal} with a backing shell process.
@@ -9830,7 +9830,7 @@ declare module 'vscode' {
 		 *
 		 * Note that mime types that cannot be sent to the extension will be omitted.
 		 */
-		readonly dropMimeTypes: string[];
+		readonly dropMimeTypes: readonly string[];
 
 		/**
 		 * The mime types that the {@link TreeDragAndDropController.handleDrag `handleDrag`} method of this `TreeDragAndDropController` may add to the tree data transfer.
@@ -9838,7 +9838,7 @@ declare module 'vscode' {
 		 *
 		 * The recommended mime type of the tree (`application/vnd.code.tree.<treeidlowercase>`) will be automatically added.
 		 */
-		readonly dragMimeTypes: string[];
+		readonly dragMimeTypes: readonly string[];
 
 		/**
 		 * When the user starts dragging items from this `DragAndDropController`, `handleDrag` will be called.
@@ -9856,7 +9856,7 @@ declare module 'vscode' {
 		 * @param dataTransfer The data transfer associated with this drag.
 		 * @param token A cancellation token indicating that drag has been cancelled.
 		 */
-		handleDrag?(source: T[], dataTransfer: DataTransfer, token: CancellationToken): Thenable<void> | void;
+		handleDrag?(source: readonly T[], dataTransfer: DataTransfer, token: CancellationToken): Thenable<void> | void;
 
 		/**
 		 * Called when a drag and drop action results in a drop on the tree that this `DragAndDropController` belongs to.
@@ -11000,7 +11000,7 @@ declare module 'vscode' {
 		 *
 		 * @param thenable A thenable that resolves to {@link TextEdit pre-save-edits}.
 		 */
-		waitUntil(thenable: Thenable<TextEdit[]>): void;
+		waitUntil(thenable: Thenable<readonly TextEdit[]>): void;
 
 		/**
 		 * Allows to pause the event loop until the provided thenable resolved.
@@ -13114,7 +13114,7 @@ declare module 'vscode' {
 		 * this execution.
 		 * @return A thenable that resolves when the operation finished.
 		 */
-		replaceOutput(out: NotebookCellOutput | NotebookCellOutput[], cell?: NotebookCell): Thenable<void>;
+		replaceOutput(out: NotebookCellOutput | readonly NotebookCellOutput[], cell?: NotebookCell): Thenable<void>;
 
 		/**
 		 * Append to the output of the cell that is executing or to another cell that is affected by this execution.
@@ -13124,7 +13124,7 @@ declare module 'vscode' {
 		 * this execution.
 		 * @return A thenable that resolves when the operation finished.
 		 */
-		appendOutput(out: NotebookCellOutput | NotebookCellOutput[], cell?: NotebookCell): Thenable<void>;
+		appendOutput(out: NotebookCellOutput | readonly NotebookCellOutput[], cell?: NotebookCell): Thenable<void>;
 
 		/**
 		 * Replace all output items of existing cell output.
@@ -13133,7 +13133,7 @@ declare module 'vscode' {
 		 * @param output Output object that already exists.
 		 * @return A thenable that resolves when the operation finished.
 		 */
-		replaceOutputItems(items: NotebookCellOutputItem | NotebookCellOutputItem[], output: NotebookCellOutput): Thenable<void>;
+		replaceOutputItems(items: NotebookCellOutputItem | readonly NotebookCellOutputItem[], output: NotebookCellOutput): Thenable<void>;
 
 		/**
 		 * Append output items to existing cell output.
@@ -13142,7 +13142,7 @@ declare module 'vscode' {
 		 * @param output Output object that already exists.
 		 * @return A thenable that resolves when the operation finished.
 		 */
-		appendOutputItems(items: NotebookCellOutputItem | NotebookCellOutputItem[], output: NotebookCellOutput): Thenable<void>;
+		appendOutputItems(items: NotebookCellOutputItem | readonly NotebookCellOutputItem[], output: NotebookCellOutput): Thenable<void>;
 	}
 
 	/**
diff --git a/src/vscode-dts/vscode.proposed.commentsResolvedState.d.ts b/src/vscode-dts/vscode.proposed.commentsResolvedState.d.ts
index 837a3699ce8..53e2d1e2a09 100644
--- a/src/vscode-dts/vscode.proposed.commentsResolvedState.d.ts
+++ b/src/vscode-dts/vscode.proposed.commentsResolvedState.d.ts
@@ -12,6 +12,7 @@ declare module 'vscode' {
 		Resolved = 1
 	}
 
+	// TODO@API doc
 	export interface CommentThread {
 		state?: CommentThreadState;
 	}
diff --git a/src/vscode-dts/vscode.proposed.inlineCompletionsNew.d.ts b/src/vscode-dts/vscode.proposed.inlineCompletionsNew.d.ts
index 7855c4b4ea4..200b7ebda04 100644
--- a/src/vscode-dts/vscode.proposed.inlineCompletionsNew.d.ts
+++ b/src/vscode-dts/vscode.proposed.inlineCompletionsNew.d.ts
@@ -9,16 +9,24 @@ declare module 'vscode' {
 	// Temporary API to allow for safe migration.
 
 	export namespace languages {
+
 		/**
 		 * Registers an inline completion provider.
 		 *
-		 *  @return A {@link Disposable} that unregisters this provider when being disposed.
+		 * Multiple providers can be registered for a language. In that case providers are asked in
+		 * parallel and the results are merged. A failing provider (rejected promise or exception) will
+		 * not cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A inline completion provider.
+		 * @return A {@link Disposable} that unregisters this provider when being disposed.
 		 */
-		// TODO@API what are the rules when multiple providers apply
 		export function registerInlineCompletionItemProviderNew(selector: DocumentSelector, provider: InlineCompletionItemProviderNew): Disposable;
 	}
 
+	// TODO@API doc
 	export interface InlineCompletionItemProviderNew {
+
 		/**
 		 * Provides inline completion items for the given position and document.
 		 * If inline completions are enabled, this method will be called whenever the user stopped typing.
@@ -28,6 +36,7 @@ declare module 'vscode' {
 		provideInlineCompletionItems(document: TextDocument, position: Position, context: InlineCompletionContextNew, token: CancellationToken): ProviderResult<InlineCompletionListNew | InlineCompletionItemNew[]>;
 	}
 
+	// TODO@API doc
 	export interface InlineCompletionContextNew {
 		/**
 		 * How the completion was triggered.
@@ -50,6 +59,7 @@ declare module 'vscode' {
 	}
 
 	// TODO@API find a better name, xyzFilter, xyzConstraint
+	// TODO@API doc
 	export interface SelectedCompletionInfoNew {
 		range: Range;
 		text: string;
@@ -72,17 +82,14 @@ declare module 'vscode' {
 		Automatic = 1,
 	}
 
-	/**
-	 * @deprecated Return an array of Inline Completion items directly. Will be removed eventually.
-	*/
-	// TODO@API We could keep this and allow for `vscode.Command` instances that explain
-	// the result. That would replace the existing proposed menu-identifier and be more LSP friendly
-	// TODO@API maybe use MarkdownString
+	// TODO@API doc
 	export class InlineCompletionListNew {
 		items: InlineCompletionItemNew[];
 
-		// command: Command; "Show More..."
-
+		// TODO@API We could keep this and allow for `vscode.Command` instances that explain
+		// the result. That would replace the existing proposed menu-identifier and be more LSP friendly
+		// TODO@API maybe use MarkdownString
+		// commands?: Command[];  // "Show More..."
 		// description: MarkdownString
 
 		/**
@@ -126,7 +133,7 @@ declare module 'vscode' {
 		 */
 		command?: Command;
 
-		// TODO@API insertText -> string | SnippetString
-		constructor(insertText: string, range?: Range, command?: Command);
+		// TODO@API doc
+		constructor(insertText: string | SnippetString, range?: Range, command?: Command);
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.inputBoxSeverity.d.ts b/src/vscode-dts/vscode.proposed.inputBoxSeverity.d.ts
index aca62dc70ba..ceb932ecdc6 100644
--- a/src/vscode-dts/vscode.proposed.inputBoxSeverity.d.ts
+++ b/src/vscode-dts/vscode.proposed.inputBoxSeverity.d.ts
@@ -17,6 +17,7 @@ declare module 'vscode' {
 		/**
 		 * The validation message to display. This will become the new {@link InputBoxOptions#validateInput} upon finalization.
 		 */
+		// TODO@API consider to extract InputBoxValidationMessage
 		validateInput2?(value: string): string | { content: string; severity: InputBoxValidationSeverity } | undefined | null |
 			Thenable<string | { content: string; severity: InputBoxValidationSeverity } | undefined | null>;
 	}
diff --git a/src/vscode-dts/vscode.proposed.notebookConcatTextDocument.d.ts b/src/vscode-dts/vscode.proposed.notebookConcatTextDocument.d.ts
index 1350d276088..259708cbe8e 100644
--- a/src/vscode-dts/vscode.proposed.notebookConcatTextDocument.d.ts
+++ b/src/vscode-dts/vscode.proposed.notebookConcatTextDocument.d.ts
@@ -15,22 +15,36 @@ declare module 'vscode' {
 		export function createConcatTextDocument(notebook: NotebookDocument, selector?: DocumentSelector): NotebookConcatTextDocument;
 	}
 
+	/** @deprecated */
 	export interface NotebookConcatTextDocument {
+		/** @deprecated */
 		readonly uri: Uri;
+		/** @deprecated */
 		readonly isClosed: boolean;
+		/** @deprecated */
 		dispose(): void;
+		/** @deprecated */
 		readonly onDidChange: Event<void>;
+		/** @deprecated */
 		readonly version: number;
+		/** @deprecated */
 		getText(): string;
+		/** @deprecated */
 		getText(range: Range): string;
 
 		offsetAt(position: Position): number;
+		/** @deprecated */
 		positionAt(offset: number): Position;
+		/** @deprecated */
 		validateRange(range: Range): Range;
+		/** @deprecated */
 		validatePosition(position: Position): Position;
 
+		/** @deprecated */
 		locationAt(positionOrRange: Position | Range): Location;
+		/** @deprecated */
 		positionAt(location: Location): Position;
+		/** @deprecated */
 		contains(uri: Uri): boolean;
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.notebookEditor.d.ts b/src/vscode-dts/vscode.proposed.notebookEditor.d.ts
index 824d3ed5fee..57e8d0e2706 100644
--- a/src/vscode-dts/vscode.proposed.notebookEditor.d.ts
+++ b/src/vscode-dts/vscode.proposed.notebookEditor.d.ts
@@ -48,12 +48,12 @@ declare module 'vscode' {
 		 *
 		 * The primary selection (or focused range) is `selections[0]`. When the document has no cells, the primary selection is empty `{ start: 0, end: 0 }`;
 		 */
-		selections: NotebookRange[];
+		selections: readonly NotebookRange[];
 
 		/**
 		 * The current visible ranges in the editor (vertically).
 		 */
-		readonly visibleRanges: NotebookRange[];
+		readonly visibleRanges: readonly NotebookRange[];
 
 		/**
 		 * Scroll as indicated by `revealType` in order to reveal the given range.
@@ -74,7 +74,7 @@ declare module 'vscode' {
 		 * The {@link NotebookEditor notebook editor} for which the selections have changed.
 		 */
 		readonly notebookEditor: NotebookEditor;
-		readonly selections: ReadonlyArray<NotebookRange>;
+		readonly selections: readonly NotebookRange[];
 	}
 
 	export interface NotebookEditorVisibleRangesChangeEvent {
@@ -82,19 +82,19 @@ declare module 'vscode' {
 		 * The {@link NotebookEditor notebook editor} for which the visible ranges have changed.
 		 */
 		readonly notebookEditor: NotebookEditor;
-		readonly visibleRanges: ReadonlyArray<NotebookRange>;
+		readonly visibleRanges: readonly NotebookRange[];
 	}
 
 	export interface NotebookDocumentShowOptions {
-		viewColumn?: ViewColumn;
-		preserveFocus?: boolean;
-		preview?: boolean;
-		selections?: NotebookRange[];
+		readonly viewColumn?: ViewColumn;
+		readonly preserveFocus?: boolean;
+		readonly preview?: boolean;
+		readonly selections?: readonly NotebookRange[];
 	}
 
 	export namespace window {
-		export const visibleNotebookEditors: NotebookEditor[];
-		export const onDidChangeVisibleNotebookEditors: Event<NotebookEditor[]>;
+		export const visibleNotebookEditors: readonly NotebookEditor[];
+		export const onDidChangeVisibleNotebookEditors: Event<readonly NotebookEditor[]>;
 		export const activeNotebookEditor: NotebookEditor | undefined;
 		export const onDidChangeActiveNotebookEditor: Event<NotebookEditor | undefined>;
 		export const onDidChangeNotebookEditorSelection: Event<NotebookEditorSelectionChangeEvent>;
diff --git a/src/vscode-dts/vscode.proposed.tabs.d.ts b/src/vscode-dts/vscode.proposed.tabs.d.ts
index 91ba6ade9ce..102c643497e 100644
--- a/src/vscode-dts/vscode.proposed.tabs.d.ts
+++ b/src/vscode-dts/vscode.proposed.tabs.d.ts
@@ -7,23 +7,54 @@ declare module 'vscode' {
 
 	// https://github.com/Microsoft/vscode/issues/15178
 
+	// TODO@API name alternatives for TabKind: TabInput, TabOptions,
+
+
+	/**
+	 * The tab represents a single text based resource
+	 */
 	export class TabKindText {
+		/**
+		 * The uri represented by the tab.
+		 */
 		readonly uri: Uri;
 		constructor(uri: Uri);
 	}
 
+	/**
+	 * The tab represents two text based resources
+	 * being rendered as a diff.
+	 */
 	export class TabKindTextDiff {
+		/**
+		 * The uri of the original text resource.
+		 */
 		readonly original: Uri;
+		/**
+		 * The uri of the modified text resource.
+		 */
 		readonly modified: Uri;
 		constructor(original: Uri, modified: Uri);
 	}
 
+	/**
+	 * The tab represents a custom editor.
+	 */
 	export class TabKindCustom {
+		/**
+		 * The uri which the tab is representing.
+		 */
 		readonly uri: Uri;
+		/**
+		 * The type of custom editor.
+		 */
 		readonly viewType: string;
 		constructor(uri: Uri, viewType: string);
 	}
 
+	/**
+	 * The tab represents a webview.
+	 */
 	export class TabKindWebview {
 		/**
 		 * The type of webview. Maps to {@linkcode WebviewPanel.viewType WebviewPanel's viewType}
@@ -32,25 +63,48 @@ declare module 'vscode' {
 		constructor(viewType: string);
 	}
 
+	/**
+	 * The tab represents a notebook.
+	 */
 	export class TabKindNotebook {
+		/**
+		 * The uri which the tab is representing.
+		 */
 		readonly uri: Uri;
+		/**
+		 * The type of notebook. Maps to {@linkcode NotebookDocument.notebookType NotebookDocuments's notebookType}
+		 */
 		readonly notebookType: string;
 		constructor(uri: Uri, notebookType: string);
 	}
 
+	/**
+	 * The tabs represents two notebooks in a diff configuration.
+	 */
 	export class TabKindNotebookDiff {
+		/**
+		 * The uri of the original notebook.
+		 */
 		readonly original: Uri;
+		/**
+		 * The uri of the modified notebook.
+		 */
 		readonly modified: Uri;
 		readonly notebookType: string;
 		constructor(original: Uri, modified: Uri, notebookType: string);
 	}
 
+	/**
+	 * The tab represents a terminal in the editor area.
+	 */
 	export class TabKindTerminal {
 		constructor();
 	}
 
 	/**
-	 * Represents a tab within the window
+	 * Represents a tab within a {@link TabGroup group of tabs}.
+	 * Tabs are merely the graphical representation within the editor area.
+	 * A backing editor is not a guarantee.
 	 */
 	export interface Tab {
 
@@ -99,6 +153,12 @@ declare module 'vscode' {
 		export const tabGroups: TabGroups;
 	}
 
+	export interface TabChangeEvent {
+		readonly added: readonly Tab[];
+		readonly removed: readonly Tab[];
+		readonly changed: readonly Tab[];
+	}
+
 	export interface TabGroup {
 		/**
 		 * Whether or not the group is currently active
@@ -127,49 +187,44 @@ declare module 'vscode' {
 		/**
 		 * All the groups within the group container
 		 */
-		readonly groups: readonly TabGroup[];
+		readonly all: readonly TabGroup[];
 
 		/**
 		 * The currently active group
 		 */
-		// TOD@API name: maybe `activeGroup` to align with `groups` (which isn't tabGroups)
+		// TODO@API name: maybe `activeGroup` to align with `groups` (which isn't tabGroups)
 		readonly activeTabGroup: TabGroup;
 
 		/**
 		 * An {@link Event event} which fires when {@link TabGroup tab groups} has changed.
 		 */
-		readonly onDidChangeTabGroups: Event<TabGroup[]>;
+		// TODO@API maybe `onDidChangeGroups`
+		readonly onDidChangeTabGroups: Event<readonly TabGroup[]>;
 
 		/**
 		 * An {@link Event event} which fires when a {@link Tab tabs} have changed.
 		 */
-		readonly onDidChangeTabs: Event<Tab[]>;
-
-		/**
-		 * An {@link Event} which fires when an active tab changes.
-		 * Similar to {@link TabGroup.onDidChangeTabs} but only on tabs
-		 * with isActive equal to true.
-		 */
-		readonly onDidChangeActiveTab: Event<Tab>;
-
-		/**
-		 * An {@link Event} which fires when the active group changes.
-		 * This does not fire when the properties within the group change.
-		 */
-		readonly onDidChangeActiveTabGroup: Event<TabGroup>;
+		readonly onDidChangeTabs: Event<TabChangeEvent>;
 
 		/**
 		 * Closes the tab. This makes the tab object invalid and the tab
 		 * should no longer be used for further actions.
 		 * Note: In the case of a dirty tab, a confirmation dialog will be shown which may be cancelled. If cancelled the tab is still valid
-		 * @param tab The tab to close, must be reference equal to a tab given by the API
+		 *
+		 * @param tab The tab to close.
 		 * @param preserveFocus When `true` focus will remain in its current position. If `false` it will jump to the next tab.
-		 * @returns A promise that resolves true when then tab is closed. Otherwise it will return false.
-		 * If false is returned the tab is still valid.
+		 * @returns A promise that resolves to `true` when all tabs have been closed
 		 */
-		close(tab: Tab | Tab[], preserveFocus?: boolean): Thenable<boolean>;
-		// TODO@API support to close "all"
-		// close(tab: TabGroup | TabGroup[], preserveFocus?: boolean): Thenable<boolean>;
+		close(tab: Tab | readonly Tab[], preserveFocus?: boolean): Thenable<boolean>;
+
+		/**
+		 * Closes the tab group. This makes the tab group object invalid and the tab group
+		 * should no longer be used for furhter actions.
+		 * @param tabGroup The tab group to close.
+		 * @param preserveFocus When `true` focus will remain in its current position.
+		 * @returns A promise that resolves to `true` when all tab groups have been closed
+		 */
+		close(tabGroup: TabGroup | readonly TabGroup[], preserveFocus?: boolean): Thenable<boolean>;
 
 		/**
 		 * Moves a tab to the given index within the column.
@@ -182,7 +237,7 @@ declare module 'vscode' {
 		 */
 		// TODO@API support TabGroup in addition to ViewColumn
 		// TODO@API support just index for moving inside current group
-		// TODO@API move a tag group
+		// TODO@API move a tab group
 		move(tab: Tab, viewColumn: ViewColumn, index: number, preserveFocus?: boolean): Thenable<void>;
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.textEditorDrop.d.ts b/src/vscode-dts/vscode.proposed.textEditorDrop.d.ts
index efddb06d421..f0ea3649a82 100644
--- a/src/vscode-dts/vscode.proposed.textEditorDrop.d.ts
+++ b/src/vscode-dts/vscode.proposed.textEditorDrop.d.ts
@@ -13,53 +13,35 @@ declare module 'vscode' {
 		constructor(range: Range, snippet: SnippetString);
 	}
 
-
-	export interface TextEditorDropEvent {
+	/**
+	 * Provider which handles dropping of resources into a text editor.
+	 *
+	 * The user can drop into a text editor by holding down `shift` while dragging. Requires `workbench.editor.dropIntoEditor.enabled` to be on.
+	 */
+	export interface DocumentOnDropProvider {
 		/**
-		 * The {@link TextEditor} the resource was dropped onto.
-		 */
-		readonly editor: TextEditor;
-
-		/**
-		 * The position in the file where the drop occurred
-		 */
-		readonly position: Position;
-
-		/**
-		 *  The {@link DataTransfer data transfer} associated with this drop.
-		 */
-		readonly dataTransfer: DataTransfer;
-
-		/**
-		 * Allows to pause the event to delay apply the drop.
+		 * Provide edits which inserts the content being dragged and dropped into the document.
 		 *
-		 * *Note:* This function can only be called during event dispatch and not
-		 * in an asynchronous manner:
+		 * @param document The document in which the drop occurred.
+		 * @param position The position in the document where the drop occurred.
+		 * @param dataTransfer A {@link DataTransfer} object that holds data about what is being dragged and dropped.
+		 * @param token A cancellation token.
 		 *
-		 * ```ts
-		 * workspace.onWillDropOnTextEditor(event => {
-		 * 	// async, will *throw* an error
-		 * 	setTimeout(() => event.waitUntil(promise));
-		 *
-		 * 	// sync, OK
-		 * 	event.waitUntil(promise);
-		 * })
-		 * ```
-		 *
-		 * @param thenable A thenable that delays saving.
+		 * @return A {@link SnippetTextEdit} or a thenable that resolves to such. The lack of a result can be
+		 * signaled by returning `undefined` or `null`.
 		 */
-		waitUntil(thenable: Thenable<any>): void;
-
-		//
-		waitUntil(thenable: Thenable<SnippetTextEdit>): void;
-
-		token: CancellationToken;
+		provideDocumentOnDropEdits(document: TextDocument, position: Position, dataTransfer: DataTransfer, token: CancellationToken): ProviderResult<SnippetTextEdit>;
 	}
 
-	export namespace workspace {
+	export namespace languages {
 		/**
-		 * Event fired when the user drops a resource into a text editor.
+		 * Registers a new {@link DocumentOnDropProvider}.
+		 *
+		 * @param selector A selector that defines the documents this provider applies to.
+		 * @param provider A drop provider.
+		 *
+		 * @return A {@link Disposable} that unregisters this provider when disposed of.
 		 */
-		export const onWillDropOnTextEditor: Event<TextEditorDropEvent>;
+		export function registerDocumentOnDropProvider(selector: DocumentSelector, provider: DocumentOnDropProvider): Disposable;
 	}
 }
diff --git a/test/automation/src/application.ts b/test/automation/src/application.ts
index 15b7fbd9a92..23c9e630ea2 100644
--- a/test/automation/src/application.ts
+++ b/test/automation/src/application.ts
@@ -5,7 +5,8 @@
 
 import { Workbench } from './workbench';
 import { Code, launch, LaunchOptions } from './code';
-import { Logger } from './logger';
+import { Logger, measureAndLog } from './logger';
+import { PlaywrightDriver } from './playwrightDriver';
 
 export const enum Quality {
 	Dev,
@@ -21,11 +22,7 @@ export interface ApplicationOptions extends LaunchOptions {
 
 export class Application {
 
-	private static INSTANCES = 0;
-
 	constructor(private options: ApplicationOptions) {
-		Application.INSTANCES++;
-
 		this._userDataPath = options.userDataDir;
 		this._workspacePathOrFolder = options.workspacePath;
 	}
@@ -52,6 +49,10 @@ export class Application {
 		return !!this.options.web;
 	}
 
+	get legacy(): boolean {
+		return !!this.options.legacy;
+	}
+
 	private _workspacePathOrFolder: string;
 	get workspacePathOrFolder(): string {
 		return this._workspacePathOrFolder;
@@ -66,37 +67,27 @@ export class Application {
 		return this._userDataPath;
 	}
 
-	async start(): Promise<any> {
+	async start(): Promise<void> {
 		await this._start();
 		await this.code.waitForElement('.explorer-folders-view');
 	}
 
-	async restart(options?: { workspaceOrFolder?: string; extraArgs?: string[] }): Promise<any> {
+	async restart(options?: { workspaceOrFolder?: string; extraArgs?: string[] }): Promise<void> {
 		await this.stop();
 		await this._start(options?.workspaceOrFolder, options?.extraArgs);
 	}
 
-	private async _start(workspaceOrFolder = this.workspacePathOrFolder, extraArgs: string[] = []): Promise<any> {
+	private async _start(workspaceOrFolder = this.workspacePathOrFolder, extraArgs: string[] = []): Promise<void> {
 		this._workspacePathOrFolder = workspaceOrFolder;
 
 		// Launch Code...
 		const code = await this.startApplication(extraArgs);
 
 		// ...and make sure the window is ready to interact
-		const windowReady = this.checkWindowReady(code);
-
-		// Make sure to take a screenshot if waiting for window ready
-		// takes unusually long to help diagnose issues when Code does
-		// not seem to startup healthy.
-		const timeoutHandle = setTimeout(() => this.takeScreenshot(`checkWindowReady_instance_${Application.INSTANCES}`), 20000);
-		try {
-			await windowReady;
-		} finally {
-			clearTimeout(timeoutHandle);
-		}
+		await measureAndLog(this.checkWindowReady(code), 'Application#checkWindowReady()', this.logger);
 	}
 
-	async stop(): Promise<any> {
+	async stop(): Promise<void> {
 		if (this._code) {
 			try {
 				await this._code.exit();
@@ -114,15 +105,6 @@ export class Application {
 		await this._code?.stopTracing(name, persist);
 	}
 
-	private async takeScreenshot(name: string): Promise<void> {
-		if (this.web) {
-			return; // supported only on desktop
-		}
-
-		// Desktop: call `stopTracing` to take a screenshot
-		return this._code?.stopTracing(name, true);
-	}
-
 	private async startApplication(extraArgs: string[] = []): Promise<Code> {
 		const code = this._code = await launch({
 			...this.options,
@@ -134,16 +116,18 @@ export class Application {
 		return code;
 	}
 
-	private async checkWindowReady(code: Code): Promise<any> {
-		this.logger.log('checkWindowReady: begin');
+	private async checkWindowReady(code: Code): Promise<void> {
 
+		// This is legacy and will be removed when our old driver removes
 		await code.waitForWindowIds(ids => ids.length > 0);
-		await code.waitForElement('.monaco-workbench');
+
+		// We need a rendered workbench
+		await this.checkWorkbenchReady(code);
 
 		// Remote but not web: wait for a remote connection state change
 		if (this.remote) {
-			await code.waitForTextContent('.monaco-workbench .statusbar-item[id="status.host"]', undefined, s => {
-				this.logger.log(`checkWindowReady: remote indicator text is ${s}`);
+			await measureAndLog(code.waitForTextContent('.monaco-workbench .statusbar-item[id="status.host"]', undefined, statusHostLabel => {
+				this.logger.log(`checkWindowReady: remote indicator text is ${statusHostLabel}`);
 
 				// The absence of "Opening Remote" is not a strict
 				// indicator for a successful connection, but we
@@ -153,10 +137,32 @@ export class Application {
 				// diagnose this. As such, as soon as the connection
 				// state changes away from the "Opening Remote..." one
 				// we return.
-				return !s.includes('Opening Remote');
-			}, 300 /* = 30s of retry */);
+				return !statusHostLabel.includes('Opening Remote');
+			}, 300 /* = 30s of retry */), 'Application#checkWindowReady: wait for remote indicator', this.logger);
+		}
+	}
+
+	private async checkWorkbenchReady(code: Code): Promise<void> {
+		const driver = code.driver;
+
+		// Web / Legacy: just poll for workbench element
+		if (this.web || !(driver instanceof PlaywrightDriver)) {
+			await measureAndLog(code.waitForElement('.monaco-workbench'), 'Application#checkWindowReady: wait for .monaco-workbench element', this.logger);
 		}
 
-		this.logger.log('checkWindowReady: end');
+		// Desktop (playwright): we see hangs, where IPC messages
+		// are not delivered (https://github.com/microsoft/vscode/issues/146785)
+		// Workaround is to try to reload the window when that happens
+		else {
+			try {
+				await measureAndLog(code.waitForElement('.monaco-workbench', undefined, 100 /* 10s of retry */), 'Application#checkWindowReady: wait for .monaco-workbench element', this.logger);
+			} catch (error) {
+				this.logger.log(`checkWindowReady: giving up after 10s, reloading window and trying again...`);
+
+				await driver.reload();
+
+				return this.checkWorkbenchReady(code);
+			}
+		}
 	}
 }
diff --git a/test/automation/src/code.ts b/test/automation/src/code.ts
index d728c2dfddb..3bba5773f97 100644
--- a/test/automation/src/code.ts
+++ b/test/automation/src/code.ts
@@ -3,30 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as path from 'path';
+import { join } from 'path';
 import * as os from 'os';
 import * as cp from 'child_process';
 import { IDriver, IDisposable, IElement, Thenable, ILocalizedStrings, ILocaleInfo } from './driver';
-import { launch as launchElectron } from './electronDriver';
-import { launch as launchPlaywright } from './playwrightDriver';
+import { launch as launchElectron } from './electron';
+import { launch as launchPlaywrightBrowser } from './playwrightBrowser';
+import { launch as launchPlaywrightElectron } from './playwrightElectron';
 import { Logger, measureAndLog } from './logger';
 import { copyExtension } from './extensions';
 import * as treekill from 'tree-kill';
 
-const repoPath = path.join(__dirname, '../../..');
+const rootPath = join(__dirname, '../../..');
 
 export interface LaunchOptions {
 	codePath?: string;
-	workspacePath: string;
+	readonly workspacePath: string;
 	userDataDir: string;
-	extensionsPath: string;
-	logger: Logger;
-	verbose?: boolean;
-	extraArgs?: string[];
-	remote?: boolean;
-	web?: boolean;
-	headless?: boolean;
-	browser?: 'chromium' | 'webkit' | 'firefox';
+	readonly extensionsPath: string;
+	readonly logger: Logger;
+	readonly logsPath: string;
+	readonly verbose?: boolean;
+	readonly extraArgs?: string[];
+	readonly remote?: boolean;
+	readonly web?: boolean;
+	readonly legacy?: boolean;
+	readonly tracing?: boolean;
+	readonly headless?: boolean;
+	readonly browser?: 'chromium' | 'webkit' | 'firefox';
 }
 
 interface ICodeInstance {
@@ -71,71 +75,41 @@ export async function launch(options: LaunchOptions): Promise<Code> {
 		throw new Error('Smoke test process has terminated, refusing to spawn Code');
 	}
 
-	await measureAndLog(copyExtension(repoPath, options.extensionsPath, 'vscode-notebook-tests'), 'copyExtension(vscode-notebook-tests)', options.logger);
+	await measureAndLog(copyExtension(rootPath, options.extensionsPath, 'vscode-notebook-tests'), 'copyExtension(vscode-notebook-tests)', options.logger);
 
 	// Browser smoke tests
 	if (options.web) {
-		const { serverProcess, client, driver, kill } = await measureAndLog(launchPlaywright(options), 'launch playwright', options.logger);
+		const { serverProcess, client, driver, kill } = await measureAndLog(launchPlaywrightBrowser(options), 'launch playwright (browser)', options.logger);
 		registerInstance(serverProcess, options.logger, 'server', kill);
 
-		return new Code(client, driver, options.logger, serverProcess);
+		return new Code(client, driver, options.logger);
 	}
 
-	// Electron smoke tests
+	// Electron smoke tests (playwright)
+	else if (!options.legacy) {
+		const { client, driver } = await measureAndLog(launchPlaywrightElectron(options), 'launch playwright (electron)', options.logger);
+
+		return new Code(client, driver, options.logger);
+	}
+
+	// Electron smoke tests (legacy driver)
 	else {
 		const { electronProcess, client, driver, kill } = await measureAndLog(launchElectron(options), 'launch electron', options.logger);
 		registerInstance(electronProcess, options.logger, 'electron', kill);
 
-		return new Code(client, driver, options.logger, electronProcess);
-	}
-}
-
-async function poll<T>(
-	fn: () => Thenable<T>,
-	acceptFn: (result: T) => boolean,
-	logger: Logger,
-	timeoutMessage: string,
-	retryCount = 200,
-	retryInterval = 100 // millis
-): Promise<T> {
-	let trial = 1;
-	let lastError: string = '';
-
-	while (true) {
-		if (trial > retryCount) {
-			logger.log('Timeout!');
-			logger.log(lastError);
-			logger.log(`Timeout: ${timeoutMessage} after ${(retryCount * retryInterval) / 1000} seconds.`);
-			throw new Error(`Timeout: ${timeoutMessage} after ${(retryCount * retryInterval) / 1000} seconds.`);
-		}
-
-		let result;
-		try {
-			result = await fn();
-			if (acceptFn(result)) {
-				return result;
-			} else {
-				lastError = 'Did not pass accept function';
-			}
-		} catch (e: any) {
-			lastError = Array.isArray(e.stack) ? e.stack.join(os.EOL) : e.stack;
-		}
-
-		await new Promise(resolve => setTimeout(resolve, retryInterval));
-		trial++;
+		return new Code(client, driver, options.logger);
 	}
 }
 
 export class Code {
 
 	private _activeWindowId: number | undefined = undefined;
-	driver: IDriver;
+	readonly driver: IDriver;
 
 	constructor(
 		private client: IDisposable,
 		driver: IDriver,
-		readonly logger: Logger,
-		private readonly mainProcess: cp.ChildProcess
+		readonly logger: Logger
 	) {
 		this.driver = new Proxy(driver, {
 			get(target, prop) {
@@ -156,27 +130,18 @@ export class Code {
 		});
 	}
 
-	async capturePage(): Promise<string> {
-		const windowId = await this.getActiveWindowId();
-		return await this.driver.capturePage(windowId);
-	}
-
 	async startTracing(name: string): Promise<void> {
 		const windowId = await this.getActiveWindowId();
-		if (typeof this.driver.startTracing === 'function') { // added only in 1.64
-			return await this.driver.startTracing(windowId, name);
-		}
+		return await this.driver.startTracing(windowId, name);
 	}
 
 	async stopTracing(name: string, persist: boolean): Promise<void> {
 		const windowId = await this.getActiveWindowId();
-		if (typeof this.driver.stopTracing === 'function') { // added only in 1.64
-			return await this.driver.stopTracing(windowId, name, persist);
-		}
+		return await this.driver.stopTracing(windowId, name, persist);
 	}
 
 	async waitForWindowIds(accept: (windowIds: number[]) => boolean): Promise<void> {
-		await poll(() => this.driver.getWindowIds(), accept, this.logger, `get window ids`);
+		await this.poll(() => this.driver.getWindowIds(), accept, `get window ids`);
 	}
 
 	async dispatchKeybinding(keybinding: string): Promise<void> {
@@ -185,18 +150,13 @@ export class Code {
 	}
 
 	async exit(): Promise<void> {
+
+		// Start the exit flow via driver
+		const pid = await measureAndLog(this.driver.exitApplication(), 'driver.exitApplication()', this.logger);
+
 		return measureAndLog(new Promise<void>((resolve, reject) => {
 			let done = false;
 
-			// Start the exit flow via driver
-			this.driver.exitApplication().then(veto => {
-				if (veto) {
-					done = true;
-					reject(new Error('Smoke test exit call resulted in unexpected veto'));
-				}
-			});
-
-			// Await the exit of the application
 			(async () => {
 				let retries = 0;
 				while (!done) {
@@ -206,8 +166,13 @@ export class Code {
 						this.logger.log('Smoke test exit call did not terminate process after 10s, forcefully exiting the application...');
 
 						// no need to await since we're polling for the process to die anyways
-						treekill(this.mainProcess.pid!, err => {
-							this.logger.log('Failed to kill Electron process tree:', err?.message);
+						treekill(pid, err => {
+							try {
+								process.kill(pid, 0); // throws an exception if the process doesn't exist anymore
+								this.logger.log('Failed to kill Electron process tree:', err?.message);
+							} catch (error) {
+								// Expected when process is gone
+							}
 						});
 					}
 
@@ -217,7 +182,7 @@ export class Code {
 					}
 
 					try {
-						process.kill(this.mainProcess.pid!, 0); // throws an exception if the process doesn't exist anymore.
+						process.kill(pid, 0); // throws an exception if the process doesn't exist anymore.
 						await new Promise(resolve => setTimeout(resolve, 500));
 					} catch (error) {
 						done = true;
@@ -234,10 +199,9 @@ export class Code {
 		const windowId = await this.getActiveWindowId();
 		accept = accept || (result => textContent !== undefined ? textContent === result : !!result);
 
-		return await poll(
+		return await this.poll(
 			() => this.driver.getElements(windowId, selector).then(els => els.length > 0 ? Promise.resolve(els[0].textContent) : Promise.reject(new Error('Element not found for textContent'))),
 			s => accept!(typeof s === 'string' ? s : ''),
-			this.logger,
 			`get text content '${selector}'`,
 			retryCount
 		);
@@ -245,47 +209,47 @@ export class Code {
 
 	async waitAndClick(selector: string, xoffset?: number, yoffset?: number, retryCount: number = 200): Promise<void> {
 		const windowId = await this.getActiveWindowId();
-		await poll(() => this.driver.click(windowId, selector, xoffset, yoffset), () => true, this.logger, `click '${selector}'`, retryCount);
+		await this.poll(() => this.driver.click(windowId, selector, xoffset, yoffset), () => true, `click '${selector}'`, retryCount);
 	}
 
 	async waitForSetValue(selector: string, value: string): Promise<void> {
 		const windowId = await this.getActiveWindowId();
-		await poll(() => this.driver.setValue(windowId, selector, value), () => true, this.logger, `set value '${selector}'`);
+		await this.poll(() => this.driver.setValue(windowId, selector, value), () => true, `set value '${selector}'`);
 	}
 
 	async waitForElements(selector: string, recursive: boolean, accept: (result: IElement[]) => boolean = result => result.length > 0): Promise<IElement[]> {
 		const windowId = await this.getActiveWindowId();
-		return await poll(() => this.driver.getElements(windowId, selector, recursive), accept, this.logger, `get elements '${selector}'`);
+		return await this.poll(() => this.driver.getElements(windowId, selector, recursive), accept, `get elements '${selector}'`);
 	}
 
 	async waitForElement(selector: string, accept: (result: IElement | undefined) => boolean = result => !!result, retryCount: number = 200): Promise<IElement> {
 		const windowId = await this.getActiveWindowId();
-		return await poll<IElement>(() => this.driver.getElements(windowId, selector).then(els => els[0]), accept, this.logger, `get element '${selector}'`, retryCount);
+		return await this.poll<IElement>(() => this.driver.getElements(windowId, selector).then(els => els[0]), accept, `get element '${selector}'`, retryCount);
 	}
 
 	async waitForActiveElement(selector: string, retryCount: number = 200): Promise<void> {
 		const windowId = await this.getActiveWindowId();
-		await poll(() => this.driver.isActiveElement(windowId, selector), r => r, this.logger, `is active element '${selector}'`, retryCount);
+		await this.poll(() => this.driver.isActiveElement(windowId, selector), r => r, `is active element '${selector}'`, retryCount);
 	}
 
 	async waitForTitle(accept: (title: string) => boolean): Promise<void> {
 		const windowId = await this.getActiveWindowId();
-		await poll(() => this.driver.getTitle(windowId), accept, this.logger, `get title`);
+		await this.poll(() => this.driver.getTitle(windowId), accept, `get title`);
 	}
 
 	async waitForTypeInEditor(selector: string, text: string): Promise<void> {
 		const windowId = await this.getActiveWindowId();
-		await poll(() => this.driver.typeInEditor(windowId, selector, text), () => true, this.logger, `type in editor '${selector}'`);
+		await this.poll(() => this.driver.typeInEditor(windowId, selector, text), () => true, `type in editor '${selector}'`);
 	}
 
 	async waitForTerminalBuffer(selector: string, accept: (result: string[]) => boolean): Promise<void> {
 		const windowId = await this.getActiveWindowId();
-		await poll(() => this.driver.getTerminalBuffer(windowId, selector), accept, this.logger, `get terminal buffer '${selector}'`);
+		await this.poll(() => this.driver.getTerminalBuffer(windowId, selector), accept, `get terminal buffer '${selector}'`);
 	}
 
 	async writeInTerminal(selector: string, value: string): Promise<void> {
 		const windowId = await this.getActiveWindowId();
-		await poll(() => this.driver.writeInTerminal(windowId, selector, value), () => true, this.logger, `writeInTerminal '${selector}'`);
+		await this.poll(() => this.driver.writeInTerminal(windowId, selector, value), () => true, `writeInTerminal '${selector}'`);
 	}
 
 	async getLocaleInfo(): Promise<ILocaleInfo> {
@@ -312,6 +276,42 @@ export class Code {
 	dispose(): void {
 		this.client.dispose();
 	}
+
+	private async poll<T>(
+		fn: () => Thenable<T>,
+		acceptFn: (result: T) => boolean,
+		timeoutMessage: string,
+		retryCount = 200,
+		retryInterval = 100 // millis
+	): Promise<T> {
+		let trial = 1;
+		let lastError: string = '';
+
+		while (true) {
+			if (trial > retryCount) {
+				this.logger.log('Timeout!');
+				this.logger.log(lastError);
+				this.logger.log(`Timeout: ${timeoutMessage} after ${(retryCount * retryInterval) / 1000} seconds.`);
+
+				throw new Error(`Timeout: ${timeoutMessage} after ${(retryCount * retryInterval) / 1000} seconds.`);
+			}
+
+			let result;
+			try {
+				result = await fn();
+				if (acceptFn(result)) {
+					return result;
+				} else {
+					lastError = 'Did not pass accept function';
+				}
+			} catch (e: any) {
+				lastError = Array.isArray(e.stack) ? e.stack.join(os.EOL) : e.stack;
+			}
+
+			await new Promise(resolve => setTimeout(resolve, retryInterval));
+			trial++;
+		}
+	}
 }
 
 export function findElement(element: IElement, fn: (element: IElement) => boolean): IElement | null {
diff --git a/test/automation/src/driver.js b/test/automation/src/driver.js
index 1da40e42b06..c415029cdf9 100644
--- a/test/automation/src/driver.js
+++ b/test/automation/src/driver.js
@@ -3,10 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+//@ts-check
+'use strict';
+
 const path = require('path');
 
 exports.connect = function (outPath, handle) {
 	const bootstrapPath = path.join(outPath, 'bootstrap-amd.js');
 	const { load } = require(bootstrapPath);
-	return new Promise((c, e) => load('vs/platform/driver/node/driver', ({ connect }) => connect(handle).then(c, e), e));
-};
\ No newline at end of file
+
+	return new Promise((resolve, reject) => load('vs/platform/driver/node/driver', ({ connect }) => connect(handle).then(resolve, reject), reject));
+};
diff --git a/test/automation/src/electronDriver.ts b/test/automation/src/electron.ts
similarity index 68%
rename from test/automation/src/electronDriver.ts
rename to test/automation/src/electron.ts
index ed6b7726133..e9574a9e725 100644
--- a/test/automation/src/electronDriver.ts
+++ b/test/automation/src/electron.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as path from 'path';
-import * as os from 'os';
+import { join } from 'path';
+import { platform } from 'os';
 import { tmpName } from 'tmp';
 import { connect as connectElectronDriver, IDisposable, IDriver } from './driver';
 import { ChildProcess, spawn, SpawnOptions } from 'child_process';
@@ -16,15 +16,17 @@ import { URI } from 'vscode-uri';
 import { Logger, measureAndLog } from './logger';
 import type { LaunchOptions } from './code';
 
-const repoPath = path.join(__dirname, '../../..');
+const root = join(__dirname, '..', '..', '..');
 
-export async function launch(options: LaunchOptions): Promise<{ electronProcess: ChildProcess; client: IDisposable; driver: IDriver; kill: () => Promise<void> }> {
-	const { codePath, workspacePath, extensionsPath, userDataDir, remote, logger, verbose, extraArgs } = options;
+export interface IElectronConfiguration {
+	readonly electronPath: string;
+	readonly args: string[];
+	readonly env?: NodeJS.ProcessEnv;
+}
+
+export async function resolveElectronConfiguration(options: LaunchOptions): Promise<IElectronConfiguration> {
+	const { codePath, workspacePath, extensionsPath, userDataDir, remote, logger, logsPath, extraArgs } = options;
 	const env = { ...process.env };
-	const logsPath = path.join(repoPath, '.build', 'logs', remote ? 'smoke-tests-remote' : 'smoke-tests');
-	const outPath = codePath ? getBuildOutPath(codePath) : getDevOutPath();
-
-	const driverIPCHandle = await measureAndLog(createDriverHandle(), 'createDriverHandle', logger);
 
 	const args = [
 		workspacePath,
@@ -38,8 +40,7 @@ export async function launch(options: LaunchOptions): Promise<{ electronProcess:
 		'--disable-workspace-trust',
 		`--extensions-dir=${extensionsPath}`,
 		`--user-data-dir=${userDataDir}`,
-		`--logsPath=${logsPath}`,
-		'--driver', driverIPCHandle
+		`--logsPath=${logsPath}`
 	];
 
 	if (process.platform === 'linux') {
@@ -52,7 +53,7 @@ export async function launch(options: LaunchOptions): Promise<{ electronProcess:
 
 		if (codePath) {
 			// running against a build: copy the test resolver extension
-			await measureAndLog(copyExtension(repoPath, extensionsPath, 'vscode-test-resolver'), 'copyExtension(vscode-test-resolver)', logger);
+			await measureAndLog(copyExtension(root, extensionsPath, 'vscode-test-resolver'), 'copyExtension(vscode-test-resolver)', logger);
 		}
 		args.push('--enable-proposed-api=vscode.vscode-test-resolver');
 		const remoteDataDir = `${userDataDir}-server`;
@@ -60,26 +61,19 @@ export async function launch(options: LaunchOptions): Promise<{ electronProcess:
 
 		if (codePath) {
 			// running against a build: copy the test resolver extension into remote extensions dir
-			const remoteExtensionsDir = path.join(remoteDataDir, 'extensions');
+			const remoteExtensionsDir = join(remoteDataDir, 'extensions');
 			mkdirp.sync(remoteExtensionsDir);
-			await measureAndLog(copyExtension(repoPath, remoteExtensionsDir, 'vscode-notebook-tests'), 'copyExtension(vscode-notebook-tests)', logger);
+			await measureAndLog(copyExtension(root, remoteExtensionsDir, 'vscode-notebook-tests'), 'copyExtension(vscode-notebook-tests)', logger);
 		}
 
 		env['TESTRESOLVER_DATA_FOLDER'] = remoteDataDir;
-		env['TESTRESOLVER_LOGS_FOLDER'] = path.join(logsPath, 'server');
+		env['TESTRESOLVER_LOGS_FOLDER'] = join(logsPath, 'server');
 	}
 
-	const spawnOptions: SpawnOptions = { env };
-
 	args.push('--enable-proposed-api=vscode.vscode-notebook-tests');
 
 	if (!codePath) {
-		args.unshift(repoPath);
-	}
-
-	if (verbose) {
-		args.push('--driver-verbose');
-		spawnOptions.stdio = ['ignore', 'inherit', 'inherit'];
+		args.unshift(root);
 	}
 
 	if (extraArgs) {
@@ -87,6 +81,32 @@ export async function launch(options: LaunchOptions): Promise<{ electronProcess:
 	}
 
 	const electronPath = codePath ? getBuildElectronPath(codePath) : getDevElectronPath();
+
+	return {
+		env,
+		args,
+		electronPath
+	};
+}
+
+/**
+ * @deprecated should use the playwright based electron support instead
+ */
+export async function launch(options: LaunchOptions): Promise<{ electronProcess: ChildProcess; client: IDisposable; driver: IDriver; kill: () => Promise<void> }> {
+	const { codePath, logger, verbose } = options;
+	const { env, args, electronPath } = await resolveElectronConfiguration(options);
+
+	const driverIPCHandle = await measureAndLog(createDriverHandle(), 'createDriverHandle', logger);
+	args.push('--driver', driverIPCHandle);
+
+	const outPath = codePath ? getBuildOutPath(codePath) : getDevOutPath();
+
+	const spawnOptions: SpawnOptions = { env };
+
+	if (verbose) {
+		spawnOptions.stdio = ['ignore', 'inherit', 'inherit'];
+	}
+
 	const electronProcess = spawn(electronPath, args, spawnOptions);
 
 	logger.log(`Started electron for desktop smoke tests on pid ${electronProcess.pid}`);
@@ -150,56 +170,65 @@ async function teardown(electronProcess: ChildProcess, logger: Logger): Promise<
 	logger.log(`Gave up tearing down electron client after ${retries} attempts...`);
 }
 
-function getDevElectronPath(): string {
-	const buildPath = path.join(repoPath, '.build');
-	const product = require(path.join(repoPath, 'product.json'));
+export function getDevElectronPath(): string {
+	const buildPath = join(root, '.build');
+	const product = require(join(root, 'product.json'));
 
 	switch (process.platform) {
 		case 'darwin':
-			return path.join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron');
+			return join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron');
 		case 'linux':
-			return path.join(buildPath, 'electron', `${product.applicationName}`);
+			return join(buildPath, 'electron', `${product.applicationName}`);
 		case 'win32':
-			return path.join(buildPath, 'electron', `${product.nameShort}.exe`);
+			return join(buildPath, 'electron', `${product.nameShort}.exe`);
 		default:
 			throw new Error('Unsupported platform.');
 	}
 }
 
-function getBuildElectronPath(root: string): string {
+export function getBuildElectronPath(root: string): string {
 	switch (process.platform) {
 		case 'darwin':
-			return path.join(root, 'Contents', 'MacOS', 'Electron');
+			return join(root, 'Contents', 'MacOS', 'Electron');
 		case 'linux': {
-			const product = require(path.join(root, 'resources', 'app', 'product.json'));
-			return path.join(root, product.applicationName);
+			const product = require(join(root, 'resources', 'app', 'product.json'));
+			return join(root, product.applicationName);
 		}
 		case 'win32': {
-			const product = require(path.join(root, 'resources', 'app', 'product.json'));
-			return path.join(root, `${product.nameShort}.exe`);
+			const product = require(join(root, 'resources', 'app', 'product.json'));
+			return join(root, `${product.nameShort}.exe`);
 		}
 		default:
 			throw new Error('Unsupported platform.');
 	}
 }
 
+export function getBuildVersion(root: string): string {
+	switch (process.platform) {
+		case 'darwin':
+			return require(join(root, 'Contents', 'Resources', 'app', 'package.json')).version;
+		default:
+			return require(join(root, 'resources', 'app', 'package.json')).version;
+	}
+}
+
 function getDevOutPath(): string {
-	return path.join(repoPath, 'out');
+	return join(root, 'out');
 }
 
 function getBuildOutPath(root: string): string {
 	switch (process.platform) {
 		case 'darwin':
-			return path.join(root, 'Contents', 'Resources', 'app', 'out');
+			return join(root, 'Contents', 'Resources', 'app', 'out');
 		default:
-			return path.join(root, 'resources', 'app', 'out');
+			return join(root, 'resources', 'app', 'out');
 	}
 }
 
 async function createDriverHandle(): Promise<string> {
 
 	// Windows
-	if ('win32' === os.platform()) {
+	if ('win32' === platform()) {
 		const name = [...Array(15)].map(() => Math.random().toString(36)[3]).join('');
 		return `\\\\.\\pipe\\${name}`;
 	}
diff --git a/test/automation/src/index.ts b/test/automation/src/index.ts
index 61f72fe7322..e5ffa4e60cb 100644
--- a/test/automation/src/index.ts
+++ b/test/automation/src/index.ts
@@ -26,3 +26,4 @@ export * from './viewlet';
 export * from './localization';
 export * from './workbench';
 export * from './driver';
+export { getDevElectronPath, getBuildElectronPath, getBuildVersion } from './electron';
diff --git a/test/automation/src/playwrightBrowser.ts b/test/automation/src/playwrightBrowser.ts
new file mode 100644
index 00000000000..702b5bb4218
--- /dev/null
+++ b/test/automation/src/playwrightBrowser.ts
@@ -0,0 +1,180 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as playwright from '@playwright/test';
+import { ChildProcess, spawn } from 'child_process';
+import { join } from 'path';
+import { mkdir } from 'fs';
+import { promisify } from 'util';
+import { IDriver, IDisposable } from './driver';
+import { URI } from 'vscode-uri';
+import * as kill from 'tree-kill';
+import { Logger, measureAndLog } from './logger';
+import type { LaunchOptions } from './code';
+import { PlaywrightDriver } from './playwrightDriver';
+
+const root = join(__dirname, '..', '..', '..');
+
+let port = 9000;
+
+export async function launch(options: LaunchOptions): Promise<{ serverProcess: ChildProcess; client: IDisposable; driver: IDriver; kill: () => Promise<void> }> {
+
+	// Launch server
+	const { serverProcess, endpoint } = await launchServer(options);
+
+	// Launch browser
+	const { browser, context, page } = await launchBrowser(options, endpoint);
+
+	return {
+		serverProcess,
+		client: {
+			dispose: () => { /* there is no client to dispose for browser, teardown is triggered via exitApplication call */ }
+		},
+		driver: new PlaywrightDriver(browser, context, page, serverProcess.pid, options),
+		kill: () => teardown(serverProcess.pid, options.logger)
+	};
+}
+
+async function launchServer(options: LaunchOptions) {
+	const { userDataDir, codePath, extensionsPath, logger, logsPath } = options;
+	const codeServerPath = codePath ?? process.env.VSCODE_REMOTE_SERVER_PATH;
+	const agentFolder = userDataDir;
+	await measureAndLog(promisify(mkdir)(agentFolder), `mkdir(${agentFolder})`, logger);
+	const env = {
+		VSCODE_REMOTE_SERVER_PATH: codeServerPath,
+		...process.env
+	};
+
+	const args = ['--disable-telemetry', '--disable-workspace-trust', '--port', `${port++}`, '--driver', 'web', '--extensions-dir', extensionsPath, '--server-data-dir', agentFolder, '--accept-server-license-terms'];
+
+	let serverLocation: string | undefined;
+	if (codeServerPath) {
+		const { serverApplicationName } = require(join(codeServerPath, 'product.json'));
+		serverLocation = join(codeServerPath, 'bin', `${serverApplicationName}${process.platform === 'win32' ? '.cmd' : ''}`);
+
+		logger.log(`Starting built server from '${serverLocation}'`);
+	} else {
+		serverLocation = join(root, `scripts/code-server.${process.platform === 'win32' ? 'bat' : 'sh'}`);
+
+		logger.log(`Starting server out of sources from '${serverLocation}'`);
+	}
+
+	logger.log(`Storing log files into '${logsPath}'`);
+	args.push('--logsPath', logsPath);
+
+	logger.log(`Command line: '${serverLocation}' ${args.join(' ')}`);
+	const serverProcess = spawn(
+		serverLocation,
+		args,
+		{ env }
+	);
+
+	logger.log(`Started server for browser smoke tests (pid: ${serverProcess.pid})`);
+
+	return {
+		serverProcess,
+		endpoint: await measureAndLog(waitForEndpoint(serverProcess, logger), 'waitForEndpoint(serverProcess)', logger)
+	};
+}
+
+async function launchBrowser(options: LaunchOptions, endpoint: string) {
+	const { logger, workspacePath, tracing, headless } = options;
+
+	const browser = await measureAndLog(playwright[options.browser ?? 'chromium'].launch({ headless: headless ?? false }), 'playwright#launch', logger);
+	browser.on('disconnected', () => logger.log(`Playwright: browser disconnected`));
+
+	const context = await measureAndLog(browser.newContext(), 'browser.newContext', logger);
+
+	if (tracing) {
+		try {
+			await measureAndLog(context.tracing.start({ screenshots: true, /* remaining options are off for perf reasons */ }), 'context.tracing.start()', logger);
+		} catch (error) {
+			logger.log(`Playwright (Browser): Failed to start playwright tracing (${error})`); // do not fail the build when this fails
+		}
+	}
+
+	const page = await measureAndLog(context.newPage(), 'context.newPage()', logger);
+	await measureAndLog(page.setViewportSize({ width: 1200, height: 800 }), 'page.setViewportSize', logger);
+
+	if (options.verbose) {
+		context.on('page', () => logger.log(`Playwright (Browser): context.on('page')`));
+		context.on('requestfailed', e => logger.log(`Playwright (Browser): context.on('requestfailed') [${e.failure()?.errorText} for ${e.url()}]`));
+
+		page.on('console', e => logger.log(`Playwright (Browser): window.on('console') [${e.text()}]`));
+		page.on('dialog', () => logger.log(`Playwright (Browser): page.on('dialog')`));
+		page.on('domcontentloaded', () => logger.log(`Playwright (Browser): page.on('domcontentloaded')`));
+		page.on('load', () => logger.log(`Playwright (Browser): page.on('load')`));
+		page.on('popup', () => logger.log(`Playwright (Browser): page.on('popup')`));
+		page.on('framenavigated', () => logger.log(`Playwright (Browser): page.on('framenavigated')`));
+		page.on('requestfailed', e => logger.log(`Playwright (Browser): page.on('requestfailed') [${e.failure()?.errorText} for ${e.url()}]`));
+	}
+
+	page.on('pageerror', async (error) => logger.log(`Playwright (Browser) ERROR: page error: ${error}`));
+	page.on('crash', () => logger.log('Playwright (Browser) ERROR: page crash'));
+	page.on('close', () => logger.log('Playwright (Browser): page close'));
+	page.on('response', async (response) => {
+		if (response.status() >= 400) {
+			logger.log(`Playwright (Browser) ERROR: HTTP status ${response.status()} for ${response.url()}`);
+		}
+	});
+
+	const payloadParam = `[["enableProposedApi",""],["webviewExternalEndpointCommit","181b43c0e2949e36ecb623d8cc6de29d4fa2bae8"],["skipWelcome","true"]]`;
+	await measureAndLog(page.goto(`${endpoint}&${workspacePath.endsWith('.code-workspace') ? 'workspace' : 'folder'}=${URI.file(workspacePath!).path}&payload=${payloadParam}`), 'page.goto()', logger);
+
+	return { browser, context, page };
+}
+
+export async function teardown(serverPid: number | undefined, logger: Logger): Promise<void> {
+	if (typeof serverPid !== 'number') {
+		return;
+	}
+
+	let retries = 0;
+	while (retries < 3) {
+		retries++;
+
+		try {
+			return await promisify(kill)(serverPid);
+		} catch (error) {
+			try {
+				process.kill(serverPid, 0); // throws an exception if the process doesn't exist anymore
+				logger.log(`Error tearing down server (pid: ${serverPid}, attempt: ${retries}): ${error}`);
+			} catch (error) {
+				return; // Expected when process is gone
+			}
+		}
+	}
+
+	logger.log(`Gave up tearing down server after ${retries} attempts...`);
+}
+
+function waitForEndpoint(server: ChildProcess, logger: Logger): Promise<string> {
+	return new Promise<string>((resolve, reject) => {
+		let endpointFound = false;
+
+		server.stdout?.on('data', data => {
+			if (!endpointFound) {
+				logger.log(`[server] stdout: ${data}`); // log until endpoint found to diagnose issues
+			}
+
+			const matches = data.toString('ascii').match(/Web UI available at (.+)/);
+			if (matches !== null) {
+				endpointFound = true;
+
+				resolve(matches[1]);
+			}
+		});
+
+		server.stderr?.on('data', error => {
+			if (!endpointFound) {
+				logger.log(`[server] stderr: ${error}`); // log until endpoint found to diagnose issues
+			}
+
+			if (error.toString().indexOf('EADDRINUSE') !== -1) {
+				reject(new Error(error));
+			}
+		});
+	});
+}
diff --git a/test/automation/src/playwrightDriver.ts b/test/automation/src/playwrightDriver.ts
index 4f0f7a94fba..4218ad94f90 100644
--- a/test/automation/src/playwrightDriver.ts
+++ b/test/automation/src/playwrightDriver.ts
@@ -4,49 +4,39 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as playwright from '@playwright/test';
-import { ChildProcess, spawn } from 'child_process';
 import { join } from 'path';
-import { mkdir } from 'fs';
-import { promisify } from 'util';
-import { IDriver, IDisposable, IWindowDriver } from './driver';
-import { URI } from 'vscode-uri';
-import * as kill from 'tree-kill';
+import { IDriver, IWindowDriver } from './driver';
 import { PageFunction } from 'playwright-core/types/structs';
-import { Logger, measureAndLog } from './logger';
-import type { LaunchOptions } from './code';
+import { measureAndLog } from './logger';
+import { LaunchOptions } from './code';
+import { teardown } from './playwrightBrowser';
 
-const width = 1200;
-const height = 800;
+export class PlaywrightDriver implements IDriver {
 
-const root = join(__dirname, '..', '..', '..');
-const logsPath = join(root, '.build', 'logs', 'smoke-tests-browser');
+	private static traceCounter = 1;
 
-const vscodeToPlaywrightKey: { [key: string]: string } = {
-	cmd: 'Meta',
-	ctrl: 'Control',
-	shift: 'Shift',
-	enter: 'Enter',
-	escape: 'Escape',
-	right: 'ArrowRight',
-	up: 'ArrowUp',
-	down: 'ArrowDown',
-	left: 'ArrowLeft',
-	home: 'Home',
-	esc: 'Escape'
-};
-
-let traceCounter = 1;
-
-class PlaywrightDriver implements IDriver {
+	private static readonly vscodeToPlaywrightKey: { [key: string]: string } = {
+		cmd: 'Meta',
+		ctrl: 'Control',
+		shift: 'Shift',
+		enter: 'Enter',
+		escape: 'Escape',
+		right: 'ArrowRight',
+		up: 'ArrowUp',
+		down: 'ArrowDown',
+		left: 'ArrowLeft',
+		home: 'Home',
+		esc: 'Escape'
+	};
 
 	_serviceBrand: undefined;
 
 	constructor(
-		private readonly server: ChildProcess,
-		private readonly browser: playwright.Browser,
+		private readonly application: playwright.Browser | playwright.ElectronApplication,
 		private readonly context: playwright.BrowserContext,
 		private readonly page: playwright.Page,
-		private readonly logger: Logger
+		private readonly serverPid: number | undefined,
+		private readonly options: LaunchOptions
 	) {
 	}
 
@@ -54,51 +44,73 @@ class PlaywrightDriver implements IDriver {
 		return [1];
 	}
 
-	async capturePage() {
-		return '';
-	}
-
 	async startTracing(windowId: number, name: string): Promise<void> {
+		if (!this.options.tracing) {
+			return; // tracing disabled
+		}
+
 		try {
-			await measureAndLog(this.context.tracing.startChunk({ title: name }), `startTracing for ${name}`, this.logger);
+			await measureAndLog(this.context.tracing.startChunk({ title: name }), `startTracing for ${name}`, this.options.logger);
 		} catch (error) {
 			// Ignore
 		}
 	}
 
 	async stopTracing(windowId: number, name: string, persist: boolean): Promise<void> {
+		if (!this.options.tracing) {
+			return; // tracing disabled
+		}
+
 		try {
 			let persistPath: string | undefined = undefined;
 			if (persist) {
-				persistPath = join(logsPath, `playwright-trace-${traceCounter++}-${name.replace(/\s+/g, '-')}.zip`);
+				persistPath = join(this.options.logsPath, `playwright-trace-${PlaywrightDriver.traceCounter++}-${name.replace(/\s+/g, '-')}.zip`);
 			}
 
-			await measureAndLog(this.context.tracing.stopChunk({ path: persistPath }), `stopTracing for ${name}`, this.logger);
+			await measureAndLog(this.context.tracing.stopChunk({ path: persistPath }), `stopTracing for ${name}`, this.options.logger);
 		} catch (error) {
 			// Ignore
 		}
 	}
 
-	async reloadWindow(windowId: number) {
-		throw new Error('Unsupported');
+	async reload() {
+		await this.page.reload();
 	}
 
 	async exitApplication() {
+
+		// Stop tracing
 		try {
-			await measureAndLog(this.context.tracing.stop(), 'stop tracing', this.logger);
+			if (this.options.tracing) {
+				await measureAndLog(this.context.tracing.stop(), 'stop tracing', this.options.logger);
+			}
 		} catch (error) {
 			// Ignore
 		}
 
-		try {
-			await measureAndLog(this.browser.close(), 'Browser.close()', this.logger);
-		} catch (error) {
-			// Ignore
+		// VSCode shutdown (desktop only)
+		let mainPid: number | undefined = undefined;
+		if (!this.options.web) {
+			try {
+				mainPid = await measureAndLog(this._evaluateWithDriver(([driver]) => (driver as unknown as IDriver).exitApplication()), 'driver.exitApplication()', this.options.logger);
+			} catch (error) {
+				this.options.logger.log(`Error exiting appliction (${error})`);
+			}
 		}
 
-		await measureAndLog(teardown(this.server, this.logger), 'teardown server', this.logger);
+		// Playwright shutdown
+		try {
+			await measureAndLog(this.application.close(), 'playwright.close()', this.options.logger);
+		} catch (error) {
+			this.options.logger.log(`Error closing appliction (${error})`);
+		}
 
-		return false;
+		// Server shutdown
+		if (typeof this.serverPid === 'number') {
+			await measureAndLog(teardown(this.serverPid, this.options.logger), 'teardown server', this.options.logger);
+		}
+
+		return mainPid ?? this.serverPid! /* when running web we must have a server Pid */;
 	}
 
 	async dispatchKeybinding(windowId: number, keybinding: string) {
@@ -117,8 +129,8 @@ class PlaywrightDriver implements IDriver {
 			const keys = chord.split('+');
 			const keysDown: string[] = [];
 			for (let i = 0; i < keys.length; i++) {
-				if (keys[i] in vscodeToPlaywrightKey) {
-					keys[i] = vscodeToPlaywrightKey[keys[i]];
+				if (keys[i] in PlaywrightDriver.vscodeToPlaywrightKey) {
+					keys[i] = PlaywrightDriver.vscodeToPlaywrightKey[keys[i]];
 				}
 				await this.page.keyboard.down(keys[i]);
 				keysDown.push(keys[i]);
@@ -136,10 +148,6 @@ class PlaywrightDriver implements IDriver {
 		await this.page.mouse.click(x + (xoffset ? xoffset : 0), y + (yoffset ? yoffset : 0));
 	}
 
-	async doubleClick(windowId: number, selector: string) {
-		throw new Error('Unsupported');
-	}
-
 	async setValue(windowId: number, selector: string, text: string) {
 		return this.page.evaluate(([driver, selector, text]) => driver.setValue(selector, text), [await this._getDriverHandle(), selector, text] as const);
 	}
@@ -188,156 +196,7 @@ class PlaywrightDriver implements IDriver {
 		return new Promise<void>(resolve => setTimeout(resolve, ms));
 	}
 
-	// TODO: Cache
 	private async _getDriverHandle(): Promise<playwright.JSHandle<IWindowDriver>> {
 		return this.page.evaluateHandle('window.driver');
 	}
 }
-
-let port = 9000;
-
-export async function launch(options: LaunchOptions): Promise<{ serverProcess: ChildProcess; client: IDisposable; driver: IDriver; kill: () => Promise<void> }> {
-
-	// Launch server
-	const { serverProcess, endpoint } = await launchServer(options);
-
-	// Launch browser
-	const { browser, context, page } = await launchBrowser(options, endpoint);
-
-	return {
-		serverProcess,
-		client: {
-			dispose: () => { /* there is no client to dispose for browser, teardown is triggered via exitApplication call */ }
-		},
-		driver: new PlaywrightDriver(serverProcess, browser, context, page, options.logger),
-		kill: () => teardown(serverProcess, options.logger)
-	};
-}
-
-async function launchServer(options: LaunchOptions) {
-	const { userDataDir, codePath, extensionsPath, logger } = options;
-	const codeServerPath = codePath ?? process.env.VSCODE_REMOTE_SERVER_PATH;
-	const agentFolder = userDataDir;
-	await measureAndLog(promisify(mkdir)(agentFolder), `mkdir(${agentFolder})`, logger);
-	const env = {
-		VSCODE_REMOTE_SERVER_PATH: codeServerPath,
-		...process.env
-	};
-
-	const args = ['--disable-telemetry', '--disable-workspace-trust', '--port', `${port++}`, '--driver', 'web', '--extensions-dir', extensionsPath, '--server-data-dir', agentFolder, '--accept-server-license-terms'];
-
-	let serverLocation: string | undefined;
-	if (codeServerPath) {
-		const { serverApplicationName } = require(join(codeServerPath, 'product.json'));
-		serverLocation = join(codeServerPath, 'bin', `${serverApplicationName}${process.platform === 'win32' ? '.cmd' : ''}`);
-
-		logger.log(`Starting built server from '${serverLocation}'`);
-	} else {
-		serverLocation = join(root, `scripts/code-server.${process.platform === 'win32' ? 'bat' : 'sh'}`);
-
-		logger.log(`Starting server out of sources from '${serverLocation}'`);
-	}
-
-	logger.log(`Storing log files into '${logsPath}'`);
-	args.push('--logsPath', logsPath);
-
-	logger.log(`Command line: '${serverLocation}' ${args.join(' ')}`);
-	const serverProcess = spawn(
-		serverLocation,
-		args,
-		{ env }
-	);
-
-	logger.log(`Started server for browser smoke tests (pid: ${serverProcess.pid})`);
-
-	return {
-		serverProcess,
-		endpoint: await measureAndLog(waitForEndpoint(serverProcess, logger), 'waitForEndpoint(serverProcess)', logger)
-	};
-}
-
-async function launchBrowser(options: LaunchOptions, endpoint: string) {
-	const { logger, workspacePath } = options;
-
-	const browser = await measureAndLog(playwright[options.browser ?? 'chromium'].launch({ headless: options.headless ?? false }), 'playwright#launch', logger);
-	browser.on('disconnected', () => logger.log(`Playwright: browser disconnected`));
-
-	const context = await measureAndLog(browser.newContext(), 'browser.newContext', logger);
-
-	try {
-		await measureAndLog(context.tracing.start({ screenshots: true, snapshots: true, sources: true }), 'context.tracing.start()', logger);
-	} catch (error) {
-		logger.log(`Failed to start playwright tracing: ${error}`); // do not fail the build when this fails
-	}
-
-	const page = await measureAndLog(context.newPage(), 'context.newPage()', logger);
-	await measureAndLog(page.setViewportSize({ width, height }), 'page.setViewportSize', logger);
-
-	page.on('pageerror', async (error) => logger.log(`Playwright ERROR: page error: ${error}`));
-	page.on('crash', () => logger.log('Playwright ERROR: page crash'));
-	page.on('close', () => logger.log('Playwright: page close'));
-	page.on('response', async (response) => {
-		if (response.status() >= 400) {
-			logger.log(`Playwright ERROR: HTTP status ${response.status()} for ${response.url()}`);
-		}
-	});
-
-	const payloadParam = `[["enableProposedApi",""],["webviewExternalEndpointCommit","181b43c0e2949e36ecb623d8cc6de29d4fa2bae8"],["skipWelcome","true"]]`;
-	await measureAndLog(page.goto(`${endpoint}&folder=${URI.file(workspacePath!).path}&payload=${payloadParam}`), 'page.goto()', logger);
-
-	return { browser, context, page };
-}
-
-async function teardown(server: ChildProcess, logger: Logger): Promise<void> {
-	const serverPid = server.pid;
-	if (typeof serverPid !== 'number') {
-		return;
-	}
-
-	let retries = 0;
-	while (retries < 3) {
-		retries++;
-
-		try {
-			return await promisify(kill)(serverPid);
-		} catch (error) {
-			try {
-				process.kill(serverPid, 0); // throws an exception if the process doesn't exist anymore
-				logger.log(`Error tearing down server (pid: ${serverPid}, attempt: ${retries}): ${error}`);
-			} catch (error) {
-				return; // Expected when process is gone
-			}
-		}
-	}
-
-	logger.log(`Gave up tearing down server after ${retries} attempts...`);
-}
-
-function waitForEndpoint(server: ChildProcess, logger: Logger): Promise<string> {
-	return new Promise<string>((resolve, reject) => {
-		let endpointFound = false;
-
-		server.stdout?.on('data', data => {
-			if (!endpointFound) {
-				logger.log(`[server] stdout: ${data}`); // log until endpoint found to diagnose issues
-			}
-
-			const matches = data.toString('ascii').match(/Web UI available at (.+)/);
-			if (matches !== null) {
-				endpointFound = true;
-
-				resolve(matches[1]);
-			}
-		});
-
-		server.stderr?.on('data', error => {
-			if (!endpointFound) {
-				logger.log(`[server] stderr: ${error}`); // log until endpoint found to diagnose issues
-			}
-
-			if (error.toString().indexOf('EADDRINUSE') !== -1) {
-				reject(new Error(error));
-			}
-		});
-	});
-}
diff --git a/test/automation/src/playwrightElectron.ts b/test/automation/src/playwrightElectron.ts
new file mode 100644
index 00000000000..79a4d26f032
--- /dev/null
+++ b/test/automation/src/playwrightElectron.ts
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as playwright from '@playwright/test';
+import { IDriver, IDisposable } from './driver';
+import type { LaunchOptions } from './code';
+import { PlaywrightDriver } from './playwrightDriver';
+import { IElectronConfiguration, resolveElectronConfiguration } from './electron';
+import { measureAndLog } from './logger';
+
+export async function launch(options: LaunchOptions): Promise<{ client: IDisposable; driver: IDriver }> {
+
+	// Resolve electron config and update
+	const { electronPath, args, env } = await resolveElectronConfiguration(options);
+	args.push('--enable-smoke-test-driver', 'true');
+
+	// Launch electron via playwright
+	const { electron, context, page } = await launchElectron({ electronPath, args, env }, options);
+
+	return {
+		client: {
+			dispose: () => { /* there is no client to dispose for electron, teardown is triggered via exitApplication call */ }
+		},
+		driver: new PlaywrightDriver(electron, context, page, undefined /* no server */, options)
+	};
+}
+
+async function launchElectron(configuration: IElectronConfiguration, options: LaunchOptions) {
+	const { logger, tracing } = options;
+
+	const electron = await measureAndLog(playwright._electron.launch({
+		executablePath: configuration.electronPath,
+		args: configuration.args,
+		env: configuration.env as { [key: string]: string }
+	}), 'playwright-electron#launch', logger);
+
+	const window = await measureAndLog(electron.firstWindow(), 'playwright-electron#firstWindow', logger);
+
+	const context = window.context();
+
+	if (tracing) {
+		try {
+			await measureAndLog(context.tracing.start({ screenshots: true, /* remaining options are off for perf reasons */ }), 'context.tracing.start()', logger);
+		} catch (error) {
+			logger.log(`Playwright (Electron): Failed to start playwright tracing (${error})`); // do not fail the build when this fails
+		}
+	}
+
+	if (options.verbose) {
+		electron.on('window', () => logger.log(`Playwright (Electron): electron.on('window')`));
+		electron.on('close', () => logger.log(`Playwright (Electron): electron.on('close')`));
+
+		context.on('page', () => logger.log(`Playwright (Electron): context.on('page')`));
+		context.on('requestfailed', e => logger.log(`Playwright (Electron): context.on('requestfailed') [${e.failure()?.errorText} for ${e.url()}]`));
+
+		window.on('dialog', () => logger.log(`Playwright (Electron): window.on('dialog')`));
+		window.on('domcontentloaded', () => logger.log(`Playwright (Electron): window.on('domcontentloaded')`));
+		window.on('load', () => logger.log(`Playwright (Electron): window.on('load')`));
+		window.on('popup', () => logger.log(`Playwright (Electron): window.on('popup')`));
+		window.on('framenavigated', () => logger.log(`Playwright (Electron): window.on('framenavigated')`));
+		window.on('requestfailed', e => logger.log(`Playwright (Electron): window.on('requestfailed') [${e.failure()?.errorText} for ${e.url()}]`));
+	}
+
+	window.on('console', e => logger.log(`Playwright (Electron): window.on('console') [${e.text()}]`));
+	window.on('pageerror', async (error) => logger.log(`Playwright (Electron) ERROR: page error: ${error}`));
+	window.on('crash', () => logger.log('Playwright (Electron) ERROR: page crash'));
+	window.on('close', () => logger.log('Playwright (Electron): page close'));
+	window.on('response', async (response) => {
+		if (response.status() >= 400) {
+			logger.log(`Playwright (Electron) ERROR: HTTP status ${response.status()} for ${response.url()}`);
+		}
+	});
+
+	return { electron, context, page: window };
+}
diff --git a/test/automation/tools/copy-driver-definition.js b/test/automation/tools/copy-driver-definition.js
index 5f34e6d7ddc..cf757ecbc38 100644
--- a/test/automation/tools/copy-driver-definition.js
+++ b/test/automation/tools/copy-driver-definition.js
@@ -3,6 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+//@ts-check
+'use strict';
+
 const fs = require('fs');
 const path = require('path');
 
diff --git a/test/automation/tools/copy-package-version.js b/test/automation/tools/copy-package-version.js
index f01739a651f..b9d1560c406 100644
--- a/test/automation/tools/copy-package-version.js
+++ b/test/automation/tools/copy-package-version.js
@@ -3,6 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+//@ts-check
+'use strict';
+
 const fs = require('fs');
 const path = require('path');
 
diff --git a/test/integration/browser/src/index.ts b/test/integration/browser/src/index.ts
index 0510fc4f54d..18350685d5e 100644
--- a/test/integration/browser/src/index.ts
+++ b/test/integration/browser/src/index.ts
@@ -125,7 +125,7 @@ async function launchServer(browserType: BrowserType): Promise<{ endpoint: url.U
 	const root = path.join(__dirname, '..', '..', '..', '..');
 	const logsPath = path.join(root, '.build', 'logs', 'integration-tests-browser');
 
-	const serverArgs = ['--driver', 'web', '--enable-proposed-api', '--disable-telemetry', '--server-data-dir', userDataDir, '--accept-server-license-terms', '--disable-workspace-trust'];
+	const serverArgs = ['--enable-proposed-api', '--disable-telemetry', '--server-data-dir', userDataDir, '--accept-server-license-terms', '--disable-workspace-trust'];
 
 	let serverLocation: string;
 	if (process.env.VSCODE_REMOTE_SERVER_PATH) {
diff --git a/test/integration/electron/testrunner.js b/test/integration/electron/testrunner.js
index 8a64744321b..8c55a40e4df 100644
--- a/test/integration/electron/testrunner.js
+++ b/test/integration/electron/testrunner.js
@@ -3,14 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+//@ts-check
 'use strict';
 
 const paths = require('path');
 const glob = require('glob');
 // Linux: prevent a weird NPE when mocha on Linux requires the window size from the TTY
-// Since we are not running in a tty environment, we just implementt he method statically
+// Since we are not running in a tty environment, we just implement the method statically
 const tty = require('tty');
+// @ts-ignore
 if (!tty.getWindowSize) {
+	// @ts-ignore
 	tty.getWindowSize = function () { return [80, 75]; };
 }
 const Mocha = require('mocha');
diff --git a/test/smoke/README.md b/test/smoke/README.md
index e207607f329..ffef4c28339 100644
--- a/test/smoke/README.md
+++ b/test/smoke/README.md
@@ -21,7 +21,7 @@ example: yarn smoketest --build /Applications/Visual\ Studio\ Code\ -\ Insiders.
 # Build (Web - read instructions below)
 yarn smoketest --build <path to server web build (ends in -web)> --web --browser [chromium|webkit]
 
-# Remote (Electron - Must be run on distro)
+# Remote (Electron)
 yarn smoketest --build <path to latest version> --remote
 ```
 
@@ -57,7 +57,7 @@ xattr -d com.apple.quarantine <path to server with web folder zip>
 - `-f PATTERN` (alias `-g PATTERN`) filters the tests to be run. You can also use pretty much any mocha argument;
 - `--headless` will run playwright in headless mode when `--web` is used.
 
-**Note**: you can enable verbose logging of playwright library by setting a `DEBUG` environment variable before running the tests (https://playwright.dev/docs/debug#verbose-api-logs)
+**Note**: you can enable verbose logging of playwright library by setting a `DEBUG` environment variable before running the tests (https://playwright.dev/docs/debug#verbose-api-logs), for example to `pw:browser`.
 
 ### Develop
 
diff --git a/test/smoke/src/areas/multiroot/multiroot.test.ts b/test/smoke/src/areas/multiroot/multiroot.test.ts
index 845d193af44..0038f8b70e6 100644
--- a/test/smoke/src/areas/multiroot/multiroot.test.ts
+++ b/test/smoke/src/areas/multiroot/multiroot.test.ts
@@ -26,7 +26,8 @@ function createWorkspaceFile(workspacePath: string): string {
 		],
 		settings: {
 			'workbench.startupEditor': 'none',
-			'workbench.enableExperiments': false
+			'workbench.enableExperiments': false,
+			"typescript.disableAutomaticTypeAcquisition": true
 		}
 	};
 
diff --git a/test/smoke/src/areas/search/search.test.ts b/test/smoke/src/areas/search/search.test.ts
index c6db8699c76..fa61fcd65b8 100644
--- a/test/smoke/src/areas/search/search.test.ts
+++ b/test/smoke/src/areas/search/search.test.ts
@@ -19,21 +19,12 @@ export function setup(logger: Logger) {
 			retry(async () => cp.execSync('git reset --hard HEAD --quiet', { cwd: app.workspacePathOrFolder }), 0, 5);
 		});
 
-		// https://github.com/microsoft/vscode/issues/124146
-		it.skip /* https://github.com/microsoft/vscode/issues/124335 */('has a tooltp with a keybinding', async function () {
-			const app = this.app as Application;
-			const tooltip: string = await app.workbench.search.getSearchTooltip();
-			if (!/Search \(.+\)/.test(tooltip)) {
-				throw Error(`Expected search tooltip to contain keybinding but got ${tooltip}`);
-			}
-		});
-
 		it('searches for body & checks for correct result number', async function () {
 			const app = this.app as Application;
 			await app.workbench.search.openSearchViewlet();
 			await app.workbench.search.searchFor('body');
 
-			await app.workbench.search.waitForResultText('16 results in 5 files');
+			await app.workbench.search.waitForResultText('6 results in 3 files');
 		});
 
 		it('searches only for *.js files & checks for correct result number', async function () {
@@ -51,15 +42,15 @@ export function setup(logger: Logger) {
 		it('dismisses result & checks for correct result number', async function () {
 			const app = this.app as Application;
 			await app.workbench.search.searchFor('body');
-			await app.workbench.search.waitForResultText('16 results in 5 files');
-			await app.workbench.search.removeFileMatch('app.js', '12 results in 4 files');
+			await app.workbench.search.waitForResultText('6 results in 3 files');
+			await app.workbench.search.removeFileMatch('app.js', '2 results in 2 files');
 		});
 
 		it.skip('replaces first search result with a replace term', async function () { // TODo@roblourens https://github.com/microsoft/vscode/issues/137195
 			const app = this.app as Application;
 
 			await app.workbench.search.searchFor('body');
-			await app.workbench.search.waitForResultText('16 results in 5 files');
+			await app.workbench.search.waitForResultText('6 results in 3 files');
 			await app.workbench.search.expandReplace();
 			await app.workbench.search.setReplaceText('ydob');
 			await app.workbench.search.replaceFileMatch('app.js', '12 results in 4 files');
diff --git a/test/smoke/src/areas/statusbar/statusbar.test.ts b/test/smoke/src/areas/statusbar/statusbar.test.ts
index 6cfa745a11e..a383d8a5e51 100644
--- a/test/smoke/src/areas/statusbar/statusbar.test.ts
+++ b/test/smoke/src/areas/statusbar/statusbar.test.ts
@@ -7,7 +7,7 @@ import { join } from 'path';
 import { Application, Quality, StatusBarElement, Logger } from '../../../../automation';
 import { installAllHandlers } from '../../utils';
 
-export function setup(isWeb: boolean, logger: Logger) {
+export function setup(logger: Logger) {
 	describe('Statusbar', () => {
 
 		// Shared before/after handling
diff --git a/test/smoke/src/areas/terminal/terminal-tabs.test.ts b/test/smoke/src/areas/terminal/terminal-tabs.test.ts
index 0d1914096e8..d038369ca21 100644
--- a/test/smoke/src/areas/terminal/terminal-tabs.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-tabs.test.ts
@@ -58,7 +58,7 @@ export function setup() {
 			await terminal.assertSingleTab({ name });
 		});
 
-		it('should reset the tab name to the default value when no name is provided', async () => {
+		it.skip('should reset the tab name to the default value when no name is provided', async () => { // https://github.com/microsoft/vscode/issues/146796
 			await terminal.createTerminal();
 			const defaultName = await terminal.getSingleTabName();
 			const name = 'my terminal name';
diff --git a/test/smoke/src/areas/workbench/data-loss.test.ts b/test/smoke/src/areas/workbench/data-loss.test.ts
index 2749bb696da..aa6118a16ef 100644
--- a/test/smoke/src/areas/workbench/data-loss.test.ts
+++ b/test/smoke/src/areas/workbench/data-loss.test.ts
@@ -118,7 +118,7 @@ export function setup(ensureStableCode: () => string | undefined, logger: Logger
 		}
 	});
 
-	describe('Data Loss (stable -> insiders)', () => {
+	describe.skip('Data Loss (stable -> insiders)', () => { //TODO@bpasero enable again once we shipped 1.67.x
 
 		let insidersApp: Application | undefined = undefined;
 		let stableApp: Application | undefined = undefined;
diff --git a/test/smoke/src/main.ts b/test/smoke/src/main.ts
index 2b8fe48e500..5d9027234ee 100644
--- a/test/smoke/src/main.ts
+++ b/test/smoke/src/main.ts
@@ -13,7 +13,7 @@ import * as rimraf from 'rimraf';
 import * as mkdirp from 'mkdirp';
 import * as vscodetest from '@vscode/test-electron';
 import fetch from 'node-fetch';
-import { Quality, MultiLogger, Logger, ConsoleLogger, FileLogger, measureAndLog } from '../../automation';
+import { Quality, MultiLogger, Logger, ConsoleLogger, FileLogger, measureAndLog, getDevElectronPath, getBuildElectronPath, getBuildVersion } from '../../automation';
 import { retry, timeout } from './utils';
 
 import { setup as setupDataLossTests } from './areas/workbench/data-loss.test';
@@ -28,7 +28,7 @@ import { setup as setupLocalizationTests } from './areas/workbench/localization.
 import { setup as setupLaunchTests } from './areas/workbench/launch.test';
 import { setup as setupTerminalTests } from './areas/terminal/terminal.test';
 
-const repoPath = path.join(__dirname, '..', '..', '..');
+const rootPath = path.join(__dirname, '..', '..', '..');
 
 const [, , ...args] = process.argv;
 const opts = minimist(args, {
@@ -44,7 +44,9 @@ const opts = minimist(args, {
 		'verbose',
 		'remote',
 		'web',
-		'headless'
+		'headless',
+		'legacy',
+		'tracing'
 	],
 	default: {
 		verbose: false
@@ -54,12 +56,29 @@ const opts = minimist(args, {
 	remote?: boolean;
 	headless?: boolean;
 	web?: boolean;
+	legacy?: boolean;
+	tracing?: boolean;
 	build?: string;
 	'stable-build'?: string;
 	browser?: string;
 	electronArgs?: string;
 };
 
+const logsPath = (() => {
+	const logsParentPath = path.join(rootPath, '.build', 'logs');
+
+	let logsName: string;
+	if (opts.web) {
+		logsName = 'smoke-tests-browser';
+	} else if (opts.remote) {
+		logsName = opts.legacy ? 'smoke-tests-remote-legacy' : 'smoke-tests-remote';
+	} else {
+		logsName = opts.legacy ? 'smoke-tests-electron-legacy' : 'smoke-tests-electron';
+	}
+
+	return path.join(logsParentPath, logsName);
+})();
+
 const logger = createLogger();
 
 function createLogger(): Logger {
@@ -70,10 +89,12 @@ function createLogger(): Logger {
 		loggers.push(new ConsoleLogger());
 	}
 
+	// Prepare logs path
+	fs.rmSync(logsPath, { recursive: true, force: true, maxRetries: 3 });
+	mkdirp.sync(logsPath);
+
 	// Always log to log file
-	const logPath = path.join(repoPath, '.build', 'logs', opts.web ? 'smoke-tests-browser' : opts.remote ? 'smoke-tests-remote' : 'smoke-tests');
-	mkdirp.sync(logPath);
-	loggers.push(new FileLogger(path.join(logPath, 'smoke-test-runner.log')));
+	loggers.push(new FileLogger(path.join(logsPath, 'smoke-test-runner.log')));
 
 	return new MultiLogger(loggers);
 }
@@ -122,49 +143,6 @@ function parseVersion(version: string): { major: number; minor: number; patch: n
 // #### Electron Smoke Tests ####
 //
 if (!opts.web) {
-
-	function getDevElectronPath(): string {
-		const buildPath = path.join(repoPath, '.build');
-		const product = require(path.join(repoPath, 'product.json'));
-
-		switch (process.platform) {
-			case 'darwin':
-				return path.join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron');
-			case 'linux':
-				return path.join(buildPath, 'electron', `${product.applicationName}`);
-			case 'win32':
-				return path.join(buildPath, 'electron', `${product.nameShort}.exe`);
-			default:
-				throw new Error('Unsupported platform.');
-		}
-	}
-
-	function getBuildElectronPath(root: string): string {
-		switch (process.platform) {
-			case 'darwin':
-				return path.join(root, 'Contents', 'MacOS', 'Electron');
-			case 'linux': {
-				const product = require(path.join(root, 'resources', 'app', 'product.json'));
-				return path.join(root, product.applicationName);
-			}
-			case 'win32': {
-				const product = require(path.join(root, 'resources', 'app', 'product.json'));
-				return path.join(root, `${product.nameShort}.exe`);
-			}
-			default:
-				throw new Error('Unsupported platform.');
-		}
-	}
-
-	function getBuildVersion(root: string): string {
-		switch (process.platform) {
-			case 'darwin':
-				return require(path.join(root, 'Contents', 'Resources', 'app', 'package.json')).version;
-			default:
-				return require(path.join(root, 'resources', 'app', 'package.json')).version;
-		}
-	}
-
 	let testCodePath = opts.build;
 	let electronPath: string;
 
@@ -174,7 +152,7 @@ if (!opts.web) {
 	} else {
 		testCodePath = getDevElectronPath();
 		electronPath = testCodePath;
-		process.env.VSCODE_REPOSITORY = repoPath;
+		process.env.VSCODE_REPOSITORY = rootPath;
 		process.env.VSCODE_DEV = '1';
 		process.env.VSCODE_CLI = '1';
 	}
@@ -213,7 +191,7 @@ else {
 	}
 
 	if (!testCodeServerPath) {
-		process.env.VSCODE_REPOSITORY = repoPath;
+		process.env.VSCODE_REPOSITORY = rootPath;
 		process.env.VSCODE_DEV = '1';
 		process.env.VSCODE_CLI = '1';
 
@@ -249,11 +227,6 @@ async function setupRepository(): Promise<void> {
 			cp.spawnSync('git', ['reset', '--hard', 'FETCH_HEAD'], { cwd: workspacePath });
 			cp.spawnSync('git', ['clean', '-xdf'], { cwd: workspacePath });
 		}
-
-		// None of the current smoke tests have a dependency on the packages.
-		// If new smoke tests are added that need the packages, uncomment this.
-		// logger.log('Running yarn...');
-		// cp.execSync('yarn', { cwd: workspacePath, stdio: 'inherit' });
 	}
 }
 
@@ -355,9 +328,12 @@ before(async function () {
 		extensionsPath,
 		waitTime: parseInt(opts['wait-time'] || '0') || 20,
 		logger,
+		logsPath,
 		verbose: opts.verbose,
 		remote: opts.remote,
 		web: opts.web,
+		legacy: opts.legacy,
+		tracing: opts.tracing,
 		headless: opts.headless,
 		browser: opts.browser,
 		extraArgs: (opts.electronArgs || '').split(' ').map(a => a.trim()).filter(a => !!a)
@@ -390,16 +366,16 @@ after(async function () {
 	}
 });
 
-describe(`VSCode Smoke Tests (${opts.web ? 'Web' : 'Electron'})`, () => {
+describe(`VSCode Smoke Tests (${opts.web ? 'Web' : opts.legacy ? 'Electron (legacy)' : 'Electron'})`, () => {
 	if (!opts.web) { setupDataLossTests(() => opts['stable-build'] /* Do not change, deferred for a reason! */, logger); }
-	if (!opts.web) { setupPreferencesTests(logger); }
+	setupPreferencesTests(logger);
 	setupSearchTests(logger);
 	setupNotebookTests(logger);
 	setupLanguagesTests(logger);
-	if (opts.web) { setupTerminalTests(logger); } // TODO@daniel TODO@meggan: Enable terminal tests for non-web when the desktop driver is moved to playwright
-	setupStatusbarTests(!!opts.web, logger);
-	if (quality !== Quality.Dev) { setupExtensionTests(logger); }
-	if (!opts.web) { setupMultirootTests(logger); }
+	if (opts.web) { setupTerminalTests(logger); } // Tests require playwright driver (https://github.com/microsoft/vscode/issues/146811)
+	setupStatusbarTests(logger);
+	if (quality !== Quality.Dev && !opts.remote) { setupExtensionTests(logger); } // https://github.com/microsoft/vscode/issues/146800
+	setupMultirootTests(logger);
 	if (!opts.web && !opts.remote && quality !== Quality.Dev) { setupLocalizationTests(logger); }
 	if (!opts.web && !opts.remote) { setupLaunchTests(logger); }
 });
diff --git a/test/smoke/test/index.js b/test/smoke/test/index.js
index 276bcfe37b6..7b2894db1e1 100644
--- a/test/smoke/test/index.js
+++ b/test/smoke/test/index.js
@@ -3,17 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-const path = require('path');
+//@ts-check
+'use strict';
+
+const { join } = require('path');
 const Mocha = require('mocha');
 const minimist = require('minimist');
 
 const [, , ...args] = process.argv;
 const opts = minimist(args, {
-	boolean: 'web',
+	boolean: ['web', 'legacy'],
 	string: ['f', 'g']
 });
 
-const suite = opts['web'] ? 'Browser Smoke Tests' : 'Desktop Smoke Tests';
+const suite = opts['web'] ? 'Browser Smoke Tests' : opts['legacy'] ? 'Desktop Smoke Tests (Legacy)' : 'Desktop Smoke Tests';
 
 const options = {
 	color: true,
@@ -28,7 +31,7 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
 		reporterEnabled: 'spec, mocha-junit-reporter',
 		mochaJunitReporterReporterOptions: {
 			testsuitesTitle: `${suite} ${process.platform}`,
-			mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${process.arch}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
+			mochaFile: join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${process.arch}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
 		}
 	};
 }
@@ -39,9 +42,8 @@ mocha.run(failures => {
 
 	// Indicate location of log files for further diagnosis
 	if (failures) {
-		const repoPath = path.join(__dirname, '..', '..', '..');
-		const logPath = path.join(repoPath, '.build', 'logs', opts.web ? 'smoke-tests-browser' : opts.remote ? 'smoke-tests-remote' : 'smoke-tests');
-		const logFile = path.join(logPath, 'smoke-test-runner.log');
+		const rootPath = join(__dirname, '..', '..', '..');
+		const logPath = join(rootPath, '.build', 'logs');
 
 		if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
 			console.log(`
@@ -62,7 +64,7 @@ mocha.run(failures => {
 # '${logPath}'.
 #
 # Logs of the smoke test runner are stored into
-# '${logFile}'.
+# 'smoke-test-runner.log' in respective folder.
 #
 #############################################
 		`);
diff --git a/test/unit/browser/index.js b/test/unit/browser/index.js
index 6e8a61872a6..f8f871d6d3b 100644
--- a/test/unit/browser/index.js
+++ b/test/unit/browser/index.js
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 //@ts-check
+'use strict';
 
 const path = require('path');
 const glob = require('glob');
diff --git a/test/unit/node/index.js b/test/unit/node/index.js
index d59ff18c3f5..4db0c54a393 100644
--- a/test/unit/node/index.js
+++ b/test/unit/node/index.js
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 //@ts-check
+'use strict';
 
 process.env.MOCHA_COLORS = '1'; // Force colors (note that this must come before any mocha imports)
 
@@ -28,8 +29,7 @@ const excludeGlob = '**/{browser,electron-sandbox,electron-browser,electron-main
 const excludeModules = [
 	'vs/platform/environment/test/node/nativeModules.test.js', // native modules are compiled against Electron and this test would fail with node.js
 	'vs/base/parts/storage/test/node/storage.test.js', // same as above, due to direct dependency to sqlite native module
-	'vs/workbench/contrib/testing/test/common/testResultStorage.test.js', // TODO@connor4312 https://github.com/microsoft/vscode/issues/137853
-	'vs/workbench/contrib/testing/test/common/testResultService.test.js', // TODO@connor4312 https://github.com/microsoft/vscode/issues/137853
+	'vs/workbench/contrib/testing/test/**' // flaky
 ];
 
 /**
diff --git a/yarn.lock b/yarn.lock
index 03c1363d3dd..9a5cc16c9dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -95,6 +95,13 @@
     events "^3.0.0"
     tslib "^2.2.0"
 
+"@babel/code-frame@7.16.7", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
+  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
+  dependencies:
+    "@babel/highlight" "^7.16.7"
+
 "@babel/code-frame@^7.0.0":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
@@ -102,13 +109,6 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
-  dependencies:
-    "@babel/highlight" "^7.16.7"
-
 "@babel/code-frame@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
@@ -121,20 +121,20 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60"
   integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==
 
-"@babel/core@^7.14.8":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.7.tgz#db990f931f6d40cb9b87a0dc7d2adc749f1dcbcf"
-  integrity sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==
+"@babel/core@7.16.12":
+  version "7.16.12"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.12.tgz#5edc53c1b71e54881315923ae2aedea2522bb784"
+  integrity sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==
   dependencies:
     "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.16.7"
+    "@babel/generator" "^7.16.8"
     "@babel/helper-compilation-targets" "^7.16.7"
     "@babel/helper-module-transforms" "^7.16.7"
     "@babel/helpers" "^7.16.7"
-    "@babel/parser" "^7.16.7"
+    "@babel/parser" "^7.16.12"
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/traverse" "^7.16.10"
+    "@babel/types" "^7.16.8"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -163,7 +163,7 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.16.7", "@babel/generator@^7.16.8":
+"@babel/generator@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe"
   integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==
@@ -172,6 +172,15 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.17.3":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz#8da2599beb4a86194a3b24df6c085931d9ee45ad"
+  integrity sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==
+  dependencies:
+    "@babel/types" "^7.17.0"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/generator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.3.tgz#0e22c005b0a94c1c74eafe19ef78ce53a4d45c03"
@@ -199,6 +208,19 @@
     browserslist "^4.17.5"
     semver "^6.3.0"
 
+"@babel/helper-create-class-features-plugin@^7.16.10":
+  version "7.17.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9"
+  integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+
 "@babel/helper-create-class-features-plugin@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.7.tgz#9c5b34b53a01f2097daf10678d65135c1b9f84ba"
@@ -293,7 +315,7 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+"@babel/helper-plugin-utils@7.16.7", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
   integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
@@ -397,6 +419,11 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
+"@babel/parser@^7.16.12", "@babel/parser@^7.17.3":
+  version "7.17.8"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.8.tgz#2817fb9d885dd8132ea0f8eb615a6388cca1c240"
+  integrity sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ==
+
 "@babel/parser@^7.16.7", "@babel/parser@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.8.tgz#61c243a3875f7d0b0962b0543a33ece6ff2f1f17"
@@ -407,7 +434,7 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.3.tgz#790874091d2001c9be6ec426c2eed47bc7679081"
   integrity sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ==
 
-"@babel/plugin-proposal-class-properties@^7.14.5":
+"@babel/plugin-proposal-class-properties@7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
   integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
@@ -415,7 +442,7 @@
     "@babel/helper-create-class-features-plugin" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-proposal-dynamic-import@^7.14.5":
+"@babel/plugin-proposal-dynamic-import@7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
   integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==
@@ -423,7 +450,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-proposal-export-namespace-from@^7.14.5":
+"@babel/plugin-proposal-export-namespace-from@7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163"
   integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==
@@ -431,7 +458,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.14.5":
+"@babel/plugin-proposal-logical-assignment-operators@7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea"
   integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==
@@ -439,7 +466,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5":
+"@babel/plugin-proposal-nullish-coalescing-operator@7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
   integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==
@@ -447,7 +474,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.14.5":
+"@babel/plugin-proposal-numeric-separator@7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9"
   integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==
@@ -455,7 +482,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-optional-chaining@^7.14.5":
+"@babel/plugin-proposal-optional-chaining@7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
   integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==
@@ -464,15 +491,15 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.14.5":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.7.tgz#e418e3aa6f86edd6d327ce84eff188e479f571e0"
-  integrity sha512-7twV3pzhrRxSwHeIvFE6coPgvo+exNDOiGUMg39o2LiLo1Y+4aKpfkcLGcg1UHonzorCt7SNXnoMyCnnIOA8Sw==
+"@babel/plugin-proposal-private-methods@7.16.11":
+  version "7.16.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
+  integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.16.10"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-proposal-private-property-in-object@^7.14.5":
+"@babel/plugin-proposal-private-property-in-object@7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
   integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
@@ -482,7 +509,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-syntax-async-generators@^7.8.4":
+"@babel/plugin-syntax-async-generators@7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
@@ -503,20 +530,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-json-strings@^7.8.3":
+"@babel/plugin-syntax-json-strings@7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz#50b6571d13f764266a113d77c82b4a6508bbe665"
-  integrity sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
@@ -538,14 +558,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-object-rest-spread@^7.8.3":
+"@babel/plugin-syntax-object-rest-spread@7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+"@babel/plugin-syntax-optional-catch-binding@7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
@@ -573,7 +593,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-modules-commonjs@^7.14.5":
+"@babel/plugin-transform-modules-commonjs@7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe"
   integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==
@@ -583,17 +603,6 @@
     "@babel/helper-simple-access" "^7.16.7"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-react-jsx@^7.14.5":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.7.tgz#86a6a220552afd0e4e1f0388a68a372be7add0d4"
-  integrity sha512-8D16ye66fxiE8m890w0BpPpngG9o9OVBBy0gH2E+2AR7qMR2ZpTYJEqLxAsoroenMId0p/wMW+Blc0meDgu0Ag==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-jsx" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
 "@babel/plugin-transform-typescript@^7.16.7":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz#591ce9b6b83504903fa9dd3652c357c2ba7a1ee0"
@@ -603,7 +612,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-typescript" "^7.16.7"
 
-"@babel/preset-typescript@^7.14.5":
+"@babel/preset-typescript@7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz#ab114d68bb2020afc069cd51b37ff98a046a70b9"
   integrity sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ==
@@ -630,6 +639,22 @@
     "@babel/parser" "^7.8.3"
     "@babel/types" "^7.8.3"
 
+"@babel/traverse@^7.16.10":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
+  integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.17.3"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.17.3"
+    "@babel/types" "^7.17.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/traverse@^7.16.7":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.8.tgz#bab2f2b09a5fe8a8d9cad22cbfe3ba1d126fef9c"
@@ -669,6 +694,14 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
+  integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    to-fast-properties "^2.0.0"
+
 "@babel/types@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c"
@@ -1013,49 +1046,45 @@
     node-addon-api "^3.2.1"
     node-gyp-build "^4.3.0"
 
-"@playwright/test@1.18.0":
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.18.0.tgz#e6ac7b588d927fdd028d72f0db1030dd777a79a7"
-  integrity sha512-ceu4DqerPlyRsdNfke4IUyWH1WccRuBokngFdPAzc5CRzlGmSTT59NBkJyn8Fg/F01CziaMFgNRrHQIMSd4g5A==
+"@playwright/test@1.20.2":
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.20.2.tgz#0da1f24bf12d5a7249fa771a5344b76170f62653"
+  integrity sha512-unkLa+xe/lP7MVC0qpgadc9iSG1+LEyGBzlXhGS/vLGAJaSFs8DNfI89hNd5shHjWfNzb34JgPVnkRKCSNo5iw==
   dependencies:
-    "@babel/code-frame" "^7.14.5"
-    "@babel/core" "^7.14.8"
-    "@babel/plugin-proposal-class-properties" "^7.14.5"
-    "@babel/plugin-proposal-dynamic-import" "^7.14.5"
-    "@babel/plugin-proposal-export-namespace-from" "^7.14.5"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
-    "@babel/plugin-proposal-numeric-separator" "^7.14.5"
-    "@babel/plugin-proposal-optional-chaining" "^7.14.5"
-    "@babel/plugin-proposal-private-methods" "^7.14.5"
-    "@babel/plugin-proposal-private-property-in-object" "^7.14.5"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-transform-modules-commonjs" "^7.14.5"
-    "@babel/plugin-transform-react-jsx" "^7.14.5"
-    "@babel/preset-typescript" "^7.14.5"
-    babel-plugin-module-resolver "^4.1.0"
+    "@babel/code-frame" "7.16.7"
+    "@babel/core" "7.16.12"
+    "@babel/helper-plugin-utils" "7.16.7"
+    "@babel/plugin-proposal-class-properties" "7.16.7"
+    "@babel/plugin-proposal-dynamic-import" "7.16.7"
+    "@babel/plugin-proposal-export-namespace-from" "7.16.7"
+    "@babel/plugin-proposal-logical-assignment-operators" "7.16.7"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "7.16.7"
+    "@babel/plugin-proposal-numeric-separator" "7.16.7"
+    "@babel/plugin-proposal-optional-chaining" "7.16.7"
+    "@babel/plugin-proposal-private-methods" "7.16.11"
+    "@babel/plugin-proposal-private-property-in-object" "7.16.7"
+    "@babel/plugin-syntax-async-generators" "7.8.4"
+    "@babel/plugin-syntax-json-strings" "7.8.3"
+    "@babel/plugin-syntax-object-rest-spread" "7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "7.8.3"
+    "@babel/plugin-transform-modules-commonjs" "7.16.8"
+    "@babel/preset-typescript" "7.16.7"
     colors "1.4.0"
-    commander "^8.2.0"
-    debug "^4.1.1"
-    expect "=27.2.5"
-    jest-matcher-utils "=27.2.5"
-    jpeg-js "^0.4.2"
-    json5 "^2.2.0"
-    mime "^2.4.6"
-    minimatch "^3.0.3"
-    ms "^2.1.2"
-    open "^8.3.0"
-    pirates "^4.0.1"
-    pixelmatch "^5.2.1"
-    playwright-core "=1.18.0"
-    pngjs "^5.0.0"
-    rimraf "^3.0.2"
-    source-map-support "^0.4.18"
-    stack-utils "^2.0.3"
-    yazl "^2.5.1"
+    commander "8.3.0"
+    debug "4.3.3"
+    expect "27.2.5"
+    jest-matcher-utils "27.2.5"
+    json5 "2.2.1"
+    mime "3.0.0"
+    minimatch "3.0.4"
+    ms "2.1.3"
+    open "8.4.0"
+    pirates "4.0.4"
+    playwright-core "1.20.2"
+    rimraf "3.0.2"
+    source-map-support "0.4.18"
+    stack-utils "2.0.5"
+    yazl "2.5.1"
 
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
@@ -1112,10 +1141,10 @@
   resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
   integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
 
-"@ts-morph/common@~0.11.1":
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/@ts-morph/common/-/common-0.11.1.tgz#281af2a0642b19354d8aa07a0d50dfdb4aa8164e"
-  integrity sha512-7hWZS0NRpEsNV8vWJzg7FEz6V8MaLNeJOmwmghqUXTpzk16V1LLZhdo+4QvE/+zv4cVci0OviuJFnqhEfoV3+g==
+"@ts-morph/common@~0.12.3":
+  version "0.12.3"
+  resolved "https://registry.yarnpkg.com/@ts-morph/common/-/common-0.12.3.tgz#a96e250217cd30e480ab22ec6a0ebbe65fd784ff"
+  integrity sha512-4tUmeLyXJnJWvTFOKtcNJ1yh0a3SsTLi2MUoyj8iUNznFRN1ZquaNe7Oukqrnki2FzZkm0J9adCNLDZxUzvj+w==
   dependencies:
     fast-glob "^3.2.7"
     minimatch "^3.0.4"
@@ -1580,14 +1609,14 @@
   resolved "https://registry.yarnpkg.com/@vscode/sudo-prompt/-/sudo-prompt-9.3.1.tgz#c562334bc6647733649fd42afc96c0eea8de3b65"
   integrity sha512-9ORTwwS74VaTn38tNbQhsA5U44zkJfcb0BdTSyyG6frP4e8KMtHuTXYmwefe5dpL8XB1aGSIVTaLjD3BbWb5iA==
 
-"@vscode/telemetry-extractor@^1.9.5":
-  version "1.9.5"
-  resolved "https://registry.yarnpkg.com/@vscode/telemetry-extractor/-/telemetry-extractor-1.9.5.tgz#8c77165a0b2dcc5caafa7b94d93cf6581e740838"
-  integrity sha512-1A8eBeJu2tzPBuTqrBeUD9hwsmeCZQSpQURomTXz0LiKwED5GUS/UpRh9WNaDO4A4yix9RC0/wwJok5k8NqvCg==
+"@vscode/telemetry-extractor@^1.9.6":
+  version "1.9.6"
+  resolved "https://registry.yarnpkg.com/@vscode/telemetry-extractor/-/telemetry-extractor-1.9.6.tgz#1b8d31c2ea841b33e5aa4e9c69a01f011cfc3add"
+  integrity sha512-G5m3NRNXW5ePsm4dft64EiOOopYin/3vQ6mBwWKkgnRkD8LivVvtDBjDMwZGsN5lF0w4t+ugb+IE4bXfMhZMcg==
   dependencies:
-    command-line-args "^5.2.0"
-    ts-morph "^12.2.0"
-    vscode-ripgrep "^1.12.1"
+    "@vscode/ripgrep" "^1.14.2"
+    command-line-args "^5.2.1"
+    ts-morph "^13.0.3"
 
 "@vscode/test-web@^0.0.22":
   version "0.0.22"
@@ -1955,11 +1984,6 @@ agent-base@4:
   dependencies:
     es6-promisify "^5.0.0"
 
-agent-base@5:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
-  integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==
-
 agent-base@6:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.1.tgz#808007e4e5867decb0ab6ab2f928fbdb5a596db4"
@@ -2441,17 +2465,6 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-module-resolver@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-4.1.0.tgz#22a4f32f7441727ec1fbf4967b863e1e3e9f33e2"
-  integrity sha512-MlX10UDheRr3lb3P0WcaIdtCSRlxdQsB1sBqL7W0raF070bGl1HQQq5K3T2vf2XAYie+ww+5AKC/WrkjRO2knA==
-  dependencies:
-    find-babel-config "^1.2.0"
-    glob "^7.1.6"
-    pkg-up "^3.1.0"
-    reselect "^4.0.0"
-    resolve "^1.13.1"
-
 bach@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/bach/-/bach-1.2.0.tgz#4b3ce96bf27134f79a1b414a51c14e34c3bd9880"
@@ -3214,10 +3227,12 @@ coa@^2.0.2:
     chalk "^2.4.1"
     q "^1.1.2"
 
-code-block-writer@^10.1.1:
-  version "10.1.1"
-  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-10.1.1.tgz#ad5684ed4bfb2b0783c8b131281ae84ee640a42f"
-  integrity sha512-67ueh2IRGst/51p0n6FvPrnRjAGHY5F8xdjkgrYE7DDzpJe6qA07RYQ9VcoUeo5ATOjSOiWpSL3SWBRRbempMw==
+code-block-writer@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-11.0.0.tgz#5956fb186617f6740e2c3257757fea79315dd7d4"
+  integrity sha512-GEqWvEWWsOvER+g9keO4ohFoD3ymwyCnqY3hoTr7GZipYFwEhMHJw+TtV0rfgRhNImM6QWZGO2XYjlJVyYT62w==
+  dependencies:
+    tslib "2.3.1"
 
 code-point-at@^1.0.0:
   version "1.1.0"
@@ -3308,10 +3323,10 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-command-line-args@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.2.0.tgz#087b02748272169741f1fd7c785b295df079b9be"
-  integrity sha512-4zqtU1hYsSJzcJBOcNZIbW5Fbk9BkjCp1pZVhQKoRaWL5J7N4XphDLwo8aWwdQpTugxwu+jf9u2ZhkXiqp5Z6A==
+command-line-args@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.2.1.tgz#c44c32e437a57d7c51157696893c5909e9cec42e"
+  integrity sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg==
   dependencies:
     array-back "^3.1.0"
     find-replace "^3.0.0"
@@ -3328,6 +3343,11 @@ commander@2.11.x:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
   integrity sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==
 
+commander@8.3.0, commander@^8.2.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
+  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
+
 commander@^2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
@@ -3348,11 +3368,6 @@ commander@^7.0.0, commander@^7.2.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
-commander@^8.2.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
-  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
-
 commandpost@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/commandpost/-/commandpost-1.2.1.tgz#2e9c4c7508b9dc704afefaa91cab92ee6054cc68"
@@ -3856,6 +3871,13 @@ debug@4.3.1, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
   dependencies:
     ms "2.1.2"
 
+debug@4.3.3, debug@^4.3.2:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
+  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
+  dependencies:
+    ms "2.1.2"
+
 debug@^3.1.0:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
@@ -3863,13 +3885,6 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.3.2:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
-  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
-  dependencies:
-    ms "2.1.2"
-
 decamelize@^1.1.1, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -4297,10 +4312,10 @@ electron-to-chromium@^1.4.17:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.45.tgz#cf1144091d6683cbd45a231954a745f02fb24598"
   integrity sha512-czF9eYVuOmlY/vxyMQz2rGlNSjZpxNQYBe1gmQv7al171qOIhgyO9k7D5AKlgeTCSPKk+LHhj5ZyIdmEub9oNg==
 
-electron@17.3.0:
-  version "17.3.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-17.3.0.tgz#cdcc46a7a3cd0b6f2a1757fbeb807f6b2fce847e"
-  integrity sha512-KuYHCOw1a+CE9thZlWRqTScf6M81KLd6n5qpdBGb0rl62+50RUuau9CnYpBb3EJxrjsXLaiQCBBSdPsozf/XUg==
+electron@17.3.1:
+  version "17.3.1"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-17.3.1.tgz#083b6bd034eb1ee7d75378316d6460348eb62605"
+  integrity sha512-C5E3uvXo1cmI+xYtbiMCW8AAGhBL0HbLA6cqD7FJmBoPtY88W/3A/km5z8oPGORyBNgSe7tSoHx4a6jWJIR+og==
   dependencies:
     "@electron/get" "^1.13.0"
     "@types/node" "^14.6.2"
@@ -4867,7 +4882,7 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-expect@=27.2.5:
+expect@27.2.5:
   version "27.2.5"
   resolved "https://registry.yarnpkg.com/expect/-/expect-27.2.5.tgz#16154aaa60b4d9a5b0adacfea3e4d6178f4b93fd"
   integrity sha512-ZrO0w7bo8BgGoP/bLz+HDCI+0Hfei9jUSZs5yI/Wyn9VkG9w8oJ7rHRgYj+MA7yqqFa0IwHA3flJzZtYugShJA==
@@ -4936,17 +4951,7 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extract-zip@^1.0.3:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
-  integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
-  dependencies:
-    concat-stream "^1.6.2"
-    debug "^2.6.9"
-    mkdirp "^0.5.4"
-    yauzl "^2.10.0"
-
-extract-zip@^2.0.1:
+extract-zip@2.0.1, extract-zip@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
   integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
@@ -4957,6 +4962,16 @@ extract-zip@^2.0.1:
   optionalDependencies:
     "@types/yauzl" "^2.9.1"
 
+extract-zip@^1.0.3:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
+  integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
+  dependencies:
+    concat-stream "^1.6.2"
+    debug "^2.6.9"
+    mkdirp "^0.5.4"
+    yauzl "^2.10.0"
+
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -5133,14 +5148,6 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-find-babel-config@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2"
-  integrity sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==
-  dependencies:
-    json5 "^0.5.1"
-    path-exists "^3.0.0"
-
 find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
@@ -6283,6 +6290,14 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
+https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
 https-proxy-agent@^2.2.3:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
@@ -6291,22 +6306,6 @@ https-proxy-agent@^2.2.3:
     agent-base "^4.3.0"
     debug "^3.1.0"
 
-https-proxy-agent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b"
-  integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==
-  dependencies:
-    agent-base "5"
-    debug "4"
-
-https-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
-  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
-  dependencies:
-    agent-base "6"
-    debug "4"
-
 human-signals@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
@@ -6619,13 +6618,6 @@ is-core-module@^2.2.0:
   dependencies:
     has "^1.0.3"
 
-is-core-module@^2.8.0:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
-  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
-  dependencies:
-    has "^1.0.3"
-
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -7012,7 +7004,7 @@ jest-get-type@^27.0.6, jest-get-type@^27.4.0:
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.4.0.tgz#7503d2663fffa431638337b3998d39c5e928e9b5"
   integrity sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==
 
-jest-matcher-utils@=27.2.5:
+jest-matcher-utils@27.2.5:
   version "27.2.5"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.2.5.tgz#4684faaa8eb32bf15e6edaead6834031897e2980"
   integrity sha512-qNR/kh6bz0Dyv3m68Ck2g1fLW5KlSOUNcFQh87VXHZwWc/gY6XwnKofx76Qytz3x5LDWT09/2+yXndTkaG4aWg==
@@ -7061,7 +7053,7 @@ jest-worker@^27.0.2:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jpeg-js@^0.4.2:
+jpeg-js@0.4.3, jpeg-js@^0.4.2:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.3.tgz#6158e09f1983ad773813704be80680550eff977b"
   integrity sha512-ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q==
@@ -7162,10 +7154,10 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+json5@2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
+  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
 
 json5@^1.0.1:
   version "1.0.1"
@@ -7188,13 +7180,6 @@ json5@^2.1.2:
   dependencies:
     minimist "^1.2.5"
 
-json5@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
-  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
-  dependencies:
-    minimist "^1.2.5"
-
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -7868,6 +7853,11 @@ mime-types@^2.1.27:
   dependencies:
     mime-db "1.48.0"
 
+mime@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7"
+  integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==
+
 mime@^1.3.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
@@ -8116,7 +8106,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.1.1, ms@^2.1.2:
+ms@2.1.3, ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -8606,7 +8596,7 @@ only@~0.0.2:
   resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4"
   integrity sha1-Kv3oTQPlC5qO3EROMGEKcCle37Q=
 
-open@^8.3.0:
+open@8.4.0:
   version "8.4.0"
   resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
   integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
@@ -8906,7 +8896,7 @@ path-key@^3.0.0, path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
-path-parse@^1.0.6, path-parse@^1.0.7:
+path-parse@^1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
@@ -9036,12 +9026,12 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pirates@^4.0.1:
+pirates@4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.4.tgz#07df81e61028e402735cdd49db701e4885b4e6e6"
   integrity sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==
 
-pixelmatch@^5.2.1:
+pixelmatch@5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-5.2.1.tgz#9e4e4f4aa59648208a31310306a5bed5522b0d65"
   integrity sha512-WjcAdYSnKrrdDdqTcVEY7aB7UhhwjYQKYhHiBXdJef0MOaQeYpUdQ+iVyBLa5YBKS8MPVPPMX7rpOByISLpeEQ==
@@ -9062,34 +9052,29 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-pkg-up@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
-  integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
+playwright-core@1.20.2:
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.20.2.tgz#02336afd9a631d59a666f11f3492550201c6c31b"
+  integrity sha512-iV6+HftSPalynkq0CYJala1vaTOq7+gU9BRfKCdM9bAxNq/lFLrwbluug2Wt5OoUwbMABcnTThIEm3/qUhCdJQ==
   dependencies:
-    find-up "^3.0.0"
-
-playwright-core@=1.18.0:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.18.0.tgz#b4d2b9068f26357adaa952a13254796fd439f322"
-  integrity sha512-JTRlCVpfAFcC1nth+XIE07w6M5m6C8PaEoClv7wGWF97cyDMcHIij0xIVEKMKli7IG5N0mqjLDFc/akXSbMZ1g==
-  dependencies:
-    commander "^8.2.0"
-    debug "^4.1.1"
-    extract-zip "^2.0.1"
-    https-proxy-agent "^5.0.0"
-    jpeg-js "^0.4.2"
-    mime "^2.4.6"
-    pngjs "^5.0.0"
-    progress "^2.0.3"
-    proper-lockfile "^4.1.1"
-    proxy-from-env "^1.1.0"
-    rimraf "^3.0.2"
-    socks-proxy-agent "^6.1.0"
-    stack-utils "^2.0.3"
-    ws "^7.4.6"
-    yauzl "^2.10.0"
-    yazl "^2.5.1"
+    colors "1.4.0"
+    commander "8.3.0"
+    debug "4.3.3"
+    extract-zip "2.0.1"
+    https-proxy-agent "5.0.0"
+    jpeg-js "0.4.3"
+    mime "3.0.0"
+    pixelmatch "5.2.1"
+    pngjs "6.0.0"
+    progress "2.0.3"
+    proper-lockfile "4.1.2"
+    proxy-from-env "1.1.0"
+    rimraf "3.0.2"
+    socks-proxy-agent "6.1.1"
+    stack-utils "2.0.5"
+    ws "8.4.2"
+    yauzl "2.10.0"
+    yazl "2.5.1"
 
 playwright-core@=1.18.1:
   version "1.18.1"
@@ -9149,6 +9134,11 @@ plugin-error@^1.0.0, plugin-error@^1.0.1:
     arr-union "^3.1.0"
     extend-shallow "^3.0.2"
 
+pngjs@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-6.0.0.tgz#ca9e5d2aa48db0228a52c419c3308e87720da821"
+  integrity sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==
+
 pngjs@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-4.0.1.tgz#f803869bb2fc1bfe1bf99aa4ec21c108117cfdbe"
@@ -9550,22 +9540,22 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
+progress@2.0.3, progress@^2.0.0, progress@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+
 progress@^1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
   integrity sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=
 
-progress@^2.0.0, progress@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
-proper-lockfile@^4.1.1:
+proper-lockfile@4.1.2, proper-lockfile@^4.1.1:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f"
   integrity sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==
@@ -9579,7 +9569,7 @@ proto-list@~1.2.1:
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
 
-proxy-from-env@^1.1.0:
+proxy-from-env@1.1.0, proxy-from-env@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
@@ -9969,11 +9959,6 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-reselect@^4.0.0:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.5.tgz#852c361247198da6756d07d9296c2b51eddb79f6"
-  integrity sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ==
-
 resolve-cwd@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -10032,15 +10017,6 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.4.0:
     is-core-module "^2.1.0"
     path-parse "^1.0.6"
 
-resolve@^1.13.1:
-  version "1.21.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.21.0.tgz#b51adc97f3472e6a5cf4444d34bc9d6b9037591f"
-  integrity sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==
-  dependencies:
-    is-core-module "^2.8.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
 resolve@^1.3.2:
   version "1.14.2"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.2.tgz#dbf31d0fa98b1f29aa5169783b9c290cb865fea2"
@@ -10110,7 +10086,7 @@ rimraf@2.6.3, rimraf@~2.6.2:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.2:
+rimraf@3.0.2, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -10469,6 +10445,15 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
+socks-proxy-agent@6.1.1, socks-proxy-agent@^6.1.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz#e664e8f1aaf4e1fb3df945f09e3d94f911137f87"
+  integrity sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==
+  dependencies:
+    agent-base "^6.0.2"
+    debug "^4.3.1"
+    socks "^2.6.1"
+
 socks-proxy-agent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz#7c0f364e7b1cf4a7a437e71253bed72e9004be60"
@@ -10478,15 +10463,6 @@ socks-proxy-agent@^5.0.0:
     debug "4"
     socks "^2.3.3"
 
-socks-proxy-agent@^6.1.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz#e664e8f1aaf4e1fb3df945f09e3d94f911137f87"
-  integrity sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==
-  dependencies:
-    agent-base "^6.0.2"
-    debug "^4.3.1"
-    socks "^2.6.1"
-
 socks@^2.3.3, socks@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e"
@@ -10519,6 +10495,13 @@ source-map-resolve@^0.6.0:
     atob "^2.1.2"
     decode-uri-component "^0.2.0"
 
+source-map-support@0.4.18:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
+  dependencies:
+    source-map "^0.5.6"
+
 source-map-support@^0.3.2:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.3.3.tgz#34900977d5ba3f07c7757ee72e73bb1a9b53754f"
@@ -10526,13 +10509,6 @@ source-map-support@^0.3.2:
   dependencies:
     source-map "0.1.32"
 
-source-map-support@^0.4.18:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
-  dependencies:
-    source-map "^0.5.6"
-
 source-map-support@~0.5.12, source-map-support@~0.5.19:
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
@@ -10683,7 +10659,7 @@ stack-trace@0.0.10:
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
   integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
 
-stack-utils@^2.0.3:
+stack-utils@2.0.5, stack-utils@^2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5"
   integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==
@@ -11005,11 +10981,6 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-preserve-symlinks-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
-  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
-
 sver-compat@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/sver-compat/-/sver-compat-1.5.0.tgz#3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8"
@@ -11386,13 +11357,13 @@ ts-loader@^9.2.7:
     micromatch "^4.0.0"
     semver "^7.3.4"
 
-ts-morph@^12.2.0:
-  version "12.2.0"
-  resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-12.2.0.tgz#3332319cecd44aff0b7b410f1fe39637499b1a1b"
-  integrity sha512-WHXLtFDcIRwoqaiu0elAoZ/AmI+SwwDafnPKjgJmdwJ2gRVO0jMKBt88rV2liT/c6MTsXyuWbGFiHe9MRddWJw==
+ts-morph@^13.0.3:
+  version "13.0.3"
+  resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-13.0.3.tgz#c0c51d1273ae2edb46d76f65161eb9d763444c1d"
+  integrity sha512-pSOfUMx8Ld/WUreoSzvMFQG5i9uEiWIsBYjpU9+TTASOeUa89j5HykomeqVULm1oqWtBdleI3KEFRLrlA3zGIw==
   dependencies:
-    "@ts-morph/common" "~0.11.1"
-    code-block-writer "^10.1.1"
+    "@ts-morph/common" "~0.12.3"
+    code-block-writer "^11.0.0"
 
 tsec@0.1.4:
   version "0.1.4"
@@ -11402,6 +11373,11 @@ tsec@0.1.4:
     glob "^7.1.1"
     minimatch "^3.0.3"
 
+tslib@2.3.1, tslib@^2.0.0, tslib@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
+
 tslib@^1.8.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
@@ -11412,11 +11388,6 @@ tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.0, tslib@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
-  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
-
 tsscmp@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
@@ -11932,14 +11903,6 @@ vscode-regexpp@^3.1.0:
   resolved "https://registry.yarnpkg.com/vscode-regexpp/-/vscode-regexpp-3.1.0.tgz#42d059b6fffe99bd42939c0d013f632f0cad823f"
   integrity sha512-pqtN65VC1jRLawfluX4Y80MMG0DHJydWhe5ZwMHewZD6sys4LbU6lHwFAHxeuaVE6Y6+xZOtAw+9hvq7/0ejkg==
 
-vscode-ripgrep@^1.12.1:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.13.2.tgz#8ccebc33f14d54442c4b11962aead163c55b506e"
-  integrity sha512-RlK9U87EokgHfiOjDQ38ipQQX936gWOcWPQaJpYf+kAkz1PQ1pK2n7nhiscdOmLu6XGjTs7pWFJ/ckonpN7twQ==
-  dependencies:
-    https-proxy-agent "^4.0.0"
-    proxy-from-env "^1.1.0"
-
 vscode-textmate@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-6.0.0.tgz#a3777197235036814ac9a92451492f2748589210"
@@ -12266,6 +12229,11 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
+ws@8.4.2:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.4.2.tgz#18e749868d8439f2268368829042894b6907aa0b"
+  integrity sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==
+
 ws@^7.2.0:
   version "7.4.6"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
@@ -12324,35 +12292,35 @@ xtend@~2.1.1:
   dependencies:
     object-keys "~0.4.0"
 
-xterm-addon-search@0.9.0-beta.17:
-  version "0.9.0-beta.17"
-  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.9.0-beta.17.tgz#4cd575fd67a010af3d0b224092527747bb87c219"
-  integrity sha512-/Q6xQ/HunP2BxJU4NTsLX9aH376tsT9dpcS+NFBDVbwB1iPF02JhedHmA4mxY3KGNyQflefhwyGGMKZfTau2iA==
+xterm-addon-search@0.9.0-beta.18:
+  version "0.9.0-beta.18"
+  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.9.0-beta.18.tgz#5317aed1dc747f468ccb7ecd151fb00d82a8a19d"
+  integrity sha512-SAeA3thc2WJNYXwjOEJFLpZ1ZVOs22RLmz9a6WcrzXkvCjLZRvbRGwX25Ms+Dd7dVDQNbKVUzUJohspP/vYr0Q==
 
-xterm-addon-serialize@0.7.0-beta.11:
-  version "0.7.0-beta.11"
-  resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.7.0-beta.11.tgz#d9d6a862b3d70fc6160e39bc235a2a9ef45e20d6"
-  integrity sha512-okirLeH8VpOxlnZkER2lN0emaTgWe/DHVGpY9ByfLIoYw506Ci2LRcOjyYwJBRTJcfLp3TGnwQSYfooCZHDndw==
+xterm-addon-serialize@0.7.0-beta.12:
+  version "0.7.0-beta.12"
+  resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.7.0-beta.12.tgz#4f845d8b1a9f9b7ae3f910455ce8c58b041babc7"
+  integrity sha512-b4Ug0B/RSJMux+KAcp+PXVqubVyXjN1yCQw1FOkgVYTpmd9AH/X+EcxKml5Lz8DsKmsXqfD9AlV3WpEeT+OtMw==
 
 xterm-addon-unicode11@0.4.0-beta.3:
   version "0.4.0-beta.3"
   resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.3.tgz#f350184155fafd5ad0d6fbf31d13e6ca7dea1efa"
   integrity sha512-FryZAVwbUjKTmwXnm1trch/2XO60F5JsDvOkZhzobV1hm10sFLVuZpFyHXiUx7TFeeFsvNP+S77LAtWoeT5z+Q==
 
-xterm-addon-webgl@0.12.0-beta.25:
-  version "0.12.0-beta.25"
-  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.25.tgz#67fd222d245c4bf749b2abdf0acec640fb575bcd"
-  integrity sha512-QK0r6hi+plkMtHZrOlUO/IcDa9mnYxOKrqrmzbjxT6cuhXJf2EiWpBBY6Rkk0cVXtDOlkGO1b7hWvD3qeWeWvQ==
+xterm-addon-webgl@0.12.0-beta.27:
+  version "0.12.0-beta.27"
+  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.27.tgz#afc5bc01d1ef3af9005fb9f6325a4db9c92aa8d9"
+  integrity sha512-P948trotU8FMHtaA7C2x97VpLq6QLSjO53kWNvONS0/XwEKQBIYCI7Jfri2wcLgfQg6Cn4OQGLoj2YBK3MMyww==
 
-xterm-headless@4.19.0-beta.17:
-  version "4.19.0-beta.17"
-  resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.19.0-beta.17.tgz#0540b4526f31f2aab6d026f91ac56475260d45e0"
-  integrity sha512-A6CbJauiCDur5BZ6kHOCJ3rPLPAdX4JHMGazt0UoYkgbi0xQun+3P2M8C7Ll/NS/zZtv6aPJHAHeXu2TWqV5Lg==
+xterm-headless@4.19.0-beta.20:
+  version "4.19.0-beta.20"
+  resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.19.0-beta.20.tgz#9e401920fcc24c2474e0bd45df932c62413594da"
+  integrity sha512-twp0vCyfdI4wVgDrwxaHk1FtC4UhTNNgbIPT6yVPjICOUkUTOvFjrQCNKHv2uMOJo9uAH2gyOsIqHdEP549rJA==
 
-xterm@4.19.0-beta.17:
-  version "4.19.0-beta.17"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.19.0-beta.17.tgz#79b177eedd3bc835e1951f38318b5c0c04039896"
-  integrity sha512-NvfGJLfZa0SHGR6WttNfugRYizM20gVbWM/nVJAlyHruMZ/rfJj29MuPERJAZTNHtRnYplhAP8bSc3r7/2l+dg==
+xterm@4.19.0-beta.20:
+  version "4.19.0-beta.20"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.19.0-beta.20.tgz#d8e970d8a8460c1d1a5ec9866f78f607a44c1349"
+  integrity sha512-IYI4ngSWzpV4sJXLWGEDF7vgLuUHn0CUQ42+TGv4H/hCGo4uru4s/D3Yws0ETb3a9VwRpZEPsigULaWTnhFusg==
 
 y18n@^3.2.1:
   version "3.2.2"
@@ -12523,7 +12491,7 @@ yaserver@^0.2.0:
   resolved "https://registry.yarnpkg.com/yaserver/-/yaserver-0.2.0.tgz#56393027dc13f3c1bb89d20e0bd17269aa927802"
   integrity sha512-onsELrl7Y42M4P3T9R0N/ZJNJRu4cGwzhDyOWIFRMJvPUIrGKInYGh+DJBefrbr1qoyDu7DSCLl9BL5hSSVfDA==
 
-yauzl@^2.10.0, yauzl@^2.4.2, yauzl@^2.9.2:
+yauzl@2.10.0, yauzl@^2.10.0, yauzl@^2.4.2, yauzl@^2.9.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
   integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
@@ -12539,6 +12507,13 @@ yauzl@^2.2.1:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.0.1"
 
+yazl@2.5.1, yazl@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.5.1.tgz#a3d65d3dd659a5b0937850e8609f22fffa2b5c35"
+  integrity sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==
+  dependencies:
+    buffer-crc32 "~0.2.3"
+
 yazl@^2.2.1, yazl@^2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.4.3.tgz#ec26e5cc87d5601b9df8432dbdd3cd2e5173a071"
@@ -12546,13 +12521,6 @@ yazl@^2.2.1, yazl@^2.4.3:
   dependencies:
     buffer-crc32 "~0.2.3"
 
-yazl@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.5.1.tgz#a3d65d3dd659a5b0937850e8609f22fffa2b5c35"
-  integrity sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==
-  dependencies:
-    buffer-crc32 "~0.2.3"
-
 ylru@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.2.1.tgz#f576b63341547989c1de7ba288760923b27fe84f"