web - remove legacy environment support

Benjamin Pasero · Benjamin Pasero · commit c21ca53c18e8 · 2019-12-06T17:53:05.000+01:00
diff --git a/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.ts b/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.ts
@@ -65,11 +65,6 @@ class BrowserExtensionHostDebugService extends ExtensionHostDebugChannelClient i
 
 	openExtensionDevelopmentHostWindow(args: string[], env: IProcessEnvironment): Promise<void> {
 
-		if (!this.workspaceProvider.payload) {
-			// TODO@Ben remove me once environment is adopted
-			return this.openExtensionDevelopmentHostWindowLegacy(args);
-		}
-
 		// Find out which workspace to open debug window on
 		let debugWorkspace: IWorkspace = undefined;
 		const folderUriArg = this.findArgument('folder-uri', args);
@@ -117,66 +112,6 @@ class BrowserExtensionHostDebugService extends ExtensionHostDebugChannelClient i
 		});
 	}
 
-	private openExtensionDevelopmentHostWindowLegacy(args: string[]): Promise<void> {
-		// we pass the "args" as query parameters of the URL
-
-		let newAddress = `${document.location.origin}${document.location.pathname}?`;
-		let gotFolder = false;
-
-		const addQueryParameter = (key: string, value: string) => {
-			const lastChar = newAddress.charAt(newAddress.length - 1);
-			if (lastChar !== '?' && lastChar !== '&') {
-				newAddress += '&';
-			}
-			newAddress += `${key}=${encodeURIComponent(value)}`;
-		};
-
-		const findArgument = (key: string) => {
-			for (let a of args) {
-				const k = `--${key}=`;
-				if (a.indexOf(k) === 0) {
-					return a.substr(k.length);
-				}
-			}
-			return undefined;
-		};
-
-		const f = findArgument('folder-uri');
-		if (f) {
-			const u = URI.parse(f);
-			gotFolder = true;
-			addQueryParameter('folder', u.path);
-		}
-		if (!gotFolder) {
-			// request empty window
-			addQueryParameter('ew', 'true');
-		}
-
-		const ep = findArgument('extensionDevelopmentPath');
-		if (ep) {
-			addQueryParameter('extensionDevelopmentPath', ep);
-		}
-
-		const etp = findArgument('extensionTestsPath');
-		if (etp) {
-			addQueryParameter('extensionTestsPath', etp);
-		}
-
-		const di = findArgument('debugId');
-		if (di) {
-			addQueryParameter('debugId', di);
-		}
-
-		const ibe = findArgument('inspect-brk-extensions');
-		if (ibe) {
-			addQueryParameter('inspect-brk-extensions', ibe);
-		}
-
-		window.open(newAddress);
-
-		return Promise.resolve();
-	}
-
 	private findArgument(key: string, args: string[]): string | undefined {
 		for (const a of args) {
 			const k = `--${key}=`;
diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts
@@ -308,36 +308,6 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
 						break;
 				}
 			}
-		} else {
-			// TODO@Ben remove me once environment is adopted
-			if (document && document.location && document.location.search) {
-				const map = new Map<string, string>();
-				const query = document.location.search.substring(1);
-				const vars = query.split('&');
-				for (let p of vars) {
-					const pair = p.split('=');
-					if (pair.length >= 2) {
-						map.set(pair[0], decodeURIComponent(pair[1]));
-					}
-				}
-
-				const edp = map.get('extensionDevelopmentPath');
-				if (edp) {
-					extensionHostDebugEnvironment.extensionDevelopmentLocationURI = [URI.parse(edp)];
-					extensionHostDebugEnvironment.isExtensionDevelopment = true;
-				}
-
-				const di = map.get('debugId');
-				if (di) {
-					extensionHostDebugEnvironment.params.debugId = di;
-				}
-
-				const ibe = map.get('inspect-brk-extensions');
-				if (ibe) {
-					extensionHostDebugEnvironment.params.port = parseInt(ibe);
-					extensionHostDebugEnvironment.params.break = false;
-				}
-			}
 		}
 
 		return extensionHostDebugEnvironment;
