Merge from vscode 966b87dd4013be1a9c06e2b8334522ec61905cc2 (#4696)

src/vs/platform/issue/common/issue.ts

@@ -89,4 +89,5 @@ export interface IIssueService {
 	_serviceBrand: any;
 	openReporter(data: IssueReporterData): Promise<void>;
 	openProcessExplorer(data: ProcessExplorerData): Promise<void>;
+	getSystemStatus(): Promise<string>;
 }

src/vs/platform/issue/electron-browser/issueService.ts

@@ -25,4 +25,8 @@ export class IssueService implements IIssueService {
 	openProcessExplorer(data: ProcessExplorerData): Promise<void> {
 		return this.channel.call('openProcessExplorer', data);
 	}
+
+	getSystemStatus(): Promise<string> {
+		return this.channel.call('getSystemStatus');
+	}
 }

src/vs/platform/issue/electron-main/issueService.ts

@@ -214,6 +214,12 @@ export class IssueService implements IIssueService {
 		});
 	}
 
+	public getSystemStatus(): Promise<string> {
+		return this.launchService.getMainProcessInfo().then(info => {
+			return this.diagnosticsService.getDiagnostics(info);
+		});
+	}
+
 	private getWindowPosition(parentWindow: BrowserWindow, defaultWidth: number, defaultHeight: number): IWindowState {
 		// We want the new window to open on the same display that the parent is in
 		let displayToUse: Electron.Display | undefined;

src/vs/platform/issue/node/issueIpc.ts

@@ -21,6 +21,8 @@ export class IssueChannel implements IServerChannel {
 				return this.service.openReporter(arg);
 			case 'openProcessExplorer':
 				return this.service.openProcessExplorer(arg);
+			case 'getSystemStatus':
+				return this.service.getSystemStatus();
 		}
 
 		throw new Error(`Call not found: ${command}`);