Merge from vscode 591842cc4b71958c81947b254924a215fe3edcbd (#4886)

src/vs/code/electron-browser/issue/issueReporterMain.ts

@@ -917,6 +917,18 @@ export class IssueReporter extends Disposable {
 				<tr><td>VM</td><td>${systemInfo.vmHint}</td></tr>
 			</table>`;
 
+			systemInfo.remoteData.forEach(remote => {
+				renderedData += `
+				<hr>
+				<table>
+					<tr><td>Remote</td><td>${remote.hostName}</td></tr>
+					<tr><td>OS</td><td>${remote.machineInfo.os}</td></tr>
+					<tr><td>CPUs</td><td>${remote.machineInfo.cpus}</td></tr>
+					<tr><td>Memory (System)</td><td>${remote.machineInfo.memory}</td></tr>
+					<tr><td>VM</td><td>${remote.machineInfo.vmHint}</td></tr>
+				</table>`;
+			});
+
 			target.innerHTML = renderedData;
 		}
 	}

src/vs/code/electron-browser/issue/issueReporterModel.ts

@@ -69,11 +69,19 @@ ${this._data.issueDescription}
 
 Azure Data Studio version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
 OS version: ${this._data.versionInfo && this._data.versionInfo.os}
-
+${this.getRemoteOSes()}
 ${this.getInfos()}
 <!-- generated by issue reporter -->`;
 	}
 
+	private getRemoteOSes(): string {
+		if (this._data.systemInfo && this._data.systemInfo.remoteData.length) {
+			return this._data.systemInfo.remoteData.map(remote => `Remote OS version: ${remote.machineInfo.os}`).join('\n') + '\n';
+		}
+
+		return '';
+	}
+
 	fileOnExtension(): boolean | undefined {
 		const fileOnExtensionSupported = this._data.issueType === IssueType.Bug
 			|| this._data.issueType === IssueType.PerformanceIssue
@@ -159,6 +167,18 @@ ${this.getInfos()}
 |Process Argv|${this._data.systemInfo.processArgs}|
 |Screen Reader|${this._data.systemInfo.screenReader}|
 |VM|${this._data.systemInfo.vmHint}|`;
+
+			this._data.systemInfo.remoteData.forEach(remote => {
+				md += `
+
+|Item|Value|
+|---|---|
+|Remote|${remote.hostName}|
+|OS|${remote.machineInfo.os}|
+|CPUs|${remote.machineInfo.cpus}|
+|Memory (System)|${remote.machineInfo.memory}|
+|VM|${remote.machineInfo.vmHint}|`;
+			});
 		}
 
 		md += '\n</details>';

src/vs/code/electron-browser/issue/test/testReporterModel.test.ts

@@ -50,6 +50,7 @@ Extensions: none
 				vmHint: '0%',
 				processArgs: '',
 				screenReader: 'no',
+				remoteData: [],
 				gpuStatus: {
 					'2d_canvas': 'enabled',
 					'checker_imaging': 'disabled_off'
@@ -82,6 +83,67 @@ OS version: undefined
 <!-- generated by issue reporter -->`);
 	});
 
+	test('serializes remote information when data is provided', () => {
+		const issueReporterModel = new IssueReporterModel({
+			issueType: 0,
+			systemInfo: {
+				os: 'Darwin',
+				cpus: 'Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz (8 x 2800)',
+				memory: '16.00GB',
+				vmHint: '0%',
+				processArgs: '',
+				screenReader: 'no',
+				gpuStatus: {
+					'2d_canvas': 'enabled',
+					'checker_imaging': 'disabled_off'
+				},
+				remoteData: [
+					{
+						hostName: 'SSH: Pineapple',
+						machineInfo: {
+							os: 'Linux x64 4.18.0',
+							cpus: 'Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz (2 x 2294)',
+							memory: '8GB',
+							vmHint: '100%'
+						}
+					}
+				]
+			}
+		});
+		assert.equal(issueReporterModel.serialize(),
+			`
+Issue Type: <b>Bug</b>
+
+undefined
+
+VS Code version: undefined
+OS version: undefined
+Remote OS version: Linux x64 4.18.0
+
+<details>
+<summary>System Info</summary>
+
+|Item|Value|
+|---|---|
+|CPUs|Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz (8 x 2800)|
+|GPU Status|2d_canvas: enabled<br>checker_imaging: disabled_off|
+|Load (avg)|undefined|
+|Memory (System)|16.00GB|
+|Process Argv||
+|Screen Reader|no|
+|VM|0%|
+
+|Item|Value|
+|---|---|
+|Remote|SSH: Pineapple|
+|OS|Linux x64 4.18.0|
+|CPUs|Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz (2 x 2294)|
+|Memory (System)|8GB|
+|VM|100%|
+</details>Extensions: none
+<!-- generated by issue reporter -->`);
+	});
+
 	test('should normalize GitHub urls', () => {
 		[
 			'https://github.com/repo',

src/vs/code/electron-browser/workbench/workbench.js

@@ -64,7 +64,14 @@ bootstrapWindow.load([
 	});
 
 /**
- * @param {object} configuration
+ * // configuration: IWindowConfiguration
+ * @param {{
+ *	partsSplashPath?: string,
+ *	highContrast?: boolean,
+ *	extensionDevelopmentPath?: string | string[],
+ *	folderUri?: object,
+ *	workspace?: object
+ * }} configuration
  */
 function showPartsSplash(configuration) {
 	perf.mark('willShowPartsSplash');

src/vs/code/electron-main/window.ts

@@ -30,7 +30,7 @@ import { endsWith } from 'vs/base/common/strings';
 
 export interface IWindowCreationOptions {
 	state: IWindowState;
-	extensionDevelopmentPath?: string;
+	extensionDevelopmentPath?: string | string[];
 	isExtensionTestHost?: boolean;
 }
 
@@ -220,9 +220,11 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		return !!this.config.extensionTestsPath;
 	}
 
-	get extensionDevelopmentPath(): string | undefined {
+	/*
+	get extensionDevelopmentPaths(): string | string[] | undefined {
 		return this.config.extensionDevelopmentPath;
 	}
+	*/
 
 	get config(): IWindowConfiguration {
 		return this.currentConfig;

src/vs/code/electron-main/windows.ts

@@ -26,7 +26,7 @@ import { ITelemetryService, ITelemetryData } from 'vs/platform/telemetry/common/
 import { IWindowsMainService, IOpenConfiguration, IWindowsCountChangedEvent, ICodeWindow, IWindowState as ISingleWindowState, WindowMode } from 'vs/platform/windows/electron-main/windows';
 import { IHistoryMainService, IRecent } from 'vs/platform/history/common/history';
 import { IProcessEnvironment, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { IWorkspacesMainService, IWorkspaceIdentifier, WORKSPACE_FILTER, isSingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspacesMainService, IWorkspaceIdentifier, WORKSPACE_FILTER, isSingleFolderWorkspaceIdentifier, hasWorkspaceFileExtension } from 'vs/platform/workspaces/common/workspaces';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { mnemonicButtonLabel } from 'vs/base/common/labels';
 import { Schemas } from 'vs/base/common/network';
@@ -899,7 +899,7 @@ export class WindowsManager implements IWindowsMainService {
 		for (let f of fileUris) {
 			const fileUri = this.argToUri(f);
 			if (fileUri) {
-				const path = this.parseUri({ fileUri }, parseOptions);
+				const path = this.parseUri(hasWorkspaceFileExtension(f) ? { workspaceUri: fileUri } : { fileUri }, parseOptions);
 				if (path) {
 					pathsToOpen.push(path);
 				}
@@ -1153,7 +1153,7 @@ export class WindowsManager implements IWindowsMainService {
 		return { openFolderInNewWindow: !!openFolderInNewWindow, openFilesInNewWindow };
 	}
 
-	openExtensionDevelopmentHostWindow(extensionDevelopmentPath: string, openConfig: IOpenConfiguration): void {
+	openExtensionDevelopmentHostWindow(extensionDevelopmentPath: string | string[], openConfig: IOpenConfiguration): void {
 
 		// Reload an existing extension development host window on the same path
 		// We currently do not allow more than one extension development window
@@ -1207,9 +1207,30 @@ export class WindowsManager implements IWindowsMainService {
 		openConfig.cli['folder-uri'] = folderUris;
 		openConfig.cli['file-uri'] = fileUris;
 
-		const match = extensionDevelopmentPath.match(/^vscode-remote:\/\/([^\/]+)/);
-		if (match) {
-			openConfig.cli['remote'] = URI.parse(extensionDevelopmentPath).authority;
+		if (Array.isArray(extensionDevelopmentPath)) {
+			let authority: string | undefined = undefined;
+			for (let p of extensionDevelopmentPath) {
+				const match = p.match(/^vscode-remote:\/\/([^\/]+)/);
+				if (match) {
+					const auth = URI.parse(p).authority;
+					if (authority) {
+						if (auth !== authority) {
+							console.log('more than one authority');
+						}
+					} else {
+						authority = auth;
+					}
+				}
+			}
+			if (authority) {
+				openConfig.cli['remote'] = authority;
+			}
+
+		} else {
+			const match = extensionDevelopmentPath.match(/^vscode-remote:\/\/([^\/]+)/);
+			if (match) {
+				openConfig.cli['remote'] = URI.parse(extensionDevelopmentPath).authority;
+			}
 		}
 
 		// Open it

src/vs/code/node/windowsFinder.ts

@@ -14,7 +14,7 @@ export interface ISimpleWindow {
 	openedWorkspace?: IWorkspaceIdentifier;
 	openedFolderUri?: URI;
 
-	extensionDevelopmentPath?: string;
+	extensionDevelopmentPath?: string | string[];
 	lastFocusTime: number;
 }
 
@@ -95,13 +95,33 @@ export function findWindowOnWorkspace<W extends ISimpleWindow>(windows: W[], wor
 	return null;
 }
 
-export function findWindowOnExtensionDevelopmentPath<W extends ISimpleWindow>(windows: W[], extensionDevelopmentPath: string): W | null {
+export function findWindowOnExtensionDevelopmentPath<W extends ISimpleWindow>(windows: W[], extensionDevelopmentPath: string | string[]): W | null {
+
+	const matches = (uriString: string): boolean => {
+		if (Array.isArray(extensionDevelopmentPath)) {
+			return extensionDevelopmentPath.some(p => extpath.isEqual(p, uriString, !platform.isLinux /* ignorecase */));
+		} else if (extensionDevelopmentPath) {
+			return extpath.isEqual(extensionDevelopmentPath, uriString, !platform.isLinux /* ignorecase */);
+		}
+		return false;
+	};
+
 	for (const window of windows) {
-		// match on extension development path. The path can be a path or uri string, using paths.isEqual is not 100% correct but good enough
-		if (window.extensionDevelopmentPath && extpath.isEqual(window.extensionDevelopmentPath, extensionDevelopmentPath, !platform.isLinux /* ignorecase */)) {
-			return window;
+		// match on extension development path. The path can be one or more paths or uri strings, using paths.isEqual is not 100% correct but good enough
+
+		if (window.extensionDevelopmentPath) {
+			if (Array.isArray(window.extensionDevelopmentPath)) {
+				if (window.extensionDevelopmentPath.some(p => matches(p))) {
+					return window;
+				}
+			} else if (window.extensionDevelopmentPath) {
+				if (matches(window.extensionDevelopmentPath)) {
+					return window;
+				}
+			}
 		}
 	}
+
 	return null;
 }