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-02-01 09:35:41 -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/base/node/config.ts
+++ b/src/vs/base/node/config.ts
@@ -171,7 +171,7 @@ export class ConfigWatcher<T> implements IConfigWatcher<T>, IDisposable {
 			// Windows: in some cases the filename contains artifacts from the absolute path
 			// see https://github.com/nodejs/node/issues/19170
 			// As such, we have to ensure that the filename basename is used for comparison.
-			if (isWindows && filename !== this.configName) {
+			if (isWindows && filename && filename !== this.configName) {
 				filename = basename(filename);
 			}

--- a/src/vs/base/node/cpuUsage.sh
+++ b/src/vs/base/node/cpuUsage.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+function get_total_cpu_time() {
+  # Read the first line of /proc/stat and remove the cpu prefix
+  CPU=(`sed -n 's/^cpu\s//p' /proc/stat`)
+
+  # Sum all of the values in CPU to get total time
+  for VALUE in "${CPU[@]}"; do
+    let $1=$1+$VALUE
+  done
+}
+
+TOTAL_TIME_BEFORE=0
+get_total_cpu_time TOTAL_TIME_BEFORE
+
+# Loop over the arguments, which are a list of PIDs
+# The 13th and 14th words in /proc/<PID>/stat are the user and system time
+# the process has used, so sum these to get total process run time
+declare -a PROCESS_BEFORE_TIMES
+ITER=0
+for PID in "$@"; do
+  if [ -f /proc/$PID/stat ]
+  then
+    PROCESS_STATS=`cat /proc/$PID/stat`
+    PROCESS_STAT_ARRAY=($PROCESS_STATS)
+
+    let PROCESS_TIME_BEFORE="${PROCESS_STAT_ARRAY[13]}+${PROCESS_STAT_ARRAY[14]}"
+  else
+    let PROCESS_TIME_BEFORE=0
+  fi
+
+  PROCESS_BEFORE_TIMES[$ITER]=$PROCESS_TIME_BEFORE
+  ((ITER++))
+done
+
+# Wait for a second
+sleep 1
+
+TOTAL_TIME_AFTER=0
+get_total_cpu_time TOTAL_TIME_AFTER
+
+# Check the user and system time sum of each process again and compute the change
+# in process time used over total system time
+ITER=0
+for PID in "$@"; do
+  if [ -f /proc/$PID/stat ]
+  then
+    PROCESS_STATS=`cat /proc/$PID/stat`
+    PROCESS_STAT_ARRAY=($PROCESS_STATS)
+
+    let PROCESS_TIME_AFTER="${PROCESS_STAT_ARRAY[13]}+${PROCESS_STAT_ARRAY[14]}"
+  else
+    let PROCESS_TIME_AFTER=${PROCESS_BEFORE_TIMES[$ITER]}
+  fi
+
+  PROCESS_TIME_BEFORE=${PROCESS_BEFORE_TIMES[$ITER]}
+  let PROCESS_DELTA=$PROCESS_TIME_AFTER-$PROCESS_TIME_BEFORE
+  let TOTAL_DELTA=$TOTAL_TIME_AFTER-$TOTAL_TIME_BEFORE
+  CPU_USAGE=`echo "100*$PROCESS_DELTA/$TOTAL_DELTA" | bc -l`
+
+  # Parent script reads from stdout, so echo result to be read
+  echo $CPU_USAGE
+  ((ITER++))
+done
--- a/src/vs/base/node/encoding.ts
+++ b/src/vs/base/node/encoding.ts
@@ -11,6 +11,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { isLinux, isMacintosh } from 'vs/base/common/platform';
 import { exec } from 'child_process';
 import { Readable, Writable, WritableOptions } from 'stream';
+import { toWinJsPromise } from 'vs/base/common/async';

 export const UTF8 = 'utf8';
 export const UTF8_with_bom = 'utf8bom';
@@ -88,6 +89,7 @@ export function toDecodeStream(readable: Readable, options: IDecodeStreamOptions
 					resolve({ detected, stream: this._decodeStream });

 				}, err => {
+					this.emit('error', err);
 					callback(err);
 				});
 			}
@@ -191,25 +193,25 @@ const IGNORE_ENCODINGS = ['ascii', 'utf-8', 'utf-16', 'utf-32'];
 /**
 * Guesses the encoding from buffer.
 */
-export async function guessEncodingByBuffer(buffer: NodeBuffer): TPromise<string> {
-	const jschardet = await import('jschardet');
+export function guessEncodingByBuffer(buffer: NodeBuffer): TPromise<string> {
+	return toWinJsPromise(import('jschardet')).then(jschardet => {
+		jschardet.Constants.MINIMUM_THRESHOLD = MINIMUM_THRESHOLD;

-	jschardet.Constants.MINIMUM_THRESHOLD = MINIMUM_THRESHOLD;
+		const guessed = jschardet.detect(buffer);
+		if (!guessed || !guessed.encoding) {
+			return null;
+		}

-	const guessed = jschardet.detect(buffer);
-	if (!guessed || !guessed.encoding) {
-		return null;
-	}
+		const enc = guessed.encoding.toLowerCase();

-	const enc = guessed.encoding.toLowerCase();
+		// Ignore encodings that cannot guess correctly
+		// (http://chardet.readthedocs.io/en/latest/supported-encodings.html)
+		if (0 <= IGNORE_ENCODINGS.indexOf(enc)) {
+			return null;
+		}

-	// Ignore encodings that cannot guess correctly
-	// (http://chardet.readthedocs.io/en/latest/supported-encodings.html)
-	if (0 <= IGNORE_ENCODINGS.indexOf(enc)) {
-		return null;
-	}
-
-	return toIconvLiteEncoding(guessed.encoding);
+		return toIconvLiteEncoding(guessed.encoding);
+	});
 }

 const JSCHARDET_TO_ICONV_ENCODINGS: { [name: string]: string } = {
--- a/src/vs/base/node/extfs.ts
+++ b/src/vs/base/node/extfs.ts
@@ -5,15 +5,16 @@

 'use strict';

-import * as uuid from 'vs/base/common/uuid';
-import * as strings from 'vs/base/common/strings';
-import * as platform from 'vs/base/common/platform';
-import * as flow from 'vs/base/node/flow';
 import * as fs from 'fs';
 import * as paths from 'path';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { nfcall } from 'vs/base/common/async';
+import { normalizeNFC } from 'vs/base/common/normalization';
+import * as platform from 'vs/base/common/platform';
+import * as strings from 'vs/base/common/strings';
+import * as uuid from 'vs/base/common/uuid';
+import { TPromise } from 'vs/base/common/winjs.base';
 import { encode, encodeStream } from 'vs/base/node/encoding';
+import * as flow from 'vs/base/node/flow';

 const loop = flow.loop;

@@ -21,7 +22,7 @@ export function readdirSync(path: string): string[] {
 	// Mac: uses NFD unicode form on disk, but we want NFC
 	// See also https://github.com/nodejs/node/issues/2165
 	if (platform.isMacintosh) {
-		return fs.readdirSync(path).map(c => strings.normalizeNFC(c));
+		return fs.readdirSync(path).map(c => normalizeNFC(c));
 	}

 	return fs.readdirSync(path);
@@ -36,7 +37,7 @@ export function readdir(path: string, callback: (error: Error, files: string[])
 				return callback(error, null);
 			}

-			return callback(null, children.map(c => strings.normalizeNFC(c)));
+			return callback(null, children.map(c => normalizeNFC(c)));
 		});
 	}

@@ -129,17 +130,27 @@ function doCopyFile(source: string, target: string, mode: number, callback: (err
 }

 export function mkdirp(path: string, mode?: number): TPromise<boolean> {
-	const mkdir = () => nfcall(fs.mkdir, path, mode)
-		.then(null, (err: NodeJS.ErrnoException) => {
-			if (err.code === 'EEXIST') {
-				return nfcall(fs.stat, path)
-					.then((stat: fs.Stats) => stat.isDirectory
-						? null
-						: TPromise.wrapError(new Error(`'${path}' exists and is not a directory.`)));
+	const mkdir = () => {
+		return nfcall(fs.mkdir, path, mode).then(null, (mkdirErr: NodeJS.ErrnoException) => {
+
+			// ENOENT: a parent folder does not exist yet
+			if (mkdirErr.code === 'ENOENT') {
+				return TPromise.wrapError(mkdirErr);
 			}

-			return TPromise.wrapError<boolean>(err);
+			// Any other error: check if folder exists and
+			// return normally in that case if its a folder
+			return nfcall(fs.stat, path).then((stat: fs.Stats) => {
+				if (!stat.isDirectory()) {
+					return TPromise.wrapError(new Error(`'${path}' exists and is not a directory.`));
+				}
+
+				return null;
+			}, statErr => {
+				return TPromise.wrapError(mkdirErr); // bubble up original mkdir error
+			});
 		});
+	};

 	// stop at root
 	if (path === paths.dirname(path)) {
@@ -148,10 +159,14 @@ export function mkdirp(path: string, mode?: number): TPromise<boolean> {

 	// recursively mkdir
 	return mkdir().then(null, (err: NodeJS.ErrnoException) => {
+
+		// ENOENT: a parent folder does not exist yet, continue
+		// to create the parent folder and then try again.
 		if (err.code === 'ENOENT') {
 			return mkdirp(paths.dirname(path), mode).then(mkdir);
 		}

+		// Any other error
 		return TPromise.wrapError<boolean>(err);
 	});
 }
@@ -619,7 +634,7 @@ function normalizePath(path: string): string {
 	return strings.rtrim(paths.normalize(path), paths.sep);
 }

-export function watch(path: string, onChange: (type: string, path: string) => void, onError: (error: string) => void): fs.FSWatcher {
+export function watch(path: string, onChange: (type: string, path?: string) => void, onError: (error: string) => void): fs.FSWatcher {
 	try {
 		const watcher = fs.watch(path);

@@ -630,7 +645,7 @@ export function watch(path: string, onChange: (type: string, path: string) => vo
 				if (platform.isMacintosh) {
 					// Mac: uses NFD unicode form on disk, but we want NFC
 					// See also https://github.com/nodejs/node/issues/2165
-					file = strings.normalizeNFC(file);
+					file = normalizeNFC(file);
 				}
 			}

--- a/src/vs/base/node/pfs.ts
+++ b/src/vs/base/node/pfs.ts
@@ -99,6 +99,7 @@ const writeFilePathQueue: { [path: string]: Queue<void> } = Object.create(null);

 export function writeFile(path: string, data: string, options?: extfs.IWriteFileOptions): TPromise<void>;
 export function writeFile(path: string, data: NodeBuffer, options?: extfs.IWriteFileOptions): TPromise<void>;
+export function writeFile(path: string, data: Uint8Array, options?: extfs.IWriteFileOptions): TPromise<void>;
 export function writeFile(path: string, data: NodeJS.ReadableStream, options?: extfs.IWriteFileOptions): TPromise<void>;
 export function writeFile(path: string, data: any, options?: extfs.IWriteFileOptions): TPromise<void> {
 	const queueKey = toQueueKey(path);
--- a/src/vs/base/node/processes.ts
+++ b/src/vs/base/node/processes.ts
@@ -8,7 +8,7 @@ import * as path from 'path';
 import * as cp from 'child_process';
 import { fork } from 'vs/base/node/stdFork';
 import * as nls from 'vs/nls';
-import { PPromise, TPromise, TValueCallback, TProgressCallback, ErrorCallback } from 'vs/base/common/winjs.base';
+import { TPromise, TValueCallback, ErrorCallback } from 'vs/base/common/winjs.base';
 import * as Types from 'vs/base/common/types';
 import { IStringDictionary } from 'vs/base/common/collections';
 import URI from 'vs/base/common/uri';
@@ -19,6 +19,8 @@ import { LineDecoder } from 'vs/base/node/decoder';
 import { CommandOptions, ForkOptions, SuccessData, Source, TerminateResponse, TerminateResponseCode, Executable } from 'vs/base/common/processes';
 export { CommandOptions, ForkOptions, SuccessData, Source, TerminateResponse, TerminateResponseCode };

+export type TProgressCallback<T> = (progress: T) => void;
+
 export interface LineData {
 	line: string;
 	source: Source;
@@ -79,6 +81,7 @@ export abstract class AbstractProcess<TProgressData> {

 	private childProcess: cp.ChildProcess;
 	protected childProcessPromise: TPromise<cp.ChildProcess>;
+	private pidResolve: TValueCallback<number>;
 	protected terminateRequested: boolean;

 	private static WellKnowCommands: IStringDictionary<boolean> = {
@@ -151,18 +154,16 @@ export abstract class AbstractProcess<TProgressData> {
 		return 'other';
 	}

-	public start(): PPromise<SuccessData, TProgressData> {
+	public start(pp: TProgressCallback<TProgressData>): TPromise<SuccessData> {
 		if (Platform.isWindows && ((this.options && this.options.cwd && TPath.isUNC(this.options.cwd)) || !this.options && !this.options.cwd && TPath.isUNC(process.cwd()))) {
 			return TPromise.wrapError(new Error(nls.localize('TaskRunner.UNC', 'Can\'t execute a shell command on a UNC drive.')));
 		}
 		return this.useExec().then((useExec) => {
 			let cc: TValueCallback<SuccessData>;
 			let ee: ErrorCallback;
-			let pp: TProgressCallback<TProgressData>;
-			let result = new PPromise<any, TProgressData>((c, e, p) => {
+			let result = new TPromise<any>((c, e) => {
 				cc = c;
 				ee = e;
-				pp = p;
 			});

 			if (useExec) {
@@ -233,7 +234,7 @@ export abstract class AbstractProcess<TProgressData> {
 					if (this.cmd) {
 						childProcess = cp.spawn(this.cmd, this.args, this.options);
 					} else if (this.module) {
-						this.childProcessPromise = new TPromise<cp.ChildProcess>((c, e, p) => {
+						this.childProcessPromise = new TPromise<cp.ChildProcess>((c, e) => {
 							fork(this.module, this.args, <ForkOptions>this.options, (error: any, childProcess: cp.ChildProcess) => {
 								if (error) {
 									e(error);
@@ -241,6 +242,10 @@ export abstract class AbstractProcess<TProgressData> {
 									return;
 								}
 								this.childProcess = childProcess;
+								if (this.pidResolve) {
+									this.pidResolve(Types.isNumber(childProcess.pid) ? childProcess.pid : -1);
+									this.pidResolve = undefined;
+								}
 								this.childProcess.on('close', closeHandler);
 								this.handleSpawn(childProcess, cc, pp, ee, false);
 								c(childProcess);
@@ -251,6 +256,10 @@ export abstract class AbstractProcess<TProgressData> {
 				if (childProcess) {
 					this.childProcess = childProcess;
 					this.childProcessPromise = TPromise.as(childProcess);
+					if (this.pidResolve) {
+						this.pidResolve(Types.isNumber(childProcess.pid) ? childProcess.pid : -1);
+						this.pidResolve = undefined;
+					}
 					childProcess.on('error', (error: Error) => {
 						this.childProcess = null;
 						ee({ terminated: this.terminateRequested, error: error });
@@ -288,7 +297,13 @@ export abstract class AbstractProcess<TProgressData> {
 	}

 	public get pid(): TPromise<number> {
-		return this.childProcessPromise.then(childProcess => childProcess.pid, err => -1);
+		if (this.childProcessPromise) {
+			return this.childProcessPromise.then(childProcess => childProcess.pid, err => -1);
+		} else {
+			return new TPromise<number>((resolve) => {
+				this.pidResolve = resolve;
+			});
+		}
 	}

 	public terminate(): TPromise<TerminateResponse> {
@@ -308,7 +323,7 @@ export abstract class AbstractProcess<TProgressData> {
 	}

 	private useExec(): TPromise<boolean> {
-		return new TPromise<boolean>((c, e, p) => {
+		return new TPromise<boolean>((c, e) => {
 			if (!this.shell || !Platform.isWindows) {
 				c(false);
 			}
--- a/src/vs/base/node/proxy.ts
+++ b/src/vs/base/node/proxy.ts
@@ -8,8 +8,6 @@
 import { Url, parse as parseUrl } from 'url';
 import { isBoolean } from 'vs/base/common/types';
 import { Agent } from './request';
-import { TPromise } from 'vs/base/common/winjs.base';
-

 function getSystemProxyURI(requestURL: Url): string {
 	if (requestURL.protocol === 'http:') {
@@ -26,7 +24,7 @@ export interface IOptions {
 	strictSSL?: boolean;
 }

-export async function getProxyAgent(rawRequestURL: string, options: IOptions = {}): TPromise<Agent> {
+export async function getProxyAgent(rawRequestURL: string, options: IOptions = {}): Promise<Agent> {
 	const requestURL = parseUrl(rawRequestURL);
 	const proxyURL = options.proxyUrl || getSystemProxyURI(requestURL);

--- a/src/vs/base/node/ps.ts
+++ b/src/vs/base/node/ps.ts
@@ -6,6 +6,7 @@
 'use strict';

 import { exec } from 'child_process';
+import URI from 'vs/base/common/uri';

 export interface ProcessItem {
 	name: string;
@@ -191,7 +192,41 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
 						}
 					}

-					resolve(rootItem);
+					if (process.platform === 'linux') {
+						// Flatten rootItem to get a list of all VSCode processes
+						let processes = [rootItem];
+						const pids = [];
+						while (processes.length) {
+							const process = processes.shift();
+							pids.push(process.pid);
+							if (process.children) {
+								processes = processes.concat(process.children);
+							}
+						}
+
+						// The cpu usage value reported on Linux is the average over the process lifetime,
+						// recalculate the usage over a one second interval
+						// JSON.stringify is needed to escape spaces, https://github.com/nodejs/node/issues/6803
+						let cmd = JSON.stringify(URI.parse(require.toUrl('vs/base/node/cpuUsage.sh')).fsPath);
+						cmd += ' ' + pids.join(' ');
+
+						exec(cmd, {}, (err, stdout, stderr) => {
+							if (err || stderr) {
+								reject(err || stderr.toString());
+							} else {
+								const cpuUsage = stdout.toString().split('\n');
+								for (let i = 0; i < pids.length; i++) {
+									const processInfo = map.get(pids[i]);
+									processInfo.load = parseFloat(cpuUsage[i]);
+								}
+
+								resolve(rootItem);
+							}
+						});
+					} else {
+						resolve(rootItem);
+					}
+
 				}
 			});
 		}
--- a/src/vs/base/node/request.ts
+++ b/src/vs/base/node/request.ts
@@ -49,7 +49,7 @@ export interface IRequestFunction {
 	(options: IRequestOptions): TPromise<IRequestContext>;
 }

-async function getNodeRequest(options: IRequestOptions): TPromise<IRawRequestFunction> {
+async function getNodeRequest(options: IRequestOptions): Promise<IRawRequestFunction> {
 	const endpoint = parseUrl(options.url);
 	const module = endpoint.protocol === 'https:' ? await import('https') : await import('http');
 	return module.request;
@@ -60,7 +60,7 @@ export function request(options: IRequestOptions): TPromise<IRequestContext> {

 	const rawRequestPromise = options.getRawRequest
 		? TPromise.as(options.getRawRequest(options))
-		: getNodeRequest(options);
+		: TPromise.wrap(getNodeRequest(options));

 	return rawRequestPromise.then(rawRequest => {

--- a/src/vs/base/node/stats.ts
+++ b/src/vs/base/node/stats.ts
@@ -5,8 +5,9 @@

 'use strict';

-import { readdirSync, statSync, existsSync, readFileSync } from 'fs';
+import { readdir, stat, exists, readFile } from 'fs';
 import { join } from 'path';
+import { parse } from 'vs/base/common/json';

 export interface WorkspaceStatItem {
 	name: string;
@@ -26,34 +27,49 @@ function asSortedItems(map: Map<string, number>): WorkspaceStatItem[] {
 	return a.sort((a, b) => b.count - a.count);
 }

-export function collectLaunchConfigs(folder: string): WorkspaceStatItem[] {
+export function collectLaunchConfigs(folder: string): Promise<WorkspaceStatItem[]> {
 	let launchConfigs = new Map<string, number>();

 	let launchConfig = join(folder, '.vscode', 'launch.json');
-	if (existsSync(launchConfig)) {
-		try {
-			const contents = readFileSync(launchConfig).toString();
-			const json = JSON.parse(contents);
-			if (json['configurations']) {
-				for (const each of json['configurations']) {
-					const type = each['type'];
-					if (type) {
-						if (launchConfigs.has(type)) {
-							launchConfigs.set(type, launchConfigs.get(type) + 1);
-						}
-						else {
-							launchConfigs.set(type, 1);
+	return new Promise((resolve, reject) => {
+		exists(launchConfig, (doesExist) => {
+			if (doesExist) {
+				readFile(launchConfig, (err, contents) => {
+					if (err) {
+						return resolve([]);
+					}
+
+					const errors = [];
+					const json = parse(contents.toString(), errors);
+					if (errors.length) {
+						console.log(`Unable to parse ${launchConfig}`);
+						return resolve([]);
+					}
+
+					if (json['configurations']) {
+						for (const each of json['configurations']) {
+							const type = each['type'];
+							if (type) {
+								if (launchConfigs.has(type)) {
+									launchConfigs.set(type, launchConfigs.get(type) + 1);
+								}
+								else {
+									launchConfigs.set(type, 1);
+								}
+							}
 						}
 					}
-				}
+
+					return resolve(asSortedItems(launchConfigs));
+				});
+			} else {
+				return resolve([]);
 			}
-		} catch {
-		}
-	}
-	return asSortedItems(launchConfigs);
+		});
+	});
 }

-export function collectWorkspaceStats(folder: string, filter: string[]): WorkspaceStats {
+export function collectWorkspaceStats(folder: string, filter: string[]): Promise<WorkspaceStats> {
 	const configFilePatterns = [
 		{ 'tag': 'grunt.js', 'pattern': /^gruntfile\.js$/i },
 		{ 'tag': 'gulp.js', 'pattern': /^gulpfile\.js$/i },
@@ -78,35 +94,62 @@ export function collectWorkspaceStats(folder: string, filter: string[]): Workspa

 	const MAX_FILES = 20000;

-	let walkSync = (dir: string, acceptFile: (fileName: string) => void, filter: string[], token) => {
-		try {
-			let files = readdirSync(dir);
+	function walk(dir: string, filter: string[], token, done: (allFiles: string[]) => void): void {
+		let results = [];
+		readdir(dir, async (err, files) => {
+			// Ignore folders that can't be read
+			if (err) {
+				return done(results);
+			}
+
+			let pending = files.length;
+			if (pending === 0) {
+				return done(results);
+			}
+
 			for (const file of files) {
 				if (token.maxReached) {
-					return;
+					return done(results);
 				}
-				try {
-					if (statSync(join(dir, file)).isDirectory()) {
-						if (filter.indexOf(file) === -1) {
-							walkSync(join(dir, file), acceptFile, filter, token);
+
+				stat(join(dir, file), (err, stats) => {
+					// Ignore files that can't be read
+					if (err) {
+						if (--pending === 0) {
+							return done(results);
+						}
+					} else {
+						if (stats.isDirectory()) {
+							if (filter.indexOf(file) === -1) {
+								walk(join(dir, file), filter, token, (res: string[]) => {
+									results = results.concat(res);
+
+									if (--pending === 0) {
+										return done(results);
+									}
+								});
+							} else {
+								if (--pending === 0) {
+									done(results);
+								}
+							}
+						} else {
+							if (token.count >= MAX_FILES) {
+								token.maxReached = true;
+							}
+
+							token.count++;
+							results.push(file);
+
+							if (--pending === 0) {
+								done(results);
+							}
 						}
 					}
-					else {
-						if (token.count >= MAX_FILES) {
-							token.maxReached = true;
-							return;
-						}
-						token.count++;
-						acceptFile(file);
-					}
-				} catch {
-					// skip over files for which stat fails
-				}
+				});
 			}
-		} catch {
-			// skip over folders that cannot be read
-		}
-	};
+		});
+	}

 	let addFileType = (fileType: string) => {
 		if (fileTypes.has(fileType)) {
@@ -140,13 +183,18 @@ export function collectWorkspaceStats(folder: string, filter: string[]): Workspa
 	};

 	let token: { count: number, maxReached: boolean } = { count: 0, maxReached: false };
-	walkSync(folder, acceptFile, filter, token);

-	return {
-		configFiles: asSortedItems(configFiles),
-		fileTypes: asSortedItems(fileTypes),
-		fileCount: token.count,
-		maxFilesReached: token.maxReached
+	return new Promise((resolve, reject) => {
+		walk(folder, filter, token, (files) => {
+			files.forEach(acceptFile);

-	};
+			resolve({
+				configFiles: asSortedItems(configFiles),
+				fileTypes: asSortedItems(fileTypes),
+				fileCount: token.count,
+				maxFilesReached: token.maxReached
+
+			});
+		});
+	});
 }
--- a/src/vs/base/node/stdFork.ts
+++ b/src/vs/base/node/stdFork.ts
@@ -19,7 +19,7 @@ export interface IForkOpts {
 }

 function makeRandomHexString(length: number): string {
-	let chars = ['0', '1', '2', '3', '4', '5', '6', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'];
+	let chars = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'];
 	let result = '';
 	for (let i = 0; i < length; i++) {
 		let idx = Math.floor(chars.length * Math.random());
@@ -29,7 +29,7 @@ function makeRandomHexString(length: number): string {
 }

 function generatePipeName(): string {
-	let randomName = 'vscode-' + makeRandomHexString(40);
+	let randomName = 'vscode-std-' + makeRandomHexString(40);
 	if (process.platform === 'win32') {
 		return '\\\\.\\pipe\\' + randomName + '-sock';
 	}
--- a/src/vs/base/node/zip.ts
+++ b/src/vs/base/node/zip.ts
@@ -72,6 +72,9 @@ function toExtractError(err: Error): ExtractError {
 function extractEntry(stream: Readable, fileName: string, mode: number, targetPath: string, options: IOptions): TPromise<void> {
 	const dirName = path.dirname(fileName);
 	const targetDirName = path.join(targetPath, dirName);
+	if (targetDirName.indexOf(targetPath) !== 0) {
+		return TPromise.wrapError(new Error(nls.localize('invalid file', "Error extracting {0}. Invalid file.", fileName)));
+	}
 	const targetFileName = path.join(targetPath, fileName);

 	let istream: WriteStream;
@@ -111,7 +114,6 @@ function extractZip(zipfile: ZipFile, targetPath: string, options: IOptions, log
 		}, e));
 		zipfile.readEntry();
 		zipfile.on('entry', (entry: Entry) => {
-			logService.debug(targetPath, 'Found', entry.fileName);

 			if (isCanceled) {
 				return;