Merge pull request microsoft#96211 from microsoft/weinand-patch-95957

selectively propagate debugging arguments for payload
berknam · Apr 27, 2020 · cfa8b26 · cfa8b26
2 parents 18528b3 + 329b0a0
commit cfa8b26
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/src/vs/workbench/services/host/browser/browserHostService.ts b/src/vs/workbench/services/host/browser/browserHostService.ts
@@ -117,14 +117,34 @@ export class BrowserHostService extends Disposable implements IHostService {
 			const openable = toOpen[i];
 			openable.label = openable.label || this.getRecentLabel(openable);
 
+			// selectively copy payload: for now only extension debugging properties are considered
+			const originalPayload = this.workspaceProvider.payload;
+			let newPayload: Array<unknown> | undefined = undefined;
+			if (originalPayload && Array.isArray(originalPayload)) {
+				for (let pair of originalPayload) {
+					if (Array.isArray(pair) && pair.length === 2) {
+						switch (pair[0]) {
+							case 'extensionDevelopmentPath':
+							case 'debugId':
+							case 'inspect-brk-extensions':
+								if (!newPayload) {
+									newPayload = new Array();
+								}
+								newPayload.push(pair);
+								break;
+						}
+					}
+				}
+			}
+
 			// Folder
 			if (isFolderToOpen(openable)) {
-				this.workspaceProvider.open({ folderUri: openable.folderUri }, { reuse: this.shouldReuse(options, false /* no file */) });
+				this.workspaceProvider.open({ folderUri: openable.folderUri }, { reuse: this.shouldReuse(options, false /* no file */), payload: newPayload });
 			}
 
 			// Workspace
 			else if (isWorkspaceToOpen(openable)) {
-				this.workspaceProvider.open({ workspaceUri: openable.workspaceUri }, { reuse: this.shouldReuse(options, false /* no file */) });
+				this.workspaceProvider.open({ workspaceUri: openable.workspaceUri }, { reuse: this.shouldReuse(options, false /* no file */), payload: newPayload });
 			}
 
 			// File