Merge VS Code 1.26.1 (#2394)

* Squash merge commits for 1.26 (#1) (#2323) * Polish tag search as per feedback (#55269) * Polish tag search as per feedback * Updated regex * Allow users to opt-out of features that send online requests in the background (#55097) * settings sweep #54690 * Minor css tweaks to enable eoverflow elipsis in more places (#55277) * fix an issue with titlebarheight when not scaling with zoom * Settings descriptions update #54690 * fixes #55209 * Settings editor - many padding fixes * More space above level 2 label * Fixing Cannot debug npm script using Yarn #55103 * Settings editor - show ellipsis when description overflows * Settings editor - ... fix measuring around links, relayout * Setting descriptions * Settings editor - fix ... for some short lines, fix select container width * Settings editor - overlay trees so scrollable shadow is full width * Fix #54133 - missing extension settings after reload * Settings color token description tweak * Settings editor - disable overflow indicator temporarily, needs to be faster * Added command to Run the selected npm script * fixes #54452 * fixes #54929 * fixes #55248 * prefix command with extension name * Contribute run selected to the context menu * node-debug@1.26.6 * Allow terminal rendererType to be swapped out at runtime Part of #53274 Fixes #55344 * Settings editor - fix not focusing search when restoring editor setInput must be actually async. Will be fixed naturally when we aren't using winJS promises... * Settings editor - TOC should only expand the section with a selected item * Bump node-debug2 * Settings editor - Tree focus outlines * Settings editor - don't blink the scrollbar when toc selection changes And hide TOC correctly when the editor is narrow * Settings editor - header rows should not be selectable * fixes #54877 * change debug assignee to isi * Settings sweep (#54690) * workaround for #55051 * Settings sweep (#54690) * settings sweep #54690 * Don't try closing tags when you type > after another > * Describe what implementation code lens does Fixes #55370 * fix javadoc formatter setting description * fixes #55325 * update to officical TS version * Settings editor - Even more padding, use semibold instead of bold * Fix #55357 - fix TOC twistie * fixes #55288 * explorer: refresh on di change file system provider registration fixes #53256 * Disable push to Linux repo to test standalone publisher * New env var to notify log level to extensions #54001 * Disable snippets in extension search (when not in suggest dropdown) (#55281) * Disable snippits in extension search (when not in suggest dropdown) * Add monaco input contributions * Fix bug preventing snippetSuggestions from taking effect in sub-editors * Latest emmet helper to fix #52366 * Fix comment updates for threads within same file * Allow extensions to log telemetry to log files #54001 * Pull latest css grammar * files.exclude control - use same style for "add" vs "edit" * files.exclude control - focus/keyboard behavior * don't show menubar too early * files.exclude - better styling * Place cursor at end of extensions search box on autofill (#55254) * Place cursor at end of extensions search box on autofill * Use position instead of selection * fix linux build issue (empty if block) * Settings editor - fix extension category prefixes * Settings editor - add simple ellipsis for first line that overflows, doesn't cover case when first line does not overflow but there is more text, TODO * File/Text search provider docs * Fixes #52655 * Include epoch (#55008) * Fixes #53385 * Fixes #49480 * VS Code Insiders (Users) not opening Fixes #55353 * Better handling of the case when the extension host fails to start * Fixes #53966 * Remove confusing Start from wordPartLeft commands ID * vscode-xterm@3.6.0-beta12 Fixes #55488 * Initial size is set to infinity!! Fixes #55461 * Polish embeddedEditorBackground * configuration service misses event * Fix #55224 - fix duplicate results in multiroot workspace from splitting the diskseach query * Select all not working in issue reporter on mac, fixes #55424 * Disable fuzzy matching for extensions autosuggest (#55498) * Fix clipping of extensions search border in some third party themes (#55504) * fixes #55538 * Fix bug causing an aria alert to not be shown the third time (and odd numbers thereafter) * Settings editor - work around rendering glitch with webkit-line-clamp * Settings editor - revert earlier '...' changes * Settings editor - move enumDescription to its own div, because it disturbs -webkit-line-clamp for some reason * Settings editor - better overflow indicator * Don't show existing filters in autocomplete (#55495) * Dont show existing filters in autocomplete * Simplify * Settings Editor: Add aria labels for input elements Fixes: #54836 (#55543) * fixes #55223 * Update vscode-css-languageservice to 3.0.10-next.1 * Fix #55509 - settings navigation * Fix #55519 * Fix #55520 * FIx #55524 * Fix #55556 - include wordSeparators in all search queries, so findTextInFiles can respect isWordMatch correctly * oss updates for endgame * Fix unit tests * fixes #55522 * Avoid missing manifest error from bubbling up #54757 * Settings format crawl * Search provider - Fix FileSearchProvider to return array, not progress * Fix #55598 * Settings editor - fix NPE rendering settings with no description * dont render inden guides in search box (#55600) * fixes #55454 * More settings crawl * Another change for #55598 - maxResults applies to FileSearch and TextSearch but not FileIndex * Fix FileSearchProvider unit tests for progress change * fixes #55561 * Settings description update for #54690 * Update setting descriptions for online services * Minor edits * fixes #55513 * fixes #55451 * Fix #55612 - fix findTextInFiles cancellation * fixes #55539 * More setting description tweaks * Setting to disable online experiments #54354 * fixes #55507 * fixes #55515 * Show online services action only in Insiders for now * Settings editor - change toc behavior default to 'filter' * Settings editor - nicer filter count style during search * Fix #55617 - search viewlet icons * Settings editor - better styling for element count indicator * SearchProvider - fix NPE when searching extraFileResources * Allow extends to work without json suffix Fixes #16905 * Remove accessability options logic entirely Follow up on #55451 * use latest version of DAP * fixes #55490 * fixes #55122 * fixes #52332 * Avoid assumptions about git: URIs (fixes #36236) * relative path for descriptions * resourece: get rid of isFile context key fixes #48275 * Register previous ids for compatibility (#53497) * more tuning for #48275 * no need to always re-read "files explorer" fixes #52003 * read out active composites properly fixes #51967 * Update link colors for hc theme to meet color contrast ratio, fixes #55651 Also updated link color for `textLinkActiveForeground` to be the same as `textLinkForeground` as it wasn't properly updated * detect 'winpty-agent.exe'; fixes #55672 * node-debug@1.26.7 * reset counter on new label * Settings editor - fix multiple setting links in one description * Settings editor - color code blocks in setting descriptions, fix #55532 * Settings editor - hover color in TOC * Settings editor - fix navigation NPE * Settings editor - fix text control width * Settings editor - maybe fix #55684 * Fix bug causing cursor to not move on paste * fixes #53582 * Use ctrlCmd instead of ctrl for go down from search box * fixes #55264 * fixes #55456 * filter for spcaes before triggering search (#55611) * Fix #55698 - don't lose filtered TOC counts when refreshing TOC * fixes #55421 * fixes #28979 * fixes #55576 * only add check for updates to windows/linux help * readonly files: append decoration to label fixes #53022 * debug: do not show toolbar while initialising fixes #55026 * Opening launch.json should not activate debug extensions fixes #55029 * fixes #55435 * fixes #55434 * fixes #55439 * trigger menu only on altkey up * Fix #50555 - fix settings editor memory leak * Fix #55712 - no need to focus 'a' anymore when restoring control focus after tree render * fixes #55335 * proper fix for readonly model fixes #53022 * improve FoldingRangeKind spec (for #55686) * Use class with static fields (fixes #55494) * Fixes #53671 * fixes #54630 * [html] should disable ionic suggestions by default. Currently forces deprecated Ionic v1 suggestions in .html files while typing. Fixes #53324 * cleanup deps * debug issues back to andre * update electron for smoketest * Fix #55757 - prevent settings tabs from overflowing * Fix #53897 - revert setting menu defaults to old editor * Add enum descriptions to `typescript.preferences.importModuleSpecifier` * Fix #55767 - leaking style elements from settings editor * Fix #55521 - prevent flashing when clicking in exclude control * Update Git modified color for contrast ratio, fixes #53140 * Revert "Merge branch 'master' of github.com:Microsoft/vscode" This reverts commit bf46b6bfbae0cab99c2863e1244a916181fa9fbc, reversing changes made to e275a424483dfb4ed33b428c97d5e2c441d6b917. * Revert "Revert "Merge branch 'master' of github.com:Microsoft/vscode"" This reverts commit 53949d963f39e40757557c6526332354a31d9154. * don't ask to install an incomplete menu * Fix NPE in terminal AccessibilityManager Fixes #55744 * don't display fallback menu unless we've closed the last window * fixes #55547 * Fix smoke tests for extension search box * Update OSSREADME.json for Electron 2.0.5 * Update distro Includes Chromium license changes * fix #55455 * fix #55865 * fixes #55893 * Fix bug causing workspace recommendations to go away upon ignoring a recommendation (#55805) * Fix bug causing workspace recommendations to go away upon ignoring a recommendation * ONly show on @recommended or @recommended:workspace * Make more consistant * Fix #55911 * Understand json activity (#55926) * Understand json file activity * Refactoring * adding composer.json * Distro update for experiments * use terminal.processId for auto-attach; fixes #55918 * Reject invalid URI with vscode.openFolder (for #55891) * improve win32 setup system vs user detection fixes #55840 fixes #55840 delay winreg import related to #55840 show notification earlier related to #55840 fix #55840 update inno setup message related to #55840 * Fix #55593 - this code only operates on local paths, so use fsPath and Uri.file instead * Bring back the old menu due to electron 2.0 issues (#55913) * add the old menu back for native menus * make menu labels match * `vscode.openFolder`: treat missing URI schema gracefully (for #55891) * delay EH reattach; fixes #55955 * Mark all json files under appSettingsHome as settings * Use localized strings for telemetry opt-out * Exception when saving file editor opened from remote file provider (fixes #55051) * Remove terminal menu from stable Fixes 56003 * VSCode Insiders crashes on open with TypeError: Cannot read property 'lastIndexOf' of undefined. Fixes #54933 * improve fix for #55891 * fix #55916 * Improve #55891 * increase EH debugging restart delay; fixes #55955 * Revert "Don't include non-resource entries in history quick pick" This reverts commit 37209a838e9f7e9abe6dc53ed73cdf1e03b72060. * Diff editor: horizontal scrollbar height is smaller (fixes #56062) * improve openFolder uri fix (correctly treat backslashes) * fixes #56116 repair ipc for native menubar keybindings * Fix #56240 - Open the JSON settings editor instead of the UI editor * Fix #55536 * uriDisplay: if no formatter is registered fall back to getPathlabel fixes #56104 * VSCode hangs when opening python file. Fixes #56377 * VS Code Hangs When Opening Specific PowerShell File. Fixes #56430 * Fix #56433 - search extraFileResources even when no folders open * Workaround #55649 * Fix in master #56371 * Fix tests #56371 * Fix in master #56317 * increase version to 1.26.1 * Fixes #56387: Handle SIGPIPE in extension host * fixes #56185 * Fix merge issues (part 1) * Fix build breaks (part 1) * Build breaks (part 2) * Build breaks (part 3) * More build breaks (part 4) * Fix build breaks (part 5) * WIP * Fix menus * Render query result and message panels (#2363) * Put back query editor hot exit changes * Fix grid changes that broke profiler (#2365) * Update APIs for saving query editor state * Fix restore view state for profiler and edit data * Updating custom default themes to support 4.5:1 contrast ratio * Test updates * Fix Extension Manager and Windows Setup * Update license headers * Add appveyor and travis files back * Fix hidden modal dropdown issue
2026-01-19 09:35:36 -05:00 · 2018-09-04 14:55:00 -07:00
parent 3763278366
commit 81329fa7fa
2638 changed files with 118456 additions and 64012 deletions
--- a/src/vs/code/electron-browser/issue/issueReporter.js
+++ b/src/vs/code/electron-browser/issue/issueReporter.js
@@ -45,6 +45,8 @@ function readFile(file) {
 	});
 }

+const writeFile = (file, content) => new Promise((c, e) => fs.writeFile(file, content, 'utf8', err => err ? e(err) : c()));
+
 function main() {
 	const args = parseURLQueryArgs();
 	const configuration = JSON.parse(args['config'] || '{}') || {};
@@ -127,8 +129,15 @@ function main() {
 				let json = JSON.parse(content);
 				bundles[bundle] = json;
 				cb(undefined, json);
-			})
-			.catch(cb);
+			}).catch((error) => {
+				try {
+					if (nlsConfig._corruptedFile) {
+						writeFile(nlsConfig._corruptedFile, 'corrupted').catch(function (error) { console.error(error); });
+					}
+				} finally {
+					cb(error, undefined);
+				}
+			});
 		};
 	}

--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -23,7 +23,7 @@ import { getDelayedChannel } from 'vs/base/parts/ipc/common/ipc';
 import { connect as connectNet } from 'vs/base/parts/ipc/node/ipc.net';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { IWindowConfiguration, IWindowsService } from 'vs/platform/windows/common/windows';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { NullTelemetryService, combinedAppender, LogAppender } from 'vs/platform/telemetry/common/telemetryUtils';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
 import { ITelemetryAppenderChannel, TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc';
@@ -40,7 +40,8 @@ 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';
+import { normalizeGitHubUrl } from 'vs/code/electron-browser/issue/issueReporterUtil';
+import { Button } from 'vs/base/browser/ui/button/button';

 const MAX_URL_LENGTH = platform.isWindows ? 2081 : 5400;

@@ -72,6 +73,8 @@ export class IssueReporter extends Disposable {
 	private receivedPerformanceInfo = false;
 	private shouldQueueSearch = false;

+	private previewButton: Button;
+
 	constructor(configuration: IssueReporterConfiguration) {
 		super();

@@ -83,9 +86,11 @@ export class IssueReporter extends Disposable {
 				vscodeVersion: `${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`,
 				os: `${os.type()} ${os.arch()} ${os.release()}`
 			},
-			extensionsDisabled: this.environmentService.disableExtensions,
+			extensionsDisabled: !!this.environmentService.disableExtensions,
 		});

+		this.previewButton = new Button(document.getElementById('issue-reporter'));
+
 		ipcRenderer.on('issuePerformanceInfoResponse', (event, info) => {
 			this.logService.trace('issueReporter: Received performance data');
 			this.issueReporterModel.update(info);
@@ -145,7 +150,7 @@ export class IssueReporter extends Disposable {
 		const content: string[] = [];

 		if (styles.inputBackground) {
-			content.push(`input[type="text"], textarea, select, .issues-container > .issue > .issue-state { background-color: ${styles.inputBackground}; }`);
+			content.push(`input[type="text"], textarea, select, .issues-container > .issue > .issue-state, .block-info { background-color: ${styles.inputBackground}; }`);
 		}

 		if (styles.inputBorder) {
@@ -155,7 +160,7 @@ export class IssueReporter extends Disposable {
 		}

 		if (styles.inputForeground) {
-			content.push(`input[type="text"], textarea, select, .issues-container > .issue > .issue-state { color: ${styles.inputForeground}; }`);
+			content.push(`input[type="text"], textarea, select, .issues-container > .issue > .issue-state, .block-info { color: ${styles.inputForeground}; }`);
 		}

 		if (styles.inputErrorBorder) {
@@ -171,22 +176,14 @@ export class IssueReporter extends Disposable {
 			content.push(`a, .workbenchCommand { color: ${styles.textLinkColor}; }`);
 		}

-		if (styles.buttonBackground) {
-			content.push(`button { background-color: ${styles.buttonBackground}; }`);
-		}
-
-		if (styles.buttonForeground) {
-			content.push(`button { color: ${styles.buttonForeground}; }`);
-		}
-
-		if (styles.buttonHoverBackground) {
-			content.push(`#github-submit-btn:hover:enabled, #github-submit-btn:focus:enabled { background-color: ${styles.buttonHoverBackground}; }`);
-		}
-
 		if (styles.textLinkColor) {
 			content.push(`a { color: ${styles.textLinkColor}; }`);
 		}

+		if (styles.textLinkActiveForeground) {
+			content.push(`a:hover, .workbenchCommand:hover { color: ${styles.textLinkActiveForeground}; }`);
+		}
+
 		if (styles.sliderBackgroundColor) {
 			content.push(`::-webkit-scrollbar-thumb { background-color: ${styles.sliderBackgroundColor}; }`);
 		}
@@ -199,6 +196,18 @@ export class IssueReporter extends Disposable {
 			content.push(`::--webkit-scrollbar-thumb:hover { background-color: ${styles.sliderHoverColor}; }`);
 		}

+		if (styles.buttonBackground) {
+			content.push(`.monaco-text-button { background-color: ${styles.buttonBackground} !important; }`);
+		}
+
+		if (styles.buttonForeground) {
+			content.push(`.monaco-text-button { color: ${styles.buttonForeground} !important; }`);
+		}
+
+		if (styles.buttonHoverBackground) {
+			content.push(`.monaco-text-button:hover, .monaco-text-button:focus { background-color: ${styles.buttonHoverBackground} !important; }`);
+		}
+
 		styleTag.innerHTML = content.join('\n');
 		document.head.appendChild(styleTag);
 		document.body.style.color = styles.color;
@@ -278,9 +287,9 @@ export class IssueReporter extends Disposable {
 			.then(() => connectNet(this.environmentService.sharedIPCHandle, `window:${configuration.windowId}`));

 		const instantiationService = new InstantiationService(serviceCollection, true);
-		if (this.environmentService.isBuilt && !this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) {
+		if (!this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) {
 			const channel = getDelayedChannel<ITelemetryAppenderChannel>(sharedProcess.then(c => c.getChannel('telemetryAppender')));
-			const appender = new TelemetryAppenderClient(channel);
+			const appender = combinedAppender(new TelemetryAppenderClient(channel), new LogAppender(logService));
 			const commonProperties = resolveCommonProperties(product.commit, pkg.version, configuration.machineId, this.environmentService.installSourcePath);
 			const piiPaths = [this.environmentService.appRoot, this.environmentService.extensionsPath];
 			const config: ITelemetryServiceConfig = { appender, commonProperties, piiPaths };
@@ -312,20 +321,20 @@ export class IssueReporter extends Disposable {
 			});
 		});

-		const labelElements = document.getElementsByClassName('caption');
-		for (let i = 0; i < labelElements.length; i++) {
-			const label = labelElements.item(i);
-			label.addEventListener('click', (e) => {
-				e.stopPropagation();
-
-				// Stop propgagation not working as expected in this case https://bugs.chromium.org/p/chromium/issues/detail?id=809801
-				// preventDefault does prevent outer details tag from toggling, so use that and manually toggle the checkbox
+		const showInfoElements = document.getElementsByClassName('showInfo');
+		for (let i = 0; i < showInfoElements.length; i++) {
+			const showInfo = showInfoElements.item(i);
+			showInfo.addEventListener('click', (e) => {
 				e.preventDefault();
-				const containingDiv = (<HTMLLabelElement>e.target).parentElement;
-				const checkbox = <HTMLInputElement>containingDiv.firstElementChild;
-				if (checkbox) {
-					checkbox.checked = !checkbox.checked;
-					this.issueReporterModel.update({ [checkbox.id]: !this.issueReporterModel.getData()[checkbox.id] });
+				const label = (<HTMLDivElement>e.target);
+				const containingElement = label.parentElement.parentElement;
+				const info = containingElement.lastElementChild;
+				if (info.classList.contains('hidden')) {
+					show(info);
+					label.textContent = localize('hide', "hide");
+				} else {
+					hide(info);
+					label.textContent = localize('show', "show");
 				}
 			});
 		}
@@ -372,7 +381,7 @@ export class IssueReporter extends Disposable {
 			}
 		});

-		this.addEventListener('github-submit-btn', 'click', () => this.createIssue());
+		this.previewButton.onDidClick(() => this.createIssue());

 		this.addEventListener('disableExtensions', 'click', () => {
 			ipcRenderer.send('workbenchCommand', 'workbench.action.reloadWindowWithExtensionsDisabled');
@@ -404,17 +413,26 @@ export class IssueReporter extends Disposable {
 			if (cmdOrCtrlKey && e.keyCode === 189) {
 				this.applyZoom(webFrame.getZoomLevel() - 1);
 			}
+
+			// With latest electron upgrade, cmd+a is no longer propagating correctly for inputs in this window on mac
+			// Manually perform the selection
+			if (platform.isMacintosh) {
+				if (cmdOrCtrlKey && e.keyCode === 65 && e.target) {
+					if (e.target instanceof HTMLInputElement || e.target instanceof HTMLTextAreaElement) {
+						(<HTMLInputElement>e.target).select();
+					}
+				}
+			}
 		};
 	}

 	private updatePreviewButtonState() {
-		const submitButton = <HTMLButtonElement>document.getElementById('github-submit-btn');
 		if (this.isPreviewEnabled()) {
-			submitButton.disabled = false;
-			submitButton.textContent = localize('previewOnGitHub', "Preview on GitHub");
+			this.previewButton.label = localize('previewOnGitHub', "Preview on GitHub");
+			this.previewButton.enabled = true;
 		} else {
-			submitButton.disabled = true;
-			submitButton.textContent = localize('loadingData', "Loading data...");
+			this.previewButton.enabled = false;
+			this.previewButton.label = localize('loadingData', "Loading data...");
 		}
 	}

@@ -458,13 +476,20 @@ export class IssueReporter extends Disposable {
 	}

 	private searchExtensionIssues(title: string): void {
-		const url = this.getExtensionRepositoryUrl();
+		const url = this.getExtensionGitHubUrl();
 		if (title) {
-			const matches = /^https?:\/\/github\.com\/(.*)(?:.git)/.exec(url);
+			const matches = /^https?:\/\/github\.com\/(.*)/.exec(url);
 			if (matches && matches.length) {
 				const repo = matches[1];
 				return this.searchGitHub(repo, title);
 			}
+
+			// If the extension has no repository, display empty search results
+			if (this.issueReporterModel.getData().selectedExtension) {
+				this.clearSearchResults();
+				return this.displaySearchResults([]);
+
+			}
 		}

 		this.clearSearchResults();
@@ -734,6 +759,12 @@ export class IssueReporter extends Disposable {
 				this.validateInput('description');
 			});

+			if (this.issueReporterModel.fileOnExtension()) {
+				document.getElementById('extension-selector').addEventListener('change', (event) => {
+					this.validateInput('extension-selector');
+				});
+			}
+
 			return false;
 		}

@@ -758,16 +789,26 @@ export class IssueReporter extends Disposable {
 		return true;
 	}

+	private getExtensionGitHubUrl(): string {
+		let repositoryUrl = '';
+		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 = normalizeGitHubUrl(bugsUrl);
+		} else if (extensionUrl && extensionUrl.match(/^https?:\/\/github\.com\/(.*)/)) {
+			repositoryUrl = normalizeGitHubUrl(extensionUrl);
+		}
+
+		return repositoryUrl;
+	}
+
 	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 extensionGitHubUrl = this.getExtensionGitHubUrl();
+			if (extensionGitHubUrl) {
+				repositoryUrl = extensionGitHubUrl + '/issues/new';
 			}
 		}

--- a/src/vs/code/electron-browser/issue/issueReporterPage.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterPage.ts
@@ -49,89 +49,6 @@ export default (): string => `

 	</div>

-	<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>
-			</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 description-section">
 		<label for="description" id="issue-description-label">
 			<!-- To be dynamically filled -->
@@ -144,5 +61,70 @@ export default (): string => `
 		</div>
 	</div>

-	<button id="github-submit-btn" disabled>${escape(localize('loadingData', "Loading data..."))}</button>
+	<div class="system-info" id="block-container">
+		<div class="block block-system">
+			<input class="sendData" type="checkbox" id="includeSystemInfo" checked/>
+			<label class="caption" for="includeSystemInfo">${escape(localize({
+		key: 'sendSystemInfo',
+		comment: ['{0} is either "show" or "hide" and is a button to toggle the visibililty of the system information']
+	}, "Include my system information ({0})")).replace('{0}', `<a href="#" class="showInfo">${escape(localize('show', "show"))}</a>`)}</label>
+			<div class="block-info hidden">
+				<!-- To be dynamically filled -->
+			</div>
+		</div>
+		<div class="block block-process">
+			<input class="sendData" type="checkbox" id="includeProcessInfo" checked/>
+			<label class="caption" for="includeProcessInfo">${escape(localize({
+		key: 'sendProcessInfo',
+		comment: ['{0} is either "show" or "hide" and is a button to toggle the visibililty of the process info']
+	}, "Include my currently running processes ({0})")).replace('{0}', `<a href="#" class="showInfo">${escape(localize('show', "show"))}</a>`)}</label>
+			<pre class="block-info hidden">
+				<code>
+				<!-- To be dynamically filled -->
+				</code>
+			</pre>
+		</div>
+		<div class="block block-workspace">
+			<input class="sendData" type="checkbox" id="includeWorkspaceInfo" checked/>
+			<label class="caption" for="includeWorkspaceInfo">${escape(localize({
+		key: 'sendWorkspaceInfo',
+		comment: ['{0} is either "show" or "hide" and is a button to toggle the visibililty of the workspace information']
+	}, "Include my workspace metadata ({0})")).replace('{0}', `<a href="#" class="showInfo">${escape(localize('show', "show"))}</a>`)}</label>
+			<pre id="systemInfo" class="block-info hidden">
+				<code>
+				<!-- To be dynamically filled -->
+				</code>
+			</pre>
+		</div>
+		<div class="block block-extensions">
+			<input class="sendData" type="checkbox" id="includeExtensions" checked/>
+			<label class="caption" for="includeExtensions">${escape(localize({
+		key: 'sendExtensions',
+		comment: ['{0} is either "show" or "hide" and is a button to toggle the visibililty of the enabled extensions list']
+	}, "Include my enabled extensions ({0})")).replace('{0}', `<a href="#" class="showInfo">${escape(localize('show', "show"))}</a>`)}</label>
+			<div id="systemInfo" class="block-info hidden">
+				<!-- To be dynamically filled -->
+			</div>
+		</div>
+		<div class="block block-searchedExtensions">
+			<input class="sendData" type="checkbox" id="includeSearchedExtensions" checked/>
+			<label class="caption" for="includeSearchedExtensions">${escape(localize({
+		key: 'sendSearchedExtensions',
+		comment: ['{0} is either "show" or "hide" and is a button to toggle the visibililty of the searched extensions']
+	}, "Send searched extensions ({0})")).replace('{0}', `<a href="#" class="showInfo">${escape(localize('show', "show"))}</a>`)}</label>
+			<div class="block-info hidden">
+				<!-- To be dynamically filled -->
+			</div>
+		</div>
+		<div class="block block-settingsSearchResults">
+			<input class="sendData" type="checkbox" id="includeSettingsSearchDetails" checked/>
+			<label class="caption" for="includeSettingsSearchDetails">${escape(localize({
+		key: 'sendSettingsSearchDetails',
+		comment: ['{0} is either "show" or "hide" and is a button to toggle the visibililty of the search details']
+	}, "Send settings search details ({0})")).replace('{0}', `<a href="#" class="showInfo">${escape(localize('show', "show"))}</a>`)}</label>
+			<div class="block-info hidden">
+				<!-- To be dynamically filled -->
+			</div>
+		</div>
+	</div>
 </div>`;
--- a/src/vs/code/electron-browser/issue/issueReporterUtil.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterUtil.ts
@@ -7,7 +7,7 @@

 import { endsWith, rtrim } from 'vs/base/common/strings';

-export function normalizeGitHubIssuesUrl(url: string): string {
+export function normalizeGitHubUrl(url: string): string {
 	// If the url has a .git suffix, remove it
 	if (endsWith(url, '.git')) {
 		url = url.substr(0, url.length - 4);
@@ -16,15 +16,13 @@ export function normalizeGitHubIssuesUrl(url: string): string {
 	// 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;
+	if (endsWith(url, '/new')) {
+		url = rtrim(url, '/new');
 	}

-	// Add new segment if it does not exist
-	if (endsWith(url, 'issues')) {
-		return url + '/new';
+	if (endsWith(url, '/issues')) {
+		url = rtrim(url, '/issues');
 	}

-	return url + '/issues/new';
+	return url;
 }
--- a/src/vs/code/electron-browser/issue/media/issueReporter.css
+++ b/src/vs/code/electron-browser/issue/media/issueReporter.css
@@ -10,18 +10,17 @@
 table {
 	width: 100%;
 	max-width: 100%;
-	margin-bottom: 1rem;
 	background-color: transparent;
 	border-collapse: collapse;
 }
 th {
 	vertical-align: bottom;
-	border-bottom: 2px solid #e9ecef;
-	padding: .75rem;
+	border-bottom: 1px solid;
+	padding: 5px;
 	text-align: inherit;
 }
 td {
-	padding: .75rem;
+	padding: 5px;
 	vertical-align: top;
 }

@@ -48,7 +47,6 @@ input[type="text"], textarea {
 	line-height: 1.5;
 	color: #495057;
 	background-color: #fff;
-	border-radius: .25rem;
 	border: 1px solid #ced4da;
 }

@@ -60,19 +58,13 @@ textarea {
 /**
 * Button
 */
-button {
-	display: inline-block;
-	font-weight: 400;
-	line-height: 1.25;
-	text-align: center;
-	white-space: nowrap;
-	vertical-align: middle;
-	user-select: none;
-	padding: .5rem 1rem;
-	font-size: 1rem;
-	border-radius: .25rem;
-	background: none;
-	border: 1px solid transparent;
+
+.monaco-text-button {
+	display: block;
+	width: auto;
+	padding: 4px 10px;
+	align-self: flex-end;
+	margin-bottom: 10px;
 }

 select {
@@ -83,7 +75,6 @@ select {
 	line-height: 1.5;
 	color: #495057;
 	background-color: #fff;
-	border-radius: 0.25rem;
 	border: none;
 }

@@ -103,7 +94,7 @@ html {

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

@@ -111,26 +102,22 @@ body {
 	display: none;
 }

+.block {
+	font-size: 12px;
+}
+
 .block .block-info {
 	width: 100%;
-	font-family: 'Menlo', 'Courier New', 'Courier', monospace;
+	font-family: Monaco, Menlo, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";
 	font-size: 12px;
 	overflow: auto;
 	overflow-wrap: break-word;
+	margin: 5px;
+	padding: 10px;
 }
-pre {
-	margin: 10px 20px;
-}
+
 pre code {
-	font-family: 'Menlo', 'Courier New', 'Courier', monospace;
-}
-
-button:hover:enabled {
-	cursor: pointer;
-}
-
-button:disabled {
-	cursor: auto;
+	font-family: Monaco, Menlo, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";
 }

 #issue-reporter {
@@ -138,6 +125,7 @@ button:disabled {
 	margin-left: auto;
 	margin-right: auto;
 	padding-top: 2em;
+	padding-bottom: 2em;
 	display: flex;
 	flex-direction: column;
 	height: 100%;
@@ -184,40 +172,17 @@ textarea {
 	margin-top: 1em;
 }

-.system-info {
-	margin-bottom: 1.25em;
-}
-
 select, input, textarea {
 	border: 1px solid transparent;
 	margin-top: 10px;
 }

-summary {
-	border: 1px solid transparent;
-	padding: 0 10px;
-	margin-bottom: 5px;
-	cursor: pointer;
-}

 .validation-error {
 	font-size: 12px;
 	margin-top: 1em;
 }

-.include-data {
-	display: inline-block;
-}
-
-.include-data > .caption {
-	display: inline-block;
-	font-size: 12px;
-	cursor: pointer;
-}
-
-.sendData {
-	margin-left: 1em;
-}

 input[type="checkbox"] {
 	width: auto;
@@ -238,7 +203,6 @@ input:disabled {

 .instructions {
 	font-size: 12px;
-	margin-left: 1em;
 	margin-top: .5em;
 }

@@ -276,13 +240,8 @@ a {
 	color: #be1100;
 }

-button {
-	background-color: #007ACC;
-	color: #fff;
-}
-
 .section .input-group .validation-error {
-	margin-left: 13%;
+	margin-left: 15%;
 }

 .section .inline-form-control, .section .inline-label {
@@ -302,17 +261,25 @@ button {
 }

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

+#problem-source-help-text {
+	margin-left: calc(15% + 1em);
+}
+
@media (max-width: 950px) {
 	.section .inline-label {
-		width: 13%;
+		width: 15%;
+	}
+
+	#problem-source-help-text {
+		margin-left: calc(15% + 1em);
 	}

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

@@ -321,6 +288,10 @@ button {
 		display: none !important;
 	}

+	#problem-source-help-text {
+		margin-left: 1em;
+	}
+
 	.section .inline-form-control {
 		width: 100%;
 	}
--- a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
+++ b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
@@ -7,7 +7,7 @@

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

 suite('IssueReporter', () => {
@@ -81,7 +81,7 @@ OS version: undefined
 			'https://github.com/repo/issues/new',
 			'https://github.com/repo/issues/new/'
 		].forEach(url => {
-			assert.equal('https://github.com/repo/issues/new', normalizeGitHubIssuesUrl(url));
+			assert.equal('https://github.com/repo', normalizeGitHubUrl(url));
 		});
 	});

--- a/src/vs/code/electron-browser/processExplorer/processExplorer.js
+++ b/src/vs/code/electron-browser/processExplorer/processExplorer.js
@@ -45,6 +45,8 @@ function readFile(file) {
 	});
 }

+const writeFile = (file, content) => new Promise((c, e) => fs.writeFile(file, content, 'utf8', err => err ? e(err) : c()));
+
 function main() {
 	const args = parseURLQueryArgs();
 	const configuration = JSON.parse(args['config'] || '{}') || {};
@@ -102,8 +104,15 @@ function main() {
 				let json = JSON.parse(content);
 				bundles[bundle] = json;
 				cb(undefined, json);
-			})
-			.catch(cb);
+			}).catch((error) => {
+				try {
+					if (nlsConfig._corruptedFile) {
+						writeFile(nlsConfig._corruptedFile, 'corrupted').catch(function (error) { console.error(error); });
+					}
+				} finally {
+					cb(error, undefined);
+				}
+			});
 		};
 	}

--- a/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts
+++ b/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts
@@ -7,7 +7,7 @@

 import 'vs/css!./media/processExplorer';
 import { listProcesses, ProcessItem } from 'vs/base/node/ps';
-import { remote, webFrame } from 'electron';
+import { remote, webFrame, ipcRenderer, clipboard } from 'electron';
 import { repeat } from 'vs/base/common/strings';
 import { totalmem } from 'os';
 import product from 'vs/platform/node/product';
@@ -17,6 +17,7 @@ import * as browser from 'vs/base/browser/browser';
 import * as platform from 'vs/base/common/platform';

 let processList: any[];
+let mapPidToWindowTitle = new Map<number, string>();

 function getProcessList(rootProcess: ProcessItem) {
 	const processes: any[] = [];
@@ -33,8 +34,17 @@ function getProcessItem(processes: any[], item: ProcessItem, indent: number): vo

 	const MB = 1024 * 1024;

+	let name = item.name;
+	if (isRoot) {
+		name = `${product.applicationName} main`;
+	}
+
+	if (name === 'window') {
+		const windowTitle = mapPidToWindowTitle.get(item.pid);
+		name = windowTitle !== undefined ? `${name} (${mapPidToWindowTitle.get(item.pid)})` : name;
+	}
+
 	// 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({
@@ -127,45 +137,88 @@ function applyZoom(zoomLevel: number): void {
 function showContextMenu(e) {
 	e.preventDefault();

+	const menu = new remote.Menu();
+
 	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());
+		menu.append(new remote.MenuItem({
+			type: 'separator'
+		}));
+
+		menu.append(new remote.MenuItem({
+			label: localize('copy', "Copy"),
+			click() {
+				const row = document.getElementById(pid.toString());
+				if (row) {
+					clipboard.writeText(row.innerText);
+				}
+			}
+		}));
+
+		menu.append(new remote.MenuItem({
+			label: localize('copyAll', "Copy All"),
+			click() {
+				const processList = document.getElementById('process-list');
+				if (processList) {
+					clipboard.writeText(processList.innerText);
+				}
+			}
+		}));
+	} else {
+		menu.append(new remote.MenuItem({
+			label: localize('copyAll', "Copy All"),
+			click() {
+				const processList = document.getElementById('process-list');
+				if (processList) {
+					clipboard.writeText(processList.innerText);
+				}
+			}
+		}));
 	}
+
+	menu.popup({ window: 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);
+	// Map window process pids to titles, annotate process names with this when rendering to distinguish between them
+	ipcRenderer.on('windowsInfoResponse', (event, windows) => {
+		mapPidToWindowTitle = new Map<number, string>();
+		windows.forEach(window => mapPidToWindowTitle.set(window.pid, window.title));
+	});

-		const tableRows = document.getElementsByTagName('tr');
-		for (let i = 0; i < tableRows.length; i++) {
-			const tableRow = tableRows[i];
-			tableRow.addEventListener('contextmenu', (e) => {
-				showContextMenu(e);
-			});
-		}
-	}), 1200);
+	setInterval(() => {
+		ipcRenderer.send('windowsInfoRequest');
+
+		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) => {
--- a/src/vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner.ts
+++ b/src/vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner.ts
@@ -66,9 +66,13 @@ export class LanguagePackCachedDataCleaner {
 				}
 				// Cleanup entries for language packs that aren't installed anymore
 				const cacheDir = path.join(this._environmentService.userDataPath, 'clp');
+				let exists = await pfs.exists(cacheDir);
+				if (!exists) {
+					return;
+				}
 				for (let entry of await pfs.readdir(cacheDir)) {
 					if (installed[entry]) {
-						this._logService.info(`Skipping directory ${entry}. Language pack still in use`);
+						this._logService.info(`Skipping directory ${entry}. Language pack still in use.`);
 						continue;
 					}
 					this._logService.info('Removing unused language pack:', entry);
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
@@ -53,6 +53,8 @@ function readFile(file) {
 	});
 }

+const writeFile = (file, content) => new Promise((c, e) => fs.writeFile(file, content, 'utf8', err => err ? e(err) : c()));
+
 function main() {
 	const args = parseURLQueryArgs();
 	const configuration = JSON.parse(args['config'] || '{}') || {};
@@ -111,8 +113,15 @@ function main() {
 				let json = JSON.parse(content);
 				bundles[bundle] = json;
 				cb(undefined, json);
-			})
-				.catch(cb);
+			}).catch((error) => {
+				try {
+					if (nlsConfig._corruptedFile) {
+						writeFile(nlsConfig._corruptedFile, 'corrupted').catch(function (error) { console.error(error); });
+					}
+				} finally {
+					cb(error, undefined);
+				}
+			});
 		};
 	}

--- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
@@ -25,7 +25,7 @@ import { ConfigurationService } from 'vs/platform/configuration/node/configurati
 import { IRequestService } from 'vs/platform/request/node/request';
 import { RequestService } from 'vs/platform/request/electron-browser/requestService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { combinedAppender, NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { combinedAppender, NullTelemetryService, ITelemetryAppender, NullAppender, LogAppender } from 'vs/platform/telemetry/common/telemetryUtils';
 import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
 import { TelemetryAppenderChannel } from 'vs/platform/telemetry/common/telemetryIpc';
 import { TelemetryService, ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService';
@@ -42,6 +42,7 @@ import { ILocalizationsService } from 'vs/platform/localizations/common/localiza
 import { LocalizationsChannel } from 'vs/platform/localizations/common/localizationsIpc';
 import { DialogChannelClient } from 'vs/platform/dialogs/common/dialogIpc';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';

 export interface ISharedProcessConfiguration {
 	readonly machineId: string;
@@ -61,11 +62,14 @@ const eventPrefix = 'monacoworkbench';

 function main(server: Server, initData: ISharedProcessInitData, configuration: ISharedProcessConfiguration): void {
 	const services = new ServiceCollection();
+	const disposables: IDisposable[] = [];
+	process.once('exit', () => dispose(disposables));

 	const environmentService = new EnvironmentService(initData.args, process.execPath);
-	const logLevelClient = new LogLevelSetterChannelClient(server.getChannel('loglevel', { route: () => 'main' }));
+	const mainRoute = () => TPromise.as('main');
+	const logLevelClient = new LogLevelSetterChannelClient(server.getChannel('loglevel', { routeCall: mainRoute, routeEvent: mainRoute }));
 	const logService = new FollowerLogService(logLevelClient, createSpdLogService('sharedprocess', initData.logLevel, environmentService.logsPath));
-	process.once('exit', () => logService.dispose());
+	disposables.push(logService);

 	logService.info('main', JSON.stringify(configuration));

@@ -74,42 +78,33 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
 	services.set(IConfigurationService, new SyncDescriptor(ConfigurationService));
 	services.set(IRequestService, new SyncDescriptor(RequestService));

-	const windowsChannel = server.getChannel('windows', { route: () => 'main' });
+	const windowsChannel = server.getChannel('windows', { routeCall: mainRoute, routeEvent: mainRoute });
 	const windowsService = new WindowsChannelClient(windowsChannel);
 	services.set(IWindowsService, windowsService);

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

 	const instantiationService = new InstantiationService(services);

 	instantiationService.invokeFunction(accessor => {
-		const appenders: AppInsightsAppender[] = [];
-
-		if (product.aiConfig && product.aiConfig.asimovKey) {
-			appenders.push(new AppInsightsAppender(eventPrefix, null, product.aiConfig.asimovKey));
-		}
-
-		// It is important to dispose the AI adapter properly because
-		// only then they flush remaining data.
-		process.once('exit', () => appenders.forEach(a => a.dispose()));
-
-		const appender = combinedAppender(...appenders);
-		server.registerChannel('telemetryAppender', new TelemetryAppenderChannel(appender));
-
 		const services = new ServiceCollection();
 		const environmentService = accessor.get(IEnvironmentService);
 		const { appRoot, extensionsPath, extensionDevelopmentPath, isBuilt, installSourcePath } = environmentService;
+		const telemetryLogService = new FollowerLogService(logLevelClient, createSpdLogService('telemetry', initData.logLevel, environmentService.logsPath));

-		if (isBuilt && !extensionDevelopmentPath && !environmentService.args['disable-telemetry'] && product.enableTelemetry) {
+		let appInsightsAppender: ITelemetryAppender = NullAppender;
+		if (product.aiConfig && product.aiConfig.asimovKey && isBuilt) {
+			appInsightsAppender = new AppInsightsAppender(eventPrefix, null, product.aiConfig.asimovKey, telemetryLogService);
+			disposables.push(appInsightsAppender); // Ensure the AI appender is disposed so that it flushes remaining data
+		}
+		server.registerChannel('telemetryAppender', new TelemetryAppenderChannel(appInsightsAppender));
+
+		if (!extensionDevelopmentPath && !environmentService.args['disable-telemetry'] && product.enableTelemetry) {
 			const config: ITelemetryServiceConfig = {
-				appender,
+				appender: combinedAppender(appInsightsAppender, new LogAppender(logService)),
 				commonProperties: resolveCommonProperties(product.commit, pkg.version, configuration.machineId, installSourcePath),
 				piiPaths: [appRoot, extensionsPath]
 			};
@@ -138,6 +133,7 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
 			server.registerChannel('localizations', localizationsChannel);

 			createSharedProcessContributions(instantiationService2);
+			disposables.push(extensionManagementService as ExtensionManagementService);
 		});
 	});
 }