Merge VS Code 1.23.1 (#1520)

2026-01-17 17:22:42 -05:00 · 2018-06-05 11:24:51 -07:00
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions
--- a/src/vs/code/electron-browser/issue/issueReporter.js
+++ b/src/vs/code/electron-browser/issue/issueReporter.js
@@ -9,6 +9,11 @@ const path = require('path');
 const fs = require('fs');
 const remote = require('electron').remote;

+function assign(destination, source) {
+	return Object.keys(source)
+		.reduce(function (r, key) { r[key] = source[key]; return r; }, destination);
+}
+
 function parseURLQueryArgs() {
 	const search = window.location.search || '';

@@ -19,15 +24,6 @@ function parseURLQueryArgs() {
 		.reduce(function (r, param) { r[param[0]] = decodeURIComponent(param[1]); return r; }, {});
 }

-function createScript(src, onload) {
-	const script = document.createElement('script');
-	script.src = src;
-	script.addEventListener('load', onload);
-
-	const head = document.getElementsByTagName('head')[0];
-	head.insertBefore(script, head.lastChild);
-}
-
 function uriFromPath(_path) {
 	var pathName = path.resolve(_path).replace(/\\/g, '/');
 	if (pathName.length > 0 && pathName.charAt(0) !== '/') {
@@ -53,6 +49,8 @@ function main() {
 	const args = parseURLQueryArgs();
 	const configuration = JSON.parse(args['config'] || '{}') || {};

+	assign(process.env, configuration.userEnv);
+
 	//#region Add support for using node_modules.asar
 	(function () {
 		const path = require('path');
@@ -65,10 +63,10 @@ function main() {
 		const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';

 		const originalResolveLookupPaths = Module._resolveLookupPaths;
-		Module._resolveLookupPaths = function (request, parent) {
-			const result = originalResolveLookupPaths(request, parent);
+		Module._resolveLookupPaths = function (request, parent, newReturn) {
+			const result = originalResolveLookupPaths(request, parent, newReturn);

-			const paths = result[1];
+			const paths = newReturn ? result : result[1];
 			for (let i = 0, len = paths.length; i < len; i++) {
 				if (paths[i] === NODE_MODULES_PATH) {
 					paths.splice(i, 0, NODE_MODULES_ASAR_PATH);
@@ -143,31 +141,34 @@ function main() {

 	window.document.documentElement.setAttribute('lang', locale);

-	// In the bundled version the nls plugin is packaged with the loader so the NLS Plugins
-	// loads as soon as the loader loads. To be able to have pseudo translation
-	createScript(rootUrl + '/vs/loader.js', function () {
-		var define = global.define;
-		global.define = undefined;
-		define('fs', ['original-fs'], function (originalFS) { return originalFS; }); // replace the patched electron fs with the original node fs for all AMD code
+	// Load the loader
+	const loaderFilename = configuration.appRoot + '/out/vs/loader.js';
+	const loaderSource = fs.readFileSync(loaderFilename);
+	require('vm').runInThisContext(loaderSource, { filename: loaderFilename });
+	var define = global.define;
+	global.define = undefined;

-		window.MonacoEnvironment = {};
+	window.nodeRequire = require.__$__nodeRequire;

-		require.config({
-			baseUrl: rootUrl,
-			'vs/nls': nlsConfig,
-			nodeCachedDataDir: configuration.nodeCachedDataDir,
-			nodeModules: [/*BUILD->INSERT_NODE_MODULES*/]
+	define('fs', ['original-fs'], function (originalFS) { return originalFS; }); // replace the patched electron fs with the original node fs for all AMD code
+
+	window.MonacoEnvironment = {};
+
+	require.config({
+		baseUrl: rootUrl,
+		'vs/nls': nlsConfig,
+		nodeCachedDataDir: configuration.nodeCachedDataDir,
+		nodeModules: [/*BUILD->INSERT_NODE_MODULES*/]
+	});
+
+	if (nlsConfig.pseudo) {
+		require(['vs/nls'], function (nlsPlugin) {
+			nlsPlugin.setPseudoTranslation(nlsConfig.pseudo);
 		});
+	}

-		if (nlsConfig.pseudo) {
-			require(['vs/nls'], function (nlsPlugin) {
-				nlsPlugin.setPseudoTranslation(nlsConfig.pseudo);
-			});
-		}
-
-		require(['vs/code/electron-browser/issue/issueReporterMain'], (issueReporter) => {
-			issueReporter.startup(configuration);
-		});
+	require(['vs/code/electron-browser/issue/issueReporterMain'], (issueReporter) => {
+		issueReporter.startup(configuration);
 	});
 }

--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -40,6 +40,7 @@ import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
 import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log/common/logIpc';
 import { ILogService, getLogLevel } from 'vs/platform/log/common/log';
 import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
+import { normalizeGitHubIssuesUrl } from 'vs/code/electron-browser/issue/issueReporterUtil';

 const MAX_URL_LENGTH = platform.isWindows ? 2081 : 5400;

@@ -69,6 +70,7 @@ export class IssueReporter extends Disposable {
 	private numberOfSearchResultsDisplayed = 0;
 	private receivedSystemInfo = false;
 	private receivedPerformanceInfo = false;
+	private shouldQueueSearch = false;

 	constructor(configuration: IssueReporterConfiguration) {
 		super();
@@ -105,7 +107,9 @@ export class IssueReporter extends Disposable {
 		});

 		ipcRenderer.send('issueSystemInfoRequest');
-		ipcRenderer.send('issuePerformanceInfoRequest');
+		if (configuration.data.issueType === IssueType.PerformanceIssue) {
+			ipcRenderer.send('issuePerformanceInfoRequest');
+		}
 		this.logService.trace('issueReporter: Sent data requests');

 		if (window.document.documentElement.lang !== 'en') {
@@ -160,7 +164,7 @@ export class IssueReporter extends Disposable {
 		}

 		if (styles.inputActiveBorder) {
-			content.push(`input[type='text']:focus, textarea:focus, select:focus, summary:focus, button:focus  { border: 1px solid ${styles.inputActiveBorder}; outline-style: none; }`);
+			content.push(`input[type='text']:focus, textarea:focus, select:focus, summary:focus, button:focus, a:focus, .workbenchCommand:focus  { border: 1px solid ${styles.inputActiveBorder}; outline-style: none; }`);
 		}

 		if (styles.textLinkColor) {
@@ -208,14 +212,14 @@ export class IssueReporter extends Disposable {
 		});

 		const numberOfThemeExtesions = themes && themes.length;
-		this.issueReporterModel.update({ numberOfThemeExtesions, enabledNonThemeExtesions: nonThemes });
+		this.issueReporterModel.update({ numberOfThemeExtesions, enabledNonThemeExtesions: nonThemes, allExtensions: extensions });
 		this.updateExtensionTable(nonThemes, numberOfThemeExtesions);

 		if (this.environmentService.disableExtensions || extensions.length === 0) {
 			(<HTMLButtonElement>document.getElementById('disableExtensions')).disabled = true;
-			(<HTMLInputElement>document.getElementById('reproducesWithoutExtensions')).checked = true;
-			this.issueReporterModel.update({ reprosWithoutExtensions: true });
 		}
+
+		this.updateExtensionSelector(extensions);
 	}

 	private handleSettingsSearchData(data: ISettingsSearchIssueReporterData): void {
@@ -292,7 +296,11 @@ export class IssueReporter extends Disposable {

 	private setEventHandlers(): void {
 		this.addEventListener('issue-type', 'change', (event: Event) => {
-			this.issueReporterModel.update({ issueType: parseInt((<HTMLInputElement>event.target).value) });
+			const issueType = parseInt((<HTMLInputElement>event.target).value);
+			this.issueReporterModel.update({ issueType: issueType });
+			if (issueType === IssueType.PerformanceIssue && !this.receivedPerformanceInfo) {
+				ipcRenderer.send('issuePerformanceInfoRequest');
+			}
 			this.updatePreviewButtonState();
 			this.render();
 		});
@@ -322,30 +330,33 @@ export class IssueReporter extends Disposable {
 			});
 		}

-		this.addEventListener('reproducesWithoutExtensions', 'click', (e) => {
-			this.issueReporterModel.update({ reprosWithoutExtensions: true });
-		});
+		this.addEventListener('issue-source', 'change', (event: Event) => {
+			const fileOnExtension = JSON.parse((<HTMLInputElement>event.target).value);
+			this.issueReporterModel.update({ fileOnExtension: fileOnExtension, includeExtensions: !fileOnExtension });
+			this.render();

-		this.addEventListener('reproducesWithExtensions', 'click', (e) => {
-			this.issueReporterModel.update({ reprosWithoutExtensions: false });
+			const title = (<HTMLInputElement>document.getElementById('issue-title')).value;
+			if (fileOnExtension) {
+				this.searchExtensionIssues(title);
+			} else {
+				const description = this.issueReporterModel.getData().issueDescription;
+				this.searchVSCodeIssues(title, description);
+			}
 		});

 		this.addEventListener('description', 'input', (event: Event) => {
 			const issueDescription = (<HTMLInputElement>event.target).value;
 			this.issueReporterModel.update({ issueDescription });

-			const title = (<HTMLInputElement>document.getElementById('issue-title')).value;
-			if (title || issueDescription) {
-				this.searchDuplicates(title, issueDescription);
-			} else {
-				this.clearSearchResults();
+			// Only search for extension issues on title change
+			if (!this.issueReporterModel.fileOnExtension()) {
+				const title = (<HTMLInputElement>document.getElementById('issue-title')).value;
+				this.searchVSCodeIssues(title, issueDescription);
 			}
 		});

 		this.addEventListener('issue-title', 'input', (e) => {
-			const description = this.issueReporterModel.getData().issueDescription;
 			const title = (<HTMLInputElement>event.target).value;
-
 			const lengthValidationMessage = document.getElementById('issue-title-length-validation-error');
 			if (title && this.getIssueUrlWithTitle(title).length > MAX_URL_LENGTH) {
 				show(lengthValidationMessage);
@@ -353,10 +364,11 @@ export class IssueReporter extends Disposable {
 				hide(lengthValidationMessage);
 			}

-			if (title || description) {
-				this.searchDuplicates(title, description);
+			if (this.issueReporterModel.fileOnExtension()) {
+				this.searchExtensionIssues(title);
 			} else {
-				this.clearSearchResults();
+				const description = this.issueReporterModel.getData().issueDescription;
+				this.searchVSCodeIssues(title, description);
 			}
 		});

@@ -367,43 +379,32 @@ export class IssueReporter extends Disposable {
 		});

 		this.addEventListener('disableExtensions', 'keydown', (e: KeyboardEvent) => {
+			e.stopPropagation();
 			if (e.keyCode === 13 || e.keyCode === 32) {
 				ipcRenderer.send('workbenchCommand', 'workbench.extensions.action.disableAll');
 				ipcRenderer.send('workbenchCommand', 'workbench.action.reloadWindow');
 			}
 		});

-		this.addEventListener('showRunning', 'click', () => {
-			ipcRenderer.send('workbenchCommand', 'workbench.action.showRuntimeExtensions');
-		});
-
-		this.addEventListener('showRunning', 'keydown', (e: KeyboardEvent) => {
-			if (e.keyCode === 13 || e.keyCode === 32) {
-				ipcRenderer.send('workbenchCommand', 'workbench.action.showRuntimeExtensions');
+		document.onkeydown = (e: KeyboardEvent) => {
+			const cmdOrCtrlKey = platform.isMacintosh ? e.metaKey : e.ctrlKey;
+			// Cmd/Ctrl+Enter previews issue and closes window
+			if (cmdOrCtrlKey && e.keyCode === 13) {
+				if (this.createIssue()) {
+					remote.getCurrentWindow().close();
+				}
 			}
-		});

-		// Cmd+Enter or Mac or Ctrl+Enter on other platforms previews issue and closes window
-		if (platform.isMacintosh) {
-			let prevKeyWasCommand = false;
-			document.onkeydown = (e: KeyboardEvent) => {
-				if (prevKeyWasCommand && e.keyCode === 13) {
-					if (this.createIssue()) {
-						remote.getCurrentWindow().close();
-					}
-				}
+			// Cmd/Ctrl + zooms in
+			if (cmdOrCtrlKey && e.keyCode === 187) {
+				this.applyZoom(webFrame.getZoomLevel() + 1);
+			}

-				prevKeyWasCommand = e.keyCode === 91 || e.keyCode === 93;
-			};
-		} else {
-			document.onkeydown = (e: KeyboardEvent) => {
-				if (e.ctrlKey && e.keyCode === 13) {
-					if (this.createIssue()) {
-						remote.getCurrentWindow().close();
-					}
-				}
-			};
-		}
+			// Cmd/Ctrl - zooms out
+			if (cmdOrCtrlKey && e.keyCode === 189) {
+				this.applyZoom(webFrame.getZoomLevel() - 1);
+			}
+		};
 	}

 	private updatePreviewButtonState() {
@@ -438,12 +439,77 @@ export class IssueReporter extends Disposable {
 		return false;
 	}

+	private getExtensionRepositoryUrl(): string {
+		const selectedExtension = this.issueReporterModel.getData().selectedExtension;
+		return selectedExtension && selectedExtension.manifest && selectedExtension.manifest.repository && selectedExtension.manifest.repository.url;
+	}
+
+	private getExtensionBugsUrl(): string {
+		const selectedExtension = this.issueReporterModel.getData().selectedExtension;
+		return selectedExtension && selectedExtension.manifest && selectedExtension.manifest.bugs && selectedExtension.manifest.bugs.url;
+	}
+
+	private searchVSCodeIssues(title: string, issueDescription: string): void {
+		if (title) {
+			this.searchDuplicates(title, issueDescription);
+		} else {
+			this.clearSearchResults();
+		}
+	}
+
+	private searchExtensionIssues(title: string): void {
+		const url = this.getExtensionRepositoryUrl();
+		if (title) {
+			const matches = /^https?:\/\/github\.com\/(.*)(?:.git)/.exec(url);
+			if (matches && matches.length) {
+				const repo = matches[1];
+				return this.searchGitHub(repo, title);
+			}
+		}
+
+		this.clearSearchResults();
+	}
+
 	private clearSearchResults(): void {
 		const similarIssues = document.getElementById('similar-issues');
 		similarIssues.innerHTML = '';
 		this.numberOfSearchResultsDisplayed = 0;
 	}

+	@debounce(300)
+	private searchGitHub(repo: string, title: string): void {
+		const query = `is:issue+repo:${repo}+${title}`;
+		const similarIssues = document.getElementById('similar-issues');
+
+		window.fetch(`https://api.github.com/search/issues?q=${query}`).then((response) => {
+			response.json().then(result => {
+				similarIssues.innerHTML = '';
+				if (result && result.items) {
+					this.displaySearchResults(result.items);
+				} else {
+					// If the items property isn't present, the rate limit has been hit
+					const message = $('div.list-title');
+					message.textContent = localize('rateLimited', "GitHub query limit exceeded. Please wait.");
+					similarIssues.appendChild(message);
+
+					const resetTime = response.headers.get('X-RateLimit-Reset');
+					const timeToWait = parseInt(resetTime) - Math.floor(Date.now() / 1000);
+					if (this.shouldQueueSearch) {
+						this.shouldQueueSearch = false;
+						setTimeout(() => {
+							this.searchGitHub(repo, title);
+							this.shouldQueueSearch = true;
+						}, timeToWait * 1000);
+					}
+				}
+			}).catch(e => {
+				this.logSearchError(e);
+			});
+		}).catch(e => {
+			this.logSearchError(e);
+		});
+	}
+
 	@debounce(300)
 	private searchDuplicates(title: string, body: string): void {
 		const url = 'https://vscode-probot.westus.cloudapp.azure.com:7890/duplicate_candidates';
@@ -516,7 +582,7 @@ export class IssueReporter extends Disposable {
 			similarIssues.appendChild(issues);
 		} else {
 			const message = $('div.list-title');
-			message.textContent = localize('noResults', "No results found");
+			message.textContent = localize('noSimilarIssues', "No similar issues found");
 			similarIssues.appendChild(message);
 		}
 	}
@@ -542,8 +608,8 @@ export class IssueReporter extends Disposable {
 		} else {
 			typeSelect.innerHTML = [
 				makeOption(IssueType.Bug, localize('bugReporter', "Bug Report")),
-				makeOption(IssueType.PerformanceIssue, localize('performanceIssue', "Performance Issue")),
-				makeOption(IssueType.FeatureRequest, localize('featureRequest', "Feature Request"))
+				makeOption(IssueType.FeatureRequest, localize('featureRequest', "Feature Request")),
+				makeOption(IssueType.PerformanceIssue, localize('performanceIssue', "Performance Issue"))
 			].join('\n');
 		}

@@ -552,7 +618,8 @@ export class IssueReporter extends Disposable {

 	private renderBlocks(): void {
 		// Depending on Issue Type, we render different blocks and text
-		const { issueType } = this.issueReporterModel.getData();
+		const { issueType, fileOnExtension } = this.issueReporterModel.getData();
+		const blockContainer = document.getElementById('block-container');
 		const systemBlock = document.querySelector('.block-system');
 		const processBlock = document.querySelector('.block-process');
 		const workspaceBlock = document.querySelector('.block-workspace');
@@ -560,39 +627,64 @@ export class IssueReporter extends Disposable {
 		const searchedExtensionsBlock = document.querySelector('.block-searchedExtensions');
 		const settingsSearchResultsBlock = document.querySelector('.block-settingsSearchResults');

-		const disabledExtensions = document.getElementById('disabledExtensions');
+		const problemSource = document.getElementById('problem-source');
+		const problemSourceHelpText = document.getElementById('problem-source-help-text');
 		const descriptionTitle = document.getElementById('issue-description-label');
 		const descriptionSubtitle = document.getElementById('issue-description-subtitle');
+		const extensionSelector = document.getElementById('extension-selection');

 		// Hide all by default
+		hide(blockContainer);
 		hide(systemBlock);
 		hide(processBlock);
 		hide(workspaceBlock);
 		hide(extensionsBlock);
 		hide(searchedExtensionsBlock);
 		hide(settingsSearchResultsBlock);
-		hide(disabledExtensions);
+		hide(problemSource);
+		hide(problemSourceHelpText);
+		hide(extensionSelector);

 		if (issueType === IssueType.Bug) {
+			show(blockContainer);
 			show(systemBlock);
-			show(extensionsBlock);
-			show(disabledExtensions);
+			show(problemSource);
+
+			if (fileOnExtension) {
+				show(extensionSelector);
+			} else {
+				show(extensionsBlock);
+				show(problemSourceHelpText);
+			}

 			descriptionTitle.innerHTML = `${localize('stepsToReproduce', "Steps to Reproduce")} <span class="required-input">*</span>`;
 			descriptionSubtitle.innerHTML = localize('bugDescription', "Share the steps needed to reliably reproduce the problem. Please include actual and expected results. We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.");
 		} else if (issueType === IssueType.PerformanceIssue) {
+			show(blockContainer);
 			show(systemBlock);
 			show(processBlock);
 			show(workspaceBlock);
-			show(extensionsBlock);
-			show(disabledExtensions);
+			show(problemSource);
+
+			if (fileOnExtension) {
+				show(extensionSelector);
+			} else {
+				show(extensionsBlock);
+				show(problemSourceHelpText);
+			}

 			descriptionTitle.innerHTML = `${localize('stepsToReproduce', "Steps to Reproduce")} <span class="required-input">*</span>`;
 			descriptionSubtitle.innerHTML = localize('performanceIssueDesciption', "When did this performance issue happen? Does it occur on startup or after a specific series of actions? We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.");
 		} else if (issueType === IssueType.FeatureRequest) {
 			descriptionTitle.innerHTML = `${localize('description', "Description")} <span class="required-input">*</span>`;
 			descriptionSubtitle.innerHTML = localize('featureRequestDescription', "Please describe the feature you would like to see. We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.");
+			show(problemSource);
+
+			if (fileOnExtension) {
+				show(extensionSelector);
+			}
 		} else if (issueType === IssueType.SettingsSearchIssue) {
+			show(blockContainer);
 			show(searchedExtensionsBlock);
 			show(settingsSearchResultsBlock);

@@ -614,11 +706,14 @@ export class IssueReporter extends Disposable {

 	private validateInputs(): boolean {
 		let isValid = true;
-		['issue-title', 'description'].forEach(elementId => {
+		['issue-title', 'description', 'issue-source'].forEach(elementId => {
 			isValid = this.validateInput(elementId) && isValid;
-
 		});

+		if (this.issueReporterModel.fileOnExtension()) {
+			isValid = this.validateInput('extension-selector') && isValid;
+		}
+
 		return isValid;
 	}

@@ -626,7 +721,10 @@ export class IssueReporter extends Disposable {
 		if (!this.validateInputs()) {
 			// If inputs are invalid, set focus to the first one and add listeners on them
 			// to detect further changes
-			(<HTMLInputElement>document.getElementsByClassName('invalid-input')[0]).focus();
+			const invalidInput = document.getElementsByClassName('invalid-input');
+			if (invalidInput.length) {
+				(<HTMLInputElement>invalidInput[0]).focus();
+			}

 			document.getElementById('issue-title').addEventListener('input', (event) => {
 				this.validateInput('issue-title');
@@ -641,8 +739,8 @@ export class IssueReporter extends Disposable {

 		/* __GDPR__
 			"issueReporterSubmit" : {
-				"issueType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				"numSimilarIssuesDisplayed" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				"issueType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+				"numSimilarIssuesDisplayed" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
 			}
 		*/
 		this.telemetryService.publicLog('issueReporterSubmit', { issueType: this.issueReporterModel.getData().issueType, numSimilarIssuesDisplayed: this.numberOfSearchResultsDisplayed });
@@ -660,24 +758,88 @@ export class IssueReporter extends Disposable {
 		return true;
 	}

-	private getIssueUrlWithTitle(issueTitle: string) {
+	private getIssueUrlWithTitle(issueTitle: string): string {
+		let repositoryUrl = product.reportIssueUrl;
+		if (this.issueReporterModel.fileOnExtension()) {
+			const bugsUrl = this.getExtensionBugsUrl();
+			const extensionUrl = this.getExtensionRepositoryUrl();
+			// If given, try to match the extension's bug url
+			if (bugsUrl && bugsUrl.match(/^https?:\/\/github\.com\/(.*)/)) {
+				repositoryUrl = normalizeGitHubIssuesUrl(bugsUrl);
+			} else if (extensionUrl && extensionUrl.match(/^https?:\/\/github\.com\/(.*)/)) {
+				repositoryUrl = normalizeGitHubIssuesUrl(extensionUrl);
+			}
+		}
+
 		const queryStringPrefix = product.reportIssueUrl.indexOf('?') === -1 ? '?' : '&';
-		return `${product.reportIssueUrl}${queryStringPrefix}title=${encodeURIComponent(issueTitle)}`;
+		return `${repositoryUrl}${queryStringPrefix}title=${encodeURIComponent(issueTitle)}`;
 	}

 	private updateSystemInfo = (state) => {
 		const target = document.querySelector('.block-system .block-info');
 		let tableHtml = '';
 		Object.keys(state.systemInfo).forEach(k => {
+			const data = typeof state.systemInfo[k] === 'object'
+				? Object.keys(state.systemInfo[k]).map(key => `${key}: ${state.systemInfo[k][key]}`).join('<br>')
+				: state.systemInfo[k];
+
 			tableHtml += `
 				<tr>
 					<td>${k}</td>
-					<td>${state.systemInfo[k]}</td>
+					<td>${data}</td>
 				</tr>`;
 		});
 		target.innerHTML = `<table>${tableHtml}</table>`;
 	}

+	private updateExtensionSelector(extensions: ILocalExtension[]): void {
+		interface IOption {
+			name: string;
+			id: string;
+		}
+
+		const extensionOptions: IOption[] = extensions.map(extension => {
+			return {
+				name: extension.manifest.displayName || extension.manifest.name || '',
+				id: extension.identifier.id
+			};
+		});
+
+		// Sort extensions by name
+		extensionOptions.sort((a, b) => {
+			const aName = a.name.toLowerCase();
+			const bName = b.name.toLowerCase();
+			if (aName > bName) {
+				return 1;
+			}
+
+			if (aName < bName) {
+				return -1;
+			}
+
+			return 0;
+		});
+
+		const makeOption = (extension: IOption) => `<option value="${extension.id}">${escape(extension.name)}</option>`;
+		const extensionsSelector = document.getElementById('extension-selector');
+		extensionsSelector.innerHTML = '<option></option>' + extensionOptions.map(makeOption).join('\n');
+
+		this.addEventListener('extension-selector', 'change', (e: Event) => {
+			const selectedExtensionId = (<HTMLInputElement>e.target).value;
+			const extensions = this.issueReporterModel.getData().allExtensions;
+			const matches = extensions.filter(extension => extension.identifier.id === selectedExtensionId);
+			if (matches.length) {
+				this.issueReporterModel.update({ selectedExtension: matches[0] });
+
+				const title = (<HTMLInputElement>document.getElementById('issue-title')).value;
+				this.searchExtensionIssues(title);
+			} else {
+				this.issueReporterModel.update({ selectedExtension: null });
+				this.clearSearchResults();
+			}
+		});
+	}
+
 	private updateProcessInfo = (state) => {
 		const target = document.querySelector('.block-process .block-info');
 		target.innerHTML = `<code>${state.processInfo}</code>`;
--- a/src/vs/code/electron-browser/issue/issueReporterModel.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterModel.ts
@@ -26,9 +26,11 @@ export interface IssueReporterData {
 	includeSettingsSearchDetails?: boolean;

 	numberOfThemeExtesions?: number;
+	allExtensions?: ILocalExtension[];
 	enabledNonThemeExtesions?: ILocalExtension[];
 	extensionsDisabled?: boolean;
-	reprosWithoutExtensions?: boolean;
+	fileOnExtension?: boolean;
+	selectedExtension?: ILocalExtension;
 	actualSearchResults?: ISettingSearchResult[];
 	query?: string;
 	filterResultCount?: number;
@@ -44,8 +46,7 @@ export class IssueReporterModel {
 			includeProcessInfo: true,
 			includeExtensions: true,
 			includeSearchedExtensions: true,
-			includeSettingsSearchDetails: true,
-			reprosWithoutExtensions: false
+			includeSettingsSearchDetails: true
 		};

 		this._data = initialData ? assign(defaultData, initialData) : defaultData;
@@ -73,6 +74,22 @@ ${this.getInfos()}
 <!-- generated by issue reporter -->`;
 	}

+	fileOnExtension(): boolean {
+		const fileOnExtensionSupported = this._data.issueType === IssueType.Bug
+			|| this._data.issueType === IssueType.PerformanceIssue
+			|| this._data.issueType === IssueType.FeatureRequest;
+
+		return fileOnExtensionSupported && this._data.fileOnExtension;
+	}
+
+	private getExtensionVersion(): string {
+		if (this.fileOnExtension()) {
+			return `\nExtension version: ${this._data.selectedExtension.manifest.version}`;
+		} else {
+			return '';
+		}
+	}
+
 	private getIssueTypeTitle(): string {
 		if (this._data.issueType === IssueType.Bug) {
 			return 'Bug';
@@ -109,8 +126,6 @@ ${this.getInfos()}
 			if (this._data.includeExtensions) {
 				info += this.generateExtensionsMd();
 			}
-
-			info += this._data.reprosWithoutExtensions ? '\nReproduces without extensions' : '\nReproduces only with extensions';
 		}

 		if (this._data.issueType === IssueType.SettingsSearchIssue) {
@@ -136,7 +151,11 @@ ${this.getInfos()}
 `;

 		Object.keys(this._data.systemInfo).forEach(k => {
-			md += `|${k}|${this._data.systemInfo[k]}|\n`;
+			const data = typeof this._data.systemInfo[k] === 'object'
+				? Object.keys(this._data.systemInfo[k]).map(key => `${key}: ${this._data.systemInfo[k][key]}`).join('<br>')
+				: this._data.systemInfo[k];
+
+			md += `|${k}|${data}|\n`;
 		});

 		md += '\n</details>';
--- a/src/vs/code/electron-browser/issue/issueReporterPage.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterPage.ts
@@ -19,6 +19,25 @@ export default (): string => `
 			</select>
 		</div>

+		<div class="input-group" id="problem-source">
+			<label class="inline-label" for="issue-source">${escape(localize('issueSourceLabel', "File on"))}</label>
+			<select id="issue-source" class="inline-form-control">
+				<!-- {{ SQL CARBON EDIT }} -->
+				<option value="false">${escape(localize('sqlops', "SQL Operations Studio"))}</option>
+				<option value="true">${escape(localize('extension', "An Extension"))}</option>
+			</select>
+			<div id="problem-source-help-text" class="instructions">${escape(localize('disableExtensionsLabelText', "Try to reproduce the problem after {0}. If the problem only reproduces when extensions are active, it is likely an issue with an extension."))
+		.replace('{0}', `<span tabIndex=0 role="button" id="disableExtensions" class="workbenchCommand">${escape(localize('disableExtensions', "disabling all extensions and reloading the window"))}</span>`)}
+			</div>
+
+			<div id="extension-selection">
+				<label class="inline-label" for="extension-selector">${escape(localize('chooseExtension', "Extension"))} <span class="required-input">*</span></label>
+				<select id="extension-selector" class="inline-form-control">
+					<!-- To be dynamically filled -->
+				</select>
+			</div>
+		</div>
+
 		<div class="input-group">
 			<label class="inline-label" for="issue-title">${escape(localize('issueTitleLabel', "Title"))} <span class="required-input">*</span></label>
 			<input id="issue-title" type="text" class="inline-form-control" placeholder="${escape(localize('issueTitleRequired', "Please enter a title."))}" required>
@@ -27,118 +46,93 @@ export default (): string => `
 				<!-- To be dynamically filled -->
 			</small>
 		</div>
+
 	</div>

-	<div class="system-info">
-		<div id="block-container">
-			<div class="block block-system">
-				<details>
-					<summary>${escape(localize('systemInfo', "My System Info"))}
-						<div class="include-data">
-							<input class="sendData" type="checkbox" id="includeSystemInfo" checked/>
-							<label class="caption" for="includeSystemInfo">${escape(localize('sendData', "Send my data"))}</label>
-						</div>
-					</summary>
-					<div class="block-info">
-						<!-- To be dynamically filled -->
-					</div>
-				</details>
-			</div>
-			<div class="block block-process">
-				<details>
-					<summary>${escape(localize('processes', "Currently Running Processes"))}
-						<div class="include-data">
-							<input class="sendData"  type="checkbox" id="includeProcessInfo" checked/>
-							<label class="caption" for="includeProcessInfo">${escape(localize('sendData', "Send my data"))}</label>
-						</div>
-					</summary>
-					<pre class="block-info">
-						<!-- To be dynamically filled -->
-					</pre>
-				</details>
-			</div>
-			<div class="block block-workspace">
-				<details>
-					<summary>${escape(localize('workspaceStats', "My Workspace Stats"))}
-						<div class="include-data">
-							<input class="sendData"  type="checkbox" id="includeWorkspaceInfo" checked/>
-							<label class="caption" for="includeWorkspaceInfo">${escape(localize('sendData', "Send my data"))}</label>
-						</div>
-					</summary>
-					<pre class="block-info">
-						<code>
-							<!-- To be dynamically filled -->
-						</code>
-					</pre>
-				</details>
-			</div>
-			<div class="block block-extensions">
-				<details>
-					<summary>${escape(localize('extensions', "My Extensions"))}
-						<div class="include-data">
-							<input class="sendData"  type="checkbox" id="includeExtensions" checked/>
-							<label class="caption" for="includeExtensions">${escape(localize('sendData', "Send my data"))}</label>
-						</div>
-					</summary>
-					<div class="block-info">
-						<!-- To be dynamically filled -->
-					</div>
-				</details>
-			</div>
-			<div class="block block-searchedExtensions">
-				<details>
-					<summary>${escape(localize('searchedExtensions', "Searched Extensions"))}
-						<div class="include-data">
-							<input class="sendData"  type="checkbox" id="includeSearchedExtensions" checked/>
-							<label class="caption" for="includeSearchedExtensions">${escape(localize('sendData', "Send my data"))}</label>
-						</div>
-					</summary>
-					<div class="block-info">
-						<!-- To be dynamically filled -->
-					</div>
-				</details>
-			</div>
-			<div class="block block-settingsSearchResults">
-				<details>
-					<summary>${escape(localize('settingsSearchDetails', "Settings Search Details"))}
-						<div class="include-data">
-							<input class="sendData"  type="checkbox" id="includeSettingsSearchDetails" checked/>
-							<label class="caption" for="includeSettingsSearchDetails">${escape(localize('sendData', "Send my data"))}</label>
-						</div>
-					</summary>
-					<div class="block-info">
-						<!-- To be dynamically filled -->
-					</div>
-				</details>
-			</div>
-		</div>
-	</div>
-
-	<div class="section">
-		<div id="disabledExtensions">
-			<div class="extensions-form">
-				<label>${escape(localize('tryDisablingExtensions', "Is the problem reproducible when extensions are disabled?"))}</label>
-				<div class="form-buttons">
-					<div class="choice">
-						<input type="radio" id="reproducesWithoutExtensions" value=true name="reprosWithoutExtensions" />
-						<label for="reproducesWithoutExtensions">${escape(localize('yes', "Yes"))}</label>
-					</div>
-					<div class="choice">
-						<input type="radio" id="reproducesWithExtensions" value=false name="reprosWithoutExtensions" checked/>
-						<label for="reproducesWithExtensions">${escape(localize('no', "No"))}</label>
+	<div class="system-info" id="block-container">
+		<div class="block block-system">
+			<details>
+				<summary>${escape(localize('systemInfo', "My System Info"))}
+					<div class="include-data">
+						<input class="sendData" type="checkbox" id="includeSystemInfo" checked/>
+						<label class="caption" for="includeSystemInfo">${escape(localize('sendData', "Send my data"))}</label>
 					</div>
+				</summary>
+				<div class="block-info">
+					<!-- To be dynamically filled -->
 				</div>
-			</div>
-			<div class="instructions">${escape(localize('disableExtensionsLabelText', "Try to reproduce the problem after {0}."))
-		.replace('{0}', `<span tabIndex=0 role="button" id="disableExtensions" class="workbenchCommand">${escape(localize('disableExtensions', "disabling all extensions and reloading the window"))}</span>`)}
-			</div>
-			<div class="instructions">${escape(localize('showRunningExtensionsLabelText', "If you suspect it's an extension issue, {0} to report the issue on the extension."))
-		.replace('{0}', `<span tabIndex=0 role="button"id="showRunning" class="workbenchCommand">${escape(localize('showRunningExtensions', "view all running extensions"))}</span>`)}
-			</div>
+			</details>
+		</div>
+		<div class="block block-process">
+			<details>
+				<summary>${escape(localize('processes', "Currently Running Processes"))}
+					<div class="include-data">
+						<input class="sendData"  type="checkbox" id="includeProcessInfo" checked/>
+						<label class="caption" for="includeProcessInfo">${escape(localize('sendData', "Send my data"))}</label>
+					</div>
+				</summary>
+				<pre class="block-info">
+					<!-- To be dynamically filled -->
+				</pre>
+			</details>
+		</div>
+		<div class="block block-workspace">
+			<details>
+				<summary>${escape(localize('workspaceStats', "My Workspace Stats"))}
+					<div class="include-data">
+						<input class="sendData"  type="checkbox" id="includeWorkspaceInfo" checked/>
+						<label class="caption" for="includeWorkspaceInfo">${escape(localize('sendData', "Send my data"))}</label>
+					</div>
+				</summary>
+				<pre class="block-info">
+					<code>
+						<!-- To be dynamically filled -->
+					</code>
+				</pre>
+			</details>
+		</div>
+		<div class="block block-extensions">
+			<details>
+				<summary>${escape(localize('extensions', "My Extensions"))}
+					<div class="include-data">
+						<input class="sendData"  type="checkbox" id="includeExtensions" checked/>
+						<label class="caption" for="includeExtensions">${escape(localize('sendData', "Send my data"))}</label>
+					</div>
+				</summary>
+				<div class="block-info">
+					<!-- To be dynamically filled -->
+				</div>
+			</details>
+		</div>
+		<div class="block block-searchedExtensions">
+			<details>
+				<summary>${escape(localize('searchedExtensions', "Searched Extensions"))}
+					<div class="include-data">
+						<input class="sendData"  type="checkbox" id="includeSearchedExtensions" checked/>
+						<label class="caption" for="includeSearchedExtensions">${escape(localize('sendData', "Send my data"))}</label>
+					</div>
+				</summary>
+				<div class="block-info">
+					<!-- To be dynamically filled -->
+				</div>
+			</details>
+		</div>
+		<div class="block block-settingsSearchResults">
+			<details>
+				<summary>${escape(localize('settingsSearchDetails', "Settings Search Details"))}
+					<div class="include-data">
+						<input class="sendData"  type="checkbox" id="includeSettingsSearchDetails" checked/>
+						<label class="caption" for="includeSettingsSearchDetails">${escape(localize('sendData', "Send my data"))}</label>
+					</div>
+				</summary>
+				<div class="block-info">
+					<!-- To be dynamically filled -->
+				</div>
+			</details>
 		</div>
 	</div>

-	<div class="input-group">
+	<div class="input-group description-section">
 		<label for="description" id="issue-description-label">
 			<!-- To be dynamically filled -->
 		</label>
@@ -146,7 +140,7 @@ export default (): string => `
 			<!-- To be dynamically filled -->
 		</div>
 		<div class="block-info-text">
-			<textarea name="description" id="description" cols="100" rows="12" placeholder="${escape(localize('details', "Please enter details."))}" required></textarea>
+			<textarea name="description" id="description" placeholder="${escape(localize('details', "Please enter details."))}" required></textarea>
 		</div>
 	</div>

--- a/src/vs/code/electron-browser/issue/issueReporterUtil.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterUtil.ts
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { endsWith, rtrim } from 'vs/base/common/strings';
+
+export function normalizeGitHubIssuesUrl(url: string): string {
+	// If the url has a .git suffix, remove it
+	if (endsWith(url, '.git')) {
+		url = url.substr(0, url.length - 4);
+	}
+
+	// Remove trailing slash
+	url = rtrim(url, '/');
+
+	// If the url already ends with issues/new, it's beautiful, return it
+	if (endsWith(url, 'issues/new')) {
+		return url;
+	}
+
+	// Add new segment if it does not exist
+	if (endsWith(url, 'issues')) {
+		return url + '/new';
+	}
+
+	return url + '/issues/new';
+}
--- a/src/vs/code/electron-browser/issue/media/issueReporter.css
+++ b/src/vs/code/electron-browser/issue/media/issueReporter.css
@@ -18,16 +18,11 @@ th {
 	vertical-align: bottom;
 	border-bottom: 2px solid #e9ecef;
 	padding: .75rem;
-	border-top: 1px solid #e9ecef;
 	text-align: inherit;
 }
-tr:nth-of-type(even) {
-	background-color: rgba(0,0,0,.05);
-}
 td {
 	padding: .75rem;
 	vertical-align: top;
-	border-top: 1px solid #e9ecef;
 }

 .block-settingsSearchResults-details {
@@ -39,7 +34,7 @@ td {
 }

 .section {
-	margin-bottom: 1.5em;
+	margin-bottom: .5em;
 }

 /**
@@ -103,21 +98,19 @@ textarea {
 html {
 	font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Ubuntu", "Droid Sans", sans-serif;
 	color: #CCCCCC;
+	height: 100%;
 }

 body {
 	margin: 0;
 	overflow: scroll;
+	height: 100%;
 }

 .hidden {
 	display: none;
 }

-#block-container {
-	margin-top: 1em;
-}
-
 .block .block-info {
 	width: 100%;
 	font-family: 'Menlo', 'Courier New', 'Courier', monospace;
@@ -144,11 +137,32 @@ button:disabled {
 	max-width: 85vw;
 	margin-left: auto;
 	margin-right: auto;
-	margin-top: 2em;
+	padding-top: 2em;
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.description-section {
+	flex-grow: 1;
+	display: flex;
+	flex-direction: column;
+	flex-shrink: 0;
+}
+
+textarea {
+	flex-grow: 1;
+	min-height: 150px;
+}
+
+.block-info-text {
+	display: flex;
+	flex-grow: 1;
 }

 #github-submit-btn {
-	float: right;
+	flex-shrink: 0;
+	margin-left: auto;
 	margin-top: 10px;
 	margin-bottom: 10px;
 }
@@ -166,31 +180,8 @@ button:disabled {
 	margin-bottom: 1em;
 }

-.extensions-form {
-	display: flex;
-}
-
-.extensions-form > .form-buttons {
-	display: flex;
-	margin-left: 20px;
-}
-
-.extensions-form > .form-buttons > .choice {
-	margin-right: 35px;
-	position: relative;
-}
-
-.extensions-form > .form-buttons > .choice > label, .extensions-form  > .form-buttons > .choice > input {
-	cursor: pointer;
-	height: 100%;
-	margin-top: 1px;
-}
-
-.extensions-form > .form-buttons > .choice > label {
-	position: absolute;
-	top: 50%;
-	margin-top: -50%;
-	left: 20px;
+#extension-selection {
+	margin-top: 1em;
 }

 .system-info {
@@ -206,6 +197,7 @@ summary {
 	border: 1px solid transparent;
 	padding: 0 10px;
 	margin-bottom: 5px;
+	cursor: pointer;
 }

 .validation-error {
@@ -250,8 +242,9 @@ input:disabled {
 	margin-top: .5em;
 }

-.workbenchCommand {
+a, .workbenchCommand {
 	cursor: pointer;
+	border: 1px solid transparent;
 }

 .workbenchCommand:disabled {
@@ -309,17 +302,17 @@ button {
 }

 #similar-issues {
-	margin-left: 12%;
+	margin-left: 13%;
 	display: block;
 }

@media (max-width: 950px) {
 	.section .inline-label {
-		width: 12%;
+		width: 13%;
 	}

 	.section .inline-form-control  {
-		width: calc(88% - 5px);
+		width: calc(87% - 5px);
 	}
 }

@@ -328,7 +321,7 @@ button {
 		display: none !important;
 	}

-	.inline-form-control {
+	.section .inline-form-control {
 		width: 100%;
 	}

@@ -352,26 +345,28 @@ button {
 .issues-container {
 	margin-left: 1.5em;
 	margin-top: .5em;
-	height: 92px;
+	max-height: 92px;
 	overflow-y: auto;
 }

 .issues-container > .issue {
 	padding: 4px 0;
+	display: flex;
 }

 .issues-container > .issue > .issue-link {
-	display: inline-block;
 	width: calc(100% - 82px);
-	vertical-align: top;
 	overflow: hidden;
 	padding-top: 3px;
 	white-space: nowrap;
 	text-overflow: ellipsis;
 }

+.issues-container > .issue > .issue-state .octicon {
+	width: 16px;
+}
+
 .issues-container > .issue > .issue-state {
-	display: inline-block;
 	width: 77px;
 	padding: 3px 6px;
 	margin-right: 5px;
@@ -380,14 +375,8 @@ button {
 	border-radius: .25rem;
 }

-.issues-container > .issue > .issue-state .octicon {
-	vertical-align: top;
-	width: 16px;
-}
-
 .issues-container > .issue .label {
 	margin-left: 5px;
-	display: inline-block;
 	width: 44px;
 	text-overflow: ellipsis;
 	overflow: hidden;
--- a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
+++ b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
@@ -7,6 +7,8 @@

 import * as assert from 'assert';
 import { IssueReporterModel } from 'vs/code/electron-browser/issue/issueReporterModel';
+import { normalizeGitHubIssuesUrl } from 'vs/code/electron-browser/issue/issueReporterUtil';
+import { IssueType } from 'vs/platform/issue/common/issue';

 suite('IssueReporter', () => {

@@ -18,8 +20,7 @@ suite('IssueReporter', () => {
 			includeProcessInfo: true,
 			includeExtensions: true,
 			includeSearchedExtensions: true,
-			includeSettingsSearchDetails: true,
-			reprosWithoutExtensions: false
+			includeSettingsSearchDetails: true
 		});
 	});

@@ -38,4 +39,75 @@ OS version: undefined

 <!-- generated by issue reporter -->`);
 	});
+
+	test('serializes GPU information when data is provided', () => {
+		const issueReporterModel = new IssueReporterModel({
+			issueType: 0,
+			systemInfo: {
+				'GPU Status': {
+					'2d_canvas': 'enabled',
+					'checker_imaging': 'disabled_off'
+				}
+			}
+		});
+		assert.equal(issueReporterModel.serialize(),
+		// {{SQL CARBON EDIT}}
+			`
+Issue Type: <b>Bug</b>
+
+undefined
+
+SQL Operations Studio version: undefined
+OS version: undefined
+
+<details>
+<summary>System Info</summary>
+
+|Item|Value|
+|---|---|
+|GPU Status|2d_canvas: enabled<br>checker_imaging: disabled_off|
+
+</details>Extensions: none
+<!-- generated by issue reporter -->`);
+	});
+
+	test('should normalize GitHub urls', () => {
+		[
+			'https://github.com/repo',
+			'https://github.com/repo/',
+			'https://github.com/repo.git',
+			'https://github.com/repo/issues',
+			'https://github.com/repo/issues/',
+			'https://github.com/repo/issues/new',
+			'https://github.com/repo/issues/new/'
+		].forEach(url => {
+			assert.equal('https://github.com/repo/issues/new', normalizeGitHubIssuesUrl(url));
+		});
+	});
+
+	test('should have support for filing on extensions for bugs, performance issues, and feature requests', () => {
+		[
+			IssueType.Bug,
+			IssueType.FeatureRequest,
+			IssueType.PerformanceIssue
+		].forEach(type => {
+			const issueReporterModel = new IssueReporterModel({
+				issueType: type,
+				fileOnExtension: true
+			});
+
+			assert.equal(issueReporterModel.fileOnExtension(), true);
+		});
+
+		[
+			IssueType.SettingsSearchIssue
+		].forEach(type => {
+			const issueReporterModel = new IssueReporterModel({
+				issueType: type,
+				fileOnExtension: true
+			});
+
+			assert.equal(issueReporterModel.fileOnExtension(), false);
+		});
+	});
 });
--- a/src/vs/code/electron-browser/processExplorer/media/processExplorer.css
+++ b/src/vs/code/electron-browser/processExplorer/media/processExplorer.css
@@ -0,0 +1,69 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+html,
+body {
+	margin: 0;
+	padding: 0;
+	height: 100%;
+	width: 100%;
+	-webkit-touch-callout: none;
+	-webkit-user-select: none;
+	user-select: none;
+	font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Ubuntu", "Droid Sans", sans-serif;
+	font-size: 13px;
+	color: #cccccc;
+}
+
+.cpu {
+	width: 45px;
+}
+
+.pid {
+	width: 50px
+}
+
+.memory {
+	width: 90px;
+}
+
+.process-item {
+	line-height: 22px;
+}
+
+table {
+	border-collapse: collapse;
+	width: 100%;
+	table-layout: fixed;
+}
+th {
+	vertical-align: bottom;
+	border-bottom: 1px solid #cccccc;
+	padding: .5rem;
+	border-top: 1px solid #cccccc;
+	cursor: default;
+}
+td {
+	padding: .25rem;
+	vertical-align: top;
+	cursor: default;
+}
+
+.centered {
+	text-align: center;
+}
+
+.nameLabel{
+	text-align: left;
+}
+
+.data {
+	white-space: pre;
+	padding-left: .5rem;
+}
+
+tbody > tr:hover {
+	background-color: #2A2D2E;
+}
--- a/src/vs/code/electron-browser/processExplorer/processExplorer.html
+++ b/src/vs/code/electron-browser/processExplorer/processExplorer.html
@@ -0,0 +1,17 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="utf-8" />
+	<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data:; media-src 'none'; child-src 'self'; object-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https:;">
+</head>
+
+<body aria-label="">
+	<div id="process-list"></div>
+</body>
+
+<!-- Startup via processExplorer.js -->
+<script src="processExplorer.js"></script>
+
+</html>
--- a/src/vs/code/electron-browser/processExplorer/processExplorer.js
+++ b/src/vs/code/electron-browser/processExplorer/processExplorer.js
@@ -0,0 +1,175 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const remote = require('electron').remote;
+
+function assign(destination, source) {
+	return Object.keys(source)
+		.reduce(function (r, key) { r[key] = source[key]; return r; }, destination);
+}
+
+function parseURLQueryArgs() {
+	const search = window.location.search || '';
+
+	return search.split(/[?&]/)
+		.filter(function (param) { return !!param; })
+		.map(function (param) { return param.split('='); })
+		.filter(function (param) { return param.length === 2; })
+		.reduce(function (r, param) { r[param[0]] = decodeURIComponent(param[1]); return r; }, {});
+}
+
+function uriFromPath(_path) {
+	var pathName = path.resolve(_path).replace(/\\/g, '/');
+	if (pathName.length > 0 && pathName.charAt(0) !== '/') {
+		pathName = '/' + pathName;
+	}
+
+	return encodeURI('file://' + pathName);
+}
+
+function readFile(file) {
+	return new Promise(function(resolve, reject) {
+		fs.readFile(file, 'utf8', function(err, data) {
+			if (err) {
+				reject(err);
+				return;
+			}
+			resolve(data);
+		});
+	});
+}
+
+function main() {
+	const args = parseURLQueryArgs();
+	const configuration = JSON.parse(args['config'] || '{}') || {};
+
+	assign(process.env, configuration.userEnv);
+
+	//#region Add support for using node_modules.asar
+	(function () {
+		const path = require('path');
+		const Module = require('module');
+		let NODE_MODULES_PATH = path.join(configuration.appRoot, 'node_modules');
+		if (/[a-z]\:/.test(NODE_MODULES_PATH)) {
+			// Make drive letter uppercase
+			NODE_MODULES_PATH = NODE_MODULES_PATH.charAt(0).toUpperCase() + NODE_MODULES_PATH.substr(1);
+		}
+		const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';
+
+		const originalResolveLookupPaths = Module._resolveLookupPaths;
+		Module._resolveLookupPaths = function (request, parent, newReturn) {
+			const result = originalResolveLookupPaths(request, parent, newReturn);
+
+			const paths = newReturn ? result : result[1];
+			for (let i = 0, len = paths.length; i < len; i++) {
+				if (paths[i] === NODE_MODULES_PATH) {
+					paths.splice(i, 0, NODE_MODULES_ASAR_PATH);
+					break;
+				}
+			}
+
+			return result;
+		};
+	})();
+	//#endregion
+
+	// Get the nls configuration into the process.env as early as possible.
+	var nlsConfig = { availableLanguages: {} };
+	const config = process.env['VSCODE_NLS_CONFIG'];
+	if (config) {
+		process.env['VSCODE_NLS_CONFIG'] = config;
+		try {
+			nlsConfig = JSON.parse(config);
+		} catch (e) { /*noop*/ }
+	}
+
+	if (nlsConfig._resolvedLanguagePackCoreLocation) {
+		let bundles = Object.create(null);
+		nlsConfig.loadBundle = function(bundle, language, cb) {
+			let result = bundles[bundle];
+			if (result) {
+				cb(undefined, result);
+				return;
+			}
+			let bundleFile = path.join(nlsConfig._resolvedLanguagePackCoreLocation, bundle.replace(/\//g, '!') + '.nls.json');
+			readFile(bundleFile).then(function (content) {
+				let json = JSON.parse(content);
+				bundles[bundle] = json;
+				cb(undefined, json);
+			})
+			.catch(cb);
+		};
+	}
+
+	var locale = nlsConfig.availableLanguages['*'] || 'en';
+	if (locale === 'zh-tw') {
+		locale = 'zh-Hant';
+	} else if (locale === 'zh-cn') {
+		locale = 'zh-Hans';
+	}
+
+	window.document.documentElement.setAttribute('lang', locale);
+
+	const extractKey = function (e) {
+		return [
+			e.ctrlKey ? 'ctrl-' : '',
+			e.metaKey ? 'meta-' : '',
+			e.altKey ? 'alt-' : '',
+			e.shiftKey ? 'shift-' : '',
+			e.keyCode
+		].join('');
+	};
+
+	const TOGGLE_DEV_TOOLS_KB = (process.platform === 'darwin' ? 'meta-alt-73' : 'ctrl-shift-73'); // mac: Cmd-Alt-I, rest: Ctrl-Shift-I
+	const RELOAD_KB = (process.platform === 'darwin' ? 'meta-82' : 'ctrl-82'); // mac: Cmd-R, rest: Ctrl-R
+
+	window.addEventListener('keydown', function (e) {
+		const key = extractKey(e);
+		if (key === TOGGLE_DEV_TOOLS_KB) {
+			remote.getCurrentWebContents().toggleDevTools();
+		} else if (key === RELOAD_KB) {
+			remote.getCurrentWindow().reload();
+		}
+	});
+
+	// Load the loader
+	const loaderFilename = configuration.appRoot + '/out/vs/loader.js';
+	const loaderSource = fs.readFileSync(loaderFilename);
+	require('vm').runInThisContext(loaderSource, { filename: loaderFilename });
+	var define = global.define;
+	global.define = undefined;
+
+	window.nodeRequire = require.__$__nodeRequire;
+
+	define('fs', ['original-fs'], function (originalFS) { return originalFS; }); // replace the patched electron fs with the original node fs for all AMD code
+
+	window.MonacoEnvironment = {};
+	const rootUrl = uriFromPath(configuration.appRoot) + '/out';
+
+	require.config({
+		baseUrl: rootUrl,
+		'vs/nls': nlsConfig,
+		nodeCachedDataDir: configuration.nodeCachedDataDir,
+		nodeModules: [/*BUILD->INSERT_NODE_MODULES*/]
+	});
+
+	if (nlsConfig.pseudo) {
+		require(['vs/nls'], function (nlsPlugin) {
+			nlsPlugin.setPseudoTranslation(nlsConfig.pseudo);
+		});
+	}
+
+	require([
+		'vs/code/electron-browser/processExplorer/processExplorerMain'
+	], function (processExplorer) {
+		processExplorer.startup(configuration.data);
+	});
+}
+
+main();
--- a/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts
+++ b/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts
@@ -0,0 +1,184 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import 'vs/css!./media/processExplorer';
+import { listProcesses, ProcessItem } from 'vs/base/node/ps';
+import { remote, webFrame } from 'electron';
+import { repeat } from 'vs/base/common/strings';
+import { totalmem } from 'os';
+import product from 'vs/platform/node/product';
+import { localize } from 'vs/nls';
+import { ProcessExplorerStyles, ProcessExplorerData } from 'vs/platform/issue/common/issue';
+import * as browser from 'vs/base/browser/browser';
+import * as platform from 'vs/base/common/platform';
+
+let processList: any[];
+
+function getProcessList(rootProcess: ProcessItem) {
+	const processes: any[] = [];
+
+	if (rootProcess) {
+		getProcessItem(processes, rootProcess, 0);
+	}
+
+	return processes;
+}
+
+function getProcessItem(processes: any[], item: ProcessItem, indent: number): void {
+	const isRoot = (indent === 0);
+
+	const MB = 1024 * 1024;
+
+	// Format name with indent
+	const name = isRoot ? `${product.applicationName} main` : item.name;
+	const formattedName = isRoot ? name : `${repeat('    ', indent)} ${name}`;
+	const memory = process.platform === 'win32' ? item.mem : (totalmem() * (item.mem / 100));
+	processes.push({
+		cpu: Number(item.load.toFixed(0)),
+		memory: Number((memory / MB).toFixed(0)),
+		pid: Number((item.pid).toFixed(0)),
+		name,
+		formattedName,
+		cmd: item.cmd
+	});
+
+	// Recurse into children if any
+	if (Array.isArray(item.children)) {
+		item.children.forEach(child => getProcessItem(processes, child, indent + 1));
+	}
+}
+
+function getProcessIdWithHighestProperty(processList, propertyName: string) {
+	let max = 0;
+	let maxProcessId;
+	processList.forEach(process => {
+		if (process[propertyName] > max) {
+			max = process[propertyName];
+			maxProcessId = process.pid;
+		}
+	});
+
+	return maxProcessId;
+}
+
+function updateProcessInfo(processList): void {
+	const target = document.getElementById('process-list');
+	const highestCPUProcess = getProcessIdWithHighestProperty(processList, 'cpu');
+	const highestMemoryProcess = getProcessIdWithHighestProperty(processList, 'memory');
+
+	let tableHtml = `
+		<tr>
+			<th class="cpu">${localize('cpu', "CPU %")}</th>
+			<th class="memory">${localize('memory', "Memory (MB)")}</th>
+			<th class="pid">${localize('pid', "pid")}</th>
+			<th class="nameLabel">${localize('name', "Name")}</th>
+		</tr>`;
+
+	processList.forEach(p => {
+		const cpuClass = p.pid === highestCPUProcess ? 'highest' : '';
+		const memoryClass = p.pid === highestMemoryProcess ? 'highest' : '';
+
+		tableHtml += `
+			<tr id=${p.pid}>
+				<td class="centered ${cpuClass}">${p.cpu}</td>
+				<td class="centered ${memoryClass}">${p.memory}</td>
+				<td class="centered">${p.pid}</td>
+				<td title="${p.name}" class="data">${p.formattedName}</td>
+			</tr>`;
+	});
+
+	target.innerHTML = `<table>${tableHtml}</table>`;
+}
+
+function applyStyles(styles: ProcessExplorerStyles): void {
+	const styleTag = document.createElement('style');
+	const content: string[] = [];
+
+	if (styles.hoverBackground) {
+		content.push(`tbody > tr:hover  { background-color: ${styles.hoverBackground}; }`);
+	}
+
+	if (styles.hoverForeground) {
+		content.push(`tbody > tr:hover{ color: ${styles.hoverForeground}; }`);
+	}
+
+	if (styles.highlightForeground) {
+		content.push(`.highest { color: ${styles.highlightForeground}; }`);
+	}
+
+	styleTag.innerHTML = content.join('\n');
+	document.head.appendChild(styleTag);
+	document.body.style.color = styles.color;
+}
+
+function applyZoom(zoomLevel: number): void {
+	webFrame.setZoomLevel(zoomLevel);
+	browser.setZoomFactor(webFrame.getZoomFactor());
+	// See https://github.com/Microsoft/vscode/issues/26151
+	// Cannot be trusted because the webFrame might take some time
+	// until it really applies the new zoom level
+	browser.setZoomLevel(webFrame.getZoomLevel(), /*isTrusted*/false);
+}
+
+function showContextMenu(e) {
+	e.preventDefault();
+
+	const pid = parseInt(e.currentTarget.id);
+	if (pid && typeof pid === 'number') {
+		const menu = new remote.Menu();
+		menu.append(new remote.MenuItem({
+			label: localize('killProcess', "Kill Process"),
+			click() {
+				process.kill(pid, 'SIGTERM');
+			}
+		})
+		);
+
+		menu.append(new remote.MenuItem({
+			label: localize('forceKillProcess', "Force Kill Process"),
+			click() {
+				process.kill(pid, 'SIGKILL');
+			}
+		})
+		);
+
+		menu.popup(remote.getCurrentWindow());
+	}
+}
+
+export function startup(data: ProcessExplorerData): void {
+	applyStyles(data.styles);
+	applyZoom(data.zoomLevel);
+
+	setInterval(() => listProcesses(remote.process.pid).then(processes => {
+		processList = getProcessList(processes);
+		updateProcessInfo(processList);
+
+		const tableRows = document.getElementsByTagName('tr');
+		for (let i = 0; i < tableRows.length; i++) {
+			const tableRow = tableRows[i];
+			tableRow.addEventListener('contextmenu', (e) => {
+				showContextMenu(e);
+			});
+		}
+	}), 1200);
+
+
+	document.onkeydown = (e: KeyboardEvent) => {
+		const cmdOrCtrlKey = platform.isMacintosh ? e.metaKey : e.ctrlKey;
+
+		// Cmd/Ctrl + zooms in
+		if (cmdOrCtrlKey && e.keyCode === 187) {
+			applyZoom(webFrame.getZoomLevel() + 1);
+		}
+
+		// Cmd/Ctrl - zooms out
+		if (cmdOrCtrlKey && e.keyCode === 189) {
+			applyZoom(webFrame.getZoomLevel() - 1);
+		}
+	};
+}
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
@@ -69,10 +69,10 @@ function main() {
 		const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';

 		const originalResolveLookupPaths = Module._resolveLookupPaths;
-		Module._resolveLookupPaths = function (request, parent) {
-			const result = originalResolveLookupPaths(request, parent);
+		Module._resolveLookupPaths = function (request, parent, newReturn) {
+			const result = originalResolveLookupPaths(request, parent, newReturn);

-			const paths = result[1];
+			const paths = newReturn ? result : result[1];
 			for (let i = 0, len = paths.length; i < len; i++) {
 				if (paths[i] === NODE_MODULES_PATH) {
 					paths.splice(i, 0, NODE_MODULES_ASAR_PATH);
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
@@ -30,10 +30,9 @@ import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProper
 import { TelemetryAppenderChannel } from 'vs/platform/telemetry/common/telemetryIpc';
 import { TelemetryService, ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService';
 import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
-import { IWindowsService } from 'vs/platform/windows/common/windows';
+import { IWindowsService, ActiveWindowManager } from 'vs/platform/windows/common/windows';
 import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc';
 import { ipcRenderer } from 'electron';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { createSharedProcessContributions } from 'vs/code/electron-browser/sharedProcess/contrib/contributions';
 import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
 import { ILogService, LogLevel } from 'vs/platform/log/common/log';
@@ -41,8 +40,8 @@ import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log
 import { LocalizationsService } from 'vs/platform/localizations/node/localizations';
 import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
 import { LocalizationsChannel } from 'vs/platform/localizations/common/localizationsIpc';
-import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
-import { ChoiceChannelClient } from 'vs/platform/dialogs/common/choiceIpc';
+import { DialogChannelClient } from 'vs/platform/dialogs/common/dialogIpc';
+import { IDialogService } from 'vs/platform/dialogs/common/dialogs';

 export interface ISharedProcessConfiguration {
 	readonly machineId: string;
@@ -58,28 +57,6 @@ interface ISharedProcessInitData {
 	logLevel: LogLevel;
 }

-class ActiveWindowManager implements IDisposable {
-	private disposables: IDisposable[] = [];
-	private _activeWindowId: number;
-
-	constructor( @IWindowsService windowsService: IWindowsService) {
-		windowsService.onWindowOpen(this.setActiveWindow, this, this.disposables);
-		windowsService.onWindowFocus(this.setActiveWindow, this, this.disposables);
-	}
-
-	private setActiveWindow(windowId: number) {
-		this._activeWindowId = windowId;
-	}
-
-	public get activeClientId(): string {
-		return `window:${this._activeWindowId}`;
-	}
-
-	public dispose() {
-		this.disposables = dispose(this.disposables);
-	}
-}
-
 const eventPrefix = 'monacoworkbench';

 function main(server: Server, initData: ISharedProcessInitData, configuration: ISharedProcessConfiguration): void {
@@ -102,13 +79,13 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
 	services.set(IWindowsService, windowsService);

 	const activeWindowManager = new ActiveWindowManager(windowsService);
-	const choiceChannel = server.getChannel('choice', {
+	const dialogChannel = server.getChannel('dialog', {
 		route: () => {
-			logService.info('Routing choice request to the client', activeWindowManager.activeClientId);
+			logService.info('Routing dialog request to the client', activeWindowManager.activeClientId);
 			return activeWindowManager.activeClientId;
 		}
 	});
-	services.set(IChoiceService, new ChoiceChannelClient(choiceChannel));
+	services.set(IDialogService, new DialogChannelClient(dialogChannel));

 	const instantiationService = new InstantiationService(services);