Merge from vscode 591842cc4b71958c81947b254924a215fe3edcbd (#4886)

src/vs/platform/launch/electron-main/launchService.ts

@@ -15,10 +15,11 @@ import { whenDeleted } from 'vs/base/node/pfs';
 import { IWorkspacesMainService } from 'vs/platform/workspaces/common/workspaces';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { URI, UriComponents } from 'vs/base/common/uri';
-import { BrowserWindow } from 'electron';
+import { BrowserWindow, ipcMain, Event as IpcEvent } from 'electron';
 import { Event } from 'vs/base/common/event';
 import { hasArgs } from 'vs/platform/environment/node/argv';
 import { coalesce } from 'vs/base/common/arrays';
+import { IDiagnosticInfoOptions, IDiagnosticInfo, IRemoteDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnosticsService';
 
 export const ID = 'launchService';
 export const ILaunchService = createDecorator<ILaunchService>(ID);
@@ -32,6 +33,7 @@ export interface IWindowInfo {
 	pid: number;
 	title: string;
 	folderURIs: UriComponents[];
+	remoteAuthority?: string;
 }
 
 export interface IMainProcessInfo {
@@ -41,6 +43,11 @@ export interface IMainProcessInfo {
 	windows: IWindowInfo[];
 }
 
+export interface IRemoteDiagnosticOptions {
+	includeProcesses?: boolean;
+	includeWorkspaceMetadata?: boolean;
+}
+
 function parseOpenUrl(args: ParsedArgs): URI[] {
 	if (args['open-url'] && args._urls && args._urls.length > 0) {
 		// --open-url must contain -- followed by the url(s)
@@ -64,6 +71,7 @@ export interface ILaunchService {
 	getMainProcessId(): Promise<number>;
 	getMainProcessInfo(): Promise<IMainProcessInfo>;
 	getLogsPath(): Promise<string>;
+	getRemoteDiagnostics(options: IRemoteDiagnosticOptions): Promise<IRemoteDiagnosticInfo[]>;
 }
 
 export class LaunchChannel implements IServerChannel {
@@ -88,6 +96,9 @@ export class LaunchChannel implements IServerChannel {
 
 			case 'get-logs-path':
 				return this.service.getLogsPath();
+
+			case 'get-remote-diagnostics':
+				return this.service.getRemoteDiagnostics(arg);
 		}
 
 		throw new Error(`Call not found: ${command}`);
@@ -115,6 +126,10 @@ export class LaunchChannelClient implements ILaunchService {
 	getLogsPath(): Promise<string> {
 		return this.channel.call('get-logs-path', null);
 	}
+
+	getRemoteDiagnostics(options: IRemoteDiagnosticOptions): Promise<IRemoteDiagnosticInfo[]> {
+		return this.channel.call('get-remote-diagnostics', options);
+	}
 }
 
 export class LaunchService implements ILaunchService {
@@ -284,7 +299,45 @@ export class LaunchService implements ILaunchService {
 		return Promise.resolve(this.environmentService.logsPath);
 	}
 
-	private codeWindowToInfo(window: ICodeWindow): IWindowInfo {
+	getRemoteDiagnostics(options: IRemoteDiagnosticOptions): Promise<IRemoteDiagnosticInfo[]> {
+		const windows = this.windowsMainService.getWindows();
+		const promises: Promise<IDiagnosticInfo | undefined>[] = windows.map(window => {
+			return new Promise((resolve, reject) => {
+				if (window.remoteAuthority) {
+					const replyChannel = `vscode:getDiagnosticInfoResponse${window.id}`;
+					const args: IDiagnosticInfoOptions = {
+						includeProcesses: options.includeProcesses,
+						folders: options.includeWorkspaceMetadata ? this.getFolderURIs(window) : undefined
+					};
+
+					window.sendWhenReady('vscode:getDiagnosticInfo', { replyChannel, args });
+
+					ipcMain.once(replyChannel, (_: IpcEvent, data: IRemoteDiagnosticInfo) => {
+						// No data is returned if getting the connection fails.
+						if (!data) {
+							resolve();
+						}
+
+						if (typeof (data) === 'string') {
+							reject(new Error(data));
+						}
+
+						resolve(data);
+					});
+
+					setTimeout(() => {
+						resolve();
+					}, 5000);
+				} else {
+					resolve();
+				}
+			});
+		});
+
+		return Promise.all(promises).then(diagnostics => diagnostics.filter((x): x is IRemoteDiagnosticInfo => !!x));
+	}
+
+	private getFolderURIs(window: ICodeWindow): URI[] {
 		const folderURIs: URI[] = [];
 
 		if (window.openedFolderUri) {
@@ -303,14 +356,20 @@ export class LaunchService implements ILaunchService {
 			}
 		}
 
-		return this.browserWindowToInfo(window.win, folderURIs);
+		return folderURIs;
 	}
 
-	private browserWindowToInfo(win: BrowserWindow, folderURIs: URI[] = []): IWindowInfo {
+	private codeWindowToInfo(window: ICodeWindow): IWindowInfo {
+		const folderURIs = this.getFolderURIs(window);
+		return this.browserWindowToInfo(window.win, folderURIs, window.remoteAuthority);
+	}
+
+	private browserWindowToInfo(win: BrowserWindow, folderURIs: URI[] = [], remoteAuthority?: string): IWindowInfo {
 		return {
 			pid: win.webContents.getOSProcessId(),
 			title: win.getTitle(),
-			folderURIs
+			folderURIs,
+			remoteAuthority
 		};
 	}
 }