From 89802f26c8a5fa04211086f89acada147c20198f Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Wed, 24 Jan 2018 09:49:59 -0800
Subject: [PATCH] Display truncated VSCode version in issue reporter

---
 .../issue/issueReporterMain.ts                 | 18 +++++++-----------
 .../issue/issueReporterPage.ts                 |  8 +++++---
 src/vs/code/electron-main/diagnostics.ts       |  9 ---------
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index 93be7de5db0..67bb4b64a23 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -12,6 +12,7 @@ import { $ } from 'vs/base/browser/dom';
 import * as browser from 'vs/base/browser/browser';
 import product from 'vs/platform/node/product';
 import pkg from 'vs/platform/node/package';
+import * as os from 'os';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { Client as ElectronIPCClient } from 'vs/base/parts/ipc/electron-browser/ipc.electron-browser';
 import { getDelayedChannel } from 'vs/base/parts/ipc/common/ipc';
@@ -27,7 +28,7 @@ import { InstantiationService } from 'vs/platform/instantiation/common/instantia
 import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
 import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc';
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
-import { IssueReporterModel, IssueReporterData } from 'vs/code/electron-browser/issue/issueReporterModel';
+import { IssueReporterModel } from 'vs/code/electron-browser/issue/issueReporterModel';
 import { IssueReporterStyles } from 'vs/platform/issue/common/issue';
 import BaseHtml from 'vs/code/electron-browser/issue/issueReporterPage';
 
@@ -54,7 +55,11 @@ export class IssueReporter extends Disposable {
 			issueType: 0,
 			includeSystemInfo: true,
 			includeWorkspaceInfo: true,
-			includeProcessInfo: true
+			includeProcessInfo: true,
+			versionInfo: {
+				vscodeVersion: `${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`,
+				os: `${os.type()} ${os.arch()} ${os.release()}`
+			}
 		});
 
 		ipcRenderer.on('issueStyleResponse', (event, styles: IssueReporterStyles) => {
@@ -352,20 +357,11 @@ export class IssueReporter extends Disposable {
 	 */
 
 	private updateAllBlocks(state) {
-		this.updateVersionInfo(state);
 		this.updateSystemInfo(state);
 		this.updateProcessInfo(state);
 		this.updateWorkspaceInfo(state);
 	}
 
-	private updateVersionInfo = (state: IssueReporterData) => {
-		const version = document.getElementById('vscode-version');
-		(<HTMLInputElement>version).value = state.versionInfo.vscodeVersion;
-
-		const osversion = document.getElementById('os');
-		(<HTMLInputElement>osversion).value = state.versionInfo.os;
-	}
-
 	private updateSystemInfo = (state) => {
 		const target = document.querySelector('.block-system .block-info');
 		let tableHtml = '';
diff --git a/src/vs/code/electron-browser/issue/issueReporterPage.ts b/src/vs/code/electron-browser/issue/issueReporterPage.ts
index 5836f45bd10..85bf92331c3 100644
--- a/src/vs/code/electron-browser/issue/issueReporterPage.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterPage.ts
@@ -6,6 +6,8 @@
 
 import { escape } from 'vs/base/common/strings';
 import { localize } from 'vs/nls';
+import * as os from 'os';
+import pkg from 'vs/platform/node/package';
 
 export default (): string => `
 <div id="issue-reporter">
@@ -32,11 +34,11 @@ export default (): string => `
 	<div class="input-group">
 		<div class="two-col">
 			<label for="vscode-version">${escape(localize('vscodeVersion', "VS Code Version"))} <span class="required-input">*</span></label>
-			<input id="vscode-version" type="text" value="${escape(localize('loading', "Loading..."))}" disabled/>
+			<input id="vscode-version" type="text" value="${pkg.name} ${pkg.version}" disabled/>
 		</div>
 		<div class="two-col">
 			<label for="os">${escape(localize('osVersion', "OS Version"))} <span class="required-input">*</span></label>
-			<input id="os" type="text" value="${escape(localize('loading', "Loading..."))}" disabled/>
+			<input id="os" type="text" value="${os.type()} ${os.arch()} ${os.release()}" disabled/>
 		</div>
 	</div>
 
@@ -89,7 +91,7 @@ export default (): string => `
 			<!-- To be dynamically filled -->
 		</small>
 		<div class="block-info-text">
-			<small>${escape(localize('githubMarkdown', "We support GitHub-flavored Markdown. You will still be able to edit your issue when we preview it on GitHub."))}</small>
+			<small>${escape(localize('githubMarkdown', "We support GitHub-flavored Markdown. You will still be able to edit your issue and add screenshots when we preview it on GitHub."))}</small>
 			<div id="description-validation-error" class="validation-error hidden">${escape(localize('issueDescriptionRequired', "Please enter a description."))}</div>
 			<textarea name="description" id="description" cols="100" rows="15" required></textarea>
 		</div>
diff --git a/src/vs/code/electron-main/diagnostics.ts b/src/vs/code/electron-main/diagnostics.ts
index 8a3fb1445fd..cfab99c860a 100644
--- a/src/vs/code/electron-main/diagnostics.ts
+++ b/src/vs/code/electron-main/diagnostics.ts
@@ -39,7 +39,6 @@ export interface ProcessInfo {
 }
 
 export interface DiagnosticInfo {
-	versionInfo?: VersionInfo;
 	systemInfo?: SystemInfo;
 	processInfo?: ProcessInfo[];
 	workspaceInfo?: string;
@@ -80,7 +79,6 @@ export function buildDiagnostics(info: IMainProcessInfo): Promise<DiagnosticInfo
 		}
 
 		return {
-			versionInfo: getVersionInfo(),
 			systemInfo: getSystemInfo(info),
 			processInfo: getProcessList(info, rootProcess),
 			workspaceInfo: workspaceInfoMessages.join('\n')
@@ -188,13 +186,6 @@ function formatLaunchConfigs(configs: WorkspaceStatItem[]): string {
 	return output.join('\n');
 }
 
-function getVersionInfo(): VersionInfo {
-	return {
-		vscodeVersion: `${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`,
-		os: `${os.type()} ${os.arch()} ${os.release()}`
-	};
-}
-
 function getSystemInfo(info: IMainProcessInfo): SystemInfo {
 	const MB = 1024 * 1024;
 	const GB = 1024 * MB;