diff --git a/src/vs/base/browser/htmlContentRenderer.ts b/src/vs/base/browser/htmlContentRenderer.ts
index d6f4a95e287..fd81c880241 100644
--- a/src/vs/base/browser/htmlContentRenderer.ts
+++ b/src/vs/base/browser/htmlContentRenderer.ts
@@ -24,7 +24,7 @@ export interface RenderOptions {
 	className?: string;
 	inline?: boolean;
 	actionHandler?: IContentActionHandler;
-	codeBlockRenderer?: (modeId: string, value: string) => Thenable<string>;
+	codeBlockRenderer?: (modeId: string, value: string) => Promise<string>;
 	codeBlockRenderCallback?: () => void;
 }
 
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts
index 425533c5664..c195b03f812 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.ts
+++ b/src/vs/base/browser/ui/actionbar/actionbar.ts
@@ -792,7 +792,7 @@ export class ActionBar extends Disposable implements IActionRunner {
 		this._onDidCancel.fire();
 	}
 
-	run(action: IAction, context?: any): Thenable<void> {
+	run(action: IAction, context?: any): Promise<void> {
 		return this._actionRunner.run(action, context);
 	}
 
diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts
index d2487b4229a..f176c74a8a5 100644
--- a/src/vs/base/browser/ui/tree/asyncDataTree.ts
+++ b/src/vs/base/browser/ui/tree/asyncDataTree.ts
@@ -16,7 +16,7 @@ import { Iterator } from 'vs/base/common/iterator';
 
 export interface IDataSource<T extends NonNullable<any>> {
 	hasChildren(element: T | null): boolean;
-	getChildren(element: T | null): Thenable<T[]>;
+	getChildren(element: T | null): Promise<T[]>;
 }
 
 enum AsyncDataTreeNodeState {
@@ -177,7 +177,7 @@ export class AsyncDataTree<T extends NonNullable<any>, TFilterData = void> imple
 	private readonly tree: ObjectTree<IAsyncDataTreeNode<T>, TFilterData>;
 	private readonly root: IAsyncDataTreeNode<T>;
 	private readonly nodes = new Map<T | null, IAsyncDataTreeNode<T>>();
-	private readonly refreshPromises = new Map<IAsyncDataTreeNode<T>, Thenable<void>>();
+	private readonly refreshPromises = new Map<IAsyncDataTreeNode<T>, Promise<void>>();
 	private readonly identityProvider?: IIdentityProvider<T>;
 
 	private readonly _onDidChangeNodeState = new Emitter<IAsyncDataTreeNode<T>>();
@@ -278,7 +278,7 @@ export class AsyncDataTree<T extends NonNullable<any>, TFilterData = void> imple
 
 	// Data Tree
 
-	refresh(element: T | null, recursive = true): Thenable<void> {
+	refresh(element: T | null, recursive = true): Promise<void> {
 		return this.refreshNode(this.getDataNode(element), recursive, ChildrenResolutionReason.Refresh);
 	}
 
@@ -436,7 +436,7 @@ export class AsyncDataTree<T extends NonNullable<any>, TFilterData = void> imple
 		}
 	}
 
-	private _refreshNode(node: IAsyncDataTreeNode<T>, recursive: boolean, reason: ChildrenResolutionReason): Thenable<void> {
+	private _refreshNode(node: IAsyncDataTreeNode<T>, recursive: boolean, reason: ChildrenResolutionReason): Promise<void> {
 		let result = this.refreshPromises.get(node);
 
 		if (result) {
@@ -448,7 +448,7 @@ export class AsyncDataTree<T extends NonNullable<any>, TFilterData = void> imple
 		return always(result, () => this.refreshPromises.delete(node));
 	}
 
-	private doRefresh(node: IAsyncDataTreeNode<T>, recursive: boolean, reason: ChildrenResolutionReason): Thenable<void> {
+	private doRefresh(node: IAsyncDataTreeNode<T>, recursive: boolean, reason: ChildrenResolutionReason): Promise<void> {
 		const hasChildren = !!this.dataSource.hasChildren(node.element);
 
 		if (!hasChildren) {
diff --git a/src/vs/base/common/actions.ts b/src/vs/base/common/actions.ts
index 07db01c6922..2e4fbf152d0 100644
--- a/src/vs/base/common/actions.ts
+++ b/src/vs/base/common/actions.ts
@@ -20,11 +20,11 @@ export interface IAction extends IDisposable {
 	enabled: boolean;
 	checked: boolean;
 	radio: boolean;
-	run(event?: any): Thenable<any>;
+	run(event?: any): Promise<any>;
 }
 
 export interface IActionRunner extends IDisposable {
-	run(action: IAction, context?: any): Thenable<any>;
+	run(action: IAction, context?: any): Promise<any>;
 	onDidRun: Event<IRunEvent>;
 	onDidBeforeRun: Event<IRunEvent>;
 }
@@ -60,9 +60,9 @@ export class Action implements IAction {
 	protected _enabled: boolean;
 	protected _checked: boolean;
 	protected _radio: boolean;
-	protected _actionCallback?: (event?: any) => Thenable<any>;
+	protected _actionCallback?: (event?: any) => Promise<any>;
 
-	constructor(id: string, label: string = '', cssClass: string = '', enabled: boolean = true, actionCallback?: (event?: any) => Thenable<any>) {
+	constructor(id: string, label: string = '', cssClass: string = '', enabled: boolean = true, actionCallback?: (event?: any) => Promise<any>) {
 		this._id = id;
 		this._label = label;
 		this._cssClass = cssClass;
@@ -164,7 +164,7 @@ export class Action implements IAction {
 		}
 	}
 
-	run(event?: any, _data?: ITelemetryData): Thenable<any> {
+	run(event?: any, _data?: ITelemetryData): Promise<any> {
 		if (this._actionCallback) {
 			return this._actionCallback(event);
 		}
@@ -191,7 +191,7 @@ export class ActionRunner extends Disposable implements IActionRunner {
 	private _onDidRun = this._register(new Emitter<IRunEvent>());
 	readonly onDidRun: Event<IRunEvent> = this._onDidRun.event;
 
-	run(action: IAction, context?: any): Thenable<any> {
+	run(action: IAction, context?: any): Promise<any> {
 		if (!action.enabled) {
 			return Promise.resolve(null);
 		}
@@ -205,7 +205,7 @@ export class ActionRunner extends Disposable implements IActionRunner {
 		});
 	}
 
-	protected runAction(action: IAction, context?: any): Thenable<any> {
+	protected runAction(action: IAction, context?: any): Promise<any> {
 		const res = context ? action.run(context) : action.run();
 		return Promise.resolve(res);
 	}
diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts
index e55ddf7e9df..7deeeae3b06 100644
--- a/src/vs/base/common/async.ts
+++ b/src/vs/base/common/async.ts
@@ -9,15 +9,15 @@ import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
 
-export function isThenable<T>(obj: any): obj is Thenable<T> {
-	return obj && typeof (<Thenable<any>>obj).then === 'function';
+export function isThenable<T>(obj: any): obj is Promise<T> {
+	return obj && typeof (<Promise<any>>obj).then === 'function';
 }
 
 export interface CancelablePromise<T> extends Promise<T> {
 	cancel(): void;
 }
 
-export function createCancelablePromise<T>(callback: (token: CancellationToken) => Thenable<T>): CancelablePromise<T> {
+export function createCancelablePromise<T>(callback: (token: CancellationToken) => Promise<T>): CancelablePromise<T> {
 	const source = new CancellationTokenSource();
 
 	const thenable = callback(source.token);
@@ -38,10 +38,10 @@ export function createCancelablePromise<T>(callback: (token: CancellationToken)
 		cancel() {
 			source.cancel();
 		}
-		then<TResult1 = T, TResult2 = never>(resolve?: ((value: T) => TResult1 | Thenable<TResult1>) | undefined | null, reject?: ((reason: any) => TResult2 | Thenable<TResult2>) | undefined | null): Promise<TResult1 | TResult2> {
+		then<TResult1 = T, TResult2 = never>(resolve?: ((value: T) => TResult1 | Promise<TResult1>) | undefined | null, reject?: ((reason: any) => TResult2 | Promise<TResult2>) | undefined | null): Promise<TResult1 | TResult2> {
 			return promise.then(resolve, reject);
 		}
-		catch<TResult = never>(reject?: ((reason: any) => TResult | Thenable<TResult>) | undefined | null): Promise<T | TResult> {
+		catch<TResult = never>(reject?: ((reason: any) => TResult | Promise<TResult>) | undefined | null): Promise<T | TResult> {
 			return this.then(undefined, reject);
 		}
 	};
@@ -90,9 +90,9 @@ export interface ITask<T> {
  */
 export class Throttler {
 
-	private activePromise: Thenable<any> | null;
-	private queuedPromise: Thenable<any> | null;
-	private queuedPromiseFactory: ITask<Thenable<any>> | null;
+	private activePromise: Promise<any> | null;
+	private queuedPromise: Promise<any> | null;
+	private queuedPromiseFactory: ITask<Promise<any>> | null;
 
 	constructor() {
 		this.activePromise = null;
@@ -100,7 +100,7 @@ export class Throttler {
 		this.queuedPromiseFactory = null;
 	}
 
-	queue<T>(promiseFactory: ITask<Thenable<T>>): Thenable<T> {
+	queue<T>(promiseFactory: ITask<Promise<T>>): Promise<T> {
 		if (this.activePromise) {
 			this.queuedPromiseFactory = promiseFactory;
 
@@ -142,7 +142,7 @@ export class Sequencer {
 
 	private current: Promise<any> = Promise.resolve(null);
 
-	queue<T>(promiseTask: ITask<Thenable<T>>): Thenable<T> {
+	queue<T>(promiseTask: ITask<Promise<T>>): Promise<T> {
 		return this.current = this.current.then(() => promiseTask());
 	}
 }
@@ -173,10 +173,10 @@ export class Sequencer {
 export class Delayer<T> implements IDisposable {
 
 	private timeout: any;
-	private completionPromise: Thenable<any> | null;
-	private doResolve: ((value?: any | Thenable<any>) => void) | null;
+	private completionPromise: Promise<any> | null;
+	private doResolve: ((value?: any | Promise<any>) => void) | null;
 	private doReject: (err: any) => void;
-	private task: ITask<T | Thenable<T>> | null;
+	private task: ITask<T | Promise<T>> | null;
 
 	constructor(public defaultDelay: number) {
 		this.timeout = null;
@@ -185,7 +185,7 @@ export class Delayer<T> implements IDisposable {
 		this.task = null;
 	}
 
-	trigger(task: ITask<T | Thenable<T>>, delay: number = this.defaultDelay): Thenable<T> {
+	trigger(task: ITask<T | Promise<T>>, delay: number = this.defaultDelay): Promise<T> {
 		this.task = task;
 		this.cancelTimeout();
 
@@ -247,7 +247,7 @@ export class Delayer<T> implements IDisposable {
  */
 export class ThrottledDelayer<T> {
 
-	private delayer: Delayer<Thenable<T>>;
+	private delayer: Delayer<Promise<T>>;
 	private throttler: Throttler;
 
 	constructor(defaultDelay: number) {
@@ -255,8 +255,8 @@ export class ThrottledDelayer<T> {
 		this.throttler = new Throttler();
 	}
 
-	trigger(promiseFactory: ITask<Thenable<T>>, delay?: number): Thenable<T> {
-		return this.delayer.trigger(() => this.throttler.queue(promiseFactory), delay) as any as Thenable<T>;
+	trigger(promiseFactory: ITask<Promise<T>>, delay?: number): Promise<T> {
+		return this.delayer.trigger(() => this.throttler.queue(promiseFactory), delay) as any as Promise<T>;
 	}
 
 	isTriggered(): boolean {
@@ -303,8 +303,8 @@ export class Barrier {
 }
 
 export function timeout(millis: number): CancelablePromise<void>;
-export function timeout(millis: number, token: CancellationToken): Thenable<void>;
-export function timeout(millis: number, token?: CancellationToken): CancelablePromise<void> | Thenable<void> {
+export function timeout(millis: number, token: CancellationToken): Promise<void>;
+export function timeout(millis: number, token?: CancellationToken): CancelablePromise<void> | Promise<void> {
 	if (!token) {
 		return createCancelablePromise(token => timeout(millis, token));
 	}
@@ -334,7 +334,7 @@ export function disposableTimeout(handler: Function, timeout = 0): IDisposable {
  * @param promise a promise
  * @param callback a function that will be call in the success and error case.
  */
-export function always<T>(promise: Thenable<T>, callback: () => void): Promise<T> {
+export function always<T>(promise: Promise<T>, callback: () => void): Promise<T> {
 	function safeCallback() {
 		try {
 			callback();
@@ -346,7 +346,7 @@ export function always<T>(promise: Thenable<T>, callback: () => void): Promise<T
 	return Promise.resolve(promise);
 }
 
-export function ignoreErrors<T>(promise: Thenable<T>): Thenable<T | undefined> {
+export function ignoreErrors<T>(promise: Promise<T>): Promise<T | undefined> {
 	return promise.then(undefined, _ => undefined);
 }
 
@@ -355,16 +355,16 @@ export function ignoreErrors<T>(promise: Thenable<T>): Thenable<T | undefined> {
  * promise will complete to an array of results from each promise.
  */
 
-export function sequence<T>(promiseFactories: ITask<Thenable<T>>[]): Promise<T[]> {
+export function sequence<T>(promiseFactories: ITask<Promise<T>>[]): Promise<T[]> {
 	const results: T[] = [];
 	let index = 0;
 	const len = promiseFactories.length;
 
-	function next(): Thenable<T> | null {
+	function next(): Promise<T> | null {
 		return index < len ? promiseFactories[index++]() : null;
 	}
 
-	function thenHandler(result: any): Thenable<any> {
+	function thenHandler(result: any): Promise<any> {
 		if (result !== undefined && result !== null) {
 			results.push(result);
 		}
@@ -380,7 +380,7 @@ export function sequence<T>(promiseFactories: ITask<Thenable<T>>[]): Promise<T[]
 	return Promise.resolve(null).then(thenHandler);
 }
 
-export function first<T>(promiseFactories: ITask<Thenable<T>>[], shouldStop: (t: T) => boolean = t => !!t, defaultValue: T | null = null): Promise<T | null> {
+export function first<T>(promiseFactories: ITask<Promise<T>>[], shouldStop: (t: T) => boolean = t => !!t, defaultValue: T | null = null): Promise<T | null> {
 	let index = 0;
 	const len = promiseFactories.length;
 
@@ -405,8 +405,8 @@ export function first<T>(promiseFactories: ITask<Thenable<T>>[], shouldStop: (t:
 }
 
 interface ILimitedTaskFactory<T> {
-	factory: ITask<Thenable<T>>;
-	c: (value?: T | Thenable<T>) => void;
+	factory: ITask<Promise<T>>;
+	c: (value?: T | Promise<T>) => void;
 	e: (error?: any) => void;
 }
 
@@ -438,7 +438,7 @@ export class Limiter<T> {
 		// return this.runningPromises + this.outstandingPromises.length;
 	}
 
-	queue(factory: ITask<Thenable<T>>): Thenable<T> {
+	queue(factory: ITask<Promise<T>>): Promise<T> {
 		this._size++;
 
 		return new Promise<T>((c, e) => {
@@ -685,8 +685,8 @@ export function nfcall(fn: Function, ...args: any[]): any {
 	return new Promise((c, e) => fn(...args, (err: any, result: any) => err ? e(err) : c(result)));
 }
 
-export function ninvoke(thisArg: any, fn: Function, ...args: any[]): Thenable<any>;
-export function ninvoke<T>(thisArg: any, fn: Function, ...args: any[]): Thenable<T>;
+export function ninvoke(thisArg: any, fn: Function, ...args: any[]): Promise<any>;
+export function ninvoke<T>(thisArg: any, fn: Function, ...args: any[]): Promise<T>;
 export function ninvoke(thisArg: any, fn: Function, ...args: any[]): any {
 	return new Promise((resolve, reject) => fn.call(thisArg, ...args, (err: any, result: any) => err ? reject(err) : resolve(result)));
 }
diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts
index 7e7838c117c..4fde520b56d 100644
--- a/src/vs/base/common/event.ts
+++ b/src/vs/base/common/event.ts
@@ -332,7 +332,7 @@ export namespace Event {
 		return result.event;
 	}
 
-	export function fromPromise<T =any>(promise: Thenable<T>): Event<T> {
+	export function fromPromise<T =any>(promise: Promise<T>): Event<T> {
 		const emitter = new Emitter<T>();
 		let shouldEmit = false;
 
@@ -350,7 +350,7 @@ export namespace Event {
 		return emitter.event;
 	}
 
-	export function toPromise<T>(event: Event<T>): Thenable<T> {
+	export function toPromise<T>(event: Event<T>): Promise<T> {
 		return new Promise(c => once(event)(c));
 	}
 }
@@ -585,14 +585,14 @@ export class Emitter<T> {
 }
 
 export interface IWaitUntil {
-	waitUntil(thenable: Thenable<any>): void;
+	waitUntil(thenable: Promise<any>): void;
 }
 
 export class AsyncEmitter<T extends IWaitUntil> extends Emitter<T> {
 
-	private _asyncDeliveryQueue: [Listener, T, Thenable<any>[]][];
+	private _asyncDeliveryQueue: [Listener, T, Promise<any>[]][];
 
-	async fireAsync(eventFn: (thenables: Thenable<any>[], listener: Function) => T): Promise<void> {
+	async fireAsync(eventFn: (thenables: Promise<any>[], listener: Function) => T): Promise<void> {
 		if (!this._listeners) {
 			return;
 		}
@@ -605,7 +605,7 @@ export class AsyncEmitter<T extends IWaitUntil> extends Emitter<T> {
 		}
 
 		for (let iter = this._listeners.iterator(), e = iter.next(); !e.done; e = iter.next()) {
-			let thenables: Thenable<void>[] = [];
+			let thenables: Promise<void>[] = [];
 			this._asyncDeliveryQueue.push([e.value, eventFn(thenables, typeof e.value === 'function' ? e.value : e.value[0]), thenables]);
 		}
 
diff --git a/src/vs/base/common/paging.ts b/src/vs/base/common/paging.ts
index a6518831a93..cc808e645b7 100644
--- a/src/vs/base/common/paging.ts
+++ b/src/vs/base/common/paging.ts
@@ -15,12 +15,12 @@ export interface IPager<T> {
 	firstPage: T[];
 	total: number;
 	pageSize: number;
-	getPage(pageIndex: number, cancellationToken: CancellationToken): Thenable<T[]>;
+	getPage(pageIndex: number, cancellationToken: CancellationToken): Promise<T[]>;
 }
 
 interface IPage<T> {
 	isResolved: boolean;
-	promise: Thenable<void> | null;
+	promise: Promise<void> | null;
 	cts: CancellationTokenSource | null;
 	promiseIndexes: Set<number>;
 	elements: T[];
@@ -43,7 +43,7 @@ export interface IPagedModel<T> {
 	length: number;
 	isResolved(index: number): boolean;
 	get(index: number): T;
-	resolve(index: number, cancellationToken: CancellationToken): Thenable<T>;
+	resolve(index: number, cancellationToken: CancellationToken): Promise<T>;
 }
 
 export function singlePagePager<T>(elements: T[]): IPager<T> {
@@ -51,7 +51,7 @@ export function singlePagePager<T>(elements: T[]): IPager<T> {
 		firstPage: elements,
 		total: elements.length,
 		pageSize: elements.length,
-		getPage: (pageIndex: number, cancellationToken: CancellationToken): Thenable<T[]> => {
+		getPage: (pageIndex: number, cancellationToken: CancellationToken): Promise<T[]> => {
 			return Promise.resolve(elements);
 		}
 	};
@@ -90,7 +90,7 @@ export class PagedModel<T> implements IPagedModel<T> {
 		return page.elements[indexInPage];
 	}
 
-	resolve(index: number, cancellationToken: CancellationToken): Thenable<T> {
+	resolve(index: number, cancellationToken: CancellationToken): Promise<T> {
 		if (cancellationToken.isCancellationRequested) {
 			return Promise.reject(canceled());
 		}
@@ -151,7 +151,7 @@ export class DelayedPagedModel<T> implements IPagedModel<T> {
 		return this.model.get(index);
 	}
 
-	resolve(index: number, cancellationToken: CancellationToken): Thenable<T> {
+	resolve(index: number, cancellationToken: CancellationToken): Promise<T> {
 		return new Promise((c, e) => {
 			if (cancellationToken.isCancellationRequested) {
 				return e(canceled());
@@ -196,7 +196,7 @@ export function mergePagers<T>(one: IPager<T>, other: IPager<T>): IPager<T> {
 		firstPage: [...one.firstPage, ...other.firstPage],
 		total: one.total + other.total,
 		pageSize: one.pageSize + other.pageSize,
-		getPage(pageIndex: number, token): Thenable<T[]> {
+		getPage(pageIndex: number, token): Promise<T[]> {
 			return Promise.all([one.getPage(pageIndex, token), other.getPage(pageIndex, token)])
 				.then(([onePage, otherPage]) => [...onePage, ...otherPage]);
 		}
diff --git a/src/vs/base/node/encoding.ts b/src/vs/base/node/encoding.ts
index 516afbc93cc..0f975015eb6 100644
--- a/src/vs/base/node/encoding.ts
+++ b/src/vs/base/node/encoding.ts
@@ -36,7 +36,7 @@ export function toDecodeStream(readable: Readable, options: IDecodeStreamOptions
 		readable.pipe(new class extends Writable {
 
 			private _decodeStream: NodeJS.ReadWriteStream;
-			private _decodeStreamConstruction: Thenable<any>;
+			private _decodeStreamConstruction: Promise<any>;
 			private _buffer: Buffer[] = [];
 			private _bytesBuffered = 0;
 
diff --git a/src/vs/base/node/ports.ts b/src/vs/base/node/ports.ts
index 4a4316a8bf1..a077f020fa9 100644
--- a/src/vs/base/node/ports.ts
+++ b/src/vs/base/node/ports.ts
@@ -18,7 +18,7 @@ export function randomPort(): number {
  * Given a start point and a max number of retries, will find a port that
  * is openable. Will return 0 in case no free port can be found.
  */
-export function findFreePort(startPort: number, giveUpAfter: number, timeout: number): Thenable<number> {
+export function findFreePort(startPort: number, giveUpAfter: number, timeout: number): Promise<number> {
 	let done = false;
 
 	return new Promise(resolve => {
diff --git a/src/vs/base/node/processes.ts b/src/vs/base/node/processes.ts
index 8ea9f18803c..dbe416c83a4 100644
--- a/src/vs/base/node/processes.ts
+++ b/src/vs/base/node/processes.ts
@@ -17,7 +17,7 @@ import { CommandOptions, ForkOptions, SuccessData, Source, TerminateResponse, Te
 import { getPathFromAmdModule } from 'vs/base/common/amd';
 export { CommandOptions, ForkOptions, SuccessData, Source, TerminateResponse, TerminateResponseCode };
 
-export type ValueCallback<T> = (value?: T | Thenable<T>) => void;
+export type ValueCallback<T> = (value?: T | Promise<T>) => void;
 export type ErrorCallback = (error?: any) => void;
 export type ProgressCallback<T> = (progress: T) => void;
 
diff --git a/src/vs/base/node/storage.ts b/src/vs/base/node/storage.ts
index 1ba69a7ac4a..29f240df167 100644
--- a/src/vs/base/node/storage.ts
+++ b/src/vs/base/node/storage.ts
@@ -39,12 +39,12 @@ export interface IStorageDatabase {
 
 	readonly onDidChangeItemsExternal: Event<IStorageItemsChangeEvent>;
 
-	getItems(): Thenable<Map<string, string>>;
-	updateItems(request: IUpdateRequest): Thenable<void>;
+	getItems(): Promise<Map<string, string>>;
+	updateItems(request: IUpdateRequest): Promise<void>;
 
-	close(): Thenable<void>;
+	close(): Promise<void>;
 
-	checkIntegrity(full: boolean): Thenable<string>;
+	checkIntegrity(full: boolean): Promise<string>;
 }
 
 export interface IStorage extends IDisposable {
@@ -53,7 +53,7 @@ export interface IStorage extends IDisposable {
 	readonly size: number;
 	readonly onDidChangeStorage: Event<string>;
 
-	init(): Thenable<void>;
+	init(): Promise<void>;
 
 	get(key: string, fallbackValue: string): string;
 	get(key: string, fallbackValue?: string): string | undefined;
@@ -64,12 +64,12 @@ export interface IStorage extends IDisposable {
 	getInteger(key: string, fallbackValue: number): number;
 	getInteger(key: string, fallbackValue?: number): number | undefined;
 
-	set(key: string, value: any): Thenable<void>;
-	delete(key: string): Thenable<void>;
+	set(key: string, value: any): Promise<void>;
+	delete(key: string): Promise<void>;
 
-	close(): Thenable<void>;
+	close(): Promise<void>;
 
-	checkIntegrity(full: boolean): Thenable<string>;
+	checkIntegrity(full: boolean): Promise<string>;
 }
 
 enum StorageState {
@@ -152,7 +152,7 @@ export class Storage extends Disposable implements IStorage {
 		return this.cache.size;
 	}
 
-	init(): Thenable<void> {
+	init(): Promise<void> {
 		if (this.state !== StorageState.None) {
 			return Promise.resolve(); // either closed or already initialized
 		}
@@ -207,7 +207,7 @@ export class Storage extends Disposable implements IStorage {
 		return parseInt(value, 10);
 	}
 
-	set(key: string, value: any): Thenable<void> {
+	set(key: string, value: any): Promise<void> {
 		if (this.state === StorageState.Closed) {
 			return Promise.resolve(); // Return early if we are already closed
 		}
@@ -238,7 +238,7 @@ export class Storage extends Disposable implements IStorage {
 		return this.flushDelayer.trigger(() => this.flushPending());
 	}
 
-	delete(key: string): Thenable<void> {
+	delete(key: string): Promise<void> {
 		if (this.state === StorageState.Closed) {
 			return Promise.resolve(); // Return early if we are already closed
 		}
@@ -262,7 +262,7 @@ export class Storage extends Disposable implements IStorage {
 		return this.flushDelayer.trigger(() => this.flushPending());
 	}
 
-	close(): Thenable<void> {
+	close(): Promise<void> {
 		if (this.state === StorageState.Closed) {
 			return Promise.resolve(); // return if already closed
 		}
@@ -277,7 +277,7 @@ export class Storage extends Disposable implements IStorage {
 		return this.flushDelayer.trigger(() => this.flushPending(), 0 /* as soon as possible */).then(onDone, onDone);
 	}
 
-	private flushPending(): Thenable<void> {
+	private flushPending(): Promise<void> {
 		if (this.pendingInserts.size === 0 && this.pendingDeletes.size === 0) {
 			return Promise.resolve(); // return early if nothing to do
 		}
@@ -293,7 +293,7 @@ export class Storage extends Disposable implements IStorage {
 		return this.database.updateItems(updateRequest);
 	}
 
-	checkIntegrity(full: boolean): Thenable<string> {
+	checkIntegrity(full: boolean): Promise<string> {
 		return this.database.checkIntegrity(full);
 	}
 }
@@ -669,11 +669,11 @@ export class InMemoryStorageDatabase implements IStorageDatabase {
 
 	private items = new Map<string, string>();
 
-	getItems(): Thenable<Map<string, string>> {
+	getItems(): Promise<Map<string, string>> {
 		return Promise.resolve(this.items);
 	}
 
-	updateItems(request: IUpdateRequest): Thenable<void> {
+	updateItems(request: IUpdateRequest): Promise<void> {
 		if (request.insert) {
 			request.insert.forEach((value, key) => this.items.set(key, value));
 		}
@@ -685,11 +685,11 @@ export class InMemoryStorageDatabase implements IStorageDatabase {
 		return Promise.resolve();
 	}
 
-	close(): Thenable<void> {
+	close(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	checkIntegrity(full: boolean): Thenable<string> {
+	checkIntegrity(full: boolean): Promise<string> {
 		return Promise.resolve('ok');
 	}
 }
\ No newline at end of file
diff --git a/src/vs/base/parts/ipc/node/ipc.cp.ts b/src/vs/base/parts/ipc/node/ipc.cp.ts
index 147adec58a1..2217c707d22 100644
--- a/src/vs/base/parts/ipc/node/ipc.cp.ts
+++ b/src/vs/base/parts/ipc/node/ipc.cp.ts
@@ -105,7 +105,7 @@ export class Client implements IChannelClient, IDisposable {
 		const that = this;
 
 		return {
-			call<T>(command: string, arg?: any, cancellationToken?: CancellationToken): Thenable<T> {
+			call<T>(command: string, arg?: any, cancellationToken?: CancellationToken): Promise<T> {
 				return that.requestPromise<T>(channelName, command, arg, cancellationToken);
 			},
 			listen(event: string, arg?: any) {
@@ -114,7 +114,7 @@ export class Client implements IChannelClient, IDisposable {
 		} as T;
 	}
 
-	protected requestPromise<T>(channelName: string, name: string, arg?: any, cancellationToken = CancellationToken.None): Thenable<T> {
+	protected requestPromise<T>(channelName: string, name: string, arg?: any, cancellationToken = CancellationToken.None): Promise<T> {
 		if (!this.disposeDelayer) {
 			return Promise.reject(new Error('disposed'));
 		}
diff --git a/src/vs/base/parts/ipc/node/ipc.net.ts b/src/vs/base/parts/ipc/node/ipc.net.ts
index 8014e7fb044..9a2235a92d8 100644
--- a/src/vs/base/parts/ipc/node/ipc.net.ts
+++ b/src/vs/base/parts/ipc/node/ipc.net.ts
@@ -249,9 +249,9 @@ export class Client<TContext = string> extends IPCClient<TContext> {
 	}
 }
 
-export function serve(port: number): Thenable<Server>;
-export function serve(namedPipe: string): Thenable<Server>;
-export function serve(hook: any): Thenable<Server> {
+export function serve(port: number): Promise<Server>;
+export function serve(namedPipe: string): Promise<Server>;
+export function serve(hook: any): Promise<Server> {
 	return new Promise<Server>((c, e) => {
 		const server = createServer();
 
@@ -263,10 +263,10 @@ export function serve(hook: any): Thenable<Server> {
 	});
 }
 
-export function connect(options: { host: string, port: number }, clientId: string): Thenable<Client>;
-export function connect(port: number, clientId: string): Thenable<Client>;
-export function connect(namedPipe: string, clientId: string): Thenable<Client>;
-export function connect(hook: any, clientId: string): Thenable<Client> {
+export function connect(options: { host: string, port: number }, clientId: string): Promise<Client>;
+export function connect(port: number, clientId: string): Promise<Client>;
+export function connect(namedPipe: string, clientId: string): Promise<Client>;
+export function connect(hook: any, clientId: string): Promise<Client> {
 	return new Promise<Client>((c, e) => {
 		const socket = createConnection(hook, () => {
 			socket.removeListener('error', e);
diff --git a/src/vs/base/parts/ipc/node/ipc.ts b/src/vs/base/parts/ipc/node/ipc.ts
index eb7ef91c707..61a97a3ff5c 100644
--- a/src/vs/base/parts/ipc/node/ipc.ts
+++ b/src/vs/base/parts/ipc/node/ipc.ts
@@ -58,7 +58,7 @@ enum State {
  * with at most one single return value.
  */
 export interface IChannel {
-	call<T>(command: string, arg?: any, cancellationToken?: CancellationToken): Thenable<T>;
+	call<T>(command: string, arg?: any, cancellationToken?: CancellationToken): Promise<T>;
 	listen<T>(event: string, arg?: any): Event<T>;
 }
 
@@ -68,7 +68,7 @@ export interface IChannel {
  * if you'd like to handle remote promises or events.
  */
 export interface IServerChannel<TContext = string> {
-	call<T>(ctx: TContext, command: string, arg?: any, cancellationToken?: CancellationToken): Thenable<T>;
+	call<T>(ctx: TContext, command: string, arg?: any, cancellationToken?: CancellationToken): Promise<T>;
 	listen<T>(ctx: TContext, event: string, arg?: any): Event<T>;
 }
 
@@ -103,8 +103,8 @@ export interface IConnectionHub<TContext> {
  * channels (each from a separate client) to pick from.
  */
 export interface IClientRouter<TContext = string> {
-	routeCall(hub: IConnectionHub<TContext>, command: string, arg?: any, cancellationToken?: CancellationToken): Thenable<Client<TContext>>;
-	routeEvent(hub: IConnectionHub<TContext>, event: string, arg?: any): Thenable<Client<TContext>>;
+	routeCall(hub: IConnectionHub<TContext>, command: string, arg?: any, cancellationToken?: CancellationToken): Promise<Client<TContext>>;
+	routeEvent(hub: IConnectionHub<TContext>, event: string, arg?: any): Promise<Client<TContext>>;
 }
 
 /**
@@ -290,7 +290,7 @@ export class ChannelServer<TContext = string> implements IChannelServer<TContext
 	private onPromise(request: IRawPromiseRequest): void {
 		const channel = this.channels.get(request.channelName);
 		const cancellationTokenSource = new CancellationTokenSource();
-		let promise: Thenable<any>;
+		let promise: Promise<any>;
 
 		try {
 			promise = channel.call(this.ctx, request.name, request.arg, cancellationTokenSource.token);
@@ -380,7 +380,7 @@ export class ChannelClient implements IChannelClient, IDisposable {
 		} as T;
 	}
 
-	private requestPromise(channelName: string, name: string, arg?: any, cancellationToken = CancellationToken.None): Thenable<any> {
+	private requestPromise(channelName: string, name: string, arg?: any, cancellationToken = CancellationToken.None): Promise<any> {
 		const id = this.lastRequestId++;
 		const type = RequestType.Promise;
 		const request: IRawRequest = { id, type, channelName, name, arg };
@@ -539,7 +539,7 @@ export class ChannelClient implements IChannelClient, IDisposable {
 		}
 	}
 
-	private whenInitialized(): Thenable<void> {
+	private whenInitialized(): Promise<void> {
 		if (this.state === State.Idle) {
 			return Promise.resolve();
 		} else {
@@ -681,9 +681,9 @@ export class IPCClient<TContext = string> implements IChannelClient, IChannelSer
 	}
 }
 
-export function getDelayedChannel<T extends IChannel>(promise: Thenable<T>): T {
+export function getDelayedChannel<T extends IChannel>(promise: Promise<T>): T {
 	return {
-		call(command: string, arg?: any, cancellationToken?: CancellationToken): Thenable<T> {
+		call(command: string, arg?: any, cancellationToken?: CancellationToken): Promise<T> {
 			return promise.then(c => c.call(command, arg, cancellationToken));
 		},
 
@@ -699,7 +699,7 @@ export function getNextTickChannel<T extends IChannel>(channel: T): T {
 	let didTick = false;
 
 	return {
-		call<T>(command: string, arg?: any, cancellationToken?: CancellationToken): Thenable<T> {
+		call<T>(command: string, arg?: any, cancellationToken?: CancellationToken): Promise<T> {
 			if (didTick) {
 				return channel.call(command, arg, cancellationToken);
 			}
@@ -726,13 +726,13 @@ export function getNextTickChannel<T extends IChannel>(channel: T): T {
 
 export class StaticRouter<TContext = string> implements IClientRouter<TContext> {
 
-	constructor(private fn: (ctx: TContext) => boolean | Thenable<boolean>) { }
+	constructor(private fn: (ctx: TContext) => boolean | Promise<boolean>) { }
 
-	routeCall(hub: IConnectionHub<TContext>): Thenable<Client<TContext>> {
+	routeCall(hub: IConnectionHub<TContext>): Promise<Client<TContext>> {
 		return this.route(hub);
 	}
 
-	routeEvent(hub: IConnectionHub<TContext>): Thenable<Client<TContext>> {
+	routeEvent(hub: IConnectionHub<TContext>): Promise<Client<TContext>> {
 		return this.route(hub);
 	}
 
diff --git a/src/vs/base/parts/ipc/test/node/ipc.test.ts b/src/vs/base/parts/ipc/test/node/ipc.test.ts
index 9aa937b63da..625f1a65922 100644
--- a/src/vs/base/parts/ipc/test/node/ipc.test.ts
+++ b/src/vs/base/parts/ipc/test/node/ipc.test.ts
@@ -95,11 +95,11 @@ class TestIPCServer extends IPCServer<string> {
 const TestChannelId = 'testchannel';
 
 interface ITestService {
-	marco(): Thenable<string>;
-	error(message: string): Thenable<void>;
-	neverComplete(): Thenable<void>;
-	neverCompleteCT(cancellationToken: CancellationToken): Thenable<void>;
-	buffersLength(buffers: Buffer[]): Thenable<number>;
+	marco(): Promise<string>;
+	error(message: string): Promise<void>;
+	neverComplete(): Promise<void>;
+	neverCompleteCT(cancellationToken: CancellationToken): Promise<void>;
+	buffersLength(buffers: Buffer[]): Promise<number>;
 
 	pong: Event<string>;
 }
@@ -109,19 +109,19 @@ class TestService implements ITestService {
 	private _pong = new Emitter<string>();
 	readonly pong = this._pong.event;
 
-	marco(): Thenable<string> {
+	marco(): Promise<string> {
 		return Promise.resolve('polo');
 	}
 
-	error(message: string): Thenable<void> {
+	error(message: string): Promise<void> {
 		return Promise.reject(new Error(message));
 	}
 
-	neverComplete(): Thenable<void> {
+	neverComplete(): Promise<void> {
 		return new Promise(_ => { });
 	}
 
-	neverCompleteCT(cancellationToken: CancellationToken): Thenable<void> {
+	neverCompleteCT(cancellationToken: CancellationToken): Promise<void> {
 		if (cancellationToken.isCancellationRequested) {
 			return Promise.reject(canceled());
 		}
@@ -129,7 +129,7 @@ class TestService implements ITestService {
 		return new Promise((_, e) => cancellationToken.onCancellationRequested(() => e(canceled())));
 	}
 
-	buffersLength(buffers: Buffer[]): Thenable<number> {
+	buffersLength(buffers: Buffer[]): Promise<number> {
 		return Promise.resolve(buffers.reduce((r, b) => r + b.length, 0));
 	}
 
@@ -142,7 +142,7 @@ class TestChannel implements IServerChannel {
 
 	constructor(private service: ITestService) { }
 
-	call(_, command: string, arg: any, cancellationToken: CancellationToken): Thenable<any> {
+	call(_, command: string, arg: any, cancellationToken: CancellationToken): Promise<any> {
 		switch (command) {
 			case 'marco': return this.service.marco();
 			case 'error': return this.service.error(arg);
@@ -169,23 +169,23 @@ class TestChannelClient implements ITestService {
 
 	constructor(private channel: IChannel) { }
 
-	marco(): Thenable<string> {
+	marco(): Promise<string> {
 		return this.channel.call('marco');
 	}
 
-	error(message: string): Thenable<void> {
+	error(message: string): Promise<void> {
 		return this.channel.call('error', message);
 	}
 
-	neverComplete(): Thenable<void> {
+	neverComplete(): Promise<void> {
 		return this.channel.call('neverComplete');
 	}
 
-	neverCompleteCT(cancellationToken: CancellationToken): Thenable<void> {
+	neverCompleteCT(cancellationToken: CancellationToken): Promise<void> {
 		return this.channel.call('neverCompleteCT', undefined, cancellationToken);
 	}
 
-	buffersLength(buffers: Buffer[]): Thenable<number> {
+	buffersLength(buffers: Buffer[]): Promise<number> {
 		return this.channel.call('buffersLength', buffers);
 	}
 }
diff --git a/src/vs/base/parts/ipc/test/node/testService.ts b/src/vs/base/parts/ipc/test/node/testService.ts
index 241402397d4..6c35db5e4ea 100644
--- a/src/vs/base/parts/ipc/test/node/testService.ts
+++ b/src/vs/base/parts/ipc/test/node/testService.ts
@@ -13,9 +13,9 @@ export interface IMarcoPoloEvent {
 
 export interface ITestService {
 	onMarco: Event<IMarcoPoloEvent>;
-	marco(): Thenable<string>;
-	pong(ping: string): Thenable<{ incoming: string, outgoing: string }>;
-	cancelMe(): Thenable<boolean>;
+	marco(): Promise<string>;
+	pong(ping: string): Promise<{ incoming: string, outgoing: string }>;
+	cancelMe(): Promise<boolean>;
 }
 
 export class TestService implements ITestService {
@@ -23,16 +23,16 @@ export class TestService implements ITestService {
 	private _onMarco = new Emitter<IMarcoPoloEvent>();
 	onMarco: Event<IMarcoPoloEvent> = this._onMarco.event;
 
-	marco(): Thenable<string> {
+	marco(): Promise<string> {
 		this._onMarco.fire({ answer: 'polo' });
 		return Promise.resolve('polo');
 	}
 
-	pong(ping: string): Thenable<{ incoming: string, outgoing: string }> {
+	pong(ping: string): Promise<{ incoming: string, outgoing: string }> {
 		return Promise.resolve({ incoming: ping, outgoing: 'pong' });
 	}
 
-	cancelMe(): Thenable<boolean> {
+	cancelMe(): Promise<boolean> {
 		return Promise.resolve(timeout(100)).then(() => true);
 	}
 }
@@ -49,7 +49,7 @@ export class TestChannel implements IServerChannel {
 		throw new Error('Event not found');
 	}
 
-	call(_, command: string, ...args: any[]): Thenable<any> {
+	call(_, command: string, ...args: any[]): Promise<any> {
 		switch (command) {
 			case 'pong': return this.testService.pong(args[0]);
 			case 'cancelMe': return this.testService.cancelMe();
@@ -65,15 +65,15 @@ export class TestServiceClient implements ITestService {
 
 	constructor(private channel: IChannel) { }
 
-	marco(): Thenable<string> {
+	marco(): Promise<string> {
 		return this.channel.call('marco');
 	}
 
-	pong(ping: string): Thenable<{ incoming: string, outgoing: string }> {
+	pong(ping: string): Promise<{ incoming: string, outgoing: string }> {
 		return this.channel.call('pong', ping);
 	}
 
-	cancelMe(): Thenable<boolean> {
+	cancelMe(): Promise<boolean> {
 		return this.channel.call('cancelMe');
 	}
 }
\ No newline at end of file
diff --git a/src/vs/base/parts/quickopen/browser/quickOpenViewer.ts b/src/vs/base/parts/quickopen/browser/quickOpenViewer.ts
index fd8df5f680f..042d649f924 100644
--- a/src/vs/base/parts/quickopen/browser/quickOpenViewer.ts
+++ b/src/vs/base/parts/quickopen/browser/quickOpenViewer.ts
@@ -36,12 +36,12 @@ export class DataSource implements IDataSource {
 		return model && model === element && model.entries.length > 0;
 	}
 
-	getChildren(tree: ITree, element: any): Thenable<any[]> {
+	getChildren(tree: ITree, element: any): Promise<any[]> {
 		const model = this.modelProvider.getModel();
 		return Promise.resolve(model === element ? model.entries : []);
 	}
 
-	getParent(tree: ITree, element: any): Thenable<any> {
+	getParent(tree: ITree, element: any): Promise<any> {
 		return Promise.resolve(null);
 	}
 }
diff --git a/src/vs/base/parts/tree/browser/tree.ts b/src/vs/base/parts/tree/browser/tree.ts
index 311af266ab5..9c10466ddf7 100644
--- a/src/vs/base/parts/tree/browser/tree.ts
+++ b/src/vs/base/parts/tree/browser/tree.ts
@@ -49,7 +49,7 @@ export interface ITree {
 	/**
 	 * Sets the input of the tree.
 	 */
-	setInput(element: any): Thenable<any>;
+	setInput(element: any): Promise<any>;
 
 	/**
 	 * Returns the tree's input.
@@ -75,7 +75,7 @@ export interface ITree {
 	 * Refreshes an element.
 	 * Provide no arguments and it will refresh the input element.
 	 */
-	refresh(element?: any, recursive?: boolean): Thenable<any>;
+	refresh(element?: any, recursive?: boolean): Promise<any>;
 
 	/**
 	 * Updates an element's width.
@@ -86,36 +86,36 @@ export interface ITree {
 	 * Expands an element.
 	 * The returned promise returns a boolean for whether the element was expanded or not.
 	 */
-	expand(element: any): Thenable<any>;
+	expand(element: any): Promise<any>;
 
 	/**
 	 * Expands several elements.
 	 * The returned promise returns a boolean array for whether the elements were expanded or not.
 	 */
-	expandAll(elements?: any[]): Thenable<any>;
+	expandAll(elements?: any[]): Promise<any>;
 
 	/**
 	 * Collapses an element.
 	 * The returned promise returns a boolean for whether the element was collapsed or not.
 	 */
-	collapse(element: any, recursive?: boolean): Thenable<any>;
+	collapse(element: any, recursive?: boolean): Promise<any>;
 
 	/**
 	 * Collapses several elements.
 	 * Provide no arguments and it will recursively collapse all elements in the tree
 	 * The returned promise returns a boolean for whether the elements were collapsed or not.
 	 */
-	collapseAll(elements?: any[], recursive?: boolean): Thenable<any>;
+	collapseAll(elements?: any[], recursive?: boolean): Promise<any>;
 
 	/**
 	 * Toggles an element's expansion state.
 	 */
-	toggleExpansion(element: any, recursive?: boolean): Thenable<any>;
+	toggleExpansion(element: any, recursive?: boolean): Promise<any>;
 
 	/**
 	 * Toggles several element's expansion state.
 	 */
-	toggleExpansionAll(elements: any[]): Thenable<any>;
+	toggleExpansionAll(elements: any[]): Promise<any>;
 
 	/**
 	 * Returns whether an element is expanded or not.
@@ -131,7 +131,7 @@ export interface ITree {
 	 * Reveals an element in the tree. The relativeTop is a value between 0 and 1. The closer to 0 the more the
 	 * element will scroll up to the top.
 	 */
-	reveal(element: any, relativeTop?: number): Thenable<any>;
+	reveal(element: any, relativeTop?: number): Promise<any>;
 
 	/**
 	 * Returns the relative top position of any given element, if visible.
@@ -377,12 +377,12 @@ export interface IDataSource {
 	/**
 	 * Returns the element's children as an array in a promise.
 	 */
-	getChildren(tree: ITree, element: any): Thenable<any>;
+	getChildren(tree: ITree, element: any): Promise<any>;
 
 	/**
 	 * Returns the element's parent in a promise.
 	 */
-	getParent(tree: ITree, element: any): Thenable<any>;
+	getParent(tree: ITree, element: any): Promise<any>;
 
 	/**
 	 * Returns whether an element should be expanded when first added to the tree.
diff --git a/src/vs/base/parts/tree/browser/treeDefaults.ts b/src/vs/base/parts/tree/browser/treeDefaults.ts
index 13fce9da63a..5980bea0d08 100644
--- a/src/vs/base/parts/tree/browser/treeDefaults.ts
+++ b/src/vs/base/parts/tree/browser/treeDefaults.ts
@@ -555,7 +555,7 @@ export class CollapseAllAction extends Action {
 		super('vs.tree.collapse', nls.localize('collapse', "Collapse"), 'monaco-tree-action collapse-all', enabled);
 	}
 
-	public run(context?: any): Thenable<any> {
+	public run(context?: any): Promise<any> {
 		if (this.viewer.getHighlight()) {
 			return Promise.resolve(); // Global action disabled if user is in edit mode from another action
 		}
diff --git a/src/vs/base/parts/tree/browser/treeImpl.ts b/src/vs/base/parts/tree/browser/treeImpl.ts
index 24d1868227c..1bd18fb65ff 100644
--- a/src/vs/base/parts/tree/browser/treeImpl.ts
+++ b/src/vs/base/parts/tree/browser/treeImpl.ts
@@ -149,7 +149,7 @@ export class Tree implements _.ITree {
 		this.view.onHidden();
 	}
 
-	public setInput(element: any): Thenable<any> {
+	public setInput(element: any): Promise<any> {
 		return this.model.setInput(element);
 	}
 
@@ -157,7 +157,7 @@ export class Tree implements _.ITree {
 		return this.model.getInput();
 	}
 
-	public refresh(element: any = null, recursive = true): Thenable<any> {
+	public refresh(element: any = null, recursive = true): Promise<any> {
 		return this.model.refresh(element, recursive);
 	}
 
@@ -166,27 +166,27 @@ export class Tree implements _.ITree {
 		return this.view.updateWidth(item);
 	}
 
-	public expand(element: any): Thenable<any> {
+	public expand(element: any): Promise<any> {
 		return this.model.expand(element);
 	}
 
-	public expandAll(elements: any[]): Thenable<any> {
+	public expandAll(elements: any[]): Promise<any> {
 		return this.model.expandAll(elements);
 	}
 
-	public collapse(element: any, recursive: boolean = false): Thenable<any> {
+	public collapse(element: any, recursive: boolean = false): Promise<any> {
 		return this.model.collapse(element, recursive);
 	}
 
-	public collapseAll(elements: any[] | null = null, recursive: boolean = false): Thenable<any> {
+	public collapseAll(elements: any[] | null = null, recursive: boolean = false): Promise<any> {
 		return this.model.collapseAll(elements, recursive);
 	}
 
-	public toggleExpansion(element: any, recursive: boolean = false): Thenable<any> {
+	public toggleExpansion(element: any, recursive: boolean = false): Promise<any> {
 		return this.model.toggleExpansion(element, recursive);
 	}
 
-	public toggleExpansionAll(elements: any[]): Thenable<any> {
+	public toggleExpansionAll(elements: any[]): Promise<any> {
 		return this.model.toggleExpansionAll(elements);
 	}
 
@@ -198,7 +198,7 @@ export class Tree implements _.ITree {
 		return this.model.getExpandedElements();
 	}
 
-	public reveal(element: any, relativeTop: number | null = null): Thenable<any> {
+	public reveal(element: any, relativeTop: number | null = null): Promise<any> {
 		return this.model.reveal(element, relativeTop);
 	}
 
diff --git a/src/vs/base/parts/tree/browser/treeModel.ts b/src/vs/base/parts/tree/browser/treeModel.ts
index 0e87d9def40..9be92db0bc6 100644
--- a/src/vs/base/parts/tree/browser/treeModel.ts
+++ b/src/vs/base/parts/tree/browser/treeModel.ts
@@ -78,7 +78,7 @@ export class Lock {
 		return !!this.locks[item.id];
 	}
 
-	public run(item: Item, fn: () => Thenable<any>): Thenable<any> {
+	public run(item: Item, fn: () => Promise<any>): Promise<any> {
 		var lock = this.getLock(item);
 
 		if (lock) {
@@ -89,7 +89,7 @@ export class Lock {
 			});
 		}
 
-		var result: Thenable<any>;
+		var result: Promise<any>;
 
 		return new Promise((c, e) => {
 
@@ -350,7 +350,7 @@ export class Item {
 		this._onDidReveal.fire(eventData);
 	}
 
-	public expand(): Thenable<any> {
+	public expand(): Promise<any> {
 		if (this.isExpanded() || !this.doesHaveChildren || this.lock.isLocked(this)) {
 			return Promise.resolve(false);
 		}
@@ -361,7 +361,7 @@ export class Item {
 			}
 
 			var eventData: IItemExpandEvent = { item: this };
-			var result: Thenable<any>;
+			var result: Promise<any>;
 			this._onExpand.fire(eventData);
 
 			if (this.needsChildrenRefresh) {
@@ -391,7 +391,7 @@ export class Item {
 		});
 	}
 
-	public collapse(recursive: boolean = false): Thenable<any> {
+	public collapse(recursive: boolean = false): Promise<any> {
 		if (recursive) {
 			var collapseChildrenPromise = Promise.resolve(null);
 			this.forEachChild((child) => {
@@ -447,7 +447,7 @@ export class Item {
 		return this.height;
 	}
 
-	private refreshChildren(recursive: boolean, safe: boolean = false, force: boolean = false): Thenable<any> {
+	private refreshChildren(recursive: boolean, safe: boolean = false, force: boolean = false): Promise<any> {
 		if (!force && !this.isExpanded()) {
 			const setNeedsChildrenRefresh = (item: Item) => {
 				item.needsChildrenRefresh = true;
@@ -465,7 +465,7 @@ export class Item {
 			var eventData: IItemChildrenRefreshEvent = { item: this, isNested: safe };
 			this._onRefreshChildren.fire(eventData);
 
-			var childrenPromise: Thenable<any>;
+			var childrenPromise: Promise<any>;
 			if (this.doesHaveChildren) {
 				childrenPromise = this.context.dataSource.getChildren(this.context.tree, this.element);
 			} else {
@@ -532,7 +532,7 @@ export class Item {
 		return safe ? doRefresh() : this.lock.run(this, doRefresh);
 	}
 
-	private doRefresh(recursive: boolean, safe: boolean = false): Thenable<any> {
+	private doRefresh(recursive: boolean, safe: boolean = false): Promise<any> {
 		this.doesHaveChildren = this.context.dataSource.hasChildren(this.context.tree, this.element);
 		this.height = this._getHeight();
 		this.updateVisibility();
@@ -546,7 +546,7 @@ export class Item {
 		this.setVisible(this._isVisible());
 	}
 
-	public refresh(recursive: boolean): Thenable<any> {
+	public refresh(recursive: boolean): Promise<any> {
 		return this.doRefresh(recursive);
 	}
 
@@ -929,7 +929,7 @@ export class TreeModel {
 		this.traitsToItems = {};
 	}
 
-	public setInput(element: any): Thenable<any> {
+	public setInput(element: any): Promise<any> {
 		var eventData: IInputEvent = { item: this.input };
 		this._onSetInput.fire(eventData);
 
@@ -976,7 +976,7 @@ export class TreeModel {
 		return this.input ? this.input.getElement() : null;
 	}
 
-	public refresh(element: any = null, recursive: boolean = true): Thenable<any> {
+	public refresh(element: any = null, recursive: boolean = true): Promise<any> {
 		var item = this.getItem(element);
 
 		if (!item) {
@@ -990,7 +990,7 @@ export class TreeModel {
 		});
 	}
 
-	public expand(element: any): Thenable<any> {
+	public expand(element: any): Promise<any> {
 		var item = this.getItem(element);
 
 		if (!item) {
@@ -1000,7 +1000,7 @@ export class TreeModel {
 		return item.expand();
 	}
 
-	public expandAll(elements?: any[]): Thenable<any> {
+	public expandAll(elements?: any[]): Promise<any> {
 		if (!elements) {
 			elements = [];
 
@@ -1015,7 +1015,7 @@ export class TreeModel {
 		return this._expandAll(elements);
 	}
 
-	private _expandAll(elements: any[]): Thenable<any> {
+	private _expandAll(elements: any[]): Promise<any> {
 		if (elements.length === 0) {
 			return Promise.resolve(null);
 		}
@@ -1041,7 +1041,7 @@ export class TreeModel {
 			.then(() => this._expandAll(elementsToDelay));
 	}
 
-	private __expandAll(elements: any[]): Thenable<any> {
+	private __expandAll(elements: any[]): Promise<any> {
 		var promises = [];
 		for (var i = 0, len = elements.length; i < len; i++) {
 			promises.push(this.expand(elements[i]));
@@ -1049,7 +1049,7 @@ export class TreeModel {
 		return Promise.all(promises);
 	}
 
-	public collapse(element: any, recursive: boolean = false): Thenable<any> {
+	public collapse(element: any, recursive: boolean = false): Promise<any> {
 		var item = this.getItem(element);
 
 		if (!item) {
@@ -1059,7 +1059,7 @@ export class TreeModel {
 		return item.collapse(recursive);
 	}
 
-	public collapseAll(elements: any[] | null = null, recursive: boolean = false): Thenable<any> {
+	public collapseAll(elements: any[] | null = null, recursive: boolean = false): Promise<any> {
 		if (!elements) {
 			elements = [this.input];
 			recursive = true;
@@ -1071,11 +1071,11 @@ export class TreeModel {
 		return Promise.all(promises);
 	}
 
-	public toggleExpansion(element: any, recursive: boolean = false): Thenable<any> {
+	public toggleExpansion(element: any, recursive: boolean = false): Promise<any> {
 		return this.isExpanded(element) ? this.collapse(element, recursive) : this.expand(element);
 	}
 
-	public toggleExpansionAll(elements: any[]): Thenable<any> {
+	public toggleExpansionAll(elements: any[]): Promise<any> {
 		var promises = [];
 		for (var i = 0, len = elements.length; i < len; i++) {
 			promises.push(this.toggleExpansion(elements[i]));
@@ -1107,7 +1107,7 @@ export class TreeModel {
 		return result;
 	}
 
-	public reveal(element: any, relativeTop: number | null = null): Thenable<any> {
+	public reveal(element: any, relativeTop: number | null = null): Promise<any> {
 		return this.resolveUnknownParentChain(element).then((chain: any[]) => {
 			var result = Promise.resolve(null);
 
@@ -1125,7 +1125,7 @@ export class TreeModel {
 		});
 	}
 
-	private resolveUnknownParentChain(element: any): Thenable<any> {
+	private resolveUnknownParentChain(element: any): Promise<any> {
 		return this.context.dataSource.getParent(this.context.tree, element).then((parent) => {
 			if (!parent) {
 				return Promise.resolve([]);
diff --git a/src/vs/base/parts/tree/test/browser/treeModel.test.ts b/src/vs/base/parts/tree/test/browser/treeModel.test.ts
index 76ff355c4c5..03c321bb0de 100644
--- a/src/vs/base/parts/tree/test/browser/treeModel.test.ts
+++ b/src/vs/base/parts/tree/test/browser/treeModel.test.ts
@@ -169,11 +169,11 @@ class TestDataSource implements _.IDataSource {
 		return !!element.children;
 	}
 
-	public getChildren(tree, element): Thenable<any> {
+	public getChildren(tree, element): Promise<any> {
 		return Promise.resolve(element.children);
 	}
 
-	public getParent(tree, element): Thenable<any> {
+	public getParent(tree, element): Promise<any> {
 		throw new Error('Not implemented');
 	}
 }
@@ -683,7 +683,7 @@ suite('TreeModel - Expansion', () => {
 					if (e === 'b') { return Promise.resolve(['b1']); }
 					return Promise.resolve([]);
 				},
-				getParent: (_, e): Thenable<any> => { throw new Error('not implemented'); },
+				getParent: (_, e): Promise<any> => { throw new Error('not implemented'); },
 				shouldAutoexpand: (_, e) => e === 'b'
 			}
 		});
@@ -1079,7 +1079,7 @@ suite('TreeModel - Traits', () => {
 class DynamicModel implements _.IDataSource {
 
 	private data: any;
-	public promiseFactory: { (): Thenable<any>; } | null;
+	public promiseFactory: { (): Promise<any>; } | null;
 
 	private _onGetChildren = new Emitter<any>();
 	readonly onGetChildren: Event<any> = this._onGetChildren.event;
@@ -1124,7 +1124,7 @@ class DynamicModel implements _.IDataSource {
 		return !!this.data[element];
 	}
 
-	public getChildren(tree, element): Thenable<any> {
+	public getChildren(tree, element): Promise<any> {
 		this._onGetChildren.fire(element);
 		var result = this.promiseFactory ? this.promiseFactory() : Promise.resolve(null);
 		return result.then(() => {
@@ -1133,7 +1133,7 @@ class DynamicModel implements _.IDataSource {
 		});
 	}
 
-	public getParent(tree, element): Thenable<any> {
+	public getParent(tree, element): Promise<any> {
 		throw new Error('Not implemented');
 	}
 }
@@ -1529,7 +1529,7 @@ suite('TreeModel - Dynamic data model', () => {
 			// delay expansions and refreshes
 			dataModel.promiseFactory = () => { return timeout(0); };
 
-			var promises: Thenable<any>[] = [];
+			var promises: Promise<any>[] = [];
 
 			promises.push(model.expand('father'));
 			dataModel.removeChild('root', 'father');
@@ -1573,7 +1573,7 @@ suite('TreeModel - bugs', () => {
 					if (e === 'bart') { return getBartChildren(); }
 					return Promise.resolve([]);
 				},
-				getParent: (_, e): Thenable<any> => { throw new Error('not implemented'); },
+				getParent: (_, e): Promise<any> => { throw new Error('not implemented'); },
 			}
 		});
 
diff --git a/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts b/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts
index 96dfbbd5b44..fb37d930de1 100644
--- a/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts
+++ b/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts
@@ -55,7 +55,7 @@ suite('AsyncDataTree', function () {
 			hasChildren(element: Element | null): boolean {
 				return !element || (element.children && element.children.length > 0);
 			}
-			getChildren(element: Element | null): Thenable<Element[]> {
+			getChildren(element: Element | null): Promise<Element[]> {
 				if (!element) {
 					return Promise.resolve(root.children);
 				}
diff --git a/src/vs/base/test/common/async.test.ts b/src/vs/base/test/common/async.test.ts
index a18872a82b7..76257d43640 100644
--- a/src/vs/base/test/common/async.test.ts
+++ b/src/vs/base/test/common/async.test.ts
@@ -140,7 +140,7 @@ suite('Async', () => {
 
 		let throttler = new async.Throttler();
 
-		let promises: Thenable<any>[] = [];
+		let promises: Promise<any>[] = [];
 
 		promises.push(throttler.queue(factoryFactory(1)).then((n) => { assert.equal(n, 1); }));
 		promises.push(throttler.queue(factoryFactory(2)).then((n) => { assert.equal(n, 3); }));
@@ -156,7 +156,7 @@ suite('Async', () => {
 		};
 
 		let delayer = new async.Delayer(0);
-		let promises: Thenable<any>[] = [];
+		let promises: Promise<any>[] = [];
 
 		assert(!delayer.isTriggered());
 
@@ -204,7 +204,7 @@ suite('Async', () => {
 		};
 
 		let delayer = new async.Delayer(0);
-		let promises: Thenable<any>[] = [];
+		let promises: Promise<any>[] = [];
 
 		assert(!delayer.isTriggered());
 
@@ -231,7 +231,7 @@ suite('Async', () => {
 		};
 
 		let delayer = new async.Delayer(0);
-		let promises: Thenable<any>[] = [];
+		let promises: Promise<any>[] = [];
 
 		assert(!delayer.isTriggered());
 
@@ -281,7 +281,7 @@ suite('Async', () => {
 		};
 
 		let delayer = new async.Delayer(0);
-		let promises: Thenable<any>[] = [];
+		let promises: Promise<any>[] = [];
 
 		assert(!delayer.isTriggered());
 
@@ -326,7 +326,7 @@ suite('Async', () => {
 
 		let limiter = new async.Limiter(1);
 
-		let promises: Thenable<any>[] = [];
+		let promises: Promise<any>[] = [];
 		[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n))));
 
 		return Promise.all(promises).then((res) => {
@@ -347,7 +347,7 @@ suite('Async', () => {
 		let factoryFactory = (n: number) => () => async.timeout(0).then(() => n);
 
 		let limiter = new async.Limiter(1);
-		let promises: Thenable<any>[] = [];
+		let promises: Promise<any>[] = [];
 		[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n))));
 
 		return Promise.all(promises).then((res) => {
@@ -374,7 +374,7 @@ suite('Async', () => {
 
 		let limiter = new async.Limiter(5);
 
-		let promises: Thenable<any>[] = [];
+		let promises: Promise<any>[] = [];
 		[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n))));
 
 		return Promise.all(promises).then((res) => {
diff --git a/src/vs/base/test/common/event.test.ts b/src/vs/base/test/common/event.test.ts
index 69522e2b2a2..186f3112ff7 100644
--- a/src/vs/base/test/common/event.test.ts
+++ b/src/vs/base/test/common/event.test.ts
@@ -254,7 +254,7 @@ suite('AsyncEmitter', function () {
 		emitter.fireAsync(thenables => ({
 			foo: true,
 			bar: 1,
-			waitUntil(t: Thenable<void>) { thenables.push(t); }
+			waitUntil(t: Promise<void>) { thenables.push(t); }
 		}));
 		emitter.dispose();
 	});
diff --git a/src/vs/base/test/common/paging.test.ts b/src/vs/base/test/common/paging.test.ts
index fe332c0bd31..3ce69663384 100644
--- a/src/vs/base/test/common/paging.test.ts
+++ b/src/vs/base/test/common/paging.test.ts
@@ -8,7 +8,7 @@ import { IPager, PagedModel } from 'vs/base/common/paging';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { isPromiseCanceledError, canceled } from 'vs/base/common/errors';
 
-function getPage(pageIndex: number, cancellationToken: CancellationToken): Thenable<number[]> {
+function getPage(pageIndex: number, cancellationToken: CancellationToken): Promise<number[]> {
 	if (cancellationToken.isCancellationRequested) {
 		return Promise.reject(canceled());
 	}
@@ -21,9 +21,9 @@ class TestPager implements IPager<number> {
 	readonly firstPage = [0, 1, 2, 3, 4];
 	readonly pageSize = 5;
 	readonly total = 100;
-	readonly getPage: (pageIndex: number, cancellationToken: CancellationToken) => Thenable<number[]>;
+	readonly getPage: (pageIndex: number, cancellationToken: CancellationToken) => Promise<number[]>;
 
-	constructor(getPageFn?: (pageIndex: number, cancellationToken: CancellationToken) => Thenable<number[]>) {
+	constructor(getPageFn?: (pageIndex: number, cancellationToken: CancellationToken) => Promise<number[]>) {
 		this.getPage = getPageFn || getPage;
 	}
 }
diff --git a/src/vs/base/test/common/utils.ts b/src/vs/base/test/common/utils.ts
index dae0e054b00..63e4393926b 100644
--- a/src/vs/base/test/common/utils.ts
+++ b/src/vs/base/test/common/utils.ts
@@ -7,7 +7,7 @@ import * as paths from 'vs/base/common/paths';
 import { URI } from 'vs/base/common/uri';
 import { canceled } from 'vs/base/common/errors';
 
-export type ValueCallback<T = any> = (value: T | Thenable<T>) => void;
+export type ValueCallback<T = any> = (value: T | Promise<T>) => void;
 
 export class DeferredPromise<T> {
 
diff --git a/src/vs/base/test/node/utils.ts b/src/vs/base/test/node/utils.ts
index 2ee7de39d71..9bc3a59a16d 100644
--- a/src/vs/base/test/node/utils.ts
+++ b/src/vs/base/test/node/utils.ts
@@ -10,10 +10,10 @@ import { mkdirp, del } from 'vs/base/node/pfs';
 
 export interface ITestFileResult {
 	testFile: string;
-	cleanUp: () => Thenable<void>;
+	cleanUp: () => Promise<void>;
 }
 
-export function testFile(folder: string, file: string): Thenable<ITestFileResult> {
+export function testFile(folder: string, file: string): Promise<ITestFileResult> {
 	const id = generateUuid();
 	const parentDir = join(tmpdir(), 'vsctests', id);
 	const newDir = join(parentDir, 'config', id);
diff --git a/src/vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner.ts b/src/vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner.ts
index 3f14814bdee..931eeab83fd 100644
--- a/src/vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner.ts
+++ b/src/vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner.ts
@@ -47,7 +47,7 @@ export class NodeCachedDataCleaner {
 			readdir(nodeCachedDataRootDir).then(entries => {
 
 				const now = Date.now();
-				const deletes: Thenable<any>[] = [];
+				const deletes: Promise<any>[] = [];
 
 				entries.forEach(entry => {
 					// name check
diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
index 457818a9755..fb0305ca329 100644
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
@@ -149,8 +149,8 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
 	});
 }
 
-function setupIPC(hook: string): Thenable<Server> {
-	function setup(retry: boolean): Thenable<Server> {
+function setupIPC(hook: string): Promise<Server> {
+	function setup(retry: boolean): Promise<Server> {
 		return serve(hook).then(null, err => {
 			if (!retry || platform.isWindows || err.code !== 'EADDRINUSE') {
 				return Promise.reject(err);
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 363b6cb1220..b25ad242115 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -84,7 +84,7 @@ export class CodeApplication extends Disposable {
 	private electronIpcServer: ElectronIPCServer;
 
 	private sharedProcess: SharedProcess;
-	private sharedProcessClient: Thenable<Client>;
+	private sharedProcessClient: Promise<Client>;
 
 	constructor(
 		private mainIpcServer: Server,
@@ -172,7 +172,7 @@ export class CodeApplication extends Disposable {
 
 		class ActiveConnection {
 			private _authority: string;
-			private _client: Thenable<Client<RemoteAgentConnectionContext>>;
+			private _client: Promise<Client<RemoteAgentConnectionContext>>;
 			private _disposeRunner: RunOnceScheduler;
 
 			constructor(authority: string, host: string, port: number) {
@@ -189,7 +189,7 @@ export class CodeApplication extends Disposable {
 				});
 			}
 
-			public getClient(): Thenable<Client<RemoteAgentConnectionContext>> {
+			public getClient(): Promise<Client<RemoteAgentConnectionContext>> {
 				this._disposeRunner.schedule();
 				return this._client;
 			}
@@ -381,7 +381,7 @@ export class CodeApplication extends Disposable {
 		}
 	}
 
-	startup(): Thenable<void> {
+	startup(): Promise<void> {
 		this.logService.debug('Starting VS Code');
 		this.logService.debug(`from: ${this.environmentService.appRoot}`);
 		this.logService.debug('args:', this.environmentService.args);
@@ -456,7 +456,7 @@ export class CodeApplication extends Disposable {
 		}
 	}
 
-	private resolveMachineId(): string | Thenable<string> {
+	private resolveMachineId(): string | Promise<string> {
 		const machineId = this.stateService.getItem<string>(CodeApplication.MACHINE_ID_KEY);
 		if (machineId) {
 			return machineId;
@@ -504,7 +504,7 @@ export class CodeApplication extends Disposable {
 		});
 	}
 
-	private initServices(machineId: string): Thenable<IInstantiationService> {
+	private initServices(machineId: string): Promise<IInstantiationService> {
 		const services = new ServiceCollection();
 
 		if (process.platform === 'win32') {
@@ -544,7 +544,7 @@ export class CodeApplication extends Disposable {
 		return appInstantiationService.invokeFunction(accessor => this.initStorageService(accessor)).then(() => appInstantiationService);
 	}
 
-	private initStorageService(accessor: ServicesAccessor): Thenable<void> {
+	private initStorageService(accessor: ServicesAccessor): Promise<void> {
 		const storageMainService = accessor.get(IStorageMainService) as StorageMainService;
 
 		// Ensure to close storage on shutdown
@@ -644,7 +644,7 @@ export class CodeApplication extends Disposable {
 			const environmentService = accessor.get(IEnvironmentService);
 
 			urlService.registerHandler({
-				handleURL(uri: URI): Thenable<boolean> {
+				handleURL(uri: URI): Promise<boolean> {
 					if (windowsMainService.getWindowCount() === 0) {
 						const cli = { ...environmentService.args, goto: true };
 						const [window] = windowsMainService.open({ context: OpenContext.API, cli, forceEmpty: true });
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index 62183f13f3e..822428ee28d 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -88,7 +88,7 @@ async function cleanupOlderLogs(environmentService: EnvironmentService): Promise
 	await Promise.all(toDelete.map(name => rimraf(path.join(logsRoot, name))));
 }
 
-function createPaths(environmentService: IEnvironmentService): Thenable<any> {
+function createPaths(environmentService: IEnvironmentService): Promise<any> {
 	const paths = [
 		environmentService.extensionsPath,
 		environmentService.nodeCachedDataDir,
@@ -104,14 +104,14 @@ class ExpectedError extends Error {
 	public readonly isExpected = true;
 }
 
-function setupIPC(accessor: ServicesAccessor): Thenable<Server> {
+function setupIPC(accessor: ServicesAccessor): Promise<Server> {
 	const logService = accessor.get(ILogService);
 	const environmentService = accessor.get(IEnvironmentService);
 	const requestService = accessor.get(IRequestService);
 	const diagnosticsService = accessor.get(IDiagnosticsService);
 
-	function allowSetForegroundWindow(service: LaunchChannelClient): Thenable<void> {
-		let promise: Thenable<void> = Promise.resolve();
+	function allowSetForegroundWindow(service: LaunchChannelClient): Promise<void> {
+		let promise: Promise<void> = Promise.resolve();
 		if (platform.isWindows) {
 			promise = service.getMainProcessId()
 				.then(processId => {
@@ -129,7 +129,7 @@ function setupIPC(accessor: ServicesAccessor): Thenable<Server> {
 		return promise;
 	}
 
-	function setup(retry: boolean): Thenable<Server> {
+	function setup(retry: boolean): Promise<Server> {
 		return serve(environmentService.mainIPCHandle).then(server => {
 
 			// Print --status usage info
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
index af6af4d5dd0..e0e46e1b08f 100644
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -74,7 +74,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 	private currentConfig: IWindowConfiguration;
 	private pendingLoadConfig: IWindowConfiguration;
 
-	private marketplaceHeadersPromise: Thenable<object>;
+	private marketplaceHeadersPromise: Promise<object>;
 
 	private touchBarGroups: Electron.TouchBarSegmentedControl[];
 
@@ -277,7 +277,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		}
 	}
 
-	ready(): Thenable<ICodeWindow> {
+	ready(): Promise<ICodeWindow> {
 		return new Promise<ICodeWindow>(resolve => {
 			if (this.isReady) {
 				return resolve(this);
diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
index e7ea37b2d9f..2b769bf1c65 100644
--- a/src/vs/code/electron-main/windows.ts
+++ b/src/vs/code/electron-main/windows.ts
@@ -1488,15 +1488,15 @@ export class WindowsManager implements IWindowsMainService {
 		});
 	}
 
-	saveAndEnterWorkspace(win: ICodeWindow, path: string): Thenable<IEnterWorkspaceResult> {
+	saveAndEnterWorkspace(win: ICodeWindow, path: string): Promise<IEnterWorkspaceResult> {
 		return this.workspacesManager.saveAndEnterWorkspace(win, path).then(result => this.doEnterWorkspace(win, result));
 	}
 
-	enterWorkspace(win: ICodeWindow, path: string): Thenable<IEnterWorkspaceResult> {
+	enterWorkspace(win: ICodeWindow, path: string): Promise<IEnterWorkspaceResult> {
 		return this.workspacesManager.enterWorkspace(win, path).then(result => this.doEnterWorkspace(win, result));
 	}
 
-	createAndEnterWorkspace(win: ICodeWindow, folders?: IWorkspaceFolderCreationData[], path?: string): Thenable<IEnterWorkspaceResult> {
+	createAndEnterWorkspace(win: ICodeWindow, folders?: IWorkspaceFolderCreationData[], path?: string): Promise<IEnterWorkspaceResult> {
 		return this.workspacesManager.createAndEnterWorkspace(win, folders, path).then(result => this.doEnterWorkspace(win, result));
 	}
 
@@ -1585,7 +1585,7 @@ export class WindowsManager implements IWindowsMainService {
 		return this.open({ context, cli: this.environmentService.args, forceNewTabbedWindow: true, forceEmpty: true });
 	}
 
-	waitForWindowCloseOrLoad(windowId: number): Thenable<void> {
+	waitForWindowCloseOrLoad(windowId: number): Promise<void> {
 		return new Promise<void>(resolve => {
 			function handler(id: number) {
 				if (id === windowId) {
@@ -1773,15 +1773,15 @@ export class WindowsManager implements IWindowsMainService {
 		this.dialogs.pickAndOpen(internalOptions);
 	}
 
-	showMessageBox(options: Electron.MessageBoxOptions, win?: ICodeWindow): Thenable<IMessageBoxResult> {
+	showMessageBox(options: Electron.MessageBoxOptions, win?: ICodeWindow): Promise<IMessageBoxResult> {
 		return this.dialogs.showMessageBox(options, win);
 	}
 
-	showSaveDialog(options: Electron.SaveDialogOptions, win?: ICodeWindow): Thenable<string> {
+	showSaveDialog(options: Electron.SaveDialogOptions, win?: ICodeWindow): Promise<string> {
 		return this.dialogs.showSaveDialog(options, win);
 	}
 
-	showOpenDialog(options: Electron.OpenDialogOptions, win?: ICodeWindow): Thenable<string[]> {
+	showOpenDialog(options: Electron.OpenDialogOptions, win?: ICodeWindow): Promise<string[]> {
 		return this.dialogs.showOpenDialog(options, win);
 	}
 
@@ -1852,7 +1852,7 @@ class Dialogs {
 		});
 	}
 
-	private getFileOrFolderUris(options: IInternalNativeOpenDialogOptions): Thenable<URI[]> {
+	private getFileOrFolderUris(options: IInternalNativeOpenDialogOptions): Promise<URI[]> {
 
 		// Ensure dialog options
 		if (!options.dialogOptions) {
@@ -1911,7 +1911,7 @@ class Dialogs {
 		return windowDialogQueue;
 	}
 
-	showMessageBox(options: Electron.MessageBoxOptions, window?: ICodeWindow): Thenable<IMessageBoxResult> {
+	showMessageBox(options: Electron.MessageBoxOptions, window?: ICodeWindow): Promise<IMessageBoxResult> {
 		return this.getDialogQueue(window).queue(() => {
 			return new Promise(resolve => {
 				dialog.showMessageBox(window ? window.win : void 0, options, (response: number, checkboxChecked: boolean) => {
@@ -1921,7 +1921,7 @@ class Dialogs {
 		});
 	}
 
-	showSaveDialog(options: Electron.SaveDialogOptions, window?: ICodeWindow): Thenable<string> {
+	showSaveDialog(options: Electron.SaveDialogOptions, window?: ICodeWindow): Promise<string> {
 
 		function normalizePath(path: string): string {
 			if (path && isMacintosh) {
@@ -1940,7 +1940,7 @@ class Dialogs {
 		});
 	}
 
-	showOpenDialog(options: Electron.OpenDialogOptions, window?: ICodeWindow): Thenable<string[]> {
+	showOpenDialog(options: Electron.OpenDialogOptions, window?: ICodeWindow): Promise<string[]> {
 
 		function normalizePaths(paths: string[]): string[] {
 			if (paths && paths.length > 0 && isMacintosh) {
@@ -1984,7 +1984,7 @@ class WorkspacesManager {
 	) {
 	}
 
-	saveAndEnterWorkspace(window: ICodeWindow, path: string): Thenable<IEnterWorkspaceResult> {
+	saveAndEnterWorkspace(window: ICodeWindow, path: string): Promise<IEnterWorkspaceResult> {
 		if (!window || !window.win || !window.isReady || !window.openedWorkspace || !path || !this.isValidTargetWorkspacePath(window, path)) {
 			return Promise.resolve(null); // return early if the window is not ready or disposed or does not have a workspace
 		}
@@ -1992,7 +1992,7 @@ class WorkspacesManager {
 		return this.doSaveAndOpenWorkspace(window, window.openedWorkspace, path);
 	}
 
-	enterWorkspace(window: ICodeWindow, path: string): Thenable<IEnterWorkspaceResult> {
+	enterWorkspace(window: ICodeWindow, path: string): Promise<IEnterWorkspaceResult> {
 		if (!window || !window.win || !window.isReady) {
 			return Promise.resolve(null); // return early if the window is not ready or disposed
 		}
@@ -2009,7 +2009,7 @@ class WorkspacesManager {
 
 	}
 
-	createAndEnterWorkspace(window: ICodeWindow, folders?: IWorkspaceFolderCreationData[], path?: string): Thenable<IEnterWorkspaceResult> {
+	createAndEnterWorkspace(window: ICodeWindow, folders?: IWorkspaceFolderCreationData[], path?: string): Promise<IEnterWorkspaceResult> {
 		if (!window || !window.win || !window.isReady) {
 			return Promise.resolve(null); // return early if the window is not ready or disposed
 		}
@@ -2026,7 +2026,7 @@ class WorkspacesManager {
 
 	}
 
-	private isValidTargetWorkspacePath(window: ICodeWindow, path?: string): Thenable<boolean> {
+	private isValidTargetWorkspacePath(window: ICodeWindow, path?: string): Promise<boolean> {
 		if (!path) {
 			return Promise.resolve(true);
 		}
@@ -2052,8 +2052,8 @@ class WorkspacesManager {
 		return Promise.resolve(true); // OK
 	}
 
-	private doSaveAndOpenWorkspace(window: ICodeWindow, workspace: IWorkspaceIdentifier, path?: string): Thenable<IEnterWorkspaceResult> {
-		let savePromise: Thenable<IWorkspaceIdentifier>;
+	private doSaveAndOpenWorkspace(window: ICodeWindow, workspace: IWorkspaceIdentifier, path?: string): Promise<IEnterWorkspaceResult> {
+		let savePromise: Promise<IWorkspaceIdentifier>;
 		if (path) {
 			savePromise = this.workspacesMainService.saveWorkspace(workspace, path);
 		} else {
@@ -2098,7 +2098,7 @@ class WorkspacesManager {
 		});
 	}
 
-	promptToSaveUntitledWorkspace(window: ICodeWindow, workspace: IWorkspaceIdentifier): Thenable<boolean> {
+	promptToSaveUntitledWorkspace(window: ICodeWindow, workspace: IWorkspaceIdentifier): Promise<boolean> {
 		enum ConfirmResult {
 			SAVE,
 			DONT_SAVE,
diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
index 9154f6813e6..fdf5f292fe1 100644
--- a/src/vs/code/node/cli.ts
+++ b/src/vs/code/node/cli.ts
@@ -29,7 +29,7 @@ function shouldSpawnCliProcess(argv: ParsedArgs): boolean {
 }
 
 interface IMainCli {
-	main: (argv: ParsedArgs) => Thenable<void>;
+	main: (argv: ParsedArgs) => Promise<void>;
 }
 
 export async function main(argv: string[]): Promise<any> {
@@ -121,7 +121,7 @@ export async function main(argv: string[]): Promise<any> {
 
 		delete env['ELECTRON_RUN_AS_NODE'];
 
-		const processCallbacks: ((child: ChildProcess) => Thenable<any>)[] = [];
+		const processCallbacks: ((child: ChildProcess) => Promise<any>)[] = [];
 
 		const verbose = args.verbose || args.status || typeof args['upload-logs'] !== 'undefined';
 		if (verbose) {
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index 8df36e47959..67fe22445f5 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -62,7 +62,7 @@ export function getIdAndVersion(id: string): [string, string] {
 }
 
 
-type Task = { (): Thenable<void> };
+type Task = { (): Promise<void> };
 
 class Main {
 
@@ -205,7 +205,7 @@ class Main {
 		}
 	}
 
-	private uninstallExtension(extensions: string[]): Thenable<any> {
+	private uninstallExtension(extensions: string[]): Promise<any> {
 		async function getExtensionId(extensionDescription: string): Promise<string> {
 			if (!/\.vsix$/i.test(extensionDescription)) {
 				return extensionDescription;
diff --git a/src/vs/editor/browser/editorExtensions.ts b/src/vs/editor/browser/editorExtensions.ts
index 40a1ff7bbb9..20cdbad8f5c 100644
--- a/src/vs/editor/browser/editorExtensions.ts
+++ b/src/vs/editor/browser/editorExtensions.ts
@@ -108,7 +108,7 @@ export abstract class Command {
 		}
 	}
 
-	public abstract runCommand(accessor: ServicesAccessor, args: any): void | Thenable<void>;
+	public abstract runCommand(accessor: ServicesAccessor, args: any): void | Promise<void>;
 }
 
 //#endregion Command
@@ -145,7 +145,7 @@ export abstract class EditorCommand extends Command {
 		};
 	}
 
-	public runCommand(accessor: ServicesAccessor, args: any): void | Thenable<void> {
+	public runCommand(accessor: ServicesAccessor, args: any): void | Promise<void> {
 		const codeEditorService = accessor.get(ICodeEditorService);
 
 		// Find the editor with text focus or active
@@ -166,7 +166,7 @@ export abstract class EditorCommand extends Command {
 		});
 	}
 
-	public abstract runEditorCommand(accessor: ServicesAccessor | null, editor: ICodeEditor, args: any): void | Thenable<void>;
+	public abstract runEditorCommand(accessor: ServicesAccessor | null, editor: ICodeEditor, args: any): void | Promise<void>;
 }
 
 //#endregion EditorCommand
@@ -213,7 +213,7 @@ export abstract class EditorAction extends EditorCommand {
 		super.register();
 	}
 
-	public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void | Thenable<void> {
+	public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void | Promise<void> {
 		this.reportTelemetry(accessor, editor);
 		return this.run(accessor, editor, args || {});
 	}
@@ -231,7 +231,7 @@ export abstract class EditorAction extends EditorCommand {
 		accessor.get(ITelemetryService).publicLog('editorActionInvoked', { name: this.label, id: this.id, ...editor.getTelemetryData() });
 	}
 
-	public abstract run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void | Thenable<void>;
+	public abstract run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void | Promise<void>;
 }
 
 //#endregion EditorAction
diff --git a/src/vs/editor/browser/services/abstractCodeEditorService.ts b/src/vs/editor/browser/services/abstractCodeEditorService.ts
index 7c8eabb46dd..8ca0f1ce5c9 100644
--- a/src/vs/editor/browser/services/abstractCodeEditorService.ts
+++ b/src/vs/editor/browser/services/abstractCodeEditorService.ts
@@ -126,7 +126,7 @@ export abstract class AbstractCodeEditorService extends Disposable implements IC
 	}
 
 	abstract getActiveCodeEditor(): ICodeEditor | null;
-	abstract openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Thenable<ICodeEditor | null>;
+	abstract openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null>;
 }
 
 export class ModelTransientSettingWatcher {
diff --git a/src/vs/editor/browser/services/codeEditorService.ts b/src/vs/editor/browser/services/codeEditorService.ts
index 914a77ae3b3..68f4c24fc6e 100644
--- a/src/vs/editor/browser/services/codeEditorService.ts
+++ b/src/vs/editor/browser/services/codeEditorService.ts
@@ -45,5 +45,5 @@ export interface ICodeEditorService {
 	getTransientModelProperty(model: ITextModel, key: string): any;
 
 	getActiveCodeEditor(): ICodeEditor | null;
-	openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Thenable<ICodeEditor | null>;
+	openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null>;
 }
diff --git a/src/vs/editor/browser/services/codeEditorServiceImpl.ts b/src/vs/editor/browser/services/codeEditorServiceImpl.ts
index b490643881b..a4cccb9e658 100644
--- a/src/vs/editor/browser/services/codeEditorServiceImpl.ts
+++ b/src/vs/editor/browser/services/codeEditorServiceImpl.ts
@@ -67,7 +67,7 @@ export abstract class CodeEditorServiceImpl extends AbstractCodeEditorService {
 	}
 
 	abstract getActiveCodeEditor(): ICodeEditor | null;
-	abstract openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Thenable<ICodeEditor | null>;
+	abstract openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null>;
 }
 
 interface IModelDecorationOptionsProvider extends IDisposable {
diff --git a/src/vs/editor/browser/services/openerService.ts b/src/vs/editor/browser/services/openerService.ts
index 4d73c2bfc4f..f2b0f9f9ed6 100644
--- a/src/vs/editor/browser/services/openerService.ts
+++ b/src/vs/editor/browser/services/openerService.ts
@@ -39,7 +39,7 @@ export class OpenerService implements IOpenerService {
 		}
 
 		const { scheme, path, query, fragment } = resource;
-		let promise: Thenable<any> | undefined = undefined;
+		let promise: Promise<any> | undefined = undefined;
 
 		if (scheme === Schemas.http || scheme === Schemas.https || scheme === Schemas.mailto) {
 			// open http or default mail application
diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts
index 010cc950d8e..081927c1d8f 100644
--- a/src/vs/editor/common/modes.ts
+++ b/src/vs/editor/common/modes.ts
@@ -221,7 +221,7 @@ export interface IState {
  * to that type `T`. In addition, `null` and `undefined` can be returned - either directly or from a
  * thenable.
  */
-export type ProviderResult<T> = T | undefined | null | Thenable<T | undefined | null>;
+export type ProviderResult<T> = T | undefined | null | Promise<T | undefined | null>;
 
 /**
  * A hover represents additional information for a symbol or word. Hovers are
@@ -1405,7 +1405,7 @@ export interface ITokenizationRegistry {
 	/**
 	 * Register a promise for a tokenization support.
 	 */
-	registerPromise(language: string, promise: Thenable<ITokenizationSupport>): Thenable<IDisposable>;
+	registerPromise(language: string, promise: Promise<ITokenizationSupport>): Promise<IDisposable>;
 
 	/**
 	 * Get the tokenization support for a language.
@@ -1417,7 +1417,7 @@ export interface ITokenizationRegistry {
 	 * Get the promise of a tokenization support for a language.
 	 * `null` is returned if no support is available and no promise for the support has been registered yet.
 	 */
-	getPromise(language: string): Thenable<ITokenizationSupport> | null;
+	getPromise(language: string): Promise<ITokenizationSupport> | null;
 
 	/**
 	 * Set the new color map that all tokens will use in their ColorId binary encoded bits for foreground and background.
diff --git a/src/vs/editor/common/modes/tokenizationRegistry.ts b/src/vs/editor/common/modes/tokenizationRegistry.ts
index 7282be4a653..beef379fcc9 100644
--- a/src/vs/editor/common/modes/tokenizationRegistry.ts
+++ b/src/vs/editor/common/modes/tokenizationRegistry.ts
@@ -11,7 +11,7 @@ import { ColorId, ITokenizationRegistry, ITokenizationSupport, ITokenizationSupp
 export class TokenizationRegistryImpl implements ITokenizationRegistry {
 
 	private _map: { [language: string]: ITokenizationSupport };
-	private _promises: { [language: string]: Thenable<IDisposable> };
+	private _promises: { [language: string]: Promise<IDisposable> };
 
 	private readonly _onDidChange: Emitter<ITokenizationSupportChangedEvent> = new Emitter<ITokenizationSupportChangedEvent>();
 	public readonly onDidChange: Event<ITokenizationSupportChangedEvent> = this._onDidChange.event;
@@ -43,7 +43,7 @@ export class TokenizationRegistryImpl implements ITokenizationRegistry {
 		});
 	}
 
-	public registerPromise(language: string, supportPromise: Thenable<ITokenizationSupport | null>): Thenable<IDisposable> {
+	public registerPromise(language: string, supportPromise: Promise<ITokenizationSupport | null>): Promise<IDisposable> {
 		const promise = this._promises[language] = supportPromise.then(support => {
 			delete this._promises[language];
 			if (support) {
@@ -55,7 +55,7 @@ export class TokenizationRegistryImpl implements ITokenizationRegistry {
 		return promise;
 	}
 
-	public getPromise(language: string): Thenable<ITokenizationSupport> | null {
+	public getPromise(language: string): Promise<ITokenizationSupport> | null {
 		const support = this.get(language);
 		if (support) {
 			return Promise.resolve(support);
diff --git a/src/vs/editor/common/services/resolverService.ts b/src/vs/editor/common/services/resolverService.ts
index 4793776643e..43fa6cf2160 100644
--- a/src/vs/editor/common/services/resolverService.ts
+++ b/src/vs/editor/common/services/resolverService.ts
@@ -18,7 +18,7 @@ export interface ITextModelService {
 	 * Provided a resource URI, it will return a model reference
 	 * which should be disposed once not needed anymore.
 	 */
-	createModelReference(resource: URI): Thenable<IReference<ITextEditorModel>>;
+	createModelReference(resource: URI): Promise<IReference<ITextEditorModel>>;
 
 	/**
 	 * Registers a specific `scheme` content provider.
@@ -31,7 +31,7 @@ export interface ITextModelContentProvider {
 	/**
 	 * Given a resource, return the content of the resource as `ITextModel`.
 	 */
-	provideTextContent(resource: URI): Thenable<ITextModel>;
+	provideTextContent(resource: URI): Promise<ITextModel>;
 }
 
 export interface ITextEditorModel extends IEditorModel {
diff --git a/src/vs/editor/contrib/codeAction/codeActionCommands.ts b/src/vs/editor/contrib/codeAction/codeActionCommands.ts
index 34ee776f095..96acb0aa447 100644
--- a/src/vs/editor/contrib/codeAction/codeActionCommands.ts
+++ b/src/vs/editor/contrib/codeAction/codeActionCommands.ts
@@ -128,7 +128,7 @@ export class QuickFixController implements IEditorContribution {
 		}
 	}
 
-	public triggerFromEditorSelection(filter?: CodeActionFilter, autoApply?: CodeActionAutoApply): Thenable<CodeAction[] | undefined> {
+	public triggerFromEditorSelection(filter?: CodeActionFilter, autoApply?: CodeActionAutoApply): Promise<CodeAction[] | undefined> {
 		return this._model.trigger({ type: 'manual', filter, autoApply });
 	}
 
diff --git a/src/vs/editor/contrib/codeAction/codeActionModel.ts b/src/vs/editor/contrib/codeAction/codeActionModel.ts
index 3c4c4b90cd0..84d29a8949f 100644
--- a/src/vs/editor/contrib/codeAction/codeActionModel.ts
+++ b/src/vs/editor/contrib/codeAction/codeActionModel.ts
@@ -112,7 +112,7 @@ export class CodeActionOracle {
 		return selection ? selection : undefined;
 	}
 
-	private _createEventAndSignalChange(trigger: CodeActionTrigger, selection: Selection | undefined): Thenable<CodeAction[] | undefined> {
+	private _createEventAndSignalChange(trigger: CodeActionTrigger, selection: Selection | undefined): Promise<CodeAction[] | undefined> {
 		if (!selection) {
 			// cancel
 			this._signalChange({
@@ -221,7 +221,7 @@ export class CodeActionModel {
 		}
 	}
 
-	trigger(trigger: CodeActionTrigger): Thenable<CodeAction[] | undefined> {
+	trigger(trigger: CodeActionTrigger): Promise<CodeAction[] | undefined> {
 		if (this._codeActionOracle) {
 			return this._codeActionOracle.trigger(trigger);
 		}
diff --git a/src/vs/editor/contrib/codeAction/codeActionWidget.ts b/src/vs/editor/contrib/codeAction/codeActionWidget.ts
index a4af30a6584..04c1bb3eda1 100644
--- a/src/vs/editor/contrib/codeAction/codeActionWidget.ts
+++ b/src/vs/editor/contrib/codeAction/codeActionWidget.ts
@@ -27,7 +27,7 @@ export class CodeActionContextMenu {
 		private readonly _onApplyCodeAction: (action: CodeAction) => Promise<any>
 	) { }
 
-	show(fixes: Thenable<CodeAction[]>, at: { x: number; y: number } | Position) {
+	show(fixes: Promise<CodeAction[]>, at: { x: number; y: number } | Position) {
 
 		const actionsPromise = fixes ? fixes.then(value => {
 			return value.map(action => {
diff --git a/src/vs/editor/contrib/codelens/codelens.ts b/src/vs/editor/contrib/codelens/codelens.ts
index 6dccdfd1375..30468bf74a1 100644
--- a/src/vs/editor/contrib/codelens/codelens.ts
+++ b/src/vs/editor/contrib/codelens/codelens.ts
@@ -68,7 +68,7 @@ registerLanguageCommand('_executeCodeLensProvider', function (accessor, args) {
 	const result: ICodeLensSymbol[] = [];
 	return getCodeLensData(model, CancellationToken.None).then(value => {
 
-		let resolve: Thenable<any>[] = [];
+		let resolve: Promise<any>[] = [];
 
 		for (const item of value) {
 			if (typeof itemResolveCount === 'undefined' || Boolean(item.symbol.command)) {
diff --git a/src/vs/editor/contrib/folding/folding.ts b/src/vs/editor/contrib/folding/folding.ts
index 5035b697113..698296e20c7 100644
--- a/src/vs/editor/contrib/folding/folding.ts
+++ b/src/vs/editor/contrib/folding/folding.ts
@@ -36,7 +36,7 @@ export const ID = 'editor.contrib.folding';
 
 export interface RangeProvider {
 	readonly id: string;
-	compute(cancelationToken: CancellationToken): Thenable<FoldingRegions | null>;
+	compute(cancelationToken: CancellationToken): Promise<FoldingRegions | null>;
 	dispose(): void;
 }
 
@@ -70,7 +70,7 @@ export class FoldingController implements IEditorContribution {
 
 	private foldingStateMemento: FoldingStateMemento | null;
 
-	private foldingModelPromise: Thenable<FoldingModel | null> | null;
+	private foldingModelPromise: Promise<FoldingModel | null> | null;
 	private updateScheduler: Delayer<FoldingModel | null> | null;
 
 	private globalToDispose: IDisposable[];
@@ -432,7 +432,7 @@ abstract class FoldingAction<T> extends EditorAction {
 
 	abstract invoke(foldingController: FoldingController, foldingModel: FoldingModel, editor: ICodeEditor, args: T): void;
 
-	public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, args: T): void | Thenable<void> {
+	public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, args: T): void | Promise<void> {
 		let foldingController = FoldingController.get(editor);
 		if (!foldingController) {
 			return;
diff --git a/src/vs/editor/contrib/folding/indentRangeProvider.ts b/src/vs/editor/contrib/folding/indentRangeProvider.ts
index 3804acfeee6..886dcbb6bab 100644
--- a/src/vs/editor/contrib/folding/indentRangeProvider.ts
+++ b/src/vs/editor/contrib/folding/indentRangeProvider.ts
@@ -26,7 +26,7 @@ export class IndentRangeProvider implements RangeProvider {
 	dispose() {
 	}
 
-	compute(cancelationToken: CancellationToken): Thenable<FoldingRegions> {
+	compute(cancelationToken: CancellationToken): Promise<FoldingRegions> {
 		let foldingRules = LanguageConfigurationRegistry.getFoldingRules(this.editorModel.getLanguageIdentifier().id);
 		let offSide = foldingRules && !!foldingRules.offSide;
 		let markers = foldingRules && foldingRules.markers;
diff --git a/src/vs/editor/contrib/folding/intializingRangeProvider.ts b/src/vs/editor/contrib/folding/intializingRangeProvider.ts
index 02d411a3490..a783ffa9755 100644
--- a/src/vs/editor/contrib/folding/intializingRangeProvider.ts
+++ b/src/vs/editor/contrib/folding/intializingRangeProvider.ts
@@ -48,7 +48,7 @@ export class InitializingRangeProvider implements RangeProvider {
 		}
 	}
 
-	compute(cancelationToken: CancellationToken): Thenable<FoldingRegions> {
+	compute(cancelationToken: CancellationToken): Promise<FoldingRegions> {
 		let foldingRangeData: IFoldingRangeData[] = [];
 		if (this.decorationIds) {
 			for (let id of this.decorationIds) {
diff --git a/src/vs/editor/contrib/folding/syntaxRangeProvider.ts b/src/vs/editor/contrib/folding/syntaxRangeProvider.ts
index 5d7c1b28a27..dc9f10ba2f1 100644
--- a/src/vs/editor/contrib/folding/syntaxRangeProvider.ts
+++ b/src/vs/editor/contrib/folding/syntaxRangeProvider.ts
@@ -28,7 +28,7 @@ export class SyntaxRangeProvider implements RangeProvider {
 	constructor(private editorModel: ITextModel, private providers: FoldingRangeProvider[], private limit = MAX_FOLDING_REGIONS) {
 	}
 
-	compute(cancellationToken: CancellationToken): Thenable<FoldingRegions | null> {
+	compute(cancellationToken: CancellationToken): Promise<FoldingRegions | null> {
 		return collectSyntaxRanges(this.providers, this.editorModel, cancellationToken).then(ranges => {
 			if (ranges) {
 				let res = sanitizeRanges(ranges, this.limit);
@@ -43,7 +43,7 @@ export class SyntaxRangeProvider implements RangeProvider {
 
 }
 
-function collectSyntaxRanges(providers: FoldingRangeProvider[], model: ITextModel, cancellationToken: CancellationToken): Thenable<IFoldingRangeData[] | null> {
+function collectSyntaxRanges(providers: FoldingRangeProvider[], model: ITextModel, cancellationToken: CancellationToken): Promise<IFoldingRangeData[] | null> {
 	let rangeData: IFoldingRangeData[] | null = null;
 	let promises = providers.map((provider, i) => {
 		return Promise.resolve(provider.provideFoldingRanges(model, foldingContext, cancellationToken)).then(ranges => {
diff --git a/src/vs/editor/contrib/goToDefinition/goToDefinition.ts b/src/vs/editor/contrib/goToDefinition/goToDefinition.ts
index 28b14740ec9..4866a02f2b8 100644
--- a/src/vs/editor/contrib/goToDefinition/goToDefinition.ts
+++ b/src/vs/editor/contrib/goToDefinition/goToDefinition.ts
@@ -17,12 +17,12 @@ function getDefinitions<T>(
 	model: ITextModel,
 	position: Position,
 	registry: LanguageFeatureRegistry<T>,
-	provide: (provider: T, model: ITextModel, position: Position) => DefinitionLink | DefinitionLink[] | null | undefined | Thenable<DefinitionLink | DefinitionLink[] | null | undefined>
-): Thenable<DefinitionLink[]> {
+	provide: (provider: T, model: ITextModel, position: Position) => DefinitionLink | DefinitionLink[] | null | undefined | Promise<DefinitionLink | DefinitionLink[] | null | undefined>
+): Promise<DefinitionLink[]> {
 	const provider = registry.ordered(model);
 
 	// get results
-	const promises = provider.map((provider): Thenable<DefinitionLink | DefinitionLink[] | null | undefined> => {
+	const promises = provider.map((provider): Promise<DefinitionLink | DefinitionLink[] | null | undefined> => {
 		return Promise.resolve(provide(provider, model, position)).then(undefined, err => {
 			onUnexpectedExternalError(err);
 			return null;
@@ -34,25 +34,25 @@ function getDefinitions<T>(
 }
 
 
-export function getDefinitionsAtPosition(model: ITextModel, position: Position, token: CancellationToken): Thenable<DefinitionLink[]> {
+export function getDefinitionsAtPosition(model: ITextModel, position: Position, token: CancellationToken): Promise<DefinitionLink[]> {
 	return getDefinitions(model, position, DefinitionProviderRegistry, (provider, model, position) => {
 		return provider.provideDefinition(model, position, token);
 	});
 }
 
-export function getDeclarationsAtPosition(model: ITextModel, position: Position, token: CancellationToken): Thenable<DefinitionLink[]> {
+export function getDeclarationsAtPosition(model: ITextModel, position: Position, token: CancellationToken): Promise<DefinitionLink[]> {
 	return getDefinitions(model, position, DeclarationProviderRegistry, (provider, model, position) => {
 		return provider.provideDeclaration(model, position, token);
 	});
 }
 
-export function getImplementationsAtPosition(model: ITextModel, position: Position, token: CancellationToken): Thenable<DefinitionLink[]> {
+export function getImplementationsAtPosition(model: ITextModel, position: Position, token: CancellationToken): Promise<DefinitionLink[]> {
 	return getDefinitions(model, position, ImplementationProviderRegistry, (provider, model, position) => {
 		return provider.provideImplementation(model, position, token);
 	});
 }
 
-export function getTypeDefinitionsAtPosition(model: ITextModel, position: Position, token: CancellationToken): Thenable<DefinitionLink[]> {
+export function getTypeDefinitionsAtPosition(model: ITextModel, position: Position, token: CancellationToken): Promise<DefinitionLink[]> {
 	return getDefinitions(model, position, TypeDefinitionProviderRegistry, (provider, model, position) => {
 		return provider.provideTypeDefinition(model, position, token);
 	});
diff --git a/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts b/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts
index aee05dc747e..36f2d0e6eb1 100644
--- a/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts
+++ b/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts
@@ -51,7 +51,7 @@ export class DefinitionAction extends EditorAction {
 		this._configuration = configuration;
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): Thenable<void> {
+	public run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
 		const notificationService = accessor.get(INotificationService);
 		const editorService = accessor.get(ICodeEditorService);
 		const progressService = accessor.get(IProgressService);
@@ -114,7 +114,7 @@ export class DefinitionAction extends EditorAction {
 		return definitionPromise;
 	}
 
-	protected _getTargetLocationForPosition(model: ITextModel, position: corePosition.Position, token: CancellationToken): Thenable<DefinitionLink[]> {
+	protected _getTargetLocationForPosition(model: ITextModel, position: corePosition.Position, token: CancellationToken): Promise<DefinitionLink[]> {
 		return getDefinitionsAtPosition(model, position, token);
 	}
 
@@ -147,7 +147,7 @@ export class DefinitionAction extends EditorAction {
 		}
 	}
 
-	private _openReference(editor: ICodeEditor, editorService: ICodeEditorService, reference: Location, sideBySide: boolean): Thenable<ICodeEditor> {
+	private _openReference(editor: ICodeEditor, editorService: ICodeEditorService, reference: Location, sideBySide: boolean): Promise<ICodeEditor> {
 		return editorService.openCodeEditor({
 			resource: reference.uri,
 			options: {
@@ -258,7 +258,7 @@ export class PeekDefinitionAction extends DefinitionAction {
 
 export class DeclarationAction extends DefinitionAction {
 
-	protected _getTargetLocationForPosition(model: ITextModel, position: corePosition.Position, token: CancellationToken): Thenable<DefinitionLink[]> {
+	protected _getTargetLocationForPosition(model: ITextModel, position: corePosition.Position, token: CancellationToken): Promise<DefinitionLink[]> {
 		return getDeclarationsAtPosition(model, position, token);
 	}
 
@@ -322,7 +322,7 @@ export class PeekDeclarationAction extends DeclarationAction {
 }
 
 export class ImplementationAction extends DefinitionAction {
-	protected _getTargetLocationForPosition(model: ITextModel, position: corePosition.Position, token: CancellationToken): Thenable<DefinitionLink[]> {
+	protected _getTargetLocationForPosition(model: ITextModel, position: corePosition.Position, token: CancellationToken): Promise<DefinitionLink[]> {
 		return getImplementationsAtPosition(model, position, token);
 	}
 
@@ -380,7 +380,7 @@ export class PeekImplementationAction extends ImplementationAction {
 }
 
 export class TypeDefinitionAction extends DefinitionAction {
-	protected _getTargetLocationForPosition(model: ITextModel, position: corePosition.Position, token: CancellationToken): Thenable<DefinitionLink[]> {
+	protected _getTargetLocationForPosition(model: ITextModel, position: corePosition.Position, token: CancellationToken): Promise<DefinitionLink[]> {
 		return getTypeDefinitionsAtPosition(model, position, token);
 	}
 
diff --git a/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.ts b/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.ts
index 7118ce9d891..3dbccd60ba0 100644
--- a/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.ts
+++ b/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.ts
@@ -281,7 +281,7 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
 			DefinitionProviderRegistry.has(this.editor.getModel());
 	}
 
-	private findDefinition(target: IMouseTarget, token: CancellationToken): Thenable<DefinitionLink[]> {
+	private findDefinition(target: IMouseTarget, token: CancellationToken): Promise<DefinitionLink[]> {
 		const model = this.editor.getModel();
 		if (!model) {
 			return Promise.resolve(null);
@@ -290,7 +290,7 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
 		return getDefinitionsAtPosition(model, target.position, token);
 	}
 
-	private gotoDefinition(target: IMouseTarget, sideBySide: boolean): Thenable<any> {
+	private gotoDefinition(target: IMouseTarget, sideBySide: boolean): Promise<any> {
 		this.editor.setPosition(target.position);
 		const action = new DefinitionAction(new DefinitionActionConfig(sideBySide, false, true, false), { alias: undefined, label: undefined, id: undefined, precondition: undefined });
 		return this.editor.invokeWithinContext(accessor => action.run(accessor, this.editor));
diff --git a/src/vs/editor/contrib/gotoError/gotoError.ts b/src/vs/editor/contrib/gotoError/gotoError.ts
index 8551d1fb962..58cda9b9d4f 100644
--- a/src/vs/editor/contrib/gotoError/gotoError.ts
+++ b/src/vs/editor/contrib/gotoError/gotoError.ts
@@ -320,7 +320,7 @@ class MarkerNavigationAction extends EditorAction {
 		this._multiFile = multiFile;
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): Thenable<void> {
+	public run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
 
 		const markerService = accessor.get(IMarkerService);
 		const editorService = accessor.get(ICodeEditorService);
diff --git a/src/vs/editor/contrib/links/getLinks.ts b/src/vs/editor/contrib/links/getLinks.ts
index 8ee3eabb7f0..5a75d3db2e5 100644
--- a/src/vs/editor/contrib/links/getLinks.ts
+++ b/src/vs/editor/contrib/links/getLinks.ts
@@ -37,7 +37,7 @@ export class Link implements ILink {
 		return this._link.url;
 	}
 
-	resolve(token: CancellationToken): Thenable<URI> {
+	resolve(token: CancellationToken): Promise<URI> {
 		if (this._link.url) {
 			try {
 				return Promise.resolve(URI.parse(this._link.url));
diff --git a/src/vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts b/src/vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts
index 0c0a8e8b015..8d80428ad0f 100644
--- a/src/vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts
+++ b/src/vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts
@@ -84,7 +84,7 @@ suite('ParameterHintsModel', () => {
 			signatureHelpTriggerCharacters = [triggerChar];
 			signatureHelpRetriggerCharacters = [];
 
-			provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Thenable<modes.SignatureHelp> {
+			provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Promise<modes.SignatureHelp> {
 				++invokeCount;
 				if (invokeCount === 1) {
 					assert.strictEqual(context.triggerKind, modes.SignatureHelpTriggerKind.TriggerCharacter);
@@ -117,7 +117,7 @@ suite('ParameterHintsModel', () => {
 			signatureHelpTriggerCharacters = [triggerChar];
 			signatureHelpRetriggerCharacters = [];
 
-			provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Thenable<modes.SignatureHelp> {
+			provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Promise<modes.SignatureHelp> {
 				++invokeCount;
 				if (invokeCount === 1) {
 					assert.strictEqual(context.triggerKind, modes.SignatureHelpTriggerKind.TriggerCharacter);
@@ -179,7 +179,7 @@ suite('ParameterHintsModel', () => {
 			signatureHelpTriggerCharacters = ['a', 'b'];
 			signatureHelpRetriggerCharacters = [];
 
-			provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Thenable<modes.SignatureHelp> {
+			provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Promise<modes.SignatureHelp> {
 				++invokeCount;
 				if (invokeCount === 1) {
 					assert.strictEqual(context.triggerKind, modes.SignatureHelpTriggerKind.TriggerCharacter);
@@ -214,7 +214,7 @@ suite('ParameterHintsModel', () => {
 			signatureHelpRetriggerCharacters = [];
 
 
-			provideSignatureHelp(_model: ITextModel, _position: Position, token: CancellationToken): modes.SignatureHelp | Thenable<modes.SignatureHelp> {
+			provideSignatureHelp(_model: ITextModel, _position: Position, token: CancellationToken): modes.SignatureHelp | Promise<modes.SignatureHelp> {
 				const count = invokeCount++;
 				token.onCancellationRequested(() => { didRequestCancellationOf = count; });
 
@@ -267,7 +267,7 @@ suite('ParameterHintsModel', () => {
 			signatureHelpTriggerCharacters = [triggerChar];
 			signatureHelpRetriggerCharacters = [retriggerChar];
 
-			provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Thenable<modes.SignatureHelp> {
+			provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Promise<modes.SignatureHelp> {
 				++invokeCount;
 				if (invokeCount === 1) {
 					assert.strictEqual(context.triggerKind, modes.SignatureHelpTriggerKind.TriggerCharacter);
diff --git a/src/vs/editor/contrib/quickOpen/quickOpen.ts b/src/vs/editor/contrib/quickOpen/quickOpen.ts
index 716cf33db87..48c01f13058 100644
--- a/src/vs/editor/contrib/quickOpen/quickOpen.ts
+++ b/src/vs/editor/contrib/quickOpen/quickOpen.ts
@@ -12,7 +12,7 @@ import { DocumentSymbol, DocumentSymbolProviderRegistry } from 'vs/editor/common
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { CancellationToken } from 'vs/base/common/cancellation';
 
-export function getDocumentSymbols(model: ITextModel, flat: boolean, token: CancellationToken): Thenable<DocumentSymbol[]> {
+export function getDocumentSymbols(model: ITextModel, flat: boolean, token: CancellationToken): Promise<DocumentSymbol[]> {
 
 	let roots: DocumentSymbol[] = [];
 
diff --git a/src/vs/editor/contrib/referenceSearch/referencesController.ts b/src/vs/editor/contrib/referenceSearch/referencesController.ts
index 8fd4231cf89..39646d1713d 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesController.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesController.ts
@@ -25,7 +25,7 @@ export const ctxReferenceSearchVisible = new RawContextKey<boolean>('referenceSe
 
 export interface RequestOptions {
 	getMetaTitle(model: ReferencesModel): string;
-	onGoto?: (reference: Location) => Thenable<any>;
+	onGoto?: (reference: Location) => Promise<any>;
 }
 
 export abstract class ReferencesController implements editorCommon.IEditorContribution {
@@ -192,7 +192,7 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
 		this._requestIdPool += 1; // Cancel pending requests
 	}
 
-	private _gotoReference(ref: Location): Thenable<any> {
+	private _gotoReference(ref: Location): Promise<any> {
 		this._widget.hide();
 
 		this._ignoreModelChangeEvent = true;
diff --git a/src/vs/editor/contrib/referenceSearch/referencesTree.ts b/src/vs/editor/contrib/referenceSearch/referencesTree.ts
index 7db27ea761a..ffda710aa84 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesTree.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesTree.ts
@@ -47,7 +47,7 @@ export class DataSource implements IDataSource<TreeElement> {
 		return false;
 	}
 
-	getChildren(element: TreeElement): Thenable<TreeElement[]> {
+	getChildren(element: TreeElement): Promise<TreeElement[]> {
 		if (!element && this.root instanceof FileReferences) {
 			element = this.root;
 		}
diff --git a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
index 20bcb427f2d..e27a095b0f4 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
@@ -441,7 +441,7 @@ export class ReferenceWidget extends PeekViewWidget {
 		});
 	}
 
-	public setModel(newModel: ReferencesModel): Thenable<any> {
+	public setModel(newModel: ReferencesModel): Promise<any> {
 		// clean up
 		this._disposeOnNewModel = dispose(this._disposeOnNewModel);
 		this._model = newModel;
@@ -451,7 +451,7 @@ export class ReferenceWidget extends PeekViewWidget {
 		return undefined;
 	}
 
-	private _onNewModel(): Thenable<any> {
+	private _onNewModel(): Promise<any> {
 
 		if (this._model.empty) {
 			this.setTitle('');
diff --git a/src/vs/editor/contrib/rename/rename.ts b/src/vs/editor/contrib/rename/rename.ts
index 293a0676232..234a02c58d1 100644
--- a/src/vs/editor/contrib/rename/rename.ts
+++ b/src/vs/editor/contrib/rename/rename.ts
@@ -245,7 +245,7 @@ export class RenameAction extends EditorAction {
 		});
 	}
 
-	runCommand(accessor: ServicesAccessor, args: [URI, IPosition]): void | Thenable<void> {
+	runCommand(accessor: ServicesAccessor, args: [URI, IPosition]): void | Promise<void> {
 		const editorService = accessor.get(ICodeEditorService);
 		const [uri, pos] = args || [undefined, undefined];
 
diff --git a/src/vs/editor/contrib/suggest/suggest.ts b/src/vs/editor/contrib/suggest/suggest.ts
index 395219bc57c..969e5cef5aa 100644
--- a/src/vs/editor/contrib/suggest/suggest.ts
+++ b/src/vs/editor/contrib/suggest/suggest.ts
@@ -28,7 +28,7 @@ export class CompletionItem {
 
 	_brand: 'ISuggestionItem';
 
-	readonly resolve: (token: CancellationToken) => Thenable<void>;
+	readonly resolve: (token: CancellationToken) => Promise<void>;
 
 	// perf
 	readonly labelLow: string;
@@ -250,7 +250,7 @@ registerDefaultLanguageCommand('_executeCompletionItemProvider', (model, positio
 		suggestions: []
 	};
 
-	let resolving: Thenable<any>[] = [];
+	let resolving: Promise<any>[] = [];
 	let maxItemsToResolve = args['maxItemsToResolve'] || 0;
 
 	return provideSuggestionItems(model, position).then(items => {
diff --git a/src/vs/editor/contrib/suggest/wordDistance.ts b/src/vs/editor/contrib/suggest/wordDistance.ts
index 17c8b46f451..825b2175a3b 100644
--- a/src/vs/editor/contrib/suggest/wordDistance.ts
+++ b/src/vs/editor/contrib/suggest/wordDistance.ts
@@ -17,7 +17,7 @@ export abstract class WordDistance {
 		distance() { return 0; }
 	};
 
-	static create(service: IEditorWorkerService, editor: ICodeEditor): Thenable<WordDistance> {
+	static create(service: IEditorWorkerService, editor: ICodeEditor): Promise<WordDistance> {
 
 		if (!editor.getConfiguration().contribInfo.suggest.localityBonus) {
 			return Promise.resolve(WordDistance.None);
diff --git a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
index f525b8d039f..e448e3fffad 100644
--- a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
+++ b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
@@ -66,7 +66,7 @@ abstract class OccurenceAtPositionRequest implements IOccurenceAtPositionRequest
 		this.result = createCancelablePromise(token => this._compute(model, selection, wordSeparators, token));
 	}
 
-	protected abstract _compute(model: ITextModel, selection: Selection, wordSeparators: string, token: CancellationToken): Thenable<DocumentHighlight[]>;
+	protected abstract _compute(model: ITextModel, selection: Selection, wordSeparators: string, token: CancellationToken): Promise<DocumentHighlight[]>;
 
 	private _getCurrentWordRange(model: ITextModel, selection: Selection): Range | null {
 		const word = model.getWordAtPosition(selection.getPosition());
@@ -105,7 +105,7 @@ abstract class OccurenceAtPositionRequest implements IOccurenceAtPositionRequest
 }
 
 class SemanticOccurenceAtPositionRequest extends OccurenceAtPositionRequest {
-	protected _compute(model: ITextModel, selection: Selection, wordSeparators: string, token: CancellationToken): Thenable<DocumentHighlight[]> {
+	protected _compute(model: ITextModel, selection: Selection, wordSeparators: string, token: CancellationToken): Promise<DocumentHighlight[]> {
 		return getOccurrencesAtPosition(model, selection.getPosition(), token);
 	}
 }
@@ -119,7 +119,7 @@ class TextualOccurenceAtPositionRequest extends OccurenceAtPositionRequest {
 		this._selectionIsEmpty = selection.isEmpty();
 	}
 
-	protected _compute(model: ITextModel, selection: Selection, wordSeparators: string, token: CancellationToken): Thenable<DocumentHighlight[]> {
+	protected _compute(model: ITextModel, selection: Selection, wordSeparators: string, token: CancellationToken): Promise<DocumentHighlight[]> {
 		return timeout(250, token).then(() => {
 			if (!selection.isEmpty()) {
 				return [];
diff --git a/src/vs/editor/standalone/browser/quickOpen/quickOutline.ts b/src/vs/editor/standalone/browser/quickOpen/quickOutline.ts
index 37f229f1ff2..646bda8a909 100644
--- a/src/vs/editor/standalone/browser/quickOpen/quickOutline.ts
+++ b/src/vs/editor/standalone/browser/quickOpen/quickOutline.ts
@@ -128,7 +128,7 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction {
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): Thenable<void> {
+	public run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
 
 		let model = editor.getModel();
 
diff --git a/src/vs/editor/standalone/browser/simpleServices.ts b/src/vs/editor/standalone/browser/simpleServices.ts
index b0818279377..2a2b5dc59ad 100644
--- a/src/vs/editor/standalone/browser/simpleServices.ts
+++ b/src/vs/editor/standalone/browser/simpleServices.ts
@@ -57,7 +57,7 @@ export class SimpleModel implements ITextEditorModel {
 		return this._onDispose.event;
 	}
 
-	public load(): Thenable<SimpleModel> {
+	public load(): Promise<SimpleModel> {
 		return Promise.resolve(this);
 	}
 
@@ -141,7 +141,7 @@ export class SimpleProgressService implements IProgressService {
 		return SimpleProgressService.NULL_PROGRESS_RUNNER;
 	}
 
-	showWhile(promise: Thenable<any>, delay?: number): Thenable<void> {
+	showWhile(promise: Promise<any>, delay?: number): Promise<void> {
 		return Promise.resolve(void 0);
 	}
 }
@@ -150,7 +150,7 @@ export class SimpleDialogService implements IDialogService {
 
 	public _serviceBrand: any;
 
-	public confirm(confirmation: IConfirmation): Thenable<IConfirmationResult> {
+	public confirm(confirmation: IConfirmation): Promise<IConfirmationResult> {
 		return this.doConfirm(confirmation).then(confirmed => {
 			return {
 				confirmed,
@@ -159,7 +159,7 @@ export class SimpleDialogService implements IDialogService {
 		});
 	}
 
-	private doConfirm(confirmation: IConfirmation): Thenable<boolean> {
+	private doConfirm(confirmation: IConfirmation): Promise<boolean> {
 		let messageText = confirmation.message;
 		if (confirmation.detail) {
 			messageText = messageText + '\n\n' + confirmation.detail;
@@ -168,7 +168,7 @@ export class SimpleDialogService implements IDialogService {
 		return Promise.resolve(window.confirm(messageText));
 	}
 
-	public show(severity: Severity, message: string, buttons: string[], options?: IDialogOptions): Thenable<number> {
+	public show(severity: Severity, message: string, buttons: string[], options?: IDialogOptions): Promise<number> {
 		return Promise.resolve(0);
 	}
 }
diff --git a/src/vs/editor/standalone/browser/standaloneCodeServiceImpl.ts b/src/vs/editor/standalone/browser/standaloneCodeServiceImpl.ts
index 1e060eaa872..c52be42a833 100644
--- a/src/vs/editor/standalone/browser/standaloneCodeServiceImpl.ts
+++ b/src/vs/editor/standalone/browser/standaloneCodeServiceImpl.ts
@@ -19,7 +19,7 @@ export class StandaloneCodeEditorServiceImpl extends CodeEditorServiceImpl {
 		return null; // not supported in the standalone case
 	}
 
-	public openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Thenable<ICodeEditor | null> {
+	public openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null> {
 		if (!source) {
 			return Promise.resolve(null);
 		}
diff --git a/src/vs/editor/standalone/browser/standaloneLanguages.ts b/src/vs/editor/standalone/browser/standaloneLanguages.ts
index 8db8f4a7805..1fecf4a297c 100644
--- a/src/vs/editor/standalone/browser/standaloneLanguages.ts
+++ b/src/vs/editor/standalone/browser/standaloneLanguages.ts
@@ -345,7 +345,7 @@ export function registerSignatureHelpProvider(languageId: string, provider: mode
  */
 export function registerHoverProvider(languageId: string, provider: modes.HoverProvider): IDisposable {
 	return modes.HoverProviderRegistry.register(languageId, {
-		provideHover: (model: model.ITextModel, position: Position, token: CancellationToken): Thenable<modes.Hover> => {
+		provideHover: (model: model.ITextModel, position: Position, token: CancellationToken): Promise<modes.Hover> => {
 			let word = model.getWordAtPosition(position);
 
 			return Promise.resolve<modes.Hover | null | undefined>(provider.provideHover(model, position, token)).then((value) => {
@@ -411,7 +411,7 @@ export function registerCodeLensProvider(languageId: string, provider: modes.Cod
  */
 export function registerCodeActionProvider(languageId: string, provider: CodeActionProvider): IDisposable {
 	return modes.CodeActionProviderRegistry.register(languageId, {
-		provideCodeActions: (model: model.ITextModel, range: Range, context: modes.CodeActionContext, token: CancellationToken): (modes.Command | modes.CodeAction)[] | Thenable<(modes.Command | modes.CodeAction)[]> => {
+		provideCodeActions: (model: model.ITextModel, range: Range, context: modes.CodeActionContext, token: CancellationToken): (modes.Command | modes.CodeAction)[] | Promise<(modes.Command | modes.CodeAction)[]> => {
 			let markers = StaticServices.markerService.get().read({ resource: model.uri }).filter(m => {
 				return Range.areIntersectingOrTouching(m, range);
 			});
@@ -496,7 +496,7 @@ export interface CodeActionProvider {
 	/**
 	 * Provide commands for the given document and range.
 	 */
-	provideCodeActions(model: model.ITextModel, range: Range, context: CodeActionContext, token: CancellationToken): (modes.Command | modes.CodeAction)[] | Thenable<(modes.Command | modes.CodeAction)[]>;
+	provideCodeActions(model: model.ITextModel, range: Range, context: CodeActionContext, token: CancellationToken): (modes.Command | modes.CodeAction)[] | Promise<(modes.Command | modes.CodeAction)[]>;
 }
 
 /**
diff --git a/src/vs/editor/test/browser/editorTestServices.ts b/src/vs/editor/test/browser/editorTestServices.ts
index 4f27495b5ab..31a6abfe92c 100644
--- a/src/vs/editor/test/browser/editorTestServices.ts
+++ b/src/vs/editor/test/browser/editorTestServices.ts
@@ -15,7 +15,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 export class TestCodeEditorService extends AbstractCodeEditorService {
 	public lastInput: IResourceInput;
 	public getActiveCodeEditor(): ICodeEditor | null { return null; }
-	public openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Thenable<ICodeEditor | null> {
+	public openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null> {
 		this.lastInput = input;
 		return Promise.resolve(null);
 	}
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index e49a496e4eb..0d7d7c9ad9d 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -4386,7 +4386,7 @@ declare namespace monaco.languages {
 		/**
 		 * Provide commands for the given document and range.
 		 */
-		provideCodeActions(model: editor.ITextModel, range: Range, context: CodeActionContext, token: CancellationToken): (Command | CodeAction)[] | Thenable<(Command | CodeAction)[]>;
+		provideCodeActions(model: editor.ITextModel, range: Range, context: CodeActionContext, token: CancellationToken): (Command | CodeAction)[] | Promise<(Command | CodeAction)[]>;
 	}
 
 	/**
@@ -4625,7 +4625,7 @@ declare namespace monaco.languages {
 	 * to that type `T`. In addition, `null` and `undefined` can be returned - either directly or from a
 	 * thenable.
 	 */
-	export type ProviderResult<T> = T | undefined | null | Thenable<T | undefined | null>;
+	export type ProviderResult<T> = T | undefined | null | Promise<T | undefined | null>;
 
 	/**
 	 * A hover represents additional information for a symbol or word. Hovers are
diff --git a/src/vs/platform/configuration/test/common/testConfigurationService.ts b/src/vs/platform/configuration/test/common/testConfigurationService.ts
index 36dda417ead..3fd7eac379b 100644
--- a/src/vs/platform/configuration/test/common/testConfigurationService.ts
+++ b/src/vs/platform/configuration/test/common/testConfigurationService.ts
@@ -37,7 +37,7 @@ export class TestConfigurationService implements IConfigurationService {
 		return Promise.resolve(void 0);
 	}
 
-	public setUserConfiguration(key: any, value: any, root?: URI): Thenable<void> {
+	public setUserConfiguration(key: any, value: any, root?: URI): Promise<void> {
 		if (root) {
 			const configForRoot = this.configurationByRoot.get(root.fsPath) || Object.create(null);
 			configForRoot[key] = value;
diff --git a/src/vs/platform/dialogs/common/dialogs.ts b/src/vs/platform/dialogs/common/dialogs.ts
index 5a5b13003e9..6fcf6a53e22 100644
--- a/src/vs/platform/dialogs/common/dialogs.ts
+++ b/src/vs/platform/dialogs/common/dialogs.ts
@@ -127,7 +127,7 @@ export interface IDialogService {
 	/**
 	 * Ask the user for confirmation with a modal dialog.
 	 */
-	confirm(confirmation: IConfirmation): Thenable<IConfirmationResult>;
+	confirm(confirmation: IConfirmation): Promise<IConfirmationResult>;
 
 	/**
 	 * Present a modal dialog to the user.
@@ -136,7 +136,7 @@ export interface IDialogService {
 	 * then a promise with index of `cancelId` option is returned. If there is no such
 	 * option then promise with index `0` is returned.
 	 */
-	show(severity: Severity, message: string, buttons: string[], options?: IDialogOptions): Thenable<number>;
+	show(severity: Severity, message: string, buttons: string[], options?: IDialogOptions): Promise<number>;
 }
 
 export const IFileDialogService = createDecorator<IFileDialogService>('fileDialogService');
@@ -169,32 +169,32 @@ export interface IFileDialogService {
 	/**
 	 * Shows a file-folder selection dialog and opens the selected entry.
 	 */
-	pickFileFolderAndOpen(options: IPickAndOpenOptions): Thenable<any>;
+	pickFileFolderAndOpen(options: IPickAndOpenOptions): Promise<any>;
 
 	/**
 	 * Shows a file selection dialog and opens the selected entry.
 	 */
-	pickFileAndOpen(options: IPickAndOpenOptions): Thenable<any>;
+	pickFileAndOpen(options: IPickAndOpenOptions): Promise<any>;
 
 	/**
 	 * Shows a folder selection dialog and opens the selected entry.
 	 */
-	pickFolderAndOpen(options: IPickAndOpenOptions): Thenable<any>;
+	pickFolderAndOpen(options: IPickAndOpenOptions): Promise<any>;
 
 	/**
 	 * Shows a workspace selection dialog and opens the selected entry.
 	 */
-	pickWorkspaceAndOpen(options: IPickAndOpenOptions): Thenable<any>;
+	pickWorkspaceAndOpen(options: IPickAndOpenOptions): Promise<any>;
 
 	/**
 	 * Shows a save file dialog and returns the chosen file URI.
 	 */
-	showSaveDialog(options: ISaveDialogOptions): Thenable<URI>;
+	showSaveDialog(options: ISaveDialogOptions): Promise<URI>;
 
 	/**
 	 * Shows a open file dialog and returns the chosen file URI.
 	 */
-	showOpenDialog(options: IOpenDialogOptions): Thenable<URI[] | undefined>;
+	showOpenDialog(options: IOpenDialogOptions): Promise<URI[] | undefined>;
 
 }
 
diff --git a/src/vs/platform/dialogs/node/dialogIpc.ts b/src/vs/platform/dialogs/node/dialogIpc.ts
index adf6aad9432..db4c1cd607e 100644
--- a/src/vs/platform/dialogs/node/dialogIpc.ts
+++ b/src/vs/platform/dialogs/node/dialogIpc.ts
@@ -16,7 +16,7 @@ export class DialogChannel implements IServerChannel {
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	call(_, command: string, args?: any[]): Thenable<any> {
+	call(_, command: string, args?: any[]): Promise<any> {
 		switch (command) {
 			case 'show': return this.dialogService.show(args![0], args![1], args![2]);
 			case 'confirm': return this.dialogService.confirm(args![0]);
@@ -31,11 +31,11 @@ export class DialogChannelClient implements IDialogService {
 
 	constructor(private channel: IChannel) { }
 
-	show(severity: Severity, message: string, options: string[]): Thenable<number> {
+	show(severity: Severity, message: string, options: string[]): Promise<number> {
 		return this.channel.call('show', [severity, message, options]);
 	}
 
-	confirm(confirmation: IConfirmation): Thenable<IConfirmationResult> {
+	confirm(confirmation: IConfirmation): Promise<IConfirmationResult> {
 		return this.channel.call('confirm', [confirmation]);
 	}
 }
\ No newline at end of file
diff --git a/src/vs/platform/download/node/downloadIpc.ts b/src/vs/platform/download/node/downloadIpc.ts
index 06fff141f0b..61a9da3f354 100644
--- a/src/vs/platform/download/node/downloadIpc.ts
+++ b/src/vs/platform/download/node/downloadIpc.ts
@@ -35,7 +35,7 @@ export class DownloadServiceChannel implements IServerChannel {
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	call(_, command: string): Thenable<any> {
+	call(_, command: string): Promise<any> {
 		throw new Error(`Call not found: ${command}`);
 	}
 }
diff --git a/src/vs/platform/driver/node/driver.ts b/src/vs/platform/driver/node/driver.ts
index 79b3343e14e..ef5c686b3a5 100644
--- a/src/vs/platform/driver/node/driver.ts
+++ b/src/vs/platform/driver/node/driver.ts
@@ -27,19 +27,19 @@ export interface IElement {
 export interface IDriver {
 	_serviceBrand: any;
 
-	getWindowIds(): Thenable<number[]>;
-	capturePage(windowId: number): Thenable<string>;
-	reloadWindow(windowId: number): Thenable<void>;
-	dispatchKeybinding(windowId: number, keybinding: string): Thenable<void>;
-	click(windowId: number, selector: string, xoffset?: number | undefined, yoffset?: number | undefined): Thenable<void>;
-	doubleClick(windowId: number, selector: string): Thenable<void>;
-	setValue(windowId: number, selector: string, text: string): Thenable<void>;
-	getTitle(windowId: number): Thenable<string>;
-	isActiveElement(windowId: number, selector: string): Thenable<boolean>;
-	getElements(windowId: number, selector: string, recursive?: boolean): Thenable<IElement[]>;
-	typeInEditor(windowId: number, selector: string, text: string): Thenable<void>;
-	getTerminalBuffer(windowId: number, selector: string): Thenable<string[]>;
-	writeInTerminal(windowId: number, selector: string, text: string): Thenable<void>;
+	getWindowIds(): Promise<number[]>;
+	capturePage(windowId: number): Promise<string>;
+	reloadWindow(windowId: number): Promise<void>;
+	dispatchKeybinding(windowId: number, keybinding: string): Promise<void>;
+	click(windowId: number, selector: string, xoffset?: number | undefined, yoffset?: number | undefined): Promise<void>;
+	doubleClick(windowId: number, selector: string): Promise<void>;
+	setValue(windowId: number, selector: string, text: string): Promise<void>;
+	getTitle(windowId: number): Promise<string>;
+	isActiveElement(windowId: number, selector: string): Promise<boolean>;
+	getElements(windowId: number, selector: string, recursive?: boolean): Promise<IElement[]>;
+	typeInEditor(windowId: number, selector: string, text: string): Promise<void>;
+	getTerminalBuffer(windowId: number, selector: string): Promise<string[]>;
+	writeInTerminal(windowId: number, selector: string, text: string): Promise<void>;
 }
 //*END
 
@@ -51,7 +51,7 @@ export class DriverChannel implements IServerChannel {
 		throw new Error('No event found');
 	}
 
-	call(_, command: string, arg?: any): Thenable<any> {
+	call(_, command: string, arg?: any): Promise<any> {
 		switch (command) {
 			case 'getWindowIds': return this.driver.getWindowIds();
 			case 'capturePage': return this.driver.capturePage(arg);
@@ -78,55 +78,55 @@ export class DriverChannelClient implements IDriver {
 
 	constructor(private channel: IChannel) { }
 
-	getWindowIds(): Thenable<number[]> {
+	getWindowIds(): Promise<number[]> {
 		return this.channel.call('getWindowIds');
 	}
 
-	capturePage(windowId: number): Thenable<string> {
+	capturePage(windowId: number): Promise<string> {
 		return this.channel.call('capturePage', windowId);
 	}
 
-	reloadWindow(windowId: number): Thenable<void> {
+	reloadWindow(windowId: number): Promise<void> {
 		return this.channel.call('reloadWindow', windowId);
 	}
 
-	dispatchKeybinding(windowId: number, keybinding: string): Thenable<void> {
+	dispatchKeybinding(windowId: number, keybinding: string): Promise<void> {
 		return this.channel.call('dispatchKeybinding', [windowId, keybinding]);
 	}
 
-	click(windowId: number, selector: string, xoffset: number | undefined, yoffset: number | undefined): Thenable<void> {
+	click(windowId: number, selector: string, xoffset: number | undefined, yoffset: number | undefined): Promise<void> {
 		return this.channel.call('click', [windowId, selector, xoffset, yoffset]);
 	}
 
-	doubleClick(windowId: number, selector: string): Thenable<void> {
+	doubleClick(windowId: number, selector: string): Promise<void> {
 		return this.channel.call('doubleClick', [windowId, selector]);
 	}
 
-	setValue(windowId: number, selector: string, text: string): Thenable<void> {
+	setValue(windowId: number, selector: string, text: string): Promise<void> {
 		return this.channel.call('setValue', [windowId, selector, text]);
 	}
 
-	getTitle(windowId: number): Thenable<string> {
+	getTitle(windowId: number): Promise<string> {
 		return this.channel.call('getTitle', [windowId]);
 	}
 
-	isActiveElement(windowId: number, selector: string): Thenable<boolean> {
+	isActiveElement(windowId: number, selector: string): Promise<boolean> {
 		return this.channel.call('isActiveElement', [windowId, selector]);
 	}
 
-	getElements(windowId: number, selector: string, recursive: boolean): Thenable<IElement[]> {
+	getElements(windowId: number, selector: string, recursive: boolean): Promise<IElement[]> {
 		return this.channel.call('getElements', [windowId, selector, recursive]);
 	}
 
-	typeInEditor(windowId: number, selector: string, text: string): Thenable<void> {
+	typeInEditor(windowId: number, selector: string, text: string): Promise<void> {
 		return this.channel.call('typeInEditor', [windowId, selector, text]);
 	}
 
-	getTerminalBuffer(windowId: number, selector: string): Thenable<string[]> {
+	getTerminalBuffer(windowId: number, selector: string): Promise<string[]> {
 		return this.channel.call('getTerminalBuffer', [windowId, selector]);
 	}
 
-	writeInTerminal(windowId: number, selector: string, text: string): Thenable<void> {
+	writeInTerminal(windowId: number, selector: string, text: string): Promise<void> {
 		return this.channel.call('writeInTerminal', [windowId, selector, text]);
 	}
 }
@@ -136,8 +136,8 @@ export interface IDriverOptions {
 }
 
 export interface IWindowDriverRegistry {
-	registerWindowDriver(windowId: number): Thenable<IDriverOptions>;
-	reloadWindowDriver(windowId: number): Thenable<void>;
+	registerWindowDriver(windowId: number): Promise<IDriverOptions>;
+	reloadWindowDriver(windowId: number): Promise<void>;
 }
 
 export class WindowDriverRegistryChannel implements IServerChannel {
@@ -148,7 +148,7 @@ export class WindowDriverRegistryChannel implements IServerChannel {
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	call(_, command: string, arg?: any): Thenable<any> {
+	call(_, command: string, arg?: any): Promise<any> {
 		switch (command) {
 			case 'registerWindowDriver': return this.registry.registerWindowDriver(arg);
 			case 'reloadWindowDriver': return this.registry.reloadWindowDriver(arg);
@@ -164,25 +164,25 @@ export class WindowDriverRegistryChannelClient implements IWindowDriverRegistry
 
 	constructor(private channel: IChannel) { }
 
-	registerWindowDriver(windowId: number): Thenable<IDriverOptions> {
+	registerWindowDriver(windowId: number): Promise<IDriverOptions> {
 		return this.channel.call('registerWindowDriver', windowId);
 	}
 
-	reloadWindowDriver(windowId: number): Thenable<void> {
+	reloadWindowDriver(windowId: number): Promise<void> {
 		return this.channel.call('reloadWindowDriver', windowId);
 	}
 }
 
 export interface IWindowDriver {
-	click(selector: string, xoffset?: number | undefined, yoffset?: number | undefined): Thenable<void>;
-	doubleClick(selector: string): Thenable<void>;
-	setValue(selector: string, text: string): Thenable<void>;
-	getTitle(): Thenable<string>;
-	isActiveElement(selector: string): Thenable<boolean>;
-	getElements(selector: string, recursive: boolean): Thenable<IElement[]>;
-	typeInEditor(selector: string, text: string): Thenable<void>;
-	getTerminalBuffer(selector: string): Thenable<string[]>;
-	writeInTerminal(selector: string, text: string): Thenable<void>;
+	click(selector: string, xoffset?: number | undefined, yoffset?: number | undefined): Promise<void>;
+	doubleClick(selector: string): Promise<void>;
+	setValue(selector: string, text: string): Promise<void>;
+	getTitle(): Promise<string>;
+	isActiveElement(selector: string): Promise<boolean>;
+	getElements(selector: string, recursive: boolean): Promise<IElement[]>;
+	typeInEditor(selector: string, text: string): Promise<void>;
+	getTerminalBuffer(selector: string): Promise<string[]>;
+	writeInTerminal(selector: string, text: string): Promise<void>;
 }
 
 export class WindowDriverChannel implements IServerChannel {
@@ -193,7 +193,7 @@ export class WindowDriverChannel implements IServerChannel {
 		throw new Error(`No event found: ${event}`);
 	}
 
-	call(_, command: string, arg?: any): Thenable<any> {
+	call(_, command: string, arg?: any): Promise<any> {
 		switch (command) {
 			case 'click': return this.driver.click(arg[0], arg[1], arg[2]);
 			case 'doubleClick': return this.driver.doubleClick(arg);
@@ -216,39 +216,39 @@ export class WindowDriverChannelClient implements IWindowDriver {
 
 	constructor(private channel: IChannel) { }
 
-	click(selector: string, xoffset?: number, yoffset?: number): Thenable<void> {
+	click(selector: string, xoffset?: number, yoffset?: number): Promise<void> {
 		return this.channel.call('click', [selector, xoffset, yoffset]);
 	}
 
-	doubleClick(selector: string): Thenable<void> {
+	doubleClick(selector: string): Promise<void> {
 		return this.channel.call('doubleClick', selector);
 	}
 
-	setValue(selector: string, text: string): Thenable<void> {
+	setValue(selector: string, text: string): Promise<void> {
 		return this.channel.call('setValue', [selector, text]);
 	}
 
-	getTitle(): Thenable<string> {
+	getTitle(): Promise<string> {
 		return this.channel.call('getTitle');
 	}
 
-	isActiveElement(selector: string): Thenable<boolean> {
+	isActiveElement(selector: string): Promise<boolean> {
 		return this.channel.call('isActiveElement', selector);
 	}
 
-	getElements(selector: string, recursive: boolean): Thenable<IElement[]> {
+	getElements(selector: string, recursive: boolean): Promise<IElement[]> {
 		return this.channel.call('getElements', [selector, recursive]);
 	}
 
-	typeInEditor(selector: string, text: string): Thenable<void> {
+	typeInEditor(selector: string, text: string): Promise<void> {
 		return this.channel.call('typeInEditor', [selector, text]);
 	}
 
-	getTerminalBuffer(selector: string): Thenable<string[]> {
+	getTerminalBuffer(selector: string): Promise<string[]> {
 		return this.channel.call('getTerminalBuffer', selector);
 	}
 
-	writeInTerminal(selector: string, text: string): Thenable<void> {
+	writeInTerminal(selector: string, text: string): Promise<void> {
 		return this.channel.call('writeInTerminal', [selector, text]);
 	}
 }
diff --git a/src/vs/platform/editor/common/editor.ts b/src/vs/platform/editor/common/editor.ts
index 906769fae65..b07aeaa04a2 100644
--- a/src/vs/platform/editor/common/editor.ts
+++ b/src/vs/platform/editor/common/editor.ts
@@ -16,7 +16,7 @@ export interface IEditorModel {
 	/**
 	 * Loads the model.
 	 */
-	load(): Thenable<IEditorModel>;
+	load(): Promise<IEditorModel>;
 
 	/**
 	 * Dispose associated resources
diff --git a/src/vs/platform/extensionManagement/node/extensionLifecycle.ts b/src/vs/platform/extensionManagement/node/extensionLifecycle.ts
index 6de328ec850..a65f0317565 100644
--- a/src/vs/platform/extensionManagement/node/extensionLifecycle.ts
+++ b/src/vs/platform/extensionManagement/node/extensionLifecycle.ts
@@ -50,7 +50,7 @@ export class ExtensionsLifecycle extends Disposable {
 		return null;
 	}
 
-	private runLifecycleHook(lifecycleHook: string, lifecycleType: string, args: string[], timeout: boolean, extension: ILocalExtension): Thenable<void> {
+	private runLifecycleHook(lifecycleHook: string, lifecycleType: string, args: string[], timeout: boolean, extension: ILocalExtension): Promise<void> {
 		return new Promise<void>((c, e) => {
 
 			const extensionLifecycleProcess = this.start(lifecycleHook, lifecycleType, args, extension);
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementIpc.ts b/src/vs/platform/extensionManagement/node/extensionManagementIpc.ts
index 17f5c5bb8a0..a1f0d010abf 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementIpc.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementIpc.ts
@@ -35,7 +35,7 @@ export class ExtensionManagementChannel implements IServerChannel {
 		throw new Error('Invalid listen');
 	}
 
-	call(context, command: string, args?: any): Thenable<any> {
+	call(context, command: string, args?: any): Promise<any> {
 		const uriTransformer = this.getUriTransformer(context);
 		switch (command) {
 			case 'zip': return this.service.zip(this._transformIncoming(args[0], uriTransformer)).then(uri => uriTransformer.transformOutgoing(uri));
diff --git a/src/vs/platform/extensionManagement/node/multiExtensionManagement.ts b/src/vs/platform/extensionManagement/node/multiExtensionManagement.ts
index c1057928ede..6ea0adf85f3 100644
--- a/src/vs/platform/extensionManagement/node/multiExtensionManagement.ts
+++ b/src/vs/platform/extensionManagement/node/multiExtensionManagement.ts
@@ -112,8 +112,8 @@ export class MultiExtensionManagementService extends Disposable implements IExte
 		return this.extensionManagementServerService.getExtensionManagementServer(extension.location);
 	}
 
-	private _remoteAuthorityResolverPromise: Thenable<ResolvedAuthority>;
-	private hasToSyncExtensions(): Thenable<boolean> {
+	private _remoteAuthorityResolverPromise: Promise<ResolvedAuthority>;
+	private hasToSyncExtensions(): Promise<boolean> {
 		if (!this.extensionManagementServerService.remoteExtensionManagementServer) {
 			return Promise.resolve(false);
 		}
diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index 2c8b94bdba3..b007b6f1840 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -52,7 +52,7 @@ export interface IFileService {
 	/**
 	 * Tries to activate a provider with the given scheme.
 	 */
-	activateProvider(scheme: string): Thenable<void>;
+	activateProvider(scheme: string): Promise<void>;
 
 	/**
 	 * Checks if this file service can handle the given resource.
@@ -70,51 +70,51 @@ export interface IFileService {
 	 * the stat service is asked to automatically resolve child folders that only
 	 * contain a single element.
 	 */
-	resolveFile(resource: URI, options?: IResolveFileOptions): Thenable<IFileStat>;
+	resolveFile(resource: URI, options?: IResolveFileOptions): Promise<IFileStat>;
 
 	/**
 	 * Same as resolveFile but supports resolving multiple resources in parallel.
 	 * If one of the resolve targets fails to resolve returns a fake IFileStat instead of making the whole call fail.
 	 */
-	resolveFiles(toResolve: { resource: URI, options?: IResolveFileOptions }[]): Thenable<IResolveFileResult[]>;
+	resolveFiles(toResolve: { resource: URI, options?: IResolveFileOptions }[]): Promise<IResolveFileResult[]>;
 
 	/**
 	 * Finds out if a file identified by the resource exists.
 	 */
-	existsFile(resource: URI): Thenable<boolean>;
+	existsFile(resource: URI): Promise<boolean>;
 
 	/**
 	 * Resolve the contents of a file identified by the resource.
 	 *
 	 * The returned object contains properties of the file and the full value as string.
 	 */
-	resolveContent(resource: URI, options?: IResolveContentOptions): Thenable<IContent>;
+	resolveContent(resource: URI, options?: IResolveContentOptions): Promise<IContent>;
 
 	/**
 	 * Resolve the contents of a file identified by the resource.
 	 *
 	 * The returned object contains properties of the file and the value as a readable stream.
 	 */
-	resolveStreamContent(resource: URI, options?: IResolveContentOptions): Thenable<IStreamContent>;
+	resolveStreamContent(resource: URI, options?: IResolveContentOptions): Promise<IStreamContent>;
 
 	/**
 	 * Updates the content replacing its previous value.
 	 */
-	updateContent(resource: URI, value: string | ITextSnapshot, options?: IUpdateContentOptions): Thenable<IFileStat>;
+	updateContent(resource: URI, value: string | ITextSnapshot, options?: IUpdateContentOptions): Promise<IFileStat>;
 
 	/**
 	 * Moves the file to a new path identified by the resource.
 	 *
 	 * The optional parameter overwrite can be set to replace an existing file at the location.
 	 */
-	moveFile(source: URI, target: URI, overwrite?: boolean): Thenable<IFileStat>;
+	moveFile(source: URI, target: URI, overwrite?: boolean): Promise<IFileStat>;
 
 	/**
 	 * Copies the file to a path identified by the resource.
 	 *
 	 * The optional parameter overwrite can be set to replace an existing file at the location.
 	 */
-	copyFile(source: URI, target: URI, overwrite?: boolean): Thenable<IFileStat>;
+	copyFile(source: URI, target: URI, overwrite?: boolean): Promise<IFileStat>;
 
 	/**
 	 * Creates a new file with the given path. The returned promise
@@ -122,26 +122,26 @@ export interface IFileService {
 	 *
 	 * The optional parameter content can be used as value to fill into the new file.
 	 */
-	createFile(resource: URI, content?: string, options?: ICreateFileOptions): Thenable<IFileStat>;
+	createFile(resource: URI, content?: string, options?: ICreateFileOptions): Promise<IFileStat>;
 
 	/**
 	 * Reads a folder's content with the given path. The returned promise
 	 * will have the list of children as a result.
 	 */
-	readFolder(resource: URI): Thenable<string[]>;
+	readFolder(resource: URI): Promise<string[]>;
 
 	/**
 	 * Creates a new folder with the given path. The returned promise
 	 * will have the stat model object as a result.
 	 */
-	createFolder(resource: URI): Thenable<IFileStat>;
+	createFolder(resource: URI): Promise<IFileStat>;
 
 	/**
 	 * Deletes the provided file. The optional useTrash parameter allows to
 	 * move the file to trash. The optional recursive parameter allows to delete
 	 * non-empty folders recursively.
 	 */
-	del(resource: URI, options?: { useTrash?: boolean, recursive?: boolean }): Thenable<void>;
+	del(resource: URI, options?: { useTrash?: boolean, recursive?: boolean }): Promise<void>;
 
 	/**
 	 * Allows to start a watcher that reports file change events on the provided resource.
@@ -208,21 +208,21 @@ export interface IFileSystemProvider {
 	onDidChangeFile: Event<IFileChange[]>;
 	watch(resource: URI, opts: IWatchOptions): IDisposable;
 
-	stat(resource: URI): Thenable<IStat>;
-	mkdir(resource: URI): Thenable<void>;
-	readdir(resource: URI): Thenable<[string, FileType][]>;
-	delete(resource: URI, opts: FileDeleteOptions): Thenable<void>;
+	stat(resource: URI): Promise<IStat>;
+	mkdir(resource: URI): Promise<void>;
+	readdir(resource: URI): Promise<[string, FileType][]>;
+	delete(resource: URI, opts: FileDeleteOptions): Promise<void>;
 
-	rename(from: URI, to: URI, opts: FileOverwriteOptions): Thenable<void>;
-	copy?(from: URI, to: URI, opts: FileOverwriteOptions): Thenable<void>;
+	rename(from: URI, to: URI, opts: FileOverwriteOptions): Promise<void>;
+	copy?(from: URI, to: URI, opts: FileOverwriteOptions): Promise<void>;
 
-	readFile?(resource: URI): Thenable<Uint8Array>;
-	writeFile?(resource: URI, content: Uint8Array, opts: FileWriteOptions): Thenable<void>;
+	readFile?(resource: URI): Promise<Uint8Array>;
+	writeFile?(resource: URI, content: Uint8Array, opts: FileWriteOptions): Promise<void>;
 
-	open?(resource: URI): Thenable<number>;
-	close?(fd: number): Thenable<void>;
-	read?(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Thenable<number>;
-	write?(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Thenable<number>;
+	open?(resource: URI): Promise<number>;
+	close?(fd: number): Promise<void>;
+	read?(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Promise<number>;
+	write?(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Promise<number>;
 }
 
 export interface IFileSystemProviderRegistrationEvent {
diff --git a/src/vs/platform/integrity/common/integrity.ts b/src/vs/platform/integrity/common/integrity.ts
index e326da2bac3..37c0fe97ed6 100644
--- a/src/vs/platform/integrity/common/integrity.ts
+++ b/src/vs/platform/integrity/common/integrity.ts
@@ -23,5 +23,5 @@ export interface IntegrityTestResult {
 export interface IIntegrityService {
 	_serviceBrand: any;
 
-	isPure(): Thenable<IntegrityTestResult>;
+	isPure(): Promise<IntegrityTestResult>;
 }
diff --git a/src/vs/platform/integrity/node/integrityServiceImpl.ts b/src/vs/platform/integrity/node/integrityServiceImpl.ts
index 670230c6d4e..ca2e3ac9cce 100644
--- a/src/vs/platform/integrity/node/integrityServiceImpl.ts
+++ b/src/vs/platform/integrity/node/integrityServiceImpl.ts
@@ -57,7 +57,7 @@ export class IntegrityServiceImpl implements IIntegrityService {
 	_serviceBrand: any;
 
 	private _storage: IntegrityStorage;
-	private _isPurePromise: Thenable<IntegrityTestResult>;
+	private _isPurePromise: Promise<IntegrityTestResult>;
 
 	constructor(
 		@INotificationService private notificationService: INotificationService,
@@ -101,11 +101,11 @@ export class IntegrityServiceImpl implements IIntegrityService {
 		);
 	}
 
-	isPure(): Thenable<IntegrityTestResult> {
+	isPure(): Promise<IntegrityTestResult> {
 		return this._isPurePromise;
 	}
 
-	private _isPure(): Thenable<IntegrityTestResult> {
+	private _isPure(): Promise<IntegrityTestResult> {
 		const expectedChecksums = product.checksums || {};
 
 		return this.lifecycleService.when(LifecyclePhase.Eventually).then(() => {
diff --git a/src/vs/platform/issue/common/issue.ts b/src/vs/platform/issue/common/issue.ts
index ef78a8d1bb7..90c4b4356ce 100644
--- a/src/vs/platform/issue/common/issue.ts
+++ b/src/vs/platform/issue/common/issue.ts
@@ -87,6 +87,6 @@ export interface ProcessExplorerData extends WindowData {
 
 export interface IIssueService {
 	_serviceBrand: any;
-	openReporter(data: IssueReporterData): Thenable<void>;
-	openProcessExplorer(data: ProcessExplorerData): Thenable<void>;
+	openReporter(data: IssueReporterData): Promise<void>;
+	openProcessExplorer(data: ProcessExplorerData): Promise<void>;
 }
diff --git a/src/vs/platform/issue/node/issueIpc.ts b/src/vs/platform/issue/node/issueIpc.ts
index c6b2ad7e786..a4a3df818fb 100644
--- a/src/vs/platform/issue/node/issueIpc.ts
+++ b/src/vs/platform/issue/node/issueIpc.ts
@@ -15,7 +15,7 @@ export class IssueChannel implements IServerChannel {
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	call(_, command: string, arg?: any): Thenable<any> {
+	call(_, command: string, arg?: any): Promise<any> {
 		switch (command) {
 			case 'openIssueReporter':
 				return this.service.openReporter(arg);
@@ -33,11 +33,11 @@ export class IssueChannelClient implements IIssueService {
 
 	constructor(private channel: IChannel) { }
 
-	openReporter(data: IssueReporterData): Thenable<void> {
+	openReporter(data: IssueReporterData): Promise<void> {
 		return this.channel.call('openIssueReporter', data);
 	}
 
-	openProcessExplorer(data: ProcessExplorerData): Thenable<void> {
+	openProcessExplorer(data: ProcessExplorerData): Promise<void> {
 		return this.channel.call('openProcessExplorer', data);
 	}
 }
\ No newline at end of file
diff --git a/src/vs/platform/launch/electron-main/launchService.ts b/src/vs/platform/launch/electron-main/launchService.ts
index 9a85fd26d8b..20a6d4b95ce 100644
--- a/src/vs/platform/launch/electron-main/launchService.ts
+++ b/src/vs/platform/launch/electron-main/launchService.ts
@@ -60,10 +60,10 @@ function parseOpenUrl(args: ParsedArgs): URI[] {
 
 export interface ILaunchService {
 	_serviceBrand: any;
-	start(args: ParsedArgs, userEnv: IProcessEnvironment): Thenable<void>;
-	getMainProcessId(): Thenable<number>;
-	getMainProcessInfo(): Thenable<IMainProcessInfo>;
-	getLogsPath(): Thenable<string>;
+	start(args: ParsedArgs, userEnv: IProcessEnvironment): Promise<void>;
+	getMainProcessId(): Promise<number>;
+	getMainProcessInfo(): Promise<IMainProcessInfo>;
+	getLogsPath(): Promise<string>;
 }
 
 export class LaunchChannel implements IServerChannel {
@@ -74,7 +74,7 @@ export class LaunchChannel implements IServerChannel {
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	call(_, command: string, arg: any): Thenable<any> {
+	call(_, command: string, arg: any): Promise<any> {
 		switch (command) {
 			case 'start':
 				const { args, userEnv } = arg as IStartArguments;
@@ -100,19 +100,19 @@ export class LaunchChannelClient implements ILaunchService {
 
 	constructor(private channel: IChannel) { }
 
-	start(args: ParsedArgs, userEnv: IProcessEnvironment): Thenable<void> {
+	start(args: ParsedArgs, userEnv: IProcessEnvironment): Promise<void> {
 		return this.channel.call('start', { args, userEnv });
 	}
 
-	getMainProcessId(): Thenable<number> {
+	getMainProcessId(): Promise<number> {
 		return this.channel.call('get-main-process-id', null);
 	}
 
-	getMainProcessInfo(): Thenable<IMainProcessInfo> {
+	getMainProcessInfo(): Promise<IMainProcessInfo> {
 		return this.channel.call('get-main-process-info', null);
 	}
 
-	getLogsPath(): Thenable<string> {
+	getLogsPath(): Promise<string> {
 		return this.channel.call('get-logs-path', null);
 	}
 }
@@ -130,14 +130,14 @@ export class LaunchService implements ILaunchService {
 		@IConfigurationService private readonly configurationService: IConfigurationService
 	) { }
 
-	start(args: ParsedArgs, userEnv: IProcessEnvironment): Thenable<void> {
+	start(args: ParsedArgs, userEnv: IProcessEnvironment): Promise<void> {
 		this.logService.trace('Received data from other instance: ', args, userEnv);
 
 		const urlsToOpen = parseOpenUrl(args);
 
 		// Check early for open-url which is handled in URL service
 		if (urlsToOpen.length) {
-			let whenWindowReady: Thenable<any> = Promise.resolve<any>(null);
+			let whenWindowReady: Promise<any> = Promise.resolve<any>(null);
 
 			// Create a window if there is none
 			if (this.windowsMainService.getWindowCount() === 0) {
@@ -159,7 +159,7 @@ export class LaunchService implements ILaunchService {
 		return this.startOpenWindow(args, userEnv);
 	}
 
-	private startOpenWindow(args: ParsedArgs, userEnv: IProcessEnvironment): Thenable<void> {
+	private startOpenWindow(args: ParsedArgs, userEnv: IProcessEnvironment): Promise<void> {
 		const context = !!userEnv['VSCODE_CLI'] ? OpenContext.CLI : OpenContext.DESKTOP;
 		let usedWindows: ICodeWindow[] = [];
 
@@ -232,13 +232,13 @@ export class LaunchService implements ILaunchService {
 		return Promise.resolve(void 0);
 	}
 
-	getMainProcessId(): Thenable<number> {
+	getMainProcessId(): Promise<number> {
 		this.logService.trace('Received request for process ID from other instance.');
 
 		return Promise.resolve(process.pid);
 	}
 
-	getMainProcessInfo(): Thenable<IMainProcessInfo> {
+	getMainProcessInfo(): Promise<IMainProcessInfo> {
 		this.logService.trace('Received request for main process info from other instance.');
 
 		const windows: IWindowInfo[] = [];
@@ -258,7 +258,7 @@ export class LaunchService implements ILaunchService {
 		});
 	}
 
-	getLogsPath(): Thenable<string> {
+	getLogsPath(): Promise<string> {
 		this.logService.trace('Received request for logs path from other instance.');
 
 		return Promise.resolve(this.environmentService.logsPath);
diff --git a/src/vs/platform/lifecycle/common/lifecycle.ts b/src/vs/platform/lifecycle/common/lifecycle.ts
index 41fe7ac9089..4879ee13e8d 100644
--- a/src/vs/platform/lifecycle/common/lifecycle.ts
+++ b/src/vs/platform/lifecycle/common/lifecycle.ts
@@ -24,7 +24,7 @@ export interface BeforeShutdownEvent {
 	 * Allows to veto the shutdown. The veto can be a long running operation but it
 	 * will block the application from closing.
 	 */
-	veto(value: boolean | Thenable<boolean>): void;
+	veto(value: boolean | Promise<boolean>): void;
 
 	/**
 	 * The reason why the application will be shutting down.
@@ -46,7 +46,7 @@ export interface WillShutdownEvent {
 	 * Allows to join the shutdown. The promise can be a long running operation but it
 	 * will block the application from closing.
 	 */
-	join(promise: Thenable<void>): void;
+	join(promise: Promise<void>): void;
 
 	/**
 	 * The reason why the application is shutting down.
@@ -162,7 +162,7 @@ export interface ILifecycleService {
 	 * Returns a promise that resolves when a certain lifecycle phase
 	 * has started.
 	 */
-	when(phase: LifecyclePhase): Thenable<void>;
+	when(phase: LifecyclePhase): Promise<void>;
 }
 
 export const NullLifecycleService: ILifecycleService = {
@@ -176,12 +176,12 @@ export const NullLifecycleService: ILifecycleService = {
 };
 
 // Shared veto handling across main and renderer
-export function handleVetos(vetos: (boolean | Thenable<boolean>)[], onError: (error: Error) => void): Promise<boolean /* veto */> {
+export function handleVetos(vetos: (boolean | Promise<boolean>)[], onError: (error: Error) => void): Promise<boolean /* veto */> {
 	if (vetos.length === 0) {
 		return Promise.resolve(false);
 	}
 
-	const promises: Thenable<void>[] = [];
+	const promises: Promise<void>[] = [];
 	let lazyValue = false;
 
 	for (let valueOrPromise of vetos) {
diff --git a/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts b/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts
index a9563520938..cbb965509fe 100644
--- a/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts
+++ b/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts
@@ -116,7 +116,7 @@ export class LifecycleService extends Disposable implements ILifecycleService {
 	}
 
 	private handleBeforeShutdown(reason: ShutdownReason): Promise<boolean> {
-		const vetos: (boolean | Thenable<boolean>)[] = [];
+		const vetos: (boolean | Promise<boolean>)[] = [];
 
 		this._onBeforeShutdown.fire({
 			veto(value) {
@@ -131,8 +131,8 @@ export class LifecycleService extends Disposable implements ILifecycleService {
 		});
 	}
 
-	private handleWillShutdown(reason: ShutdownReason): Thenable<void> {
-		const joiners: Thenable<void>[] = [];
+	private handleWillShutdown(reason: ShutdownReason): Promise<void> {
+		const joiners: Promise<void>[] = [];
 
 		this._onWillShutdown.fire({
 			join(promise) {
@@ -169,7 +169,7 @@ export class LifecycleService extends Disposable implements ILifecycleService {
 		}
 	}
 
-	when(phase: LifecyclePhase): Thenable<any> {
+	when(phase: LifecyclePhase): Promise<any> {
 		if (phase <= this._phase) {
 			return Promise.resolve();
 		}
diff --git a/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts b/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts
index 9c1a284a297..786ee14504b 100644
--- a/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts
+++ b/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts
@@ -26,7 +26,7 @@ export const enum UnloadReason {
 export interface IWindowUnloadEvent {
 	window: ICodeWindow;
 	reason: UnloadReason;
-	veto(value: boolean | Thenable<boolean>): void;
+	veto(value: boolean | Promise<boolean>): void;
 }
 
 export interface ShutdownEvent {
@@ -35,7 +35,7 @@ export interface ShutdownEvent {
 	 * Allows to join the shutdown. The promise can be a long running operation but it
 	 * will block the application from closing.
 	 */
-	join(promise: Thenable<void>): void;
+	join(promise: Promise<void>): void;
 }
 
 export interface ILifecycleService {
@@ -79,7 +79,7 @@ export interface ILifecycleService {
 	/**
 	 * Unload a window for the provided reason. All lifecycle event handlers are triggered.
 	 */
-	unload(window: ICodeWindow, reason: UnloadReason): Thenable<boolean /* veto */>;
+	unload(window: ICodeWindow, reason: UnloadReason): Promise<boolean /* veto */>;
 
 	/**
 	 * Restart the application with optional arguments (CLI). All lifecycle event handlers are triggered.
@@ -89,7 +89,7 @@ export interface ILifecycleService {
 	/**
 	 * Shutdown the application normally. All lifecycle event handlers are triggered.
 	 */
-	quit(fromUpdate?: boolean): Thenable<boolean /* veto */>;
+	quit(fromUpdate?: boolean): Promise<boolean /* veto */>;
 
 	/**
 	 * Forcefully shutdown the application. No livecycle event handlers are triggered.
@@ -107,10 +107,10 @@ export class LifecycleService extends Disposable implements ILifecycleService {
 	private oneTimeListenerTokenGenerator = 0;
 	private windowCounter = 0;
 
-	private pendingQuitPromise: Thenable<boolean> | null;
+	private pendingQuitPromise: Promise<boolean> | null;
 	private pendingQuitPromiseResolve: { (veto: boolean): void } | null;
 
-	private pendingWillShutdownPromise: Thenable<void> | null;
+	private pendingWillShutdownPromise: Promise<void> | null;
 
 	private _quitRequested = false;
 	get quitRequested(): boolean { return this._quitRequested; }
@@ -217,14 +217,14 @@ export class LifecycleService extends Disposable implements ILifecycleService {
 		});
 	}
 
-	private beginOnWillShutdown(): Thenable<void> {
+	private beginOnWillShutdown(): Promise<void> {
 		if (this.pendingWillShutdownPromise) {
 			return this.pendingWillShutdownPromise; // shutdown is already running
 		}
 
 		this.logService.trace('Lifecycle#onWillShutdown.fire()');
 
-		const joiners: Thenable<void>[] = [];
+		const joiners: Promise<void>[] = [];
 
 		this._onWillShutdown.fire({
 			join(promise) {
@@ -292,7 +292,7 @@ export class LifecycleService extends Disposable implements ILifecycleService {
 		});
 	}
 
-	unload(window: ICodeWindow, reason: UnloadReason): Thenable<boolean /* veto */> {
+	unload(window: ICodeWindow, reason: UnloadReason): Promise<boolean /* veto */> {
 
 		// Always allow to unload a window that is not yet ready
 		if (!window.isReady) {
@@ -348,7 +348,7 @@ export class LifecycleService extends Disposable implements ILifecycleService {
 		}
 	}
 
-	private onBeforeUnloadWindowInRenderer(window: ICodeWindow, reason: UnloadReason): Thenable<boolean /* veto */> {
+	private onBeforeUnloadWindowInRenderer(window: ICodeWindow, reason: UnloadReason): Promise<boolean /* veto */> {
 		return new Promise<boolean>(c => {
 			const oneTimeEventToken = this.oneTimeListenerTokenGenerator++;
 			const okChannel = `vscode:ok${oneTimeEventToken}`;
@@ -366,8 +366,8 @@ export class LifecycleService extends Disposable implements ILifecycleService {
 		});
 	}
 
-	private onBeforeUnloadWindowInMain(window: ICodeWindow, reason: UnloadReason): Thenable<boolean /* veto */> {
-		const vetos: (boolean | Thenable<boolean>)[] = [];
+	private onBeforeUnloadWindowInMain(window: ICodeWindow, reason: UnloadReason): Promise<boolean /* veto */> {
+		const vetos: (boolean | Promise<boolean>)[] = [];
 
 		this._onBeforeWindowUnload.fire({
 			reason,
@@ -380,7 +380,7 @@ export class LifecycleService extends Disposable implements ILifecycleService {
 		return handleVetos(vetos, err => this.logService.error(err));
 	}
 
-	private onWillUnloadWindowInRenderer(window: ICodeWindow, reason: UnloadReason): Thenable<void> {
+	private onWillUnloadWindowInRenderer(window: ICodeWindow, reason: UnloadReason): Promise<void> {
 		return new Promise<void>(resolve => {
 			const oneTimeEventToken = this.oneTimeListenerTokenGenerator++;
 			const replyChannel = `vscode:reply${oneTimeEventToken}`;
@@ -395,7 +395,7 @@ export class LifecycleService extends Disposable implements ILifecycleService {
 	 * A promise that completes to indicate if the quit request has been veto'd
 	 * by the user or not.
 	 */
-	quit(fromUpdate?: boolean): Thenable<boolean /* veto */> {
+	quit(fromUpdate?: boolean): Promise<boolean /* veto */> {
 		if (this.pendingQuitPromise) {
 			return this.pendingQuitPromise;
 		}
diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts
index bf79fbd8adb..3848455b466 100644
--- a/src/vs/platform/list/browser/listService.ts
+++ b/src/vs/platform/list/browser/listService.ts
@@ -794,7 +794,7 @@ export class HighlightingWorkbenchTree extends WorkbenchTree {
 		this.disposables.push(this._onDidStartFilter);
 	}
 
-	setInput(element: any): Thenable<any> {
+	setInput(element: any): Promise<any> {
 		this.input.setEnabled(false);
 		return super.setInput(element).then(value => {
 			if (!this.input.inputElement) {
diff --git a/src/vs/platform/localizations/common/localizations.ts b/src/vs/platform/localizations/common/localizations.ts
index 82a18ef351a..2f70e80f400 100644
--- a/src/vs/platform/localizations/common/localizations.ts
+++ b/src/vs/platform/localizations/common/localizations.ts
@@ -29,7 +29,7 @@ export interface ILocalizationsService {
 	_serviceBrand: any;
 
 	readonly onDidLanguagesChange: Event<void>;
-	getLanguageIds(type?: LanguageType): Thenable<string[]>;
+	getLanguageIds(type?: LanguageType): Promise<string[]>;
 }
 
 export function isValidLocalization(localization: ILocalization): boolean {
diff --git a/src/vs/platform/localizations/node/localizations.ts b/src/vs/platform/localizations/node/localizations.ts
index b609124430d..15c1419bc4e 100644
--- a/src/vs/platform/localizations/node/localizations.ts
+++ b/src/vs/platform/localizations/node/localizations.ts
@@ -55,7 +55,7 @@ export class LocalizationsService extends Disposable implements ILocalizationsSe
 		this.extensionManagementService.getInstalled().then(installed => this.cache.update(installed));
 	}
 
-	getLanguageIds(type: LanguageType): Thenable<string[]> {
+	getLanguageIds(type: LanguageType): Promise<string[]> {
 		if (type === LanguageType.Core) {
 			return Promise.resolve([...systemLanguages]);
 		}
@@ -110,7 +110,7 @@ class LanguagePacksCache extends Disposable {
 		this.languagePacksFileLimiter = new Queue();
 	}
 
-	getLanguagePacks(): Thenable<{ [language: string]: ILanguagePack }> {
+	getLanguagePacks(): Promise<{ [language: string]: ILanguagePack }> {
 		// if queue is not empty, fetch from disk
 		if (this.languagePacksFileLimiter.size) {
 			return this.withLanguagePacks()
@@ -119,7 +119,7 @@ class LanguagePacksCache extends Disposable {
 		return Promise.resolve(this.languagePacks);
 	}
 
-	update(extensions: ILocalExtension[]): Thenable<{ [language: string]: ILanguagePack }> {
+	update(extensions: ILocalExtension[]): Promise<{ [language: string]: ILanguagePack }> {
 		return this.withLanguagePacks(languagePacks => {
 			Object.keys(languagePacks).forEach(language => delete languagePacks[language]);
 			this.createLanguagePacksFromExtensions(languagePacks, ...extensions);
@@ -168,7 +168,7 @@ class LanguagePacksCache extends Disposable {
 		}
 	}
 
-	private withLanguagePacks<T>(fn: (languagePacks: { [language: string]: ILanguagePack }) => T | null = () => null): Thenable<T> {
+	private withLanguagePacks<T>(fn: (languagePacks: { [language: string]: ILanguagePack }) => T | null = () => null): Promise<T> {
 		return this.languagePacksFileLimiter.queue(() => {
 			let result: T | null = null;
 			return pfs.readFile(this.languagePacksFilePath, 'utf8')
diff --git a/src/vs/platform/localizations/node/localizationsIpc.ts b/src/vs/platform/localizations/node/localizationsIpc.ts
index fa5a5518ae6..f37957e46c0 100644
--- a/src/vs/platform/localizations/node/localizationsIpc.ts
+++ b/src/vs/platform/localizations/node/localizationsIpc.ts
@@ -23,7 +23,7 @@ export class LocalizationsChannel implements IServerChannel {
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	call(_, command: string, arg?: any): Thenable<any> {
+	call(_, command: string, arg?: any): Promise<any> {
 		switch (command) {
 			case 'getLanguageIds': return this.service.getLanguageIds(arg);
 		}
@@ -40,7 +40,7 @@ export class LocalizationsChannelClient implements ILocalizationsService {
 
 	get onDidLanguagesChange(): Event<void> { return this.channel.listen('onDidLanguagesChange'); }
 
-	getLanguageIds(type?: LanguageType): Thenable<string[]> {
+	getLanguageIds(type?: LanguageType): Promise<string[]> {
 		return this.channel.call('getLanguageIds', type);
 	}
 }
\ No newline at end of file
diff --git a/src/vs/platform/log/node/logIpc.ts b/src/vs/platform/log/node/logIpc.ts
index 7cb099b5021..92846e6d86d 100644
--- a/src/vs/platform/log/node/logIpc.ts
+++ b/src/vs/platform/log/node/logIpc.ts
@@ -23,7 +23,7 @@ export class LogLevelSetterChannel implements IServerChannel {
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	call(_, command: string, arg?: any): Thenable<any> {
+	call(_, command: string, arg?: any): Promise<any> {
 		switch (command) {
 			case 'setLevel': this.service.setLevel(arg);
 		}
diff --git a/src/vs/platform/menubar/common/menubar.ts b/src/vs/platform/menubar/common/menubar.ts
index f43c83a4d9a..c88dab47842 100644
--- a/src/vs/platform/menubar/common/menubar.ts
+++ b/src/vs/platform/menubar/common/menubar.ts
@@ -11,7 +11,7 @@ export const IMenubarService = createDecorator<IMenubarService>('menubarService'
 export interface IMenubarService {
 	_serviceBrand: any;
 
-	updateMenubar(windowId: number, menuData: IMenubarData): Thenable<void>;
+	updateMenubar(windowId: number, menuData: IMenubarData): Promise<void>;
 }
 
 export interface IMenubarData {
diff --git a/src/vs/platform/menubar/node/menubarIpc.ts b/src/vs/platform/menubar/node/menubarIpc.ts
index 70d61f0d879..ff2166784ef 100644
--- a/src/vs/platform/menubar/node/menubarIpc.ts
+++ b/src/vs/platform/menubar/node/menubarIpc.ts
@@ -14,7 +14,7 @@ export class MenubarChannel implements IServerChannel {
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	call(_, command: string, arg?: any): Thenable<any> {
+	call(_, command: string, arg?: any): Promise<any> {
 		switch (command) {
 			case 'updateMenubar': return this.service.updateMenubar(arg[0], arg[1]);
 		}
@@ -29,7 +29,7 @@ export class MenubarChannelClient implements IMenubarService {
 
 	constructor(private channel: IChannel) { }
 
-	updateMenubar(windowId: number, menuData: IMenubarData): Thenable<void> {
+	updateMenubar(windowId: number, menuData: IMenubarData): Promise<void> {
 		return this.channel.call('updateMenubar', [windowId, menuData]);
 	}
 }
diff --git a/src/vs/platform/progress/common/progress.ts b/src/vs/platform/progress/common/progress.ts
index 99144374abb..27195ab0d54 100644
--- a/src/vs/platform/progress/common/progress.ts
+++ b/src/vs/platform/progress/common/progress.ts
@@ -22,7 +22,7 @@ export interface IProgressService {
 	 * Indicate progress for the duration of the provided promise. Progress will stop in
 	 * any case of promise completion, error or cancellation.
 	 */
-	showWhile(promise: Thenable<any>, delay?: number): Thenable<void>;
+	showWhile(promise: Promise<any>, delay?: number): Promise<void>;
 }
 
 export const enum ProgressLocation {
@@ -52,7 +52,7 @@ export interface IProgressService2 {
 
 	_serviceBrand: any;
 
-	withProgress<P extends Thenable<R>, R=any>(options: IProgressOptions, task: (progress: IProgress<IProgressStep>) => P, onDidCancel?: () => void): P;
+	withProgress<P extends Promise<R>, R=any>(options: IProgressOptions, task: (progress: IProgress<IProgressStep>) => P, onDidCancel?: () => void): P;
 }
 
 export interface IProgressRunner {
diff --git a/src/vs/platform/quickOpen/common/quickOpen.ts b/src/vs/platform/quickOpen/common/quickOpen.ts
index 390fcac7daf..a5232810f36 100644
--- a/src/vs/platform/quickOpen/common/quickOpen.ts
+++ b/src/vs/platform/quickOpen/common/quickOpen.ts
@@ -26,7 +26,7 @@ export interface IQuickOpenService {
 	 *
 	 * The returned promise completes when quick open is closing.
 	 */
-	show(prefix?: string, options?: IShowOptions): Thenable<void>;
+	show(prefix?: string, options?: IShowOptions): Promise<void>;
 
 	/**
 	 * Allows to navigate from the outside in an opened picker.
diff --git a/src/vs/platform/quickinput/common/quickInput.ts b/src/vs/platform/quickinput/common/quickInput.ts
index e273c0918a2..7dde852bb12 100644
--- a/src/vs/platform/quickinput/common/quickInput.ts
+++ b/src/vs/platform/quickinput/common/quickInput.ts
@@ -114,7 +114,7 @@ export interface IInputOptions {
 	/**
 	 * an optional function that is used to validate user input.
 	 */
-	validateInput?: (input: string) => Thenable<string>;
+	validateInput?: (input: string) => Promise<string>;
 }
 
 export interface IQuickInput {
@@ -230,9 +230,9 @@ export interface IQuickInputService {
 	/**
 	 * Opens the quick input box for selecting items and returns a promise with the user selected item(s) if any.
 	 */
-	pick<T extends IQuickPickItem>(picks: Thenable<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: IPickOptions<T> & { canPickMany: true }, token?: CancellationToken): Promise<T[]>;
-	pick<T extends IQuickPickItem>(picks: Thenable<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: IPickOptions<T> & { canPickMany: false }, token?: CancellationToken): Promise<T>;
-	pick<T extends IQuickPickItem>(picks: Thenable<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: Omit<IPickOptions<T>, 'canPickMany'>, token?: CancellationToken): Promise<T>;
+	pick<T extends IQuickPickItem>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: IPickOptions<T> & { canPickMany: true }, token?: CancellationToken): Promise<T[]>;
+	pick<T extends IQuickPickItem>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: IPickOptions<T> & { canPickMany: false }, token?: CancellationToken): Promise<T>;
+	pick<T extends IQuickPickItem>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: Omit<IPickOptions<T>, 'canPickMany'>, token?: CancellationToken): Promise<T>;
 
 	/**
 	 * Opens the quick input box for text input and returns a promise with the user typed value if any.
diff --git a/src/vs/platform/remote/common/remoteAuthorityResolver.ts b/src/vs/platform/remote/common/remoteAuthorityResolver.ts
index ea9f3c1056a..51628f97ee5 100644
--- a/src/vs/platform/remote/common/remoteAuthorityResolver.ts
+++ b/src/vs/platform/remote/common/remoteAuthorityResolver.ts
@@ -18,7 +18,7 @@ export interface IRemoteAuthorityResolverService {
 
 	_serviceBrand: any;
 
-	resolveAuthority(authority: string): Thenable<ResolvedAuthority>;
+	resolveAuthority(authority: string): Promise<ResolvedAuthority>;
 
 	setResolvedAuthority(resolvedAuthority: ResolvedAuthority): void;
 }
diff --git a/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts b/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts
index 705f1cedf94..475677e05a2 100644
--- a/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts
+++ b/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts
@@ -27,7 +27,7 @@ export class RemoteAuthorityResolverService implements IRemoteAuthorityResolverS
 		this._resolvedAuthorities = Object.create(null);
 	}
 
-	resolveAuthority(authority: string): Thenable<ResolvedAuthority> {
+	resolveAuthority(authority: string): Promise<ResolvedAuthority> {
 		if (this._resolvedAuthorities[authority]) {
 			return Promise.resolve(this._resolvedAuthorities[authority]);
 		}
diff --git a/src/vs/platform/remote/node/remoteAgentConnection.ts b/src/vs/platform/remote/node/remoteAgentConnection.ts
index 9c053ad7d05..ddcb7177b4d 100644
--- a/src/vs/platform/remote/node/remoteAgentConnection.ts
+++ b/src/vs/platform/remote/node/remoteAgentConnection.ts
@@ -11,7 +11,7 @@ export interface RemoteAgentConnectionContext {
 	clientId: string;
 }
 
-export function connectRemoteAgentManagement(remoteAuthority: string, host: string, port: number, clientId: string): Thenable<Client<RemoteAgentConnectionContext>> {
+export function connectRemoteAgentManagement(remoteAuthority: string, host: string, port: number, clientId: string): Promise<Client<RemoteAgentConnectionContext>> {
 	throw new Error(`Not implemented`);
 }
 
@@ -20,6 +20,6 @@ export interface IExtensionHostConnectionResult {
 	debugPort?: number;
 }
 
-export function connectRemoteAgentExtensionHost(host: string, port: number, debugArguments: IExtensionHostDebugParams): Thenable<IExtensionHostConnectionResult> {
+export function connectRemoteAgentExtensionHost(host: string, port: number, debugArguments: IExtensionHostDebugParams): Promise<IExtensionHostConnectionResult> {
 	throw new Error(`Not implemented`);
 }
diff --git a/src/vs/platform/remote/node/remoteAgentFileSystemChannel.ts b/src/vs/platform/remote/node/remoteAgentFileSystemChannel.ts
index c479a3935c9..d083a69af11 100644
--- a/src/vs/platform/remote/node/remoteAgentFileSystemChannel.ts
+++ b/src/vs/platform/remote/node/remoteAgentFileSystemChannel.ts
@@ -75,36 +75,36 @@ export class RemoteExtensionsFileSystemProvider extends Disposable implements IF
 		return Buffer.isBuffer(data) ? data : Buffer.from(data.buffer, data.byteOffset, data.byteLength);
 	}
 
-	stat(resource: URI): Thenable<IStat> {
+	stat(resource: URI): Promise<IStat> {
 		return this._channel.call('stat', [resource]);
 	}
 
-	readFile(resource: URI): Thenable<Uint8Array> {
+	readFile(resource: URI): Promise<Uint8Array> {
 		return this._channel.call('readFile', [resource]);
 	}
 
-	writeFile(resource: URI, content: Uint8Array, opts: FileWriteOptions): Thenable<void> {
+	writeFile(resource: URI, content: Uint8Array, opts: FileWriteOptions): Promise<void> {
 		const contents = RemoteExtensionsFileSystemProvider._asBuffer(content);
 		return this._channel.call('writeFile', [resource, contents, opts]);
 	}
 
-	delete(resource: URI, opts: FileDeleteOptions): Thenable<void> {
+	delete(resource: URI, opts: FileDeleteOptions): Promise<void> {
 		return this._channel.call('delete', [resource, opts]);
 	}
 
-	mkdir(resource: URI): Thenable<void> {
+	mkdir(resource: URI): Promise<void> {
 		return this._channel.call('mkdir', [resource]);
 	}
 
-	readdir(resource: URI): Thenable<[string, FileType][]> {
+	readdir(resource: URI): Promise<[string, FileType][]> {
 		return this._channel.call('readdir', [resource]);
 	}
 
-	rename(resource: URI, target: URI, opts: FileOverwriteOptions): Thenable<void> {
+	rename(resource: URI, target: URI, opts: FileOverwriteOptions): Promise<void> {
 		return this._channel.call('rename', [resource, target, opts]);
 	}
 
-	copy(resource: URI, target: URI, opts: FileOverwriteOptions): Thenable<void> {
+	copy(resource: URI, target: URI, opts: FileOverwriteOptions): Promise<void> {
 		return this._channel.call('copy', [resource, target, opts]);
 	}
 }
diff --git a/src/vs/platform/search/common/search.ts b/src/vs/platform/search/common/search.ts
index f84d037ca68..63c4bbaaa6a 100644
--- a/src/vs/platform/search/common/search.ts
+++ b/src/vs/platform/search/common/search.ts
@@ -28,7 +28,7 @@ export interface ISearchService {
 	textSearch(query: ITextQuery, token?: CancellationToken, onProgress?: (result: ISearchProgressItem) => void): Promise<ISearchComplete>;
 	fileSearch(query: IFileQuery, token?: CancellationToken): Promise<ISearchComplete>;
 	extendQuery(query: ITextQuery | IFileQuery): void;
-	clearCache(cacheKey: string): Thenable<void>;
+	clearCache(cacheKey: string): Promise<void>;
 	registerSearchResultProvider(scheme: string, type: SearchProviderType, provider: ISearchResultProvider): IDisposable;
 }
 
@@ -59,7 +59,7 @@ export const enum SearchProviderType {
 export interface ISearchResultProvider {
 	textSearch(query: ITextQuery, onProgress?: (p: ISearchProgressItem) => void, token?: CancellationToken): Promise<ISearchComplete>;
 	fileSearch(query: IFileQuery, token?: CancellationToken): Promise<ISearchComplete>;
-	clearCache(cacheKey: string): Thenable<void>;
+	clearCache(cacheKey: string): Promise<void>;
 }
 
 export interface IFolderQuery<U extends UriComponents=URI> {
diff --git a/src/vs/platform/storage/node/storageIpc.ts b/src/vs/platform/storage/node/storageIpc.ts
index 44ab2537c58..886049f1b15 100644
--- a/src/vs/platform/storage/node/storageIpc.ts
+++ b/src/vs/platform/storage/node/storageIpc.ts
@@ -70,7 +70,7 @@ export class GlobalStorageDatabaseChannel extends Disposable implements IServerC
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	call(_, command: string, arg?: any): Thenable<any> {
+	call(_, command: string, arg?: any): Promise<any> {
 		switch (command) {
 			case 'getItems': {
 				return Promise.resolve(mapToSerializable(this.storageMainService.items));
@@ -125,11 +125,11 @@ export class GlobalStorageDatabaseChannelClient extends Disposable implements IS
 		}
 	}
 
-	getItems(): Thenable<Map<string, string>> {
+	getItems(): Promise<Map<string, string>> {
 		return this.channel.call('getItems').then((data: Item[]) => serializableToMap(data));
 	}
 
-	updateItems(request: IUpdateRequest): Thenable<void> {
+	updateItems(request: IUpdateRequest): Promise<void> {
 		let updateCount = 0;
 		const serializableRequest: ISerializableUpdateRequest = Object.create(null);
 
@@ -150,11 +150,11 @@ export class GlobalStorageDatabaseChannelClient extends Disposable implements IS
 		return this.channel.call('updateItems', serializableRequest);
 	}
 
-	checkIntegrity(full: boolean): Thenable<string> {
+	checkIntegrity(full: boolean): Promise<string> {
 		return this.channel.call('checkIntegrity', full);
 	}
 
-	close(): Thenable<void> {
+	close(): Promise<void> {
 
 		// when we are about to close, we start to ignore main-side changes since we close anyway
 		this.onDidChangeItemsOnMainListener = dispose(this.onDidChangeItemsOnMainListener);
diff --git a/src/vs/platform/storage/node/storageMainService.ts b/src/vs/platform/storage/node/storageMainService.ts
index 345a913a092..9d4e8bad79c 100644
--- a/src/vs/platform/storage/node/storageMainService.ts
+++ b/src/vs/platform/storage/node/storageMainService.ts
@@ -130,7 +130,7 @@ export class StorageMainService extends Disposable implements IStorageMainServic
 		} as ISQLiteStorageDatabaseLoggingOptions;
 	}
 
-	initialize(): Thenable<void> {
+	initialize(): Promise<void> {
 		const useInMemoryStorage = this.storagePath === SQLiteStorageDatabase.IN_MEMORY_PATH;
 
 		let globalStorageExists: Promise<boolean>;
@@ -158,7 +158,7 @@ export class StorageMainService extends Disposable implements IStorageMainServic
 			}).then(() => {
 
 				// Migrate storage if this is the first start and we are not using in-memory
-				let migrationPromise: Thenable<void>;
+				let migrationPromise: Promise<void>;
 				if (!useInMemoryStorage && !exists) {
 					// TODO@Ben remove global storage migration and move Storage creation back to ctor
 					migrationPromise = this.migrateGlobalStorage().then(() => this.logService.info('[storage] migrated global storage'), error => this.logService.error(`[storage] migration error ${error}`));
@@ -171,7 +171,7 @@ export class StorageMainService extends Disposable implements IStorageMainServic
 		});
 	}
 
-	private migrateGlobalStorage(): Thenable<void> {
+	private migrateGlobalStorage(): Promise<void> {
 		this.logService.info('[storage] migrating global storage from localStorage into SQLite');
 
 		const localStorageDBBackup = join(this.environmentService.userDataPath, 'Local Storage', 'file__0.vscmig');
@@ -357,15 +357,15 @@ export class StorageMainService extends Disposable implements IStorageMainServic
 		return this.storage.getInteger(key, fallbackValue);
 	}
 
-	store(key: string, value: any): Thenable<void> {
+	store(key: string, value: any): Promise<void> {
 		return this.storage.set(key, value);
 	}
 
-	remove(key: string): Thenable<void> {
+	remove(key: string): Promise<void> {
 		return this.storage.delete(key);
 	}
 
-	close(): Thenable<void> {
+	close(): Promise<void> {
 		this.logService.trace('StorageMainService#close() - begin');
 
 		// Signal as event so that clients can still store data
@@ -380,7 +380,7 @@ export class StorageMainService extends Disposable implements IStorageMainServic
 		});
 	}
 
-	checkIntegrity(full: boolean): Thenable<string> {
+	checkIntegrity(full: boolean): Promise<string> {
 		return this.storage.checkIntegrity(full);
 	}
 }
\ No newline at end of file
diff --git a/src/vs/platform/storage/node/storageService.ts b/src/vs/platform/storage/node/storageService.ts
index 6ff7e243226..21267cd4eeb 100644
--- a/src/vs/platform/storage/node/storageService.ts
+++ b/src/vs/platform/storage/node/storageService.ts
@@ -73,14 +73,14 @@ export class StorageService extends Disposable implements IStorageService {
 		this._onDidChangeStorage.fire({ key, scope });
 	}
 
-	initialize(payload: IWorkspaceInitializationPayload): Thenable<void> {
+	initialize(payload: IWorkspaceInitializationPayload): Promise<void> {
 		return Promise.all([
 			this.initializeGlobalStorage(),
 			this.initializeWorkspaceStorage(payload)
 		]).then(() => void 0);
 	}
 
-	private initializeGlobalStorage(): Thenable<void> {
+	private initializeGlobalStorage(): Promise<void> {
 		mark('willInitGlobalStorage');
 
 		return this.globalStorage.init().then(() => {
@@ -92,7 +92,7 @@ export class StorageService extends Disposable implements IStorageService {
 		});
 	}
 
-	private initializeWorkspaceStorage(payload: IWorkspaceInitializationPayload): Thenable<void> {
+	private initializeWorkspaceStorage(payload: IWorkspaceInitializationPayload): Promise<void> {
 
 		// Prepare workspace storage folder for DB
 		return this.prepareWorkspaceStorageFolder(payload).then(result => {
@@ -144,7 +144,7 @@ export class StorageService extends Disposable implements IStorageService {
 		return join(this.environmentService.workspaceStorageHome, payload.id); // workspace home + workspace id;
 	}
 
-	private prepareWorkspaceStorageFolder(payload: IWorkspaceInitializationPayload): Thenable<{ path: string, wasCreated: boolean }> {
+	private prepareWorkspaceStorageFolder(payload: IWorkspaceInitializationPayload): Promise<{ path: string, wasCreated: boolean }> {
 		const workspaceStorageFolderPath = this.getWorkspaceStorageFolderPath(payload);
 
 		return exists(workspaceStorageFolderPath).then(exists => {
@@ -232,7 +232,7 @@ export class StorageService extends Disposable implements IStorageService {
 		return scope === StorageScope.GLOBAL ? this.globalStorage.size : this.workspaceStorage.size;
 	}
 
-	checkIntegrity(scope: StorageScope, full: boolean): Thenable<string> {
+	checkIntegrity(scope: StorageScope, full: boolean): Promise<string> {
 		return scope === StorageScope.GLOBAL ? this.globalStorage.checkIntegrity(full) : this.workspaceStorage.checkIntegrity(full);
 	}
 
@@ -287,7 +287,7 @@ export class StorageService extends Disposable implements IStorageService {
 		});
 	}
 
-	migrate(toWorkspace: IWorkspaceInitializationPayload): Thenable<void> {
+	migrate(toWorkspace: IWorkspaceInitializationPayload): Promise<void> {
 		if (this.workspaceStoragePath === SQLiteStorageDatabase.IN_MEMORY_PATH) {
 			return Promise.resolve(); // no migration needed if running in memory
 		}
@@ -324,7 +324,7 @@ export class LogStorageAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		this.storageService.logStorage();
 
 		return this.windowService.openDevTools();
diff --git a/src/vs/platform/telemetry/common/telemetry.ts b/src/vs/platform/telemetry/common/telemetry.ts
index 159ad58dabe..93bb7eebd5b 100644
--- a/src/vs/platform/telemetry/common/telemetry.ts
+++ b/src/vs/platform/telemetry/common/telemetry.ts
@@ -27,9 +27,9 @@ export interface ITelemetryService {
 	 * Sends a telemetry event that has been privacy approved.
 	 * Do not call this unless you have been given approval.
 	 */
-	publicLog(eventName: string, data?: ITelemetryData, anonymizeFilePaths?: boolean): Thenable<void>;
+	publicLog(eventName: string, data?: ITelemetryData, anonymizeFilePaths?: boolean): Promise<void>;
 
-	getTelemetryInfo(): Thenable<ITelemetryInfo>;
+	getTelemetryInfo(): Promise<ITelemetryInfo>;
 
 	isOptedIn: boolean;
 }
diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts
index 3b9110a8c81..7f300844819 100644
--- a/src/vs/platform/telemetry/common/telemetryService.ts
+++ b/src/vs/platform/telemetry/common/telemetryService.ts
@@ -16,7 +16,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 
 export interface ITelemetryServiceConfig {
 	appender: ITelemetryAppender;
-	commonProperties?: Thenable<{ [name: string]: any }>;
+	commonProperties?: Promise<{ [name: string]: any }>;
 	piiPaths?: string[];
 }
 
@@ -28,7 +28,7 @@ export class TelemetryService implements ITelemetryService {
 	_serviceBrand: any;
 
 	private _appender: ITelemetryAppender;
-	private _commonProperties: Thenable<{ [name: string]: any; }>;
+	private _commonProperties: Promise<{ [name: string]: any; }>;
 	private _piiPaths: string[];
 	private _userOptIn: boolean;
 
@@ -72,7 +72,7 @@ export class TelemetryService implements ITelemetryService {
 		return this._userOptIn;
 	}
 
-	getTelemetryInfo(): Thenable<ITelemetryInfo> {
+	getTelemetryInfo(): Promise<ITelemetryInfo> {
 		return this._commonProperties.then(values => {
 			// well known properties
 			let sessionId = values['sessionID'];
@@ -87,7 +87,7 @@ export class TelemetryService implements ITelemetryService {
 		this._disposables = dispose(this._disposables);
 	}
 
-	publicLog(eventName: string, data?: ITelemetryData, anonymizeFilePaths?: boolean): Thenable<any> {
+	publicLog(eventName: string, data?: ITelemetryData, anonymizeFilePaths?: boolean): Promise<any> {
 		// don't send events when the user is optout
 		if (!this._userOptIn) {
 			return Promise.resolve(undefined);
diff --git a/src/vs/platform/telemetry/common/telemetryUtils.ts b/src/vs/platform/telemetry/common/telemetryUtils.ts
index 0a2bc0dc06b..a89ec346ff4 100644
--- a/src/vs/platform/telemetry/common/telemetryUtils.ts
+++ b/src/vs/platform/telemetry/common/telemetryUtils.ts
@@ -29,7 +29,7 @@ export const NullTelemetryService = new class implements ITelemetryService {
 
 export interface ITelemetryAppender {
 	log(eventName: string, data: any): void;
-	dispose(): Thenable<any> | undefined;
+	dispose(): Promise<any> | undefined;
 }
 
 export function combinedAppender(...appenders: ITelemetryAppender[]): ITelemetryAppender {
diff --git a/src/vs/platform/telemetry/node/telemetryIpc.ts b/src/vs/platform/telemetry/node/telemetryIpc.ts
index a99e372fa31..c0a1e657ea7 100644
--- a/src/vs/platform/telemetry/node/telemetryIpc.ts
+++ b/src/vs/platform/telemetry/node/telemetryIpc.ts
@@ -20,7 +20,7 @@ export class TelemetryAppenderChannel implements IServerChannel {
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	call(_, command: string, { eventName, data }: ITelemetryLog): Thenable<any> {
+	call(_, command: string, { eventName, data }: ITelemetryLog): Promise<any> {
 		this.appender.log(eventName, data);
 		return Promise.resolve(null);
 	}
diff --git a/src/vs/platform/telemetry/node/telemetryNodeUtils.ts b/src/vs/platform/telemetry/node/telemetryNodeUtils.ts
index 6c42c1e752f..5540da30a71 100644
--- a/src/vs/platform/telemetry/node/telemetryNodeUtils.ts
+++ b/src/vs/platform/telemetry/node/telemetryNodeUtils.ts
@@ -9,7 +9,7 @@ import product from 'vs/platform/node/product';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
-export function addGAParameters(telemetryService: ITelemetryService, environmentService: IEnvironmentService, uri: URI, origin: string, experiment = '1'): Thenable<URI> {
+export function addGAParameters(telemetryService: ITelemetryService, environmentService: IEnvironmentService, uri: URI, origin: string, experiment = '1'): Promise<URI> {
 	if (environmentService.isBuilt && !environmentService.isExtensionDevelopment && !environmentService.args['disable-telemetry'] && !!product.enableTelemetry) {
 		if (uri.scheme === 'https' && uri.authority === 'code.visualstudio.com') {
 			return telemetryService.getTelemetryInfo()
diff --git a/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts b/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
index 712287504c9..193a20bf6f5 100644
--- a/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
+++ b/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
@@ -206,13 +206,13 @@ suite('TelemetryService', () => {
 
 	class JoinableTelemetryService extends TelemetryService {
 
-		private readonly promises: Thenable<void>[] = [];
+		private readonly promises: Promise<void>[] = [];
 
 		join(): Promise<any> {
 			return Promise.all(this.promises);
 		}
 
-		publicLog(eventName: string, data?: ITelemetryData, anonymizeFilePaths?: boolean): Thenable<void> {
+		publicLog(eventName: string, data?: ITelemetryData, anonymizeFilePaths?: boolean): Promise<void> {
 			let p = super.publicLog(eventName, data, anonymizeFilePaths);
 			this.promises.push(p);
 			return p;
diff --git a/src/vs/platform/update/common/update.ts b/src/vs/platform/update/common/update.ts
index 5f9d514d8de..205d961cece 100644
--- a/src/vs/platform/update/common/update.ts
+++ b/src/vs/platform/update/common/update.ts
@@ -76,7 +76,7 @@ export const State = {
 export interface IAutoUpdater extends Event.NodeEventEmitter {
 	setFeedURL(url: string): void;
 	checkForUpdates(): void;
-	applyUpdate?(): Thenable<void>;
+	applyUpdate?(): Promise<void>;
 	quitAndInstall(): void;
 }
 
@@ -88,10 +88,10 @@ export interface IUpdateService {
 	readonly onStateChange: Event<State>;
 	readonly state: State;
 
-	checkForUpdates(context: any): Thenable<void>;
-	downloadUpdate(): Thenable<void>;
-	applyUpdate(): Thenable<void>;
-	quitAndInstall(): Thenable<void>;
+	checkForUpdates(context: any): Promise<void>;
+	downloadUpdate(): Promise<void>;
+	applyUpdate(): Promise<void>;
+	quitAndInstall(): Promise<void>;
 
-	isLatestVersion(): Thenable<boolean | undefined>;
+	isLatestVersion(): Promise<boolean | undefined>;
 }
diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index 2e3a485737c..2283a9a9c77 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -80,7 +80,7 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		return quality === 'none' ? undefined : product.quality;
 	}
 
-	private scheduleCheckForUpdates(delay = 60 * 60 * 1000): Thenable<void> {
+	private scheduleCheckForUpdates(delay = 60 * 60 * 1000): Promise<void> {
 		return timeout(delay)
 			.then(() => this.checkForUpdates(null))
 			.then(() => {
@@ -127,7 +127,7 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		// noop
 	}
 
-	quitAndInstall(): Thenable<void> {
+	quitAndInstall(): Promise<void> {
 		this.logService.trace('update#quitAndInstall, state = ', this.state.type);
 
 		if (this.state.type !== StateType.Ready) {
@@ -149,7 +149,7 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		return Promise.resolve(void 0);
 	}
 
-	isLatestVersion(): Thenable<boolean | undefined> {
+	isLatestVersion(): Promise<boolean | undefined> {
 		if (!this.url) {
 			return Promise.resolve(undefined);
 		}
diff --git a/src/vs/platform/update/electron-main/updateService.snap.ts b/src/vs/platform/update/electron-main/updateService.snap.ts
index 62e8207ff4a..ed0cb25b057 100644
--- a/src/vs/platform/update/electron-main/updateService.snap.ts
+++ b/src/vs/platform/update/electron-main/updateService.snap.ts
@@ -50,7 +50,7 @@ abstract class AbstractUpdateService2 implements IUpdateService {
 		this.scheduleCheckForUpdates(30 * 1000).then(undefined, err => this.logService.error(err));
 	}
 
-	private scheduleCheckForUpdates(delay = 60 * 60 * 1000): Thenable<void> {
+	private scheduleCheckForUpdates(delay = 60 * 60 * 1000): Promise<void> {
 		return timeout(delay)
 			.then(() => this.checkForUpdates(null))
 			.then(() => {
@@ -93,11 +93,11 @@ abstract class AbstractUpdateService2 implements IUpdateService {
 		await this.doApplyUpdate();
 	}
 
-	protected doApplyUpdate(): Thenable<void> {
+	protected doApplyUpdate(): Promise<void> {
 		return Promise.resolve(void 0);
 	}
 
-	quitAndInstall(): Thenable<void> {
+	quitAndInstall(): Promise<void> {
 		this.logService.trace('update#quitAndInstall, state = ', this.state.type);
 
 		if (this.state.type !== StateType.Ready) {
@@ -128,7 +128,7 @@ abstract class AbstractUpdateService2 implements IUpdateService {
 		// noop
 	}
 
-	abstract isLatestVersion(): Thenable<boolean | undefined>;
+	abstract isLatestVersion(): Promise<boolean | undefined>;
 	protected abstract doCheckForUpdates(context: any): void;
 }
 
@@ -202,7 +202,7 @@ export class SnapUpdateService extends AbstractUpdateService2 {
 		});
 	}
 
-	private isUpdateAvailable(): Thenable<boolean> {
+	private isUpdateAvailable(): Promise<boolean> {
 		return new Promise((c, e) => {
 			realpath(`/snap/${product.applicationName}/current`, (err, resolvedCurrentSnapPath) => {
 				if (err) { return e(err); }
@@ -213,7 +213,7 @@ export class SnapUpdateService extends AbstractUpdateService2 {
 		});
 	}
 
-	isLatestVersion(): Thenable<boolean | undefined> {
+	isLatestVersion(): Promise<boolean | undefined> {
 		return this.isUpdateAvailable().then(undefined, err => {
 			this.logService.error('update#checkForSnapUpdate(): Could not get realpath of application.');
 			return undefined;
diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
index 4a972956116..84a38e9b2a2 100644
--- a/src/vs/platform/update/electron-main/updateService.win32.ts
+++ b/src/vs/platform/update/electron-main/updateService.win32.ts
@@ -53,7 +53,7 @@ export class Win32UpdateService extends AbstractUpdateService {
 	private availableUpdate: IAvailableUpdate | undefined;
 
 	@memoize
-	get cachePath(): Thenable<string> {
+	get cachePath(): Promise<string> {
 		const result = path.join(tmpdir(), `vscode-update-${product.target}-${process.arch}`);
 		return pfs.mkdirp(result, void 0).then(() => result);
 	}
diff --git a/src/vs/platform/update/node/updateIpc.ts b/src/vs/platform/update/node/updateIpc.ts
index f579a48f578..69308aaacb3 100644
--- a/src/vs/platform/update/node/updateIpc.ts
+++ b/src/vs/platform/update/node/updateIpc.ts
@@ -19,7 +19,7 @@ export class UpdateChannel implements IServerChannel {
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	call(_, command: string, arg?: any): Thenable<any> {
+	call(_, command: string, arg?: any): Promise<any> {
 		switch (command) {
 			case 'checkForUpdates': return this.service.checkForUpdates(arg);
 			case 'downloadUpdate': return this.service.downloadUpdate();
@@ -57,23 +57,23 @@ export class UpdateChannelClient implements IUpdateService {
 		});
 	}
 
-	checkForUpdates(context: any): Thenable<void> {
+	checkForUpdates(context: any): Promise<void> {
 		return this.channel.call('checkForUpdates', context);
 	}
 
-	downloadUpdate(): Thenable<void> {
+	downloadUpdate(): Promise<void> {
 		return this.channel.call('downloadUpdate');
 	}
 
-	applyUpdate(): Thenable<void> {
+	applyUpdate(): Promise<void> {
 		return this.channel.call('applyUpdate');
 	}
 
-	quitAndInstall(): Thenable<void> {
+	quitAndInstall(): Promise<void> {
 		return this.channel.call('quitAndInstall');
 	}
 
-	isLatestVersion(): Thenable<boolean> {
+	isLatestVersion(): Promise<boolean> {
 		return this.channel.call('isLatestVersion');
 	}
 }
diff --git a/src/vs/platform/url/common/url.ts b/src/vs/platform/url/common/url.ts
index f5813089729..f73971c4e00 100644
--- a/src/vs/platform/url/common/url.ts
+++ b/src/vs/platform/url/common/url.ts
@@ -10,12 +10,12 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 export const IURLService = createDecorator<IURLService>('urlService');
 
 export interface IURLHandler {
-	handleURL(uri: URI): Thenable<boolean>;
+	handleURL(uri: URI): Promise<boolean>;
 }
 
 export interface IURLService {
 	_serviceBrand: any;
 
-	open(url: URI): Thenable<boolean>;
+	open(url: URI): Promise<boolean>;
 	registerHandler(handler: IURLHandler): IDisposable;
 }
diff --git a/src/vs/platform/url/common/urlService.ts b/src/vs/platform/url/common/urlService.ts
index d70094077b3..78ebd68a2eb 100644
--- a/src/vs/platform/url/common/urlService.ts
+++ b/src/vs/platform/url/common/urlService.ts
@@ -18,7 +18,7 @@ export class URLService implements IURLService {
 
 	private handlers = new Set<IURLHandler>();
 
-	open(uri: URI): Thenable<boolean> {
+	open(uri: URI): Promise<boolean> {
 		const handlers = Array.from(this.handlers);
 		return first(handlers.map(h => () => h.handleURL(uri)), undefined, false);
 	}
@@ -35,11 +35,11 @@ export class RelayURLService extends URLService implements IURLHandler {
 		super();
 	}
 
-	open(uri: URI): Thenable<boolean> {
+	open(uri: URI): Promise<boolean> {
 		return this.urlService.open(uri);
 	}
 
-	handleURL(uri: URI): Thenable<boolean> {
+	handleURL(uri: URI): Promise<boolean> {
 		return super.open(uri);
 	}
 }
diff --git a/src/vs/platform/url/node/urlIpc.ts b/src/vs/platform/url/node/urlIpc.ts
index 40e14de4b9b..9116fb66444 100644
--- a/src/vs/platform/url/node/urlIpc.ts
+++ b/src/vs/platform/url/node/urlIpc.ts
@@ -17,7 +17,7 @@ export class URLServiceChannel implements IServerChannel {
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	call(_, command: string, arg?: any): Thenable<any> {
+	call(_, command: string, arg?: any): Promise<any> {
 		switch (command) {
 			case 'open': return this.service.open(URI.revive(arg));
 		}
@@ -32,7 +32,7 @@ export class URLServiceChannelClient implements IURLService {
 
 	constructor(private channel: IChannel) { }
 
-	open(url: URI): Thenable<boolean> {
+	open(url: URI): Promise<boolean> {
 		return this.channel.call('open', url.toJSON());
 	}
 
@@ -49,7 +49,7 @@ export class URLHandlerChannel implements IServerChannel {
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	call(_, command: string, arg?: any): Thenable<any> {
+	call(_, command: string, arg?: any): Promise<any> {
 		switch (command) {
 			case 'handleURL': return this.handler.handleURL(URI.revive(arg));
 		}
@@ -62,7 +62,7 @@ export class URLHandlerChannelClient implements IURLHandler {
 
 	constructor(private channel: IChannel) { }
 
-	handleURL(uri: URI): Thenable<boolean> {
+	handleURL(uri: URI): Promise<boolean> {
 		return this.channel.call('handleURL', uri.toJSON());
 	}
 }
diff --git a/src/vs/platform/windows/common/windows.ts b/src/vs/platform/windows/common/windows.ts
index de4bfdff63e..b35ab6b018d 100644
--- a/src/vs/platform/windows/common/windows.ts
+++ b/src/vs/platform/windows/common/windows.ts
@@ -102,72 +102,72 @@ export interface IWindowsService {
 	onRecentlyOpenedChange: Event<void>;
 
 	// Dialogs
-	pickFileFolderAndOpen(options: INativeOpenDialogOptions): Thenable<void>;
-	pickFileAndOpen(options: INativeOpenDialogOptions): Thenable<void>;
-	pickFolderAndOpen(options: INativeOpenDialogOptions): Thenable<void>;
-	pickWorkspaceAndOpen(options: INativeOpenDialogOptions): Thenable<void>;
-	showMessageBox(windowId: number, options: MessageBoxOptions): Thenable<IMessageBoxResult>;
-	showSaveDialog(windowId: number, options: SaveDialogOptions): Thenable<string>;
-	showOpenDialog(windowId: number, options: OpenDialogOptions): Thenable<string[]>;
+	pickFileFolderAndOpen(options: INativeOpenDialogOptions): Promise<void>;
+	pickFileAndOpen(options: INativeOpenDialogOptions): Promise<void>;
+	pickFolderAndOpen(options: INativeOpenDialogOptions): Promise<void>;
+	pickWorkspaceAndOpen(options: INativeOpenDialogOptions): Promise<void>;
+	showMessageBox(windowId: number, options: MessageBoxOptions): Promise<IMessageBoxResult>;
+	showSaveDialog(windowId: number, options: SaveDialogOptions): Promise<string>;
+	showOpenDialog(windowId: number, options: OpenDialogOptions): Promise<string[]>;
 
-	reloadWindow(windowId: number, args?: ParsedArgs): Thenable<void>;
-	openDevTools(windowId: number, options?: IDevToolsOptions): Thenable<void>;
-	toggleDevTools(windowId: number): Thenable<void>;
-	closeWorkspace(windowId: number): Thenable<void>;
-	enterWorkspace(windowId: number, path: string): Thenable<IEnterWorkspaceResult | undefined>;
-	createAndEnterWorkspace(windowId: number, folders?: IWorkspaceFolderCreationData[], path?: string): Thenable<IEnterWorkspaceResult | undefined>;
-	saveAndEnterWorkspace(windowId: number, path: string): Thenable<IEnterWorkspaceResult | undefined>;
-	toggleFullScreen(windowId: number): Thenable<void>;
-	setRepresentedFilename(windowId: number, fileName: string): Thenable<void>;
-	addRecentlyOpened(files: URI[]): Thenable<void>;
-	removeFromRecentlyOpened(paths: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI | string)[]): Thenable<void>;
-	clearRecentlyOpened(): Thenable<void>;
-	getRecentlyOpened(windowId: number): Thenable<IRecentlyOpened>;
-	focusWindow(windowId: number): Thenable<void>;
-	closeWindow(windowId: number): Thenable<void>;
-	isFocused(windowId: number): Thenable<boolean>;
-	isMaximized(windowId: number): Thenable<boolean>;
-	maximizeWindow(windowId: number): Thenable<void>;
-	unmaximizeWindow(windowId: number): Thenable<void>;
-	minimizeWindow(windowId: number): Thenable<void>;
-	onWindowTitleDoubleClick(windowId: number): Thenable<void>;
-	setDocumentEdited(windowId: number, flag: boolean): Thenable<void>;
-	quit(): Thenable<void>;
-	relaunch(options: { addArgs?: string[], removeArgs?: string[] }): Thenable<void>;
+	reloadWindow(windowId: number, args?: ParsedArgs): Promise<void>;
+	openDevTools(windowId: number, options?: IDevToolsOptions): Promise<void>;
+	toggleDevTools(windowId: number): Promise<void>;
+	closeWorkspace(windowId: number): Promise<void>;
+	enterWorkspace(windowId: number, path: string): Promise<IEnterWorkspaceResult | undefined>;
+	createAndEnterWorkspace(windowId: number, folders?: IWorkspaceFolderCreationData[], path?: string): Promise<IEnterWorkspaceResult | undefined>;
+	saveAndEnterWorkspace(windowId: number, path: string): Promise<IEnterWorkspaceResult | undefined>;
+	toggleFullScreen(windowId: number): Promise<void>;
+	setRepresentedFilename(windowId: number, fileName: string): Promise<void>;
+	addRecentlyOpened(files: URI[]): Promise<void>;
+	removeFromRecentlyOpened(paths: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI | string)[]): Promise<void>;
+	clearRecentlyOpened(): Promise<void>;
+	getRecentlyOpened(windowId: number): Promise<IRecentlyOpened>;
+	focusWindow(windowId: number): Promise<void>;
+	closeWindow(windowId: number): Promise<void>;
+	isFocused(windowId: number): Promise<boolean>;
+	isMaximized(windowId: number): Promise<boolean>;
+	maximizeWindow(windowId: number): Promise<void>;
+	unmaximizeWindow(windowId: number): Promise<void>;
+	minimizeWindow(windowId: number): Promise<void>;
+	onWindowTitleDoubleClick(windowId: number): Promise<void>;
+	setDocumentEdited(windowId: number, flag: boolean): Promise<void>;
+	quit(): Promise<void>;
+	relaunch(options: { addArgs?: string[], removeArgs?: string[] }): Promise<void>;
 
 	// macOS Native Tabs
-	newWindowTab(): Thenable<void>;
-	showPreviousWindowTab(): Thenable<void>;
-	showNextWindowTab(): Thenable<void>;
-	moveWindowTabToNewWindow(): Thenable<void>;
-	mergeAllWindowTabs(): Thenable<void>;
-	toggleWindowTabsBar(): Thenable<void>;
+	newWindowTab(): Promise<void>;
+	showPreviousWindowTab(): Promise<void>;
+	showNextWindowTab(): Promise<void>;
+	moveWindowTabToNewWindow(): Promise<void>;
+	mergeAllWindowTabs(): Promise<void>;
+	toggleWindowTabsBar(): Promise<void>;
 
 	// macOS TouchBar
-	updateTouchBar(windowId: number, items: ISerializableCommandAction[][]): Thenable<void>;
+	updateTouchBar(windowId: number, items: ISerializableCommandAction[][]): Promise<void>;
 
 	// Shared process
-	whenSharedProcessReady(): Thenable<void>;
-	toggleSharedProcess(): Thenable<void>;
+	whenSharedProcessReady(): Promise<void>;
+	toggleSharedProcess(): Promise<void>;
 
 	// Global methods
-	openWindow(windowId: number, paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): Thenable<void>;
-	openNewWindow(options?: INewWindowOptions): Thenable<void>;
-	showWindow(windowId: number): Thenable<void>;
-	getWindows(): Thenable<{ id: number; workspace?: IWorkspaceIdentifier; folderUri?: ISingleFolderWorkspaceIdentifier; title: string; filename?: string; }[]>;
-	getWindowCount(): Thenable<number>;
-	log(severity: string, ...messages: string[]): Thenable<void>;
-	showItemInFolder(path: string): Thenable<void>;
-	getActiveWindowId(): Thenable<number | undefined>;
+	openWindow(windowId: number, paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): Promise<void>;
+	openNewWindow(options?: INewWindowOptions): Promise<void>;
+	showWindow(windowId: number): Promise<void>;
+	getWindows(): Promise<{ id: number; workspace?: IWorkspaceIdentifier; folderUri?: ISingleFolderWorkspaceIdentifier; title: string; filename?: string; }[]>;
+	getWindowCount(): Promise<number>;
+	log(severity: string, ...messages: string[]): Promise<void>;
+	showItemInFolder(path: string): Promise<void>;
+	getActiveWindowId(): Promise<number | undefined>;
 
 	// This needs to be handled from browser process to prevent
 	// foreground ordering issues on Windows
-	openExternal(url: string): Thenable<boolean>;
+	openExternal(url: string): Promise<boolean>;
 
 	// TODO: this is a bit backwards
-	startCrashReporter(config: CrashReporterStartOptions): Thenable<void>;
+	startCrashReporter(config: CrashReporterStartOptions): Promise<void>;
 
-	openAboutDialog(): Thenable<void>;
+	openAboutDialog(): Promise<void>;
 	resolveProxy(windowId: number, url: string): Promise<string | undefined>;
 }
 
@@ -189,35 +189,35 @@ export interface IWindowService {
 
 	getConfiguration(): IWindowConfiguration;
 	getCurrentWindowId(): number;
-	pickFileFolderAndOpen(options: INativeOpenDialogOptions): Thenable<void>;
-	pickFileAndOpen(options: INativeOpenDialogOptions): Thenable<void>;
-	pickFolderAndOpen(options: INativeOpenDialogOptions): Thenable<void>;
-	pickWorkspaceAndOpen(options: INativeOpenDialogOptions): Thenable<void>;
-	reloadWindow(args?: ParsedArgs): Thenable<void>;
-	openDevTools(options?: IDevToolsOptions): Thenable<void>;
-	toggleDevTools(): Thenable<void>;
-	closeWorkspace(): Thenable<void>;
-	updateTouchBar(items: ISerializableCommandAction[][]): Thenable<void>;
-	enterWorkspace(path: string): Thenable<IEnterWorkspaceResult | undefined>;
-	createAndEnterWorkspace(folders?: IWorkspaceFolderCreationData[], path?: string): Thenable<IEnterWorkspaceResult | undefined>;
-	saveAndEnterWorkspace(path: string): Thenable<IEnterWorkspaceResult | undefined>;
-	toggleFullScreen(): Thenable<void>;
-	setRepresentedFilename(fileName: string): Thenable<void>;
-	getRecentlyOpened(): Thenable<IRecentlyOpened>;
-	focusWindow(): Thenable<void>;
-	closeWindow(): Thenable<void>;
-	openWindow(paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): Thenable<void>;
-	isFocused(): Thenable<boolean>;
-	setDocumentEdited(flag: boolean): Thenable<void>;
-	isMaximized(): Thenable<boolean>;
-	maximizeWindow(): Thenable<void>;
-	unmaximizeWindow(): Thenable<void>;
-	minimizeWindow(): Thenable<void>;
-	onWindowTitleDoubleClick(): Thenable<void>;
-	show(): Thenable<void>;
-	showMessageBox(options: MessageBoxOptions): Thenable<IMessageBoxResult>;
-	showSaveDialog(options: SaveDialogOptions): Thenable<string>;
-	showOpenDialog(options: OpenDialogOptions): Thenable<string[]>;
+	pickFileFolderAndOpen(options: INativeOpenDialogOptions): Promise<void>;
+	pickFileAndOpen(options: INativeOpenDialogOptions): Promise<void>;
+	pickFolderAndOpen(options: INativeOpenDialogOptions): Promise<void>;
+	pickWorkspaceAndOpen(options: INativeOpenDialogOptions): Promise<void>;
+	reloadWindow(args?: ParsedArgs): Promise<void>;
+	openDevTools(options?: IDevToolsOptions): Promise<void>;
+	toggleDevTools(): Promise<void>;
+	closeWorkspace(): Promise<void>;
+	updateTouchBar(items: ISerializableCommandAction[][]): Promise<void>;
+	enterWorkspace(path: string): Promise<IEnterWorkspaceResult | undefined>;
+	createAndEnterWorkspace(folders?: IWorkspaceFolderCreationData[], path?: string): Promise<IEnterWorkspaceResult | undefined>;
+	saveAndEnterWorkspace(path: string): Promise<IEnterWorkspaceResult | undefined>;
+	toggleFullScreen(): Promise<void>;
+	setRepresentedFilename(fileName: string): Promise<void>;
+	getRecentlyOpened(): Promise<IRecentlyOpened>;
+	focusWindow(): Promise<void>;
+	closeWindow(): Promise<void>;
+	openWindow(paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): Promise<void>;
+	isFocused(): Promise<boolean>;
+	setDocumentEdited(flag: boolean): Promise<void>;
+	isMaximized(): Promise<boolean>;
+	maximizeWindow(): Promise<void>;
+	unmaximizeWindow(): Promise<void>;
+	minimizeWindow(): Promise<void>;
+	onWindowTitleDoubleClick(): Promise<void>;
+	show(): Promise<void>;
+	showMessageBox(options: MessageBoxOptions): Promise<IMessageBoxResult>;
+	showSaveDialog(options: SaveDialogOptions): Promise<string>;
+	showOpenDialog(options: OpenDialogOptions): Promise<string[]>;
 	resolveProxy(url: string): Promise<string | undefined>;
 }
 
@@ -412,7 +412,7 @@ export interface IRunActionInWindowRequest {
 export class ActiveWindowManager implements IDisposable {
 
 	private disposables: IDisposable[] = [];
-	private firstActiveWindowIdPromise: Thenable<any> | null;
+	private firstActiveWindowIdPromise: Promise<any> | null;
 	private _activeWindowId: number | undefined;
 
 	constructor(@IWindowsService windowsService: IWindowsService) {
@@ -431,7 +431,7 @@ export class ActiveWindowManager implements IDisposable {
 		this._activeWindowId = windowId;
 	}
 
-	getActiveClientId(): Thenable<string> {
+	getActiveClientId(): Promise<string> {
 		if (this.firstActiveWindowIdPromise) {
 			return this.firstActiveWindowIdPromise;
 		}
diff --git a/src/vs/platform/windows/electron-browser/windowService.ts b/src/vs/platform/windows/electron-browser/windowService.ts
index 2420fe22136..a6a0ce76ca6 100644
--- a/src/vs/platform/windows/electron-browser/windowService.ts
+++ b/src/vs/platform/windows/electron-browser/windowService.ts
@@ -49,127 +49,127 @@ export class WindowService extends Disposable implements IWindowService {
 		return this.configuration;
 	}
 
-	pickFileFolderAndOpen(options: INativeOpenDialogOptions): Thenable<void> {
+	pickFileFolderAndOpen(options: INativeOpenDialogOptions): Promise<void> {
 		options.windowId = this.windowId;
 
 		return this.windowsService.pickFileFolderAndOpen(options);
 	}
 
-	pickFileAndOpen(options: INativeOpenDialogOptions): Thenable<void> {
+	pickFileAndOpen(options: INativeOpenDialogOptions): Promise<void> {
 		options.windowId = this.windowId;
 
 		return this.windowsService.pickFileAndOpen(options);
 	}
 
-	pickFolderAndOpen(options: INativeOpenDialogOptions): Thenable<void> {
+	pickFolderAndOpen(options: INativeOpenDialogOptions): Promise<void> {
 		options.windowId = this.windowId;
 
 		return this.windowsService.pickFolderAndOpen(options);
 	}
 
-	pickWorkspaceAndOpen(options: INativeOpenDialogOptions): Thenable<void> {
+	pickWorkspaceAndOpen(options: INativeOpenDialogOptions): Promise<void> {
 		options.windowId = this.windowId;
 
 		return this.windowsService.pickWorkspaceAndOpen(options);
 	}
 
-	reloadWindow(args?: ParsedArgs): Thenable<void> {
+	reloadWindow(args?: ParsedArgs): Promise<void> {
 		return this.windowsService.reloadWindow(this.windowId, args);
 	}
 
-	openDevTools(options?: IDevToolsOptions): Thenable<void> {
+	openDevTools(options?: IDevToolsOptions): Promise<void> {
 		return this.windowsService.openDevTools(this.windowId, options);
 	}
 
-	toggleDevTools(): Thenable<void> {
+	toggleDevTools(): Promise<void> {
 		return this.windowsService.toggleDevTools(this.windowId);
 	}
 
-	closeWorkspace(): Thenable<void> {
+	closeWorkspace(): Promise<void> {
 		return this.windowsService.closeWorkspace(this.windowId);
 	}
 
-	enterWorkspace(path: string): Thenable<IEnterWorkspaceResult | undefined> {
+	enterWorkspace(path: string): Promise<IEnterWorkspaceResult | undefined> {
 		return this.windowsService.enterWorkspace(this.windowId, path);
 	}
 
-	createAndEnterWorkspace(folders?: IWorkspaceFolderCreationData[], path?: string): Thenable<IEnterWorkspaceResult | undefined> {
+	createAndEnterWorkspace(folders?: IWorkspaceFolderCreationData[], path?: string): Promise<IEnterWorkspaceResult | undefined> {
 		return this.windowsService.createAndEnterWorkspace(this.windowId, folders, path);
 	}
 
-	saveAndEnterWorkspace(path: string): Thenable<IEnterWorkspaceResult | undefined> {
+	saveAndEnterWorkspace(path: string): Promise<IEnterWorkspaceResult | undefined> {
 		return this.windowsService.saveAndEnterWorkspace(this.windowId, path);
 	}
 
-	openWindow(paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): Thenable<void> {
+	openWindow(paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): Promise<void> {
 		return this.windowsService.openWindow(this.windowId, paths, options);
 	}
 
-	closeWindow(): Thenable<void> {
+	closeWindow(): Promise<void> {
 		return this.windowsService.closeWindow(this.windowId);
 	}
 
-	toggleFullScreen(): Thenable<void> {
+	toggleFullScreen(): Promise<void> {
 		return this.windowsService.toggleFullScreen(this.windowId);
 	}
 
-	setRepresentedFilename(fileName: string): Thenable<void> {
+	setRepresentedFilename(fileName: string): Promise<void> {
 		return this.windowsService.setRepresentedFilename(this.windowId, fileName);
 	}
 
-	getRecentlyOpened(): Thenable<IRecentlyOpened> {
+	getRecentlyOpened(): Promise<IRecentlyOpened> {
 		return this.windowsService.getRecentlyOpened(this.windowId);
 	}
 
-	focusWindow(): Thenable<void> {
+	focusWindow(): Promise<void> {
 		return this.windowsService.focusWindow(this.windowId);
 	}
 
-	isFocused(): Thenable<boolean> {
+	isFocused(): Promise<boolean> {
 		return this.windowsService.isFocused(this.windowId);
 	}
 
-	isMaximized(): Thenable<boolean> {
+	isMaximized(): Promise<boolean> {
 		return this.windowsService.isMaximized(this.windowId);
 	}
 
-	maximizeWindow(): Thenable<void> {
+	maximizeWindow(): Promise<void> {
 		return this.windowsService.maximizeWindow(this.windowId);
 	}
 
-	unmaximizeWindow(): Thenable<void> {
+	unmaximizeWindow(): Promise<void> {
 		return this.windowsService.unmaximizeWindow(this.windowId);
 	}
 
-	minimizeWindow(): Thenable<void> {
+	minimizeWindow(): Promise<void> {
 		return this.windowsService.minimizeWindow(this.windowId);
 	}
 
-	onWindowTitleDoubleClick(): Thenable<void> {
+	onWindowTitleDoubleClick(): Promise<void> {
 		return this.windowsService.onWindowTitleDoubleClick(this.windowId);
 	}
 
-	setDocumentEdited(flag: boolean): Thenable<void> {
+	setDocumentEdited(flag: boolean): Promise<void> {
 		return this.windowsService.setDocumentEdited(this.windowId, flag);
 	}
 
-	show(): Thenable<void> {
+	show(): Promise<void> {
 		return this.windowsService.showWindow(this.windowId);
 	}
 
-	showMessageBox(options: Electron.MessageBoxOptions): Thenable<IMessageBoxResult> {
+	showMessageBox(options: Electron.MessageBoxOptions): Promise<IMessageBoxResult> {
 		return this.windowsService.showMessageBox(this.windowId, options);
 	}
 
-	showSaveDialog(options: Electron.SaveDialogOptions): Thenable<string> {
+	showSaveDialog(options: Electron.SaveDialogOptions): Promise<string> {
 		return this.windowsService.showSaveDialog(this.windowId, options);
 	}
 
-	showOpenDialog(options: Electron.OpenDialogOptions): Thenable<string[]> {
+	showOpenDialog(options: Electron.OpenDialogOptions): Promise<string[]> {
 		return this.windowsService.showOpenDialog(this.windowId, options);
 	}
 
-	updateTouchBar(items: ISerializableCommandAction[][]): Thenable<void> {
+	updateTouchBar(items: ISerializableCommandAction[][]): Promise<void> {
 		return this.windowsService.updateTouchBar(this.windowId, items);
 	}
 
diff --git a/src/vs/platform/windows/electron-main/windows.ts b/src/vs/platform/windows/electron-main/windows.ts
index 291fdcab149..daa26cca87d 100644
--- a/src/vs/platform/windows/electron-main/windows.ts
+++ b/src/vs/platform/windows/electron-main/windows.ts
@@ -45,7 +45,7 @@ export interface ICodeWindow {
 	lastFocusTime: number;
 
 	isReady: boolean;
-	ready(): Thenable<ICodeWindow>;
+	ready(): Promise<ICodeWindow>;
 
 	addTabbedWindow(window: ICodeWindow): void;
 
@@ -96,9 +96,9 @@ export interface IWindowsMainService {
 	// methods
 	ready(initialUserEnv: IProcessEnvironment): void;
 	reload(win: ICodeWindow, cli?: ParsedArgs): void;
-	enterWorkspace(win: ICodeWindow, path: string): Thenable<IEnterWorkspaceResult>;
-	createAndEnterWorkspace(win: ICodeWindow, folders?: IWorkspaceFolderCreationData[], path?: string): Thenable<IEnterWorkspaceResult>;
-	saveAndEnterWorkspace(win: ICodeWindow, path: string): Thenable<IEnterWorkspaceResult>;
+	enterWorkspace(win: ICodeWindow, path: string): Promise<IEnterWorkspaceResult>;
+	createAndEnterWorkspace(win: ICodeWindow, folders?: IWorkspaceFolderCreationData[], path?: string): Promise<IEnterWorkspaceResult>;
+	saveAndEnterWorkspace(win: ICodeWindow, path: string): Promise<IEnterWorkspaceResult>;
 	closeWorkspace(win: ICodeWindow): void;
 	open(openConfig: IOpenConfiguration): ICodeWindow[];
 	openExtensionDevelopmentHostWindow(openConfig: IOpenConfiguration): void;
@@ -106,12 +106,12 @@ export interface IWindowsMainService {
 	pickFolderAndOpen(options: INativeOpenDialogOptions): void;
 	pickFileAndOpen(options: INativeOpenDialogOptions): void;
 	pickWorkspaceAndOpen(options: INativeOpenDialogOptions): void;
-	showMessageBox(options: Electron.MessageBoxOptions, win?: ICodeWindow): Thenable<IMessageBoxResult>;
-	showSaveDialog(options: Electron.SaveDialogOptions, win?: ICodeWindow): Thenable<string>;
-	showOpenDialog(options: Electron.OpenDialogOptions, win?: ICodeWindow): Thenable<string[]>;
+	showMessageBox(options: Electron.MessageBoxOptions, win?: ICodeWindow): Promise<IMessageBoxResult>;
+	showSaveDialog(options: Electron.SaveDialogOptions, win?: ICodeWindow): Promise<string>;
+	showOpenDialog(options: Electron.OpenDialogOptions, win?: ICodeWindow): Promise<string[]>;
 	focusLastActive(cli: ParsedArgs, context: OpenContext): ICodeWindow;
 	getLastActiveWindow(): ICodeWindow;
-	waitForWindowCloseOrLoad(windowId: number): Thenable<void>;
+	waitForWindowCloseOrLoad(windowId: number): Promise<void>;
 	openNewWindow(context: OpenContext, options?: INewWindowOptions): ICodeWindow[];
 	openNewTabbedWindow(context: OpenContext): ICodeWindow[];
 	sendToFocused(channel: string, ...args: any[]): void;
@@ -141,6 +141,6 @@ export interface IOpenConfiguration {
 }
 
 export interface ISharedProcess {
-	whenReady(): Thenable<void>;
+	whenReady(): Promise<void>;
 	toggle(): void;
 }
\ No newline at end of file
diff --git a/src/vs/platform/windows/node/windowsIpc.ts b/src/vs/platform/windows/node/windowsIpc.ts
index ecacad043a0..d6d16c4f7ae 100644
--- a/src/vs/platform/windows/node/windowsIpc.ts
+++ b/src/vs/platform/windows/node/windowsIpc.ts
@@ -43,7 +43,7 @@ export class WindowsChannel implements IServerChannel {
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	call(_, command: string, arg?: any): Thenable<any> {
+	call(_, command: string, arg?: any): Promise<any> {
 		switch (command) {
 			case 'pickFileFolderAndOpen': return this.service.pickFileFolderAndOpen(arg);
 			case 'pickFileAndOpen': return this.service.pickFileAndOpen(arg);
@@ -135,83 +135,83 @@ export class WindowsChannelClient implements IWindowsService {
 	get onWindowUnmaximize(): Event<number> { return this.channel.listen('onWindowUnmaximize'); }
 	get onRecentlyOpenedChange(): Event<void> { return this.channel.listen('onRecentlyOpenedChange'); }
 
-	pickFileFolderAndOpen(options: INativeOpenDialogOptions): Thenable<void> {
+	pickFileFolderAndOpen(options: INativeOpenDialogOptions): Promise<void> {
 		return this.channel.call('pickFileFolderAndOpen', options);
 	}
 
-	pickFileAndOpen(options: INativeOpenDialogOptions): Thenable<void> {
+	pickFileAndOpen(options: INativeOpenDialogOptions): Promise<void> {
 		return this.channel.call('pickFileAndOpen', options);
 	}
 
-	pickFolderAndOpen(options: INativeOpenDialogOptions): Thenable<void> {
+	pickFolderAndOpen(options: INativeOpenDialogOptions): Promise<void> {
 		return this.channel.call('pickFolderAndOpen', options);
 	}
 
-	pickWorkspaceAndOpen(options: INativeOpenDialogOptions): Thenable<void> {
+	pickWorkspaceAndOpen(options: INativeOpenDialogOptions): Promise<void> {
 		return this.channel.call('pickWorkspaceAndOpen', options);
 	}
 
-	showMessageBox(windowId: number, options: MessageBoxOptions): Thenable<IMessageBoxResult> {
+	showMessageBox(windowId: number, options: MessageBoxOptions): Promise<IMessageBoxResult> {
 		return this.channel.call('showMessageBox', [windowId, options]);
 	}
 
-	showSaveDialog(windowId: number, options: SaveDialogOptions): Thenable<string> {
+	showSaveDialog(windowId: number, options: SaveDialogOptions): Promise<string> {
 		return this.channel.call('showSaveDialog', [windowId, options]);
 	}
 
-	showOpenDialog(windowId: number, options: OpenDialogOptions): Thenable<string[]> {
+	showOpenDialog(windowId: number, options: OpenDialogOptions): Promise<string[]> {
 		return this.channel.call('showOpenDialog', [windowId, options]);
 	}
 
-	reloadWindow(windowId: number, args?: ParsedArgs): Thenable<void> {
+	reloadWindow(windowId: number, args?: ParsedArgs): Promise<void> {
 		return this.channel.call('reloadWindow', [windowId, args]);
 	}
 
-	openDevTools(windowId: number, options?: IDevToolsOptions): Thenable<void> {
+	openDevTools(windowId: number, options?: IDevToolsOptions): Promise<void> {
 		return this.channel.call('openDevTools', [windowId, options]);
 	}
 
-	toggleDevTools(windowId: number): Thenable<void> {
+	toggleDevTools(windowId: number): Promise<void> {
 		return this.channel.call('toggleDevTools', windowId);
 	}
 
-	closeWorkspace(windowId: number): Thenable<void> {
+	closeWorkspace(windowId: number): Promise<void> {
 		return this.channel.call('closeWorkspace', windowId);
 	}
 
-	enterWorkspace(windowId: number, path: string): Thenable<IEnterWorkspaceResult> {
+	enterWorkspace(windowId: number, path: string): Promise<IEnterWorkspaceResult> {
 		return this.channel.call('enterWorkspace', [windowId, path]);
 	}
 
-	createAndEnterWorkspace(windowId: number, folders?: IWorkspaceFolderCreationData[], path?: string): Thenable<IEnterWorkspaceResult> {
+	createAndEnterWorkspace(windowId: number, folders?: IWorkspaceFolderCreationData[], path?: string): Promise<IEnterWorkspaceResult> {
 		return this.channel.call('createAndEnterWorkspace', [windowId, folders, path]);
 	}
 
-	saveAndEnterWorkspace(windowId: number, path: string): Thenable<IEnterWorkspaceResult> {
+	saveAndEnterWorkspace(windowId: number, path: string): Promise<IEnterWorkspaceResult> {
 		return this.channel.call('saveAndEnterWorkspace', [windowId, path]);
 	}
 
-	toggleFullScreen(windowId: number): Thenable<void> {
+	toggleFullScreen(windowId: number): Promise<void> {
 		return this.channel.call('toggleFullScreen', windowId);
 	}
 
-	setRepresentedFilename(windowId: number, fileName: string): Thenable<void> {
+	setRepresentedFilename(windowId: number, fileName: string): Promise<void> {
 		return this.channel.call('setRepresentedFilename', [windowId, fileName]);
 	}
 
-	addRecentlyOpened(files: URI[]): Thenable<void> {
+	addRecentlyOpened(files: URI[]): Promise<void> {
 		return this.channel.call('addRecentlyOpened', files);
 	}
 
-	removeFromRecentlyOpened(paths: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI)[]): Thenable<void> {
+	removeFromRecentlyOpened(paths: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI)[]): Promise<void> {
 		return this.channel.call('removeFromRecentlyOpened', paths);
 	}
 
-	clearRecentlyOpened(): Thenable<void> {
+	clearRecentlyOpened(): Promise<void> {
 		return this.channel.call('clearRecentlyOpened');
 	}
 
-	getRecentlyOpened(windowId: number): Thenable<IRecentlyOpened> {
+	getRecentlyOpened(windowId: number): Promise<IRecentlyOpened> {
 		return this.channel.call('getRecentlyOpened', windowId)
 			.then((recentlyOpened: IRecentlyOpened) => {
 				recentlyOpened.workspaces = recentlyOpened.workspaces.map(workspace => isWorkspaceIdentifier(workspace) ? workspace : URI.revive(workspace));
@@ -220,127 +220,127 @@ export class WindowsChannelClient implements IWindowsService {
 			});
 	}
 
-	newWindowTab(): Thenable<void> {
+	newWindowTab(): Promise<void> {
 		return this.channel.call('newWindowTab');
 	}
 
-	showPreviousWindowTab(): Thenable<void> {
+	showPreviousWindowTab(): Promise<void> {
 		return this.channel.call('showPreviousWindowTab');
 	}
 
-	showNextWindowTab(): Thenable<void> {
+	showNextWindowTab(): Promise<void> {
 		return this.channel.call('showNextWindowTab');
 	}
 
-	moveWindowTabToNewWindow(): Thenable<void> {
+	moveWindowTabToNewWindow(): Promise<void> {
 		return this.channel.call('moveWindowTabToNewWindow');
 	}
 
-	mergeAllWindowTabs(): Thenable<void> {
+	mergeAllWindowTabs(): Promise<void> {
 		return this.channel.call('mergeAllWindowTabs');
 	}
 
-	toggleWindowTabsBar(): Thenable<void> {
+	toggleWindowTabsBar(): Promise<void> {
 		return this.channel.call('toggleWindowTabsBar');
 	}
 
-	focusWindow(windowId: number): Thenable<void> {
+	focusWindow(windowId: number): Promise<void> {
 		return this.channel.call('focusWindow', windowId);
 	}
 
-	closeWindow(windowId: number): Thenable<void> {
+	closeWindow(windowId: number): Promise<void> {
 		return this.channel.call('closeWindow', windowId);
 	}
 
-	isFocused(windowId: number): Thenable<boolean> {
+	isFocused(windowId: number): Promise<boolean> {
 		return this.channel.call('isFocused', windowId);
 	}
 
-	isMaximized(windowId: number): Thenable<boolean> {
+	isMaximized(windowId: number): Promise<boolean> {
 		return this.channel.call('isMaximized', windowId);
 	}
 
-	maximizeWindow(windowId: number): Thenable<void> {
+	maximizeWindow(windowId: number): Promise<void> {
 		return this.channel.call('maximizeWindow', windowId);
 	}
 
-	unmaximizeWindow(windowId: number): Thenable<void> {
+	unmaximizeWindow(windowId: number): Promise<void> {
 		return this.channel.call('unmaximizeWindow', windowId);
 	}
 
-	minimizeWindow(windowId: number): Thenable<void> {
+	minimizeWindow(windowId: number): Promise<void> {
 		return this.channel.call('minimizeWindow', windowId);
 	}
 
-	onWindowTitleDoubleClick(windowId: number): Thenable<void> {
+	onWindowTitleDoubleClick(windowId: number): Promise<void> {
 		return this.channel.call('onWindowTitleDoubleClick', windowId);
 	}
 
-	setDocumentEdited(windowId: number, flag: boolean): Thenable<void> {
+	setDocumentEdited(windowId: number, flag: boolean): Promise<void> {
 		return this.channel.call('setDocumentEdited', [windowId, flag]);
 	}
 
-	quit(): Thenable<void> {
+	quit(): Promise<void> {
 		return this.channel.call('quit');
 	}
 
-	relaunch(options: { addArgs?: string[], removeArgs?: string[] }): Thenable<void> {
+	relaunch(options: { addArgs?: string[], removeArgs?: string[] }): Promise<void> {
 		return this.channel.call('relaunch', [options]);
 	}
 
-	whenSharedProcessReady(): Thenable<void> {
+	whenSharedProcessReady(): Promise<void> {
 		return this.channel.call('whenSharedProcessReady');
 	}
 
-	toggleSharedProcess(): Thenable<void> {
+	toggleSharedProcess(): Promise<void> {
 		return this.channel.call('toggleSharedProcess');
 	}
 
-	openWindow(windowId: number, paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): Thenable<void> {
+	openWindow(windowId: number, paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): Promise<void> {
 		return this.channel.call('openWindow', [windowId, paths, options]);
 	}
 
-	openNewWindow(options?: INewWindowOptions): Thenable<void> {
+	openNewWindow(options?: INewWindowOptions): Promise<void> {
 		return this.channel.call('openNewWindow', options);
 	}
 
-	showWindow(windowId: number): Thenable<void> {
+	showWindow(windowId: number): Promise<void> {
 		return this.channel.call('showWindow', windowId);
 	}
 
-	getWindows(): Thenable<{ id: number; workspace?: IWorkspaceIdentifier; folderUri?: ISingleFolderWorkspaceIdentifier; title: string; filename?: string; }[]> {
+	getWindows(): Promise<{ id: number; workspace?: IWorkspaceIdentifier; folderUri?: ISingleFolderWorkspaceIdentifier; title: string; filename?: string; }[]> {
 		return this.channel.call<{ id: number; workspace?: IWorkspaceIdentifier; folderUri?: ISingleFolderWorkspaceIdentifier; title: string; filename?: string; }[]>('getWindows').then(result => { result.forEach(win => win.folderUri = win.folderUri ? URI.revive(win.folderUri) : win.folderUri); return result; });
 	}
 
-	getWindowCount(): Thenable<number> {
+	getWindowCount(): Promise<number> {
 		return this.channel.call('getWindowCount');
 	}
 
-	log(severity: string, ...messages: string[]): Thenable<void> {
+	log(severity: string, ...messages: string[]): Promise<void> {
 		return this.channel.call('log', [severity, messages]);
 	}
 
-	showItemInFolder(path: string): Thenable<void> {
+	showItemInFolder(path: string): Promise<void> {
 		return this.channel.call('showItemInFolder', path);
 	}
 
-	getActiveWindowId(): Thenable<number | undefined> {
+	getActiveWindowId(): Promise<number | undefined> {
 		return this.channel.call('getActiveWindowId');
 	}
 
-	openExternal(url: string): Thenable<boolean> {
+	openExternal(url: string): Promise<boolean> {
 		return this.channel.call('openExternal', url);
 	}
 
-	startCrashReporter(config: CrashReporterStartOptions): Thenable<void> {
+	startCrashReporter(config: CrashReporterStartOptions): Promise<void> {
 		return this.channel.call('startCrashReporter', config);
 	}
 
-	updateTouchBar(windowId: number, items: ISerializableCommandAction[][]): Thenable<void> {
+	updateTouchBar(windowId: number, items: ISerializableCommandAction[][]): Promise<void> {
 		return this.channel.call('updateTouchBar', [windowId, items]);
 	}
 
-	openAboutDialog(): Thenable<void> {
+	openAboutDialog(): Promise<void> {
 		return this.channel.call('openAboutDialog');
 	}
 
diff --git a/src/vs/platform/workspaces/common/workspaces.ts b/src/vs/platform/workspaces/common/workspaces.ts
index d7617021103..d913586c132 100644
--- a/src/vs/platform/workspaces/common/workspaces.ts
+++ b/src/vs/platform/workspaces/common/workspaces.ts
@@ -80,11 +80,11 @@ export interface IWorkspacesMainService extends IWorkspacesService {
 	onWorkspaceSaved: Event<IWorkspaceSavedEvent>;
 	onUntitledWorkspaceDeleted: Event<IWorkspaceIdentifier>;
 
-	saveWorkspace(workspace: IWorkspaceIdentifier, target: string): Thenable<IWorkspaceIdentifier>;
+	saveWorkspace(workspace: IWorkspaceIdentifier, target: string): Promise<IWorkspaceIdentifier>;
 
 	createWorkspaceSync(folders?: IWorkspaceFolderCreationData[]): IWorkspaceIdentifier;
 
-	resolveWorkspace(path: string): Thenable<IResolvedWorkspace | null>;
+	resolveWorkspace(path: string): Promise<IResolvedWorkspace | null>;
 
 	resolveWorkspaceSync(path: string): IResolvedWorkspace | null;
 
@@ -100,7 +100,7 @@ export interface IWorkspacesMainService extends IWorkspacesService {
 export interface IWorkspacesService {
 	_serviceBrand: any;
 
-	createWorkspace(folders?: IWorkspaceFolderCreationData[]): Thenable<IWorkspaceIdentifier>;
+	createWorkspace(folders?: IWorkspaceFolderCreationData[]): Promise<IWorkspaceIdentifier>;
 }
 
 export function isSingleFolderWorkspaceIdentifier(obj: any): obj is ISingleFolderWorkspaceIdentifier {
diff --git a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
index 84d82b8529f..c91d7504af4 100644
--- a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
+++ b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
@@ -49,7 +49,7 @@ export class WorkspacesMainService extends Disposable implements IWorkspacesMain
 		this.workspacesHome = environmentService.workspacesHome;
 	}
 
-	resolveWorkspace(path: string): Thenable<IResolvedWorkspace | null> {
+	resolveWorkspace(path: string): Promise<IResolvedWorkspace | null> {
 		if (!this.isWorkspacePath(path)) {
 			return Promise.resolve(null); // does not look like a valid workspace config file
 		}
@@ -114,7 +114,7 @@ export class WorkspacesMainService extends Disposable implements IWorkspacesMain
 		return isParent(path, this.environmentService.workspacesHome, !isLinux /* ignore case */);
 	}
 
-	createWorkspace(folders?: IWorkspaceFolderCreationData[]): Thenable<IWorkspaceIdentifier> {
+	createWorkspace(folders?: IWorkspaceFolderCreationData[]): Promise<IWorkspaceIdentifier> {
 		const { workspace, configParent, storedWorkspace } = this.createUntitledWorkspace(folders);
 
 		return mkdirp(configParent).then(() => {
@@ -186,7 +186,7 @@ export class WorkspacesMainService extends Disposable implements IWorkspacesMain
 		return this.isInsideWorkspacesHome(workspace.configPath);
 	}
 
-	saveWorkspace(workspace: IWorkspaceIdentifier, targetConfigPath: string): Thenable<IWorkspaceIdentifier> {
+	saveWorkspace(workspace: IWorkspaceIdentifier, targetConfigPath: string): Promise<IWorkspaceIdentifier> {
 
 		// Return early if target is same as source
 		if (isEqual(workspace.configPath, targetConfigPath, !isLinux)) {
diff --git a/src/vs/platform/workspaces/node/workspacesIpc.ts b/src/vs/platform/workspaces/node/workspacesIpc.ts
index b59519ccaa0..bfd39ea3e0c 100644
--- a/src/vs/platform/workspaces/node/workspacesIpc.ts
+++ b/src/vs/platform/workspaces/node/workspacesIpc.ts
@@ -16,7 +16,7 @@ export class WorkspacesChannel implements IServerChannel {
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	call(_, command: string, arg?: any): Thenable<any> {
+	call(_, command: string, arg?: any): Promise<any> {
 		switch (command) {
 			case 'createWorkspace': {
 				const rawFolders: IWorkspaceFolderCreationData[] = arg;
@@ -44,7 +44,7 @@ export class WorkspacesChannelClient implements IWorkspacesService {
 
 	constructor(private channel: IChannel) { }
 
-	createWorkspace(folders?: IWorkspaceFolderCreationData[]): Thenable<IWorkspaceIdentifier> {
+	createWorkspace(folders?: IWorkspaceFolderCreationData[]): Promise<IWorkspaceIdentifier> {
 		return this.channel.call('createWorkspace', folders);
 	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadCommands.ts b/src/vs/workbench/api/electron-browser/mainThreadCommands.ts
index 4753577d61c..ebfc4171ae3 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadCommands.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadCommands.ts
@@ -32,7 +32,7 @@ export class MainThreadCommands implements MainThreadCommandsShape {
 		this._generateCommandsDocumentationRegistration.dispose();
 	}
 
-	private _generateCommandsDocumentation(): Thenable<void> {
+	private _generateCommandsDocumentation(): Promise<void> {
 		return this._proxy.$getContributedCommandHandlerDescriptions().then(result => {
 			// add local commands
 			const commands = CommandsRegistry.getCommands();
@@ -70,14 +70,14 @@ export class MainThreadCommands implements MainThreadCommandsShape {
 		}
 	}
 
-	$executeCommand<T>(id: string, args: any[]): Thenable<T> {
+	$executeCommand<T>(id: string, args: any[]): Promise<T> {
 		for (let i = 0; i < args.length; i++) {
 			args[i] = revive(args[i], 0);
 		}
 		return this._commandService.executeCommand<T>(id, ...args);
 	}
 
-	$getCommands(): Thenable<string[]> {
+	$getCommands(): Promise<string[]> {
 		return Promise.resolve(Object.keys(CommandsRegistry.getCommands()));
 	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadConfiguration.ts b/src/vs/workbench/api/electron-browser/mainThreadConfiguration.ts
index 1656cb5c4de..171b7217a89 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadConfiguration.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadConfiguration.ts
@@ -34,12 +34,12 @@ export class MainThreadConfiguration implements MainThreadConfigurationShape {
 		this._configurationListener.dispose();
 	}
 
-	$updateConfigurationOption(target: ConfigurationTarget, key: string, value: any, resourceUriComponenets: UriComponents): Thenable<void> {
+	$updateConfigurationOption(target: ConfigurationTarget, key: string, value: any, resourceUriComponenets: UriComponents): Promise<void> {
 		const resource = resourceUriComponenets ? URI.revive(resourceUriComponenets) : null;
 		return this.writeConfiguration(target, key, value, resource);
 	}
 
-	$removeConfigurationOption(target: ConfigurationTarget, key: string, resourceUriComponenets: UriComponents): Thenable<void> {
+	$removeConfigurationOption(target: ConfigurationTarget, key: string, resourceUriComponenets: UriComponents): Promise<void> {
 		const resource = resourceUriComponenets ? URI.revive(resourceUriComponenets) : null;
 		return this.writeConfiguration(target, key, undefined, resource);
 	}
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts b/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
index 3cfcb747fdc..f6a450ccdec 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
@@ -121,7 +121,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 		}
 	}
 
-	public $registerBreakpoints(DTOs: (ISourceMultiBreakpointDto | IFunctionBreakpointDto)[]): Thenable<void> {
+	public $registerBreakpoints(DTOs: (ISourceMultiBreakpointDto | IFunctionBreakpointDto)[]): Promise<void> {
 
 		for (let dto of DTOs) {
 			if (dto.type === 'sourceMulti') {
@@ -144,14 +144,14 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 		return void 0;
 	}
 
-	public $unregisterBreakpoints(breakpointIds: string[], functionBreakpointIds: string[]): Thenable<void> {
+	public $unregisterBreakpoints(breakpointIds: string[], functionBreakpointIds: string[]): Promise<void> {
 		breakpointIds.forEach(id => this.debugService.removeBreakpoints(id));
 		functionBreakpointIds.forEach(id => this.debugService.removeFunctionBreakpoints(id));
 		return void 0;
 	}
 
 
-	public $registerDebugConfigurationProvider(debugType: string, hasProvide: boolean, hasResolve: boolean, hasProvideDebugAdapter: boolean, hasTracker: boolean, handle: number): Thenable<void> {
+	public $registerDebugConfigurationProvider(debugType: string, hasProvide: boolean, hasResolve: boolean, hasProvideDebugAdapter: boolean, hasTracker: boolean, handle: number): Promise<void> {
 
 		const provider = <IDebugConfigurationProvider>{
 			type: debugType,
@@ -186,7 +186,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 		}
 	}
 
-	public $registerDebugAdapterDescriptorFactory(debugType: string, handle: number): Thenable<void> {
+	public $registerDebugAdapterDescriptorFactory(debugType: string, handle: number): Promise<void> {
 
 		const provider = <IDebugAdapterDescriptorFactory>{
 			type: debugType,
@@ -226,7 +226,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 		}
 	}
 
-	public $startDebugging(_folderUri: uri | undefined, nameOrConfiguration: string | IConfig): Thenable<boolean> {
+	public $startDebugging(_folderUri: uri | undefined, nameOrConfiguration: string | IConfig): Promise<boolean> {
 		const folderUri = _folderUri ? uri.revive(_folderUri) : undefined;
 		const launch = this.debugService.getConfigurationManager().getLaunch(folderUri);
 		return this.debugService.startDebugging(launch, nameOrConfiguration).then(success => {
@@ -236,7 +236,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 		});
 	}
 
-	public $customDebugAdapterRequest(sessionId: DebugSessionUUID, request: string, args: any): Thenable<any> {
+	public $customDebugAdapterRequest(sessionId: DebugSessionUUID, request: string, args: any): Promise<any> {
 		const session = this.debugService.getModel().getSessions(true).filter(s => s.getId() === sessionId).pop();
 		if (session) {
 			return session.customRequest(request, args).then(response => {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.ts b/src/vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.ts
index 82419e929e9..45150b6a9ca 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.ts
@@ -41,7 +41,7 @@ export class MainThreadDocumentContentProviders implements MainThreadDocumentCon
 
 	$registerTextContentProvider(handle: number, scheme: string): void {
 		const registration = this._textModelResolverService.registerTextModelContentProvider(scheme, {
-			provideTextContent: (uri: URI): Thenable<ITextModel> => {
+			provideTextContent: (uri: URI): Promise<ITextModel> => {
 				return this._proxy.$provideTextDocumentContent(handle, uri).then(value => {
 					if (typeof value === 'string') {
 						const firstLineText = value.substr(0, 1 + value.search(/\r?\n/));
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDocuments.ts b/src/vs/workbench/api/electron-browser/mainThreadDocuments.ts
index 901457479b8..99fc3ac120a 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadDocuments.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadDocuments.ts
@@ -167,17 +167,17 @@ export class MainThreadDocuments implements MainThreadDocumentsShape {
 
 	// --- from extension host process
 
-	$trySaveDocument(uri: UriComponents): Thenable<boolean> {
+	$trySaveDocument(uri: UriComponents): Promise<boolean> {
 		return this._textFileService.save(URI.revive(uri));
 	}
 
-	$tryOpenDocument(_uri: UriComponents): Thenable<any> {
+	$tryOpenDocument(_uri: UriComponents): Promise<any> {
 		const uri = URI.revive(_uri);
 		if (!uri.scheme || !(uri.fsPath || uri.authority)) {
 			return Promise.reject(new Error(`Invalid uri. Scheme and authority or path must be set.`));
 		}
 
-		let promise: Thenable<boolean>;
+		let promise: Promise<boolean>;
 		switch (uri.scheme) {
 			case Schemas.untitled:
 				promise = this._handleUnititledScheme(uri);
@@ -201,11 +201,11 @@ export class MainThreadDocuments implements MainThreadDocumentsShape {
 		});
 	}
 
-	$tryCreateDocument(options?: { language?: string, content?: string }): Thenable<URI> {
+	$tryCreateDocument(options?: { language?: string, content?: string }): Promise<URI> {
 		return this._doCreateUntitled(void 0, options ? options.language : void 0, options ? options.content : void 0);
 	}
 
-	private _handleAsResourceInput(uri: URI): Thenable<boolean> {
+	private _handleAsResourceInput(uri: URI): Promise<boolean> {
 		return this._textModelResolverService.createModelReference(uri).then(ref => {
 			this._modelReferenceCollection.add(ref);
 			const result = !!ref.object;
@@ -213,7 +213,7 @@ export class MainThreadDocuments implements MainThreadDocumentsShape {
 		});
 	}
 
-	private _handleUnititledScheme(uri: URI): Thenable<boolean> {
+	private _handleUnititledScheme(uri: URI): Promise<boolean> {
 		let asFileUri = uri.with({ scheme: Schemas.file });
 		return this._fileService.resolveFile(asFileUri).then(stats => {
 			// don't create a new file ontop of an existing file
@@ -223,7 +223,7 @@ export class MainThreadDocuments implements MainThreadDocumentsShape {
 		});
 	}
 
-	private _doCreateUntitled(resource?: URI, modeId?: string, initialValue?: string): Thenable<URI> {
+	private _doCreateUntitled(resource?: URI, modeId?: string, initialValue?: string): Promise<URI> {
 		return this._untitledEditorService.loadOrCreate({
 			resource,
 			modeId,
diff --git a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
index dc9f78727e7..d57fe21bbbf 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
@@ -114,7 +114,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 
 	// --- from extension host process
 
-	$tryShowTextDocument(resource: UriComponents, options: ITextDocumentShowOptions): Thenable<string> {
+	$tryShowTextDocument(resource: UriComponents, options: ITextDocumentShowOptions): Promise<string> {
 		const uri = URI.revive(resource);
 
 		const editorOptions: ITextEditorOptions = {
@@ -136,7 +136,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		});
 	}
 
-	$tryShowEditor(id: string, position?: EditorViewColumn): Thenable<void> {
+	$tryShowEditor(id: string, position?: EditorViewColumn): Promise<void> {
 		let mainThreadEditor = this._documentsAndEditors.getEditor(id);
 		if (mainThreadEditor) {
 			let model = mainThreadEditor.getModel();
@@ -148,7 +148,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		return undefined;
 	}
 
-	$tryHideEditor(id: string): Thenable<void> {
+	$tryHideEditor(id: string): Promise<void> {
 		let mainThreadEditor = this._documentsAndEditors.getEditor(id);
 		if (mainThreadEditor) {
 			let editors = this._editorService.visibleControls;
@@ -161,7 +161,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		return undefined;
 	}
 
-	$trySetSelections(id: string, selections: ISelection[]): Thenable<void> {
+	$trySetSelections(id: string, selections: ISelection[]): Promise<void> {
 		if (!this._documentsAndEditors.getEditor(id)) {
 			return Promise.reject(disposed(`TextEditor(${id})`));
 		}
@@ -169,7 +169,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		return Promise.resolve(null);
 	}
 
-	$trySetDecorations(id: string, key: string, ranges: IDecorationOptions[]): Thenable<void> {
+	$trySetDecorations(id: string, key: string, ranges: IDecorationOptions[]): Promise<void> {
 		key = `${this._instanceId}-${key}`;
 		if (!this._documentsAndEditors.getEditor(id)) {
 			return Promise.reject(disposed(`TextEditor(${id})`));
@@ -178,7 +178,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		return Promise.resolve(null);
 	}
 
-	$trySetDecorationsFast(id: string, key: string, ranges: number[]): Thenable<void> {
+	$trySetDecorationsFast(id: string, key: string, ranges: number[]): Promise<void> {
 		key = `${this._instanceId}-${key}`;
 		if (!this._documentsAndEditors.getEditor(id)) {
 			return Promise.reject(disposed(`TextEditor(${id})`));
@@ -187,7 +187,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		return Promise.resolve(null);
 	}
 
-	$tryRevealRange(id: string, range: IRange, revealType: TextEditorRevealType): Thenable<void> {
+	$tryRevealRange(id: string, range: IRange, revealType: TextEditorRevealType): Promise<void> {
 		if (!this._documentsAndEditors.getEditor(id)) {
 			return Promise.reject(disposed(`TextEditor(${id})`));
 		}
@@ -195,7 +195,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		return undefined;
 	}
 
-	$trySetOptions(id: string, options: ITextEditorConfigurationUpdate): Thenable<void> {
+	$trySetOptions(id: string, options: ITextEditorConfigurationUpdate): Promise<void> {
 		if (!this._documentsAndEditors.getEditor(id)) {
 			return Promise.reject(disposed(`TextEditor(${id})`));
 		}
@@ -203,19 +203,19 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		return Promise.resolve(null);
 	}
 
-	$tryApplyEdits(id: string, modelVersionId: number, edits: ISingleEditOperation[], opts: IApplyEditsOptions): Thenable<boolean> {
+	$tryApplyEdits(id: string, modelVersionId: number, edits: ISingleEditOperation[], opts: IApplyEditsOptions): Promise<boolean> {
 		if (!this._documentsAndEditors.getEditor(id)) {
 			return Promise.reject(disposed(`TextEditor(${id})`));
 		}
 		return Promise.resolve(this._documentsAndEditors.getEditor(id).applyEdits(modelVersionId, edits, opts));
 	}
 
-	$tryApplyWorkspaceEdit(dto: WorkspaceEditDto): Thenable<boolean> {
+	$tryApplyWorkspaceEdit(dto: WorkspaceEditDto): Promise<boolean> {
 		const { edits } = reviveWorkspaceEditDto(dto);
 		return this._bulkEditService.apply({ edits }, undefined).then(() => true, err => false);
 	}
 
-	$tryInsertSnippet(id: string, template: string, ranges: IRange[], opts: IUndoStopOptions): Thenable<boolean> {
+	$tryInsertSnippet(id: string, template: string, ranges: IRange[], opts: IUndoStopOptions): Promise<boolean> {
 		if (!this._documentsAndEditors.getEditor(id)) {
 			return Promise.reject(disposed(`TextEditor(${id})`));
 		}
@@ -234,7 +234,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		this._codeEditorService.removeDecorationType(key);
 	}
 
-	$getDiffInformation(id: string): Thenable<ILineChange[]> {
+	$getDiffInformation(id: string): Promise<ILineChange[]> {
 		const editor = this._documentsAndEditors.getEditor(id);
 
 		if (!editor) {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
index ab621c9f767..277b711619d 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
@@ -96,53 +96,53 @@ class RemoteFileSystemProvider implements IFileSystemProvider {
 		return Buffer.isBuffer(data) ? data : Buffer.from(data.buffer, data.byteOffset, data.byteLength);
 	}
 
-	stat(resource: URI): Thenable<IStat> {
+	stat(resource: URI): Promise<IStat> {
 		return this._proxy.$stat(this._handle, resource).then(undefined, err => {
 			throw err;
 		});
 	}
 
-	readFile(resource: URI): Thenable<Uint8Array> {
+	readFile(resource: URI): Promise<Uint8Array> {
 		return this._proxy.$readFile(this._handle, resource);
 	}
 
-	writeFile(resource: URI, content: Uint8Array, opts: FileWriteOptions): Thenable<void> {
+	writeFile(resource: URI, content: Uint8Array, opts: FileWriteOptions): Promise<void> {
 		return this._proxy.$writeFile(this._handle, resource, RemoteFileSystemProvider._asBuffer(content), opts);
 	}
 
-	delete(resource: URI, opts: FileDeleteOptions): Thenable<void> {
+	delete(resource: URI, opts: FileDeleteOptions): Promise<void> {
 		return this._proxy.$delete(this._handle, resource, opts);
 	}
 
-	mkdir(resource: URI): Thenable<void> {
+	mkdir(resource: URI): Promise<void> {
 		return this._proxy.$mkdir(this._handle, resource);
 	}
 
-	readdir(resource: URI): Thenable<[string, FileType][]> {
+	readdir(resource: URI): Promise<[string, FileType][]> {
 		return this._proxy.$readdir(this._handle, resource);
 	}
 
-	rename(resource: URI, target: URI, opts: FileOverwriteOptions): Thenable<void> {
+	rename(resource: URI, target: URI, opts: FileOverwriteOptions): Promise<void> {
 		return this._proxy.$rename(this._handle, resource, target, opts);
 	}
 
-	copy(resource: URI, target: URI, opts: FileOverwriteOptions): Thenable<void> {
+	copy(resource: URI, target: URI, opts: FileOverwriteOptions): Promise<void> {
 		return this._proxy.$copy(this._handle, resource, target, opts);
 	}
 
-	open(resource: URI): Thenable<number> {
+	open(resource: URI): Promise<number> {
 		return this._proxy.$open(this._handle, resource);
 	}
 
-	close(fd: number): Thenable<void> {
+	close(fd: number): Promise<void> {
 		return this._proxy.$close(this._handle, fd);
 	}
 
-	read(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Thenable<number> {
+	read(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Promise<number> {
 		return this._proxy.$read(this._handle, fd, pos, RemoteFileSystemProvider._asBuffer(data), offset, length);
 	}
 
-	write(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Thenable<number> {
+	write(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Promise<number> {
 		return this._proxy.$write(this._handle, fd, pos, RemoteFileSystemProvider._asBuffer(data), offset, length);
 	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadHeapService.ts b/src/vs/workbench/api/electron-browser/mainThreadHeapService.ts
index e3efb95b75c..33d17085fc9 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadHeapService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadHeapService.ts
@@ -23,7 +23,7 @@ export interface IHeapService {
 	 * Track gc-collection for all new objects that
 	 * have the $ident-value set.
 	 */
-	trackRecursive<T>(obj: T | Thenable<T>): Thenable<T>;
+	trackRecursive<T>(obj: T | Promise<T>): Promise<T>;
 }
 
 export class HeapService implements IHeapService {
@@ -45,7 +45,7 @@ export class HeapService implements IHeapService {
 		clearInterval(this._consumeHandle);
 	}
 
-	trackRecursive<T>(obj: T | Thenable<T>): Thenable<T> {
+	trackRecursive<T>(obj: T | Promise<T>): Promise<T> {
 		if (isThenable(obj)) {
 			return obj.then(result => this.trackRecursive(result));
 		} else {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
index a78ff21c63a..86411c0fc92 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
@@ -111,7 +111,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 	$registerOutlineSupport(handle: number, selector: ISerializedDocumentFilter[], displayName: string): void {
 		this._registrations[handle] = modes.DocumentSymbolProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.DocumentSymbolProvider>{
 			displayName,
-			provideDocumentSymbols: (model: ITextModel, token: CancellationToken): Thenable<modes.DocumentSymbol[]> => {
+			provideDocumentSymbols: (model: ITextModel, token: CancellationToken): Promise<modes.DocumentSymbol[]> => {
 				return this._proxy.$provideDocumentSymbols(handle, model.uri, token);
 			}
 		});
@@ -122,10 +122,10 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 	$registerCodeLensSupport(handle: number, selector: ISerializedDocumentFilter[], eventHandle: number): void {
 
 		const provider = <modes.CodeLensProvider>{
-			provideCodeLenses: (model: ITextModel, token: CancellationToken): modes.ICodeLensSymbol[] | Thenable<modes.ICodeLensSymbol[]> => {
+			provideCodeLenses: (model: ITextModel, token: CancellationToken): modes.ICodeLensSymbol[] | Promise<modes.ICodeLensSymbol[]> => {
 				return this._heapService.trackRecursive(this._proxy.$provideCodeLenses(handle, model.uri, token));
 			},
-			resolveCodeLens: (model: ITextModel, codeLens: modes.ICodeLensSymbol, token: CancellationToken): modes.ICodeLensSymbol | Thenable<modes.ICodeLensSymbol> => {
+			resolveCodeLens: (model: ITextModel, codeLens: modes.ICodeLensSymbol, token: CancellationToken): modes.ICodeLensSymbol | Promise<modes.ICodeLensSymbol> => {
 				return this._heapService.trackRecursive(this._proxy.$resolveCodeLens(handle, model.uri, codeLens, token));
 			}
 		};
@@ -150,7 +150,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 	$registerDefinitionSupport(handle: number, selector: ISerializedDocumentFilter[]): void {
 		this._registrations[handle] = modes.DefinitionProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.DefinitionProvider>{
-			provideDefinition: (model, position, token): Thenable<modes.DefinitionLink[]> => {
+			provideDefinition: (model, position, token): Promise<modes.DefinitionLink[]> => {
 				return this._proxy.$provideDefinition(handle, model.uri, position, token).then(MainThreadLanguageFeatures._reviveDefinitionLinkDto);
 			}
 		});
@@ -166,7 +166,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 	$registerImplementationSupport(handle: number, selector: ISerializedDocumentFilter[]): void {
 		this._registrations[handle] = modes.ImplementationProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.ImplementationProvider>{
-			provideImplementation: (model, position, token): Thenable<modes.Definition> => {
+			provideImplementation: (model, position, token): Promise<modes.Definition> => {
 				return this._proxy.$provideImplementation(handle, model.uri, position, token).then(MainThreadLanguageFeatures._reviveDefinitionLinkDto);
 			}
 		});
@@ -174,7 +174,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 	$registerTypeDefinitionSupport(handle: number, selector: ISerializedDocumentFilter[]): void {
 		this._registrations[handle] = modes.TypeDefinitionProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.TypeDefinitionProvider>{
-			provideTypeDefinition: (model, position, token): Thenable<modes.Definition> => {
+			provideTypeDefinition: (model, position, token): Promise<modes.Definition> => {
 				return this._proxy.$provideTypeDefinition(handle, model.uri, position, token).then(MainThreadLanguageFeatures._reviveDefinitionLinkDto);
 			}
 		});
@@ -184,7 +184,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 	$registerHoverProvider(handle: number, selector: ISerializedDocumentFilter[]): void {
 		this._registrations[handle] = modes.HoverProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.HoverProvider>{
-			provideHover: (model: ITextModel, position: EditorPosition, token: CancellationToken): Thenable<modes.Hover> => {
+			provideHover: (model: ITextModel, position: EditorPosition, token: CancellationToken): Promise<modes.Hover> => {
 				return this._proxy.$provideHover(handle, model.uri, position, token);
 			}
 		});
@@ -194,7 +194,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 	$registerDocumentHighlightProvider(handle: number, selector: ISerializedDocumentFilter[]): void {
 		this._registrations[handle] = modes.DocumentHighlightProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.DocumentHighlightProvider>{
-			provideDocumentHighlights: (model: ITextModel, position: EditorPosition, token: CancellationToken): Thenable<modes.DocumentHighlight[]> => {
+			provideDocumentHighlights: (model: ITextModel, position: EditorPosition, token: CancellationToken): Promise<modes.DocumentHighlight[]> => {
 				return this._proxy.$provideDocumentHighlights(handle, model.uri, position, token);
 			}
 		});
@@ -204,7 +204,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 	$registerReferenceSupport(handle: number, selector: ISerializedDocumentFilter[]): void {
 		this._registrations[handle] = modes.ReferenceProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.ReferenceProvider>{
-			provideReferences: (model: ITextModel, position: EditorPosition, context: modes.ReferenceContext, token: CancellationToken): Thenable<modes.Location[]> => {
+			provideReferences: (model: ITextModel, position: EditorPosition, context: modes.ReferenceContext, token: CancellationToken): Promise<modes.Location[]> => {
 				return this._proxy.$provideReferences(handle, model.uri, position, context, token).then(MainThreadLanguageFeatures._reviveLocationDto);
 			}
 		});
@@ -214,7 +214,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 	$registerQuickFixSupport(handle: number, selector: ISerializedDocumentFilter[], providedCodeActionKinds?: string[]): void {
 		this._registrations[handle] = modes.CodeActionProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.CodeActionProvider>{
-			provideCodeActions: (model: ITextModel, rangeOrSelection: EditorRange | Selection, context: modes.CodeActionContext, token: CancellationToken): Thenable<modes.CodeAction[]> => {
+			provideCodeActions: (model: ITextModel, rangeOrSelection: EditorRange | Selection, context: modes.CodeActionContext, token: CancellationToken): Promise<modes.CodeAction[]> => {
 				return this._heapService.trackRecursive(this._proxy.$provideCodeActions(handle, model.uri, rangeOrSelection, context, token)).then(MainThreadLanguageFeatures._reviveCodeActionDto);
 			},
 			providedCodeActionKinds
@@ -225,7 +225,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 	$registerDocumentFormattingSupport(handle: number, selector: ISerializedDocumentFilter[]): void {
 		this._registrations[handle] = modes.DocumentFormattingEditProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.DocumentFormattingEditProvider>{
-			provideDocumentFormattingEdits: (model: ITextModel, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]> => {
+			provideDocumentFormattingEdits: (model: ITextModel, options: modes.FormattingOptions, token: CancellationToken): Promise<ISingleEditOperation[]> => {
 				return this._proxy.$provideDocumentFormattingEdits(handle, model.uri, options, token);
 			}
 		});
@@ -233,7 +233,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 	$registerRangeFormattingSupport(handle: number, selector: ISerializedDocumentFilter[]): void {
 		this._registrations[handle] = modes.DocumentRangeFormattingEditProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.DocumentRangeFormattingEditProvider>{
-			provideDocumentRangeFormattingEdits: (model: ITextModel, range: EditorRange, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]> => {
+			provideDocumentRangeFormattingEdits: (model: ITextModel, range: EditorRange, options: modes.FormattingOptions, token: CancellationToken): Promise<ISingleEditOperation[]> => {
 				return this._proxy.$provideDocumentRangeFormattingEdits(handle, model.uri, range, options, token);
 			}
 		});
@@ -244,7 +244,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 			autoFormatTriggerCharacters,
 
-			provideOnTypeFormattingEdits: (model: ITextModel, position: EditorPosition, ch: string, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]> => {
+			provideOnTypeFormattingEdits: (model: ITextModel, position: EditorPosition, ch: string, options: modes.FormattingOptions, token: CancellationToken): Promise<ISingleEditOperation[]> => {
 				return this._proxy.$provideOnTypeFormattingEdits(handle, model.uri, position, ch, options, token);
 			}
 		});
@@ -255,7 +255,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 	$registerNavigateTypeSupport(handle: number): void {
 		let lastResultId: number;
 		this._registrations[handle] = search.WorkspaceSymbolProviderRegistry.register(<search.IWorkspaceSymbolProvider>{
-			provideWorkspaceSymbols: (search: string, token: CancellationToken): Thenable<search.IWorkspaceSymbol[]> => {
+			provideWorkspaceSymbols: (search: string, token: CancellationToken): Promise<search.IWorkspaceSymbol[]> => {
 				return this._proxy.$provideWorkspaceSymbols(handle, search, token).then(result => {
 					if (lastResultId !== undefined) {
 						this._proxy.$releaseWorkspaceSymbols(handle, lastResultId);
@@ -264,7 +264,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 					return MainThreadLanguageFeatures._reviveWorkspaceSymbolDto(result.symbols);
 				});
 			},
-			resolveWorkspaceSymbol: (item: search.IWorkspaceSymbol, token: CancellationToken): Thenable<search.IWorkspaceSymbol> => {
+			resolveWorkspaceSymbol: (item: search.IWorkspaceSymbol, token: CancellationToken): Promise<search.IWorkspaceSymbol> => {
 				return this._proxy.$resolveWorkspaceSymbol(handle, item, token).then(i => MainThreadLanguageFeatures._reviveWorkspaceSymbolDto(i));
 			}
 		});
@@ -275,11 +275,11 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 	$registerRenameSupport(handle: number, selector: ISerializedDocumentFilter[], supportResolveLocation: boolean): void {
 
 		this._registrations[handle] = modes.RenameProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.RenameProvider>{
-			provideRenameEdits: (model: ITextModel, position: EditorPosition, newName: string, token: CancellationToken): Thenable<modes.WorkspaceEdit> => {
+			provideRenameEdits: (model: ITextModel, position: EditorPosition, newName: string, token: CancellationToken): Promise<modes.WorkspaceEdit> => {
 				return this._proxy.$provideRenameEdits(handle, model.uri, position, newName, token).then(reviveWorkspaceEditDto);
 			},
 			resolveRenameLocation: supportResolveLocation
-				? (model: ITextModel, position: EditorPosition, token: CancellationToken): Thenable<modes.RenameLocation> => this._proxy.$resolveRenameLocation(handle, model.uri, position, token)
+				? (model: ITextModel, position: EditorPosition, token: CancellationToken): Promise<modes.RenameLocation> => this._proxy.$resolveRenameLocation(handle, model.uri, position, token)
 				: undefined
 		});
 	}
@@ -289,7 +289,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 	$registerSuggestSupport(handle: number, selector: ISerializedDocumentFilter[], triggerCharacters: string[], supportsResolveDetails: boolean): void {
 		this._registrations[handle] = modes.CompletionProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.CompletionItemProvider>{
 			triggerCharacters,
-			provideCompletionItems: (model: ITextModel, position: EditorPosition, context: modes.CompletionContext, token: CancellationToken): Thenable<modes.CompletionList> => {
+			provideCompletionItems: (model: ITextModel, position: EditorPosition, context: modes.CompletionContext, token: CancellationToken): Promise<modes.CompletionList> => {
 				return this._proxy.$provideCompletionItems(handle, model.uri, position, context, token).then(result => {
 					if (!result) {
 						return result;
@@ -315,7 +315,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 			signatureHelpTriggerCharacters: metadata.triggerCharacters,
 			signatureHelpRetriggerCharacters: metadata.retriggerCharacters,
 
-			provideSignatureHelp: (model: ITextModel, position: EditorPosition, token: CancellationToken, context: modes.SignatureHelpContext): Thenable<modes.SignatureHelp> => {
+			provideSignatureHelp: (model: ITextModel, position: EditorPosition, token: CancellationToken, context: modes.SignatureHelpContext): Promise<modes.SignatureHelp> => {
 				return this._proxy.$provideSignatureHelp(handle, model.uri, position, context, token);
 			}
 		});
diff --git a/src/vs/workbench/api/electron-browser/mainThreadLanguages.ts b/src/vs/workbench/api/electron-browser/mainThreadLanguages.ts
index 6ea6e3b3524..88925d6bceb 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadLanguages.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadLanguages.ts
@@ -23,11 +23,11 @@ export class MainThreadLanguages implements MainThreadLanguagesShape {
 		// nothing
 	}
 
-	$getLanguages(): Thenable<string[]> {
+	$getLanguages(): Promise<string[]> {
 		return Promise.resolve(this._modeService.getRegisteredModes());
 	}
 
-	$changeLanguage(resource: UriComponents, languageId: string): Thenable<void> {
+	$changeLanguage(resource: UriComponents, languageId: string): Promise<void> {
 		const uri = URI.revive(resource);
 		let model = this._modelService.getModel(uri);
 		if (!model) {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts b/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts
index 9defb392d53..b0ef3ef24c6 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts
@@ -31,7 +31,7 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
 		//
 	}
 
-	$showMessage(severity: Severity, message: string, options: MainThreadMessageOptions, commands: { title: string; isCloseAffordance: boolean; handle: number; }[]): Thenable<number> {
+	$showMessage(severity: Severity, message: string, options: MainThreadMessageOptions, commands: { title: string; isCloseAffordance: boolean; handle: number; }[]): Promise<number> {
 		if (options.modal) {
 			return this._showModalMessage(severity, message, commands);
 		} else {
@@ -39,7 +39,7 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
 		}
 	}
 
-	private _showMessage(severity: Severity, message: string, commands: { title: string; isCloseAffordance: boolean; handle: number; }[], extension: IExtensionDescription): Thenable<number> {
+	private _showMessage(severity: Severity, message: string, commands: { title: string; isCloseAffordance: boolean; handle: number; }[], extension: IExtensionDescription): Promise<number> {
 
 		return new Promise<number>(resolve => {
 
@@ -96,7 +96,7 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
 		});
 	}
 
-	private _showModalMessage(severity: Severity, message: string, commands: { title: string; isCloseAffordance: boolean; handle: number; }[]): Thenable<number> {
+	private _showModalMessage(severity: Severity, message: string, commands: { title: string; isCloseAffordance: boolean; handle: number; }[]): Promise<number> {
 		let cancelId: number | undefined = void 0;
 
 		const buttons = commands.map((command, index) => {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadOutputService.ts b/src/vs/workbench/api/electron-browser/mainThreadOutputService.ts
index e7f0708c8b1..7427501f88c 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadOutputService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadOutputService.ts
@@ -45,14 +45,14 @@ export class MainThreadOutputService extends Disposable implements MainThreadOut
 		setVisibleChannel();
 	}
 
-	public $register(label: string, log: boolean, file?: UriComponents): Thenable<string> {
+	public $register(label: string, log: boolean, file?: UriComponents): Promise<string> {
 		const id = 'extension-output-#' + (MainThreadOutputService._idPool++);
 		Registry.as<IOutputChannelRegistry>(Extensions.OutputChannels).registerChannel({ id, label, file: file ? URI.revive(file) : null, log });
 		this._register(toDisposable(() => this.$dispose(id)));
 		return Promise.resolve(id);
 	}
 
-	public $append(channelId: string, value: string): Thenable<void> {
+	public $append(channelId: string, value: string): Promise<void> {
 		const channel = this._getChannel(channelId);
 		if (channel) {
 			channel.append(value);
@@ -60,7 +60,7 @@ export class MainThreadOutputService extends Disposable implements MainThreadOut
 		return undefined;
 	}
 
-	public $update(channelId: string): Thenable<void> {
+	public $update(channelId: string): Promise<void> {
 		const channel = this._getChannel(channelId);
 		if (channel) {
 			channel.update();
@@ -68,7 +68,7 @@ export class MainThreadOutputService extends Disposable implements MainThreadOut
 		return undefined;
 	}
 
-	public $clear(channelId: string, till: number): Thenable<void> {
+	public $clear(channelId: string, till: number): Promise<void> {
 		const channel = this._getChannel(channelId);
 		if (channel) {
 			channel.clear(till);
@@ -76,7 +76,7 @@ export class MainThreadOutputService extends Disposable implements MainThreadOut
 		return undefined;
 	}
 
-	public $reveal(channelId: string, preserveFocus: boolean): Thenable<void> {
+	public $reveal(channelId: string, preserveFocus: boolean): Promise<void> {
 		const channel = this._getChannel(channelId);
 		if (channel) {
 			this._outputService.showChannel(channel.id, preserveFocus);
@@ -84,7 +84,7 @@ export class MainThreadOutputService extends Disposable implements MainThreadOut
 		return undefined;
 	}
 
-	public $close(channelId: string): Thenable<void> {
+	public $close(channelId: string): Promise<void> {
 		const panel = this._panelService.getActivePanel();
 		if (panel && panel.getId() === OUTPUT_PANEL_ID && channelId === this._outputService.getActiveChannel().id) {
 			this._partService.setPanelHidden(true);
@@ -93,7 +93,7 @@ export class MainThreadOutputService extends Disposable implements MainThreadOut
 		return undefined;
 	}
 
-	public $dispose(channelId: string): Thenable<void> {
+	public $dispose(channelId: string): Promise<void> {
 		const channel = this._getChannel(channelId);
 		if (channel) {
 			channel.dispose();
diff --git a/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts b/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
index 0c15505bd43..580831d2b27 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
@@ -36,7 +36,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 	public dispose(): void {
 	}
 
-	$show(instance: number, options: IPickOptions<TransferQuickPickItems>, token: CancellationToken): Thenable<number | number[]> {
+	$show(instance: number, options: IPickOptions<TransferQuickPickItems>, token: CancellationToken): Promise<number | number[]> {
 		const contents = new Promise<TransferQuickPickItems[]>((resolve, reject) => {
 			this._items[instance] = { resolve, reject };
 		});
@@ -67,7 +67,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 		}
 	}
 
-	$setItems(instance: number, items: TransferQuickPickItems[]): Thenable<void> {
+	$setItems(instance: number, items: TransferQuickPickItems[]): Promise<void> {
 		if (this._items[instance]) {
 			this._items[instance].resolve(items);
 			delete this._items[instance];
@@ -75,7 +75,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 		return undefined;
 	}
 
-	$setError(instance: number, error: Error): Thenable<void> {
+	$setError(instance: number, error: Error): Promise<void> {
 		if (this._items[instance]) {
 			this._items[instance].reject(error);
 			delete this._items[instance];
@@ -85,7 +85,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 
 	// ---- input
 
-	$input(options: InputBoxOptions, validateInput: boolean, token: CancellationToken): Thenable<string> {
+	$input(options: InputBoxOptions, validateInput: boolean, token: CancellationToken): Promise<string> {
 		const inputOptions: IInputOptions = Object.create(null);
 
 		if (options) {
@@ -110,7 +110,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 
 	private sessions = new Map<number, QuickInputSession>();
 
-	$createOrUpdate(params: TransferQuickInput): Thenable<void> {
+	$createOrUpdate(params: TransferQuickInput): Promise<void> {
 		const sessionId = params.id;
 		let session = this.sessions.get(sessionId);
 		if (!session) {
@@ -202,7 +202,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 		return Promise.resolve(undefined);
 	}
 
-	$dispose(sessionId: number): Thenable<void> {
+	$dispose(sessionId: number): Promise<void> {
 		const session = this.sessions.get(sessionId);
 		if (session) {
 			session.input.dispose();
diff --git a/src/vs/workbench/api/electron-browser/mainThreadSCM.ts b/src/vs/workbench/api/electron-browser/mainThreadSCM.ts
index 661d290e43f..5d0e8f9cbd3 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadSCM.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadSCM.ts
@@ -71,7 +71,7 @@ class MainThreadSCMResource implements ISCMResource {
 		public decorations: ISCMResourceDecorations
 	) { }
 
-	open(): Thenable<void> {
+	open(): Promise<void> {
 		return this.proxy.$executeResourceCommand(this.sourceControlHandle, this.groupHandle, this.handle);
 	}
 
diff --git a/src/vs/workbench/api/electron-browser/mainThreadStorage.ts b/src/vs/workbench/api/electron-browser/mainThreadStorage.ts
index 4f33f7b4dad..ac9c82bb075 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadStorage.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadStorage.ts
@@ -39,7 +39,7 @@ export class MainThreadStorage implements MainThreadStorageShape {
 		this._storageListener.dispose();
 	}
 
-	$getValue<T>(shared: boolean, key: string): Thenable<T> {
+	$getValue<T>(shared: boolean, key: string): Promise<T> {
 		if (shared) {
 			this._sharedStorageKeysToWatch.set(key, true);
 		}
@@ -58,7 +58,7 @@ export class MainThreadStorage implements MainThreadStorageShape {
 		return JSON.parse(jsonValue);
 	}
 
-	$setValue(shared: boolean, key: string, value: object): Thenable<void> {
+	$setValue(shared: boolean, key: string, value: object): Promise<void> {
 		let jsonValue: string;
 		try {
 			jsonValue = JSON.stringify(value);
diff --git a/src/vs/workbench/api/electron-browser/mainThreadTask.ts b/src/vs/workbench/api/electron-browser/mainThreadTask.ts
index c66ec8f3103..401b83e4c7d 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadTask.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadTask.ts
@@ -408,7 +408,7 @@ export class MainThreadTask implements MainThreadTaskShape {
 		this._providers.clear();
 	}
 
-	public $registerTaskProvider(handle: number): Thenable<void> {
+	public $registerTaskProvider(handle: number): Promise<void> {
 		let provider: ITaskProvider = {
 			provideTasks: (validTypes: IStringDictionary<boolean>) => {
 				return Promise.resolve(this._proxy.$provideTasks(handle, validTypes)).then((value) => {
@@ -439,12 +439,12 @@ export class MainThreadTask implements MainThreadTaskShape {
 		return Promise.resolve(undefined);
 	}
 
-	public $unregisterTaskProvider(handle: number): Thenable<void> {
+	public $unregisterTaskProvider(handle: number): Promise<void> {
 		this._providers.delete(handle);
 		return Promise.resolve(undefined);
 	}
 
-	public $fetchTasks(filter?: TaskFilterDTO): Thenable<TaskDTO[]> {
+	public $fetchTasks(filter?: TaskFilterDTO): Promise<TaskDTO[]> {
 		return this._taskService.tasks(TaskFilterDTO.to(filter)).then((tasks) => {
 			let result: TaskDTO[] = [];
 			for (let task of tasks) {
@@ -457,7 +457,7 @@ export class MainThreadTask implements MainThreadTaskShape {
 		});
 	}
 
-	public $executeTask(value: TaskHandleDTO | TaskDTO): Thenable<TaskExecutionDTO> {
+	public $executeTask(value: TaskHandleDTO | TaskDTO): Promise<TaskExecutionDTO> {
 		return new Promise<TaskExecutionDTO>((resolve, reject) => {
 			if (TaskHandleDTO.is(value)) {
 				let workspaceFolder = this._workspaceContextServer.getWorkspaceFolder(URI.revive(value.workspaceFolder));
@@ -487,7 +487,7 @@ export class MainThreadTask implements MainThreadTaskShape {
 		});
 	}
 
-	public $terminateTask(id: string): Thenable<void> {
+	public $terminateTask(id: string): Promise<void> {
 		return new Promise<void>((resolve, reject) => {
 			this._taskService.getActiveTasks().then((tasks) => {
 				for (let task of tasks) {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts b/src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
index f3dc24577ab..a391dbe8385 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
@@ -55,7 +55,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		// when the extension host process goes down ?
 	}
 
-	public $createTerminal(name?: string, shellPath?: string, shellArgs?: string[], cwd?: string, env?: { [key: string]: string }, waitOnExit?: boolean): Thenable<number> {
+	public $createTerminal(name?: string, shellPath?: string, shellArgs?: string[], cwd?: string, env?: { [key: string]: string }, waitOnExit?: boolean): Promise<number> {
 		const shellLaunchConfig: IShellLaunchConfig = {
 			name,
 			executable: shellPath,
@@ -68,7 +68,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		return Promise.resolve(this.terminalService.createTerminal(shellLaunchConfig).id);
 	}
 
-	public $createTerminalRenderer(name: string): Thenable<number> {
+	public $createTerminalRenderer(name: string): Promise<number> {
 		const instance = this.terminalService.createTerminalRenderer(name);
 		return Promise.resolve(instance.id);
 	}
diff --git a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
index d798d579b02..127dd97c18f 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
@@ -41,7 +41,7 @@ export class MainThreadTreeViews extends Disposable implements MainThreadTreeVie
 		}
 	}
 
-	$reveal(treeViewId: string, item: ITreeItem, parentChain: ITreeItem[], options: IRevealOptions): Thenable<void> {
+	$reveal(treeViewId: string, item: ITreeItem, parentChain: ITreeItem[], options: IRevealOptions): Promise<void> {
 		return this.viewsService.openView(treeViewId, options.focus)
 			.then(() => {
 				const viewer = this.getTreeView(treeViewId);
@@ -49,7 +49,7 @@ export class MainThreadTreeViews extends Disposable implements MainThreadTreeVie
 			});
 	}
 
-	$refresh(treeViewId: string, itemsToRefreshByHandle: { [treeItemHandle: string]: ITreeItem }): Thenable<void> {
+	$refresh(treeViewId: string, itemsToRefreshByHandle: { [treeItemHandle: string]: ITreeItem }): Promise<void> {
 		const viewer = this.getTreeView(treeViewId);
 		const dataProvider = this._dataProviders.get(treeViewId);
 		if (viewer && dataProvider) {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadUrls.ts b/src/vs/workbench/api/electron-browser/mainThreadUrls.ts
index ab3585598ed..d4a3f429742 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadUrls.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadUrls.ts
@@ -41,7 +41,7 @@ export class MainThreadUrls implements MainThreadUrlsShape {
 		this.proxy = context.getProxy(ExtHostContext.ExtHostUrls);
 	}
 
-	$registerUriHandler(handle: number, extensionId: string): Thenable<void> {
+	$registerUriHandler(handle: number, extensionId: string): Promise<void> {
 		const handler = new ExtensionUrlHandler(this.proxy, handle, extensionId);
 		const disposable = this.urlService.registerHandler(handler);
 
@@ -51,7 +51,7 @@ export class MainThreadUrls implements MainThreadUrlsShape {
 		return Promise.resolve(null);
 	}
 
-	$unregisterUriHandler(handle: number): Thenable<void> {
+	$unregisterUriHandler(handle: number): Promise<void> {
 		const tuple = this.handlers.get(handle);
 
 		if (!tuple) {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index e8cad936198..054e832c0d1 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -131,7 +131,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		this._webviewService.revealWebview(webview, targetGroup || this._editorGroupService.activeGroup, showOptions.preserveFocus);
 	}
 
-	public $postMessage(handle: WebviewPanelHandle, message: any): Thenable<boolean> {
+	public $postMessage(handle: WebviewPanelHandle, message: any): Promise<boolean> {
 		const webview = this.getWebview(handle);
 		const editors = this._editorService.visibleControls
 			.filter(e => e instanceof WebviewEditor)
diff --git a/src/vs/workbench/api/electron-browser/mainThreadWindow.ts b/src/vs/workbench/api/electron-browser/mainThreadWindow.ts
index 7f914802597..5620a886f69 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWindow.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWindow.ts
@@ -25,7 +25,7 @@ export class MainThreadWindow implements MainThreadWindowShape {
 			(this.proxy.$onDidChangeWindowFocus, this.proxy, this.disposables);
 	}
 
-	$getWindowVisibility(): Thenable<boolean> {
+	$getWindowVisibility(): Promise<boolean> {
 		return this.windowService.isFocused();
 	}
 
diff --git a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
index a57c1ae6512..e22d865739c 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
@@ -60,7 +60,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 
 	// --- workspace ---
 
-	$updateWorkspaceFolders(extensionName: string, index: number, deleteCount: number, foldersToAdd: { uri: UriComponents, name?: string }[]): Thenable<void> {
+	$updateWorkspaceFolders(extensionName: string, index: number, deleteCount: number, foldersToAdd: { uri: UriComponents, name?: string }[]): Promise<void> {
 		const workspaceFoldersToAdd = foldersToAdd.map(f => ({ uri: URI.revive(f.uri), name: f.name }));
 
 		// Indicate in status message
@@ -113,7 +113,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 
 	// --- search ---
 
-	$startFileSearch(includePattern: string, _includeFolder: UriComponents, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Thenable<URI[]> {
+	$startFileSearch(includePattern: string, _includeFolder: UriComponents, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Promise<URI[]> {
 		const includeFolder = URI.revive(_includeFolder);
 		const workspace = this._contextService.getWorkspace();
 		if (!workspace.folders.length) {
@@ -174,7 +174,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		});
 	}
 
-	$startTextSearch(pattern: IPatternInfo, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Thenable<TextSearchComplete> {
+	$startTextSearch(pattern: IPatternInfo, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<TextSearchComplete> {
 		const workspace = this._contextService.getWorkspace();
 		const folders = workspace.folders.map(folder => folder.uri);
 
@@ -203,7 +203,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		return search;
 	}
 
-	$checkExists(includes: string[], token: CancellationToken): Thenable<boolean> {
+	$checkExists(includes: string[], token: CancellationToken): Promise<boolean> {
 		const queryBuilder = this._instantiationService.createInstance(QueryBuilder);
 		const folders = this._contextService.getWorkspace().folders.map(folder => folder.uri);
 		const query = queryBuilder.file(folders, {
@@ -227,13 +227,13 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 
 	// --- save & edit resources ---
 
-	$saveAll(includeUntitled?: boolean): Thenable<boolean> {
+	$saveAll(includeUntitled?: boolean): Promise<boolean> {
 		return this._textFileService.saveAll(includeUntitled).then(result => {
 			return result.results.every(each => each.success === true);
 		});
 	}
 
-	$resolveProxy(url: string): Thenable<string> {
+	$resolveProxy(url: string): Promise<string> {
 		return this._windowService.resolveProxy(url);
 	}
 }
diff --git a/src/vs/workbench/api/node/apiCommands.ts b/src/vs/workbench/api/node/apiCommands.ts
index 85f3012a678..d45fa9d6195 100644
--- a/src/vs/workbench/api/node/apiCommands.ts
+++ b/src/vs/workbench/api/node/apiCommands.ts
@@ -20,7 +20,7 @@ import { EditorGroupLayout } from 'vs/workbench/services/group/common/editorGrou
 // -----------------------------------------------------------------
 
 export interface ICommandsExecutor {
-	executeCommand<T>(id: string, ...args: any[]): Thenable<T>;
+	executeCommand<T>(id: string, ...args: any[]): Promise<T>;
 }
 
 function adjustHandler(handler: (executor: ICommandsExecutor, ...args: any[]) => any): ICommandHandler {
@@ -31,7 +31,7 @@ function adjustHandler(handler: (executor: ICommandsExecutor, ...args: any[]) =>
 
 export class PreviewHTMLAPICommand {
 	public static ID = 'vscode.previewHtml';
-	public static execute(executor: ICommandsExecutor, uri: URI, position?: vscode.ViewColumn, label?: string, options?: any): Thenable<any> {
+	public static execute(executor: ICommandsExecutor, uri: URI, position?: vscode.ViewColumn, label?: string, options?: any): Promise<any> {
 		return executor.executeCommand('_workbench.previewHtml',
 			uri,
 			typeof position === 'number' && typeConverters.ViewColumn.from(position),
@@ -44,7 +44,7 @@ CommandsRegistry.registerCommand(PreviewHTMLAPICommand.ID, adjustHandler(Preview
 
 export class OpenFolderAPICommand {
 	public static ID = 'vscode.openFolder';
-	public static execute(executor: ICommandsExecutor, uri?: URI, forceNewWindow?: boolean): Thenable<any> {
+	public static execute(executor: ICommandsExecutor, uri?: URI, forceNewWindow?: boolean): Promise<any> {
 		if (!uri) {
 			return executor.executeCommand('_files.pickFolderAndOpen', forceNewWindow);
 		}
@@ -62,7 +62,7 @@ CommandsRegistry.registerCommand(OpenFolderAPICommand.ID, adjustHandler(OpenFold
 
 export class DiffAPICommand {
 	public static ID = 'vscode.diff';
-	public static execute(executor: ICommandsExecutor, left: URI, right: URI, label: string, options?: vscode.TextDocumentShowOptions): Thenable<any> {
+	public static execute(executor: ICommandsExecutor, left: URI, right: URI, label: string, options?: vscode.TextDocumentShowOptions): Promise<any> {
 		return executor.executeCommand('_workbench.diff', [
 			left, right,
 			label,
@@ -76,7 +76,7 @@ CommandsRegistry.registerCommand(DiffAPICommand.ID, adjustHandler(DiffAPICommand
 
 export class OpenAPICommand {
 	public static ID = 'vscode.open';
-	public static execute(executor: ICommandsExecutor, resource: URI, columnOrOptions?: vscode.ViewColumn | vscode.TextDocumentShowOptions, label?: string): Thenable<any> {
+	public static execute(executor: ICommandsExecutor, resource: URI, columnOrOptions?: vscode.ViewColumn | vscode.TextDocumentShowOptions, label?: string): Promise<any> {
 		let options: ITextEditorOptions;
 		let position: EditorViewColumn;
 
@@ -101,7 +101,7 @@ CommandsRegistry.registerCommand(OpenAPICommand.ID, adjustHandler(OpenAPICommand
 
 export class RemoveFromRecentlyOpenedAPICommand {
 	public static ID = 'vscode.removeFromRecentlyOpened';
-	public static execute(executor: ICommandsExecutor, path: string): Thenable<any> {
+	public static execute(executor: ICommandsExecutor, path: string): Promise<any> {
 		return executor.executeCommand('_workbench.removeFromRecentlyOpened', path);
 	}
 }
@@ -109,7 +109,7 @@ CommandsRegistry.registerCommand(RemoveFromRecentlyOpenedAPICommand.ID, adjustHa
 
 export class SetEditorLayoutAPICommand {
 	public static ID = 'vscode.setEditorLayout';
-	public static execute(executor: ICommandsExecutor, layout: EditorGroupLayout): Thenable<any> {
+	public static execute(executor: ICommandsExecutor, layout: EditorGroupLayout): Promise<any> {
 		return executor.executeCommand('layoutEditorGroups', layout);
 	}
 }
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 024fca4e640..a6f1aae4ce7 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -101,8 +101,8 @@ export interface MainThreadClipboardShape extends IDisposable {
 export interface MainThreadCommandsShape extends IDisposable {
 	$registerCommand(id: string): void;
 	$unregisterCommand(id: string): void;
-	$executeCommand<T>(id: string, args: any[]): Thenable<T>;
-	$getCommands(): Thenable<string[]>;
+	$executeCommand<T>(id: string, args: any[]): Promise<T>;
+	$getCommands(): Promise<string[]>;
 }
 
 export interface CommentProviderFeatures {
@@ -120,8 +120,8 @@ export interface MainThreadCommentsShape extends IDisposable {
 }
 
 export interface MainThreadConfigurationShape extends IDisposable {
-	$updateConfigurationOption(target: ConfigurationTarget, key: string, value: any, resource: UriComponents): Thenable<void>;
-	$removeConfigurationOption(target: ConfigurationTarget, key: string, resource: UriComponents): Thenable<void>;
+	$updateConfigurationOption(target: ConfigurationTarget, key: string, value: any, resource: UriComponents): Promise<void>;
+	$removeConfigurationOption(target: ConfigurationTarget, key: string, resource: UriComponents): Promise<void>;
 }
 
 export interface MainThreadDiagnosticsShape extends IDisposable {
@@ -145,8 +145,8 @@ export interface MainThreadDialogSaveOptions {
 }
 
 export interface MainThreadDiaglogsShape extends IDisposable {
-	$showOpenDialog(options: MainThreadDialogOpenOptions): Thenable<UriComponents[]>;
-	$showSaveDialog(options: MainThreadDialogSaveOptions): Thenable<UriComponents>;
+	$showOpenDialog(options: MainThreadDialogOpenOptions): Promise<UriComponents[]>;
+	$showSaveDialog(options: MainThreadDialogSaveOptions): Promise<UriComponents>;
 }
 
 export interface MainThreadDecorationsShape extends IDisposable {
@@ -162,9 +162,9 @@ export interface MainThreadDocumentContentProvidersShape extends IDisposable {
 }
 
 export interface MainThreadDocumentsShape extends IDisposable {
-	$tryCreateDocument(options?: { language?: string; content?: string; }): Thenable<UriComponents>;
-	$tryOpenDocument(uri: UriComponents): Thenable<void>;
-	$trySaveDocument(uri: UriComponents): Thenable<boolean>;
+	$tryCreateDocument(options?: { language?: string; content?: string; }): Promise<UriComponents>;
+	$tryOpenDocument(uri: UriComponents): Promise<void>;
+	$trySaveDocument(uri: UriComponents): Promise<boolean>;
 }
 
 export interface ITextEditorConfigurationUpdate {
@@ -205,26 +205,26 @@ export interface ITextDocumentShowOptions {
 }
 
 export interface MainThreadTextEditorsShape extends IDisposable {
-	$tryShowTextDocument(resource: UriComponents, options: ITextDocumentShowOptions): Thenable<string>;
+	$tryShowTextDocument(resource: UriComponents, options: ITextDocumentShowOptions): Promise<string>;
 	$registerTextEditorDecorationType(key: string, options: editorCommon.IDecorationRenderOptions): void;
 	$removeTextEditorDecorationType(key: string): void;
-	$tryShowEditor(id: string, position: EditorViewColumn): Thenable<void>;
-	$tryHideEditor(id: string): Thenable<void>;
-	$trySetOptions(id: string, options: ITextEditorConfigurationUpdate): Thenable<void>;
-	$trySetDecorations(id: string, key: string, ranges: editorCommon.IDecorationOptions[]): Thenable<void>;
-	$trySetDecorationsFast(id: string, key: string, ranges: number[]): Thenable<void>;
-	$tryRevealRange(id: string, range: IRange, revealType: TextEditorRevealType): Thenable<void>;
-	$trySetSelections(id: string, selections: ISelection[]): Thenable<void>;
-	$tryApplyEdits(id: string, modelVersionId: number, edits: ISingleEditOperation[], opts: IApplyEditsOptions): Thenable<boolean>;
-	$tryApplyWorkspaceEdit(workspaceEditDto: WorkspaceEditDto): Thenable<boolean>;
-	$tryInsertSnippet(id: string, template: string, selections: IRange[], opts: IUndoStopOptions): Thenable<boolean>;
-	$getDiffInformation(id: string): Thenable<editorCommon.ILineChange[]>;
+	$tryShowEditor(id: string, position: EditorViewColumn): Promise<void>;
+	$tryHideEditor(id: string): Promise<void>;
+	$trySetOptions(id: string, options: ITextEditorConfigurationUpdate): Promise<void>;
+	$trySetDecorations(id: string, key: string, ranges: editorCommon.IDecorationOptions[]): Promise<void>;
+	$trySetDecorationsFast(id: string, key: string, ranges: number[]): Promise<void>;
+	$tryRevealRange(id: string, range: IRange, revealType: TextEditorRevealType): Promise<void>;
+	$trySetSelections(id: string, selections: ISelection[]): Promise<void>;
+	$tryApplyEdits(id: string, modelVersionId: number, edits: ISingleEditOperation[], opts: IApplyEditsOptions): Promise<boolean>;
+	$tryApplyWorkspaceEdit(workspaceEditDto: WorkspaceEditDto): Promise<boolean>;
+	$tryInsertSnippet(id: string, template: string, selections: IRange[], opts: IUndoStopOptions): Promise<boolean>;
+	$getDiffInformation(id: string): Promise<editorCommon.ILineChange[]>;
 }
 
 export interface MainThreadTreeViewsShape extends IDisposable {
 	$registerTreeViewDataProvider(treeViewId: string, options: { showCollapseAll: boolean }): void;
-	$refresh(treeViewId: string, itemsToRefresh?: { [treeItemHandle: string]: ITreeItem }): Thenable<void>;
-	$reveal(treeViewId: string, treeItem: ITreeItem, parentChain: ITreeItem[], options: IRevealOptions): Thenable<void>;
+	$refresh(treeViewId: string, itemsToRefresh?: { [treeItemHandle: string]: ITreeItem }): Promise<void>;
+	$reveal(treeViewId: string, treeItem: ITreeItem, parentChain: ITreeItem[], options: IRevealOptions): Promise<void>;
 	$setMessage(treeViewId: string, message: string | IMarkdownString): void;
 }
 
@@ -313,8 +313,8 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable {
 }
 
 export interface MainThreadLanguagesShape extends IDisposable {
-	$getLanguages(): Thenable<string[]>;
-	$changeLanguage(resource: UriComponents, languageId: string): Thenable<void>;
+	$getLanguages(): Promise<string[]>;
+	$changeLanguage(resource: UriComponents, languageId: string): Promise<void>;
 }
 
 export interface MainThreadMessageOptions {
@@ -323,17 +323,17 @@ export interface MainThreadMessageOptions {
 }
 
 export interface MainThreadMessageServiceShape extends IDisposable {
-	$showMessage(severity: Severity, message: string, options: MainThreadMessageOptions, commands: { title: string; isCloseAffordance: boolean; handle: number; }[]): Thenable<number>;
+	$showMessage(severity: Severity, message: string, options: MainThreadMessageOptions, commands: { title: string; isCloseAffordance: boolean; handle: number; }[]): Promise<number>;
 }
 
 export interface MainThreadOutputServiceShape extends IDisposable {
-	$register(label: string, log: boolean, file?: UriComponents): Thenable<string>;
-	$append(channelId: string, value: string): Thenable<void>;
-	$update(channelId: string): Thenable<void>;
-	$clear(channelId: string, till: number): Thenable<void>;
-	$reveal(channelId: string, preserveFocus: boolean): Thenable<void>;
-	$close(channelId: string): Thenable<void>;
-	$dispose(channelId: string): Thenable<void>;
+	$register(label: string, log: boolean, file?: UriComponents): Promise<string>;
+	$append(channelId: string, value: string): Promise<void>;
+	$update(channelId: string): Promise<void>;
+	$clear(channelId: string, till: number): Promise<void>;
+	$reveal(channelId: string, preserveFocus: boolean): Promise<void>;
+	$close(channelId: string): Promise<void>;
+	$dispose(channelId: string): Promise<void>;
 }
 
 export interface MainThreadProgressShape extends IDisposable {
@@ -344,8 +344,8 @@ export interface MainThreadProgressShape extends IDisposable {
 }
 
 export interface MainThreadTerminalServiceShape extends IDisposable {
-	$createTerminal(name?: string, shellPath?: string, shellArgs?: string[], cwd?: string, env?: { [key: string]: string }, waitOnExit?: boolean): Thenable<number>;
-	$createTerminalRenderer(name: string): Thenable<number>;
+	$createTerminal(name?: string, shellPath?: string, shellArgs?: string[], cwd?: string, env?: { [key: string]: string }, waitOnExit?: boolean): Promise<number>;
+	$createTerminalRenderer(name: string): Promise<number>;
 	$dispose(terminalId: number): void;
 	$hide(terminalId: number): void;
 	$sendText(terminalId: number, text: string, addNewLine: boolean): void;
@@ -431,12 +431,12 @@ export interface TransferInputBox extends BaseTransferQuickInput {
 }
 
 export interface MainThreadQuickOpenShape extends IDisposable {
-	$show(instance: number, options: IPickOptions<TransferQuickPickItems>, token: CancellationToken): Thenable<number | number[]>;
-	$setItems(instance: number, items: TransferQuickPickItems[]): Thenable<void>;
-	$setError(instance: number, error: Error): Thenable<void>;
-	$input(options: vscode.InputBoxOptions, validateInput: boolean, token: CancellationToken): Thenable<string>;
-	$createOrUpdate(params: TransferQuickInput): Thenable<void>;
-	$dispose(id: number): Thenable<void>;
+	$show(instance: number, options: IPickOptions<TransferQuickPickItems>, token: CancellationToken): Promise<number | number[]>;
+	$setItems(instance: number, items: TransferQuickPickItems[]): Promise<void>;
+	$setError(instance: number, error: Error): Promise<void>;
+	$input(options: vscode.InputBoxOptions, validateInput: boolean, token: CancellationToken): Promise<string>;
+	$createOrUpdate(params: TransferQuickInput): Promise<void>;
+	$dispose(id: number): Promise<void>;
 }
 
 export interface MainThreadStatusBarShape extends IDisposable {
@@ -445,8 +445,8 @@ export interface MainThreadStatusBarShape extends IDisposable {
 }
 
 export interface MainThreadStorageShape extends IDisposable {
-	$getValue<T>(shared: boolean, key: string): Thenable<T>;
-	$setValue(shared: boolean, key: string, value: object): Thenable<void>;
+	$getValue<T>(shared: boolean, key: string): Promise<T>;
+	$setValue(shared: boolean, key: string, value: object): Promise<void>;
 }
 
 export interface MainThreadTelemetryShape extends IDisposable {
@@ -468,7 +468,7 @@ export interface MainThreadWebviewsShape extends IDisposable {
 	$setIconPath(handle: WebviewPanelHandle, value: { light: UriComponents, dark: UriComponents } | undefined): void;
 	$setHtml(handle: WebviewPanelHandle, value: string): void;
 	$setOptions(handle: WebviewPanelHandle, options: vscode.WebviewOptions): void;
-	$postMessage(handle: WebviewPanelHandle, value: any): Thenable<boolean>;
+	$postMessage(handle: WebviewPanelHandle, value: any): Promise<boolean>;
 
 	$registerSerializer(viewType: string): void;
 	$unregisterSerializer(viewType: string): void;
@@ -483,26 +483,26 @@ export interface WebviewPanelViewState {
 export interface ExtHostWebviewsShape {
 	$onMessage(handle: WebviewPanelHandle, message: any): void;
 	$onDidChangeWebviewPanelViewState(handle: WebviewPanelHandle, newState: WebviewPanelViewState): void;
-	$onDidDisposeWebviewPanel(handle: WebviewPanelHandle): Thenable<void>;
-	$deserializeWebviewPanel(newWebviewHandle: WebviewPanelHandle, viewType: string, title: string, state: any, position: EditorViewColumn, options: vscode.WebviewOptions): Thenable<void>;
+	$onDidDisposeWebviewPanel(handle: WebviewPanelHandle): Promise<void>;
+	$deserializeWebviewPanel(newWebviewHandle: WebviewPanelHandle, viewType: string, title: string, state: any, position: EditorViewColumn, options: vscode.WebviewOptions): Promise<void>;
 }
 
 export interface MainThreadUrlsShape extends IDisposable {
-	$registerUriHandler(handle: number, extensionId: string): Thenable<void>;
-	$unregisterUriHandler(handle: number): Thenable<void>;
+	$registerUriHandler(handle: number, extensionId: string): Promise<void>;
+	$unregisterUriHandler(handle: number): Promise<void>;
 }
 
 export interface ExtHostUrlsShape {
-	$handleExternalUri(handle: number, uri: UriComponents): Thenable<void>;
+	$handleExternalUri(handle: number, uri: UriComponents): Promise<void>;
 }
 
 export interface MainThreadWorkspaceShape extends IDisposable {
-	$startFileSearch(includePattern: string, includeFolder: URI, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Thenable<UriComponents[]>;
-	$startTextSearch(query: IPatternInfo, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Thenable<vscode.TextSearchComplete>;
-	$checkExists(includes: string[], token: CancellationToken): Thenable<boolean>;
-	$saveAll(includeUntitled?: boolean): Thenable<boolean>;
-	$updateWorkspaceFolders(extensionName: string, index: number, deleteCount: number, workspaceFoldersToAdd: { uri: UriComponents, name?: string }[]): Thenable<void>;
-	$resolveProxy(url: string): Thenable<string>;
+	$startFileSearch(includePattern: string, includeFolder: URI, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Promise<UriComponents[]>;
+	$startTextSearch(query: IPatternInfo, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<vscode.TextSearchComplete>;
+	$checkExists(includes: string[], token: CancellationToken): Promise<boolean>;
+	$saveAll(includeUntitled?: boolean): Promise<boolean>;
+	$updateWorkspaceFolders(extensionName: string, index: number, deleteCount: number, workspaceFoldersToAdd: { uri: UriComponents, name?: string }[]): Promise<void>;
+	$resolveProxy(url: string): Promise<string>;
 }
 
 export interface IFileChangeDto {
@@ -528,11 +528,11 @@ export interface MainThreadSearchShape extends IDisposable {
 }
 
 export interface MainThreadTaskShape extends IDisposable {
-	$registerTaskProvider(handle: number): Thenable<void>;
-	$unregisterTaskProvider(handle: number): Thenable<void>;
-	$fetchTasks(filter?: TaskFilterDTO): Thenable<TaskDTO[]>;
-	$executeTask(task: TaskHandleDTO | TaskDTO): Thenable<TaskExecutionDTO>;
-	$terminateTask(id: string): Thenable<void>;
+	$registerTaskProvider(handle: number): Promise<void>;
+	$unregisterTaskProvider(handle: number): Promise<void>;
+	$fetchTasks(filter?: TaskFilterDTO): Promise<TaskDTO[]>;
+	$executeTask(task: TaskHandleDTO | TaskDTO): Promise<TaskExecutionDTO>;
+	$terminateTask(id: string): Promise<void>;
 	$registerTaskSystem(scheme: string, info: TaskSystemInfoDTO): void;
 }
 
@@ -606,29 +606,29 @@ export interface MainThreadDebugServiceShape extends IDisposable {
 	$acceptDAMessage(handle: number, message: DebugProtocol.ProtocolMessage): void;
 	$acceptDAError(handle: number, name: string, message: string, stack: string): void;
 	$acceptDAExit(handle: number, code: number, signal: string): void;
-	$registerDebugConfigurationProvider(type: string, hasProvideMethod: boolean, hasResolveMethod: boolean, hasProvideDaMethod: boolean, hasProvideTrackerMethod: boolean, handle: number): Thenable<void>;
-	$registerDebugAdapterDescriptorFactory(type: string, handle: number): Thenable<void>;
+	$registerDebugConfigurationProvider(type: string, hasProvideMethod: boolean, hasResolveMethod: boolean, hasProvideDaMethod: boolean, hasProvideTrackerMethod: boolean, handle: number): Promise<void>;
+	$registerDebugAdapterDescriptorFactory(type: string, handle: number): Promise<void>;
 	$registerDebugAdapterTrackerFactory(type: string, handle: number);
 	$unregisterDebugConfigurationProvider(handle: number): void;
 	$unregisterDebugAdapterDescriptorFactory(handle: number): void;
 	$unregisterDebugAdapterTrackerFactory(handle: number): void;
-	$startDebugging(folder: UriComponents | undefined, nameOrConfig: string | vscode.DebugConfiguration): Thenable<boolean>;
-	$customDebugAdapterRequest(id: DebugSessionUUID, command: string, args: any): Thenable<any>;
+	$startDebugging(folder: UriComponents | undefined, nameOrConfig: string | vscode.DebugConfiguration): Promise<boolean>;
+	$customDebugAdapterRequest(id: DebugSessionUUID, command: string, args: any): Promise<any>;
 	$appendDebugConsole(value: string): void;
 	$startBreakpointEvents(): void;
-	$registerBreakpoints(breakpoints: (ISourceMultiBreakpointDto | IFunctionBreakpointDto)[]): Thenable<void>;
-	$unregisterBreakpoints(breakpointIds: string[], functionBreakpointIds: string[]): Thenable<void>;
+	$registerBreakpoints(breakpoints: (ISourceMultiBreakpointDto | IFunctionBreakpointDto)[]): Promise<void>;
+	$unregisterBreakpoints(breakpointIds: string[], functionBreakpointIds: string[]): Promise<void>;
 }
 
 export interface MainThreadWindowShape extends IDisposable {
-	$getWindowVisibility(): Thenable<boolean>;
+	$getWindowVisibility(): Promise<boolean>;
 }
 
 // -- extension host
 
 export interface ExtHostCommandsShape {
-	$executeContributedCommand<T>(id: string, ...args: any[]): Thenable<T>;
-	$getContributedCommandHandlerDescriptions(): Thenable<{ [id: string]: string | ICommandHandlerDescription }>;
+	$executeContributedCommand<T>(id: string, ...args: any[]): Promise<T>;
+	$getContributedCommandHandlerDescriptions(): Promise<{ [id: string]: string | ICommandHandlerDescription }>;
 }
 
 export interface ExtHostConfigurationShape {
@@ -659,7 +659,7 @@ export interface ExtHostDocumentsShape {
 }
 
 export interface ExtHostDocumentSaveParticipantShape {
-	$participateInSave(resource: UriComponents, reason: SaveReason): Thenable<boolean[]>;
+	$participateInSave(resource: UriComponents, reason: SaveReason): Promise<boolean[]>;
 }
 
 export interface ITextEditorAddData {
@@ -701,7 +701,7 @@ export interface ExtHostDocumentsAndEditorsShape {
 }
 
 export interface ExtHostTreeViewsShape {
-	$getChildren(treeViewId: string, treeItemHandle?: string): Thenable<ITreeItem[]>;
+	$getChildren(treeViewId: string, treeItemHandle?: string): Promise<ITreeItem[]>;
 	$setExpanded(treeViewId: string, treeItemHandle: string, expanded: boolean): void;
 	$setSelection(treeViewId: string, treeItemHandles: string[]): void;
 	$setVisible(treeViewId: string, visible: boolean): void;
@@ -713,32 +713,32 @@ export interface ExtHostWorkspaceShape {
 }
 
 export interface ExtHostFileSystemShape {
-	$stat(handle: number, resource: UriComponents): Thenable<IStat>;
-	$readdir(handle: number, resource: UriComponents): Thenable<[string, FileType][]>;
-	$readFile(handle: number, resource: UriComponents): Thenable<Buffer>;
-	$writeFile(handle: number, resource: UriComponents, content: Buffer, opts: FileWriteOptions): Thenable<void>;
-	$rename(handle: number, resource: UriComponents, target: UriComponents, opts: FileOverwriteOptions): Thenable<void>;
-	$copy(handle: number, resource: UriComponents, target: UriComponents, opts: FileOverwriteOptions): Thenable<void>;
-	$mkdir(handle: number, resource: UriComponents): Thenable<void>;
-	$delete(handle: number, resource: UriComponents, opts: FileDeleteOptions): Thenable<void>;
+	$stat(handle: number, resource: UriComponents): Promise<IStat>;
+	$readdir(handle: number, resource: UriComponents): Promise<[string, FileType][]>;
+	$readFile(handle: number, resource: UriComponents): Promise<Buffer>;
+	$writeFile(handle: number, resource: UriComponents, content: Buffer, opts: FileWriteOptions): Promise<void>;
+	$rename(handle: number, resource: UriComponents, target: UriComponents, opts: FileOverwriteOptions): Promise<void>;
+	$copy(handle: number, resource: UriComponents, target: UriComponents, opts: FileOverwriteOptions): Promise<void>;
+	$mkdir(handle: number, resource: UriComponents): Promise<void>;
+	$delete(handle: number, resource: UriComponents, opts: FileDeleteOptions): Promise<void>;
 	$watch(handle: number, session: number, resource: UriComponents, opts: IWatchOptions): void;
 	$unwatch(handle: number, session: number): void;
-	$open(handle: number, resource: UriComponents): Thenable<number>;
-	$close(handle: number, fd: number): Thenable<void>;
-	$read(handle: number, fd: number, pos: number, data: Buffer, offset: number, length: number): Thenable<number>;
-	$write(handle: number, fd: number, pos: number, data: Buffer, offset: number, length: number): Thenable<number>;
+	$open(handle: number, resource: UriComponents): Promise<number>;
+	$close(handle: number, fd: number): Promise<void>;
+	$read(handle: number, fd: number, pos: number, data: Buffer, offset: number, length: number): Promise<number>;
+	$write(handle: number, fd: number, pos: number, data: Buffer, offset: number, length: number): Promise<number>;
 }
 
 export interface ExtHostSearchShape {
-	$provideFileSearchResults(handle: number, session: number, query: IRawQuery, token: CancellationToken): Thenable<ISearchCompleteStats>;
-	$provideTextSearchResults(handle: number, session: number, query: IRawTextQuery, token: CancellationToken): Thenable<ISearchCompleteStats>;
-	$clearCache(cacheKey: string): Thenable<void>;
+	$provideFileSearchResults(handle: number, session: number, query: IRawQuery, token: CancellationToken): Promise<ISearchCompleteStats>;
+	$provideTextSearchResults(handle: number, session: number, query: IRawTextQuery, token: CancellationToken): Promise<ISearchCompleteStats>;
+	$clearCache(cacheKey: string): Promise<void>;
 }
 
 export interface ExtHostExtensionServiceShape {
-	$resolveAuthority(remoteAuthority: string): Thenable<ResolvedAuthority>;
-	$startExtensionHost(enabledExtensionIds: string[]): Thenable<void>;
-	$activateByEvent(activationEvent: string): Thenable<void>;
+	$resolveAuthority(remoteAuthority: string): Promise<ResolvedAuthority>;
+	$startExtensionHost(enabledExtensionIds: string[]): Promise<void>;
+	$activateByEvent(activationEvent: string): Promise<void>;
 }
 
 export interface FileSystemEvents {
@@ -749,7 +749,7 @@ export interface FileSystemEvents {
 export interface ExtHostFileSystemEventServiceShape {
 	$onFileEvent(events: FileSystemEvents): void;
 	$onFileRename(oldUri: UriComponents, newUri: UriComponents): void;
-	$onWillRename(oldUri: UriComponents, newUri: UriComponents): Thenable<any>;
+	$onWillRename(oldUri: UriComponents, newUri: UriComponents): Promise<any>;
 }
 
 export interface ObjectIdentifier {
@@ -859,40 +859,40 @@ export interface CodeActionDto {
 }
 
 export interface ExtHostLanguageFeaturesShape {
-	$provideDocumentSymbols(handle: number, resource: UriComponents, token: CancellationToken): Thenable<modes.DocumentSymbol[]>;
-	$provideCodeLenses(handle: number, resource: UriComponents, token: CancellationToken): Thenable<modes.ICodeLensSymbol[]>;
-	$resolveCodeLens(handle: number, resource: UriComponents, symbol: modes.ICodeLensSymbol, token: CancellationToken): Thenable<modes.ICodeLensSymbol>;
-	$provideDefinition(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<DefinitionLinkDto[]>;
-	$provideDeclaration(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<DefinitionLinkDto[]>;
-	$provideImplementation(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<DefinitionLinkDto[]>;
-	$provideTypeDefinition(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<DefinitionLinkDto[]>;
-	$provideHover(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<modes.Hover>;
-	$provideDocumentHighlights(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<modes.DocumentHighlight[]>;
-	$provideReferences(handle: number, resource: UriComponents, position: IPosition, context: modes.ReferenceContext, token: CancellationToken): Thenable<LocationDto[]>;
-	$provideCodeActions(handle: number, resource: UriComponents, rangeOrSelection: IRange | ISelection, context: modes.CodeActionContext, token: CancellationToken): Thenable<CodeActionDto[]>;
-	$provideDocumentFormattingEdits(handle: number, resource: UriComponents, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]>;
-	$provideDocumentRangeFormattingEdits(handle: number, resource: UriComponents, range: IRange, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]>;
-	$provideOnTypeFormattingEdits(handle: number, resource: UriComponents, position: IPosition, ch: string, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]>;
-	$provideWorkspaceSymbols(handle: number, search: string, token: CancellationToken): Thenable<WorkspaceSymbolsDto>;
-	$resolveWorkspaceSymbol(handle: number, symbol: WorkspaceSymbolDto, token: CancellationToken): Thenable<WorkspaceSymbolDto>;
+	$provideDocumentSymbols(handle: number, resource: UriComponents, token: CancellationToken): Promise<modes.DocumentSymbol[]>;
+	$provideCodeLenses(handle: number, resource: UriComponents, token: CancellationToken): Promise<modes.ICodeLensSymbol[]>;
+	$resolveCodeLens(handle: number, resource: UriComponents, symbol: modes.ICodeLensSymbol, token: CancellationToken): Promise<modes.ICodeLensSymbol>;
+	$provideDefinition(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<DefinitionLinkDto[]>;
+	$provideDeclaration(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<DefinitionLinkDto[]>;
+	$provideImplementation(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<DefinitionLinkDto[]>;
+	$provideTypeDefinition(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<DefinitionLinkDto[]>;
+	$provideHover(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<modes.Hover>;
+	$provideDocumentHighlights(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<modes.DocumentHighlight[]>;
+	$provideReferences(handle: number, resource: UriComponents, position: IPosition, context: modes.ReferenceContext, token: CancellationToken): Promise<LocationDto[]>;
+	$provideCodeActions(handle: number, resource: UriComponents, rangeOrSelection: IRange | ISelection, context: modes.CodeActionContext, token: CancellationToken): Promise<CodeActionDto[]>;
+	$provideDocumentFormattingEdits(handle: number, resource: UriComponents, options: modes.FormattingOptions, token: CancellationToken): Promise<ISingleEditOperation[]>;
+	$provideDocumentRangeFormattingEdits(handle: number, resource: UriComponents, range: IRange, options: modes.FormattingOptions, token: CancellationToken): Promise<ISingleEditOperation[]>;
+	$provideOnTypeFormattingEdits(handle: number, resource: UriComponents, position: IPosition, ch: string, options: modes.FormattingOptions, token: CancellationToken): Promise<ISingleEditOperation[]>;
+	$provideWorkspaceSymbols(handle: number, search: string, token: CancellationToken): Promise<WorkspaceSymbolsDto>;
+	$resolveWorkspaceSymbol(handle: number, symbol: WorkspaceSymbolDto, token: CancellationToken): Promise<WorkspaceSymbolDto>;
 	$releaseWorkspaceSymbols(handle: number, id: number): void;
-	$provideRenameEdits(handle: number, resource: UriComponents, position: IPosition, newName: string, token: CancellationToken): Thenable<WorkspaceEditDto>;
-	$resolveRenameLocation(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<modes.RenameLocation>;
-	$provideCompletionItems(handle: number, resource: UriComponents, position: IPosition, context: modes.CompletionContext, token: CancellationToken): Thenable<SuggestResultDto>;
-	$resolveCompletionItem(handle: number, resource: UriComponents, position: IPosition, suggestion: modes.CompletionItem, token: CancellationToken): Thenable<modes.CompletionItem>;
+	$provideRenameEdits(handle: number, resource: UriComponents, position: IPosition, newName: string, token: CancellationToken): Promise<WorkspaceEditDto>;
+	$resolveRenameLocation(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<modes.RenameLocation>;
+	$provideCompletionItems(handle: number, resource: UriComponents, position: IPosition, context: modes.CompletionContext, token: CancellationToken): Promise<SuggestResultDto>;
+	$resolveCompletionItem(handle: number, resource: UriComponents, position: IPosition, suggestion: modes.CompletionItem, token: CancellationToken): Promise<modes.CompletionItem>;
 	$releaseCompletionItems(handle: number, id: number): void;
-	$provideSignatureHelp(handle: number, resource: UriComponents, position: IPosition, context: modes.SignatureHelpContext, token: CancellationToken): Thenable<modes.SignatureHelp>;
-	$provideDocumentLinks(handle: number, resource: UriComponents, token: CancellationToken): Thenable<modes.ILink[]>;
-	$resolveDocumentLink(handle: number, link: modes.ILink, token: CancellationToken): Thenable<modes.ILink>;
-	$provideDocumentColors(handle: number, resource: UriComponents, token: CancellationToken): Thenable<IRawColorInfo[]>;
-	$provideColorPresentations(handle: number, resource: UriComponents, colorInfo: IRawColorInfo, token: CancellationToken): Thenable<modes.IColorPresentation[]>;
-	$provideFoldingRanges(handle: number, resource: UriComponents, context: modes.FoldingContext, token: CancellationToken): Thenable<modes.FoldingRange[]>;
-	$provideSelectionRanges(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<IRange[]>;
+	$provideSignatureHelp(handle: number, resource: UriComponents, position: IPosition, context: modes.SignatureHelpContext, token: CancellationToken): Promise<modes.SignatureHelp>;
+	$provideDocumentLinks(handle: number, resource: UriComponents, token: CancellationToken): Promise<modes.ILink[]>;
+	$resolveDocumentLink(handle: number, link: modes.ILink, token: CancellationToken): Promise<modes.ILink>;
+	$provideDocumentColors(handle: number, resource: UriComponents, token: CancellationToken): Promise<IRawColorInfo[]>;
+	$provideColorPresentations(handle: number, resource: UriComponents, colorInfo: IRawColorInfo, token: CancellationToken): Promise<modes.IColorPresentation[]>;
+	$provideFoldingRanges(handle: number, resource: UriComponents, context: modes.FoldingContext, token: CancellationToken): Promise<modes.FoldingRange[]>;
+	$provideSelectionRanges(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<IRange[]>;
 }
 
 export interface ExtHostQuickOpenShape {
 	$onItemSelected(handle: number): void;
-	$validateInput(input: string): Thenable<string>;
+	$validateInput(input: string): Promise<string>;
 	$onDidChangeActive(sessionId: number, handles: number[]): void;
 	$onDidChangeSelection(sessionId: number, handles: number[]): void;
 	$onDidAccept(sessionId: number): void;
@@ -925,20 +925,20 @@ export interface ExtHostTerminalServiceShape {
 }
 
 export interface ExtHostSCMShape {
-	$provideOriginalResource(sourceControlHandle: number, uri: UriComponents, token: CancellationToken): Thenable<UriComponents>;
+	$provideOriginalResource(sourceControlHandle: number, uri: UriComponents, token: CancellationToken): Promise<UriComponents>;
 	$onInputBoxValueChange(sourceControlHandle: number, value: string): void;
-	$executeResourceCommand(sourceControlHandle: number, groupHandle: number, handle: number): Thenable<void>;
-	$validateInput(sourceControlHandle: number, value: string, cursorPosition: number): Thenable<[string, number] | undefined>;
-	$setSelectedSourceControls(selectedSourceControlHandles: number[]): Thenable<void>;
+	$executeResourceCommand(sourceControlHandle: number, groupHandle: number, handle: number): Promise<void>;
+	$validateInput(sourceControlHandle: number, value: string, cursorPosition: number): Promise<[string, number] | undefined>;
+	$setSelectedSourceControls(selectedSourceControlHandles: number[]): Promise<void>;
 }
 
 export interface ExtHostTaskShape {
-	$provideTasks(handle: number, validTypes: { [key: string]: boolean; }): Thenable<TaskSet>;
+	$provideTasks(handle: number, validTypes: { [key: string]: boolean; }): Promise<TaskSet>;
 	$onDidStartTask(execution: TaskExecutionDTO): void;
 	$onDidStartTaskProcess(value: TaskProcessStartedDTO): void;
 	$onDidEndTaskProcess(value: TaskProcessEndedDTO): void;
 	$OnDidEndTask(execution: TaskExecutionDTO): void;
-	$resolveVariables(workspaceFolder: UriComponents, toResolve: { process?: { name: string; cwd?: string }, variables: string[] }): Thenable<{ process?: string; variables: { [key: string]: string } }>;
+	$resolveVariables(workspaceFolder: UriComponents, toResolve: { process?: { name: string; cwd?: string }, variables: string[] }): Promise<{ process?: string; variables: { [key: string]: string } }>;
 }
 
 export interface IBreakpointDto {
@@ -993,15 +993,15 @@ export interface IDebugSessionFullDto {
 export type IDebugSessionDto = IDebugSessionFullDto | DebugSessionUUID;
 
 export interface ExtHostDebugServiceShape {
-	$substituteVariables(folder: UriComponents | undefined, config: IConfig): Thenable<IConfig>;
-	$runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): Thenable<number | undefined>;
-	$startDASession(handle: number, session: IDebugSessionDto): Thenable<void>;
-	$stopDASession(handle: number): Thenable<void>;
+	$substituteVariables(folder: UriComponents | undefined, config: IConfig): Promise<IConfig>;
+	$runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): Promise<number | undefined>;
+	$startDASession(handle: number, session: IDebugSessionDto): Promise<void>;
+	$stopDASession(handle: number): Promise<void>;
 	$sendDAMessage(handle: number, message: DebugProtocol.ProtocolMessage): void;
-	$resolveDebugConfiguration(handle: number, folder: UriComponents | undefined, debugConfiguration: IConfig): Thenable<IConfig>;
-	$provideDebugConfigurations(handle: number, folder: UriComponents | undefined): Thenable<IConfig[]>;
-	$legacyDebugAdapterExecutable(handle: number, folderUri: UriComponents | undefined): Thenable<IAdapterDescriptor>; // TODO@AW legacy
-	$provideDebugAdapter(handle: number, session: IDebugSessionDto): Thenable<IAdapterDescriptor>;
+	$resolveDebugConfiguration(handle: number, folder: UriComponents | undefined, debugConfiguration: IConfig): Promise<IConfig>;
+	$provideDebugConfigurations(handle: number, folder: UriComponents | undefined): Promise<IConfig[]>;
+	$legacyDebugAdapterExecutable(handle: number, folderUri: UriComponents | undefined): Promise<IAdapterDescriptor>; // TODO@AW legacy
+	$provideDebugAdapter(handle: number, session: IDebugSessionDto): Promise<IAdapterDescriptor>;
 	$acceptDebugSessionStarted(session: IDebugSessionDto): void;
 	$acceptDebugSessionTerminated(session: IDebugSessionDto): void;
 	$acceptDebugSessionActiveChanged(session: IDebugSessionDto): void;
@@ -1020,7 +1020,7 @@ export type DecorationData = [number, boolean, string, string, ThemeColor, strin
 export type DecorationReply = { [id: number]: DecorationData };
 
 export interface ExtHostDecorationsShape {
-	$provideDecorations(requests: DecorationRequest[], token: CancellationToken): Thenable<DecorationReply>;
+	$provideDecorations(requests: DecorationRequest[], token: CancellationToken): Promise<DecorationReply>;
 }
 
 export interface ExtHostWindowShape {
@@ -1040,15 +1040,15 @@ export interface ExtHostProgressShape {
 }
 
 export interface ExtHostCommentsShape {
-	$provideDocumentComments(handle: number, document: UriComponents): Thenable<modes.CommentInfo>;
-	$createNewCommentThread(handle: number, document: UriComponents, range: IRange, text: string): Thenable<modes.CommentThread>;
-	$replyToCommentThread(handle: number, document: UriComponents, range: IRange, commentThread: modes.CommentThread, text: string): Thenable<modes.CommentThread>;
-	$editComment(handle: number, document: UriComponents, comment: modes.Comment, text: string): Thenable<void>;
-	$deleteComment(handle: number, document: UriComponents, comment: modes.Comment): Thenable<void>;
-	$startDraft(handle: number): Thenable<void>;
-	$deleteDraft(handle: number): Thenable<void>;
-	$finishDraft(handle: number): Thenable<void>;
-	$provideWorkspaceComments(handle: number): Thenable<modes.CommentThread[]>;
+	$provideDocumentComments(handle: number, document: UriComponents): Promise<modes.CommentInfo>;
+	$createNewCommentThread(handle: number, document: UriComponents, range: IRange, text: string): Promise<modes.CommentThread>;
+	$replyToCommentThread(handle: number, document: UriComponents, range: IRange, commentThread: modes.CommentThread, text: string): Promise<modes.CommentThread>;
+	$editComment(handle: number, document: UriComponents, comment: modes.Comment, text: string): Promise<void>;
+	$deleteComment(handle: number, document: UriComponents, comment: modes.Comment): Promise<void>;
+	$startDraft(handle: number): Promise<void>;
+	$deleteDraft(handle: number): Promise<void>;
+	$finishDraft(handle: number): Promise<void>;
+	$provideWorkspaceComments(handle: number): Promise<modes.CommentThread[]>;
 }
 
 export interface ExtHostStorageShape {
diff --git a/src/vs/workbench/api/node/extHostApiCommands.ts b/src/vs/workbench/api/node/extHostApiCommands.ts
index bfee1376f3b..a0fa0215eef 100644
--- a/src/vs/workbench/api/node/extHostApiCommands.ts
+++ b/src/vs/workbench/api/node/extHostApiCommands.ts
@@ -287,7 +287,7 @@ export class ExtHostApiCommands {
 	 * @param query Search string to match query symbol names
 	 * @return A promise that resolves to an array of symbol information.
 	 */
-	private _executeWorkspaceSymbolProvider(query: string): Thenable<types.SymbolInformation[]> {
+	private _executeWorkspaceSymbolProvider(query: string): Promise<types.SymbolInformation[]> {
 		return this._commands.executeCommand<[search.IWorkspaceSymbolProvider, search.IWorkspaceSymbol[]][]>('_executeWorkspaceSymbolProvider', { query }).then(value => {
 			const result: types.SymbolInformation[] = [];
 			if (Array.isArray(value)) {
@@ -299,7 +299,7 @@ export class ExtHostApiCommands {
 		});
 	}
 
-	private _executeDefinitionProvider(resource: URI, position: types.Position): Thenable<types.Location[]> {
+	private _executeDefinitionProvider(resource: URI, position: types.Position): Promise<types.Location[]> {
 		const args = {
 			resource,
 			position: position && typeConverters.Position.from(position)
@@ -308,7 +308,7 @@ export class ExtHostApiCommands {
 			.then(tryMapWith(typeConverters.location.to));
 	}
 
-	private _executeDeclaraionProvider(resource: URI, position: types.Position): Thenable<types.Location[]> {
+	private _executeDeclaraionProvider(resource: URI, position: types.Position): Promise<types.Location[]> {
 		const args = {
 			resource,
 			position: position && typeConverters.Position.from(position)
@@ -317,7 +317,7 @@ export class ExtHostApiCommands {
 			.then(tryMapWith(typeConverters.location.to));
 	}
 
-	private _executeTypeDefinitionProvider(resource: URI, position: types.Position): Thenable<types.Location[]> {
+	private _executeTypeDefinitionProvider(resource: URI, position: types.Position): Promise<types.Location[]> {
 		const args = {
 			resource,
 			position: position && typeConverters.Position.from(position)
@@ -326,7 +326,7 @@ export class ExtHostApiCommands {
 			.then(tryMapWith(typeConverters.location.to));
 	}
 
-	private _executeImplementationProvider(resource: URI, position: types.Position): Thenable<types.Location[]> {
+	private _executeImplementationProvider(resource: URI, position: types.Position): Promise<types.Location[]> {
 		const args = {
 			resource,
 			position: position && typeConverters.Position.from(position)
@@ -335,7 +335,7 @@ export class ExtHostApiCommands {
 			.then(tryMapWith(typeConverters.location.to));
 	}
 
-	private _executeHoverProvider(resource: URI, position: types.Position): Thenable<types.Hover[]> {
+	private _executeHoverProvider(resource: URI, position: types.Position): Promise<types.Hover[]> {
 		const args = {
 			resource,
 			position: position && typeConverters.Position.from(position)
@@ -344,7 +344,7 @@ export class ExtHostApiCommands {
 			.then(tryMapWith(typeConverters.Hover.to));
 	}
 
-	private _executeDocumentHighlights(resource: URI, position: types.Position): Thenable<types.DocumentHighlight[]> {
+	private _executeDocumentHighlights(resource: URI, position: types.Position): Promise<types.DocumentHighlight[]> {
 		const args = {
 			resource,
 			position: position && typeConverters.Position.from(position)
@@ -353,7 +353,7 @@ export class ExtHostApiCommands {
 			.then(tryMapWith(typeConverters.DocumentHighlight.to));
 	}
 
-	private _executeReferenceProvider(resource: URI, position: types.Position): Thenable<types.Location[]> {
+	private _executeReferenceProvider(resource: URI, position: types.Position): Promise<types.Location[]> {
 		const args = {
 			resource,
 			position: position && typeConverters.Position.from(position)
@@ -362,7 +362,7 @@ export class ExtHostApiCommands {
 			.then(tryMapWith(typeConverters.location.to));
 	}
 
-	private _executeDocumentRenameProvider(resource: URI, position: types.Position, newName: string): Thenable<types.WorkspaceEdit> {
+	private _executeDocumentRenameProvider(resource: URI, position: types.Position, newName: string): Promise<types.WorkspaceEdit> {
 		const args = {
 			resource,
 			position: position && typeConverters.Position.from(position),
@@ -379,7 +379,7 @@ export class ExtHostApiCommands {
 		});
 	}
 
-	private _executeSignatureHelpProvider(resource: URI, position: types.Position, triggerCharacter: string): Thenable<types.SignatureHelp> {
+	private _executeSignatureHelpProvider(resource: URI, position: types.Position, triggerCharacter: string): Promise<types.SignatureHelp> {
 		const args = {
 			resource,
 			position: position && typeConverters.Position.from(position),
@@ -393,7 +393,7 @@ export class ExtHostApiCommands {
 		});
 	}
 
-	private _executeCompletionItemProvider(resource: URI, position: types.Position, triggerCharacter: string, maxItemsToResolve: number): Thenable<types.CompletionList> {
+	private _executeCompletionItemProvider(resource: URI, position: types.Position, triggerCharacter: string, maxItemsToResolve: number): Promise<types.CompletionList> {
 		const args = {
 			resource,
 			position: position && typeConverters.Position.from(position),
@@ -409,7 +409,7 @@ export class ExtHostApiCommands {
 		});
 	}
 
-	private _executeDocumentColorProvider(resource: URI): Thenable<types.ColorInformation[]> {
+	private _executeDocumentColorProvider(resource: URI): Promise<types.ColorInformation[]> {
 		const args = {
 			resource
 		};
@@ -421,7 +421,7 @@ export class ExtHostApiCommands {
 		});
 	}
 
-	private _executeSelectionRangeProvider(resource: URI, position: types.Position): Thenable<types.Range[]> {
+	private _executeSelectionRangeProvider(resource: URI, position: types.Position): Promise<types.Range[]> {
 		const args = {
 			resource,
 			position: position && typeConverters.Position.from(position)
@@ -434,7 +434,7 @@ export class ExtHostApiCommands {
 		});
 	}
 
-	private _executeColorPresentationProvider(color: types.Color, context: { uri: URI, range: types.Range }): Thenable<types.ColorPresentation[]> {
+	private _executeColorPresentationProvider(color: types.Color, context: { uri: URI, range: types.Range }): Promise<types.ColorPresentation[]> {
 		const args = {
 			resource: context.uri,
 			color: typeConverters.Color.from(color),
@@ -448,7 +448,7 @@ export class ExtHostApiCommands {
 		});
 	}
 
-	private _executeDocumentSymbolProvider(resource: URI): Thenable<vscode.SymbolInformation[]> {
+	private _executeDocumentSymbolProvider(resource: URI): Promise<vscode.SymbolInformation[]> {
 		const args = {
 			resource
 		};
@@ -480,7 +480,7 @@ export class ExtHostApiCommands {
 		});
 	}
 
-	private _executeCodeActionProvider(resource: URI, range: types.Range): Thenable<(vscode.CodeAction | vscode.Command)[]> {
+	private _executeCodeActionProvider(resource: URI, range: types.Range): Promise<(vscode.CodeAction | vscode.Command)[]> {
 		const args = {
 			resource,
 			range: typeConverters.Range.from(range)
@@ -505,7 +505,7 @@ export class ExtHostApiCommands {
 			}));
 	}
 
-	private _executeCodeLensProvider(resource: URI, itemResolveCount: number): Thenable<vscode.CodeLens[]> {
+	private _executeCodeLensProvider(resource: URI, itemResolveCount: number): Promise<vscode.CodeLens[]> {
 		const args = { resource, itemResolveCount };
 		return this._commands.executeCommand<modes.ICodeLensSymbol[]>('_executeCodeLensProvider', args)
 			.then(tryMapWith(item => {
@@ -516,7 +516,7 @@ export class ExtHostApiCommands {
 
 	}
 
-	private _executeFormatDocumentProvider(resource: URI, options: vscode.FormattingOptions): Thenable<vscode.TextEdit[]> {
+	private _executeFormatDocumentProvider(resource: URI, options: vscode.FormattingOptions): Promise<vscode.TextEdit[]> {
 		const args = {
 			resource,
 			options
@@ -525,7 +525,7 @@ export class ExtHostApiCommands {
 			.then(tryMapWith(edit => new types.TextEdit(typeConverters.Range.to(edit.range), edit.text)));
 	}
 
-	private _executeFormatRangeProvider(resource: URI, range: types.Range, options: vscode.FormattingOptions): Thenable<vscode.TextEdit[]> {
+	private _executeFormatRangeProvider(resource: URI, range: types.Range, options: vscode.FormattingOptions): Promise<vscode.TextEdit[]> {
 		const args = {
 			resource,
 			range: typeConverters.Range.from(range),
@@ -535,7 +535,7 @@ export class ExtHostApiCommands {
 			.then(tryMapWith(edit => new types.TextEdit(typeConverters.Range.to(edit.range), edit.text)));
 	}
 
-	private _executeFormatOnTypeProvider(resource: URI, position: types.Position, ch: string, options: vscode.FormattingOptions): Thenable<vscode.TextEdit[]> {
+	private _executeFormatOnTypeProvider(resource: URI, position: types.Position, ch: string, options: vscode.FormattingOptions): Promise<vscode.TextEdit[]> {
 		const args = {
 			resource,
 			position: typeConverters.Position.from(position),
@@ -546,7 +546,7 @@ export class ExtHostApiCommands {
 			.then(tryMapWith(edit => new types.TextEdit(typeConverters.Range.to(edit.range), edit.text)));
 	}
 
-	private _executeDocumentLinkProvider(resource: URI): Thenable<vscode.DocumentLink[]> {
+	private _executeDocumentLinkProvider(resource: URI): Promise<vscode.DocumentLink[]> {
 		return this._commands.executeCommand<modes.ILink[]>('_executeLinkProvider', resource)
 			.then(tryMapWith(typeConverters.DocumentLink.to));
 	}
diff --git a/src/vs/workbench/api/node/extHostCommands.ts b/src/vs/workbench/api/node/extHostCommands.ts
index 5de0838f9f5..8a6b94a362d 100644
--- a/src/vs/workbench/api/node/extHostCommands.ts
+++ b/src/vs/workbench/api/node/extHostCommands.ts
@@ -78,7 +78,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
 		});
 	}
 
-	executeCommand<T>(id: string, ...args: any[]): Thenable<T> {
+	executeCommand<T>(id: string, ...args: any[]): Promise<T> {
 		this._logService.trace('ExtHostCommands#executeCommand', id);
 
 		if (this._commands.has(id)) {
@@ -108,7 +108,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
 		}
 	}
 
-	private _executeContributedCommand<T>(id: string, args: any[]): Thenable<T> {
+	private _executeContributedCommand<T>(id: string, args: any[]): Promise<T> {
 		let { callback, thisArg, description } = this._commands.get(id);
 		if (description) {
 			for (let i = 0; i < description.args.length; i++) {
@@ -129,7 +129,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
 		}
 	}
 
-	$executeContributedCommand<T>(id: string, ...args: any[]): Thenable<T> {
+	$executeContributedCommand<T>(id: string, ...args: any[]): Promise<T> {
 		this._logService.trace('ExtHostCommands#$executeContributedCommand', id);
 
 		if (!this._commands.has(id)) {
@@ -140,7 +140,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
 		}
 	}
 
-	getCommands(filterUnderscoreCommands: boolean = false): Thenable<string[]> {
+	getCommands(filterUnderscoreCommands: boolean = false): Promise<string[]> {
 		this._logService.trace('ExtHostCommands#getCommands', filterUnderscoreCommands);
 
 		return this._proxy.$getCommands().then(result => {
@@ -151,7 +151,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
 		});
 	}
 
-	$getContributedCommandHandlerDescriptions(): Thenable<{ [id: string]: string | ICommandHandlerDescription }> {
+	$getContributedCommandHandlerDescriptions(): Promise<{ [id: string]: string | ICommandHandlerDescription }> {
 		const result: { [id: string]: string | ICommandHandlerDescription } = Object.create(null);
 		this._commands.forEach((command, id) => {
 			let { description } = command;
@@ -226,7 +226,7 @@ export class CommandsConverter {
 		}
 	}
 
-	private _executeConvertedCommand<R>(...args: any[]): Thenable<R> {
+	private _executeConvertedCommand<R>(...args: any[]): Promise<R> {
 		const actualCmd = this._heap.get<vscode.Command>(args[0]);
 		return this._commands.executeCommand(actualCmd.command, ...actualCmd.arguments);
 	}
diff --git a/src/vs/workbench/api/node/extHostComments.ts b/src/vs/workbench/api/node/extHostComments.ts
index 631d48ba4c6..c91b0132f8b 100644
--- a/src/vs/workbench/api/node/extHostComments.ts
+++ b/src/vs/workbench/api/node/extHostComments.ts
@@ -67,7 +67,7 @@ export class ExtHostComments implements ExtHostCommentsShape {
 		};
 	}
 
-	$createNewCommentThread(handle: number, uri: UriComponents, range: IRange, text: string): Thenable<modes.CommentThread> {
+	$createNewCommentThread(handle: number, uri: UriComponents, range: IRange, text: string): Promise<modes.CommentThread> {
 		const data = this._documents.getDocumentData(URI.revive(uri));
 		const ran = <vscode.Range>extHostTypeConverter.Range.to(range);
 
@@ -81,7 +81,7 @@ export class ExtHostComments implements ExtHostCommentsShape {
 		}).then(commentThread => commentThread ? convertToCommentThread(provider, commentThread, this._commandsConverter) : null);
 	}
 
-	$replyToCommentThread(handle: number, uri: UriComponents, range: IRange, thread: modes.CommentThread, text: string): Thenable<modes.CommentThread> {
+	$replyToCommentThread(handle: number, uri: UriComponents, range: IRange, thread: modes.CommentThread, text: string): Promise<modes.CommentThread> {
 		const data = this._documents.getDocumentData(URI.revive(uri));
 		const ran = <vscode.Range>extHostTypeConverter.Range.to(range);
 
@@ -95,7 +95,7 @@ export class ExtHostComments implements ExtHostCommentsShape {
 		}).then(commentThread => commentThread ? convertToCommentThread(provider, commentThread, this._commandsConverter) : null);
 	}
 
-	$editComment(handle: number, uri: UriComponents, comment: modes.Comment, text: string): Thenable<void> {
+	$editComment(handle: number, uri: UriComponents, comment: modes.Comment, text: string): Promise<void> {
 		const data = this._documents.getDocumentData(URI.revive(uri));
 
 		if (!data || !data.document) {
@@ -108,7 +108,7 @@ export class ExtHostComments implements ExtHostCommentsShape {
 		});
 	}
 
-	$deleteComment(handle: number, uri: UriComponents, comment: modes.Comment): Thenable<void> {
+	$deleteComment(handle: number, uri: UriComponents, comment: modes.Comment): Promise<void> {
 		const data = this._documents.getDocumentData(URI.revive(uri));
 
 		if (!data || !data.document) {
@@ -121,28 +121,28 @@ export class ExtHostComments implements ExtHostCommentsShape {
 		});
 	}
 
-	$startDraft(handle: number): Thenable<void> {
+	$startDraft(handle: number): Promise<void> {
 		const provider = this._documentProviders.get(handle);
 		return asThenable(() => {
 			return provider.startDraft(CancellationToken.None);
 		});
 	}
 
-	$deleteDraft(handle: number): Thenable<void> {
+	$deleteDraft(handle: number): Promise<void> {
 		const provider = this._documentProviders.get(handle);
 		return asThenable(() => {
 			return provider.deleteDraft(CancellationToken.None);
 		});
 	}
 
-	$finishDraft(handle: number): Thenable<void> {
+	$finishDraft(handle: number): Promise<void> {
 		const provider = this._documentProviders.get(handle);
 		return asThenable(() => {
 			return provider.finishDraft(CancellationToken.None);
 		});
 	}
 
-	$provideDocumentComments(handle: number, uri: UriComponents): Thenable<modes.CommentInfo> {
+	$provideDocumentComments(handle: number, uri: UriComponents): Promise<modes.CommentInfo> {
 		const data = this._documents.getDocumentData(URI.revive(uri));
 		if (!data || !data.document) {
 			return Promise.resolve(null);
@@ -154,7 +154,7 @@ export class ExtHostComments implements ExtHostCommentsShape {
 		}).then(commentInfo => commentInfo ? convertCommentInfo(handle, provider, commentInfo, this._commandsConverter) : null);
 	}
 
-	$provideWorkspaceComments(handle: number): Thenable<modes.CommentThread[]> {
+	$provideWorkspaceComments(handle: number): Promise<modes.CommentThread[]> {
 		const provider = this._workspaceProviders.get(handle);
 		if (!provider) {
 			return Promise.resolve(null);
diff --git a/src/vs/workbench/api/node/extHostDebugService.ts b/src/vs/workbench/api/node/extHostDebugService.ts
index bafe4d4f68d..3392fd8379b 100644
--- a/src/vs/workbench/api/node/extHostDebugService.ts
+++ b/src/vs/workbench/api/node/extHostDebugService.ts
@@ -160,7 +160,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 		return result;
 	}
 
-	public addBreakpoints(breakpoints0: vscode.Breakpoint[]): Thenable<void> {
+	public addBreakpoints(breakpoints0: vscode.Breakpoint[]): Promise<void> {
 
 		this.startBreakpoints();
 
@@ -218,7 +218,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 		return this._debugServiceProxy.$registerBreakpoints(dtos);
 	}
 
-	public removeBreakpoints(breakpoints0: vscode.Breakpoint[]): Thenable<void> {
+	public removeBreakpoints(breakpoints0: vscode.Breakpoint[]): Promise<void> {
 
 		this.startBreakpoints();
 
@@ -234,7 +234,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 		return this._debugServiceProxy.$unregisterBreakpoints(ids, fids);
 	}
 
-	public startDebugging(folder: vscode.WorkspaceFolder | undefined, nameOrConfig: string | vscode.DebugConfiguration): Thenable<boolean> {
+	public startDebugging(folder: vscode.WorkspaceFolder | undefined, nameOrConfig: string | vscode.DebugConfiguration): Promise<boolean> {
 		return this._debugServiceProxy.$startDebugging(folder ? folder.uri : undefined, nameOrConfig);
 	}
 
@@ -314,7 +314,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 
 	// RPC methods (ExtHostDebugServiceShape)
 
-	public $runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): Thenable<number | undefined> {
+	public $runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): Promise<number | undefined> {
 
 		if (args.kind === 'integrated') {
 
@@ -383,7 +383,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 		return Promise.resolve(this._variableResolver.resolveAny(ws, config));
 	}
 
-	public $startDASession(debugAdapterHandle: number, sessionDto: IDebugSessionDto): Thenable<void> {
+	public $startDASession(debugAdapterHandle: number, sessionDto: IDebugSessionDto): Promise<void> {
 		const mythis = this;
 
 		const session = this.getSession(sessionDto);
@@ -472,7 +472,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 		return void 0;
 	}
 
-	public $stopDASession(debugAdapterHandle: number): Thenable<void> {
+	public $stopDASession(debugAdapterHandle: number): Promise<void> {
 
 		const tracker = this._debugAdaptersTrackers.get(debugAdapterHandle);
 		this._debugAdaptersTrackers.delete(debugAdapterHandle);
@@ -550,7 +550,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 		this.fireBreakpointChanges(a, r, c);
 	}
 
-	public $provideDebugConfigurations(configProviderHandle: number, folderUri: UriComponents | undefined): Thenable<vscode.DebugConfiguration[]> {
+	public $provideDebugConfigurations(configProviderHandle: number, folderUri: UriComponents | undefined): Promise<vscode.DebugConfiguration[]> {
 		let provider = this.getConfigProviderByHandle(configProviderHandle);
 		if (!provider) {
 			return Promise.reject(new Error('no handler found'));
@@ -561,7 +561,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 		return asThenable(() => provider.provideDebugConfigurations(this.getFolder(folderUri), CancellationToken.None));
 	}
 
-	public $resolveDebugConfiguration(configProviderHandle: number, folderUri: UriComponents | undefined, debugConfiguration: vscode.DebugConfiguration): Thenable<vscode.DebugConfiguration> {
+	public $resolveDebugConfiguration(configProviderHandle: number, folderUri: UriComponents | undefined, debugConfiguration: vscode.DebugConfiguration): Promise<vscode.DebugConfiguration> {
 		let provider = this.getConfigProviderByHandle(configProviderHandle);
 		if (!provider) {
 			return Promise.reject(new Error('no handler found'));
@@ -573,7 +573,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 	}
 
 	// TODO@AW legacy
-	public $legacyDebugAdapterExecutable(configProviderHandle: number, folderUri: UriComponents | undefined): Thenable<IAdapterDescriptor> {
+	public $legacyDebugAdapterExecutable(configProviderHandle: number, folderUri: UriComponents | undefined): Promise<IAdapterDescriptor> {
 		let provider = this.getConfigProviderByHandle(configProviderHandle);
 		if (!provider) {
 			return Promise.reject(new Error('no handler found'));
@@ -584,7 +584,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 		return asThenable(() => provider.debugAdapterExecutable(this.getFolder(folderUri), CancellationToken.None)).then(x => this.convertToDto(x));
 	}
 
-	public $provideDebugAdapter(adapterProviderHandle: number, sessionDto: IDebugSessionDto): Thenable<IAdapterDescriptor> {
+	public $provideDebugAdapter(adapterProviderHandle: number, sessionDto: IDebugSessionDto): Promise<IAdapterDescriptor> {
 		let adapterProvider = this.getAdapterProviderByHandle(adapterProviderHandle);
 		if (!adapterProvider) {
 			return Promise.reject(new Error('no handler found'));
@@ -839,7 +839,7 @@ export class ExtHostDebugSession implements vscode.DebugSession {
 		return this._configuration;
 	}
 
-	public customRequest(command: string, args: any): Thenable<any> {
+	public customRequest(command: string, args: any): Promise<any> {
 		return this._debugServiceProxy.$customDebugAdapterRequest(this._id, command, args);
 	}
 }
diff --git a/src/vs/workbench/api/node/extHostDecorations.ts b/src/vs/workbench/api/node/extHostDecorations.ts
index b1a0424d2c1..1afb2f43282 100644
--- a/src/vs/workbench/api/node/extHostDecorations.ts
+++ b/src/vs/workbench/api/node/extHostDecorations.ts
@@ -41,7 +41,7 @@ export class ExtHostDecorations implements ExtHostDecorationsShape {
 		});
 	}
 
-	$provideDecorations(requests: DecorationRequest[], token: CancellationToken): Thenable<DecorationReply> {
+	$provideDecorations(requests: DecorationRequest[], token: CancellationToken): Promise<DecorationReply> {
 		const result: DecorationReply = Object.create(null);
 		return Promise.all(requests.map(request => {
 			const { handle, uri, id } = request;
diff --git a/src/vs/workbench/api/node/extHostDialogs.ts b/src/vs/workbench/api/node/extHostDialogs.ts
index b9fd874de21..5fb4a0f4ff0 100644
--- a/src/vs/workbench/api/node/extHostDialogs.ts
+++ b/src/vs/workbench/api/node/extHostDialogs.ts
@@ -15,13 +15,13 @@ export class ExtHostDialogs {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadDialogs);
 	}
 
-	showOpenDialog(options: vscode.OpenDialogOptions): Thenable<URI[]> {
+	showOpenDialog(options: vscode.OpenDialogOptions): Promise<URI[]> {
 		return this._proxy.$showOpenDialog(options).then(filepaths => {
 			return filepaths && filepaths.map(URI.revive);
 		});
 	}
 
-	showSaveDialog(options: vscode.SaveDialogOptions): Thenable<URI> {
+	showSaveDialog(options: vscode.SaveDialogOptions): Promise<URI> {
 		return this._proxy.$showSaveDialog(options).then(filepath => {
 			return filepath && URI.revive(filepath);
 		});
diff --git a/src/vs/workbench/api/node/extHostDocumentData.ts b/src/vs/workbench/api/node/extHostDocumentData.ts
index 4c4f59a9c2a..7d9d6a49155 100644
--- a/src/vs/workbench/api/node/extHostDocumentData.ts
+++ b/src/vs/workbench/api/node/extHostDocumentData.ts
@@ -97,7 +97,7 @@ export class ExtHostDocumentData extends MirrorTextModel {
 		this._isDirty = isDirty;
 	}
 
-	private _save(): Thenable<boolean> {
+	private _save(): Promise<boolean> {
 		if (this._isDisposed) {
 			return Promise.reject(new Error('Document has been closed'));
 		}
diff --git a/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts b/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts
index ea1a0778ef4..ea3ef4d0518 100644
--- a/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts
+++ b/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts
@@ -48,7 +48,7 @@ export class ExtHostDocumentSaveParticipant implements ExtHostDocumentSavePartic
 		};
 	}
 
-	$participateInSave(data: UriComponents, reason: SaveReason): Thenable<boolean[]> {
+	$participateInSave(data: UriComponents, reason: SaveReason): Promise<boolean[]> {
 		const resource = URI.revive(data);
 		const entries = this._callbacks.toArray();
 
@@ -109,7 +109,7 @@ export class ExtHostDocumentSaveParticipant implements ExtHostDocumentSavePartic
 		const event = Object.freeze(<vscode.TextDocumentWillSaveEvent>{
 			document,
 			reason,
-			waitUntil(p: Thenable<any | vscode.TextEdit[]>) {
+			waitUntil(p: Promise<any | vscode.TextEdit[]>) {
 				if (Object.isFrozen(promises)) {
 					throw illegalState('waitUntil can not be called async');
 				}
diff --git a/src/vs/workbench/api/node/extHostDocuments.ts b/src/vs/workbench/api/node/extHostDocuments.ts
index 01dd9719bc4..313dec0438e 100644
--- a/src/vs/workbench/api/node/extHostDocuments.ts
+++ b/src/vs/workbench/api/node/extHostDocuments.ts
@@ -28,7 +28,7 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
 	private _toDispose: IDisposable[];
 	private _proxy: MainThreadDocumentsShape;
 	private _documentsAndEditors: ExtHostDocumentsAndEditors;
-	private _documentLoader = new Map<string, Thenable<ExtHostDocumentData>>();
+	private _documentLoader = new Map<string, Promise<ExtHostDocumentData>>();
 
 	constructor(mainContext: IMainContext, documentsAndEditors: ExtHostDocumentsAndEditors) {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadDocuments);
@@ -67,7 +67,7 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
 		return undefined;
 	}
 
-	public ensureDocumentData(uri: URI): Thenable<ExtHostDocumentData> {
+	public ensureDocumentData(uri: URI): Promise<ExtHostDocumentData> {
 
 		let cached = this._documentsAndEditors.getDocument(uri.toString());
 		if (cached) {
@@ -89,7 +89,7 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
 		return promise;
 	}
 
-	public createDocumentData(options?: { language?: string; content?: string }): Thenable<URI> {
+	public createDocumentData(options?: { language?: string; content?: string }): Promise<URI> {
 		return this._proxy.$tryCreateDocument(options).then(data => URI.revive(data));
 	}
 
diff --git a/src/vs/workbench/api/node/extHostExtensionActivator.ts b/src/vs/workbench/api/node/extHostExtensionActivator.ts
index 64292ed13f7..1bc33c64cbf 100644
--- a/src/vs/workbench/api/node/extHostExtensionActivator.ts
+++ b/src/vs/workbench/api/node/extHostExtensionActivator.ts
@@ -14,7 +14,7 @@ const NO_OP_VOID_PROMISE = Promise.resolve<void>(void 0);
 
 export interface IExtensionMemento {
 	get<T>(key: string, defaultValue: T): T;
-	update(key: string, value: any): Thenable<boolean>;
+	update(key: string, value: any): Promise<boolean>;
 }
 
 export interface IExtensionContext {
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index 3905dfb9825..c5be3ff39e5 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -32,7 +32,7 @@ class ExtensionMemento implements IExtensionMemento {
 	private readonly _shared: boolean;
 	private readonly _storage: ExtHostStorage;
 
-	private readonly _init: Thenable<ExtensionMemento>;
+	private readonly _init: Promise<ExtensionMemento>;
 	private _value: { [n: string]: any; };
 	private readonly _storageListener: IDisposable;
 
@@ -53,7 +53,7 @@ class ExtensionMemento implements IExtensionMemento {
 		});
 	}
 
-	get whenReady(): Thenable<ExtensionMemento> {
+	get whenReady(): Promise<ExtensionMemento> {
 		return this._init;
 	}
 
@@ -65,7 +65,7 @@ class ExtensionMemento implements IExtensionMemento {
 		return value;
 	}
 
-	update(key: string, value: any): Thenable<boolean> {
+	update(key: string, value: any): Promise<boolean> {
 		this._value[key] = value;
 		return this._storage
 			.setValue(this._shared, this._id, this._value)
@@ -231,7 +231,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 	}
 
 	public async deactivateAll(): Promise<void> {
-		let allPromises: Thenable<void>[] = [];
+		let allPromises: Promise<void>[] = [];
 		try {
 			const allExtensions = this._registry.getAllExtensionDescriptions();
 			const allExtensionsIds = allExtensions.map(ext => ext.id);
@@ -253,16 +253,16 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 		return false;
 	}
 
-	private _activateByEvent(activationEvent: string, startup: boolean): Thenable<void> {
+	private _activateByEvent(activationEvent: string, startup: boolean): Promise<void> {
 		const reason = new ExtensionActivatedByEvent(startup, activationEvent);
 		return this._activator.activateByEvent(activationEvent, reason);
 	}
 
-	private _activateById(extensionId: string, reason: ExtensionActivationReason): Thenable<void> {
+	private _activateById(extensionId: string, reason: ExtensionActivationReason): Promise<void> {
 		return this._activator.activateById(extensionId, reason);
 	}
 
-	public activateByIdWithErrors(extensionId: string, reason: ExtensionActivationReason): Thenable<void> {
+	public activateByIdWithErrors(extensionId: string, reason: ExtensionActivationReason): Promise<void> {
 		return this._activateById(extensionId, reason).then(() => {
 			const extension = this._activator.getActivatedExtension(extensionId);
 			if (extension.activationFailed) {
@@ -300,7 +300,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 		return this._extensionPathIndex;
 	}
 
-	private _deactivate(extensionId: string): Thenable<void> {
+	private _deactivate(extensionId: string): Promise<void> {
 		let result = Promise.resolve(void 0);
 
 		if (!this._barrier.isOpen()) {
@@ -428,7 +428,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 		});
 	}
 
-	private static _callActivate(logService: ILogService, extensionId: string, extensionModule: IExtensionModule, context: IExtensionContext, activationTimesBuilder: ExtensionActivationTimesBuilder): Thenable<ActivatedExtension> {
+	private static _callActivate(logService: ILogService, extensionId: string, extensionModule: IExtensionModule, context: IExtensionContext, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<ActivatedExtension> {
 		// Make sure the extension's surface is not undefined
 		extensionModule = extensionModule || {
 			activate: undefined,
@@ -440,12 +440,12 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 		});
 	}
 
-	private static _callActivateOptional(logService: ILogService, extensionId: string, extensionModule: IExtensionModule, context: IExtensionContext, activationTimesBuilder: ExtensionActivationTimesBuilder): Thenable<IExtensionAPI> {
+	private static _callActivateOptional(logService: ILogService, extensionId: string, extensionModule: IExtensionModule, context: IExtensionContext, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<IExtensionAPI> {
 		if (typeof extensionModule.activate === 'function') {
 			try {
 				activationTimesBuilder.activateCallStart();
 				logService.trace(`ExtensionService#_callActivateOptional ${extensionId}`);
-				const activateResult: Thenable<IExtensionAPI> = extensionModule.activate.apply(global, [context]);
+				const activateResult: Promise<IExtensionAPI> = extensionModule.activate.apply(global, [context]);
 				activationTimesBuilder.activateCallStop();
 
 				activationTimesBuilder.activateResolveStart();
@@ -614,7 +614,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 		setTimeout(() => this._nativeExit(code), 500);
 	}
 
-	private _startExtensionHost(): Thenable<void> {
+	private _startExtensionHost(): Promise<void> {
 		if (this._started) {
 			throw new Error(`Extension host is already started!`);
 		}
@@ -634,12 +634,12 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 		throw new Error(`Not implemented`);
 	}
 
-	public $startExtensionHost(enabledExtensionIds: string[]): Thenable<void> {
+	public $startExtensionHost(enabledExtensionIds: string[]): Promise<void> {
 		this._registry.keepOnly(enabledExtensionIds);
 		return this._startExtensionHost();
 	}
 
-	public $activateByEvent(activationEvent: string): Thenable<void> {
+	public $activateByEvent(activationEvent: string): Promise<void> {
 		return (
 			this._barrier.wait()
 				.then(_ => this._activateByEvent(activationEvent, false))
diff --git a/src/vs/workbench/api/node/extHostFileSystemEventService.ts b/src/vs/workbench/api/node/extHostFileSystemEventService.ts
index 2a44937ed2c..b3bce5d253f 100644
--- a/src/vs/workbench/api/node/extHostFileSystemEventService.ts
+++ b/src/vs/workbench/api/node/extHostFileSystemEventService.ts
@@ -139,7 +139,7 @@ export class ExtHostFileSystemEventService implements ExtHostFileSystemEventServ
 		};
 	}
 
-	$onWillRename(oldUriDto: UriComponents, newUriDto: UriComponents): Thenable<any> {
+	$onWillRename(oldUriDto: UriComponents, newUriDto: UriComponents): Promise<any> {
 		const oldUri = URI.revive(oldUriDto);
 		const newUri = URI.revive(newUriDto);
 
@@ -148,7 +148,7 @@ export class ExtHostFileSystemEventService implements ExtHostFileSystemEventServ
 			return {
 				oldUri,
 				newUri,
-				waitUntil: (thenable: Thenable<vscode.WorkspaceEdit>): void => {
+				waitUntil: (thenable: Promise<vscode.WorkspaceEdit>): void => {
 					if (Object.isFrozen(bucket)) {
 						throw new TypeError('waitUntil cannot be called async');
 					}
diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
index a2172065376..d165594ba34 100644
--- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
@@ -38,7 +38,7 @@ class OutlineAdapter {
 		this._provider = provider;
 	}
 
-	provideDocumentSymbols(resource: URI, token: CancellationToken): Thenable<modes.DocumentSymbol[]> {
+	provideDocumentSymbols(resource: URI, token: CancellationToken): Promise<modes.DocumentSymbol[]> {
 		let doc = this._documents.getDocumentData(resource).document;
 		return asThenable(() => this._provider.provideDocumentSymbols(doc, token)).then(value => {
 			if (isFalsyOrEmpty(value)) {
@@ -104,7 +104,7 @@ class CodeLensAdapter {
 		private readonly _provider: vscode.CodeLensProvider
 	) { }
 
-	provideCodeLenses(resource: URI, token: CancellationToken): Thenable<modes.ICodeLensSymbol[]> {
+	provideCodeLenses(resource: URI, token: CancellationToken): Promise<modes.ICodeLensSymbol[]> {
 		const doc = this._documents.getDocumentData(resource).document;
 
 		return asThenable(() => this._provider.provideCodeLenses(doc, token)).then(lenses => {
@@ -121,14 +121,14 @@ class CodeLensAdapter {
 		});
 	}
 
-	resolveCodeLens(resource: URI, symbol: modes.ICodeLensSymbol, token: CancellationToken): Thenable<modes.ICodeLensSymbol> {
+	resolveCodeLens(resource: URI, symbol: modes.ICodeLensSymbol, token: CancellationToken): Promise<modes.ICodeLensSymbol> {
 
 		const lens = this._heapService.get<vscode.CodeLens>(ObjectIdentifier.of(symbol));
 		if (!lens) {
 			return undefined;
 		}
 
-		let resolve: Thenable<vscode.CodeLens>;
+		let resolve: Promise<vscode.CodeLens>;
 		if (typeof this._provider.resolveCodeLens !== 'function' || lens.isResolved) {
 			resolve = Promise.resolve(lens);
 		} else {
@@ -159,7 +159,7 @@ class DefinitionAdapter {
 		private readonly _provider: vscode.DefinitionProvider
 	) { }
 
-	provideDefinition(resource: URI, position: IPosition, token: CancellationToken): Thenable<modes.DefinitionLink[]> {
+	provideDefinition(resource: URI, position: IPosition, token: CancellationToken): Promise<modes.DefinitionLink[]> {
 		let doc = this._documents.getDocumentData(resource).document;
 		let pos = typeConvert.Position.to(position);
 		return asThenable(() => this._provider.provideDefinition(doc, pos, token)).then(convertToDefinitionLinks);
@@ -173,7 +173,7 @@ class DeclarationAdapter {
 		private readonly _provider: vscode.DeclarationProvider
 	) { }
 
-	provideDeclaration(resource: URI, position: IPosition, token: CancellationToken): Thenable<modes.DefinitionLink[]> {
+	provideDeclaration(resource: URI, position: IPosition, token: CancellationToken): Promise<modes.DefinitionLink[]> {
 		let doc = this._documents.getDocumentData(resource).document;
 		let pos = typeConvert.Position.to(position);
 		return asThenable(() => this._provider.provideDeclaration(doc, pos, token)).then(convertToDefinitionLinks);
@@ -187,7 +187,7 @@ class ImplementationAdapter {
 		private readonly _provider: vscode.ImplementationProvider
 	) { }
 
-	provideImplementation(resource: URI, position: IPosition, token: CancellationToken): Thenable<modes.DefinitionLink[]> {
+	provideImplementation(resource: URI, position: IPosition, token: CancellationToken): Promise<modes.DefinitionLink[]> {
 		let doc = this._documents.getDocumentData(resource).document;
 		let pos = typeConvert.Position.to(position);
 		return asThenable(() => this._provider.provideImplementation(doc, pos, token)).then(convertToDefinitionLinks);
@@ -201,7 +201,7 @@ class TypeDefinitionAdapter {
 		private readonly _provider: vscode.TypeDefinitionProvider
 	) { }
 
-	provideTypeDefinition(resource: URI, position: IPosition, token: CancellationToken): Thenable<modes.DefinitionLink[]> {
+	provideTypeDefinition(resource: URI, position: IPosition, token: CancellationToken): Promise<modes.DefinitionLink[]> {
 		const doc = this._documents.getDocumentData(resource).document;
 		const pos = typeConvert.Position.to(position);
 		return asThenable(() => this._provider.provideTypeDefinition(doc, pos, token)).then(convertToDefinitionLinks);
@@ -215,7 +215,7 @@ class HoverAdapter {
 		private readonly _provider: vscode.HoverProvider,
 	) { }
 
-	public provideHover(resource: URI, position: IPosition, token: CancellationToken): Thenable<modes.Hover> {
+	public provideHover(resource: URI, position: IPosition, token: CancellationToken): Promise<modes.Hover> {
 
 		let doc = this._documents.getDocumentData(resource).document;
 		let pos = typeConvert.Position.to(position);
@@ -243,7 +243,7 @@ class DocumentHighlightAdapter {
 		private readonly _provider: vscode.DocumentHighlightProvider
 	) { }
 
-	provideDocumentHighlights(resource: URI, position: IPosition, token: CancellationToken): Thenable<modes.DocumentHighlight[]> {
+	provideDocumentHighlights(resource: URI, position: IPosition, token: CancellationToken): Promise<modes.DocumentHighlight[]> {
 
 		let doc = this._documents.getDocumentData(resource).document;
 		let pos = typeConvert.Position.to(position);
@@ -264,7 +264,7 @@ class ReferenceAdapter {
 		private readonly _provider: vscode.ReferenceProvider
 	) { }
 
-	provideReferences(resource: URI, position: IPosition, context: modes.ReferenceContext, token: CancellationToken): Thenable<modes.Location[]> {
+	provideReferences(resource: URI, position: IPosition, context: modes.ReferenceContext, token: CancellationToken): Promise<modes.Location[]> {
 		let doc = this._documents.getDocumentData(resource).document;
 		let pos = typeConvert.Position.to(position);
 
@@ -292,7 +292,7 @@ class CodeActionAdapter {
 		private readonly _extensionId: string
 	) { }
 
-	provideCodeActions(resource: URI, rangeOrSelection: IRange | ISelection, context: modes.CodeActionContext, token: CancellationToken): Thenable<CodeActionDto[]> {
+	provideCodeActions(resource: URI, rangeOrSelection: IRange | ISelection, context: modes.CodeActionContext, token: CancellationToken): Promise<CodeActionDto[]> {
 
 		const doc = this._documents.getDocumentData(resource).document;
 		const ran = Selection.isISelection(rangeOrSelection)
@@ -363,7 +363,7 @@ class DocumentFormattingAdapter {
 		private readonly _provider: vscode.DocumentFormattingEditProvider
 	) { }
 
-	provideDocumentFormattingEdits(resource: URI, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]> {
+	provideDocumentFormattingEdits(resource: URI, options: modes.FormattingOptions, token: CancellationToken): Promise<ISingleEditOperation[]> {
 
 		const { document } = this._documents.getDocumentData(resource);
 
@@ -383,7 +383,7 @@ class RangeFormattingAdapter {
 		private readonly _provider: vscode.DocumentRangeFormattingEditProvider
 	) { }
 
-	provideDocumentRangeFormattingEdits(resource: URI, range: IRange, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]> {
+	provideDocumentRangeFormattingEdits(resource: URI, range: IRange, options: modes.FormattingOptions, token: CancellationToken): Promise<ISingleEditOperation[]> {
 
 		const { document } = this._documents.getDocumentData(resource);
 		const ran = typeConvert.Range.to(range);
@@ -406,7 +406,7 @@ class OnTypeFormattingAdapter {
 
 	autoFormatTriggerCharacters: string[] = []; // not here
 
-	provideOnTypeFormattingEdits(resource: URI, position: IPosition, ch: string, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]> {
+	provideOnTypeFormattingEdits(resource: URI, position: IPosition, ch: string, options: modes.FormattingOptions, token: CancellationToken): Promise<ISingleEditOperation[]> {
 
 		const { document } = this._documents.getDocumentData(resource);
 		const pos = typeConvert.Position.to(position);
@@ -430,7 +430,7 @@ class NavigateTypeAdapter {
 		this._provider = provider;
 	}
 
-	provideWorkspaceSymbols(search: string, token: CancellationToken): Thenable<WorkspaceSymbolsDto> {
+	provideWorkspaceSymbols(search: string, token: CancellationToken): Promise<WorkspaceSymbolsDto> {
 		const result: WorkspaceSymbolsDto = IdObject.mixin({ symbols: [] });
 		return asThenable(() => this._provider.provideWorkspaceSymbols(search, token)).then(value => {
 			if (isNonEmptyArray(value)) {
@@ -456,7 +456,7 @@ class NavigateTypeAdapter {
 		});
 	}
 
-	resolveWorkspaceSymbol(symbol: WorkspaceSymbolDto, token: CancellationToken): Thenable<WorkspaceSymbolDto> {
+	resolveWorkspaceSymbol(symbol: WorkspaceSymbolDto, token: CancellationToken): Promise<WorkspaceSymbolDto> {
 
 		if (typeof this._provider.resolveWorkspaceSymbol !== 'function') {
 			return Promise.resolve(symbol);
@@ -493,7 +493,7 @@ class RenameAdapter {
 		private readonly _provider: vscode.RenameProvider
 	) { }
 
-	provideRenameEdits(resource: URI, position: IPosition, newName: string, token: CancellationToken): Thenable<WorkspaceEditDto> {
+	provideRenameEdits(resource: URI, position: IPosition, newName: string, token: CancellationToken): Promise<WorkspaceEditDto> {
 
 		let doc = this._documents.getDocumentData(resource).document;
 		let pos = typeConvert.Position.to(position);
@@ -514,7 +514,7 @@ class RenameAdapter {
 		});
 	}
 
-	resolveRenameLocation(resource: URI, position: IPosition, token: CancellationToken): Thenable<modes.RenameLocation & modes.Rejection> {
+	resolveRenameLocation(resource: URI, position: IPosition, token: CancellationToken): Promise<modes.RenameLocation & modes.Rejection> {
 		if (typeof this._provider.prepareRename !== 'function') {
 			return Promise.resolve(undefined);
 		}
@@ -583,7 +583,7 @@ class SuggestAdapter {
 		this._provider = provider;
 	}
 
-	provideCompletionItems(resource: URI, position: IPosition, context: modes.CompletionContext, token: CancellationToken): Thenable<SuggestResultDto> {
+	provideCompletionItems(resource: URI, position: IPosition, context: modes.CompletionContext, token: CancellationToken): Promise<SuggestResultDto> {
 
 		const doc = this._documents.getDocumentData(resource).document;
 		const pos = typeConvert.Position.to(position);
@@ -630,7 +630,7 @@ class SuggestAdapter {
 		});
 	}
 
-	resolveCompletionItem(resource: URI, position: IPosition, suggestion: modes.CompletionItem, token: CancellationToken): Thenable<modes.CompletionItem> {
+	resolveCompletionItem(resource: URI, position: IPosition, suggestion: modes.CompletionItem, token: CancellationToken): Promise<modes.CompletionItem> {
 
 		if (typeof this._provider.resolveCompletionItem !== 'function') {
 			return Promise.resolve(suggestion);
@@ -733,7 +733,7 @@ class SignatureHelpAdapter {
 		private readonly _provider: vscode.SignatureHelpProvider
 	) { }
 
-	provideSignatureHelp(resource: URI, position: IPosition, context: modes.SignatureHelpContext, token: CancellationToken): Thenable<modes.SignatureHelp> {
+	provideSignatureHelp(resource: URI, position: IPosition, context: modes.SignatureHelpContext, token: CancellationToken): Promise<modes.SignatureHelp> {
 
 		const doc = this._documents.getDocumentData(resource).document;
 		const pos = typeConvert.Position.to(position);
@@ -755,7 +755,7 @@ class LinkProviderAdapter {
 		private readonly _provider: vscode.DocumentLinkProvider
 	) { }
 
-	provideLinks(resource: URI, token: CancellationToken): Thenable<modes.ILink[]> {
+	provideLinks(resource: URI, token: CancellationToken): Promise<modes.ILink[]> {
 		const doc = this._documents.getDocumentData(resource).document;
 
 		return asThenable(() => this._provider.provideDocumentLinks(doc, token)).then(links => {
@@ -773,7 +773,7 @@ class LinkProviderAdapter {
 		});
 	}
 
-	resolveLink(link: modes.ILink, token: CancellationToken): Thenable<modes.ILink> {
+	resolveLink(link: modes.ILink, token: CancellationToken): Promise<modes.ILink> {
 		if (typeof this._provider.resolveDocumentLink !== 'function') {
 			return undefined;
 		}
@@ -800,7 +800,7 @@ class ColorProviderAdapter {
 		private _provider: vscode.DocumentColorProvider
 	) { }
 
-	provideColors(resource: URI, token: CancellationToken): Thenable<IRawColorInfo[]> {
+	provideColors(resource: URI, token: CancellationToken): Promise<IRawColorInfo[]> {
 		const doc = this._documents.getDocumentData(resource).document;
 		return asThenable(() => this._provider.provideDocumentColors(doc, token)).then(colors => {
 			if (!Array.isArray(colors)) {
@@ -818,7 +818,7 @@ class ColorProviderAdapter {
 		});
 	}
 
-	provideColorPresentations(resource: URI, raw: IRawColorInfo, token: CancellationToken): Thenable<modes.IColorPresentation[]> {
+	provideColorPresentations(resource: URI, raw: IRawColorInfo, token: CancellationToken): Promise<modes.IColorPresentation[]> {
 		const document = this._documents.getDocumentData(resource).document;
 		const range = typeConvert.Range.to(raw.range);
 		const color = typeConvert.Color.to(raw.color);
@@ -835,7 +835,7 @@ class FoldingProviderAdapter {
 		private _provider: vscode.FoldingRangeProvider
 	) { }
 
-	provideFoldingRanges(resource: URI, context: modes.FoldingContext, token: CancellationToken): Thenable<modes.FoldingRange[]> {
+	provideFoldingRanges(resource: URI, context: modes.FoldingContext, token: CancellationToken): Promise<modes.FoldingRange[]> {
 		const doc = this._documents.getDocumentData(resource).document;
 		return asThenable(() => this._provider.provideFoldingRanges(doc, context, token)).then(ranges => {
 			if (!Array.isArray(ranges)) {
@@ -969,7 +969,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return ExtHostLanguageFeatures._handlePool++;
 	}
 
-	private _withAdapter<A, R>(handle: number, ctor: { new(...args: any[]): A }, callback: (adapter: A) => Thenable<R>): Thenable<R> {
+	private _withAdapter<A, R>(handle: number, ctor: { new(...args: any[]): A }, callback: (adapter: A) => Promise<R>): Promise<R> {
 		let data = this._adapter.get(handle);
 		if (data.adapter instanceof ctor) {
 			let t1: number;
@@ -1007,7 +1007,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideDocumentSymbols(handle: number, resource: UriComponents, token: CancellationToken): Thenable<modes.DocumentSymbol[]> {
+	$provideDocumentSymbols(handle: number, resource: UriComponents, token: CancellationToken): Promise<modes.DocumentSymbol[]> {
 		return this._withAdapter(handle, OutlineAdapter, adapter => adapter.provideDocumentSymbols(URI.revive(resource), token));
 	}
 
@@ -1029,11 +1029,11 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return result;
 	}
 
-	$provideCodeLenses(handle: number, resource: UriComponents, token: CancellationToken): Thenable<modes.ICodeLensSymbol[]> {
+	$provideCodeLenses(handle: number, resource: UriComponents, token: CancellationToken): Promise<modes.ICodeLensSymbol[]> {
 		return this._withAdapter(handle, CodeLensAdapter, adapter => adapter.provideCodeLenses(URI.revive(resource), token));
 	}
 
-	$resolveCodeLens(handle: number, resource: UriComponents, symbol: modes.ICodeLensSymbol, token: CancellationToken): Thenable<modes.ICodeLensSymbol> {
+	$resolveCodeLens(handle: number, resource: UriComponents, symbol: modes.ICodeLensSymbol, token: CancellationToken): Promise<modes.ICodeLensSymbol> {
 		return this._withAdapter(handle, CodeLensAdapter, adapter => adapter.resolveCodeLens(URI.revive(resource), symbol, token));
 	}
 
@@ -1045,7 +1045,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideDefinition(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<modes.DefinitionLink[]> {
+	$provideDefinition(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<modes.DefinitionLink[]> {
 		return this._withAdapter(handle, DefinitionAdapter, adapter => adapter.provideDefinition(URI.revive(resource), position, token));
 	}
 
@@ -1055,7 +1055,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideDeclaration(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<modes.DefinitionLink[]> {
+	$provideDeclaration(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<modes.DefinitionLink[]> {
 		return this._withAdapter(handle, DeclarationAdapter, adapter => adapter.provideDeclaration(URI.revive(resource), position, token));
 	}
 
@@ -1065,7 +1065,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideImplementation(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<modes.DefinitionLink[]> {
+	$provideImplementation(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<modes.DefinitionLink[]> {
 		return this._withAdapter(handle, ImplementationAdapter, adapter => adapter.provideImplementation(URI.revive(resource), position, token));
 	}
 
@@ -1075,7 +1075,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideTypeDefinition(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<modes.DefinitionLink[]> {
+	$provideTypeDefinition(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<modes.DefinitionLink[]> {
 		return this._withAdapter(handle, TypeDefinitionAdapter, adapter => adapter.provideTypeDefinition(URI.revive(resource), position, token));
 	}
 
@@ -1087,7 +1087,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideHover(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<modes.Hover> {
+	$provideHover(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<modes.Hover> {
 		return this._withAdapter(handle, HoverAdapter, adapter => adapter.provideHover(URI.revive(resource), position, token));
 	}
 
@@ -1099,7 +1099,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideDocumentHighlights(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<modes.DocumentHighlight[]> {
+	$provideDocumentHighlights(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<modes.DocumentHighlight[]> {
 		return this._withAdapter(handle, DocumentHighlightAdapter, adapter => adapter.provideDocumentHighlights(URI.revive(resource), position, token));
 	}
 
@@ -1111,7 +1111,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideReferences(handle: number, resource: UriComponents, position: IPosition, context: modes.ReferenceContext, token: CancellationToken): Thenable<modes.Location[]> {
+	$provideReferences(handle: number, resource: UriComponents, position: IPosition, context: modes.ReferenceContext, token: CancellationToken): Promise<modes.Location[]> {
 		return this._withAdapter(handle, ReferenceAdapter, adapter => adapter.provideReferences(URI.revive(resource), position, context, token));
 	}
 
@@ -1124,7 +1124,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 	}
 
 
-	$provideCodeActions(handle: number, resource: UriComponents, rangeOrSelection: IRange | ISelection, context: modes.CodeActionContext, token: CancellationToken): Thenable<CodeActionDto[]> {
+	$provideCodeActions(handle: number, resource: UriComponents, rangeOrSelection: IRange | ISelection, context: modes.CodeActionContext, token: CancellationToken): Promise<CodeActionDto[]> {
 		return this._withAdapter(handle, CodeActionAdapter, adapter => adapter.provideCodeActions(URI.revive(resource), rangeOrSelection, context, token));
 	}
 
@@ -1136,7 +1136,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideDocumentFormattingEdits(handle: number, resource: UriComponents, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]> {
+	$provideDocumentFormattingEdits(handle: number, resource: UriComponents, options: modes.FormattingOptions, token: CancellationToken): Promise<ISingleEditOperation[]> {
 		return this._withAdapter(handle, DocumentFormattingAdapter, adapter => adapter.provideDocumentFormattingEdits(URI.revive(resource), options, token));
 	}
 
@@ -1146,7 +1146,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideDocumentRangeFormattingEdits(handle: number, resource: UriComponents, range: IRange, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]> {
+	$provideDocumentRangeFormattingEdits(handle: number, resource: UriComponents, range: IRange, options: modes.FormattingOptions, token: CancellationToken): Promise<ISingleEditOperation[]> {
 		return this._withAdapter(handle, RangeFormattingAdapter, adapter => adapter.provideDocumentRangeFormattingEdits(URI.revive(resource), range, options, token));
 	}
 
@@ -1156,7 +1156,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideOnTypeFormattingEdits(handle: number, resource: UriComponents, position: IPosition, ch: string, options: modes.FormattingOptions, token: CancellationToken): Thenable<ISingleEditOperation[]> {
+	$provideOnTypeFormattingEdits(handle: number, resource: UriComponents, position: IPosition, ch: string, options: modes.FormattingOptions, token: CancellationToken): Promise<ISingleEditOperation[]> {
 		return this._withAdapter(handle, OnTypeFormattingAdapter, adapter => adapter.provideOnTypeFormattingEdits(URI.revive(resource), position, ch, options, token));
 	}
 
@@ -1168,11 +1168,11 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideWorkspaceSymbols(handle: number, search: string, token: CancellationToken): Thenable<WorkspaceSymbolsDto> {
+	$provideWorkspaceSymbols(handle: number, search: string, token: CancellationToken): Promise<WorkspaceSymbolsDto> {
 		return this._withAdapter(handle, NavigateTypeAdapter, adapter => adapter.provideWorkspaceSymbols(search, token));
 	}
 
-	$resolveWorkspaceSymbol(handle: number, symbol: WorkspaceSymbolDto, token: CancellationToken): Thenable<WorkspaceSymbolDto> {
+	$resolveWorkspaceSymbol(handle: number, symbol: WorkspaceSymbolDto, token: CancellationToken): Promise<WorkspaceSymbolDto> {
 		return this._withAdapter(handle, NavigateTypeAdapter, adapter => adapter.resolveWorkspaceSymbol(symbol, token));
 	}
 
@@ -1188,11 +1188,11 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideRenameEdits(handle: number, resource: UriComponents, position: IPosition, newName: string, token: CancellationToken): Thenable<WorkspaceEditDto> {
+	$provideRenameEdits(handle: number, resource: UriComponents, position: IPosition, newName: string, token: CancellationToken): Promise<WorkspaceEditDto> {
 		return this._withAdapter(handle, RenameAdapter, adapter => adapter.provideRenameEdits(URI.revive(resource), position, newName, token));
 	}
 
-	$resolveRenameLocation(handle: number, resource: URI, position: IPosition, token: CancellationToken): Thenable<modes.RenameLocation> {
+	$resolveRenameLocation(handle: number, resource: URI, position: IPosition, token: CancellationToken): Promise<modes.RenameLocation> {
 		return this._withAdapter(handle, RenameAdapter, adapter => adapter.resolveRenameLocation(URI.revive(resource), position, token));
 	}
 
@@ -1204,11 +1204,11 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideCompletionItems(handle: number, resource: UriComponents, position: IPosition, context: modes.CompletionContext, token: CancellationToken): Thenable<SuggestResultDto> {
+	$provideCompletionItems(handle: number, resource: UriComponents, position: IPosition, context: modes.CompletionContext, token: CancellationToken): Promise<SuggestResultDto> {
 		return this._withAdapter(handle, SuggestAdapter, adapter => adapter.provideCompletionItems(URI.revive(resource), position, context, token));
 	}
 
-	$resolveCompletionItem(handle: number, resource: UriComponents, position: IPosition, suggestion: modes.CompletionItem, token: CancellationToken): Thenable<modes.CompletionItem> {
+	$resolveCompletionItem(handle: number, resource: UriComponents, position: IPosition, suggestion: modes.CompletionItem, token: CancellationToken): Promise<modes.CompletionItem> {
 		return this._withAdapter(handle, SuggestAdapter, adapter => adapter.resolveCompletionItem(URI.revive(resource), position, suggestion, token));
 	}
 
@@ -1228,7 +1228,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideSignatureHelp(handle: number, resource: UriComponents, position: IPosition, context: modes.SignatureHelpContext, token: CancellationToken): Thenable<modes.SignatureHelp> {
+	$provideSignatureHelp(handle: number, resource: UriComponents, position: IPosition, context: modes.SignatureHelpContext, token: CancellationToken): Promise<modes.SignatureHelp> {
 		return this._withAdapter(handle, SignatureHelpAdapter, adapter => adapter.provideSignatureHelp(URI.revive(resource), position, context, token));
 	}
 
@@ -1240,11 +1240,11 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideDocumentLinks(handle: number, resource: UriComponents, token: CancellationToken): Thenable<modes.ILink[]> {
+	$provideDocumentLinks(handle: number, resource: UriComponents, token: CancellationToken): Promise<modes.ILink[]> {
 		return this._withAdapter(handle, LinkProviderAdapter, adapter => adapter.provideLinks(URI.revive(resource), token));
 	}
 
-	$resolveDocumentLink(handle: number, link: modes.ILink, token: CancellationToken): Thenable<modes.ILink> {
+	$resolveDocumentLink(handle: number, link: modes.ILink, token: CancellationToken): Promise<modes.ILink> {
 		return this._withAdapter(handle, LinkProviderAdapter, adapter => adapter.resolveLink(link, token));
 	}
 
@@ -1254,11 +1254,11 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideDocumentColors(handle: number, resource: UriComponents, token: CancellationToken): Thenable<IRawColorInfo[]> {
+	$provideDocumentColors(handle: number, resource: UriComponents, token: CancellationToken): Promise<IRawColorInfo[]> {
 		return this._withAdapter(handle, ColorProviderAdapter, adapter => adapter.provideColors(URI.revive(resource), token));
 	}
 
-	$provideColorPresentations(handle: number, resource: UriComponents, colorInfo: IRawColorInfo, token: CancellationToken): Thenable<modes.IColorPresentation[]> {
+	$provideColorPresentations(handle: number, resource: UriComponents, colorInfo: IRawColorInfo, token: CancellationToken): Promise<modes.IColorPresentation[]> {
 		return this._withAdapter(handle, ColorProviderAdapter, adapter => adapter.provideColorPresentations(URI.revive(resource), colorInfo, token));
 	}
 
@@ -1268,7 +1268,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideFoldingRanges(handle: number, resource: UriComponents, context: vscode.FoldingContext, token: CancellationToken): Thenable<modes.FoldingRange[]> {
+	$provideFoldingRanges(handle: number, resource: UriComponents, context: vscode.FoldingContext, token: CancellationToken): Promise<modes.FoldingRange[]> {
 		return this._withAdapter(handle, FoldingProviderAdapter, adapter => adapter.provideFoldingRanges(URI.revive(resource), context, token));
 	}
 
@@ -1280,7 +1280,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideSelectionRanges(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<IRange[]> {
+	$provideSelectionRanges(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<IRange[]> {
 		return this._withAdapter(handle, SelectionRangeAdapter, adapter => adapter.provideSelectionRanges(URI.revive(resource), position, token));
 	}
 
diff --git a/src/vs/workbench/api/node/extHostLanguages.ts b/src/vs/workbench/api/node/extHostLanguages.ts
index fddc63becaa..6449d452e76 100644
--- a/src/vs/workbench/api/node/extHostLanguages.ts
+++ b/src/vs/workbench/api/node/extHostLanguages.ts
@@ -20,11 +20,11 @@ export class ExtHostLanguages {
 		this._documents = documents;
 	}
 
-	getLanguages(): Thenable<string[]> {
+	getLanguages(): Promise<string[]> {
 		return this._proxy.$getLanguages();
 	}
 
-	changeLanguage(uri: vscode.Uri, languageId: string): Thenable<vscode.TextDocument> {
+	changeLanguage(uri: vscode.Uri, languageId: string): Promise<vscode.TextDocument> {
 		return this._proxy.$changeLanguage(uri, languageId).then(() => {
 			return this._documents.getDocumentData(uri).document;
 		});
diff --git a/src/vs/workbench/api/node/extHostMessageService.ts b/src/vs/workbench/api/node/extHostMessageService.ts
index f5bc168b537..f24be5f48b0 100644
--- a/src/vs/workbench/api/node/extHostMessageService.ts
+++ b/src/vs/workbench/api/node/extHostMessageService.ts
@@ -20,9 +20,9 @@ export class ExtHostMessageService {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadMessageService);
 	}
 
-	showMessage(extension: IExtensionDescription, severity: Severity, message: string, optionsOrFirstItem: vscode.MessageOptions | string, rest: string[]): Thenable<string | undefined>;
-	showMessage(extension: IExtensionDescription, severity: Severity, message: string, optionsOrFirstItem: vscode.MessageOptions | vscode.MessageItem, rest: vscode.MessageItem[]): Thenable<vscode.MessageItem | undefined>;
-	showMessage(extension: IExtensionDescription, severity: Severity, message: string, optionsOrFirstItem: vscode.MessageOptions | string | vscode.MessageItem, rest: (string | vscode.MessageItem)[]): Thenable<string | vscode.MessageItem | undefined> {
+	showMessage(extension: IExtensionDescription, severity: Severity, message: string, optionsOrFirstItem: vscode.MessageOptions | string, rest: string[]): Promise<string | undefined>;
+	showMessage(extension: IExtensionDescription, severity: Severity, message: string, optionsOrFirstItem: vscode.MessageOptions | vscode.MessageItem, rest: vscode.MessageItem[]): Promise<vscode.MessageItem | undefined>;
+	showMessage(extension: IExtensionDescription, severity: Severity, message: string, optionsOrFirstItem: vscode.MessageOptions | string | vscode.MessageItem, rest: (string | vscode.MessageItem)[]): Promise<string | vscode.MessageItem | undefined> {
 
 		let options: MainThreadMessageOptions = { extension };
 		let items: (string | vscode.MessageItem)[];
diff --git a/src/vs/workbench/api/node/extHostOutputService.ts b/src/vs/workbench/api/node/extHostOutputService.ts
index 3cf3be59ea1..9e64042fc1b 100644
--- a/src/vs/workbench/api/node/extHostOutputService.ts
+++ b/src/vs/workbench/api/node/extHostOutputService.ts
@@ -14,7 +14,7 @@ import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 
 export abstract class AbstractExtHostOutputChannel extends Disposable implements vscode.OutputChannel {
 
-	readonly _id: Thenable<string>;
+	readonly _id: Promise<string>;
 	private readonly _name: string;
 	protected readonly _proxy: MainThreadOutputServiceShape;
 	private _disposed: boolean;
diff --git a/src/vs/workbench/api/node/extHostProgress.ts b/src/vs/workbench/api/node/extHostProgress.ts
index ebe5cc7f407..4eb444f677a 100644
--- a/src/vs/workbench/api/node/extHostProgress.ts
+++ b/src/vs/workbench/api/node/extHostProgress.ts
@@ -89,4 +89,4 @@ class ProgressCallback extends Progress<IProgressStep> {
 	throttledReport(p: IProgressStep): void {
 		this._proxy.$progressReport(this._handle, p);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/api/node/extHostQuickOpen.ts b/src/vs/workbench/api/node/extHostQuickOpen.ts
index 33053514452..202e9952675 100644
--- a/src/vs/workbench/api/node/extHostQuickOpen.ts
+++ b/src/vs/workbench/api/node/extHostQuickOpen.ts
@@ -36,10 +36,10 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 		this._commands = commands;
 	}
 
-	showQuickPick(itemsOrItemsPromise: QuickPickItem[] | Thenable<QuickPickItem[]>, enableProposedApi: boolean, options: QuickPickOptions & { canPickMany: true; }, token?: CancellationToken): Thenable<QuickPickItem[] | undefined>;
-	showQuickPick(itemsOrItemsPromise: string[] | Thenable<string[]>, enableProposedApi: boolean, options?: QuickPickOptions, token?: CancellationToken): Thenable<string | undefined>;
-	showQuickPick(itemsOrItemsPromise: QuickPickItem[] | Thenable<QuickPickItem[]>, enableProposedApi: boolean, options?: QuickPickOptions, token?: CancellationToken): Thenable<QuickPickItem | undefined>;
-	showQuickPick(itemsOrItemsPromise: Item[] | Thenable<Item[]>, enableProposedApi: boolean, options?: QuickPickOptions, token: CancellationToken = CancellationToken.None): Thenable<Item | Item[] | undefined> {
+	showQuickPick(itemsOrItemsPromise: QuickPickItem[] | Promise<QuickPickItem[]>, enableProposedApi: boolean, options: QuickPickOptions & { canPickMany: true; }, token?: CancellationToken): Promise<QuickPickItem[] | undefined>;
+	showQuickPick(itemsOrItemsPromise: string[] | Promise<string[]>, enableProposedApi: boolean, options?: QuickPickOptions, token?: CancellationToken): Promise<string | undefined>;
+	showQuickPick(itemsOrItemsPromise: QuickPickItem[] | Promise<QuickPickItem[]>, enableProposedApi: boolean, options?: QuickPickOptions, token?: CancellationToken): Promise<QuickPickItem | undefined>;
+	showQuickPick(itemsOrItemsPromise: Item[] | Promise<Item[]>, enableProposedApi: boolean, options?: QuickPickOptions, token: CancellationToken = CancellationToken.None): Promise<Item | Item[] | undefined> {
 
 		// clear state from last invocation
 		this._onDidSelectItem = undefined;
@@ -133,7 +133,7 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 
 	// ---- input
 
-	showInput(options?: InputBoxOptions, token: CancellationToken = CancellationToken.None): Thenable<string> {
+	showInput(options?: InputBoxOptions, token: CancellationToken = CancellationToken.None): Promise<string> {
 
 		// global validate fn used in callback below
 		this._validateInput = options && options.validateInput;
@@ -148,7 +148,7 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 			});
 	}
 
-	$validateInput(input: string): Thenable<string> {
+	$validateInput(input: string): Promise<string> {
 		if (this._validateInput) {
 			return asThenable(() => this._validateInput(input));
 		}
@@ -157,7 +157,7 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 
 	// ---- workspace folder picker
 
-	showWorkspaceFolderPick(options?: WorkspaceFolderPickOptions, token = CancellationToken.None): Thenable<WorkspaceFolder> {
+	showWorkspaceFolderPick(options?: WorkspaceFolderPickOptions, token = CancellationToken.None): Promise<WorkspaceFolder> {
 		return this._commands.executeCommand('_workbench.pickWorkspaceFolder', [options]).then((selectedFolder: WorkspaceFolder) => {
 			if (!selectedFolder) {
 				return undefined;
diff --git a/src/vs/workbench/api/node/extHostSCM.ts b/src/vs/workbench/api/node/extHostSCM.ts
index 1ed3ad6bba9..81c4a82160f 100644
--- a/src/vs/workbench/api/node/extHostSCM.ts
+++ b/src/vs/workbench/api/node/extHostSCM.ts
@@ -279,7 +279,7 @@ class ExtHostSourceControlResourceGroup implements vscode.SourceControlResourceG
 		return this._resourceStatesMap.get(handle);
 	}
 
-	$executeResourceCommand(handle: number): Thenable<void> {
+	$executeResourceCommand(handle: number): Promise<void> {
 		const command = this._resourceStatesCommandsMap.get(handle);
 
 		if (!command) {
@@ -608,7 +608,7 @@ export class ExtHostSCM implements ExtHostSCMShape {
 		return inputBox;
 	}
 
-	$provideOriginalResource(sourceControlHandle: number, uriComponents: UriComponents, token: CancellationToken): Thenable<UriComponents> {
+	$provideOriginalResource(sourceControlHandle: number, uriComponents: UriComponents, token: CancellationToken): Promise<UriComponents> {
 		const uri = URI.revive(uriComponents);
 		this.logService.trace('ExtHostSCM#$provideOriginalResource', sourceControlHandle, uri.toString());
 
@@ -634,7 +634,7 @@ export class ExtHostSCM implements ExtHostSCMShape {
 		return Promise.resolve(null);
 	}
 
-	$executeResourceCommand(sourceControlHandle: number, groupHandle: number, handle: number): Thenable<void> {
+	$executeResourceCommand(sourceControlHandle: number, groupHandle: number, handle: number): Promise<void> {
 		this.logService.trace('ExtHostSCM#$executeResourceCommand', sourceControlHandle, groupHandle, handle);
 
 		const sourceControl = this._sourceControls.get(sourceControlHandle);
@@ -652,7 +652,7 @@ export class ExtHostSCM implements ExtHostSCMShape {
 		return group.$executeResourceCommand(handle);
 	}
 
-	$validateInput(sourceControlHandle: number, value: string, cursorPosition: number): Thenable<[string, number] | undefined> {
+	$validateInput(sourceControlHandle: number, value: string, cursorPosition: number): Promise<[string, number] | undefined> {
 		this.logService.trace('ExtHostSCM#$validateInput', sourceControlHandle);
 
 		const sourceControl = this._sourceControls.get(sourceControlHandle);
@@ -674,7 +674,7 @@ export class ExtHostSCM implements ExtHostSCMShape {
 		});
 	}
 
-	$setSelectedSourceControls(selectedSourceControlHandles: number[]): Thenable<void> {
+	$setSelectedSourceControls(selectedSourceControlHandles: number[]): Promise<void> {
 		this.logService.trace('ExtHostSCM#$setSelectedSourceControls', selectedSourceControlHandles);
 
 		const set = new Set<number>();
diff --git a/src/vs/workbench/api/node/extHostSearch.ts b/src/vs/workbench/api/node/extHostSearch.ts
index a06729009c6..75436d5aa32 100644
--- a/src/vs/workbench/api/node/extHostSearch.ts
+++ b/src/vs/workbench/api/node/extHostSearch.ts
@@ -115,7 +115,7 @@ export class ExtHostSearch implements ExtHostSearchShape {
 		});
 	}
 
-	$provideFileSearchResults(handle: number, session: number, rawQuery: IRawFileQuery, token: CancellationToken): Thenable<ISearchCompleteStats> {
+	$provideFileSearchResults(handle: number, session: number, rawQuery: IRawFileQuery, token: CancellationToken): Promise<ISearchCompleteStats> {
 		const query = reviveQuery(rawQuery);
 		if (handle === this._internalFileSearchHandle) {
 			return this.doInternalFileSearch(handle, session, query, token);
@@ -134,7 +134,7 @@ export class ExtHostSearch implements ExtHostSearchShape {
 		}
 	}
 
-	private doInternalFileSearch(handle: number, session: number, rawQuery: IFileQuery, token: CancellationToken): Thenable<ISearchCompleteStats> {
+	private doInternalFileSearch(handle: number, session: number, rawQuery: IFileQuery, token: CancellationToken): Promise<ISearchCompleteStats> {
 		const onResult = (ev) => {
 			if (isSerializedFileMatch(ev)) {
 				ev = [ev];
@@ -153,7 +153,7 @@ export class ExtHostSearch implements ExtHostSearchShape {
 		return this._internalFileSearchProvider.doFileSearch(rawQuery, onResult, token);
 	}
 
-	$clearCache(cacheKey: string): Thenable<void> {
+	$clearCache(cacheKey: string): Promise<void> {
 		if (this._internalFileSearchProvider) {
 			this._internalFileSearchProvider.clearCache(cacheKey);
 		}
@@ -164,7 +164,7 @@ export class ExtHostSearch implements ExtHostSearchShape {
 		return Promise.resolve(undefined);
 	}
 
-	$provideTextSearchResults(handle: number, session: number, rawQuery: IRawTextQuery, token: CancellationToken): Thenable<ISearchCompleteStats> {
+	$provideTextSearchResults(handle: number, session: number, rawQuery: IRawTextQuery, token: CancellationToken): Promise<ISearchCompleteStats> {
 		const provider = this._textSearchProvider.get(handle);
 		if (!provider.provideTextSearchResults) {
 			return Promise.resolve(undefined);
diff --git a/src/vs/workbench/api/node/extHostStorage.ts b/src/vs/workbench/api/node/extHostStorage.ts
index 04a8db63782..8925cdbb4d0 100644
--- a/src/vs/workbench/api/node/extHostStorage.ts
+++ b/src/vs/workbench/api/node/extHostStorage.ts
@@ -23,11 +23,11 @@ export class ExtHostStorage implements ExtHostStorageShape {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadStorage);
 	}
 
-	getValue<T>(shared: boolean, key: string, defaultValue?: T): Thenable<T> {
+	getValue<T>(shared: boolean, key: string, defaultValue?: T): Promise<T> {
 		return this._proxy.$getValue<T>(shared, key).then(value => value || defaultValue);
 	}
 
-	setValue(shared: boolean, key: string, value: object): Thenable<void> {
+	setValue(shared: boolean, key: string, value: object): Promise<void> {
 		return this._proxy.$setValue(shared, key, value);
 	}
 
diff --git a/src/vs/workbench/api/node/extHostTask.ts b/src/vs/workbench/api/node/extHostTask.ts
index 92d06dac9d2..d57fdecd022 100644
--- a/src/vs/workbench/api/node/extHostTask.ts
+++ b/src/vs/workbench/api/node/extHostTask.ts
@@ -775,7 +775,7 @@ export class ExtHostTask implements ExtHostTaskShape {
 		this._proxy.$registerTaskSystem(scheme, info);
 	}
 
-	public fetchTasks(filter?: vscode.TaskFilter): Thenable<vscode.Task[]> {
+	public fetchTasks(filter?: vscode.TaskFilter): Promise<vscode.Task[]> {
 		return this._proxy.$fetchTasks(TaskFilterDTO.from(filter)).then((values) => {
 			let result: vscode.Task[] = [];
 			for (let value of values) {
@@ -788,7 +788,7 @@ export class ExtHostTask implements ExtHostTaskShape {
 		});
 	}
 
-	public executeTask(extension: IExtensionDescription, task: vscode.Task): Thenable<vscode.TaskExecution> {
+	public executeTask(extension: IExtensionDescription, task: vscode.Task): Promise<vscode.TaskExecution> {
 		let tTask = (task as types.Task);
 		// We have a preserved ID. So the task didn't change.
 		if (tTask._id !== void 0) {
@@ -808,7 +808,7 @@ export class ExtHostTask implements ExtHostTaskShape {
 		return result;
 	}
 
-	public terminateTask(execution: vscode.TaskExecution): Thenable<void> {
+	public terminateTask(execution: vscode.TaskExecution): Promise<void> {
 		if (!(execution instanceof TaskExecutionImpl)) {
 			throw new Error('No valid task execution provided');
 		}
@@ -865,7 +865,7 @@ export class ExtHostTask implements ExtHostTaskShape {
 		}
 	}
 
-	public $provideTasks(handle: number, validTypes: { [key: string]: boolean; }): Thenable<tasks.TaskSet> {
+	public $provideTasks(handle: number, validTypes: { [key: string]: boolean; }): Promise<tasks.TaskSet> {
 		let handler = this._handlers.get(handle);
 		if (!handler) {
 			return Promise.reject(new Error('no handler found'));
@@ -888,7 +888,7 @@ export class ExtHostTask implements ExtHostTaskShape {
 		});
 	}
 
-	public $resolveVariables(uriComponents: UriComponents, toResolve: { process?: { name: string; cwd?: string; path?: string }, variables: string[] }): Thenable<{ process?: string, variables: { [key: string]: string; } }> {
+	public $resolveVariables(uriComponents: UriComponents, toResolve: { process?: { name: string; cwd?: string; path?: string }, variables: string[] }): Promise<{ process?: string, variables: { [key: string]: string; } }> {
 		let uri: URI = URI.revive(uriComponents);
 		let result = {
 			process: undefined as string,
diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts
index ff374e794f1..ec3a2cc63b1 100644
--- a/src/vs/workbench/api/node/extHostTerminalService.ts
+++ b/src/vs/workbench/api/node/extHostTerminalService.ts
@@ -119,7 +119,7 @@ export class ExtHostTerminal extends BaseExtHostTerminal implements vscode.Termi
 		this._name = name;
 	}
 
-	public get processId(): Thenable<number> {
+	public get processId(): Promise<number> {
 		return this._pidPromise;
 	}
 
diff --git a/src/vs/workbench/api/node/extHostTextEditor.ts b/src/vs/workbench/api/node/extHostTextEditor.ts
index a78c80d9425..61e9417501f 100644
--- a/src/vs/workbench/api/node/extHostTextEditor.ts
+++ b/src/vs/workbench/api/node/extHostTextEditor.ts
@@ -482,7 +482,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
 		);
 	}
 
-	private _trySetSelection(): Thenable<vscode.TextEditor> {
+	private _trySetSelection(): Promise<vscode.TextEditor> {
 		let selection = this._selections.map(TypeConverters.Selection.from);
 		return this._runOnProxy(() => this._proxy.$trySetSelections(this._id, selection));
 	}
@@ -494,7 +494,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
 
 	// ---- editing
 
-	edit(callback: (edit: TextEditorEdit) => void, options: { undoStopBefore: boolean; undoStopAfter: boolean; } = { undoStopBefore: true, undoStopAfter: true }): Thenable<boolean> {
+	edit(callback: (edit: TextEditorEdit) => void, options: { undoStopBefore: boolean; undoStopAfter: boolean; } = { undoStopBefore: true, undoStopAfter: true }): Promise<boolean> {
 		if (this._disposed) {
 			return Promise.reject(new Error('TextEditor#edit not possible on closed editors'));
 		}
@@ -503,7 +503,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
 		return this._applyEdit(edit);
 	}
 
-	private _applyEdit(editBuilder: TextEditorEdit): Thenable<boolean> {
+	private _applyEdit(editBuilder: TextEditorEdit): Promise<boolean> {
 		let editData = editBuilder.finalize();
 
 		// return when there is nothing to do
@@ -557,7 +557,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
 		});
 	}
 
-	insertSnippet(snippet: SnippetString, where?: Position | Position[] | Range | Range[], options: { undoStopBefore: boolean; undoStopAfter: boolean; } = { undoStopBefore: true, undoStopAfter: true }): Thenable<boolean> {
+	insertSnippet(snippet: SnippetString, where?: Position | Position[] | Range | Range[], options: { undoStopBefore: boolean; undoStopAfter: boolean; } = { undoStopBefore: true, undoStopAfter: true }): Promise<boolean> {
 		if (this._disposed) {
 			return Promise.reject(new Error('TextEditor#insertSnippet not possible on closed editors'));
 		}
@@ -589,7 +589,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
 
 	// ---- util
 
-	private _runOnProxy(callback: () => Thenable<any>): Thenable<ExtHostTextEditor> {
+	private _runOnProxy(callback: () => Promise<any>): Promise<ExtHostTextEditor> {
 		if (this._disposed) {
 			console.warn('TextEditor is closed/disposed');
 			return Promise.resolve(undefined);
@@ -603,7 +603,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
 	}
 }
 
-function warnOnError(promise: Thenable<any>): void {
+function warnOnError(promise: Promise<any>): void {
 	promise.then(void 0, (err) => {
 		console.warn(err);
 	});
diff --git a/src/vs/workbench/api/node/extHostTextEditors.ts b/src/vs/workbench/api/node/extHostTextEditors.ts
index def77250f79..7843bd63662 100644
--- a/src/vs/workbench/api/node/extHostTextEditors.ts
+++ b/src/vs/workbench/api/node/extHostTextEditors.ts
@@ -50,10 +50,10 @@ export class ExtHostEditors implements ExtHostEditorsShape {
 		return this._extHostDocumentsAndEditors.allEditors();
 	}
 
-	showTextDocument(document: vscode.TextDocument, column: vscode.ViewColumn, preserveFocus: boolean): Thenable<vscode.TextEditor>;
-	showTextDocument(document: vscode.TextDocument, options: { column: vscode.ViewColumn, preserveFocus: boolean, pinned: boolean }): Thenable<vscode.TextEditor>;
-	showTextDocument(document: vscode.TextDocument, columnOrOptions: vscode.ViewColumn | vscode.TextDocumentShowOptions, preserveFocus?: boolean): Thenable<vscode.TextEditor>;
-	showTextDocument(document: vscode.TextDocument, columnOrOptions: vscode.ViewColumn | vscode.TextDocumentShowOptions, preserveFocus?: boolean): Thenable<vscode.TextEditor> {
+	showTextDocument(document: vscode.TextDocument, column: vscode.ViewColumn, preserveFocus: boolean): Promise<vscode.TextEditor>;
+	showTextDocument(document: vscode.TextDocument, options: { column: vscode.ViewColumn, preserveFocus: boolean, pinned: boolean }): Promise<vscode.TextEditor>;
+	showTextDocument(document: vscode.TextDocument, columnOrOptions: vscode.ViewColumn | vscode.TextDocumentShowOptions, preserveFocus?: boolean): Promise<vscode.TextEditor>;
+	showTextDocument(document: vscode.TextDocument, columnOrOptions: vscode.ViewColumn | vscode.TextDocumentShowOptions, preserveFocus?: boolean): Promise<vscode.TextEditor> {
 		let options: ITextDocumentShowOptions;
 		if (typeof columnOrOptions === 'number') {
 			options = {
@@ -87,7 +87,7 @@ export class ExtHostEditors implements ExtHostEditorsShape {
 		return new TextEditorDecorationType(this._proxy, options);
 	}
 
-	applyWorkspaceEdit(edit: vscode.WorkspaceEdit): Thenable<boolean> {
+	applyWorkspaceEdit(edit: vscode.WorkspaceEdit): Promise<boolean> {
 		const dto = TypeConverters.WorkspaceEdit.from(edit, this._extHostDocumentsAndEditors);
 		return this._proxy.$tryApplyWorkspaceEdit(dto);
 	}
@@ -146,7 +146,7 @@ export class ExtHostEditors implements ExtHostEditorsShape {
 		}
 	}
 
-	getDiffInformation(id: string): Thenable<vscode.LineChange[]> {
+	getDiffInformation(id: string): Promise<vscode.LineChange[]> {
 		return Promise.resolve(this._proxy.$getDiffInformation(id));
 	}
 }
diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts
index 8d71acffbcf..80b280fcef7 100644
--- a/src/vs/workbench/api/node/extHostTreeViews.ts
+++ b/src/vs/workbench/api/node/extHostTreeViews.ts
@@ -82,7 +82,7 @@ export class ExtHostTreeViews implements ExtHostTreeViewsShape {
 			get onDidChangeVisibility() { return treeView.onDidChangeVisibility; },
 			get message() { return treeView.message; },
 			set message(message: string | MarkdownString) { checkProposedApiEnabled(extension); treeView.message = message; },
-			reveal: (element: T, options?: IRevealOptions): Thenable<void> => {
+			reveal: (element: T, options?: IRevealOptions): Promise<void> => {
 				return treeView.reveal(element, options);
 			},
 			dispose: () => {
@@ -92,7 +92,7 @@ export class ExtHostTreeViews implements ExtHostTreeViewsShape {
 		};
 	}
 
-	$getChildren(treeViewId: string, treeItemHandle?: string): Thenable<ITreeItem[]> {
+	$getChildren(treeViewId: string, treeItemHandle?: string): Promise<ITreeItem[]> {
 		const treeView = this.treeViews.get(treeViewId);
 		if (!treeView) {
 			return Promise.reject(new Error(localize('treeView.notRegistered', 'No tree view with id \'{0}\' registered.', treeViewId)));
@@ -194,7 +194,7 @@ class ExtHostTreeView<T> extends Disposable {
 		}
 	}
 
-	getChildren(parentHandle?: TreeItemHandle): Thenable<ITreeItem[]> {
+	getChildren(parentHandle?: TreeItemHandle): Promise<ITreeItem[]> {
 		const parentElement = parentHandle ? this.getExtensionElement(parentHandle) : void 0;
 		if (parentHandle && !parentElement) {
 			console.error(`No tree item with id \'${parentHandle}\' found.`);
@@ -260,7 +260,7 @@ class ExtHostTreeView<T> extends Disposable {
 		}
 	}
 
-	private resolveUnknownParentChain(element: T): Thenable<TreeNode[]> {
+	private resolveUnknownParentChain(element: T): Promise<TreeNode[]> {
 		return this.resolveParent(element)
 			.then((parent) => {
 				if (!parent) {
@@ -275,7 +275,7 @@ class ExtHostTreeView<T> extends Disposable {
 			});
 	}
 
-	private resolveParent(element: T): Thenable<T> {
+	private resolveParent(element: T): Promise<T> {
 		const node = this.nodes.get(element);
 		if (node) {
 			return Promise.resolve(node.parent ? this.elements.get(node.parent.item.handle) : null);
@@ -283,7 +283,7 @@ class ExtHostTreeView<T> extends Disposable {
 		return asThenable(() => this.dataProvider.getParent(element));
 	}
 
-	private resolveTreeNode(element: T, parent?: TreeNode): Thenable<TreeNode> {
+	private resolveTreeNode(element: T, parent?: TreeNode): Promise<TreeNode> {
 		const node = this.nodes.get(element);
 		if (node) {
 			return Promise.resolve(node);
@@ -317,7 +317,7 @@ class ExtHostTreeView<T> extends Disposable {
 		return this.roots;
 	}
 
-	private fetchChildrenNodes(parentElement?: T): Thenable<TreeNode[]> {
+	private fetchChildrenNodes(parentElement?: T): Promise<TreeNode[]> {
 		// clear children cache
 		this.clearChildren(parentElement);
 
@@ -330,7 +330,7 @@ class ExtHostTreeView<T> extends Disposable {
 			.then(coalesce);
 	}
 
-	private refresh(elements: T[]): Thenable<void> {
+	private refresh(elements: T[]): Promise<void> {
 		const hasRoot = elements.some(element => !element);
 		if (hasRoot) {
 			this.clearAll(); // clear cache
@@ -386,7 +386,7 @@ class ExtHostTreeView<T> extends Disposable {
 			.then(() => Object.keys(itemsToRefresh).length ? this.proxy.$refresh(this.viewId, itemsToRefresh) : null);
 	}
 
-	private refreshNode(treeItemHandle: TreeItemHandle): Thenable<TreeNode> {
+	private refreshNode(treeItemHandle: TreeItemHandle): Promise<TreeNode> {
 		const extElement = this.getExtensionElement(treeItemHandle);
 		const existing = this.nodes.get(extElement);
 		this.clearChildren(extElement); // clear children cache
diff --git a/src/vs/workbench/api/node/extHostUrls.ts b/src/vs/workbench/api/node/extHostUrls.ts
index 23bfb2e3d6c..5260672b8d4 100644
--- a/src/vs/workbench/api/node/extHostUrls.ts
+++ b/src/vs/workbench/api/node/extHostUrls.ts
@@ -40,7 +40,7 @@ export class ExtHostUrls implements ExtHostUrlsShape {
 		});
 	}
 
-	$handleExternalUri(handle: number, uri: UriComponents): Thenable<void> {
+	$handleExternalUri(handle: number, uri: UriComponents): Promise<void> {
 		const handler = this.handlers.get(handle);
 
 		if (!handler) {
diff --git a/src/vs/workbench/api/node/extHostWebview.ts b/src/vs/workbench/api/node/extHostWebview.ts
index 93c50645b77..6fa89896fa0 100644
--- a/src/vs/workbench/api/node/extHostWebview.ts
+++ b/src/vs/workbench/api/node/extHostWebview.ts
@@ -62,7 +62,7 @@ export class ExtHostWebview implements vscode.Webview {
 		this._options = newOptions;
 	}
 
-	public postMessage(message: any): Thenable<boolean> {
+	public postMessage(message: any): Promise<boolean> {
 		this.assertNotDisposed();
 		return this._proxy.$postMessage(this._handle, message);
 	}
@@ -201,7 +201,7 @@ export class ExtHostWebviewPanel implements vscode.WebviewPanel {
 		this._visible = value;
 	}
 
-	public postMessage(message: any): Thenable<boolean> {
+	public postMessage(message: any): Promise<boolean> {
 		this.assertNotDisposed();
 		return this._proxy.$postMessage(this._handle, message);
 	}
@@ -305,7 +305,7 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		}
 	}
 
-	$onDidDisposeWebviewPanel(handle: WebviewPanelHandle): Thenable<void> {
+	$onDidDisposeWebviewPanel(handle: WebviewPanelHandle): Promise<void> {
 		const panel = this.getWebviewPanel(handle);
 		if (panel) {
 			panel.dispose();
@@ -321,7 +321,7 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		state: any,
 		position: EditorViewColumn,
 		options: vscode.WebviewOptions & vscode.WebviewPanelOptions
-	): Thenable<void> {
+	): Promise<void> {
 		const serializer = this._serializers.get(viewType);
 		if (!serializer) {
 			return Promise.reject(new Error(`No serializer found for '${viewType}'`));
@@ -330,7 +330,7 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		const webview = new ExtHostWebview(webviewHandle, this._proxy, options);
 		const revivedPanel = new ExtHostWebviewPanel(webviewHandle, this._proxy, viewType, title, typeConverters.ViewColumn.to(position), options, webview);
 		this._webviewPanels.set(webviewHandle, revivedPanel);
-		return serializer.deserializeWebviewPanel(revivedPanel, state);
+		return Promise.resolve(serializer.deserializeWebviewPanel(revivedPanel, state));
 	}
 
 	private getWebviewPanel(handle: WebviewPanelHandle): ExtHostWebviewPanel | undefined {
diff --git a/src/vs/workbench/api/node/extHostWorkspace.ts b/src/vs/workbench/api/node/extHostWorkspace.ts
index b2cd3e82d15..15cb4162e77 100644
--- a/src/vs/workbench/api/node/extHostWorkspace.ts
+++ b/src/vs/workbench/api/node/extHostWorkspace.ts
@@ -345,7 +345,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
 
 	// --- search ---
 
-	findFiles(include: string | RelativePattern, exclude: vscode.GlobPattern, maxResults: number, extensionId: string, token: vscode.CancellationToken = CancellationToken.None): Thenable<vscode.Uri[]> {
+	findFiles(include: string | RelativePattern, exclude: vscode.GlobPattern, maxResults: number, extensionId: string, token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.Uri[]> {
 		this._logService.trace(`extHostWorkspace#findFiles: fileSearch, extension: ${extensionId}, entryPoint: findFiles`);
 
 		let includePattern: string;
@@ -380,7 +380,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
 			.then(data => Array.isArray(data) ? data.map(URI.revive) : []);
 	}
 
-	findTextInFiles(query: vscode.TextSearchQuery, options: vscode.FindTextInFilesOptions, callback: (result: vscode.TextSearchResult) => void, extensionId: string, token: vscode.CancellationToken = CancellationToken.None): Thenable<vscode.TextSearchComplete> {
+	findTextInFiles(query: vscode.TextSearchQuery, options: vscode.FindTextInFilesOptions, callback: (result: vscode.TextSearchResult) => void, extensionId: string, token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.TextSearchComplete> {
 		this._logService.trace(`extHostWorkspace#findTextInFiles: textSearch, extension: ${extensionId}, entryPoint: findTextInFiles`);
 
 		const requestId = this._requestIdProvider.getNext();
@@ -466,11 +466,11 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
 		}
 	}
 
-	saveAll(includeUntitled?: boolean): Thenable<boolean> {
+	saveAll(includeUntitled?: boolean): Promise<boolean> {
 		return this._proxy.$saveAll(includeUntitled);
 	}
 
-	resolveProxy(url: string): Thenable<string> {
+	resolveProxy(url: string): Promise<string> {
 		return this._proxy.$resolveProxy(url);
 	}
 }
diff --git a/src/vs/workbench/browser/actions/toggleSidebarVisibility.ts b/src/vs/workbench/browser/actions/toggleSidebarVisibility.ts
index 921dc26b558..51ef3f93c98 100644
--- a/src/vs/workbench/browser/actions/toggleSidebarVisibility.ts
+++ b/src/vs/workbench/browser/actions/toggleSidebarVisibility.ts
@@ -26,7 +26,7 @@ export class ToggleSidebarVisibilityAction extends Action {
 		this.enabled = !!this.partService;
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		const hideSidebar = this.partService.isVisible(Parts.SIDEBAR_PART);
 		this.partService.setSideBarHidden(hideSidebar);
 
diff --git a/src/vs/workbench/browser/actions/workspaceActions.ts b/src/vs/workbench/browser/actions/workspaceActions.ts
index 79885e6f18b..2ce97f9c32c 100644
--- a/src/vs/workbench/browser/actions/workspaceActions.ts
+++ b/src/vs/workbench/browser/actions/workspaceActions.ts
@@ -31,7 +31,7 @@ export class OpenFileAction extends Action {
 		super(id, label);
 	}
 
-	run(event?: any, data?: ITelemetryData): Thenable<any> {
+	run(event?: any, data?: ITelemetryData): Promise<any> {
 		return this.dialogService.pickFileAndOpen({ forceNewWindow: false, telemetryExtraData: data });
 	}
 }
@@ -49,7 +49,7 @@ export class OpenFolderAction extends Action {
 		super(id, label);
 	}
 
-	run(event?: any, data?: ITelemetryData): Thenable<any> {
+	run(event?: any, data?: ITelemetryData): Promise<any> {
 		return this.dialogService.pickFolderAndOpen({ forceNewWindow: false, telemetryExtraData: data });
 	}
 }
@@ -67,7 +67,7 @@ export class OpenFileFolderAction extends Action {
 		super(id, label);
 	}
 
-	run(event?: any, data?: ITelemetryData): Thenable<any> {
+	run(event?: any, data?: ITelemetryData): Promise<any> {
 		return this.dialogService.pickFileFolderAndOpen({ forceNewWindow: false, telemetryExtraData: data });
 	}
 }
@@ -85,7 +85,7 @@ export class AddRootFolderAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		return this.commandService.executeCommand(ADD_ROOT_FOLDER_COMMAND_ID);
 	}
 }
@@ -105,7 +105,7 @@ export class GlobalRemoveRootFolderAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		const state = this.contextService.getWorkbenchState();
 
 		// Workspace / Folder
@@ -139,7 +139,7 @@ export class SaveWorkspaceAsAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		return this.getNewWorkspaceConfigPath().then(configPathUri => {
 			if (configPathUri) {
 				const configPath = configPathUri.fsPath;
@@ -158,7 +158,7 @@ export class SaveWorkspaceAsAction extends Action {
 		});
 	}
 
-	private getNewWorkspaceConfigPath(): Thenable<URI> {
+	private getNewWorkspaceConfigPath(): Promise<URI> {
 		return this.dialogService.showSaveDialog({
 			saveLabel: mnemonicButtonLabel(nls.localize({ key: 'save', comment: ['&& denotes a mnemonic'] }, "&&Save")),
 			title: nls.localize('saveWorkspace', "Save Workspace"),
@@ -181,7 +181,7 @@ export class OpenWorkspaceAction extends Action {
 		super(id, label);
 	}
 
-	run(event?: any, data?: ITelemetryData): Thenable<any> {
+	run(event?: any, data?: ITelemetryData): Promise<any> {
 		return this.dialogService.pickWorkspaceAndOpen({ telemetryExtraData: data });
 	}
 }
@@ -202,7 +202,7 @@ export class OpenWorkspaceConfigFileAction extends Action {
 		this.enabled = !!this.workspaceContextService.getWorkspace().configuration;
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		return this.editorService.openEditor({ resource: this.workspaceContextService.getWorkspace().configuration });
 	}
 }
@@ -223,7 +223,7 @@ export class DuplicateWorkspaceInNewWindowAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		const folders = this.workspaceContextService.getWorkspace().folders;
 
 		return this.workspacesService.createWorkspace(folders).then(newWorkspace => {
diff --git a/src/vs/workbench/browser/dnd.ts b/src/vs/workbench/browser/dnd.ts
index 38bf337a617..dd1d09e2e28 100644
--- a/src/vs/workbench/browser/dnd.ts
+++ b/src/vs/workbench/browser/dnd.ts
@@ -206,7 +206,7 @@ export class ResourcesDropHandler {
 		});
 	}
 
-	private doHandleDrop(untitledOrFileResources: (IDraggedResource | IDraggedEditor)[]): Thenable<boolean> {
+	private doHandleDrop(untitledOrFileResources: (IDraggedResource | IDraggedEditor)[]): Promise<boolean> {
 
 		// Check for dirty editors being dropped
 		const resourcesWithBackups: IDraggedEditor[] = untitledOrFileResources.filter(resource => !resource.isExternal && !!(resource as IDraggedEditor).backupResource);
@@ -225,7 +225,7 @@ export class ResourcesDropHandler {
 		return Promise.resolve(false);
 	}
 
-	private handleDirtyEditorDrop(droppedDirtyEditor: IDraggedEditor): Thenable<boolean> {
+	private handleDirtyEditorDrop(droppedDirtyEditor: IDraggedEditor): Promise<boolean> {
 
 		// Untitled: always ensure that we open a new untitled for each file we drop
 		if (droppedDirtyEditor.resource.scheme === Schemas.untitled) {
@@ -254,7 +254,7 @@ export class ResourcesDropHandler {
 		return DefaultEndOfLine.LF;
 	}
 
-	private handleWorkspaceFileDrop(fileOnDiskResources: URI[]): Thenable<boolean> {
+	private handleWorkspaceFileDrop(fileOnDiskResources: URI[]): Promise<boolean> {
 		const workspaceResources: { workspaces: URI[], folders: URI[] } = {
 			workspaces: [],
 			folders: []
@@ -286,7 +286,7 @@ export class ResourcesDropHandler {
 			// Pass focus to window
 			this.windowService.focusWindow();
 
-			let workspacesToOpen: Thenable<URI[]>;
+			let workspacesToOpen: Promise<URI[]>;
 
 			// Open in separate windows if we drop workspaces or just one folder
 			if (workspaces.length > 0 || folders.length === 1) {
diff --git a/src/vs/workbench/browser/panel.ts b/src/vs/workbench/browser/panel.ts
index f827e998708..9aa0915c856 100644
--- a/src/vs/workbench/browser/panel.ts
+++ b/src/vs/workbench/browser/panel.ts
@@ -75,7 +75,7 @@ export abstract class TogglePanelAction extends Action {
 		this.panelId = panelId;
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		if (this.isPanelFocused()) {
 			this.partService.setPanelHidden(true);
 		} else {
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
index 627a12e72bd..d045a40e5fc 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
@@ -43,7 +43,7 @@ export class ViewletActivityAction extends ActivityAction {
 		super(activity);
 	}
 
-	run(event: any): Thenable<any> {
+	run(event: any): Promise<any> {
 		if (event instanceof MouseEvent && event.button === 2) {
 			return Promise.resolve(false); // do not run on right click
 		}
@@ -90,7 +90,7 @@ export class ToggleViewletAction extends Action {
 		super(_viewlet.id, _viewlet.name);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		const sideBarVisible = this.partService.isVisible(Parts.SIDEBAR_PART);
 		const activeViewlet = this.viewletService.getActiveViewlet();
 
@@ -206,7 +206,7 @@ class SwitchSideBarViewAction extends Action {
 		super(id, name);
 	}
 
-	run(offset: number): Thenable<any> {
+	run(offset: number): Promise<any> {
 		const pinnedViewletIds = this.activityService.getPinnedViewletIds();
 
 		const activeViewlet = this.viewletService.getActiveViewlet();
@@ -238,7 +238,7 @@ export class PreviousSideBarViewAction extends SwitchSideBarViewAction {
 		super(id, name, viewletService, activityService);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		return super.run(-1);
 	}
 }
@@ -257,7 +257,7 @@ export class NextSideBarViewAction extends SwitchSideBarViewAction {
 		super(id, name, viewletService, activityService);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		return super.run(1);
 	}
 }
diff --git a/src/vs/workbench/browser/parts/compositeBar.ts b/src/vs/workbench/browser/parts/compositeBar.ts
index d5881e26d65..b235c20b06a 100644
--- a/src/vs/workbench/browser/parts/compositeBar.ts
+++ b/src/vs/workbench/browser/parts/compositeBar.ts
@@ -39,7 +39,7 @@ export interface ICompositeBarOptions {
 	getCompositePinnedAction: (compositeId: string) => Action;
 	getOnCompositeClickAction: (compositeId: string) => Action;
 	getContextMenuActions: () => Action[];
-	openComposite: (compositeId: string) => Thenable<any>;
+	openComposite: (compositeId: string) => Promise<any>;
 	getDefaultCompositeId: () => string;
 	hidePart: () => void;
 }
diff --git a/src/vs/workbench/browser/parts/editor/baseEditor.ts b/src/vs/workbench/browser/parts/editor/baseEditor.ts
index 2bd03e27045..f8e3014ad63 100644
--- a/src/vs/workbench/browser/parts/editor/baseEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/baseEditor.ts
@@ -77,7 +77,7 @@ export abstract class BaseEditor extends Panel implements IEditor {
 	 * The provided cancellation token should be used to test if the operation
 	 * was cancelled.
 	 */
-	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Promise<void> {
 		this._input = input;
 		this._options = options;
 
diff --git a/src/vs/workbench/browser/parts/editor/binaryEditor.ts b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
index 79d53b8b8b4..733a359cb22 100644
--- a/src/vs/workbench/browser/parts/editor/binaryEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
@@ -21,7 +21,7 @@ import { dispose } from 'vs/base/common/lifecycle';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 
 export interface IOpenCallbacks {
-	openInternal: (input: EditorInput, options: EditorOptions) => Thenable<void>;
+	openInternal: (input: EditorInput, options: EditorOptions) => Promise<void>;
 	openExternal: (uri: URI) => void;
 }
 
@@ -72,7 +72,7 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 		parent.appendChild(this.scrollbar.getDomNode());
 	}
 
-	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Promise<void> {
 		return super.setInput(input, options, token).then(() => {
 			return input.resolve().then(model => {
 
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbs.ts b/src/vs/workbench/browser/parts/editor/breadcrumbs.ts
index d9db7b89d1f..841ae7146fd 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbs.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbs.ts
@@ -59,7 +59,7 @@ export abstract class BreadcrumbsConfig<T> {
 	onDidChange: Event<void>;
 
 	abstract getValue(overrides?: IConfigurationOverrides): T;
-	abstract updateValue(value: T, overrides?: IConfigurationOverrides): Thenable<void>;
+	abstract updateValue(value: T, overrides?: IConfigurationOverrides): Promise<void>;
 	abstract dispose(): void;
 
 	private constructor() {
@@ -92,7 +92,7 @@ export abstract class BreadcrumbsConfig<T> {
 					getValue(overrides?: IConfigurationOverrides): T {
 						return service.getValue(name, overrides);
 					}
-					updateValue(newValue: T, overrides?: IConfigurationOverrides): Thenable<void> {
+					updateValue(newValue: T, overrides?: IConfigurationOverrides): Promise<void> {
 						return service.updateValue(name, newValue, overrides);
 					}
 					dispose(): void {
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
index 9c844bfb451..88055da1e0e 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
@@ -227,7 +227,7 @@ export class FileDataSource implements IDataSource {
 		return URI.isUri(element) || IWorkspace.isIWorkspace(element) || IWorkspaceFolder.isIWorkspaceFolder(element) || element.isDirectory;
 	}
 
-	getChildren(tree: ITree, element: IWorkspace | IWorkspaceFolder | IFileStat | URI): Thenable<IWorkspaceFolder[] | IFileStat[]> {
+	getChildren(tree: ITree, element: IWorkspace | IWorkspaceFolder | IFileStat | URI): Promise<IWorkspaceFolder[] | IFileStat[]> {
 		if (IWorkspace.isIWorkspace(element)) {
 			return Promise.resolve(element.folders).then(folders => {
 				for (let child of folders) {
@@ -252,7 +252,7 @@ export class FileDataSource implements IDataSource {
 		});
 	}
 
-	getParent(tree: ITree, element: IWorkspace | URI | IWorkspaceFolder | IFileStat): Thenable<IWorkspaceFolder | IFileStat> {
+	getParent(tree: ITree, element: IWorkspace | URI | IWorkspaceFolder | IFileStat): Promise<IWorkspaceFolder | IFileStat> {
 		return Promise.resolve(this._parents.get(element));
 	}
 }
diff --git a/src/vs/workbench/browser/parts/editor/editor.ts b/src/vs/workbench/browser/parts/editor/editor.ts
index 4d91fd06327..7fb2b96ca90 100644
--- a/src/vs/workbench/browser/parts/editor/editor.ts
+++ b/src/vs/workbench/browser/parts/editor/editor.ts
@@ -76,7 +76,7 @@ export interface IEditorOpeningEvent extends IEditorIdentifier {
 	 * to return a promise that resolves to NULL to prevent the opening
 	 * alltogether.
 	 */
-	prevent(callback: () => Thenable<IEditor>): void;
+	prevent(callback: () => Promise<IEditor>): void;
 }
 
 export interface IEditorGroupsAccessor {
@@ -102,7 +102,7 @@ export interface IEditorGroupsAccessor {
 
 export interface IEditorGroupView extends IDisposable, ISerializableView, IEditorGroup {
 	readonly group: EditorGroup;
-	readonly whenRestored: Thenable<void>;
+	readonly whenRestored: Promise<void>;
 	readonly disposed: boolean;
 
 	readonly onDidFocus: Event<void>;
@@ -155,5 +155,5 @@ export interface EditorGroupsServiceImpl extends IEditorGroupsService {
 	/**
 	 * A promise that resolves when groups have been restored.
 	 */
-	readonly whenRestored: Thenable<void>;
+	readonly whenRestored: Promise<void>;
 }
diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts
index bcf9cf0dcdf..5a7979e0df7 100644
--- a/src/vs/workbench/browser/parts/editor/editorActions.ts
+++ b/src/vs/workbench/browser/parts/editor/editorActions.ts
@@ -35,7 +35,7 @@ export class ExecuteCommandAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		return this.commandService.executeCommand(this.commandId, this.commandArgs);
 	}
 }
@@ -242,7 +242,7 @@ export class NavigateBetweenGroupsAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		const nextGroup = this.editorGroupService.findGroup({ location: GroupLocation.NEXT }, this.editorGroupService.activeGroup, true);
 		nextGroup.focus();
 
@@ -263,7 +263,7 @@ export class FocusActiveGroupAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		this.editorGroupService.activeGroup.focus();
 
 		return Promise.resolve(true);
@@ -281,7 +281,7 @@ export abstract class BaseFocusGroupAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		const group = this.editorGroupService.findGroup(this.scope, this.editorGroupService.activeGroup, true);
 		if (group) {
 			group.focus();
@@ -423,7 +423,7 @@ export class OpenToSideFromQuickOpenAction extends Action {
 		this.class = (preferredDirection === GroupDirection.RIGHT) ? 'quick-open-sidebyside-vertical' : 'quick-open-sidebyside-horizontal';
 	}
 
-	run(context: any): Thenable<any> {
+	run(context: any): Promise<any> {
 		const entry = toEditorQuickOpenEntry(context);
 		if (entry) {
 			const input = entry.getInput();
@@ -490,7 +490,7 @@ export class CloseOneEditorAction extends Action {
 		super(id, label, 'close-editor-action');
 	}
 
-	run(context?: IEditorCommandsContext): Thenable<any> {
+	run(context?: IEditorCommandsContext): Promise<any> {
 		let group: IEditorGroup;
 		let editorIndex: number;
 		if (context) {
@@ -535,7 +535,7 @@ export class RevertAndCloseEditorAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		const activeControl = this.editorService.activeControl;
 		if (activeControl) {
 			const editor = activeControl.input;
@@ -569,7 +569,7 @@ export class CloseLeftEditorsInGroupAction extends Action {
 		super(id, label);
 	}
 
-	run(context?: IEditorIdentifier): Thenable<any> {
+	run(context?: IEditorIdentifier): Promise<any> {
 		const { group, editor } = getTarget(this.editorService, this.editorGroupService, context);
 		if (group && editor) {
 			return group.closeEditors({ direction: CloseDirection.LEFT, except: editor });
@@ -614,7 +614,7 @@ export abstract class BaseCloseAllAction extends Action {
 		return groupsToClose;
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 
 		// Just close all if there are no or one dirty editor
 		if (this.textFileService.getDirty().length < 2) {
@@ -627,7 +627,7 @@ export abstract class BaseCloseAllAction extends Action {
 				return void 0;
 			}
 
-			let saveOrRevertPromise: Thenable<boolean>;
+			let saveOrRevertPromise: Promise<boolean>;
 			if (confirm === ConfirmResult.DONT_SAVE) {
 				saveOrRevertPromise = this.textFileService.revertAll(null, { soft: true }).then(() => true);
 			} else {
@@ -644,7 +644,7 @@ export abstract class BaseCloseAllAction extends Action {
 		});
 	}
 
-	protected abstract doCloseAll(): Thenable<any>;
+	protected abstract doCloseAll(): Promise<any>;
 }
 
 export class CloseAllEditorsAction extends BaseCloseAllAction {
@@ -700,7 +700,7 @@ export class CloseEditorsInOtherGroupsAction extends Action {
 		super(id, label);
 	}
 
-	run(context?: IEditorIdentifier): Thenable<any> {
+	run(context?: IEditorIdentifier): Promise<any> {
 		const groupToSkip = context ? this.editorGroupService.getGroup(context.groupId) : this.editorGroupService.activeGroup;
 		return Promise.all(this.editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE).map(g => {
 			if (g.id === groupToSkip.id) {
@@ -726,7 +726,7 @@ export class CloseEditorInAllGroupsAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		const activeEditor = this.editorService.activeEditor;
 		if (activeEditor) {
 			return Promise.all(this.editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE).map(g => g.closeEditor(activeEditor)));
@@ -856,7 +856,7 @@ export class MinimizeOtherGroupsAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		this.editorGroupService.arrangeGroups(GroupsArrangement.MINIMIZE_OTHERS);
 
 		return Promise.resolve(false);
@@ -872,7 +872,7 @@ export class ResetGroupSizesAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		this.editorGroupService.arrangeGroups(GroupsArrangement.EVEN);
 
 		return Promise.resolve(false);
@@ -894,7 +894,7 @@ export class MaximizeGroupAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		if (this.editorService.activeEditor) {
 			this.editorGroupService.arrangeGroups(GroupsArrangement.MINIMIZE_OTHERS);
 			this.partService.setSideBarHidden(true);
@@ -915,7 +915,7 @@ export abstract class BaseNavigateEditorAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		const result = this.navigate();
 		if (!result) {
 			return Promise.resolve(false);
@@ -1102,7 +1102,7 @@ export class NavigateForwardAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		this.historyService.forward();
 
 		return Promise.resolve(null);
@@ -1118,7 +1118,7 @@ export class NavigateBackwardsAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		this.historyService.back();
 
 		return Promise.resolve(null);
@@ -1134,7 +1134,7 @@ export class NavigateToLastEditLocationAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		this.historyService.openLastEditLocation();
 
 		return Promise.resolve(null);
@@ -1150,7 +1150,7 @@ export class NavigateLastAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		this.historyService.last();
 
 		return Promise.resolve(null);
@@ -1170,7 +1170,7 @@ export class ReopenClosedEditorAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		this.historyService.reopenLastClosedEditor();
 
 		return Promise.resolve(false);
@@ -1191,7 +1191,7 @@ export class ClearRecentFilesAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 
 		// Clear global recently opened
 		this.windowsService.clearRecentlyOpened();
@@ -1238,7 +1238,7 @@ export class BaseQuickOpenEditorInGroupAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		const keys = this.keybindingService.lookupKeybindings(this.id);
 
 
@@ -1293,7 +1293,7 @@ export class OpenPreviousEditorFromHistoryAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		const keys = this.keybindingService.lookupKeybindings(this.id);
 
 		this.quickOpenService.show(null, { quickNavigateConfiguration: { keybindings: keys } });
@@ -1311,7 +1311,7 @@ export class OpenNextRecentlyUsedEditorAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		this.historyService.forward(true);
 
 		return Promise.resolve(null);
@@ -1327,7 +1327,7 @@ export class OpenPreviousRecentlyUsedEditorAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		this.historyService.back(true);
 
 		return Promise.resolve(null);
@@ -1347,7 +1347,7 @@ export class ClearEditorHistoryAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 
 		// Editor history
 		this.historyService.clear();
@@ -1619,7 +1619,7 @@ export class BaseCreateEditorGroupAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		this.editorGroupService.addGroup(this.editorGroupService.activeGroup, this.direction, { activate: true });
 
 		return Promise.resolve(true);
diff --git a/src/vs/workbench/browser/parts/editor/editorControl.ts b/src/vs/workbench/browser/parts/editor/editorControl.ts
index 397a1b12c2c..c2545617136 100644
--- a/src/vs/workbench/browser/parts/editor/editorControl.ts
+++ b/src/vs/workbench/browser/parts/editor/editorControl.ts
@@ -56,7 +56,7 @@ export class EditorControl extends Disposable {
 		return this._activeControl;
 	}
 
-	openEditor(editor: EditorInput, options?: EditorOptions): Thenable<IOpenEditorResult> {
+	openEditor(editor: EditorInput, options?: EditorOptions): Promise<IOpenEditorResult> {
 
 		// Editor control
 		const descriptor = Registry.as<IEditorRegistry>(EditorExtensions.Editors).getEditor(editor);
@@ -145,7 +145,7 @@ export class EditorControl extends Disposable {
 		this._onDidSizeConstraintsChange.fire();
 	}
 
-	private doSetInput(control: BaseEditor, editor: EditorInput, options: EditorOptions): Thenable<boolean> {
+	private doSetInput(control: BaseEditor, editor: EditorInput, options: EditorOptions): Promise<boolean> {
 
 		// If the input did not change, return early and only apply the options
 		// unless the options instruct us to force open it even if it is the same
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
index 6d1863f93f2..a7acb4b8513 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
@@ -95,7 +95,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 	private active: boolean;
 	private dimension: Dimension;
 
-	private _whenRestored: Thenable<void>;
+	private _whenRestored: Promise<void>;
 	private isRestored: boolean;
 
 	private scopedInstantiationService: IInstantiationService;
@@ -111,7 +111,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 	private ignoreOpenEditorErrors: boolean;
 	private disposedEditorsWorker: RunOnceWorker<EditorInput>;
 
-	private mapEditorToPendingConfirmation: Map<EditorInput, Thenable<boolean>> = new Map<EditorInput, Thenable<boolean>>();
+	private mapEditorToPendingConfirmation: Map<EditorInput, Promise<boolean>> = new Map<EditorInput, Promise<boolean>>();
 
 	constructor(
 		private accessor: IEditorGroupsAccessor,
@@ -397,7 +397,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 		}
 	}
 
-	private restoreEditors(from: IEditorGroupView | ISerializedEditorGroup): Thenable<void> {
+	private restoreEditors(from: IEditorGroupView | ISerializedEditorGroup): Promise<void> {
 		if (this._group.count === 0) {
 			return Promise.resolve(); // nothing to show
 		}
@@ -602,7 +602,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 		return this._disposed;
 	}
 
-	get whenRestored(): Thenable<void> {
+	get whenRestored(): Promise<void> {
 		return this._whenRestored;
 	}
 
@@ -724,7 +724,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 
 	//#region openEditor()
 
-	openEditor(editor: EditorInput, options?: EditorOptions): Thenable<IEditor> {
+	openEditor(editor: EditorInput, options?: EditorOptions): Promise<IEditor> {
 
 		// Guard against invalid inputs
 		if (!editor) {
@@ -743,7 +743,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 		return this.doOpenEditor(editor, options);
 	}
 
-	private doOpenEditor(editor: EditorInput, options?: EditorOptions): Thenable<IEditor> {
+	private doOpenEditor(editor: EditorInput, options?: EditorOptions): Promise<IEditor> {
 
 		// Determine options
 		const openEditorOptions: IEditorOpenOptions = {
@@ -784,10 +784,10 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 		return this.doShowEditor(editor, openEditorOptions.active, options);
 	}
 
-	private doShowEditor(editor: EditorInput, active: boolean, options?: EditorOptions): Thenable<IEditor> {
+	private doShowEditor(editor: EditorInput, active: boolean, options?: EditorOptions): Promise<IEditor> {
 
 		// Show in editor control if the active editor changed
-		let openEditorPromise: Thenable<IEditor>;
+		let openEditorPromise: Promise<IEditor>;
 		if (active) {
 			openEditorPromise = this.editorControl.openEditor(editor, options).then(result => {
 
@@ -847,7 +847,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 
 	//#region openEditors()
 
-	openEditors(editors: { editor: EditorInput, options?: EditorOptions }[]): Thenable<IEditor> {
+	openEditors(editors: { editor: EditorInput, options?: EditorOptions }[]): Promise<IEditor> {
 		if (!editors.length) {
 			return Promise.resolve(null);
 		}
@@ -958,7 +958,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 
 	//#region closeEditor()
 
-	closeEditor(editor: EditorInput = this.activeEditor): Thenable<void> {
+	closeEditor(editor: EditorInput = this.activeEditor): Promise<void> {
 		if (!editor) {
 			return Promise.resolve();
 		}
@@ -1074,7 +1074,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 		this._group.closeEditor(editor);
 	}
 
-	private handleDirty(editors: EditorInput[]): Thenable<boolean /* veto */> {
+	private handleDirty(editors: EditorInput[]): Promise<boolean /* veto */> {
 		if (!editors.length) {
 			return Promise.resolve(false); // no veto
 		}
@@ -1104,7 +1104,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 		});
 	}
 
-	private doHandleDirty(editor: EditorInput): Thenable<boolean /* veto */> {
+	private doHandleDirty(editor: EditorInput): Promise<boolean /* veto */> {
 		if (
 			!editor.isDirty() || // editor must be dirty
 			this.accessor.groups.some(groupView => groupView !== this && groupView.group.contains(editor, true /* support side by side */)) ||  // editor is opened in other group
@@ -1151,7 +1151,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 
 	//#region closeEditors()
 
-	closeEditors(args: EditorInput[] | ICloseEditorsFilter): Thenable<void> {
+	closeEditors(args: EditorInput[] | ICloseEditorsFilter): Promise<void> {
 		if (this.isEmpty()) {
 			return Promise.resolve();
 		}
@@ -1224,7 +1224,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 
 	//#region closeAllEditors()
 
-	closeAllEditors(): Thenable<void> {
+	closeAllEditors(): Promise<void> {
 		if (this.isEmpty()) {
 
 			// If the group is empty and the request is to close all editors, we still close
@@ -1269,7 +1269,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 
 	//#region replaceEditors()
 
-	replaceEditors(editors: EditorReplacement[]): Thenable<void> {
+	replaceEditors(editors: EditorReplacement[]): Promise<void> {
 
 		// Extract active vs. inactive replacements
 		let activeReplacement: EditorReplacement;
@@ -1419,7 +1419,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 }
 
 class EditorOpeningEvent implements IEditorOpeningEvent {
-	private override: () => Thenable<IEditor>;
+	private override: () => Promise<IEditor>;
 
 	constructor(
 		private _group: GroupIdentifier,
@@ -1440,11 +1440,11 @@ class EditorOpeningEvent implements IEditorOpeningEvent {
 		return this._options;
 	}
 
-	prevent(callback: () => Thenable<IEditor>): void {
+	prevent(callback: () => Promise<IEditor>): void {
 		this.override = callback;
 	}
 
-	isPrevented(): () => Thenable<IEditor> {
+	isPrevented(): () => Promise<IEditor> {
 		return this.override;
 	}
 }
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index 051a40d3b8f..fb78ef17cc7 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -129,7 +129,7 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 	private gridWidget: SerializableGrid<IEditorGroupView>;
 	private gridWidgetView: GridWidgetView<IEditorGroupView>;
 
-	private _whenRestored: Thenable<void>;
+	private _whenRestored: Promise<void>;
 	private whenRestoredResolve: () => void;
 
 	constructor(
@@ -222,7 +222,7 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 		return this.gridWidget.orientation === Orientation.VERTICAL ? GroupOrientation.VERTICAL : GroupOrientation.HORIZONTAL;
 	}
 
-	get whenRestored(): Thenable<void> {
+	get whenRestored(): Promise<void> {
 		return this._whenRestored;
 	}
 
diff --git a/src/vs/workbench/browser/parts/editor/editorPicker.ts b/src/vs/workbench/browser/parts/editor/editorPicker.ts
index b3ec71db9cf..b27ed329dfd 100644
--- a/src/vs/workbench/browser/parts/editor/editorPicker.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPicker.ts
@@ -90,7 +90,7 @@ export abstract class BaseEditorPicker extends QuickOpenHandler {
 		this.scorerCache = Object.create(null);
 	}
 
-	getResults(searchValue: string, token: CancellationToken): Thenable<QuickOpenModel> {
+	getResults(searchValue: string, token: CancellationToken): Promise<QuickOpenModel> {
 		const editorEntries = this.getEditorEntries();
 		if (!editorEntries.length) {
 			return Promise.resolve(null);
diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index b6bb0cffc16..213e1c8dc85 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -824,7 +824,7 @@ export class ShowLanguageExtensionsAction extends Action {
 		this.enabled = galleryService.isEnabled();
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.commandService.executeCommand('workbench.extensions.action.showExtensionsForLanguage', this.fileExtension).then(() => void 0);
 	}
 }
@@ -849,7 +849,7 @@ export class ChangeModeAction extends Action {
 		super(actionId, actionLabel);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		const activeTextEditorWidget = getCodeEditor(this.editorService.activeTextEditorWidget);
 		if (!activeTextEditorWidget) {
 			return this.quickInputService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
@@ -1056,7 +1056,7 @@ class ChangeIndentationAction extends Action {
 		super(actionId, actionLabel);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		const activeTextEditorWidget = getCodeEditor(this.editorService.activeTextEditorWidget);
 		if (!activeTextEditorWidget) {
 			return this.quickInputService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
@@ -1106,7 +1106,7 @@ export class ChangeEOLAction extends Action {
 		super(actionId, actionLabel);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		const activeTextEditorWidget = getCodeEditor(this.editorService.activeTextEditorWidget);
 		if (!activeTextEditorWidget) {
 			return this.quickInputService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
@@ -1153,7 +1153,7 @@ export class ChangeEncodingAction extends Action {
 		super(actionId, actionLabel);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		if (!getCodeEditor(this.editorService.activeTextEditorWidget)) {
 			return this.quickInputService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
 		}
diff --git a/src/vs/workbench/browser/parts/editor/resourceViewer.ts b/src/vs/workbench/browser/parts/editor/resourceViewer.ts
index 0af468160c1..c16192107a8 100644
--- a/src/vs/workbench/browser/parts/editor/resourceViewer.ts
+++ b/src/vs/workbench/browser/parts/editor/resourceViewer.ts
@@ -568,7 +568,7 @@ class InlineImageView {
 		return context;
 	}
 
-	private static imageSrc(descriptor: IResourceDescriptor, fileService: IFileService): Thenable<string> {
+	private static imageSrc(descriptor: IResourceDescriptor, fileService: IFileService): Promise<string> {
 		if (descriptor.resource.scheme === Schemas.data) {
 			return Promise.resolve(descriptor.resource.toString(true /* skip encoding */));
 		}
diff --git a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
index ffe94a1943f..b94b5eb95a7 100644
--- a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
@@ -92,7 +92,7 @@ export class SideBySideEditor extends BaseEditor {
 		this.updateStyles();
 	}
 
-	setInput(newInput: SideBySideEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(newInput: SideBySideEditorInput, options: EditorOptions, token: CancellationToken): Promise<void> {
 		const oldInput = <SideBySideEditorInput>this.input;
 		return super.setInput(newInput, options, token)
 			.then(() => this.updateInput(oldInput, newInput, options, token));
@@ -157,7 +157,7 @@ export class SideBySideEditor extends BaseEditor {
 		return this.detailsEditor;
 	}
 
-	private updateInput(oldInput: SideBySideEditorInput, newInput: SideBySideEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	private updateInput(oldInput: SideBySideEditorInput, newInput: SideBySideEditorInput, options: EditorOptions, token: CancellationToken): Promise<void> {
 		if (!newInput.matches(oldInput)) {
 			if (oldInput) {
 				this.disposeEditors();
@@ -172,7 +172,7 @@ export class SideBySideEditor extends BaseEditor {
 		).then(() => void 0);
 	}
 
-	private setNewInput(newInput: SideBySideEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	private setNewInput(newInput: SideBySideEditorInput, options: EditorOptions, token: CancellationToken): Promise<void> {
 		const detailsEditor = this._createEditor(<EditorInput>newInput.details, this.detailsEditorContainer);
 		const masterEditor = this._createEditor(<EditorInput>newInput.master, this.masterEditorContainer);
 
diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
index 44cfef0bb1e..07acd4f01a9 100644
--- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
@@ -73,7 +73,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		return this.instantiationService.createInstance(DiffEditorWidget, parent, configuration);
 	}
 
-	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Promise<void> {
 
 		// Dispose previous diff navigator
 		this.diffNavigatorDisposables = dispose(this.diffNavigatorDisposables);
diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts
index 9fce9723cd9..4dd0e46cb82 100644
--- a/src/vs/workbench/browser/parts/editor/textEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textEditor.ts
@@ -187,7 +187,7 @@ export abstract class BaseTextEditor extends BaseEditor implements ITextEditor {
 		return this.instantiationService.createInstance(CodeEditorWidget, parent, configuration, {});
 	}
 
-	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Promise<void> {
 		return super.setInput(input, options, token).then(() => {
 
 			// Update editor options after having set the input. We do this because there can be
diff --git a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
index a90138fb843..33403726926 100644
--- a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
@@ -54,7 +54,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 		return nls.localize('textEditor', "Text Editor");
 	}
 
-	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Promise<void> {
 
 		// Remember view settings if input changes
 		this.saveTextResourceEditorViewState(this.input);
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
index 7cab630f56b..fd17e4c738c 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
@@ -90,7 +90,7 @@ export class NotificationsToasts extends Themable {
 		});
 	}
 
-	private onCanShowNotifications(): Thenable<void> {
+	private onCanShowNotifications(): Promise<void> {
 
 		// Wait for the running phase to ensure we can draw notifications properly
 		return this.lifecycleService.when(LifecyclePhase.Ready).then(() => {
diff --git a/src/vs/workbench/browser/parts/panel/panelActions.ts b/src/vs/workbench/browser/parts/panel/panelActions.ts
index f9fa7fd846b..4ceaa84ec59 100644
--- a/src/vs/workbench/browser/parts/panel/panelActions.ts
+++ b/src/vs/workbench/browser/parts/panel/panelActions.ts
@@ -29,7 +29,7 @@ export class ClosePanelAction extends Action {
 		super(id, name, 'hide-panel-action');
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		this.partService.setPanelHidden(true);
 		return Promise.resolve(null);
 	}
@@ -48,7 +48,7 @@ export class TogglePanelAction extends Action {
 		super(id, name, partService.isVisible(Parts.PANEL_PART) ? 'panel expanded' : 'panel');
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		this.partService.setPanelHidden(this.partService.isVisible(Parts.PANEL_PART));
 		return Promise.resolve(null);
 	}
@@ -68,7 +68,7 @@ class FocusPanelAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 
 		// Show panel
 		if (!this.partService.isVisible(Parts.PANEL_PART)) {
@@ -116,7 +116,7 @@ export class TogglePanelPositionAction extends Action {
 		setClassAndLabel();
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		const position = this.partService.getPanelPosition();
 
 		this.partService.setPanelPosition(position === Position.BOTTOM ? Position.RIGHT : Position.BOTTOM);
@@ -156,7 +156,7 @@ export class ToggleMaximizedPanelAction extends Action {
 		}));
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		if (!this.partService.isVisible(Parts.PANEL_PART)) {
 			this.partService.setPanelHidden(false);
 		}
@@ -181,7 +181,7 @@ export class PanelActivityAction extends ActivityAction {
 		super(activity);
 	}
 
-	run(event: any): Thenable<any> {
+	run(event: any): Promise<any> {
 		this.panelService.openPanel(this.activity.id, true);
 		this.activate();
 		return Promise.resolve(null);
@@ -198,7 +198,7 @@ export class SwitchPanelViewAction extends Action {
 		super(id, name);
 	}
 
-	run(offset: number): Thenable<any> {
+	run(offset: number): Promise<any> {
 		const pinnedPanels = this.panelService.getPinnedPanels();
 		const activePanel = this.panelService.getActivePanel();
 		if (!activePanel) {
@@ -229,7 +229,7 @@ export class PreviousPanelViewAction extends SwitchPanelViewAction {
 		super(id, name, panelService);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		return super.run(-1);
 	}
 }
@@ -247,7 +247,7 @@ export class NextPanelViewAction extends SwitchPanelViewAction {
 		super(id, name, panelService);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		return super.run(1);
 	}
 }
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index c74cafd63a9..8d35a6dc458 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -1143,7 +1143,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 				return;
 			}
 			const input = this.createInputBox();
-			const validateInput = options.validateInput || (() => <Thenable<undefined>>Promise.resolve(undefined));
+			const validateInput = options.validateInput || (() => <Promise<undefined>>Promise.resolve(undefined));
 			const onDidValueChange = Event.debounce(input.onDidChangeValue, (last, cur) => cur, 100);
 			let validationValue = options.value || '';
 			let validation = Promise.resolve(validateInput(validationValue));
diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
index 5847a140f15..afe34275bb4 100644
--- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
+++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
@@ -53,7 +53,7 @@ import { IStorageService } from 'vs/platform/storage/common/storage';
 
 const HELP_PREFIX = '?';
 
-type ValueCallback<T = any> = (value: T | Thenable<T>) => void;
+type ValueCallback<T = any> = (value: T | Promise<T>) => void;
 
 export class QuickOpenController extends Component implements IQuickOpenService {
 
@@ -452,7 +452,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 			const previousInput = this.quickOpenWidget.getInput();
 			const wasShowingHistory = previousInput && previousInput.entries && previousInput.entries.some(e => e instanceof EditorHistoryEntry || e instanceof EditorHistoryEntryGroup);
 			if (wasShowingHistory || matchingHistoryEntries.length > 0) {
-				let responseDelay: Thenable<void>;
+				let responseDelay: Promise<void>;
 				if (resolvedHandler.hasShortResponseTime()) {
 					responseDelay = timeout(QuickOpenController.MAX_SHORT_RESPONSE_TIME);
 				} else {
@@ -836,7 +836,7 @@ export class RemoveFromEditorHistoryAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		interface IHistoryPickEntry extends IQuickPickItem {
 			input: IEditorInput | IResourceInput;
 		}
diff --git a/src/vs/workbench/browser/parts/quickopen/quickopen.ts b/src/vs/workbench/browser/parts/quickopen/quickopen.ts
index 3c749da10dd..2f4d95a864c 100644
--- a/src/vs/workbench/browser/parts/quickopen/quickopen.ts
+++ b/src/vs/workbench/browser/parts/quickopen/quickopen.ts
@@ -50,7 +50,7 @@ export class BaseQuickOpenNavigateAction extends Action {
 		super(id, label);
 	}
 
-	run(event?: any): Thenable<any> {
+	run(event?: any): Promise<any> {
 		const keys = this.keybindingService.lookupKeybindings(this.id);
 		const quickNavigate = this.quickNavigate ? { keybindings: keys } : void 0;
 
diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
index 7485f78800e..e9be92173e0 100644
--- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
+++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
@@ -175,7 +175,7 @@ export class SidebarPart extends CompositePart<Viewlet> implements IViewletServi
 		}
 	}
 
-	openViewlet(id: string, focus?: boolean): Thenable<IViewlet> {
+	openViewlet(id: string, focus?: boolean): Promise<IViewlet> {
 		if (this.getViewlet(id)) {
 			return Promise.resolve(this.doOpenViewlet(id, focus));
 		}
@@ -259,7 +259,7 @@ class FocusSideBarAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 
 		// Show side bar
 		if (!this.partService.isVisible(Parts.SIDEBAR_PART)) {
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index cc601c33b01..bc312086ebb 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -329,7 +329,7 @@ class ManageExtensionAction extends Action {
 		super('statusbar.manage.extension', nls.localize('manageExtension', "Manage Extension"));
 	}
 
-	run(extensionId: string): Thenable<any> {
+	run(extensionId: string): Promise<any> {
 		return this.commandService.executeCommand('_extensions.manage', extensionId);
 	}
 }
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index d47b03e8845..b16c2f2f60c 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -542,7 +542,7 @@ class ShowItemInFolderAction extends Action {
 		super('showItemInFolder.action.id', label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.windowsService.showItemInFolder(this.path);
 	}
 }
diff --git a/src/vs/workbench/browser/parts/views/customView.ts b/src/vs/workbench/browser/parts/views/customView.ts
index 649836e5be7..62ba18371ce 100644
--- a/src/vs/workbench/browser/parts/views/customView.ts
+++ b/src/vs/workbench/browser/parts/views/customView.ts
@@ -472,7 +472,7 @@ export class CustomTreeView extends Disposable implements ITreeView {
 		return Promise.resolve(null);
 	}
 
-	expand(itemOrItems: ITreeItem | ITreeItem[]): Thenable<void> {
+	expand(itemOrItems: ITreeItem | ITreeItem[]): Promise<void> {
 		if (this.tree) {
 			itemOrItems = Array.isArray(itemOrItems) ? itemOrItems : [itemOrItems];
 			return this.tree.expandAll(itemOrItems);
@@ -493,7 +493,7 @@ export class CustomTreeView extends Disposable implements ITreeView {
 		}
 	}
 
-	reveal(item: ITreeItem): Thenable<void> {
+	reveal(item: ITreeItem): Promise<void> {
 		if (this.tree) {
 			return this.tree.reveal(item);
 		}
@@ -827,7 +827,7 @@ class MultipleSelectionActionRunner extends ActionRunner {
 		super();
 	}
 
-	runAction(action: IAction, context: any): Thenable<any> {
+	runAction(action: IAction, context: any): Promise<any> {
 		if (action instanceof MenuItemAction) {
 			const selection = this.getSelectedResources();
 			const filteredSelection = selection.filter(s => s !== context);
diff --git a/src/vs/workbench/browser/parts/views/views.ts b/src/vs/workbench/browser/parts/views/views.ts
index acadcbb0185..f618b70cb0a 100644
--- a/src/vs/workbench/browser/parts/views/views.ts
+++ b/src/vs/workbench/browser/parts/views/views.ts
@@ -537,7 +537,7 @@ export class ViewsService extends Disposable implements IViewsService {
 		return this.viewDescriptorCollections.get(container);
 	}
 
-	openView(id: string, focus: boolean): Thenable<IView> {
+	openView(id: string, focus: boolean): Promise<IView> {
 		const viewDescriptor = ViewsRegistry.getView(id);
 		if (viewDescriptor) {
 			const viewletDescriptor = this.viewletService.getViewlet(viewDescriptor.container.id);
diff --git a/src/vs/workbench/browser/quickopen.ts b/src/vs/workbench/browser/quickopen.ts
index cbaeea3da1d..c4a6346e546 100644
--- a/src/vs/workbench/browser/quickopen.ts
+++ b/src/vs/workbench/browser/quickopen.ts
@@ -43,7 +43,7 @@ export class QuickOpenHandler {
 	 * As such, returning the same model instance across multiple searches will yield best
 	 * results in terms of performance when many items are shown.
 	 */
-	getResults(searchValue: string, token: CancellationToken): Thenable<IModel<any>> {
+	getResults(searchValue: string, token: CancellationToken): Promise<IModel<any>> {
 		return Promise.resolve(null);
 	}
 
diff --git a/src/vs/workbench/browser/viewlet.ts b/src/vs/workbench/browser/viewlet.ts
index f0763f64709..e61e215069d 100644
--- a/src/vs/workbench/browser/viewlet.ts
+++ b/src/vs/workbench/browser/viewlet.ts
@@ -137,7 +137,7 @@ export class ShowViewletAction extends Action {
 		this.enabled = !!this.viewletService && !!this.editorGroupService;
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 
 		// Pass focus to viewlet if not open or focused
 		if (this.otherViewletShowing() || !this.sidebarHasFocus()) {
diff --git a/src/vs/workbench/common/actions.ts b/src/vs/workbench/common/actions.ts
index 27618b146dc..13ecdbceba2 100644
--- a/src/vs/workbench/common/actions.ts
+++ b/src/vs/workbench/common/actions.ts
@@ -93,7 +93,7 @@ Registry.add(Extensions.WorkbenchActions, new class implements IWorkbenchActionR
 		};
 	}
 
-	private triggerAndDisposeAction(instantiationService: IInstantiationService, lifecycleService: ILifecycleService, descriptor: SyncActionDescriptor, args: any): Thenable<void> {
+	private triggerAndDisposeAction(instantiationService: IInstantiationService, lifecycleService: ILifecycleService, descriptor: SyncActionDescriptor, args: any): Promise<void> {
 
 		// run action when workbench is created
 		return lifecycleService.when(LifecyclePhase.Ready).then(() => {
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
index 523b7150d54..4559882e6d7 100644
--- a/src/vs/workbench/common/editor.ts
+++ b/src/vs/workbench/common/editor.ts
@@ -301,7 +301,7 @@ export interface IEditorInput extends IDisposable {
 	/**
 	 * Resolves the input.
 	 */
-	resolve(): Thenable<IEditorModel | null>;
+	resolve(): Promise<IEditorModel | null>;
 
 	/**
 	 * Returns if this input is dirty or not.
@@ -311,7 +311,7 @@ export interface IEditorInput extends IDisposable {
 	/**
 	 * Reverts this input.
 	 */
-	revert(options?: IRevertOptions): Thenable<boolean>;
+	revert(options?: IRevertOptions): Promise<boolean>;
 
 	/**
 	 * Returns if the other object matches this input.
@@ -402,7 +402,7 @@ export abstract class EditorInput extends Disposable implements IEditorInput {
 	 * Returns a type of EditorModel that represents the resolved input. Subclasses should
 	 * override to provide a meaningful model.
 	 */
-	abstract resolve(): Thenable<IEditorModel | null>;
+	abstract resolve(): Promise<IEditorModel | null>;
 
 	/**
 	 * An editor that is dirty will be asked to be saved once it closes.
@@ -414,21 +414,21 @@ export abstract class EditorInput extends Disposable implements IEditorInput {
 	/**
 	 * Subclasses should bring up a proper dialog for the user if the editor is dirty and return the result.
 	 */
-	confirmSave(): Thenable<ConfirmResult> {
+	confirmSave(): Promise<ConfirmResult> {
 		return Promise.resolve(ConfirmResult.DONT_SAVE);
 	}
 
 	/**
 	 * Saves the editor if it is dirty. Subclasses return a promise with a boolean indicating the success of the operation.
 	 */
-	save(): Thenable<boolean> {
+	save(): Promise<boolean> {
 		return Promise.resolve(true);
 	}
 
 	/**
 	 * Reverts the editor if it is dirty. Subclasses return a promise with a boolean indicating the success of the operation.
 	 */
-	revert(options?: IRevertOptions): Thenable<boolean> {
+	revert(options?: IRevertOptions): Promise<boolean> {
 		return Promise.resolve(true);
 	}
 
@@ -546,15 +546,15 @@ export class SideBySideEditorInput extends EditorInput {
 		return this.master.isDirty();
 	}
 
-	confirmSave(): Thenable<ConfirmResult> {
+	confirmSave(): Promise<ConfirmResult> {
 		return this.master.confirmSave();
 	}
 
-	save(): Thenable<boolean> {
+	save(): Promise<boolean> {
 		return this.master.save();
 	}
 
-	revert(): Thenable<boolean> {
+	revert(): Promise<boolean> {
 		return this.master.revert();
 	}
 
@@ -585,7 +585,7 @@ export class SideBySideEditorInput extends EditorInput {
 		this._register(this.master.onDidChangeLabel(() => this._onDidChangeLabel.fire()));
 	}
 
-	resolve(): Thenable<EditorModel | null> {
+	resolve(): Promise<EditorModel | null> {
 		return Promise.resolve(null);
 	}
 
@@ -636,7 +636,7 @@ export class EditorModel extends Disposable implements IEditorModel {
 	/**
 	 * Causes this model to load returning a promise when loading is completed.
 	 */
-	load(): Thenable<EditorModel> {
+	load(): Promise<EditorModel> {
 		return Promise.resolve(this);
 	}
 
@@ -915,7 +915,7 @@ export class EditorCommandsContextActionRunner extends ActionRunner {
 		super();
 	}
 
-	run(action: IAction, context?: any): Thenable<void> {
+	run(action: IAction, context?: any): Promise<void> {
 		return super.run(action, this.context);
 	}
 }
diff --git a/src/vs/workbench/common/editor/binaryEditorModel.ts b/src/vs/workbench/common/editor/binaryEditorModel.ts
index d124fa599d4..183f5163765 100644
--- a/src/vs/workbench/common/editor/binaryEditorModel.ts
+++ b/src/vs/workbench/common/editor/binaryEditorModel.ts
@@ -74,7 +74,7 @@ export class BinaryEditorModel extends EditorModel {
 		return this.etag;
 	}
 
-	load(): Thenable<EditorModel> {
+	load(): Promise<EditorModel> {
 
 		// Make sure to resolve up to date stat for file resources
 		if (this.fileService.canHandleResource(this.resource)) {
diff --git a/src/vs/workbench/common/editor/dataUriEditorInput.ts b/src/vs/workbench/common/editor/dataUriEditorInput.ts
index 1e025627d95..5eaa261c2a3 100644
--- a/src/vs/workbench/common/editor/dataUriEditorInput.ts
+++ b/src/vs/workbench/common/editor/dataUriEditorInput.ts
@@ -62,7 +62,7 @@ export class DataUriEditorInput extends EditorInput {
 		return this.description;
 	}
 
-	resolve(): Thenable<BinaryEditorModel> {
+	resolve(): Promise<BinaryEditorModel> {
 		return this.instantiationService.createInstance(BinaryEditorModel, this.resource, this.getName()).load().then(m => m as BinaryEditorModel);
 	}
 
diff --git a/src/vs/workbench/common/editor/diffEditorInput.ts b/src/vs/workbench/common/editor/diffEditorInput.ts
index 4fa0b509ae1..3d534f3f87f 100644
--- a/src/vs/workbench/common/editor/diffEditorInput.ts
+++ b/src/vs/workbench/common/editor/diffEditorInput.ts
@@ -34,7 +34,7 @@ export class DiffEditorInput extends SideBySideEditorInput {
 		return this.master;
 	}
 
-	resolve(): Thenable<EditorModel> {
+	resolve(): Promise<EditorModel> {
 
 		// Create Model - we never reuse our cached model if refresh is true because we cannot
 		// decide for the inputs within if the cached model can be reused or not. There may be
@@ -55,7 +55,7 @@ export class DiffEditorInput extends SideBySideEditorInput {
 		return this.forceOpenAsBinary ? BINARY_DIFF_EDITOR_ID : TEXT_DIFF_EDITOR_ID;
 	}
 
-	private createModel(): Thenable<DiffEditorModel> {
+	private createModel(): Promise<DiffEditorModel> {
 
 		// Join resolve call over two inputs and build diff editor model
 		return Promise.all([
diff --git a/src/vs/workbench/common/editor/diffEditorModel.ts b/src/vs/workbench/common/editor/diffEditorModel.ts
index 099481b910e..794afd369d5 100644
--- a/src/vs/workbench/common/editor/diffEditorModel.ts
+++ b/src/vs/workbench/common/editor/diffEditorModel.ts
@@ -29,7 +29,7 @@ export class DiffEditorModel extends EditorModel {
 		return this._modifiedModel as EditorModel;
 	}
 
-	load(): Thenable<EditorModel> {
+	load(): Promise<EditorModel> {
 		return Promise.all([
 			this._originalModel.load(),
 			this._modifiedModel.load()
diff --git a/src/vs/workbench/common/editor/resourceEditorInput.ts b/src/vs/workbench/common/editor/resourceEditorInput.ts
index aa6410fbc83..c0f7d4ff143 100644
--- a/src/vs/workbench/common/editor/resourceEditorInput.ts
+++ b/src/vs/workbench/common/editor/resourceEditorInput.ts
@@ -19,7 +19,7 @@ export class ResourceEditorInput extends EditorInput {
 
 	static readonly ID: string = 'workbench.editors.resourceEditorInput';
 
-	private modelReference: Thenable<IReference<ITextEditorModel>>;
+	private modelReference: Promise<IReference<ITextEditorModel>>;
 	private resource: URI;
 	private name: string;
 	private description: string;
@@ -80,7 +80,7 @@ export class ResourceEditorInput extends EditorInput {
 		return descriptor;
 	}
 
-	resolve(): Thenable<ITextEditorModel> {
+	resolve(): Promise<ITextEditorModel> {
 		if (!this.modelReference) {
 			this.modelReference = this.textModelResolverService.createModelReference(this.resource);
 		}
diff --git a/src/vs/workbench/common/editor/textDiffEditorModel.ts b/src/vs/workbench/common/editor/textDiffEditorModel.ts
index 76e2fd18a1f..fda5a788dd6 100644
--- a/src/vs/workbench/common/editor/textDiffEditorModel.ts
+++ b/src/vs/workbench/common/editor/textDiffEditorModel.ts
@@ -29,7 +29,7 @@ export class TextDiffEditorModel extends DiffEditorModel {
 		return this._modifiedModel as BaseTextEditorModel;
 	}
 
-	load(): Thenable<EditorModel> {
+	load(): Promise<EditorModel> {
 		return super.load().then(() => {
 			this.updateTextDiffEditorModel();
 
diff --git a/src/vs/workbench/common/editor/untitledEditorInput.ts b/src/vs/workbench/common/editor/untitledEditorInput.ts
index 94392e03a4f..769a39be553 100644
--- a/src/vs/workbench/common/editor/untitledEditorInput.ts
+++ b/src/vs/workbench/common/editor/untitledEditorInput.ts
@@ -27,7 +27,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 
 	private _hasAssociatedFilePath: boolean;
 	private cachedModel: UntitledEditorModel;
-	private modelResolve: Thenable<UntitledEditorModel>;
+	private modelResolve: Promise<UntitledEditorModel>;
 
 	private readonly _onDidModelChangeContent: Emitter<void> = this._register(new Emitter<void>());
 	get onDidModelChangeContent(): Event<void> { return this._onDidModelChangeContent.event; }
@@ -162,15 +162,15 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return this.hasAssociatedFilePath;
 	}
 
-	confirmSave(): Thenable<ConfirmResult> {
+	confirmSave(): Promise<ConfirmResult> {
 		return this.textFileService.confirmSave([this.resource]);
 	}
 
-	save(): Thenable<boolean> {
+	save(): Promise<boolean> {
 		return this.textFileService.save(this.resource);
 	}
 
-	revert(): Thenable<boolean> {
+	revert(): Promise<boolean> {
 		if (this.cachedModel) {
 			this.cachedModel.revert();
 		}
@@ -209,7 +209,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		}
 	}
 
-	resolve(): Thenable<UntitledEditorModel> {
+	resolve(): Promise<UntitledEditorModel> {
 
 		// Join a model resolve if we have had one before
 		if (this.modelResolve) {
diff --git a/src/vs/workbench/common/editor/untitledEditorModel.ts b/src/vs/workbench/common/editor/untitledEditorModel.ts
index f05982c3d81..371f2c57cfe 100644
--- a/src/vs/workbench/common/editor/untitledEditorModel.ts
+++ b/src/vs/workbench/common/editor/untitledEditorModel.ts
@@ -132,7 +132,7 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
 		this.contentChangeEventScheduler.schedule();
 	}
 
-	load(): Thenable<UntitledEditorModel> {
+	load(): Promise<UntitledEditorModel> {
 
 		// Check for backups first
 		return this.backupFileService.loadBackupResource(this.resource).then(backupResource => {
diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts
index fd08fbce997..d6756663f48 100644
--- a/src/vs/workbench/common/views.ts
+++ b/src/vs/workbench/common/views.ts
@@ -229,7 +229,7 @@ export const IViewsService = createDecorator<IViewsService>('viewsService');
 export interface IViewsService {
 	_serviceBrand: any;
 
-	openView(id: string, focus?: boolean): Thenable<IView>;
+	openView(id: string, focus?: boolean): Promise<IView>;
 
 	getViewDescriptors(container: ViewContainer): IViewDescriptorCollection;
 }
@@ -268,9 +268,9 @@ export interface ITreeView extends IDisposable {
 
 	getOptimalWidth(): number;
 
-	reveal(item: ITreeItem): Thenable<void>;
+	reveal(item: ITreeItem): Promise<void>;
 
-	expand(itemOrItems: ITreeItem | ITreeItem[]): Thenable<void>;
+	expand(itemOrItems: ITreeItem | ITreeItem[]): Promise<void>;
 
 	setSelection(items: ITreeItem[]): void;
 
diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts
index 922aaab8f4e..b963a748071 100644
--- a/src/vs/workbench/electron-browser/actions.ts
+++ b/src/vs/workbench/electron-browser/actions.ts
@@ -53,7 +53,7 @@ export class CloseCurrentWindowAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		this.windowService.closeWindow();
 
 		return Promise.resolve(true);
@@ -75,7 +75,7 @@ export class CloseWorkspaceAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
 			this.notificationService.info(nls.localize('noWorkspaceOpened', "There is currently no workspace opened in this instance to close."));
 
@@ -99,7 +99,7 @@ export class NewWindowAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.windowsService.openNewWindow();
 	}
 }
@@ -113,7 +113,7 @@ export class ToggleFullScreenAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.windowService.toggleFullScreen();
 	}
 }
@@ -133,7 +133,7 @@ export class ToggleMenuBarAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		let currentVisibilityValue = this.configurationService.getValue<MenuBarVisibility>(ToggleMenuBarAction.menuBarVisibilityKey);
 		if (typeof currentVisibilityValue !== 'string') {
 			currentVisibilityValue = 'default';
@@ -161,7 +161,7 @@ export class ToggleDevToolsAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.windowsService.toggleDevTools();
 	}
 }
@@ -206,7 +206,7 @@ export class ZoomInAction extends BaseZoomAction {
 		super(id, label, configurationService);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		this.setConfiguredZoomLevel(webFrame.getZoomLevel() + 1);
 
 		return Promise.resolve(true);
@@ -226,7 +226,7 @@ export class ZoomOutAction extends BaseZoomAction {
 		super(id, label, configurationService);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		this.setConfiguredZoomLevel(webFrame.getZoomLevel() - 1);
 
 		return Promise.resolve(true);
@@ -246,7 +246,7 @@ export class ZoomResetAction extends BaseZoomAction {
 		super(id, label, configurationService);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		this.setConfiguredZoomLevel(0);
 
 		return Promise.resolve(true);
@@ -266,7 +266,7 @@ export class ReloadWindowAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		return this.windowService.reloadWindow().then(() => true);
 	}
 }
@@ -284,7 +284,7 @@ export class ReloadWindowWithExtensionsDisabledAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		return this.windowService.reloadWindow({ _: [], 'disable-extensions': true }).then(() => true);
 	}
 }
@@ -312,7 +312,7 @@ export abstract class BaseSwitchWindow extends Action {
 
 	protected abstract isQuickNavigate(): boolean;
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		const currentWindowId = this.windowService.getCurrentWindowId();
 
 		return this.windowsService.getWindows().then(windows => {
@@ -422,7 +422,7 @@ export abstract class BaseOpenRecentAction extends Action {
 
 	protected abstract isQuickNavigate(): boolean;
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.windowService.getRecentlyOpened()
 			.then(({ workspaces, files }) => this.openRecent(workspaces, files));
 	}
@@ -555,7 +555,7 @@ export class OpenIssueReporterAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		return this.issueService.openReporter()
 			.then(() => true);
 	}
@@ -573,7 +573,7 @@ export class OpenProcessExplorer extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		return this.issueService.openProcessExplorer()
 			.then(() => true);
 	}
@@ -591,7 +591,7 @@ export class ReportPerformanceIssueUsingReporterAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		// TODO: Reporter should send timings table as well
 		return this.issueService.openReporter({ issueType: IssueType.PerformanceIssue })
 			.then(() => true);
@@ -614,7 +614,7 @@ export class KeybindingsReferenceAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		window.open(KeybindingsReferenceAction.URL);
 		return null;
 	}
@@ -635,7 +635,7 @@ export class OpenDocumentationUrlAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		window.open(OpenDocumentationUrlAction.URL);
 		return null;
 	}
@@ -656,7 +656,7 @@ export class OpenIntroductoryVideosUrlAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		window.open(OpenIntroductoryVideosUrlAction.URL);
 		return null;
 	}
@@ -677,7 +677,7 @@ export class OpenTipsAndTricksUrlAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		window.open(OpenTipsAndTricksUrlAction.URL);
 		return null;
 	}
@@ -692,7 +692,7 @@ export class ToggleSharedProcessAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.windowsService.toggleSharedProcess();
 	}
 }
@@ -715,7 +715,7 @@ export abstract class BaseNavigationAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		const isEditorFocus = this.partService.hasFocus(Parts.EDITOR_PART);
 		const isPanelFocus = this.partService.hasFocus(Parts.PANEL_PART);
 		const isSidebarFocus = this.partService.hasFocus(Parts.SIDEBAR_PART);
@@ -738,11 +738,11 @@ export abstract class BaseNavigationAction extends Action {
 		return Promise.resolve(false);
 	}
 
-	protected navigateOnEditorFocus(_isSidebarPositionLeft: boolean, _isPanelPositionDown: boolean): Thenable<boolean | IViewlet | IPanel> {
+	protected navigateOnEditorFocus(_isSidebarPositionLeft: boolean, _isPanelPositionDown: boolean): Promise<boolean | IViewlet | IPanel> {
 		return Promise.resolve(true);
 	}
 
-	protected navigateOnPanelFocus(_isSidebarPositionLeft: boolean, _isPanelPositionDown: boolean): Thenable<boolean | IPanel> {
+	protected navigateOnPanelFocus(_isSidebarPositionLeft: boolean, _isPanelPositionDown: boolean): Promise<boolean | IPanel> {
 		return Promise.resolve(true);
 	}
 
@@ -760,7 +760,7 @@ export abstract class BaseNavigationAction extends Action {
 		return this.panelService.openPanel(activePanelId, true);
 	}
 
-	protected navigateToSidebar(): Thenable<IViewlet | boolean> {
+	protected navigateToSidebar(): Promise<IViewlet | boolean> {
 		if (!this.partService.isVisible(Parts.SIDEBAR_PART)) {
 			return Promise.resolve(false);
 		}
@@ -806,7 +806,7 @@ export class NavigateLeftAction extends BaseNavigationAction {
 		super(id, label, editorGroupService, panelService, partService, viewletService);
 	}
 
-	protected navigateOnEditorFocus(isSidebarPositionLeft: boolean, _isPanelPositionDown: boolean): Thenable<boolean | IViewlet> {
+	protected navigateOnEditorFocus(isSidebarPositionLeft: boolean, _isPanelPositionDown: boolean): Promise<boolean | IViewlet> {
 		const didNavigate = this.navigateAcrossEditorGroup(GroupDirection.LEFT);
 		if (didNavigate) {
 			return Promise.resolve(true);
@@ -819,7 +819,7 @@ export class NavigateLeftAction extends BaseNavigationAction {
 		return Promise.resolve(false);
 	}
 
-	protected navigateOnPanelFocus(isSidebarPositionLeft: boolean, isPanelPositionDown: boolean): Thenable<boolean | IViewlet> {
+	protected navigateOnPanelFocus(isSidebarPositionLeft: boolean, isPanelPositionDown: boolean): Promise<boolean | IViewlet> {
 		if (isPanelPositionDown && isSidebarPositionLeft) {
 			return this.navigateToSidebar();
 		}
@@ -856,7 +856,7 @@ export class NavigateRightAction extends BaseNavigationAction {
 		super(id, label, editorGroupService, panelService, partService, viewletService);
 	}
 
-	protected navigateOnEditorFocus(isSidebarPositionLeft: boolean, isPanelPositionDown: boolean): Thenable<boolean | IViewlet | IPanel> {
+	protected navigateOnEditorFocus(isSidebarPositionLeft: boolean, isPanelPositionDown: boolean): Promise<boolean | IViewlet | IPanel> {
 		const didNavigate = this.navigateAcrossEditorGroup(GroupDirection.RIGHT);
 		if (didNavigate) {
 			return Promise.resolve(true);
@@ -873,7 +873,7 @@ export class NavigateRightAction extends BaseNavigationAction {
 		return Promise.resolve(false);
 	}
 
-	protected navigateOnPanelFocus(isSidebarPositionLeft: boolean, _isPanelPositionDown: boolean): Thenable<boolean | IViewlet> {
+	protected navigateOnPanelFocus(isSidebarPositionLeft: boolean, _isPanelPositionDown: boolean): Promise<boolean | IViewlet> {
 		if (!isSidebarPositionLeft) {
 			return this.navigateToSidebar();
 		}
@@ -996,7 +996,7 @@ export class IncreaseViewSizeAction extends BaseResizeViewAction {
 		super(id, label, partService);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		this.resizePart(BaseResizeViewAction.RESIZE_INCREMENT);
 		return Promise.resolve(true);
 	}
@@ -1016,7 +1016,7 @@ export class DecreaseViewSizeAction extends BaseResizeViewAction {
 		super(id, label, partService);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		this.resizePart(-BaseResizeViewAction.RESIZE_INCREMENT);
 		return Promise.resolve(true);
 	}
@@ -1035,7 +1035,7 @@ export class NewWindowTab extends Action {
 		super(NewWindowTab.ID, NewWindowTab.LABEL);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		return this.windowsService.newWindowTab().then(() => true);
 	}
 }
@@ -1053,7 +1053,7 @@ export class ShowPreviousWindowTab extends Action {
 		super(ShowPreviousWindowTab.ID, ShowPreviousWindowTab.LABEL);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		return this.windowsService.showPreviousWindowTab().then(() => true);
 	}
 }
@@ -1071,7 +1071,7 @@ export class ShowNextWindowTab extends Action {
 		super(ShowNextWindowTab.ID, ShowNextWindowTab.LABEL);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		return this.windowsService.showNextWindowTab().then(() => true);
 	}
 }
@@ -1089,7 +1089,7 @@ export class MoveWindowTabToNewWindow extends Action {
 		super(MoveWindowTabToNewWindow.ID, MoveWindowTabToNewWindow.LABEL);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		return this.windowsService.moveWindowTabToNewWindow().then(() => true);
 	}
 }
@@ -1107,7 +1107,7 @@ export class MergeAllWindowTabs extends Action {
 		super(MergeAllWindowTabs.ID, MergeAllWindowTabs.LABEL);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		return this.windowsService.mergeAllWindowTabs().then(() => true);
 	}
 }
@@ -1125,7 +1125,7 @@ export class ToggleWindowTabsBar extends Action {
 		super(ToggleWindowTabsBar.ID, ToggleWindowTabsBar.LABEL);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		return this.windowsService.toggleWindowTabsBar().then(() => true);
 	}
 }
@@ -1142,7 +1142,7 @@ export class OpenTwitterUrlAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		if (product.twitterUrl) {
 			return Promise.resolve(shell.openExternal(product.twitterUrl));
 		}
@@ -1163,7 +1163,7 @@ export class OpenRequestFeatureUrlAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		if (product.requestFeatureUrl) {
 			return Promise.resolve(shell.openExternal(product.requestFeatureUrl));
 		}
@@ -1184,7 +1184,7 @@ export class OpenLicenseUrlAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		if (product.licenseUrl) {
 			if (language) {
 				const queryArgChar = product.licenseUrl.indexOf('?') > 0 ? '&' : '?';
@@ -1211,7 +1211,7 @@ export class OpenPrivacyStatementUrlAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		if (product.privacyStatementUrl) {
 			if (language) {
 				const queryArgChar = product.privacyStatementUrl.indexOf('?') > 0 ? '&' : '?';
@@ -1239,7 +1239,7 @@ export class ShowAboutDialogAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.windowsService.openAboutDialog();
 	}
 }
@@ -1258,7 +1258,7 @@ export class InspectContextKeysAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		const disposables: IDisposable[] = [];
 
 		const stylesheet = createStyleSheet();
diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts
index 59418a29373..f5c44d48e7f 100644
--- a/src/vs/workbench/electron-browser/main.ts
+++ b/src/vs/workbench/electron-browser/main.ts
@@ -238,7 +238,7 @@ function createWorkspaceService(payload: IWorkspaceInitializationPayload, enviro
 	});
 }
 
-function createStorageService(payload: IWorkspaceInitializationPayload, environmentService: IEnvironmentService, logService: ILogService, mainProcessClient: ElectronIPCClient): Thenable<StorageService> {
+function createStorageService(payload: IWorkspaceInitializationPayload, environmentService: IEnvironmentService, logService: ILogService, mainProcessClient: ElectronIPCClient): Promise<StorageService> {
 	const globalStorageDatabase = new GlobalStorageDatabaseChannelClient(mainProcessClient.getChannel('storage'));
 	const storageService = new StorageService(globalStorageDatabase, logService, environmentService);
 
diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts
index 7466b83fde2..80bd4782837 100644
--- a/src/vs/workbench/electron-browser/window.ts
+++ b/src/vs/workbench/electron-browser/window.ts
@@ -411,7 +411,7 @@ export class ElectronWindow extends Themable {
 	}
 
 	private openResources(resources: (IResourceInput | IUntitledResourceInput)[], diffMode: boolean): void {
-		this.lifecycleService.when(LifecyclePhase.Ready).then((): Thenable<any> => {
+		this.lifecycleService.when(LifecyclePhase.Ready).then((): Promise<any> => {
 
 			// In diffMode we open 2 resources as diff
 			if (diffMode && resources.length === 2) {
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
index 3a3829df446..795153f51e7 100644
--- a/src/vs/workbench/electron-browser/workbench.ts
+++ b/src/vs/workbench/electron-browser/workbench.ts
@@ -253,7 +253,7 @@ export class Workbench extends Disposable implements IPartService {
 			(configuration.filesToDiff && configuration.filesToDiff.length > 0);
 	}
 
-	startup(): Thenable<IWorkbenchStartedInfo> {
+	startup(): Promise<IWorkbenchStartedInfo> {
 		this.workbenchStarted = true;
 
 		// Create Workbench Container
@@ -700,8 +700,8 @@ export class Workbench extends Disposable implements IPartService {
 		updateSplitEditorsVerticallyContext();
 	}
 
-	private restoreParts(): Thenable<IWorkbenchStartedInfo> {
-		const restorePromises: Thenable<any>[] = [];
+	private restoreParts(): Promise<IWorkbenchStartedInfo> {
+		const restorePromises: Promise<any>[] = [];
 
 		// Restore Editorpart
 		perf.mark('willRestoreEditors');
@@ -804,7 +804,7 @@ export class Workbench extends Disposable implements IPartService {
 		return this.lifecycleService.startupKind === StartupKind.ReloadedWindow;
 	}
 
-	private resolveEditorsToOpen(): Thenable<IResourceEditor[]> | IResourceEditor[] {
+	private resolveEditorsToOpen(): Promise<IResourceEditor[]> | IResourceEditor[] {
 		const config = this.workbenchParams.configuration;
 
 		// Files to open, diff or create
diff --git a/src/vs/workbench/parts/backup/common/backupRestorer.ts b/src/vs/workbench/parts/backup/common/backupRestorer.ts
index 3aa54ae8fdb..ec5a953331a 100644
--- a/src/vs/workbench/parts/backup/common/backupRestorer.ts
+++ b/src/vs/workbench/parts/backup/common/backupRestorer.ts
@@ -28,13 +28,13 @@ export class BackupRestorer implements IWorkbenchContribution {
 		this.lifecycleService.when(LifecyclePhase.Restored).then(() => this.doRestoreBackups());
 	}
 
-	private doRestoreBackups(): Thenable<URI[] | undefined> {
+	private doRestoreBackups(): Promise<URI[] | undefined> {
 
 		// Find all files and untitled with backups
 		return this.backupFileService.getWorkspaceFileBackups().then(backups => {
 
 			// Resolve backups that are opened
-			return this.doResolveOpenedBackups(backups).then((unresolved): Thenable<URI[] | undefined> | undefined => {
+			return this.doResolveOpenedBackups(backups).then((unresolved): Promise<URI[] | undefined> | undefined => {
 
 				// Some failed to restore or were not opened at all so we open and resolve them manually
 				if (unresolved.length > 0) {
@@ -46,8 +46,8 @@ export class BackupRestorer implements IWorkbenchContribution {
 		});
 	}
 
-	private doResolveOpenedBackups(backups: URI[]): Thenable<URI[]> {
-		const restorePromises: Thenable<any>[] = [];
+	private doResolveOpenedBackups(backups: URI[]): Promise<URI[]> {
+		const restorePromises: Promise<any>[] = [];
 		const unresolved: URI[] = [];
 
 		backups.forEach(backup => {
@@ -62,7 +62,7 @@ export class BackupRestorer implements IWorkbenchContribution {
 		return Promise.all(restorePromises).then(() => unresolved, () => unresolved);
 	}
 
-	private doOpenEditors(resources: URI[]): Thenable<void> {
+	private doOpenEditors(resources: URI[]): Promise<void> {
 		const hasOpenedEditors = this.editorService.visibleEditors.length > 0;
 		const inputs = resources.map((resource, index) => this.resolveInput(resource, index, hasOpenedEditors));
 
diff --git a/src/vs/workbench/parts/debug/browser/breakpointsView.ts b/src/vs/workbench/parts/debug/browser/breakpointsView.ts
index 4e567790181..eb0b589dde0 100644
--- a/src/vs/workbench/parts/debug/browser/breakpointsView.ts
+++ b/src/vs/workbench/parts/debug/browser/breakpointsView.ts
@@ -543,7 +543,7 @@ class FunctionBreakpointInputRenderer implements IListRenderer<IFunctionBreakpoi
 	}
 }
 
-export function openBreakpointSource(breakpoint: IBreakpoint, sideBySide: boolean, preserveFocus: boolean, debugService: IDebugService, editorService: IEditorService): Thenable<IEditor> {
+export function openBreakpointSource(breakpoint: IBreakpoint, sideBySide: boolean, preserveFocus: boolean, debugService: IDebugService, editorService: IEditorService): Promise<IEditor> {
 	if (breakpoint.uri.scheme === DEBUG_SCHEME && debugService.state === State.Inactive) {
 		return Promise.resolve(null);
 	}
diff --git a/src/vs/workbench/parts/debug/browser/debugActions.ts b/src/vs/workbench/parts/debug/browser/debugActions.ts
index 6b2def5a35d..cf5a6fb1cf9 100644
--- a/src/vs/workbench/parts/debug/browser/debugActions.ts
+++ b/src/vs/workbench/parts/debug/browser/debugActions.ts
@@ -43,7 +43,7 @@ export abstract class AbstractDebugAction extends Action {
 		this.updateEnablement();
 	}
 
-	public run(e?: any): Thenable<any> {
+	public run(e?: any): Promise<any> {
 		throw new Error('implement me');
 	}
 
@@ -99,7 +99,7 @@ export class ConfigureAction extends AbstractDebugAction {
 		this.class = this.debugService.getConfigurationManager().selectedConfiguration.name ? 'debug-action configure' : 'debug-action configure notification';
 	}
 
-	public run(event?: any): Thenable<any> {
+	public run(event?: any): Promise<any> {
 		if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
 			this.notificationService.info(nls.localize('noFolderDebugConfig', "Please first open a folder in order to do advanced debug configuration."));
 			return Promise.resolve(null);
@@ -135,7 +135,7 @@ export class StartAction extends AbstractDebugAction {
 
 	// Note: When this action is executed from the process explorer, a config is passed. For all
 	// other cases it is run with no arguments.
-	public run(config?: IConfig): Thenable<any> {
+	public run(config?: IConfig): Promise<any> {
 		if (config && 'type' in config && 'request' in config) {
 			return this.debugService.startDebugging(undefined, config, this.isNoDebug());
 		}
@@ -203,7 +203,7 @@ export class SelectAndStartAction extends AbstractDebugAction {
 		super(id, label, undefined, debugService, keybindingService);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		return this.quickOpenService.show('debug ');
 	}
 }
@@ -233,7 +233,7 @@ export class RestartAction extends AbstractDebugAction {
 		this.updateLabel(session && session.configuration.request === 'attach' ? RestartAction.RECONNECT_LABEL : RestartAction.LABEL);
 	}
 
-	public run(session: IDebugSession): Thenable<any> {
+	public run(session: IDebugSession): Promise<any> {
 		if (!session || !session.getId) {
 			session = this.debugService.getViewModel().focusedSession;
 		}
@@ -744,7 +744,7 @@ export class FocusSessionAction extends AbstractDebugAction {
 		super(id, label, null, debugService, keybindingService, 100);
 	}
 
-	public run(sessionName: string): Thenable<any> {
+	public run(sessionName: string): Promise<any> {
 		const session = this.debugService.getModel().getSessions().filter(p => p.getLabel() === sessionName).pop();
 		this.debugService.focusStackFrame(undefined, undefined, session, true);
 		const stackFrame = this.debugService.getViewModel().focusedStackFrame;
@@ -808,7 +808,7 @@ export class ReplCollapseAllAction extends CollapseAction2 {
 		super(tree, true, undefined);
 	}
 
-	public run(event?: any): Thenable<any> {
+	public run(event?: any): Promise<any> {
 		return super.run(event).then(() => {
 			this.toFocus.focus();
 		});
diff --git a/src/vs/workbench/parts/debug/browser/debugEditorActions.ts b/src/vs/workbench/parts/debug/browser/debugEditorActions.ts
index f136aaa92e2..3dbe2c0ef00 100644
--- a/src/vs/workbench/parts/debug/browser/debugEditorActions.ts
+++ b/src/vs/workbench/parts/debug/browser/debugEditorActions.ts
@@ -188,7 +188,7 @@ class SelectionToWatchExpressionsAction extends EditorAction {
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): Thenable<void> {
+	public run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
 		const debugService = accessor.get(IDebugService);
 		const viewletService = accessor.get(IViewletService);
 
@@ -230,7 +230,7 @@ class GoToBreakpointAction extends EditorAction {
 		super(opts);
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): Thenable<any> {
+	public run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): Promise<any> {
 		const debugService = accessor.get(IDebugService);
 		const editorService = accessor.get(IEditorService);
 		const currentUri = editor.getModel().uri;
diff --git a/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts b/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts
index 95504883467..0f6aa619a07 100644
--- a/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts
+++ b/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts
@@ -92,7 +92,7 @@ export class DebugQuickOpenHandler extends Quickopen.QuickOpenHandler {
 		return nls.localize('debugAriaLabel', "Type a name of a launch configuration to run.");
 	}
 
-	public getResults(input: string, token: CancellationToken): Thenable<Model.QuickOpenModel> {
+	public getResults(input: string, token: CancellationToken): Promise<Model.QuickOpenModel> {
 		const configurations: Model.QuickOpenEntry[] = [];
 
 		const configManager = this.debugService.getConfigurationManager();
diff --git a/src/vs/workbench/parts/debug/browser/loadedScriptsView.ts b/src/vs/workbench/parts/debug/browser/loadedScriptsView.ts
index d2761a2ab06..baec4a01f99 100644
--- a/src/vs/workbench/parts/debug/browser/loadedScriptsView.ts
+++ b/src/vs/workbench/parts/debug/browser/loadedScriptsView.ts
@@ -545,7 +545,7 @@ class LoadedScriptsDataSource implements IDataSource<LoadedScriptsItem> {
 		return element === null || element.hasChildren();
 	}
 
-	getChildren(element: LoadedScriptsItem | null): Thenable<LoadedScriptsItem[]> {
+	getChildren(element: LoadedScriptsItem | null): Promise<LoadedScriptsItem[]> {
 		if (element === null) {
 			element = this.root;
 		}
diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts
index c15e0dc8f85..6cf0c421429 100644
--- a/src/vs/workbench/parts/debug/common/debug.ts
+++ b/src/vs/workbench/parts/debug/common/debug.ts
@@ -112,7 +112,7 @@ export interface IExpression extends IReplElement, IExpressionContainer {
 export interface IDebugger {
 	createDebugAdapter(session: IDebugSession, outputService: IOutputService): Promise<IDebugAdapter>;
 	runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments): Promise<number | undefined>;
-	getCustomTelemetryService(): Thenable<TelemetryService>;
+	getCustomTelemetryService(): Promise<TelemetryService>;
 }
 
 export const enum State {
@@ -186,7 +186,7 @@ export interface IDebugSession extends ITreeElement {
 
 	// DAP request
 
-	initialize(dbgr: IDebugger): Thenable<void>;
+	initialize(dbgr: IDebugger): Promise<void>;
 	launchOrAttach(config: IConfig): Promise<void>;
 	restart(): Promise<void>;
 	terminate(restart?: boolean /* false */): Promise<void>;
@@ -291,7 +291,7 @@ export interface IStackFrame extends ITreeElement {
 	getSpecificSourceName(): string;
 	restart(): Promise<any>;
 	toString(): string;
-	openInEditor(editorService: IEditorService, preserveFocus?: boolean, sideBySide?: boolean): Thenable<any>;
+	openInEditor(editorService: IEditorService, preserveFocus?: boolean, sideBySide?: boolean): Promise<any>;
 }
 
 export interface IEnablement extends ITreeElement {
@@ -594,7 +594,7 @@ export interface IConfigurationManager {
 	 */
 	onDidSelectConfiguration: Event<void>;
 
-	activateDebuggers(activationEvent: string, debugType?: string): Thenable<void>;
+	activateDebuggers(activationEvent: string, debugType?: string): Promise<void>;
 
 	needsToRunInExtHost(debugType: string): boolean;
 	hasDebugConfigurationProvider(debugType: string): boolean;
@@ -608,7 +608,7 @@ export interface IConfigurationManager {
 	registerDebugAdapterTrackerFactory(debugAdapterTrackerFactory: IDebugAdapterTrackerFactory): IDisposable;
 	unregisterDebugAdapterTrackerFactory(debugAdapterTrackerFactory: IDebugAdapterTrackerFactory): void;
 
-	resolveConfigurationByProviders(folderUri: uri | undefined, type: string | undefined, debugConfiguration: any): Thenable<any>;
+	resolveConfigurationByProviders(folderUri: uri | undefined, type: string | undefined, debugConfiguration: any): Promise<any>;
 	provideDebugAdapter(session: IDebugSession): Promise<IAdapterDescriptor | undefined>;
 
 	registerDebugAdapterFactory(debugTypes: string[], debugAdapterFactory: IDebugAdapterFactory): IDisposable;
@@ -661,7 +661,7 @@ export interface ILaunch {
 	/**
 	 * Opens the launch.json file. Creates if it does not exist.
 	 */
-	openConfigFile(sideBySide: boolean, preserveFocus: boolean, type?: string): Thenable<{ editor: IEditor, created: boolean }>;
+	openConfigFile(sideBySide: boolean, preserveFocus: boolean, type?: string): Promise<{ editor: IEditor, created: boolean }>;
 }
 
 // Debug service interfaces
@@ -785,12 +785,12 @@ export interface IDebugService {
 	 * Returns true if the start debugging was successfull. For compound launches, all configurations have to start successfuly for it to return success.
 	 * On errors the startDebugging will throw an error, however some error and cancelations are handled and in that case will simply return false.
 	 */
-	startDebugging(launch: ILaunch, configOrName?: IConfig | string, noDebug?: boolean): Thenable<boolean>;
+	startDebugging(launch: ILaunch, configOrName?: IConfig | string, noDebug?: boolean): Promise<boolean>;
 
 	/**
 	 * Restarts a session or creates a new one if there is no active session.
 	 */
-	restartSession(session: IDebugSession, restartData?: any): Thenable<any>;
+	restartSession(session: IDebugSession, restartData?: any): Promise<any>;
 
 	/**
 	 * Stops the session. If the session does not exist then stops all sessions.
diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts
index c4dce89cd40..79d90ad6394 100644
--- a/src/vs/workbench/parts/debug/common/debugModel.ts
+++ b/src/vs/workbench/parts/debug/common/debugModel.ts
@@ -380,7 +380,7 @@ export class StackFrame implements IStackFrame {
 		return `${this.name} (${this.source.inMemory ? this.source.name : this.source.uri.fsPath}:${this.range.startLineNumber})`;
 	}
 
-	openInEditor(editorService: IEditorService, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): Thenable<any> {
+	openInEditor(editorService: IEditorService, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): Promise<any> {
 		return !this.source.available ? Promise.resolve(null) :
 			this.source.openInEditor(editorService, this.range, preserveFocus, sideBySide, pinned);
 	}
diff --git a/src/vs/workbench/parts/debug/common/debugSource.ts b/src/vs/workbench/parts/debug/common/debugSource.ts
index 434c78d670f..35b974baee2 100644
--- a/src/vs/workbench/parts/debug/common/debugSource.ts
+++ b/src/vs/workbench/parts/debug/common/debugSource.ts
@@ -83,7 +83,7 @@ export class Source {
 		return this.uri.scheme === DEBUG_SCHEME;
 	}
 
-	openInEditor(editorService: IEditorService, selection: IRange, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): Thenable<any> {
+	openInEditor(editorService: IEditorService, selection: IRange, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): Promise<any> {
 		return !this.available ? Promise.resolve(null) : editorService.openEditor({
 			resource: this.uri,
 			description: this.origin,
diff --git a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
index 8a753096f88..a9a1f42be75 100644
--- a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
@@ -230,7 +230,7 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 		this.themeService.onThemeChange(() => setDecorations());
 
 		this.toDispose.push(CompletionProviderRegistry.register({ scheme: DEBUG_SCHEME, hasAccessToAllModels: true }, {
-			provideCompletionItems: (model: ITextModel, position: Position, _context: CompletionContext, token: CancellationToken): Thenable<CompletionList> => {
+			provideCompletionItems: (model: ITextModel, position: Position, _context: CompletionContext, token: CancellationToken): Promise<CompletionList> => {
 				let suggestionsPromise: Promise<CompletionList>;
 				if (this.context === Context.CONDITION || this.context === Context.LOG_MESSAGE && this.isCurlyBracketOpen()) {
 					suggestionsPromise = provideSuggestionItems(this.editor.getModel(), new Position(this.lineNumber, 1), 'none', undefined, _context, token).then(suggestions => {
diff --git a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts
index df7cd90ad2c..0c8e556b3ca 100644
--- a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts
@@ -581,7 +581,7 @@ class CallStackDataSource implements IDataSource<CallStackItem> {
 		return element === null || element instanceof DebugSession || (element instanceof Thread && element.stopped);
 	}
 
-	getChildren(element: CallStackItem | null): Thenable<CallStackItem[]> {
+	getChildren(element: CallStackItem | null): Promise<CallStackItem[]> {
 		if (element === null) {
 			const model = this.debugService.getModel();
 			const sessions = model.getSessions();
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
index 030ca8cd203..8c20e13ff80 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
@@ -217,7 +217,7 @@ export class ConfigurationManager implements IConfigurationManager {
 		return providers2.length > 0;
 	}
 
-	public resolveConfigurationByProviders(folderUri: uri | undefined, type: string | undefined, debugConfiguration: IConfig): Thenable<IConfig> {
+	public resolveConfigurationByProviders(folderUri: uri | undefined, type: string | undefined, debugConfiguration: IConfig): Promise<IConfig> {
 		return this.activateDebuggers('onDebugResolve', type).then(() => {
 			// pipe the config through the promises sequentially. append at the end the '*' types
 			const providers = this.configProviders.filter(p => p.type === type && p.resolveDebugConfiguration)
@@ -235,7 +235,7 @@ export class ConfigurationManager implements IConfigurationManager {
 		});
 	}
 
-	public provideDebugConfigurations(folderUri: uri | undefined, type: string): Thenable<any[]> {
+	public provideDebugConfigurations(folderUri: uri | undefined, type: string): Promise<any[]> {
 		return this.activateDebuggers('onDebugInitialConfigurations')
 			.then(() => Promise.all(this.configProviders.filter(p => p.type === type && p.provideDebugConfigurations).map(p => p.provideDebugConfigurations(folderUri)))
 				.then(results => results.reduce((first, second) => first.concat(second), [])));
@@ -401,14 +401,14 @@ export class ConfigurationManager implements IConfigurationManager {
 		return this.debuggers.filter(dbg => strings.equalsIgnoreCase(dbg.type, type)).pop();
 	}
 
-	public guessDebugger(type?: string): Thenable<Debugger> {
+	public guessDebugger(type?: string): Promise<Debugger> {
 		if (type) {
 			const adapter = this.getDebugger(type);
 			return Promise.resolve(adapter);
 		}
 
 		const activeTextEditorWidget = this.editorService.activeTextEditorWidget;
-		let candidates: Thenable<Debugger[]>;
+		let candidates: Promise<Debugger[]>;
 		if (isCodeEditor(activeTextEditorWidget)) {
 			const model = activeTextEditorWidget.getModel();
 			const language = model ? model.getLanguageIdentifier().language : undefined;
@@ -441,8 +441,8 @@ export class ConfigurationManager implements IConfigurationManager {
 		});
 	}
 
-	public activateDebuggers(activationEvent: string, debugType?: string): Thenable<void> {
-		const thenables: Thenable<any>[] = [
+	public activateDebuggers(activationEvent: string, debugType?: string): Promise<void> {
+		const thenables: Promise<any>[] = [
 			this.extensionService.activateByEvent(activationEvent),
 			this.extensionService.activateByEvent('onDebug')
 		];
@@ -531,7 +531,7 @@ class Launch implements ILaunch {
 		return config.configurations.filter(config => config && config.name === name).shift();
 	}
 
-	public openConfigFile(sideBySide: boolean, preserveFocus: boolean, type?: string): Thenable<{ editor: IEditor, created: boolean }> {
+	public openConfigFile(sideBySide: boolean, preserveFocus: boolean, type?: string): Promise<{ editor: IEditor, created: boolean }> {
 		const resource = this.uri;
 		let created = false;
 
@@ -609,7 +609,7 @@ class WorkspaceLaunch extends Launch implements ILaunch {
 		return this.configurationService.inspect<IGlobalConfig>('launch').workspace;
 	}
 
-	openConfigFile(sideBySide: boolean, preserveFocus: boolean, type?: string): Thenable<{ editor: IEditor, created: boolean }> {
+	openConfigFile(sideBySide: boolean, preserveFocus: boolean, type?: string): Promise<{ editor: IEditor, created: boolean }> {
 		return this.editorService.openEditor({
 			resource: this.contextService.getWorkspace().configuration,
 			options: { preserveFocus }
@@ -646,7 +646,7 @@ class UserLaunch extends Launch implements ILaunch {
 		return this.configurationService.inspect<IGlobalConfig>('launch').user;
 	}
 
-	openConfigFile(sideBySide: boolean, preserveFocus: boolean, type?: string): Thenable<{ editor: IEditor, created: boolean }> {
+	openConfigFile(sideBySide: boolean, preserveFocus: boolean, type?: string): Promise<{ editor: IEditor, created: boolean }> {
 		return this.preferencesService.openGlobalSettings(false, { preserveFocus }).then(editor => ({ editor, created: false }));
 	}
 }
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts
index 9e250067c3a..978ef4822f1 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts
@@ -207,7 +207,7 @@ export class DebugHoverWidget implements IContentWidget {
 			.then(expressions => (expressions.length > 0 && expressions.every(e => e.value === expressions[0].value)) ? expressions[0] : null);
 	}
 
-	private doShow(position: Position, expression: IExpression, focus: boolean, forceValueHover = false): Thenable<void> {
+	private doShow(position: Position, expression: IExpression, focus: boolean, forceValueHover = false): Promise<void> {
 		if (!this.domNode) {
 			this.create();
 		}
@@ -298,7 +298,7 @@ class DebugHoverDataSource implements IDataSource<IExpression> {
 		return element === null || element.hasChildren;
 	}
 
-	getChildren(element: IExpression | null): Thenable<IExpression[]> {
+	getChildren(element: IExpression | null): Promise<IExpression[]> {
 		if (element === null) {
 			element = this.expression;
 		}
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index bc37e401e65..e696bf302e2 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -255,7 +255,7 @@ export class DebugService implements IDebugService {
 	 * main entry point
 	 * properly manages compounds, checks for errors and handles the initializing state.
 	 */
-	startDebugging(launch: ILaunch, configOrName?: IConfig | string, noDebug = false, unresolvedConfig?: IConfig, ): Thenable<boolean> {
+	startDebugging(launch: ILaunch, configOrName?: IConfig | string, noDebug = false, unresolvedConfig?: IConfig, ): Promise<boolean> {
 
 		this.startInitializingState();
 		// make sure to save all files and that the configuration is up to date
@@ -343,7 +343,7 @@ export class DebugService implements IDebugService {
 	/**
 	 * gets the debugger for the type, resolves configurations by providers, substitutes variables and runs prelaunch tasks
 	 */
-	private createSession(launch: ILaunch, config: IConfig, unresolvedConfig: IConfig, noDebug: boolean): Thenable<boolean> {
+	private createSession(launch: ILaunch, config: IConfig, unresolvedConfig: IConfig, noDebug: boolean): Promise<boolean> {
 		// We keep the debug type in a separate variable 'type' so that a no-folder config has no attributes.
 		// Storing the type in the config would break extensions that assume that the no-folder case is indicated by an empty config.
 		let type: string;
@@ -359,7 +359,7 @@ export class DebugService implements IDebugService {
 			config.noDebug = true;
 		}
 
-		const debuggerThenable: Thenable<void> = type ? Promise.resolve(null) : this.configurationManager.guessDebugger().then(dbgr => { type = dbgr && dbgr.type; });
+		const debuggerThenable: Promise<void> = type ? Promise.resolve(null) : this.configurationManager.guessDebugger().then(dbgr => { type = dbgr && dbgr.type; });
 		return debuggerThenable.then(() =>
 			this.configurationManager.resolveConfigurationByProviders(launch && launch.workspace ? launch.workspace.uri : undefined, type, config).then(config => {
 				// a falsy config indicates an aborted launch
@@ -417,7 +417,7 @@ export class DebugService implements IDebugService {
 	/**
 	 * instantiates the new session, initializes the session, registers session listeners and reports telemetry
 	 */
-	private doCreateSession(root: IWorkspaceFolder, configuration: { resolved: IConfig, unresolved: IConfig }): Thenable<boolean> {
+	private doCreateSession(root: IWorkspaceFolder, configuration: { resolved: IConfig, unresolved: IConfig }): Promise<boolean> {
 
 		const session = this.instantiationService.createInstance(DebugSession, configuration, root, this.model);
 		this.model.addSession(session);
@@ -474,7 +474,7 @@ export class DebugService implements IDebugService {
 		});
 	}
 
-	private launchOrAttachToSession(session: IDebugSession, focus = true): Thenable<void> {
+	private launchOrAttachToSession(session: IDebugSession, focus = true): Promise<void> {
 		const dbgr = this.configurationManager.getDebugger(session.configuration.type);
 		return session.initialize(dbgr).then(() => {
 			return session.launchOrAttach(session.configuration).then(() => {
@@ -546,10 +546,10 @@ export class DebugService implements IDebugService {
 		}));
 	}
 
-	restartSession(session: IDebugSession, restartData?: any): Thenable<any> {
+	restartSession(session: IDebugSession, restartData?: any): Promise<any> {
 		return this.textFileService.saveAll().then(() => {
 			const isAutoRestart = !!restartData;
-			const runTasks: () => Thenable<TaskRunResult> = () => {
+			const runTasks: () => Promise<TaskRunResult> = () => {
 				if (isAutoRestart) {
 					// Do not run preLaunch and postDebug tasks for automatic restarts
 					return Promise.resolve(TaskRunResult.Success);
@@ -595,7 +595,7 @@ export class DebugService implements IDebugService {
 								}
 							}
 
-							let substitutionThenable: Thenable<IConfig> = Promise.resolve(session.configuration);
+							let substitutionThenable: Promise<IConfig> = Promise.resolve(session.configuration);
 							if (needsToSubstitute) {
 								substitutionThenable = this.configurationManager.resolveConfigurationByProviders(launch.workspace ? launch.workspace.uri : undefined, unresolved.type, unresolved)
 									.then(resolved => this.substituteVariables(launch, resolved));
@@ -630,7 +630,7 @@ export class DebugService implements IDebugService {
 		return Promise.all(sessions.map(s => s.terminate()));
 	}
 
-	private substituteVariables(launch: ILaunch | undefined, config: IConfig): Thenable<IConfig> {
+	private substituteVariables(launch: ILaunch | undefined, config: IConfig): Promise<IConfig> {
 		const dbg = this.configurationManager.getDebugger(config.type);
 		if (dbg) {
 			let folder: IWorkspaceFolder | undefined = undefined;
@@ -652,7 +652,7 @@ export class DebugService implements IDebugService {
 		return Promise.resolve(config);
 	}
 
-	private showError(message: string, actions: IAction[] = []): Thenable<void> {
+	private showError(message: string, actions: IAction[] = []): Promise<void> {
 		const configureAction = this.instantiationService.createInstance(debugactions.ConfigureAction, debugactions.ConfigureAction.ID, debugactions.ConfigureAction.LABEL);
 		actions.push(configureAction);
 		return this.dialogService.show(severity.Error, message, actions.map(a => a.label).concat(nls.localize('cancel', "Cancel")), { cancelId: actions.length }).then(choice => {
@@ -666,7 +666,7 @@ export class DebugService implements IDebugService {
 
 	//---- task management
 
-	private runTaskAndCheckErrors(root: IWorkspaceFolder, taskId: string | TaskIdentifier): Thenable<TaskRunResult> {
+	private runTaskAndCheckErrors(root: IWorkspaceFolder, taskId: string | TaskIdentifier): Promise<TaskRunResult> {
 
 		const debugAnywayAction = new Action('debug.debugAnyway', nls.localize('debugAnyway', "Debug Anyway"), undefined, true, () => Promise.resolve(TaskRunResult.Success));
 		return this.runTask(root, taskId).then((taskSummary: ITaskSummary) => {
@@ -695,7 +695,7 @@ export class DebugService implements IDebugService {
 		});
 	}
 
-	private runTask(root: IWorkspaceFolder, taskId: string | TaskIdentifier): Thenable<ITaskSummary> {
+	private runTask(root: IWorkspaceFolder, taskId: string | TaskIdentifier): Promise<ITaskSummary> {
 		if (!taskId) {
 			return Promise.resolve(null);
 		}
@@ -1012,7 +1012,7 @@ export class DebugService implements IDebugService {
 
 	//---- telemetry
 
-	private telemetryDebugSessionStart(root: IWorkspaceFolder, type: string): Thenable<any> {
+	private telemetryDebugSessionStart(root: IWorkspaceFolder, type: string): Promise<any> {
 		const extension = this.configurationManager.getDebugger(type).extensionDescription;
 		/* __GDPR__
 			"debugSessionStart" : {
@@ -1036,7 +1036,7 @@ export class DebugService implements IDebugService {
 		});
 	}
 
-	private telemetryDebugSessionStop(session: IDebugSession, adapterExitEvent: AdapterEndEvent): Thenable<any> {
+	private telemetryDebugSessionStop(session: IDebugSession, adapterExitEvent: AdapterEndEvent): Promise<any> {
 
 		const breakpoints = this.model.getBreakpoints();
 
@@ -1058,7 +1058,7 @@ export class DebugService implements IDebugService {
 		});
 	}
 
-	private telemetryDebugMisconfiguration(debugType: string, message: string): Thenable<any> {
+	private telemetryDebugMisconfiguration(debugType: string, message: string): Promise<any> {
 		/* __GDPR__
 			"debugMisconfiguration" : {
 				"type" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -1071,7 +1071,7 @@ export class DebugService implements IDebugService {
 		});
 	}
 
-	private telemetryDebugAddBreakpoint(breakpoint: IBreakpoint, context: string): Thenable<any> {
+	private telemetryDebugAddBreakpoint(breakpoint: IBreakpoint, context: string): Promise<any> {
 		/* __GDPR__
 			"debugAddBreakpoint" : {
 				"context": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugSession.ts b/src/vs/workbench/parts/debug/electron-browser/debugSession.ts
index 064254f7bf7..d0b01b5ae7b 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugSession.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugSession.ts
@@ -135,7 +135,7 @@ export class DebugSession implements IDebugSession {
 	/**
 	 * create and initialize a new debug adapter for this session
 	 */
-	initialize(dbgr: IDebugger): Thenable<void> {
+	initialize(dbgr: IDebugger): Promise<void> {
 
 		if (this.raw) {
 			// if there was already a connection make sure to remove old listeners
diff --git a/src/vs/workbench/parts/debug/electron-browser/repl.ts b/src/vs/workbench/parts/debug/electron-browser/repl.ts
index 091da783716..4f6e5582009 100644
--- a/src/vs/workbench/parts/debug/electron-browser/repl.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/repl.ts
@@ -386,7 +386,7 @@ export class Repl extends Panel implements IPrivateReplService, IHistoryNavigati
 
 		CompletionProviderRegistry.register({ scheme: DEBUG_SCHEME, pattern: '**/replinput', hasAccessToAllModels: true }, {
 			triggerCharacters: ['.'],
-			provideCompletionItems: (model: ITextModel, position: Position, _context: CompletionContext, token: CancellationToken): Thenable<CompletionList> => {
+			provideCompletionItems: (model: ITextModel, position: Position, _context: CompletionContext, token: CancellationToken): Promise<CompletionList> => {
 				// Disable history navigation because up and down are used to navigate through the suggest widget
 				this.historyNavigationEnablement.set(false);
 
@@ -759,7 +759,7 @@ class ReplDataSource implements IDataSource<IReplElement> {
 		return element === null || !!(<IExpressionContainer>element).hasChildren;
 	}
 
-	getChildren(element: IReplElement | null): Thenable<IReplElement[]> {
+	getChildren(element: IReplElement | null): Promise<IReplElement[]> {
 		if (element === null) {
 			return Promise.resolve(this.input ? this.input.getReplElements() : []);
 		}
diff --git a/src/vs/workbench/parts/debug/electron-browser/variablesView.ts b/src/vs/workbench/parts/debug/electron-browser/variablesView.ts
index 438129dd0f2..a477413b303 100644
--- a/src/vs/workbench/parts/debug/electron-browser/variablesView.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/variablesView.ts
@@ -162,7 +162,7 @@ export class VariablesDataSource implements IDataSource<IExpression | IScope> {
 		return element.hasChildren;
 	}
 
-	getChildren(element: IExpression | IScope | null): Thenable<(IExpression | IScope)[]> {
+	getChildren(element: IExpression | IScope | null): Promise<(IExpression | IScope)[]> {
 		if (element === null) {
 			const stackFrame = this.debugService.getViewModel().focusedStackFrame;
 			return stackFrame ? stackFrame.getScopes() : Promise.resolve([]);
diff --git a/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts b/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts
index 57dd1d3452a..dd6728e9112 100644
--- a/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts
@@ -199,7 +199,7 @@ class WatchExpressionsDataSource implements IDataSource<IExpression> {
 		return element.hasChildren;
 	}
 
-	getChildren(element: IExpression | null): Thenable<(IExpression)[]> {
+	getChildren(element: IExpression | null): Promise<(IExpression)[]> {
 		if (element === null) {
 			const watchExpressions = this.debugService.getModel().getWatchExpressions();
 			const viewModel = this.debugService.getViewModel();
diff --git a/src/vs/workbench/parts/debug/node/debugger.ts b/src/vs/workbench/parts/debug/node/debugger.ts
index 7d913302660..60468da355d 100644
--- a/src/vs/workbench/parts/debug/node/debugger.ts
+++ b/src/vs/workbench/parts/debug/node/debugger.ts
@@ -115,7 +115,7 @@ export class Debugger implements IDebugger {
 		});
 	}
 
-	substituteVariables(folder: IWorkspaceFolder, config: IConfig): Thenable<IConfig> {
+	substituteVariables(folder: IWorkspaceFolder, config: IConfig): Promise<IConfig> {
 		if (this.inExtHost()) {
 			return this.configurationManager.substituteVariables(this.type, folder, config).then(config => {
 				return this.configurationResolverService.resolveWithInteractionReplace(folder, config, 'launch', this.variables);
@@ -208,7 +208,7 @@ export class Debugger implements IDebugger {
 	}
 
 	@memoize
-	getCustomTelemetryService(): Thenable<TelemetryService> {
+	getCustomTelemetryService(): Promise<TelemetryService> {
 		if (!this.debuggerContribution.aiKey) {
 			return Promise.resolve(undefined);
 		}
diff --git a/src/vs/workbench/parts/debug/node/terminals.ts b/src/vs/workbench/parts/debug/node/terminals.ts
index 5d514e483a6..c81df11eb9c 100644
--- a/src/vs/workbench/parts/debug/node/terminals.ts
+++ b/src/vs/workbench/parts/debug/node/terminals.ts
@@ -187,7 +187,7 @@ class LinuxTerminalService extends TerminalLauncher {
 	public runInTerminal0(title: string, dir: string, args: string[], envVars: env.IProcessEnvironment, configuration: ITerminalSettings): Promise<number | undefined> {
 
 		const terminalConfig = configuration.external;
-		const execThenable: Thenable<string> = terminalConfig.linuxExec ? Promise.resolve(terminalConfig.linuxExec) : getDefaultTerminalLinuxReady();
+		const execThenable: Promise<string> = terminalConfig.linuxExec ? Promise.resolve(terminalConfig.linuxExec) : getDefaultTerminalLinuxReady();
 
 		return new Promise<number | undefined>((c, e) => {
 
diff --git a/src/vs/workbench/parts/debug/test/common/mockDebug.ts b/src/vs/workbench/parts/debug/test/common/mockDebug.ts
index c607480b044..9b0838ee00e 100644
--- a/src/vs/workbench/parts/debug/test/common/mockDebug.ts
+++ b/src/vs/workbench/parts/debug/test/common/mockDebug.ts
@@ -199,7 +199,7 @@ export class MockSession implements IDebugSession {
 
 	rawUpdate(data: IRawModelUpdate): void { }
 
-	initialize(dbgr: IDebugger): Thenable<void> {
+	initialize(dbgr: IDebugger): Promise<void> {
 		throw new Error('Method not implemented.');
 	}
 	launchOrAttach(config: IConfig): Promise<void> {
diff --git a/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts b/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts
index 626f1e22215..3c65a60f628 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts
@@ -46,7 +46,7 @@ export class ExtensionsHandler extends QuickOpenHandler {
 		super();
 	}
 
-	getResults(text: string, token: CancellationToken): Thenable<IModel<any>> {
+	getResults(text: string, token: CancellationToken): Promise<IModel<any>> {
 		const label = nls.localize('manage', "Press Enter to manage your extensions.");
 		const action = () => {
 			this.viewletService.openViewlet(VIEWLET_ID, true)
@@ -82,7 +82,7 @@ export class GalleryExtensionsHandler extends QuickOpenHandler {
 		super();
 	}
 
-	getResults(text: string, token: CancellationToken): Thenable<IModel<any>> {
+	getResults(text: string, token: CancellationToken): Promise<IModel<any>> {
 		if (/\./.test(text)) {
 			return this.galleryService.query({ names: [text], pageSize: 1 })
 				.then(galleryResult => {
diff --git a/src/vs/workbench/parts/extensions/common/extensionsInput.ts b/src/vs/workbench/parts/extensions/common/extensionsInput.ts
index a9c9bd41e4b..e3f5e16c522 100644
--- a/src/vs/workbench/parts/extensions/common/extensionsInput.ts
+++ b/src/vs/workbench/parts/extensions/common/extensionsInput.ts
@@ -38,7 +38,7 @@ export class ExtensionsInput extends EditorInput {
 		return this.extension === otherExtensionInput.extension;
 	}
 
-	resolve(): Thenable<any> {
+	resolve(): Promise<any> {
 		return Promise.resolve(null);
 	}
 
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
index 4befadce043..21bbe3a63e5 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
@@ -270,7 +270,7 @@ export class ExtensionEditor extends BaseEditor {
 		this.content = append(body, $('.content'));
 	}
 
-	setInput(input: ExtensionsInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: ExtensionsInput, options: EditorOptions, token: CancellationToken): Promise<void> {
 		return this.extensionService.getExtensions()
 			.then(runningExtensions => {
 				this.activeElement = null;
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts
index 40c8b6a2bd2..134e2bfe27b 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts
@@ -70,7 +70,7 @@ export class ExtensionHostProfileService extends Disposable implements IExtensio
 		this._onDidChangeState.fire(void 0);
 	}
 
-	public startProfiling(): Thenable<any> {
+	public startProfiling(): Promise<any> {
 		if (this._state !== ProfileSessionState.None) {
 			return null;
 		}
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
index 2679fd84256..0d62b580bc5 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
@@ -491,7 +491,7 @@ export abstract class DropDownAction extends Action {
 		return this._actionItem;
 	}
 
-	public run({ actionGroups, disposeActionsOnHide }: { actionGroups: IAction[][], disposeActionsOnHide: boolean }): Thenable<any> {
+	public run({ actionGroups, disposeActionsOnHide }: { actionGroups: IAction[][], disposeActionsOnHide: boolean }): Promise<any> {
 		if (this._actionItem) {
 			this._actionItem.showMenu(actionGroups, disposeActionsOnHide);
 		}
@@ -595,7 +595,7 @@ export class ManageExtensionAction extends DropDownAction {
 		return groups;
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		return this.extensionService.getExtensions().then(runtimeExtensions => super.run({ actionGroups: this.getActionGroups(runtimeExtensions), disposeActionsOnHide: true }));
 	}
 
@@ -628,7 +628,7 @@ export class InstallAnotherVersionAction extends Action {
 		this.enabled = this.extension && !!this.extension.gallery;
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		return this.quickInputService.pick(this.getVersionEntries(), { placeHolder: localize('selectVersion', "Select Version to Install"), matchOnDetail: true })
 			.then(pick => {
 				if (pick) {
@@ -992,7 +992,7 @@ export class ExtensionEditorDropDownAction extends DropDownAction {
 		}
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		const enabledActions = this.actions.filter(a => a.enabled);
 		if (enabledActions.length === 1) {
 			enabledActions[0].run();
@@ -1334,7 +1334,7 @@ export class ShowEnabledExtensionsAction extends Action {
 		super(id, label, null, true);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.viewletService.openViewlet(VIEWLET_ID, true)
 			.then(viewlet => viewlet as IExtensionsViewlet)
 			.then(viewlet => {
@@ -1357,7 +1357,7 @@ export class ShowInstalledExtensionsAction extends Action {
 		super(id, label, null, true);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.viewletService.openViewlet(VIEWLET_ID, true)
 			.then(viewlet => viewlet as IExtensionsViewlet)
 			.then(viewlet => {
@@ -1380,7 +1380,7 @@ export class ShowDisabledExtensionsAction extends Action {
 		super(id, label, 'null', true);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.viewletService.openViewlet(VIEWLET_ID, true)
 			.then(viewlet => viewlet as IExtensionsViewlet)
 			.then(viewlet => {
@@ -1412,7 +1412,7 @@ export class ClearExtensionsInputAction extends Action {
 		this.enabled = !!value;
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.viewletService.openViewlet(VIEWLET_ID, true)
 			.then(viewlet => viewlet as IExtensionsViewlet)
 			.then(viewlet => {
@@ -1439,7 +1439,7 @@ export class ShowBuiltInExtensionsAction extends Action {
 		super(id, label, null, true);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.viewletService.openViewlet(VIEWLET_ID, true)
 			.then(viewlet => viewlet as IExtensionsViewlet)
 			.then(viewlet => {
@@ -1462,7 +1462,7 @@ export class ShowOutdatedExtensionsAction extends Action {
 		super(id, label, null, true);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.viewletService.openViewlet(VIEWLET_ID, true)
 			.then(viewlet => viewlet as IExtensionsViewlet)
 			.then(viewlet => {
@@ -1485,7 +1485,7 @@ export class ShowPopularExtensionsAction extends Action {
 		super(id, label, null, true);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.viewletService.openViewlet(VIEWLET_ID, true)
 			.then(viewlet => viewlet as IExtensionsViewlet)
 			.then(viewlet => {
@@ -1508,7 +1508,7 @@ export class ShowRecommendedExtensionsAction extends Action {
 		super(id, label, null, true);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.viewletService.openViewlet(VIEWLET_ID, true)
 			.then(viewlet => viewlet as IExtensionsViewlet)
 			.then(viewlet => {
@@ -1541,7 +1541,7 @@ export class InstallWorkspaceRecommendedExtensionsAction extends Action {
 		this.recommendations = recommendations;
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		return this.viewletService.openViewlet(VIEWLET_ID, true)
 			.then(viewlet => viewlet as IExtensionsViewlet)
 			.then(viewlet => {
@@ -1549,7 +1549,7 @@ export class InstallWorkspaceRecommendedExtensionsAction extends Action {
 				viewlet.focus();
 				const names = this.recommendations.map(({ extensionId }) => extensionId);
 				return this.extensionWorkbenchService.queryGallery({ names, source: 'install-all-workspace-recommendations' }).then(pager => {
-					let installPromises: Thenable<void>[] = [];
+					let installPromises: Promise<void>[] = [];
 					let model = new PagedModel(pager);
 					for (let i = 0; i < pager.total; i++) {
 						installPromises.push(model.resolve(i, CancellationToken.None).then(e => {
@@ -1584,7 +1584,7 @@ export class InstallRecommendedExtensionAction extends Action {
 		this.extensionId = extensionId;
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		return this.viewletService.openViewlet(VIEWLET_ID, true)
 			.then(viewlet => viewlet as IExtensionsViewlet)
 			.then(viewlet => {
@@ -1680,7 +1680,7 @@ export class ShowRecommendedKeymapExtensionsAction extends Action {
 		super(id, label, null, true);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.viewletService.openViewlet(VIEWLET_ID, true)
 			.then(viewlet => viewlet as IExtensionsViewlet)
 			.then(viewlet => {
@@ -1703,7 +1703,7 @@ export class ShowLanguageExtensionsAction extends Action {
 		super(id, label, null, true);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.viewletService.openViewlet(VIEWLET_ID, true)
 			.then(viewlet => viewlet as IExtensionsViewlet)
 			.then(viewlet => {
@@ -1726,7 +1726,7 @@ export class ShowAzureExtensionsAction extends Action {
 		super(id, label, null, true);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.viewletService.openViewlet(VIEWLET_ID, true)
 			.then(viewlet => viewlet as IExtensionsViewlet)
 			.then(viewlet => {
@@ -1765,7 +1765,7 @@ export class ChangeSortAction extends Action {
 		this.enabled = value && this.query.isValid() && !this.query.equals(query);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.viewletService.openViewlet(VIEWLET_ID, true)
 			.then(viewlet => viewlet as IExtensionsViewlet)
 			.then(viewlet => {
@@ -1803,7 +1803,7 @@ export class ChangeGroupAction extends Action {
 		this.query = new Query(query.value, query.sortBy, this.groupBy || query.groupBy);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.viewletService.openViewlet(VIEWLET_ID, true)
 			.then(viewlet => viewlet as IExtensionsViewlet)
 			.then(viewlet => {
@@ -2619,12 +2619,12 @@ export class ReinstallAction extends Action {
 		return this.extensionsWorkbenchService.local.filter(l => l.type === LocalExtensionType.User && l.local).length > 0;
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		return this.quickInputService.pick(this.getEntries(), { placeHolder: localize('selectExtensionToReinstall', "Select Extension to Reinstall") })
 			.then(pick => pick && this.reinstallExtension(pick.extension));
 	}
 
-	private getEntries(): Thenable<(IQuickPickItem & { extension: IExtension })[]> {
+	private getEntries(): Promise<(IQuickPickItem & { extension: IExtension })[]> {
 		return this.extensionsWorkbenchService.queryLocal()
 			.then(local => {
 				const entries = local
@@ -2641,7 +2641,7 @@ export class ReinstallAction extends Action {
 			});
 	}
 
-	private reinstallExtension(extension: IExtension): Thenable<void> {
+	private reinstallExtension(extension: IExtension): Promise<void> {
 		return this.viewletService.openViewlet(VIEWLET_ID)
 			.then((viewlet: IExtensionsViewlet) => {
 				viewlet.search('');
@@ -2700,7 +2700,7 @@ export class InstallSpecificVersionOfExtensionAction extends Action {
 
 	private async getExtensionEntries(): Promise<(IQuickPickItem & { extension: IExtension, versions: IGalleryExtensionVersion[] })[]> {
 		const installed = await this.extensionsWorkbenchService.queryLocal();
-		const versionsPromises: Thenable<{ extension: IExtension, versions: IGalleryExtensionVersion[] }>[] = [];
+		const versionsPromises: Promise<{ extension: IExtension, versions: IGalleryExtensionVersion[] }>[] = [];
 		for (const extension of installed) {
 			if (this.isEnabled(extension)) {
 				versionsPromises.push(this.extensionGalleryService.getAllVersions(extension.gallery, true)
@@ -2722,7 +2722,7 @@ export class InstallSpecificVersionOfExtensionAction extends Action {
 			});
 	}
 
-	private install(extension: IExtension, version: string): Thenable<void> {
+	private install(extension: IExtension, version: string): Promise<void> {
 		return this.viewletService.openViewlet(VIEWLET_ID)
 			.then((viewlet: IExtensionsViewlet) => {
 				viewlet.search('');
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
index 7f4e0a18613..af793327171 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
@@ -401,8 +401,8 @@ export class ExtensionsListView extends ViewletPanel {
 
 	}
 
-	private _searchExperiments: Thenable<IExperiment[]>;
-	private getSearchExperiments(): Thenable<IExperiment[]> {
+	private _searchExperiments: Promise<IExperiment[]>;
+	private getSearchExperiments(): Promise<IExperiment[]> {
 		if (!this._searchExperiments) {
 			this._searchExperiments = this.experimentService.getExperimentsByType(ExperimentActionType.ExtensionSearchResults);
 		}
diff --git a/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts
index b2956c1bffe..e2a6bf40fe6 100644
--- a/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts
+++ b/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts
@@ -44,7 +44,7 @@ export class BinaryFileEditor extends BaseBinaryResourceEditor {
 		);
 	}
 
-	private openInternal(input: EditorInput, options: EditorOptions): Thenable<void> {
+	private openInternal(input: EditorInput, options: EditorOptions): Promise<void> {
 		if (input instanceof FileEditorInput) {
 			input.setForceOpenAsText();
 
diff --git a/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts b/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts
index 2300e540542..fc8f77b2b84 100644
--- a/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts
+++ b/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts
@@ -168,7 +168,7 @@ export class FileEditorTracker extends Disposable implements IWorkbenchContribut
 				// file is really gone and not just a faulty file event.
 				// This only applies to external file events, so we need to check for the isExternal
 				// flag.
-				let checkExists: Thenable<boolean>;
+				let checkExists: Promise<boolean>;
 				if (isExternal) {
 					checkExists = timeout(100).then(() => this.fileService.existsFile(resource));
 				} else {
diff --git a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
index 69c4078ff86..ba0a6eac16e 100644
--- a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
+++ b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
@@ -109,7 +109,7 @@ export class TextFileEditor extends BaseTextEditor {
 		}
 	}
 
-	setInput(input: FileEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: FileEditorInput, options: EditorOptions, token: CancellationToken): Promise<void> {
 
 		// Update/clear view settings if input changes
 		this.doSaveOrClearTextEditorViewState(this.input);
diff --git a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
index 0fa6fce1e2f..0d8adaccef1 100644
--- a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
+++ b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
@@ -28,7 +28,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 	private preferredEncoding: string;
 	private forceOpenAsBinary: boolean;
 	private forceOpenAsText: boolean;
-	private textModelReference: Thenable<IReference<ITextEditorModel>>;
+	private textModelReference: Promise<IReference<ITextEditorModel>>;
 	private name: string;
 
 	/**
@@ -222,15 +222,15 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		return model.isDirty();
 	}
 
-	confirmSave(): Thenable<ConfirmResult> {
+	confirmSave(): Promise<ConfirmResult> {
 		return this.textFileService.confirmSave([this.resource]);
 	}
 
-	save(): Thenable<boolean> {
+	save(): Promise<boolean> {
 		return this.textFileService.save(this.resource);
 	}
 
-	revert(options?: IRevertOptions): Thenable<boolean> {
+	revert(options?: IRevertOptions): Promise<boolean> {
 		return this.textFileService.revert(this.resource, options);
 	}
 
@@ -238,7 +238,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		return this.forceOpenAsBinary ? BINARY_FILE_EDITOR_ID : TEXT_FILE_EDITOR_ID;
 	}
 
-	resolve(): Thenable<TextFileEditorModel | BinaryEditorModel> {
+	resolve(): Promise<TextFileEditorModel | BinaryEditorModel> {
 
 		// Resolve as binary
 		if (this.forceOpenAsBinary) {
@@ -249,7 +249,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		return this.doResolveAsText();
 	}
 
-	private doResolveAsText(): Thenable<TextFileEditorModel | BinaryEditorModel> {
+	private doResolveAsText(): Promise<TextFileEditorModel | BinaryEditorModel> {
 
 		// Resolve as text
 		return this.textFileService.models.loadOrCreate(this.resource, {
@@ -280,7 +280,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		});
 	}
 
-	private doResolveAsBinary(): Thenable<BinaryEditorModel> {
+	private doResolveAsBinary(): Promise<BinaryEditorModel> {
 		return this.instantiationService.createInstance(BinaryEditorModel, this.resource, this.getName()).load().then(m => m as BinaryEditorModel);
 	}
 
diff --git a/src/vs/workbench/parts/files/common/files.ts b/src/vs/workbench/parts/files/common/files.ts
index 974d5e1e0af..3a145b8b474 100644
--- a/src/vs/workbench/parts/files/common/files.ts
+++ b/src/vs/workbench/parts/files/common/files.ts
@@ -35,7 +35,7 @@ export interface IExplorerViewlet extends IViewlet {
 }
 
 export interface IExplorerView {
-	select(resource: URI, reveal?: boolean): Thenable<void>;
+	select(resource: URI, reveal?: boolean): Promise<void>;
 }
 
 /**
@@ -154,7 +154,7 @@ export class FileOnDiskContentProvider implements ITextModelContentProvider {
 	) {
 	}
 
-	provideTextContent(resource: URI): Thenable<ITextModel> {
+	provideTextContent(resource: URI): Promise<ITextModel> {
 		const fileOnDiskResource = resource.with({ scheme: Schemas.file });
 
 		// Make sure our file from disk is resolved up to date
@@ -180,9 +180,9 @@ export class FileOnDiskContentProvider implements ITextModelContentProvider {
 		});
 	}
 
-	private resolveEditorModel(resource: URI, createAsNeeded?: true): Thenable<ITextModel>;
-	private resolveEditorModel(resource: URI, createAsNeeded?: boolean): Thenable<ITextModel | null>;
-	private resolveEditorModel(resource: URI, createAsNeeded: boolean = true): Thenable<ITextModel | null> {
+	private resolveEditorModel(resource: URI, createAsNeeded?: true): Promise<ITextModel>;
+	private resolveEditorModel(resource: URI, createAsNeeded?: boolean): Promise<ITextModel | null>;
+	private resolveEditorModel(resource: URI, createAsNeeded: boolean = true): Promise<ITextModel | null> {
 		const fileOnDiskResource = resource.with({ scheme: Schemas.file });
 
 		return this.textFileService.resolveTextContent(fileOnDiskResource).then(content => {
diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts
index 3c76c5c912e..1cece8af158 100644
--- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts
+++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts
@@ -98,7 +98,7 @@ export class BaseErrorReportingAction extends Action {
 		this._notificationService.error(toErrorMessage(error, false));
 	}
 
-	protected onErrorWithRetry(error: any, retry: () => Thenable<any>): void {
+	protected onErrorWithRetry(error: any, retry: () => Promise<any>): void {
 		this._notificationService.prompt(Severity.Error, toErrorMessage(error, false),
 			[{
 				label: nls.localize('retry', "Retry"),
@@ -167,7 +167,7 @@ class TriggerRenameFileAction extends BaseFileAction {
 		return this.renameAction.validateFileName(this.element.parent, name);
 	}
 
-	public run(context?: any): Thenable<any> {
+	public run(context?: any): Promise<any> {
 		if (!context) {
 			return Promise.reject(new Error('No context provided to BaseEnableFileRenameAction.'));
 		}
@@ -234,7 +234,7 @@ export abstract class BaseRenameAction extends BaseFileAction {
 		return super._isEnabled() && this.element && !this.element.isReadonly;
 	}
 
-	public run(context?: any): Thenable<any> {
+	public run(context?: any): Promise<any> {
 		if (!context) {
 			return Promise.reject(new Error('No context provided to BaseRenameFileAction.'));
 		}
@@ -277,7 +277,7 @@ export abstract class BaseRenameAction extends BaseFileAction {
 		return validateFileName(parent, name);
 	}
 
-	public abstract runAction(newName: string): Thenable<any>;
+	public abstract runAction(newName: string): Promise<any>;
 }
 
 class RenameFileAction extends BaseRenameAction {
@@ -295,7 +295,7 @@ class RenameFileAction extends BaseRenameAction {
 		this._updateEnablement();
 	}
 
-	public runAction(newName: string): Thenable<any> {
+	public runAction(newName: string): Promise<any> {
 		const parentResource = this.element.parent.resource;
 		const targetResource = resources.joinPath(parentResource, newName);
 
@@ -332,7 +332,7 @@ export class BaseNewAction extends BaseFileAction {
 		this.renameAction = editableAction;
 	}
 
-	public run(context?: any): Thenable<any> {
+	public run(context?: any): Promise<any> {
 		if (!context) {
 			return Promise.reject(new Error('No context provided to BaseNewAction.'));
 		}
@@ -456,7 +456,7 @@ export class GlobalNewUntitledFileAction extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		return this.editorService.openEditor({ options: { pinned: true } } as IUntitledResourceInput); // untitled are always pinned
 	}
 }
@@ -491,7 +491,7 @@ class CreateFileAction extends BaseCreateAction {
 		this._updateEnablement();
 	}
 
-	public runAction(fileName: string): Thenable<any> {
+	public runAction(fileName: string): Promise<any> {
 		const resource = this.element.parent.resource;
 		return this.fileService.createFile(resources.joinPath(resource, fileName)).then(stat => {
 			return this.editorService.openEditor({ resource: stat.resource, options: { pinned: true } });
@@ -518,7 +518,7 @@ class CreateFolderAction extends BaseCreateAction {
 		this._updateEnablement();
 	}
 
-	public runAction(fileName: string): Thenable<any> {
+	public runAction(fileName: string): Promise<any> {
 		const resource = this.element.parent.resource;
 		return this.fileService.createFolder(resources.joinPath(resource, fileName)).then(void 0, (error) => {
 			this.onErrorWithRetry(error, () => this.runAction(fileName));
@@ -554,7 +554,7 @@ class BaseDeleteFileAction extends BaseFileAction {
 		return super._isEnabled() && this.elements && this.elements.every(e => !e.isReadonly);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 
 		// Remove highlight
 		if (this.tree) {
@@ -571,7 +571,7 @@ class BaseDeleteFileAction extends BaseFileAction {
 		const distinctElements = resources.distinctParents(this.elements, e => e.resource);
 
 		// Handle dirty
-		let confirmDirtyPromise: Thenable<boolean> = Promise.resolve(true);
+		let confirmDirtyPromise: Promise<boolean> = Promise.resolve(true);
 		const dirty = this.textFileService.getDirty().filter(d => distinctElements.some(e => resources.isEqualOrParent(d, e.resource, !isLinux /* ignorecase */)));
 		if (dirty.length) {
 			let message: string;
@@ -608,7 +608,7 @@ class BaseDeleteFileAction extends BaseFileAction {
 				return null;
 			}
 
-			let confirmDeletePromise: Thenable<IConfirmationResult>;
+			let confirmDeletePromise: Promise<IConfirmationResult>;
 
 			// Check if we need to ask for confirmation at all
 			if (this.skipConfirm || (this.useTrash && this.configurationService.getValue<boolean>(BaseDeleteFileAction.CONFIRM_DELETE_SETTING_KEY) === false)) {
@@ -644,7 +644,7 @@ class BaseDeleteFileAction extends BaseFileAction {
 			return confirmDeletePromise.then(confirmation => {
 
 				// Check for confirmation checkbox
-				let updateConfirmSettingsPromise: Thenable<void> = Promise.resolve(void 0);
+				let updateConfirmSettingsPromise: Promise<void> = Promise.resolve(void 0);
 				if (confirmation.confirmed && confirmation.checkboxChecked === true) {
 					updateConfirmSettingsPromise = this.configurationService.updateValue(BaseDeleteFileAction.CONFIRM_DELETE_SETTING_KEY, false, ConfigurationTarget.USER);
 				}
@@ -781,7 +781,7 @@ export class AddFilesAction extends BaseFileAction {
 		this._updateEnablement();
 	}
 
-	public run(resourcesToAdd: URI[]): Thenable<any> {
+	public run(resourcesToAdd: URI[]): Promise<any> {
 		const addPromise = Promise.resolve(null).then(() => {
 			if (resourcesToAdd && resourcesToAdd.length > 0) {
 
@@ -807,7 +807,7 @@ export class AddFilesAction extends BaseFileAction {
 						targetNames.add(isLinux ? child.name : child.name.toLowerCase());
 					});
 
-					let overwritePromise: Thenable<IConfirmationResult> = Promise.resolve({ confirmed: true });
+					let overwritePromise: Promise<IConfirmationResult> = Promise.resolve({ confirmed: true });
 					if (resourcesToAdd.some(resource => {
 						return targetNames.has(!resources.hasToIgnoreCase(resource) ? resources.basename(resource) : resources.basename(resource).toLowerCase());
 					})) {
@@ -827,7 +827,7 @@ export class AddFilesAction extends BaseFileAction {
 						}
 
 						// Run add in sequence
-						const addPromisesFactory: ITask<Thenable<void>>[] = [];
+						const addPromisesFactory: ITask<Promise<void>>[] = [];
 						resourcesToAdd.forEach(resource => {
 							addPromisesFactory.push(() => {
 								const sourceFile = resource;
@@ -836,7 +836,7 @@ export class AddFilesAction extends BaseFileAction {
 								// if the target exists and is dirty, make sure to revert it. otherwise the dirty contents
 								// of the target file would replace the contents of the added file. since we already
 								// confirmed the overwrite before, this is OK.
-								let revertPromise: Thenable<ITextFileOperationResult> = Promise.resolve(null);
+								let revertPromise: Promise<ITextFileOperationResult> = Promise.resolve(null);
 								if (this.textFileService.isDirty(targetFile)) {
 									revertPromise = this.textFileService.revertAll([targetFile], { soft: true });
 								}
@@ -890,7 +890,7 @@ class CopyFileAction extends BaseFileAction {
 		this._updateEnablement();
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 
 		// Write to clipboard as file/folder to copy
 		this.clipboardService.writeResources(this.elements.map(e => e.resource));
@@ -932,7 +932,7 @@ class PasteFileAction extends BaseFileAction {
 		this._updateEnablement();
 	}
 
-	public run(fileToPaste: URI): Thenable<any> {
+	public run(fileToPaste: URI): Promise<any> {
 
 		// Check if target is ancestor of pasted folder
 		if (this.element.resource.toString() !== fileToPaste.toString() && resources.isEqualOrParent(this.element.resource, fileToPaste, !isLinux /* ignorecase */)) {
@@ -994,7 +994,7 @@ export class DuplicateFileAction extends BaseFileAction {
 		this._updateEnablement();
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 
 		// Remove highlight
 		if (this.tree) {
@@ -1113,7 +1113,7 @@ export class GlobalCompareResourcesAction extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		const activeInput = this.editorService.activeEditor;
 		const activeResource = activeInput ? activeInput.getResource() : void 0;
 		if (activeResource) {
@@ -1170,7 +1170,7 @@ export class ToggleAutoSaveAction extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		const setting = this.configurationService.inspect('files.autoSave');
 		let userAutoSaveConfig = setting.user;
 		if (types.isUndefinedOrNull(userAutoSaveConfig)) {
@@ -1210,7 +1210,7 @@ export abstract class BaseSaveAllAction extends BaseErrorReportingAction {
 	}
 
 	protected abstract includeUntitled(): boolean;
-	protected abstract doRun(context: any): Thenable<any>;
+	protected abstract doRun(context: any): Promise<any>;
 
 	private registerListeners(): void {
 
@@ -1232,7 +1232,7 @@ export abstract class BaseSaveAllAction extends BaseErrorReportingAction {
 		}
 	}
 
-	public run(context?: any): Thenable<boolean> {
+	public run(context?: any): Promise<boolean> {
 		return this.doRun(context).then(() => true, error => {
 			this.onError(error);
 			return null;
@@ -1255,7 +1255,7 @@ export class SaveAllAction extends BaseSaveAllAction {
 		return 'explorer-action save-all';
 	}
 
-	protected doRun(context: any): Thenable<any> {
+	protected doRun(context: any): Promise<any> {
 		return this.commandService.executeCommand(SAVE_ALL_COMMAND_ID);
 	}
 
@@ -1273,7 +1273,7 @@ export class SaveAllInGroupAction extends BaseSaveAllAction {
 		return 'explorer-action save-all';
 	}
 
-	protected doRun(context: any): Thenable<any> {
+	protected doRun(context: any): Promise<any> {
 		return this.commandService.executeCommand(SAVE_ALL_IN_GROUP_COMMAND_ID, {}, context);
 	}
 
@@ -1291,7 +1291,7 @@ export class CloseGroupAction extends Action {
 		super(id, label, 'action-close-all-files');
 	}
 
-	public run(context?: any): Thenable<any> {
+	public run(context?: any): Promise<any> {
 		return this.commandService.executeCommand(CLOSE_EDITORS_AND_GROUP_COMMAND_ID, {}, context);
 	}
 }
@@ -1309,7 +1309,7 @@ export class FocusFilesExplorer extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		return this.viewletService.openViewlet(VIEWLET_ID, true).then((viewlet: ExplorerViewlet) => {
 			const view = viewlet.getExplorerView();
 			if (view) {
@@ -1335,7 +1335,7 @@ export class ShowActiveFileInExplorer extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		const resource = toResource(this.editorService.activeEditor, { supportSideBySide: true });
 		if (resource) {
 			this.commandService.executeCommand(REVEAL_IN_EXPLORER_COMMAND_ID, resource);
@@ -1360,7 +1360,7 @@ export class CollapseExplorerView extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		return this.viewletService.openViewlet(VIEWLET_ID, true).then((viewlet: ExplorerViewlet) => {
 			const explorerView = viewlet.getExplorerView();
 			if (explorerView) {
@@ -1388,7 +1388,7 @@ export class RefreshExplorerView extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		return this.viewletService.openViewlet(VIEWLET_ID, true).then((viewlet: ExplorerViewlet) => {
 			const explorerView = viewlet.getExplorerView();
 			if (explorerView) {
@@ -1413,7 +1413,7 @@ export class ShowOpenedFileInNewWindow extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		const fileResource = toResource(this.editorService.activeEditor, { supportSideBySide: true, filter: Schemas.file /* todo@remote */ });
 		if (fileResource) {
 			this.windowService.openWindow([fileResource], { forceNewWindow: true, forceOpenWorkspaceAsFile: true });
@@ -1510,7 +1510,7 @@ export class CompareWithClipboardAction extends Action {
 		this.enabled = true;
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		const resource: URI = toResource(this.editorService.activeEditor, { supportSideBySide: true });
 		if (resource && (this.fileService.canHandleResource(resource) || resource.scheme === Schemas.untitled)) {
 			if (!this.registrationDisposal) {
@@ -1545,7 +1545,7 @@ class ClipboardContentProvider implements ITextModelContentProvider {
 		@IModelService private modelService: IModelService
 	) { }
 
-	provideTextContent(resource: URI): Thenable<ITextModel> {
+	provideTextContent(resource: URI): Promise<ITextModel> {
 		const model = this.modelService.createModel(this.clipboardService.readText(), this.modeService.create('text/plain'), resource);
 
 		return Promise.resolve(model);
@@ -1570,12 +1570,12 @@ function getContext(listWidget: ListWidget, viewletService: IViewletService): IE
 
 // TODO@isidor these commands are calling into actions due to the complex inheritance action structure.
 // It should be the other way around, that actions call into commands.
-function openExplorerAndRunAction(accessor: ServicesAccessor, constructor: IConstructorSignature2<ITree, ExplorerItem, Action>): Thenable<any> {
+function openExplorerAndRunAction(accessor: ServicesAccessor, constructor: IConstructorSignature2<ITree, ExplorerItem, Action>): Promise<any> {
 	const instantationService = accessor.get(IInstantiationService);
 	const listService = accessor.get(IListService);
 	const viewletService = accessor.get(IViewletService);
 	const activeViewlet = viewletService.getActiveViewlet();
-	let explorerPromise: Thenable<IViewlet> = Promise.resolve(activeViewlet);
+	let explorerPromise: Promise<IViewlet> = Promise.resolve(activeViewlet);
 	if (!activeViewlet || activeViewlet.getId() !== VIEWLET_ID) {
 		explorerPromise = viewletService.openViewlet(VIEWLET_ID, true);
 	}
diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
index 2ade215a719..ce04514a299 100644
--- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
+++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
@@ -90,7 +90,7 @@ function save(
 	untitledEditorService: IUntitledEditorService,
 	textFileService: ITextFileService,
 	editorGroupService: IEditorGroupsService
-): Thenable<any> {
+): Promise<any> {
 
 	function ensureForcedSave(options?: ISaveOptions): ISaveOptions {
 		if (!options) {
@@ -124,7 +124,7 @@ function save(
 			}
 
 			// Special case: an untitled file with associated path gets saved directly unless "saveAs" is true
-			let savePromise: Thenable<URI>;
+			let savePromise: Promise<URI>;
 			if (!isSaveAs && resource.scheme === Schemas.untitled && untitledEditorService.hasAssociatedFilePath(resource)) {
 				savePromise = textFileService.save(resource, options).then((result) => {
 					if (result) {
@@ -184,7 +184,7 @@ function save(
 }
 
 function saveAll(saveAllArguments: any, editorService: IEditorService, untitledEditorService: IUntitledEditorService,
-	textFileService: ITextFileService, editorGroupService: IEditorGroupsService): Thenable<any> {
+	textFileService: ITextFileService, editorGroupService: IEditorGroupsService): Promise<any> {
 
 	// Store some properties per untitled file to restore later after save is completed
 	const groupIdToUntitledResourceInput = new Map<number, IResourceInput[]>();
diff --git a/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts b/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
index c532e9a9f54..4593b4babae 100644
--- a/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
+++ b/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
@@ -234,7 +234,7 @@ class ResolveSaveConflictAction extends Action {
 		super('workbench.files.action.resolveConflict', nls.localize('compareChanges', "Compare"));
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		if (!this.model.isDisposed()) {
 			const resource = this.model.getResource();
 			const name = paths.basename(resource.fsPath);
diff --git a/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts b/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts
index 3e748e0774f..5c116da9d30 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts
@@ -123,7 +123,7 @@ export class EmptyView extends ViewletPanel {
 		// no-op
 	}
 
-	public setVisible(visible: boolean): Thenable<void> {
+	public setVisible(visible: boolean): Promise<void> {
 		return Promise.resolve(null);
 	}
 
@@ -133,7 +133,7 @@ export class EmptyView extends ViewletPanel {
 		}
 	}
 
-	protected reveal(element: any, relativeTop?: number): Thenable<void> {
+	protected reveal(element: any, relativeTop?: number): Promise<void> {
 		return Promise.resolve(null);
 	}
 
diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
index 5a1a8d9a1a9..ce2a419ec3d 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
@@ -330,7 +330,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		if (visible) {
 
 			// If a refresh was requested and we are now visible, run it
-			let refreshPromise: Thenable<void> = Promise.resolve(null);
+			let refreshPromise: Promise<void> = Promise.resolve(null);
 			if (this.shouldRefresh) {
 				refreshPromise = this.doRefresh();
 				this.shouldRefresh = false; // Reset flag
@@ -492,7 +492,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 				// Add the new file to its parent (Model)
 				parents.forEach(p => {
 					// We have to check if the parent is resolved #29177
-					const thenable: Thenable<IFileStat> = p.isDirectoryResolved ? Promise.resolve(null) : this.fileService.resolveFile(p.resource);
+					const thenable: Promise<IFileStat> = p.isDirectoryResolved ? Promise.resolve(null) : this.fileService.resolveFile(p.resource);
 					thenable.then(stat => {
 						if (stat) {
 							const modelStat = ExplorerItem.create(stat, p.root);
@@ -732,7 +732,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 	/**
 	 * Refresh the contents of the explorer to get up to date data from the disk about the file structure.
 	 */
-	public refresh(): Thenable<void> {
+	public refresh(): Promise<void> {
 		if (!this.explorerViewer || this.explorerViewer.getHighlight()) {
 			return Promise.resolve(null);
 		}
@@ -761,7 +761,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		});
 	}
 
-	private doRefresh(targetsToExpand: URI[] = []): Thenable<any> {
+	private doRefresh(targetsToExpand: URI[] = []): Promise<any> {
 		const targetsToResolve = this.model.roots.map(root => ({ root, resource: root.resource, options: { resolveTo: [] } }));
 
 		// First time refresh: Receive target through active editor input or selection and also include settings from previous session
@@ -800,7 +800,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		return promise;
 	}
 
-	private resolveRoots(targetsToResolve: { root: ExplorerItem, resource: URI, options: { resolveTo: any[] } }[], targetsToExpand: URI[]): Thenable<any> {
+	private resolveRoots(targetsToResolve: { root: ExplorerItem, resource: URI, options: { resolveTo: any[] } }[], targetsToExpand: URI[]): Promise<any> {
 
 		// Display roots only when multi folder workspace
 		let input = this.contextService.getWorkbenchState() === WorkbenchState.FOLDER ? this.model.roots[0] : this.model;
@@ -863,7 +863,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		// There is a remote root, resolve the roots sequantally
 		let statsToExpand: ExplorerItem[] = [];
 		let delayer = new Delayer(100);
-		let delayerPromise: Thenable<any>;
+		let delayerPromise: Promise<any>;
 		return Promise.all(targetsToResolve.map((target, index) => this.fileService.resolveFile(target.resource, target.options)
 			.then(result => result.isDirectory ? ExplorerItem.create(result, target.root, target.options.resolveTo) : errorRoot(target.resource, target.root), () => errorRoot(target.resource, target.root))
 			.then(modelStat => {
@@ -919,7 +919,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 	 * Selects and reveal the file element provided by the given resource if its found in the explorer. Will try to
 	 * resolve the path from the disk in case the explorer is not yet expanded to the file yet.
 	 */
-	public select(resource: URI, reveal: boolean = this.autoReveal): Thenable<void> {
+	public select(resource: URI, reveal: boolean = this.autoReveal): Promise<void> {
 
 		// Require valid path
 		if (!resource) {
@@ -967,7 +967,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 			: undefined;
 	}
 
-	private doSelect(fileStat: ExplorerItem, reveal: boolean): Thenable<void> {
+	private doSelect(fileStat: ExplorerItem, reveal: boolean): Promise<void> {
 		if (!fileStat) {
 			return Promise.resolve(null);
 		}
@@ -982,7 +982,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		}
 
 		// Reveal depending on flag
-		let revealPromise: Thenable<void>;
+		let revealPromise: Promise<void>;
 		if (reveal) {
 			revealPromise = this.reveal(fileStat, 0.5);
 		} else {
@@ -998,7 +998,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		});
 	}
 
-	private reveal(element: any, relativeTop?: number): Thenable<void> {
+	private reveal(element: any, relativeTop?: number): Promise<void> {
 		if (!this.tree) {
 			return Promise.resolve(null); // return early if viewlet has not yet been created
 		}
diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
index d610251a59c..d7b23a0b15a 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
@@ -75,7 +75,7 @@ export class FileDataSource implements IDataSource {
 		return stat instanceof Model || (stat instanceof ExplorerItem && (stat.isDirectory || stat.isRoot));
 	}
 
-	public getChildren(tree: ITree, stat: ExplorerItem | Model): Thenable<ExplorerItem[]> {
+	public getChildren(tree: ITree, stat: ExplorerItem | Model): Promise<ExplorerItem[]> {
 		if (stat instanceof Model) {
 			return Promise.resolve(stat.roots);
 		}
@@ -120,7 +120,7 @@ export class FileDataSource implements IDataSource {
 		}
 	}
 
-	public getParent(tree: ITree, stat: ExplorerItem | Model): Thenable<ExplorerItem> {
+	public getParent(tree: ITree, stat: ExplorerItem | Model): Promise<ExplorerItem> {
 		if (!stat) {
 			return Promise.resolve(null); // can be null if nothing selected in the tree
 		}
@@ -173,7 +173,7 @@ export class ActionRunner extends BaseActionRunner implements IActionRunner {
 		this.viewletState = state;
 	}
 
-	public run(action: IAction, context?: any): Thenable<any> {
+	public run(action: IAction, context?: any): Promise<any> {
 		return super.run(action, { viewletState: this.viewletState });
 	}
 }
@@ -930,7 +930,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 		}
 	}
 
-	private handleExternalDrop(tree: ITree, data: DesktopDragAndDropData, target: ExplorerItem | Model, originalEvent: DragMouseEvent): Thenable<void> {
+	private handleExternalDrop(tree: ITree, data: DesktopDragAndDropData, target: ExplorerItem | Model, originalEvent: DragMouseEvent): Promise<void> {
 		const droppedResources = extractResources(originalEvent.browserEvent as DragEvent, true);
 
 		// Check for dropped external files to be folders
@@ -944,7 +944,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 			if (folders.length > 0) {
 
 				// If we are in no-workspace context, ask for confirmation to create a workspace
-				let confirmedPromise: Thenable<IConfirmationResult> = Promise.resolve({ confirmed: true });
+				let confirmedPromise: Promise<IConfirmationResult> = Promise.resolve({ confirmed: true });
 				if (this.contextService.getWorkbenchState() !== WorkbenchState.WORKSPACE) {
 					confirmedPromise = this.dialogService.confirm({
 						message: folders.length > 1 ? nls.localize('dropFolders', "Do you want to add the folders to the workspace?") : nls.localize('dropFolder', "Do you want to add the folder to the workspace?"),
@@ -973,11 +973,11 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 		});
 	}
 
-	private handleExplorerDrop(tree: ITree, data: IDragAndDropData, target: ExplorerItem | Model, originalEvent: DragMouseEvent): Thenable<void> {
+	private handleExplorerDrop(tree: ITree, data: IDragAndDropData, target: ExplorerItem | Model, originalEvent: DragMouseEvent): Promise<void> {
 		const sources: ExplorerItem[] = resources.distinctParents(data.getData(), s => s.resource);
 		const isCopy = (originalEvent.ctrlKey && !isMacintosh) || (originalEvent.altKey && isMacintosh);
 
-		let confirmPromise: Thenable<IConfirmationResult>;
+		let confirmPromise: Promise<IConfirmationResult>;
 
 		// Handle confirm setting
 		const confirmDragAndDrop = !isCopy && this.configurationService.getValue<boolean>(FileDragAndDrop.CONFIRM_DND_SETTING_KEY);
@@ -1000,7 +1000,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 		return confirmPromise.then(res => {
 
 			// Check for confirmation checkbox
-			let updateConfirmSettingsPromise: Thenable<void> = Promise.resolve(void 0);
+			let updateConfirmSettingsPromise: Promise<void> = Promise.resolve(void 0);
 			if (res.confirmed && res.checkboxChecked === true) {
 				updateConfirmSettingsPromise = this.configurationService.updateValue(FileDragAndDrop.CONFIRM_DND_SETTING_KEY, false, ConfigurationTarget.USER);
 			}
@@ -1016,7 +1016,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 		});
 	}
 
-	private doHandleRootDrop(roots: ExplorerItem[], target: ExplorerItem | Model): Thenable<void> {
+	private doHandleRootDrop(roots: ExplorerItem[], target: ExplorerItem | Model): Promise<void> {
 		if (roots.length === 0) {
 			return Promise.resolve(undefined);
 		}
@@ -1048,7 +1048,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 		return this.workspaceEditingService.updateFolders(0, workspaceCreationData.length, workspaceCreationData);
 	}
 
-	private doHandleExplorerDrop(tree: ITree, source: ExplorerItem, target: ExplorerItem | Model, isCopy: boolean): Thenable<void> {
+	private doHandleExplorerDrop(tree: ITree, source: ExplorerItem, target: ExplorerItem | Model, isCopy: boolean): Promise<void> {
 		if (!(target instanceof ExplorerItem)) {
 			return Promise.resolve(void 0);
 		}
diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts
index 560aeecc1bf..be1ace4d227 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts
@@ -496,7 +496,7 @@ interface IEditorGroupTemplateData {
 class OpenEditorActionRunner extends ActionRunner {
 	public editor: OpenEditor;
 
-	run(action: IAction, context?: any): Thenable<void> {
+	run(action: IAction, context?: any): Promise<void> {
 		return super.run(action, { groupId: this.editor.groupId, editorIndex: this.editor.editorIndex });
 	}
 }
diff --git a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
index beb5093cc3e..1c33d07ae78 100644
--- a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
+++ b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
@@ -181,7 +181,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 		this.webview.sendMessage(data);
 	}
 
-	public setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	public setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Promise<void> {
 
 		if (this.input && this.input.matches(input) && this._hasValidModel() && this.input instanceof HtmlInput && input instanceof HtmlInput && areHtmlInputOptionsEqual(this.input.options, input.options)) {
 			return Promise.resolve(undefined);
diff --git a/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts b/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
index b2aa7b366dc..ee89a7d8f50 100644
--- a/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
+++ b/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
@@ -215,7 +215,7 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
 			.then(installed => installed.some(i => i.manifest && i.manifest.contributes && i.manifest.contributes.localizations && i.manifest.contributes.localizations.length && i.manifest.contributes.localizations.some(l => l.languageId.toLowerCase() === language)));
 	}
 
-	private installExtension(extension: IGalleryExtension): Thenable<void> {
+	private installExtension(extension: IGalleryExtension): Promise<void> {
 		return this.viewletService.openViewlet(EXTENSIONS_VIEWLET_ID)
 			.then(viewlet => viewlet as IExtensionsViewlet)
 			.then(viewlet => viewlet.search(`@id:${extension.identifier.id}`))
diff --git a/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts b/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts
index 2f3bad9d854..314887009ba 100644
--- a/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts
+++ b/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts
@@ -36,11 +36,11 @@ export class ConfigureLocaleAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): Thenable<IEditor | undefined> {
+	public run(event?: any): Promise<IEditor | undefined> {
 		const file = URI.file(join(this.environmentService.appSettingsHome, 'locale.json'));
 		return this.fileService.resolveFile(file).then(void 0, (error) => {
 			return this.fileService.createFile(file, ConfigureLocaleAction.DEFAULT_CONTENT);
-		}).then((stat): Thenable<IEditor | undefined> | undefined => {
+		}).then((stat): Promise<IEditor | undefined> | undefined => {
 			if (!stat) {
 				return undefined;
 			}
diff --git a/src/vs/workbench/parts/logs/electron-browser/logsActions.ts b/src/vs/workbench/parts/logs/electron-browser/logsActions.ts
index df65f541076..9b44b0f3fe3 100644
--- a/src/vs/workbench/parts/logs/electron-browser/logsActions.ts
+++ b/src/vs/workbench/parts/logs/electron-browser/logsActions.ts
@@ -23,7 +23,7 @@ export class OpenLogsFolderAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.windowsService.showItemInFolder(paths.join(this.environmentService.logsPath, 'main.log'));
 	}
 }
@@ -40,7 +40,7 @@ export class SetLogLevelAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		const current = this.logService.getLevel();
 		const entries = [
 			{ label: nls.localize('trace', "Trace"), level: LogLevel.Trace, description: this.getDescription(LogLevel.Trace, current) },
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts b/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts
index 6e563394db2..e3346332b22 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts
@@ -68,7 +68,7 @@ export class ShowProblemsPanelAction extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		this.panelService.openPanel(Constants.MARKERS_PANEL_ID, true);
 		return Promise.resolve(null);
 	}
@@ -346,7 +346,7 @@ export class QuickFixAction extends Action {
 			}));
 	}
 
-	public openFileAtMarker(element: Marker): Thenable<void> {
+	public openFileAtMarker(element: Marker): Promise<void> {
 		const { resource, selection } = { resource: element.resource, selection: element.range };
 		return this.editorService.openEditor({
 			resource,
diff --git a/src/vs/workbench/parts/output/browser/outputActions.ts b/src/vs/workbench/parts/output/browser/outputActions.ts
index d631ab4ad7a..944d07638a2 100644
--- a/src/vs/workbench/parts/output/browser/outputActions.ts
+++ b/src/vs/workbench/parts/output/browser/outputActions.ts
@@ -104,7 +104,7 @@ export class SwitchOutputAction extends Action {
 		this.class = 'output-action switch-to-output';
 	}
 
-	public run(channelId?: string): Thenable<any> {
+	public run(channelId?: string): Promise<any> {
 		return this.outputService.showChannel(channelId);
 	}
 }
@@ -187,7 +187,7 @@ export class OpenLogOutputFile extends Action {
 		this.enabled = outputChannelDescriptor && outputChannelDescriptor.file && outputChannelDescriptor.log;
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		return this.enabled ? this.editorService.openEditor(this.instantiationService.createInstance(LogViewerInput, this.getOutputChannelDescriptor())).then(() => null) : Promise.resolve(null);
 	}
 
@@ -209,7 +209,7 @@ export class ShowLogsOutputChannelAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		const entries: IQuickPickItem[] = this.outputService.getChannelDescriptors().filter(c => c.file && c.log)
 			.map(({ id, label }) => (<IQuickPickItem>{ id, label }));
 
@@ -241,7 +241,7 @@ export class OpenOutputLogFileAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		const entries: IOutputChannelQuickPickItem[] = this.outputService.getChannelDescriptors().filter(c => c.file && c.log)
 			.map(channel => (<IOutputChannelQuickPickItem>{ id: channel.id, label: channel.label, channel }));
 
diff --git a/src/vs/workbench/parts/output/browser/outputPanel.ts b/src/vs/workbench/parts/output/browser/outputPanel.ts
index d6eabdfeb84..d72b6a8e4f9 100644
--- a/src/vs/workbench/parts/output/browser/outputPanel.ts
+++ b/src/vs/workbench/parts/output/browser/outputPanel.ts
@@ -112,7 +112,7 @@ export class OutputPanel extends AbstractTextResourceEditor {
 		return channel ? nls.localize('outputPanelWithInputAriaLabel', "{0}, Output panel", channel.label) : nls.localize('outputPanelAriaLabel', "Output panel");
 	}
 
-	public setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	public setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Promise<void> {
 		this._focus = !options.preserveFocus;
 		if (input.matches(this.input)) {
 			return Promise.resolve(null);
diff --git a/src/vs/workbench/parts/output/common/output.ts b/src/vs/workbench/parts/output/common/output.ts
index 61c29285bb9..61aaa78e5ff 100644
--- a/src/vs/workbench/parts/output/common/output.ts
+++ b/src/vs/workbench/parts/output/common/output.ts
@@ -84,7 +84,7 @@ export interface IOutputService {
 	/**
 	 * Show the channel with the passed id.
 	 */
-	showChannel(id: string, preserveFocus?: boolean): Thenable<void>;
+	showChannel(id: string, preserveFocus?: boolean): Promise<void>;
 
 	/**
 	 * Allows to register on active output channel change.
diff --git a/src/vs/workbench/parts/output/common/outputLinkProvider.ts b/src/vs/workbench/parts/output/common/outputLinkProvider.ts
index 63437034c96..d739924dda7 100644
--- a/src/vs/workbench/parts/output/common/outputLinkProvider.ts
+++ b/src/vs/workbench/parts/output/common/outputLinkProvider.ts
@@ -42,7 +42,7 @@ export class OutputLinkProvider {
 		if (folders.length > 0) {
 			if (!this.linkProviderRegistration) {
 				this.linkProviderRegistration = LinkProviderRegistry.register([{ language: OUTPUT_MODE_ID, scheme: '*' }, { language: LOG_MODE_ID, scheme: '*' }], {
-					provideLinks: (model, token): Thenable<ILink[]> => {
+					provideLinks: (model, token): Promise<ILink[]> => {
 						return this.provideLinks(model.uri);
 					}
 				});
diff --git a/src/vs/workbench/parts/output/electron-browser/outputServices.ts b/src/vs/workbench/parts/output/electron-browser/outputServices.ts
index e6ef18b8fa7..58ebefeac15 100644
--- a/src/vs/workbench/parts/output/electron-browser/outputServices.ts
+++ b/src/vs/workbench/parts/output/electron-browser/outputServices.ts
@@ -69,7 +69,7 @@ interface OutputChannel extends IOutputChannel {
 	readonly file: URI;
 	readonly onDidAppendedContent: Event<void>;
 	readonly onDispose: Event<void>;
-	loadModel(): Thenable<ITextModel>;
+	loadModel(): Promise<ITextModel>;
 }
 
 abstract class AbstractFileOutputChannel extends Disposable implements OutputChannel {
@@ -151,7 +151,7 @@ abstract class AbstractFileOutputChannel extends Disposable implements OutputCha
 		}
 	}
 
-	abstract loadModel(): Thenable<ITextModel>;
+	abstract loadModel(): Promise<ITextModel>;
 	abstract append(message: string);
 
 	protected onModelCreated(model: ITextModel) { }
@@ -216,7 +216,7 @@ class OutputChannelBackedByFile extends AbstractFileOutputChannel implements Out
 		this.appendedMessage = '';
 	}
 
-	loadModel(): Thenable<ITextModel> {
+	loadModel(): Promise<ITextModel> {
 		this.loadingFromFileInProgress = true;
 		if (this.modelUpdater.isScheduled()) {
 			this.modelUpdater.cancel();
@@ -242,7 +242,7 @@ class OutputChannelBackedByFile extends AbstractFileOutputChannel implements Out
 			});
 	}
 
-	private resetModel(): Thenable<void> {
+	private resetModel(): Promise<void> {
 		this.startOffset = 0;
 		this.endOffset = 0;
 		if (this.model) {
@@ -251,7 +251,7 @@ class OutputChannelBackedByFile extends AbstractFileOutputChannel implements Out
 		return Promise.resolve(null);
 	}
 
-	private loadFile(): Thenable<string> {
+	private loadFile(): Promise<string> {
 		return this.fileService.resolveContent(this.file, { position: this.startOffset, encoding: 'utf8' })
 			.then(content => this.appendedMessage ? content.value + this.appendedMessage : content.value);
 	}
@@ -309,7 +309,7 @@ class OutputFileListener extends Disposable {
 		this.syncDelayer.trigger(loop);
 	}
 
-	private doWatch(): Thenable<void> {
+	private doWatch(): Promise<void> {
 		return this.fileService.resolveFile(this.file)
 			.then(stat => {
 				if (stat.etag !== this.etag) {
@@ -341,7 +341,7 @@ class FileOutputChannel extends AbstractFileOutputChannel implements OutputChann
 
 	private updateInProgress: boolean = false;
 	private etag: string = '';
-	private loadModelPromise: Thenable<ITextModel> = Promise.resolve();
+	private loadModelPromise: Promise<ITextModel> = Promise.resolve();
 
 	constructor(
 		outputChannelDescriptor: IOutputChannelDescriptor,
@@ -357,7 +357,7 @@ class FileOutputChannel extends AbstractFileOutputChannel implements OutputChann
 		this._register(toDisposable(() => this.fileHandler.unwatch()));
 	}
 
-	loadModel(): Thenable<ITextModel> {
+	loadModel(): Promise<ITextModel> {
 		this.loadModelPromise = this.fileService.resolveContent(this.file, { position: this.startOffset, encoding: 'utf8' })
 			.then(content => {
 				this.endOffset = this.startOffset + Buffer.from(content.value).byteLength;
@@ -473,7 +473,7 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		this._register(this.storageService.onWillSaveState(() => this.saveState()));
 	}
 
-	provideTextContent(resource: URI): Thenable<ITextModel> {
+	provideTextContent(resource: URI): Promise<ITextModel> {
 		const channel = <OutputChannel>this.getChannel(resource.path);
 		if (channel) {
 			return channel.loadModel();
@@ -481,7 +481,7 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		return null;
 	}
 
-	showChannel(id: string, preserveFocus?: boolean): Thenable<void> {
+	showChannel(id: string, preserveFocus?: boolean): Promise<void> {
 		const channel = this.getChannel(id);
 		if (!channel || this.isChannelShown(channel)) {
 			if (this._outputPanel && !preserveFocus) {
@@ -491,7 +491,7 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		}
 
 		this.activeChannel = channel;
-		let promise: Thenable<void>;
+		let promise: Promise<void>;
 		if (this.isPanelShown()) {
 			promise = this.doShowChannel(channel, preserveFocus);
 		} else {
@@ -523,7 +523,7 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		}
 	}
 
-	private onDidPanelOpen(panel: IPanel, preserveFocus: boolean): Thenable<void> {
+	private onDidPanelOpen(panel: IPanel, preserveFocus: boolean): Promise<void> {
 		if (panel && panel.getId() === OUTPUT_PANEL_ID) {
 			this._outputPanel = <OutputPanel>this.panelService.getActivePanel();
 			if (this.activeChannel) {
@@ -604,7 +604,7 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		}
 	}
 
-	private doShowChannel(channel: IOutputChannel, preserveFocus: boolean): Thenable<void> {
+	private doShowChannel(channel: IOutputChannel, preserveFocus: boolean): Promise<void> {
 		if (this._outputPanel) {
 			CONTEXT_ACTIVE_LOG_OUTPUT.bindTo(this.contextKeyService).set(channel instanceof FileOutputChannel && channel.outputChannelDescriptor.log);
 			return this._outputPanel.setInput(this.createInput(channel), EditorOptions.create({ preserveFocus }), CancellationToken.None)
@@ -650,7 +650,7 @@ export class LogContentProvider {
 	) {
 	}
 
-	provideTextContent(resource: URI): Thenable<ITextModel> {
+	provideTextContent(resource: URI): Promise<ITextModel> {
 		if (resource.scheme === LOG_SCHEME) {
 			let channel = this.getChannel(resource);
 			if (channel) {
@@ -731,7 +731,7 @@ class BufferredOutputChannel extends Disposable implements OutputChannel {
 		this.lastReadId = void 0;
 	}
 
-	loadModel(): Thenable<ITextModel> {
+	loadModel(): Promise<ITextModel> {
 		const { value, id } = this.bufferredContent.getDelta(this.lastReadId);
 		if (this.model) {
 			this.model.setValue(value);
diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
index 3f4870b68d0..3d0355e0e9f 100644
--- a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
@@ -117,7 +117,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 		this._register(focusTracker.onDidBlur(() => this.keybindingsEditorContextKey.reset()));
 	}
 
-	setInput(input: KeybindingsEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: KeybindingsEditorInput, options: EditorOptions, token: CancellationToken): Promise<void> {
 		return super.setInput(input, options, token)
 			.then(() => this.render(options && options.preserveFocus, token));
 	}
@@ -153,7 +153,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 		return focusedElement && focusedElement.templateId === KEYBINDING_ENTRY_TEMPLATE_ID ? <IKeybindingItemEntry>focusedElement : null;
 	}
 
-	defineKeybinding(keybindingEntry: IKeybindingItemEntry): Thenable<any> {
+	defineKeybinding(keybindingEntry: IKeybindingItemEntry): Promise<any> {
 		this.selectEntry(keybindingEntry);
 		this.showOverlayContainer();
 		return this.defineKeybindingWidget.define().then(key => {
@@ -181,7 +181,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 		});
 	}
 
-	removeKeybinding(keybindingEntry: IKeybindingItemEntry): Thenable<any> {
+	removeKeybinding(keybindingEntry: IKeybindingItemEntry): Promise<any> {
 		this.selectEntry(keybindingEntry);
 		if (keybindingEntry.keybindingItem.keybinding) { // This should be a pre-condition
 			this.reportKeybindingAction(KEYBINDINGS_EDITOR_COMMAND_REMOVE, keybindingEntry.keybindingItem.command, keybindingEntry.keybindingItem.keybinding);
@@ -195,7 +195,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 		return Promise.resolve(null);
 	}
 
-	resetKeybinding(keybindingEntry: IKeybindingItemEntry): Thenable<any> {
+	resetKeybinding(keybindingEntry: IKeybindingItemEntry): Promise<any> {
 		this.selectEntry(keybindingEntry);
 		this.reportKeybindingAction(KEYBINDINGS_EDITOR_COMMAND_RESET, keybindingEntry.keybindingItem.command, keybindingEntry.keybindingItem.keybinding);
 		return this.keybindingEditingService.resetKeybinding(keybindingEntry.keybindingItem.keybindingItem)
@@ -421,7 +421,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 		}));
 	}
 
-	private render(preserveFocus: boolean, token: CancellationToken): Thenable<any> {
+	private render(preserveFocus: boolean, token: CancellationToken): Promise<any> {
 		if (this.input) {
 			return this.input.resolve()
 				.then((keybindingsModel: KeybindingsEditorModel) => {
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesActions.ts b/src/vs/workbench/parts/preferences/browser/preferencesActions.ts
index 2ecd5904b80..8a701cbd15e 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesActions.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesActions.ts
@@ -29,7 +29,7 @@ export class OpenRawDefaultSettingsAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): Thenable<any> {
+	public run(event?: any): Promise<any> {
 		return this.preferencesService.openRawDefaultSettings();
 	}
 }
@@ -47,7 +47,7 @@ export class OpenSettings2Action extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): Thenable<any> {
+	public run(event?: any): Promise<any> {
 		return this.preferencesService.openSettings(false);
 	}
 }
@@ -65,7 +65,7 @@ export class OpenSettingsAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): Thenable<any> {
+	public run(event?: any): Promise<any> {
 		return this.preferencesService.openSettings();
 	}
 }
@@ -83,7 +83,7 @@ export class OpenSettingsJsonAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): Thenable<any> {
+	public run(event?: any): Promise<any> {
 		return this.preferencesService.openSettings(true);
 	}
 }
@@ -101,7 +101,7 @@ export class OpenGlobalSettingsAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): Thenable<any> {
+	public run(event?: any): Promise<any> {
 		return this.preferencesService.openGlobalSettings();
 	}
 }
@@ -119,7 +119,7 @@ export class OpenGlobalKeybindingsAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): Thenable<any> {
+	public run(event?: any): Promise<any> {
 		return this.preferencesService.openGlobalKeybindingSettings(false);
 	}
 }
@@ -137,7 +137,7 @@ export class OpenGlobalKeybindingsFileAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): Thenable<any> {
+	public run(event?: any): Promise<any> {
 		return this.preferencesService.openGlobalKeybindingSettings(true);
 	}
 }
@@ -155,7 +155,7 @@ export class OpenDefaultKeybindingsFileAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): Thenable<any> {
+	public run(event?: any): Promise<any> {
 		return this.preferencesService.openDefaultKeybindingsFile();
 	}
 }
@@ -182,7 +182,7 @@ export class OpenWorkspaceSettingsAction extends Action {
 		this.enabled = this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY;
 	}
 
-	public run(event?: any): Thenable<any> {
+	public run(event?: any): Promise<any> {
 		return this.preferencesService.openWorkspaceSettings();
 	}
 
@@ -219,7 +219,7 @@ export class OpenFolderSettingsAction extends Action {
 		this.enabled = this.workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE && this.workspaceContextService.getWorkspace().folders.length > 0;
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		return this.commandService.executeCommand<IWorkspaceFolder>(PICK_WORKSPACE_FOLDER_COMMAND_ID)
 			.then(workspaceFolder => {
 				if (workspaceFolder) {
@@ -252,7 +252,7 @@ export class ConfigureLanguageBasedSettingsAction extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		const languages = this.modeService.getRegisteredLanguageNames();
 		const picks: IQuickPickItem[] = languages.sort().map((lang, index) => {
 			let description: string = nls.localize('languageDescriptionConfigured', "({0})", this.modeService.getModeIdForLanguageName(lang.toLowerCase()));
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index c5db416d90c..f6bdf64b687 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -154,7 +154,7 @@ export class PreferencesEditor extends BaseEditor {
 		this.preferencesRenderers.editFocusedPreference();
 	}
 
-	public setInput(newInput: PreferencesEditorInput, options: SettingsEditorOptions, token: CancellationToken): Thenable<void> {
+	public setInput(newInput: PreferencesEditorInput, options: SettingsEditorOptions, token: CancellationToken): Promise<void> {
 		this.defaultSettingsEditorContextKey.set(true);
 		this.defaultSettingsJSONEditorContextKey.set(true);
 		if (options && options.query) {
@@ -254,7 +254,7 @@ export class PreferencesEditor extends BaseEditor {
 		if (this.editorService.activeControl !== this) {
 			this.focus();
 		}
-		const promise: Thenable<boolean> = this.input && this.input.isDirty() ? this.input.save() : Promise.resolve(true);
+		const promise: Promise<boolean> = this.input && this.input.isDirty() ? this.input.save() : Promise.resolve(true);
 		promise.then(() => {
 			if (target === ConfigurationTarget.USER) {
 				this.preferencesService.switchSettings(ConfigurationTarget.USER, this.preferencesService.userSettingsResource, true);
@@ -933,7 +933,7 @@ class SideBySidePreferencesWidget extends Widget {
 		return editor;
 	}
 
-	private updateInput(editor: BaseEditor, input: EditorInput, editorContributionId: string, associatedPreferencesModelUri: URI, options: EditorOptions, token: CancellationToken): Thenable<IPreferencesRenderer<ISetting>> {
+	private updateInput(editor: BaseEditor, input: EditorInput, editorContributionId: string, associatedPreferencesModelUri: URI, options: EditorOptions, token: CancellationToken): Promise<IPreferencesRenderer<ISetting>> {
 		return editor.setInput(input, options, token)
 			.then(() => {
 				if (token.isCancellationRequested) {
@@ -1041,7 +1041,7 @@ export class DefaultPreferencesEditor extends BaseTextEditor {
 		return options;
 	}
 
-	setInput(input: DefaultPreferencesEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: DefaultPreferencesEditorInput, options: EditorOptions, token: CancellationToken): Promise<void> {
 		return super.setInput(input, options, token)
 			.then(() => this.input.resolve()
 				.then(editorModel => {
@@ -1079,13 +1079,13 @@ export class DefaultPreferencesEditor extends BaseTextEditor {
 
 interface ISettingsEditorContribution extends editorCommon.IEditorContribution {
 
-	updatePreferencesRenderer(associatedPreferencesModelUri: URI): Thenable<IPreferencesRenderer<ISetting>>;
+	updatePreferencesRenderer(associatedPreferencesModelUri: URI): Promise<IPreferencesRenderer<ISetting>>;
 
 }
 
 abstract class AbstractSettingsEditorContribution extends Disposable implements ISettingsEditorContribution {
 
-	private preferencesRendererCreationPromise: Thenable<IPreferencesRenderer<ISetting>>;
+	private preferencesRendererCreationPromise: Promise<IPreferencesRenderer<ISetting>>;
 
 	constructor(protected editor: ICodeEditor,
 		@IInstantiationService protected instantiationService: IInstantiationService,
@@ -1096,7 +1096,7 @@ abstract class AbstractSettingsEditorContribution extends Disposable implements
 		this._register(this.editor.onDidChangeModel(() => this._onModelChanged()));
 	}
 
-	updatePreferencesRenderer(associatedPreferencesModelUri: URI): Thenable<IPreferencesRenderer<ISetting>> {
+	updatePreferencesRenderer(associatedPreferencesModelUri: URI): Promise<IPreferencesRenderer<ISetting>> {
 		if (!this.preferencesRendererCreationPromise) {
 			this.preferencesRendererCreationPromise = this._createPreferencesRenderer();
 		}
@@ -1117,13 +1117,13 @@ abstract class AbstractSettingsEditorContribution extends Disposable implements
 		}
 	}
 
-	private _hasAssociatedPreferencesModelChanged(associatedPreferencesModelUri: URI): Thenable<boolean> {
+	private _hasAssociatedPreferencesModelChanged(associatedPreferencesModelUri: URI): Promise<boolean> {
 		return this.preferencesRendererCreationPromise.then(preferencesRenderer => {
 			return !(preferencesRenderer && preferencesRenderer.getAssociatedPreferencesModel() && preferencesRenderer.getAssociatedPreferencesModel().uri.toString() === associatedPreferencesModelUri.toString());
 		});
 	}
 
-	private _updatePreferencesRenderer(associatedPreferencesModelUri: URI): Thenable<IPreferencesRenderer<ISetting>> {
+	private _updatePreferencesRenderer(associatedPreferencesModelUri: URI): Promise<IPreferencesRenderer<ISetting>> {
 		return this.preferencesService.createPreferencesEditorModel<ISetting>(associatedPreferencesModelUri)
 			.then(associatedPreferencesEditorModel => {
 				return this.preferencesRendererCreationPromise.then(preferencesRenderer => {
@@ -1160,7 +1160,7 @@ abstract class AbstractSettingsEditorContribution extends Disposable implements
 		super.dispose();
 	}
 
-	protected abstract _createPreferencesRenderer(): Thenable<IPreferencesRenderer<ISetting>>;
+	protected abstract _createPreferencesRenderer(): Promise<IPreferencesRenderer<ISetting>>;
 	abstract getId(): string;
 }
 
@@ -1172,7 +1172,7 @@ class DefaultSettingsEditorContribution extends AbstractSettingsEditorContributi
 		return DefaultSettingsEditorContribution.ID;
 	}
 
-	protected _createPreferencesRenderer(): Thenable<IPreferencesRenderer<ISetting>> {
+	protected _createPreferencesRenderer(): Promise<IPreferencesRenderer<ISetting>> {
 		return this.preferencesService.createPreferencesEditorModel(this.editor.getModel().uri)
 			.then(editorModel => {
 				if (editorModel instanceof DefaultSettingsEditorModel && this.editor.getModel()) {
@@ -1202,7 +1202,7 @@ class SettingsEditorContribution extends AbstractSettingsEditorContribution impl
 		return SettingsEditorContribution.ID;
 	}
 
-	protected _createPreferencesRenderer(): Thenable<IPreferencesRenderer<ISetting>> {
+	protected _createPreferencesRenderer(): Promise<IPreferencesRenderer<ISetting>> {
 		if (this.isSettingsModel()) {
 			return this.preferencesService.createPreferencesEditorModel(this.editor.getModel().uri)
 				.then(settingsModel => {
diff --git a/src/vs/workbench/parts/preferences/browser/settingsTree.ts b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
index 81521566da0..332430e794b 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
@@ -240,7 +240,7 @@ export class SimplePagedDataSource implements IDataSource {
 		return this.realDataSource.hasChildren(tree, element);
 	}
 
-	getChildren(tree: ITree, element: SettingsTreeGroupElement): Thenable<any> {
+	getChildren(tree: ITree, element: SettingsTreeGroupElement): Promise<any> {
 		return this.realDataSource.getChildren(tree, element).then(realChildren => {
 			return this._getChildren(realChildren);
 		});
@@ -257,7 +257,7 @@ export class SimplePagedDataSource implements IDataSource {
 		}
 	}
 
-	getParent(tree: ITree, element: any): Thenable<any> {
+	getParent(tree: ITree, element: any): Promise<any> {
 		return this.realDataSource.getParent(tree, element);
 	}
 
diff --git a/src/vs/workbench/parts/preferences/common/preferences.ts b/src/vs/workbench/parts/preferences/common/preferences.ts
index ac13278f91d..62679978745 100644
--- a/src/vs/workbench/parts/preferences/common/preferences.ts
+++ b/src/vs/workbench/parts/preferences/common/preferences.ts
@@ -53,9 +53,9 @@ export interface IKeybindingsEditor extends IEditor {
 	focusKeybindings(): void;
 	recordSearchKeys(): void;
 	toggleSortByPrecedence(): void;
-	defineKeybinding(keybindingEntry: IKeybindingItemEntry): Thenable<any>;
-	removeKeybinding(keybindingEntry: IKeybindingItemEntry): Thenable<any>;
-	resetKeybinding(keybindingEntry: IKeybindingItemEntry): Thenable<any>;
+	defineKeybinding(keybindingEntry: IKeybindingItemEntry): Promise<any>;
+	removeKeybinding(keybindingEntry: IKeybindingItemEntry): Promise<any>;
+	resetKeybinding(keybindingEntry: IKeybindingItemEntry): Promise<any>;
 	copyKeybinding(keybindingEntry: IKeybindingItemEntry): void;
 	copyKeybindingCommand(keybindingEntry: IKeybindingItemEntry): void;
 	showSimilarKeybindings(keybindingEntry: IKeybindingItemEntry): void;
diff --git a/src/vs/workbench/parts/preferences/common/preferencesContribution.ts b/src/vs/workbench/parts/preferences/common/preferencesContribution.ts
index db60615b96d..a12076a5e20 100644
--- a/src/vs/workbench/parts/preferences/common/preferencesContribution.ts
+++ b/src/vs/workbench/parts/preferences/common/preferencesContribution.ts
@@ -32,7 +32,7 @@ export class PreferencesContribution implements IWorkbenchContribution {
 	private start(): void {
 
 		this.textModelResolverService.registerTextModelContentProvider('vscode', {
-			provideTextContent: (uri: URI): Thenable<ITextModel> => {
+			provideTextContent: (uri: URI): Promise<ITextModel> => {
 				if (uri.scheme !== 'vscode') {
 					return null;
 				}
diff --git a/src/vs/workbench/parts/preferences/electron-browser/settingsEditor2.ts b/src/vs/workbench/parts/preferences/electron-browser/settingsEditor2.ts
index 4d0b96c462c..b7386555b75 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/settingsEditor2.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/settingsEditor2.ts
@@ -190,7 +190,7 @@ export class SettingsEditor2 extends BaseEditor {
 		this.updateStyles();
 	}
 
-	setInput(input: SettingsEditor2Input, options: SettingsEditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: SettingsEditor2Input, options: SettingsEditorOptions, token: CancellationToken): Promise<void> {
 		this.inSettingsEditorContextKey.set(true);
 		return super.setInput(input, options, token)
 			.then(() => new Promise(process.nextTick)) // Force setInput to be async
@@ -444,12 +444,12 @@ export class SettingsEditor2 extends BaseEditor {
 		}
 	}
 
-	public switchToSettingsFile(): Thenable<IEditor> {
+	public switchToSettingsFile(): Promise<IEditor> {
 		const query = parseQuery(this.searchWidget.getValue());
 		return this.openSettingsFile(query.query);
 	}
 
-	private openSettingsFile(query?: string): Thenable<IEditor> {
+	private openSettingsFile(query?: string): Promise<IEditor> {
 		const currentSettingsTarget = this.settingsTargetsWidget.settingsTarget;
 
 		const options: ISettingsEditorOptions = { query };
@@ -570,7 +570,7 @@ export class SettingsEditor2 extends BaseEditor {
 			}
 
 			if (element && (!e.payload || !e.payload.fromScroll)) {
-				let refreshP: Thenable<void> = Promise.resolve(null);
+				let refreshP: Promise<void> = Promise.resolve(null);
 				if (this.settingsTreeDataSource.pageTo(element.index, true)) {
 					refreshP = this.renderTree();
 				}
@@ -702,7 +702,7 @@ export class SettingsEditor2 extends BaseEditor {
 		}
 	}
 
-	private updateChangedSetting(key: string, value: any): Thenable<void> {
+	private updateChangedSetting(key: string, value: any): Promise<void> {
 		// ConfigurationService displays the error if this fails.
 		// Force a render afterwards because onDidConfigurationUpdate doesn't fire if the update doesn't result in an effective setting value change
 		const settingsTarget = this.settingsTargetsWidget.settingsTarget;
@@ -793,7 +793,7 @@ export class SettingsEditor2 extends BaseEditor {
 		this.telemetryService.publicLog('settingsEditor.settingModified', data);
 	}
 
-	private render(token: CancellationToken): Thenable<any> {
+	private render(token: CancellationToken): Promise<any> {
 		if (this.input) {
 			return this.input.resolve()
 				.then((model: Settings2EditorModel) => {
@@ -841,7 +841,7 @@ export class SettingsEditor2 extends BaseEditor {
 		});
 	}
 
-	private onConfigUpdate(keys?: string[], forceRefresh = false): Thenable<void> {
+	private onConfigUpdate(keys?: string[], forceRefresh = false): Promise<void> {
 		if (keys && this.settingsTreeModel) {
 			return this.updateElementsByKey(keys);
 		}
@@ -897,7 +897,7 @@ export class SettingsEditor2 extends BaseEditor {
 		return Promise.resolve(null);
 	}
 
-	private updateElementsByKey(keys: string[]): Thenable<void> {
+	private updateElementsByKey(keys: string[]): Promise<void> {
 		if (keys.length) {
 			if (this.searchResultModel) {
 				keys.forEach(key => this.searchResultModel.updateElementsByName(key));
@@ -921,7 +921,7 @@ export class SettingsEditor2 extends BaseEditor {
 			null;
 	}
 
-	private renderTree(key?: string, force = false): Thenable<void> {
+	private renderTree(key?: string, force = false): Promise<void> {
 		if (!force && key && this.scheduledRefreshes.has(key)) {
 			this.updateModifiedLabelForKey(key);
 			return Promise.resolve(null);
@@ -946,7 +946,7 @@ export class SettingsEditor2 extends BaseEditor {
 			}
 		}
 
-		let refreshP: Thenable<any>;
+		let refreshP: Promise<any>;
 		if (key) {
 			const elements = this.currentSettingsModel.getElementsByName(key);
 			if (elements && elements.length) {
@@ -991,7 +991,7 @@ export class SettingsEditor2 extends BaseEditor {
 		return match && match[1];
 	}
 
-	private triggerSearch(query: string): Thenable<void> {
+	private triggerSearch(query: string): Promise<void> {
 		this.viewState.tagFilters = new Set<string>();
 		if (query) {
 			const parsedQuery = parseQuery(query);
@@ -1098,7 +1098,7 @@ export class SettingsEditor2 extends BaseEditor {
 		this.telemetryService.publicLog('settingsEditor.filter', data);
 	}
 
-	private triggerFilterPreferences(query: string): Thenable<void> {
+	private triggerFilterPreferences(query: string): Promise<void> {
 		if (this.searchInProgress) {
 			this.searchInProgress.cancel();
 			this.searchInProgress = null;
@@ -1123,12 +1123,12 @@ export class SettingsEditor2 extends BaseEditor {
 		});
 	}
 
-	private localFilterPreferences(query: string, token?: CancellationToken): Thenable<ISearchResult> {
+	private localFilterPreferences(query: string, token?: CancellationToken): Promise<ISearchResult> {
 		const localSearchProvider = this.preferencesSearchService.getLocalSearchProvider(query);
 		return this.filterOrSearchPreferences(query, SearchResultIdx.Local, localSearchProvider, token);
 	}
 
-	private remoteSearchPreferences(query: string, token?: CancellationToken): Thenable<void> {
+	private remoteSearchPreferences(query: string, token?: CancellationToken): Promise<void> {
 		const remoteSearchProvider = this.preferencesSearchService.getRemoteSearchProvider(query);
 		const newExtSearchProvider = this.preferencesSearchService.getRemoteSearchProvider(query, true);
 
@@ -1140,7 +1140,7 @@ export class SettingsEditor2 extends BaseEditor {
 		});
 	}
 
-	private filterOrSearchPreferences(query: string, type: SearchResultIdx, searchProvider: ISearchProvider, token?: CancellationToken): Thenable<ISearchResult> {
+	private filterOrSearchPreferences(query: string, type: SearchResultIdx, searchProvider: ISearchProvider, token?: CancellationToken): Promise<ISearchResult> {
 		return this._filterOrSearchPreferencesModel(query, this.defaultSettingsEditorModel, searchProvider, token).then(result => {
 			if (token && token.isCancellationRequested) {
 				// Handle cancellation like this because cancellation is lost inside the search provider due to async/await
@@ -1187,7 +1187,7 @@ export class SettingsEditor2 extends BaseEditor {
 		}
 	}
 
-	private _filterOrSearchPreferencesModel(filter: string, model: ISettingsEditorModel, provider: ISearchProvider, token?: CancellationToken): Thenable<ISearchResult> {
+	private _filterOrSearchPreferencesModel(filter: string, model: ISettingsEditorModel, provider: ISearchProvider, token?: CancellationToken): Promise<ISearchResult> {
 		const searchP = provider ? provider.searchModel(model, token) : Promise.resolve(null);
 		return searchP
 			.then<ISearchResult>(null, err => {
diff --git a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
index cc61c82c537..934df855438 100644
--- a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
@@ -144,7 +144,7 @@ export class ShowAllCommandsAction extends Action {
 		super(id, label);
 	}
 
-	run(context?: any): Thenable<void> {
+	run(context?: any): Promise<void> {
 		const config = <IWorkbenchQuickOpenConfiguration>this.configurationService.getValue();
 		const restoreInput = config.workbench && config.workbench.commandPalette && config.workbench.commandPalette.preserveInput === true;
 
@@ -173,7 +173,7 @@ export class ClearCommandHistoryAction extends Action {
 		super(id, label);
 	}
 
-	run(context?: any): Thenable<void> {
+	run(context?: any): Promise<void> {
 		const commandHistoryLength = resolveCommandHistory(this.configurationService);
 		if (commandHistoryLength > 0) {
 			commandHistory = new LRUCache<string, number>(commandHistoryLength);
@@ -199,7 +199,7 @@ class CommandPaletteEditorAction extends EditorAction {
 		});
 	}
 
-	run(accessor: ServicesAccessor, editor: ICodeEditor): Thenable<void> {
+	run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
 		const quickOpenService = accessor.get(IQuickOpenService);
 
 		// Show with prefix
@@ -397,7 +397,7 @@ export class CommandsHandler extends QuickOpenHandler {
 		this.commandHistoryEnabled = resolveCommandHistory(this.configurationService) > 0;
 	}
 
-	getResults(searchValue: string, token: CancellationToken): Thenable<QuickOpenModel> {
+	getResults(searchValue: string, token: CancellationToken): Promise<QuickOpenModel> {
 
 		// wait for extensions being registered to cover all commands
 		// also from extensions
diff --git a/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts
index 2fc292ebe31..8a863e05d1c 100644
--- a/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts
@@ -216,7 +216,7 @@ export class GotoLineHandler extends QuickOpenHandler {
 		return nls.localize('gotoLineHandlerAriaLabel', "Type a line number to navigate to.");
 	}
 
-	getResults(searchValue: string, token: CancellationToken): Thenable<QuickOpenModel> {
+	getResults(searchValue: string, token: CancellationToken): Promise<QuickOpenModel> {
 		searchValue = searchValue.trim();
 
 		// Remember view state to be able to restore on cancel
diff --git a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
index 3304a74737c..1f6017b0945 100644
--- a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
@@ -390,7 +390,7 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 		this.rangeHighlightDecorationId = void 0;
 	}
 
-	getResults(searchValue: string, token: CancellationToken): Thenable<QuickOpenModel> {
+	getResults(searchValue: string, token: CancellationToken): Promise<QuickOpenModel> {
 		searchValue = searchValue.trim();
 
 		// Support to cancel pending outline requests
diff --git a/src/vs/workbench/parts/quickopen/browser/helpHandler.ts b/src/vs/workbench/parts/quickopen/browser/helpHandler.ts
index 8a2b41b0008..19971c6284f 100644
--- a/src/vs/workbench/parts/quickopen/browser/helpHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/helpHandler.ts
@@ -65,7 +65,7 @@ export class HelpHandler extends QuickOpenHandler {
 		super();
 	}
 
-	getResults(searchValue: string, token: CancellationToken): Thenable<QuickOpenModel> {
+	getResults(searchValue: string, token: CancellationToken): Promise<QuickOpenModel> {
 		searchValue = searchValue.trim();
 
 		const registry = (Registry.as<IQuickOpenRegistry>(Extensions.Quickopen));
diff --git a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts
index 7891e785176..a6b47c94130 100644
--- a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts
@@ -78,7 +78,7 @@ export class ViewPickerHandler extends QuickOpenHandler {
 		super();
 	}
 
-	getResults(searchValue: string, token: CancellationToken): Thenable<QuickOpenModel> {
+	getResults(searchValue: string, token: CancellationToken): Promise<QuickOpenModel> {
 		searchValue = searchValue.trim();
 		const normalizedSearchValueLowercase = stripWildcards(searchValue).toLowerCase();
 
@@ -224,7 +224,7 @@ export class QuickOpenViewPickerAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		const keys = this.keybindingService.lookupKeybindings(this.id);
 
 		this.quickOpenService.show(VIEW_PICKER_PREFIX, { quickNavigateConfiguration: { keybindings: keys } });
diff --git a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts
index fb49fce43a2..3997f637ead 100644
--- a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts
+++ b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts
@@ -67,7 +67,7 @@ class DiffMenuItemActionItem extends MenuItemActionItem {
 
 class DiffActionRunner extends ActionRunner {
 
-	runAction(action: IAction, context: any): Thenable<any> {
+	runAction(action: IAction, context: any): Promise<any> {
 		if (action instanceof MenuItemAction) {
 			return action.run(...context);
 		}
@@ -135,7 +135,7 @@ class UIEditorAction extends Action {
 		this.editor = editor;
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		return Promise.resolve(this.instantiationService.invokeFunction(accessor => this.action.run(accessor, this.editor, null)));
 	}
 }
@@ -937,7 +937,7 @@ export class DirtyDiffModel {
 	get modified(): ITextModel { return this._editorModel; }
 
 	private diffDelayer: ThrottledDelayer<IChange[]>;
-	private _originalURIPromise: Thenable<URI>;
+	private _originalURIPromise: Promise<URI>;
 	private repositoryDisposables = new Set<IDisposable[]>();
 	private originalModelDisposables: IDisposable[] = [];
 	private disposables: IDisposable[] = [];
@@ -980,7 +980,7 @@ export class DirtyDiffModel {
 		this.triggerDiff();
 	}
 
-	private triggerDiff(): Thenable<any> {
+	private triggerDiff(): Promise<any> {
 		if (!this.diffDelayer) {
 			return Promise.resolve(null);
 		}
@@ -1005,7 +1005,7 @@ export class DirtyDiffModel {
 			});
 	}
 
-	private diff(): Thenable<IChange[]> {
+	private diff(): Promise<IChange[]> {
 		return this.getOriginalURIPromise().then(originalURI => {
 			if (!this._editorModel || this._editorModel.isDisposed() || !originalURI) {
 				return Promise.resolve([]); // disposed
@@ -1019,7 +1019,7 @@ export class DirtyDiffModel {
 		});
 	}
 
-	private getOriginalURIPromise(): Thenable<URI> {
+	private getOriginalURIPromise(): Promise<URI> {
 		if (this._originalURIPromise) {
 			return this._originalURIPromise;
 		}
@@ -1061,7 +1061,7 @@ export class DirtyDiffModel {
 		});
 	}
 
-	private getOriginalResource(): Thenable<URI> {
+	private getOriginalResource(): Promise<URI> {
 		if (!this._editorModel) {
 			return Promise.resolve(null);
 		}
diff --git a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
index 2f5f3823567..aec1f2d6430 100644
--- a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
+++ b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
@@ -88,7 +88,7 @@ class StatusBarAction extends Action {
 		this.tooltip = command.tooltip;
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.commandService.executeCommand(this.command.id, ...this.command.arguments);
 	}
 }
@@ -457,7 +457,7 @@ class MultipleSelectionActionRunner extends ActionRunner {
 		super();
 	}
 
-	runAction(action: IAction, context: ISCMResource): Thenable<any> {
+	runAction(action: IAction, context: ISCMResource): Promise<any> {
 		if (action instanceof MenuItemAction) {
 			const selection = this.getSelectedResources();
 			const filteredSelection = selection.filter(s => s !== context);
diff --git a/src/vs/workbench/parts/search/browser/openAnythingHandler.ts b/src/vs/workbench/parts/search/browser/openAnythingHandler.ts
index 75e9483bbbb..8fd9995bcfd 100644
--- a/src/vs/workbench/parts/search/browser/openAnythingHandler.ts
+++ b/src/vs/workbench/parts/search/browser/openAnythingHandler.ts
@@ -83,7 +83,7 @@ export class OpenAnythingHandler extends QuickOpenHandler {
 		});
 	}
 
-	getResults(searchValue: string, token: CancellationToken): Thenable<QuickOpenModel> {
+	getResults(searchValue: string, token: CancellationToken): Promise<QuickOpenModel> {
 		this.isClosed = false; // Treat this call as the handler being in use
 
 		// Find a suitable range from the pattern looking for ":" and "#"
@@ -100,7 +100,7 @@ export class OpenAnythingHandler extends QuickOpenHandler {
 
 		// The throttler needs a factory for its promises
 		const resultsPromise = () => {
-			const resultPromises: Thenable<QuickOpenModel | FileQuickOpenModel>[] = [];
+			const resultPromises: Promise<QuickOpenModel | FileQuickOpenModel>[] = [];
 
 			// File Results
 			const filePromise = this.openFileHandler.getResults(query.original, token, OpenAnythingHandler.MAX_DISPLAYED_RESULTS);
diff --git a/src/vs/workbench/parts/search/browser/openFileHandler.ts b/src/vs/workbench/parts/search/browser/openFileHandler.ts
index bbc1d1055c5..6af8b5b2a05 100644
--- a/src/vs/workbench/parts/search/browser/openFileHandler.ts
+++ b/src/vs/workbench/parts/search/browser/openFileHandler.ts
@@ -137,7 +137,7 @@ export class OpenFileHandler extends QuickOpenHandler {
 		this.options = options;
 	}
 
-	getResults(searchValue: string, token: CancellationToken, maxSortedResults?: number): Thenable<FileQuickOpenModel> {
+	getResults(searchValue: string, token: CancellationToken, maxSortedResults?: number): Promise<FileQuickOpenModel> {
 		const query = prepareQuery(searchValue);
 
 		// Respond directly to empty search
@@ -152,7 +152,7 @@ export class OpenFileHandler extends QuickOpenHandler {
 		return this.doFindResults(query, token, this.cacheState.cacheKey, maxSortedResults);
 	}
 
-	private doFindResults(query: IPreparedQuery, token: CancellationToken, cacheKey?: string, maxSortedResults?: number): Thenable<FileQuickOpenModel> {
+	private doFindResults(query: IPreparedQuery, token: CancellationToken, cacheKey?: string, maxSortedResults?: number): Promise<FileQuickOpenModel> {
 		const queryOptions = this.doResolveQueryOptions(query, cacheKey, maxSortedResults);
 
 		let iconClass: string;
@@ -189,7 +189,7 @@ export class OpenFileHandler extends QuickOpenHandler {
 		});
 	}
 
-	private getAbsolutePathResult(query: IPreparedQuery): Thenable<URI> {
+	private getAbsolutePathResult(query: IPreparedQuery): Promise<URI> {
 		if (paths.isAbsolute(query.original)) {
 			const resource = URI.file(query.original);
 
@@ -272,9 +272,9 @@ export class CacheState {
 	private query: IFileQuery;
 
 	private loadingPhase = LoadingPhase.Created;
-	private promise: Thenable<void>;
+	private promise: Promise<void>;
 
-	constructor(cacheQuery: (cacheKey: string) => IFileQuery, private doLoad: (query: IFileQuery) => Thenable<any>, private doDispose: (cacheKey: string) => Thenable<void>, private previous: CacheState) {
+	constructor(cacheQuery: (cacheKey: string) => IFileQuery, private doLoad: (query: IFileQuery) => Promise<any>, private doDispose: (cacheKey: string) => Promise<void>, private previous: CacheState) {
 		this.query = cacheQuery(this._cacheKey);
 		if (this.previous) {
 			const current = objects.assign({}, this.query, { cacheKey: null });
diff --git a/src/vs/workbench/parts/search/browser/openSymbolHandler.ts b/src/vs/workbench/parts/search/browser/openSymbolHandler.ts
index 7bf3fe452f9..0dc2fba92fe 100644
--- a/src/vs/workbench/parts/search/browser/openSymbolHandler.ts
+++ b/src/vs/workbench/parts/search/browser/openSymbolHandler.ts
@@ -27,7 +27,7 @@ import { Schemas } from 'vs/base/common/network';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 
 class SymbolEntry extends EditorQuickOpenEntry {
-	private bearingResolve: Thenable<this>;
+	private bearingResolve: Promise<this>;
 
 	constructor(
 		private bearing: IWorkspaceSymbol,
@@ -156,10 +156,10 @@ export class OpenSymbolHandler extends QuickOpenHandler {
 		return true;
 	}
 
-	getResults(searchValue: string, token: CancellationToken): Thenable<QuickOpenModel> {
+	getResults(searchValue: string, token: CancellationToken): Promise<QuickOpenModel> {
 		searchValue = searchValue.trim();
 
-		let promise: Thenable<QuickOpenEntry[]>;
+		let promise: Promise<QuickOpenEntry[]>;
 		if (!this.options.skipDelay) {
 			promise = this.delayer.trigger(() => {
 				if (token.isCancellationRequested) {
@@ -175,7 +175,7 @@ export class OpenSymbolHandler extends QuickOpenHandler {
 		return promise.then(e => new QuickOpenModel(e));
 	}
 
-	private doGetResults(searchValue: string, token: CancellationToken): Thenable<SymbolEntry[]> {
+	private doGetResults(searchValue: string, token: CancellationToken): Promise<SymbolEntry[]> {
 		return getWorkspaceSymbols(searchValue, token).then(tuples => {
 			if (token.isCancellationRequested) {
 				return [];
diff --git a/src/vs/workbench/parts/search/browser/replaceService.ts b/src/vs/workbench/parts/search/browser/replaceService.ts
index 3831a4835a3..c0d60564ef2 100644
--- a/src/vs/workbench/parts/search/browser/replaceService.ts
+++ b/src/vs/workbench/parts/search/browser/replaceService.ts
@@ -46,7 +46,7 @@ export class ReplacePreviewContentProvider implements ITextModelContentProvider,
 		this.textModelResolverService.registerTextModelContentProvider(network.Schemas.internal, this);
 	}
 
-	public provideTextContent(uri: URI): Thenable<ITextModel> {
+	public provideTextContent(uri: URI): Promise<ITextModel> {
 		if (uri.fragment === REPLACE_PREVIEW) {
 			return this.instantiationService.createInstance(ReplacePreviewModel).resolve(uri);
 		}
@@ -65,7 +65,7 @@ class ReplacePreviewModel extends Disposable {
 		super();
 	}
 
-	resolve(replacePreviewUri: URI): Thenable<ITextModel> {
+	resolve(replacePreviewUri: URI): Promise<ITextModel> {
 		const fileResource = toFileResource(replacePreviewUri);
 		const fileMatch = <FileMatch>this.searchWorkbenchService.searchModel.searchResult.matches().filter(match => match.resource().toString() === fileResource.toString())[0];
 		return this.textModelResolverService.createModelReference(fileResource).then(ref => {
@@ -110,7 +110,7 @@ export class ReplaceService implements IReplaceService {
 
 	}
 
-	public openReplacePreview(element: FileMatchOrMatch, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): Thenable<any> {
+	public openReplacePreview(element: FileMatchOrMatch, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): Promise<any> {
 		const fileMatch = element instanceof Match ? element.parent() : element;
 
 		return this.editorService.openEditor({
diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts
index de0911d7db6..388147f4ddc 100644
--- a/src/vs/workbench/parts/search/browser/searchActions.ts
+++ b/src/vs/workbench/parts/search/browser/searchActions.ts
@@ -44,7 +44,7 @@ export function appendKeyBindingLabel(label: string, keyBinding: number | Resolv
 	}
 }
 
-export function openSearchView(viewletService: IViewletService, panelService: IPanelService, focus?: boolean): Thenable<SearchView> {
+export function openSearchView(viewletService: IViewletService, panelService: IPanelService, focus?: boolean): Promise<SearchView> {
 	if (viewletService.getViewlets().filter(v => v.id === VIEW_ID).length) {
 		return viewletService.openViewlet(VIEW_ID, focus).then(viewlet => <SearchView>viewlet);
 	}
@@ -96,7 +96,7 @@ export class FocusNextInputAction extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		const searchView = getSearchView(this.viewletService, this.panelService);
 		searchView.focusNextInputBox();
 		return Promise.resolve(null);
@@ -114,7 +114,7 @@ export class FocusPreviousInputAction extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		const searchView = getSearchView(this.viewletService, this.panelService);
 		searchView.focusPreviousInputBox();
 		return Promise.resolve(null);
@@ -129,7 +129,7 @@ export abstract class FindOrReplaceInFilesAction extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		return openSearchView(this.viewletService, this.panelService, false).then(openedView => {
 			const searchAndReplaceWidget = openedView.searchAndReplaceWidget;
 			searchAndReplaceWidget.toggleReplace(this.expandSearchReplaceWidget);
@@ -164,7 +164,7 @@ export class OpenSearchViewletAction extends FindOrReplaceInFilesAction {
 		super(id, label, viewletService, panelService, /*expandSearchReplaceWidget=*/false);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 
 		// Pass focus to viewlet if not open or focused
 		if (this.otherViewletShowing() || !isSearchViewFocused(this.viewletService, this.panelService)) {
@@ -204,7 +204,7 @@ export class CloseReplaceAction extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		const searchView = getSearchView(this.viewletService, this.panelService);
 		searchView.searchAndReplaceWidget.toggleReplace(false);
 		searchView.searchAndReplaceWidget.focus();
@@ -230,7 +230,7 @@ export class RefreshAction extends Action {
 		this.enabled = searchView && searchView.isSearchSubmitted();
 	}
 
-	public run(): Thenable<void> {
+	public run(): Promise<void> {
 		const searchView = getSearchView(this.viewletService, this.panelService);
 		if (searchView) {
 			searchView.onQueryChanged();
@@ -257,7 +257,7 @@ export class CollapseDeepestExpandedLevelAction extends Action {
 		this.enabled = searchView && searchView.hasSearchResults();
 	}
 
-	public run(): Thenable<void> {
+	public run(): Promise<void> {
 		const searchView = getSearchView(this.viewletService, this.panelService);
 		if (searchView) {
 			const viewer = searchView.getControl();
@@ -320,7 +320,7 @@ export class ClearSearchResultsAction extends Action {
 		this.enabled = searchView && (!searchView.allSearchFieldsClear() || searchView.hasSearchResults());
 	}
 
-	public run(): Thenable<void> {
+	public run(): Promise<void> {
 		const searchView = getSearchView(this.viewletService, this.panelService);
 		if (searchView) {
 			searchView.clearSearchResults();
@@ -347,7 +347,7 @@ export class CancelSearchAction extends Action {
 		this.enabled = searchView && searchView.isSearching();
 	}
 
-	public run(): Thenable<void> {
+	public run(): Promise<void> {
 		const searchView = getSearchView(this.viewletService, this.panelService);
 		if (searchView) {
 			searchView.cancelSearch();
@@ -368,7 +368,7 @@ export class FocusNextSearchResultAction extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		return openSearchView(this.viewletService, this.panelService).then(searchView => {
 			searchView.selectNextMatch();
 		});
@@ -386,7 +386,7 @@ export class FocusPreviousSearchResultAction extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		return openSearchView(this.viewletService, this.panelService).then(searchView => {
 			searchView.selectPreviousMatch();
 		});
@@ -467,7 +467,7 @@ export class RemoveAction extends AbstractSearchAndReplaceAction {
 		super('remove', RemoveAction.LABEL, 'action-remove');
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		const currentFocusElement = this.viewer.getFocus();
 		const nextFocusElementP = !currentFocusElement || currentFocusElement instanceof SearchResult || elementIsEqualOrParent(currentFocusElement, this.element) ?
 			this.getElementToFocusAfterRemoved(this.viewer, this.element) :
@@ -520,7 +520,7 @@ export class ReplaceAllAction extends AbstractSearchAndReplaceAction {
 		super(Constants.ReplaceAllInFileActionId, appendKeyBindingLabel(ReplaceAllAction.LABEL, keyBindingService.lookupKeybinding(Constants.ReplaceAllInFileActionId), keyBindingService), 'action-replace-all');
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		return this.getElementToFocusAfterRemoved(this.viewer, this.fileMatch).then(nextFocusElement => {
 			return this.fileMatch.parent().replace(this.fileMatch).then(() => {
 				if (nextFocusElement) {
@@ -543,7 +543,7 @@ export class ReplaceAllInFolderAction extends AbstractSearchAndReplaceAction {
 		super(Constants.ReplaceAllInFolderActionId, appendKeyBindingLabel(ReplaceAllInFolderAction.LABEL, keyBindingService.lookupKeybinding(Constants.ReplaceAllInFolderActionId), keyBindingService), 'action-replace-all');
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		return this.getElementToFocusAfterRemoved(this.viewer, this.folderMatch).then(nextFocusElement => {
 			return this.folderMatch.replaceAll().then(() => {
 				if (nextFocusElement) {
@@ -567,7 +567,7 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction {
 		super(Constants.ReplaceActionId, appendKeyBindingLabel(ReplaceAction.LABEL, keyBindingService.lookupKeybinding(Constants.ReplaceActionId), keyBindingService), 'action-replace');
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		this.enabled = false;
 
 		return this.element.parent().replace(this.element).then(() => {
diff --git a/src/vs/workbench/parts/search/browser/searchResultsView.ts b/src/vs/workbench/parts/search/browser/searchResultsView.ts
index 9137e3386e5..e08545a517b 100644
--- a/src/vs/workbench/parts/search/browser/searchResultsView.ts
+++ b/src/vs/workbench/parts/search/browser/searchResultsView.ts
@@ -79,7 +79,7 @@ export class SearchDataSource implements IDataSource {
 		return [];
 	}
 
-	public getChildren(tree: ITree, element: any): Thenable<any[]> {
+	public getChildren(tree: ITree, element: any): Promise<any[]> {
 		return Promise.resolve(this._getChildren(element));
 	}
 
@@ -87,7 +87,7 @@ export class SearchDataSource implements IDataSource {
 		return element instanceof FileMatch || element instanceof FolderMatch || element instanceof SearchResult;
 	}
 
-	public getParent(tree: ITree, element: any): Thenable<any> {
+	public getParent(tree: ITree, element: any): Promise<any> {
 		let value: any = null;
 
 		if (element instanceof Match) {
diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts
index 8a8ad795453..675be9822e4 100644
--- a/src/vs/workbench/parts/search/browser/searchView.ts
+++ b/src/vs/workbench/parts/search/browser/searchView.ts
@@ -377,7 +377,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		}));
 	}
 
-	private onSearchResultsChanged(event?: IChangeEvent): Thenable<any> {
+	private onSearchResultsChanged(event?: IChangeEvent): Promise<any> {
 		if (this.isVisible()) {
 			return this.refreshAndUpdateCount(event);
 		} else {
@@ -386,13 +386,13 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		}
 	}
 
-	private refreshAndUpdateCount(event?: IChangeEvent): Thenable<void> {
+	private refreshAndUpdateCount(event?: IChangeEvent): Promise<void> {
 		this.searchWidget.setReplaceAllActionState(!this.viewModel.searchResult.isEmpty());
 		this.updateSearchResultCount(this.viewModel.searchResult.query.userDisabledExcludesAndIgnoreFiles);
 		return this.refreshTree(event);
 	}
 
-	private refreshTree(event?: IChangeEvent): Thenable<any> {
+	private refreshTree(event?: IChangeEvent): Promise<any> {
 		if (!event || event.added || event.removed) {
 			return this.tree.refresh(this.viewModel.searchResult);
 		} else {
@@ -1119,7 +1119,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		}, onQueryValidationError);
 	}
 
-	private validateQuery(query: ITextQuery): Thenable<void> {
+	private validateQuery(query: ITextQuery): Promise<void> {
 		// Validate folderQueries
 		const folderQueriesExistP =
 			query.folderQueries.map(fq => {
@@ -1394,7 +1394,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		this.openSettings('.exclude');
 	}
 
-	private openSettings(query: string): Thenable<IEditor> {
+	private openSettings(query: string): Promise<IEditor> {
 		const options: ISettingsEditorOptions = { query };
 		return this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ?
 			this.preferencesService.openWorkspaceSettings(undefined, options) :
@@ -1475,7 +1475,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		this.currentSelectedFileMatch = null;
 	}
 
-	private onFocus(lineMatch: any, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): Thenable<any> {
+	private onFocus(lineMatch: any, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): Promise<any> {
 		if (!(lineMatch instanceof Match)) {
 			this.viewModel.searchResult.rangeHighlightDecorations.removeHighlightRange();
 			return Promise.resolve(true);
@@ -1487,7 +1487,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 			this.open(lineMatch, preserveFocus, sideBySide, pinned);
 	}
 
-	public open(element: FileMatchOrMatch, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): Thenable<any> {
+	public open(element: FileMatchOrMatch, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): Promise<any> {
 		const selection = this.getSelectionFrom(element);
 		const resource = element instanceof Match ? element.parent().resource() : (<FileMatch>element).resource();
 		return this.editorService.openEditor({
diff --git a/src/vs/workbench/parts/search/common/replace.ts b/src/vs/workbench/parts/search/common/replace.ts
index 8f2d2e9026d..2f42429068b 100644
--- a/src/vs/workbench/parts/search/common/replace.ts
+++ b/src/vs/workbench/parts/search/common/replace.ts
@@ -16,22 +16,22 @@ export interface IReplaceService {
 	/**
 	 * Replaces the given match in the file that match belongs to
 	 */
-	replace(match: Match): Thenable<any>;
+	replace(match: Match): Promise<any>;
 
 	/**
 	 *	Replace all the matches from the given file matches in the files
 	 *  You can also pass the progress runner to update the progress of replacing.
 	 */
-	replace(files: FileMatch[], progress?: IProgressRunner): Thenable<any>;
+	replace(files: FileMatch[], progress?: IProgressRunner): Promise<any>;
 
 	/**
 	 * Opens the replace preview for given file match or match
 	 */
-	openReplacePreview(element: FileMatchOrMatch, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): Thenable<any>;
+	openReplacePreview(element: FileMatchOrMatch, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): Promise<any>;
 
 	/**
 	 * Update the replace preview for the given file.
 	 * If `override` is `true`, then replace preview is constructed from source model
 	 */
-	updateReplacePreview(file: FileMatch, override?: boolean): Thenable<void>;
+	updateReplacePreview(file: FileMatch, override?: boolean): Promise<void>;
 }
diff --git a/src/vs/workbench/parts/search/common/searchModel.ts b/src/vs/workbench/parts/search/common/searchModel.ts
index 196b9e50263..7b3e080e05b 100644
--- a/src/vs/workbench/parts/search/common/searchModel.ts
+++ b/src/vs/workbench/parts/search/common/searchModel.ts
@@ -305,7 +305,7 @@ export class FileMatch extends Disposable {
 		this._onChange.fire(false);
 	}
 
-	public replace(toReplace: Match): Thenable<void> {
+	public replace(toReplace: Match): Promise<void> {
 		return this.replaceService.replace(toReplace)
 			.then(() => this.updatesMatchesForLineAfterReplace(toReplace.range().startLineNumber, false));
 	}
@@ -476,13 +476,13 @@ export class FolderMatch extends Disposable {
 		this.doRemove(match);
 	}
 
-	public replace(match: FileMatch): Thenable<any> {
+	public replace(match: FileMatch): Promise<any> {
 		return this.replaceService.replace([match]).then(() => {
 			this.doRemove(match, false, true);
 		});
 	}
 
-	public replaceAll(): Thenable<any> {
+	public replaceAll(): Promise<any> {
 		const matches = this.matches();
 		return this.replaceService.replace(matches).then(() => {
 			matches.forEach(match => this.doRemove(match, false, true));
@@ -682,11 +682,11 @@ export class SearchResult extends Disposable {
 		}
 	}
 
-	public replace(match: FileMatch): Thenable<any> {
+	public replace(match: FileMatch): Promise<any> {
 		return this.getFolderMatch(match.resource()).replace(match);
 	}
 
-	public replaceAll(progressRunner: IProgressRunner): Thenable<any> {
+	public replaceAll(progressRunner: IProgressRunner): Promise<any> {
 		this.replacingAll = true;
 
 		const promise = this.replaceService.replace(this.matches(), progressRunner);
@@ -838,7 +838,7 @@ export class SearchModel extends Disposable {
 		return this._searchResult;
 	}
 
-	public search(query: ITextQuery, onProgress?: (result: ISearchProgressItem) => void): Thenable<ISearchComplete> {
+	public search(query: ITextQuery, onProgress?: (result: ISearchProgressItem) => void): Promise<ISearchComplete> {
 		this.cancelSearch();
 
 		this._searchQuery = query;
diff --git a/src/vs/workbench/parts/search/test/common/searchModel.test.ts b/src/vs/workbench/parts/search/test/common/searchModel.test.ts
index 43d9115a41c..5918e0b1f8f 100644
--- a/src/vs/workbench/parts/search/test/common/searchModel.test.ts
+++ b/src/vs/workbench/parts/search/test/common/searchModel.test.ts
@@ -81,7 +81,7 @@ suite('SearchModel', () => {
 
 	function searchServiceWithResults(results: IFileMatch[], complete: ISearchComplete | null = null): ISearchService {
 		return <ISearchService>{
-			textSearch(query: ISearchQuery, token?: CancellationToken, onProgress?: (result: ISearchProgressItem) => void): Thenable<ISearchComplete> {
+			textSearch(query: ISearchQuery, token?: CancellationToken, onProgress?: (result: ISearchProgressItem) => void): Promise<ISearchComplete> {
 				return new Promise(resolve => {
 					process.nextTick(() => {
 						results.forEach(onProgress);
@@ -94,7 +94,7 @@ suite('SearchModel', () => {
 
 	function searchServiceWithError(error: Error): ISearchService {
 		return <ISearchService>{
-			textSearch(query: ISearchQuery, token?: CancellationToken, onProgress?: (result: ISearchProgressItem) => void): Thenable<ISearchComplete> {
+			textSearch(query: ISearchQuery, token?: CancellationToken, onProgress?: (result: ISearchProgressItem) => void): Promise<ISearchComplete> {
 				return new Promise((resolve, reject) => {
 					reject(error);
 				});
@@ -104,7 +104,7 @@ suite('SearchModel', () => {
 
 	function canceleableSearchService(tokenSource: CancellationTokenSource): ISearchService {
 		return <ISearchService>{
-			textSearch(query: ISearchQuery, token?: CancellationToken, onProgress?: (result: ISearchProgressItem) => void): Thenable<ISearchComplete> {
+			textSearch(query: ISearchQuery, token?: CancellationToken, onProgress?: (result: ISearchProgressItem) => void): Promise<ISearchComplete> {
 				if (token) {
 					token.onCancellationRequested(() => tokenSource.cancel());
 				}
diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts
index 4234b13765c..0ad757d0df9 100644
--- a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts
+++ b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts
@@ -131,7 +131,7 @@ class SnippetsService implements ISnippetsService {
 	readonly _serviceBrand: any;
 
 	private readonly _disposables: IDisposable[] = [];
-	private readonly _pendingWork: Thenable<any>[] = [];
+	private readonly _pendingWork: Promise<any>[] = [];
 	private readonly _files = new Map<string, SnippetFile>();
 
 	constructor(
@@ -263,7 +263,7 @@ class SnippetsService implements ISnippetsService {
 		updateWorkspaceSnippets();
 	}
 
-	private _initWorkspaceFolderSnippets(workspace: IWorkspace, bucket: IDisposable[]): Thenable<any> {
+	private _initWorkspaceFolderSnippets(workspace: IWorkspace, bucket: IDisposable[]): Promise<any> {
 		let promises = workspace.folders.map(folder => {
 			const snippetFolder = folder.toResource('.vscode');
 			return this._fileService.existsFile(snippetFolder).then(value => {
@@ -282,12 +282,12 @@ class SnippetsService implements ISnippetsService {
 		return Promise.all(promises);
 	}
 
-	private _initUserSnippets(): Thenable<any> {
+	private _initUserSnippets(): Promise<any> {
 		const userSnippetsFolder = URI.file(join(this._environmentService.appSettingsHome, 'snippets'));
 		return this._fileService.createFolder(userSnippetsFolder).then(() => this._initFolderSnippets(SnippetSource.User, userSnippetsFolder, this._disposables));
 	}
 
-	private _initFolderSnippets(source: SnippetSource, folder: URI, bucket: IDisposable[]): Thenable<any> {
+	private _initFolderSnippets(source: SnippetSource, folder: URI, bucket: IDisposable[]): Promise<any> {
 		let disposables: IDisposable[] = [];
 		let addFolderSnippets = () => {
 			disposables = dispose(disposables);
diff --git a/src/vs/workbench/parts/stats/node/workspaceStats.ts b/src/vs/workbench/parts/stats/node/workspaceStats.ts
index 430b4bd4d9d..031b7a802e1 100644
--- a/src/vs/workbench/parts/stats/node/workspaceStats.ts
+++ b/src/vs/workbench/parts/stats/node/workspaceStats.ts
@@ -189,7 +189,7 @@ export function getHashedRemotesFromConfig(text: string, stripEndingDotGit: bool
 	});
 }
 
-export function getHashedRemotesFromUri(workspaceUri: URI, fileService: IFileService, stripEndingDotGit: boolean = false): Thenable<string[]> {
+export function getHashedRemotesFromUri(workspaceUri: URI, fileService: IFileService, stripEndingDotGit: boolean = false): Promise<string[]> {
 	const path = workspaceUri.path;
 	const uri = workspaceUri.with({ path: `${path !== '/' ? path : ''}/.git/config` });
 	return fileService.resolveFile(uri).then(() => {
@@ -310,7 +310,7 @@ export class WorkspaceStats implements IWorkbenchContribution {
 			"workspace.py.azure-cognitiveservices" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
 		}
 	*/
-	private resolveWorkspaceTags(configuration: IWindowConfiguration, participant?: (rootFiles: string[]) => void): Thenable<Tags> {
+	private resolveWorkspaceTags(configuration: IWindowConfiguration, participant?: (rootFiles: string[]) => void): Promise<Tags> {
 		const tags: Tags = Object.create(null);
 
 		const state = this.contextService.getWorkbenchState();
@@ -414,7 +414,7 @@ export class WorkspaceStats implements IWorkbenchContribution {
 				tags['workspace.android.cpp'] = true;
 			}
 
-			function getFilePromises(filename, fileService, contentHandler): Thenable<void>[] {
+			function getFilePromises(filename, fileService, contentHandler): Promise<void>[] {
 				return !nameSet.has(filename) ? [] : folders.map(workspaceUri => {
 					const uri = workspaceUri.with({ path: `${workspaceUri.path !== '/' ? workspaceUri.path : ''}/${filename}` });
 					return fileService.resolveFile(uri).then(() => {
@@ -624,7 +624,7 @@ export class WorkspaceStats implements IWorkbenchContribution {
 			"node" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
 		}
 	*/
-	private reportAzureNode(workspaceUris: URI[], tags: Tags): Thenable<Tags> {
+	private reportAzureNode(workspaceUris: URI[], tags: Tags): Promise<Tags> {
 		// TODO: should also work for `node_modules` folders several levels down
 		const uris = workspaceUris.map(workspaceUri => {
 			const path = workspaceUri.path;
@@ -649,7 +649,7 @@ export class WorkspaceStats implements IWorkbenchContribution {
 			"java" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
 		}
 	*/
-	private reportAzureJava(workspaceUris: URI[], tags: Tags): Thenable<Tags> {
+	private reportAzureJava(workspaceUris: URI[], tags: Tags): Promise<Tags> {
 		return Promise.all(workspaceUris.map(workspaceUri => {
 			const path = workspaceUri.path;
 			const uri = workspaceUri.with({ path: `${path !== '/' ? path : ''}/pom.xml` });
diff --git a/src/vs/workbench/parts/tasks/browser/quickOpen.ts b/src/vs/workbench/parts/tasks/browser/quickOpen.ts
index b048d933ecd..9625914bec0 100644
--- a/src/vs/workbench/parts/tasks/browser/quickOpen.ts
+++ b/src/vs/workbench/parts/tasks/browser/quickOpen.ts
@@ -67,7 +67,7 @@ export class TaskGroupEntry extends Model.QuickOpenEntryGroup {
 
 export abstract class QuickOpenHandler extends Quickopen.QuickOpenHandler {
 
-	private tasks: Thenable<(CustomTask | ContributedTask)[]>;
+	private tasks: Promise<(CustomTask | ContributedTask)[]>;
 
 	constructor(
 		protected quickOpenService: IQuickOpenService,
@@ -87,7 +87,7 @@ export abstract class QuickOpenHandler extends Quickopen.QuickOpenHandler {
 		this.tasks = undefined;
 	}
 
-	public getResults(input: string, token: CancellationToken): Thenable<Model.QuickOpenModel> {
+	public getResults(input: string, token: CancellationToken): Promise<Model.QuickOpenModel> {
 		return this.tasks.then((tasks) => {
 			let entries: Model.QuickOpenEntry[] = [];
 			if (tasks.length === 0 || token.isCancellationRequested) {
@@ -148,7 +148,7 @@ export abstract class QuickOpenHandler extends Quickopen.QuickOpenHandler {
 		}
 	}
 
-	protected abstract getTasks(): Thenable<(CustomTask | ContributedTask)[]>;
+	protected abstract getTasks(): Promise<(CustomTask | ContributedTask)[]>;
 
 	protected abstract createEntry(task: CustomTask | ContributedTask, highlights: Model.IHighlight[]): TaskEntry;
 
@@ -173,7 +173,7 @@ class CustomizeTaskAction extends Action {
 		this.class = 'quick-open-task-configure';
 	}
 
-	public run(element: any): Thenable<any> {
+	public run(element: any): Promise<any> {
 		let task = this.getTask(element);
 		if (ContributedTask.is(task)) {
 			return this.taskService.customize(task, undefined, true).then(() => {
diff --git a/src/vs/workbench/parts/tasks/browser/taskQuickOpen.ts b/src/vs/workbench/parts/tasks/browser/taskQuickOpen.ts
index d00939691db..fd92a576452 100644
--- a/src/vs/workbench/parts/tasks/browser/taskQuickOpen.ts
+++ b/src/vs/workbench/parts/tasks/browser/taskQuickOpen.ts
@@ -32,7 +32,7 @@ export class QuickOpenHandler extends base.QuickOpenHandler {
 
 	public static readonly ID = 'workbench.picker.tasks';
 
-	private activationPromise: Thenable<void>;
+	private activationPromise: Promise<void>;
 
 	constructor(
 		@IQuickOpenService quickOpenService: IQuickOpenService,
@@ -47,7 +47,7 @@ export class QuickOpenHandler extends base.QuickOpenHandler {
 		return nls.localize('tasksAriaLabel', "Type the name of a task to run");
 	}
 
-	protected getTasks(): Thenable<(CustomTask | ContributedTask)[]> {
+	protected getTasks(): Promise<(CustomTask | ContributedTask)[]> {
 		return this.activationPromise.then(() => {
 			return this.taskService.tasks().then(tasks => tasks.filter<CustomTask | ContributedTask>((task): task is CustomTask | ContributedTask => ContributedTask.is(task) || CustomTask.is(task)));
 		});
diff --git a/src/vs/workbench/parts/tasks/common/taskService.ts b/src/vs/workbench/parts/tasks/common/taskService.ts
index fc9f1743174..827cb4c1cfa 100644
--- a/src/vs/workbench/parts/tasks/common/taskService.ts
+++ b/src/vs/workbench/parts/tasks/common/taskService.ts
@@ -19,7 +19,7 @@ export { ITaskSummary, Task, TaskTerminateResponse };
 export const ITaskService = createDecorator<ITaskService>('taskService');
 
 export interface ITaskProvider {
-	provideTasks(validTypes: IStringDictionary<boolean>): Thenable<TaskSet>;
+	provideTasks(validTypes: IStringDictionary<boolean>): Promise<TaskSet>;
 }
 
 export interface ProblemMatcherRunOptions {
@@ -55,29 +55,29 @@ export interface ITaskService {
 	supportsMultipleTaskExecutions: boolean;
 
 	configureAction(): Action;
-	build(): Thenable<ITaskSummary>;
-	runTest(): Thenable<ITaskSummary>;
-	run(task: Task, options?: ProblemMatcherRunOptions): Thenable<ITaskSummary>;
+	build(): Promise<ITaskSummary>;
+	runTest(): Promise<ITaskSummary>;
+	run(task: Task, options?: ProblemMatcherRunOptions): Promise<ITaskSummary>;
 	inTerminal(): boolean;
-	isActive(): Thenable<boolean>;
-	getActiveTasks(): Thenable<Task[]>;
+	isActive(): Promise<boolean>;
+	getActiveTasks(): Promise<Task[]>;
 	restart(task: Task): void;
-	terminate(task: Task): Thenable<TaskTerminateResponse>;
-	terminateAll(): Thenable<TaskTerminateResponse[]>;
-	tasks(filter?: TaskFilter): Thenable<Task[]>;
-	getWorkspaceTasks(runSource?: TaskRunSource): Thenable<Map<string, WorkspaceFolderTaskResult>>;
+	terminate(task: Task): Promise<TaskTerminateResponse>;
+	terminateAll(): Promise<TaskTerminateResponse[]>;
+	tasks(filter?: TaskFilter): Promise<Task[]>;
+	getWorkspaceTasks(runSource?: TaskRunSource): Promise<Map<string, WorkspaceFolderTaskResult>>;
 	/**
 	 * @param alias The task's name, label or defined identifier.
 	 */
-	getTask(workspaceFolder: IWorkspaceFolder | string, alias: string | TaskIdentifier, compareId?: boolean): Thenable<Task>;
-	getTasksForGroup(group: string): Thenable<Task[]>;
+	getTask(workspaceFolder: IWorkspaceFolder | string, alias: string | TaskIdentifier, compareId?: boolean): Promise<Task>;
+	getTasksForGroup(group: string): Promise<Task[]>;
 	getRecentlyUsedTasks(): LinkedMap<string, string>;
 	createSorter(): TaskSorter;
 
 	needsFolderQualification();
 	canCustomize(task: ContributedTask | CustomTask): boolean;
-	customize(task: ContributedTask | CustomTask, properties?: {}, openConfig?: boolean): Thenable<void>;
-	openConfig(task: CustomTask | undefined): Thenable<void>;
+	customize(task: ContributedTask | CustomTask, properties?: {}, openConfig?: boolean): Promise<void>;
+	openConfig(task: CustomTask | undefined): Promise<void>;
 
 	registerTaskProvider(taskProvider: ITaskProvider): IDisposable;
 
diff --git a/src/vs/workbench/parts/tasks/common/taskSystem.ts b/src/vs/workbench/parts/tasks/common/taskSystem.ts
index 02e97de4540..722fcffdc93 100644
--- a/src/vs/workbench/parts/tasks/common/taskSystem.ts
+++ b/src/vs/workbench/parts/tasks/common/taskSystem.ts
@@ -81,7 +81,7 @@ export const enum TaskExecuteKind {
 
 export interface ITaskExecuteResult {
 	kind: TaskExecuteKind;
-	promise: Thenable<ITaskSummary>;
+	promise: Promise<ITaskSummary>;
 	task: Task;
 	started?: {
 		restartOnFileChanges?: string;
@@ -129,11 +129,11 @@ export interface ITaskSystem {
 	onDidStateChange: Event<TaskEvent>;
 	run(task: Task, resolver: ITaskResolver): ITaskExecuteResult;
 	rerun(): ITaskExecuteResult | undefined;
-	isActive(): Thenable<boolean>;
+	isActive(): Promise<boolean>;
 	isActiveSync(): boolean;
 	getActiveTasks(): Task[];
 	canAutoTerminate(): boolean;
-	terminate(task: Task): Thenable<TaskTerminateResponse>;
-	terminateAll(): Thenable<TaskTerminateResponse[]>;
+	terminate(task: Task): Promise<TaskTerminateResponse>;
+	terminateAll(): Promise<TaskTerminateResponse[]>;
 	revealTask(task: Task): boolean;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
index 8e1b885f769..86134698d7d 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
@@ -453,7 +453,7 @@ class TaskService extends Disposable implements ITaskService {
 	private _providers: Map<number, ITaskProvider>;
 	private _taskSystemInfos: Map<string, TaskSystemInfo>;
 
-	private _workspaceTasksPromise: Thenable<Map<string, WorkspaceFolderTaskResult>>;
+	private _workspaceTasksPromise: Promise<Map<string, WorkspaceFolderTaskResult>>;
 
 	private _taskSystem: ITaskSystem;
 	private _taskSystemListener: IDisposable;
@@ -700,7 +700,7 @@ class TaskService extends Disposable implements ITaskService {
 		this._taskSystemInfos.set(key, info);
 	}
 
-	public getTask(folder: IWorkspaceFolder | string, identifier: string | TaskIdentifier, compareId: boolean = false): Thenable<Task> {
+	public getTask(folder: IWorkspaceFolder | string, identifier: string | TaskIdentifier, compareId: boolean = false): Promise<Task> {
 		let name = Types.isString(folder) ? folder : folder.name;
 		if (this.ignoredWorkspaceFolders.some(ignored => ignored.name === name)) {
 			return Promise.reject(new Error(nls.localize('TaskServer.folderIgnored', 'The folder {0} is ignored since it uses task version 0.1.0', name)));
@@ -728,7 +728,7 @@ class TaskService extends Disposable implements ITaskService {
 		});
 	}
 
-	public tasks(filter?: TaskFilter): Thenable<Task[]> {
+	public tasks(filter?: TaskFilter): Promise<Task[]> {
 		let range = filter && filter.version ? filter.version : undefined;
 		let engine = this.executionEngine;
 
@@ -764,14 +764,14 @@ class TaskService extends Disposable implements ITaskService {
 		return new TaskSorter(this.contextService.getWorkspace() ? this.contextService.getWorkspace().folders : []);
 	}
 
-	public isActive(): Thenable<boolean> {
+	public isActive(): Promise<boolean> {
 		if (!this._taskSystem) {
 			return Promise.resolve(false);
 		}
 		return this._taskSystem.isActive();
 	}
 
-	public getActiveTasks(): Thenable<Task[]> {
+	public getActiveTasks(): Promise<Task[]> {
 		if (!this._taskSystem) {
 			return Promise.resolve([]);
 		}
@@ -814,7 +814,7 @@ class TaskService extends Disposable implements ITaskService {
 		this.openerService.open(URI.parse('https://go.microsoft.com/fwlink/?LinkId=733558'));
 	}
 
-	public build(): Thenable<ITaskSummary> {
+	public build(): Promise<ITaskSummary> {
 		return this.getGroupedTasks().then((tasks) => {
 			let runnable = this.createRunnableTask(tasks, TaskGroup.Build);
 			if (!runnable || !runnable.task) {
@@ -831,7 +831,7 @@ class TaskService extends Disposable implements ITaskService {
 		});
 	}
 
-	public runTest(): Thenable<ITaskSummary> {
+	public runTest(): Promise<ITaskSummary> {
 		return this.getGroupedTasks().then((tasks) => {
 			let runnable = this.createRunnableTask(tasks, TaskGroup.Test);
 			if (!runnable || !runnable.task) {
@@ -848,7 +848,7 @@ class TaskService extends Disposable implements ITaskService {
 		});
 	}
 
-	public run(task: Task, options?: ProblemMatcherRunOptions): Thenable<ITaskSummary> {
+	public run(task: Task, options?: ProblemMatcherRunOptions): Promise<ITaskSummary> {
 		return this.getGroupedTasks().then((grouped) => {
 			if (!task) {
 				throw new TaskError(Severity.Info, nls.localize('TaskServer.noTask', 'Requested task {0} to execute not found.', task.name), TaskErrors.TaskNotFound);
@@ -891,7 +891,7 @@ class TaskService extends Disposable implements ITaskService {
 		return false;
 	}
 
-	private attachProblemMatcher(task: ContributedTask | CustomTask): Thenable<Task> {
+	private attachProblemMatcher(task: ContributedTask | CustomTask): Promise<Task> {
 		interface ProblemMatcherPickEntry extends IQuickPickItem {
 			matcher: NamedProblemMatcher;
 			never?: boolean;
@@ -954,7 +954,7 @@ class TaskService extends Disposable implements ITaskService {
 		return Promise.resolve(task);
 	}
 
-	public getTasksForGroup(group: string): Thenable<Task[]> {
+	public getTasksForGroup(group: string): Promise<Task[]> {
 		return this.getGroupedTasks().then((groups) => {
 			let result: Task[] = [];
 			groups.forEach((tasks) => {
@@ -985,7 +985,7 @@ class TaskService extends Disposable implements ITaskService {
 		return false;
 	}
 
-	public customize(task: ContributedTask | CustomTask, properties?: CustomizationProperties, openConfig?: boolean): Thenable<void> {
+	public customize(task: ContributedTask | CustomTask, properties?: CustomizationProperties, openConfig?: boolean): Promise<void> {
 		let workspaceFolder = Task.getWorkspaceFolder(task);
 		if (!workspaceFolder) {
 			return Promise.resolve(undefined);
@@ -1029,7 +1029,7 @@ class TaskService extends Disposable implements ITaskService {
 			}
 		}
 
-		let promise: Thenable<void>;
+		let promise: Promise<void>;
 		if (!fileConfig) {
 			let value = {
 				version: '2.0.0',
@@ -1093,7 +1093,7 @@ class TaskService extends Disposable implements ITaskService {
 		});
 	}
 
-	private writeConfiguration(workspaceFolder: IWorkspaceFolder, key: string, value: any): Thenable<void> {
+	private writeConfiguration(workspaceFolder: IWorkspaceFolder, key: string, value: any): Promise<void> {
 		if (this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
 			return this.configurationService.updateValue(key, value, { resource: workspaceFolder.uri }, ConfigurationTarget.WORKSPACE);
 		} else if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
@@ -1103,7 +1103,7 @@ class TaskService extends Disposable implements ITaskService {
 		}
 	}
 
-	public openConfig(task: CustomTask | undefined): Thenable<void> {
+	public openConfig(task: CustomTask | undefined): Promise<void> {
 		let resource: URI;
 		if (task) {
 			resource = Task.getWorkspaceFolder(task).toResource(task._source.config.file);
@@ -1229,7 +1229,7 @@ class TaskService extends Disposable implements ITaskService {
 		};
 	}
 
-	private executeTask(task: Task, resolver: ITaskResolver): Thenable<ITaskSummary> {
+	private executeTask(task: Task, resolver: ITaskResolver): Promise<ITaskSummary> {
 		return ProblemMatcherRegistry.onReady().then(() => {
 			return this.textFileService.saveAll().then((value) => { // make sure all dirty files are saved
 				let executeResult = this.getTaskSystem().run(task, resolver);
@@ -1238,7 +1238,7 @@ class TaskService extends Disposable implements ITaskService {
 		});
 	}
 
-	private handleExecuteResult(executeResult: ITaskExecuteResult): Thenable<ITaskSummary> {
+	private handleExecuteResult(executeResult: ITaskExecuteResult): Promise<ITaskSummary> {
 		let key = Task.getRecentlyUsedKey(executeResult.task);
 		if (key) {
 			this.getRecentlyUsedTasks().set(key, key, Touch.AsOld);
@@ -1286,14 +1286,14 @@ class TaskService extends Disposable implements ITaskService {
 		});
 	}
 
-	public terminate(task: Task): Thenable<TaskTerminateResponse> {
+	public terminate(task: Task): Promise<TaskTerminateResponse> {
 		if (!this._taskSystem) {
 			return Promise.resolve({ success: true, task: undefined });
 		}
 		return this._taskSystem.terminate(task);
 	}
 
-	public terminateAll(): Thenable<TaskTerminateResponse[]> {
+	public terminateAll(): Promise<TaskTerminateResponse[]> {
 		if (!this._taskSystem) {
 			return Promise.resolve<TaskTerminateResponse[]>([]);
 		}
@@ -1333,7 +1333,7 @@ class TaskService extends Disposable implements ITaskService {
 		return this._taskSystem;
 	}
 
-	private getGroupedTasks(): Thenable<TaskMap> {
+	private getGroupedTasks(): Promise<TaskMap> {
 		return Promise.all([this.extensionService.activateByEvent('onCommand:workbench.action.tasks.runTask'), TaskDefinitionRegistry.onReady()]).then(() => {
 			let validTypes: IStringDictionary<boolean> = Object.create(null);
 			TaskDefinitionRegistry.all().forEach(definition => validTypes[definition.taskType] = true);
@@ -1500,7 +1500,7 @@ class TaskService extends Disposable implements ITaskService {
 		return result;
 	}
 
-	public getWorkspaceTasks(runSource: TaskRunSource = TaskRunSource.User): Thenable<Map<string, WorkspaceFolderTaskResult>> {
+	public getWorkspaceTasks(runSource: TaskRunSource = TaskRunSource.User): Promise<Map<string, WorkspaceFolderTaskResult>> {
 		if (this._workspaceTasksPromise) {
 			return this._workspaceTasksPromise;
 		}
@@ -1521,11 +1521,11 @@ class TaskService extends Disposable implements ITaskService {
 		});
 	}
 
-	private computeWorkspaceTasks(runSource: TaskRunSource = TaskRunSource.User): Thenable<Map<string, WorkspaceFolderTaskResult>> {
+	private computeWorkspaceTasks(runSource: TaskRunSource = TaskRunSource.User): Promise<Map<string, WorkspaceFolderTaskResult>> {
 		if (this.workspaceFolders.length === 0) {
 			return Promise.resolve(new Map<string, WorkspaceFolderTaskResult>());
 		} else {
-			let promises: Thenable<WorkspaceFolderTaskResult>[] = [];
+			let promises: Promise<WorkspaceFolderTaskResult>[] = [];
 			for (let folder of this.workspaceFolders) {
 				promises.push(this.computeWorkspaceFolderTasks(folder, runSource).then((value) => value, () => undefined));
 			}
@@ -1724,7 +1724,7 @@ class TaskService extends Disposable implements ITaskService {
 		};
 	}
 
-	public beforeShutdown(): boolean | Thenable<boolean> {
+	public beforeShutdown(): boolean | Promise<boolean> {
 		if (!this._taskSystem) {
 			return false;
 		}
@@ -1737,7 +1737,7 @@ class TaskService extends Disposable implements ITaskService {
 			return false;
 		}
 
-		let terminatePromise: Thenable<IConfirmationResult>;
+		let terminatePromise: Promise<IConfirmationResult>;
 		if (this._taskSystem.canAutoTerminate()) {
 			terminatePromise = Promise.resolve({ confirmed: true });
 		} else {
@@ -1901,8 +1901,8 @@ class TaskService extends Disposable implements ITaskService {
 		return entries;
 	}
 
-	private showQuickPick(tasks: Thenable<Task[]> | Task[], placeHolder: string, defaultEntry?: TaskQuickPickEntry, group: boolean = false, sort: boolean = false, selectedEntry?: TaskQuickPickEntry): Thenable<Task> {
-		let _createEntries = (): Thenable<TaskQuickPickEntry[]> => {
+	private showQuickPick(tasks: Promise<Task[]> | Task[], placeHolder: string, defaultEntry?: TaskQuickPickEntry, group: boolean = false, sort: boolean = false, selectedEntry?: TaskQuickPickEntry): Promise<Task> {
+		let _createEntries = (): Promise<TaskQuickPickEntry[]> => {
 			if (Array.isArray(tasks)) {
 				return Promise.resolve(this.createTaskQuickPickEntries(tasks, group, sort, selectedEntry));
 			} else {
@@ -1929,7 +1929,7 @@ class TaskService extends Disposable implements ITaskService {
 			}).then(entry => entry ? entry.task : undefined);
 	}
 
-	private showIgnoredFoldersMessage(): Thenable<void> {
+	private showIgnoredFoldersMessage(): Promise<void> {
 		if (this.ignoredWorkspaceFolders.length === 0 || !this.showIgnoreMessage) {
 			return Promise.resolve(undefined);
 		}
@@ -2135,7 +2135,7 @@ class TaskService extends Disposable implements ITaskService {
 		if (!this.canRunCommand()) {
 			return;
 		}
-		let runQuickPick = (promise?: Thenable<Task[]>) => {
+		let runQuickPick = (promise?: Promise<Task[]>) => {
 			this.showQuickPick(promise || this.getActiveTasks(),
 				nls.localize('TaskService.tastToTerminate', 'Select task to terminate'),
 				{
@@ -2152,7 +2152,7 @@ class TaskService extends Disposable implements ITaskService {
 		};
 		if (this.inTerminal()) {
 			let identifier = this.getTaskIdentifier(arg);
-			let promise: Thenable<Task[]>;
+			let promise: Promise<Task[]>;
 			if (identifier !== void 0) {
 				promise = this.getActiveTasks();
 				promise.then((tasks) => {
@@ -2191,7 +2191,7 @@ class TaskService extends Disposable implements ITaskService {
 		if (!this.canRunCommand()) {
 			return;
 		}
-		let runQuickPick = (promise?: Thenable<Task[]>) => {
+		let runQuickPick = (promise?: Promise<Task[]>) => {
 			this.showQuickPick(promise || this.getActiveTasks(),
 				nls.localize('TaskService.tastToRestart', 'Select the task to restart'),
 				{
@@ -2208,7 +2208,7 @@ class TaskService extends Disposable implements ITaskService {
 		};
 		if (this.inTerminal()) {
 			let identifier = this.getTaskIdentifier(arg);
-			let promise: Thenable<Task[]>;
+			let promise: Promise<Task[]>;
 			if (identifier !== void 0) {
 				promise = this.getActiveTasks();
 				promise.then((tasks) => {
@@ -2248,7 +2248,7 @@ class TaskService extends Disposable implements ITaskService {
 		if (!this.canRunCommand()) {
 			return undefined;
 		}
-		let taskPromise: Thenable<TaskMap>;
+		let taskPromise: Promise<TaskMap>;
 		if (this.schemaVersion === JsonSchemaVersion.V2_0_0) {
 			taskPromise = this.getGroupedTasks();
 		} else {
@@ -2314,7 +2314,7 @@ class TaskService extends Disposable implements ITaskService {
 			return candidate && !!candidate.task;
 		}
 
-		let stats = this.contextService.getWorkspace().folders.map<Thenable<IFileStat>>((folder) => {
+		let stats = this.contextService.getWorkspace().folders.map<Promise<IFileStat>>((folder) => {
 			return this.fileService.resolveFile(folder.toResource('.vscode/tasks.json')).then(stat => stat, () => undefined);
 		});
 
diff --git a/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts b/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts
index ca2ecfda0f6..b3703e99369 100644
--- a/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts
+++ b/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts
@@ -264,7 +264,7 @@ export class ProcessRunnerDetector {
 		});
 	}
 
-	private runDetection(process: LineProcess, command: string, isShellCommand: boolean, matcher: TaskDetectorMatcher, problemMatchers: string[], list: boolean): Thenable<DetectorResult> {
+	private runDetection(process: LineProcess, command: string, isShellCommand: boolean, matcher: TaskDetectorMatcher, problemMatchers: string[], list: boolean): Promise<DetectorResult> {
 		let tasks: string[] = [];
 		matcher.init();
 
diff --git a/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts b/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts
index dab5351d183..e0b33f622fb 100644
--- a/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts
+++ b/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts
@@ -83,7 +83,7 @@ export class TerminalPickerHandler extends QuickOpenHandler {
 		super();
 	}
 
-	public getResults(searchValue: string, token: CancellationToken): Thenable<QuickOpenModel> {
+	public getResults(searchValue: string, token: CancellationToken): Promise<QuickOpenModel> {
 		searchValue = searchValue.trim();
 		const normalizedSearchValueLowercase = stripWildcards(searchValue).toLowerCase();
 
diff --git a/src/vs/workbench/parts/terminal/common/terminalService.ts b/src/vs/workbench/parts/terminal/common/terminalService.ts
index 729c7d30b56..ec829b5562b 100644
--- a/src/vs/workbench/parts/terminal/common/terminalService.ts
+++ b/src/vs/workbench/parts/terminal/common/terminalService.ts
@@ -82,7 +82,7 @@ export abstract class TerminalService implements ITerminalService {
 		this.onInstancesChanged(() => updateTerminalContextKeys());
 	}
 
-	protected abstract _showTerminalCloseConfirmation(): PromiseLike<boolean>;
+	protected abstract _showTerminalCloseConfirmation(): Promise<boolean>;
 	protected abstract _showNotEnoughSpaceToast(): void;
 	public abstract createTerminal(shell?: IShellLaunchConfig, wasNewTerminalAction?: boolean): ITerminalInstance;
 	public abstract createTerminalRenderer(name: string): ITerminalInstance;
@@ -92,7 +92,7 @@ export abstract class TerminalService implements ITerminalService {
 	public abstract setContainers(panelContainer: HTMLElement, terminalContainer: HTMLElement): void;
 	public abstract requestExtHostProcess(proxy: ITerminalProcessExtHostProxy, shellLaunchConfig: IShellLaunchConfig, activeWorkspaceRootUri: URI, cols: number, rows: number): void;
 
-	private _onBeforeShutdown(): boolean | PromiseLike<boolean> {
+	private _onBeforeShutdown(): boolean | Promise<boolean> {
 		if (this.terminalInstances.length === 0) {
 			// No terminal instances, don't veto
 			return false;
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
index a999ca590b0..58d05bb0c5f 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
@@ -79,7 +79,7 @@ export class ToggleTerminalAction extends TogglePanelAction {
 		super(id, label, TERMINAL_PANEL_ID, panelService, partService);
 	}
 
-	public run(event?: any): PromiseLike<any> {
+	public run(event?: any): Promise<any> {
 		if (this.terminalService.terminalInstances.length === 0) {
 			// If there is not yet an instance attempt to create it here so that we can suggest a
 			// new shell on Windows (and not do so when the panel is restored on reload).
@@ -106,7 +106,7 @@ export class KillTerminalAction extends Action {
 		super(id, label, 'terminal-action kill');
 	}
 
-	public run(event?: any): PromiseLike<any> {
+	public run(event?: any): Promise<any> {
 		const instance = this.terminalService.getActiveInstance();
 		if (instance) {
 			instance.dispose(true);
@@ -304,7 +304,7 @@ export class CreateNewTerminalAction extends Action {
 		super(id, label, 'terminal-action new');
 	}
 
-	public run(event?: any): PromiseLike<any> {
+	public run(event?: any): Promise<any> {
 		const folders = this.workspaceContextService.getWorkspace().folders;
 		if (event instanceof MouseEvent && (event.altKey || event.ctrlKey)) {
 			const activeInstance = this.terminalService.getActiveInstance();
@@ -316,7 +316,7 @@ export class CreateNewTerminalAction extends Action {
 			}
 		}
 
-		let instancePromise: PromiseLike<ITerminalInstance>;
+		let instancePromise: Promise<ITerminalInstance>;
 		if (folders.length <= 1) {
 			// Allow terminal service to handle the path when there is only a
 			// single root
@@ -380,7 +380,7 @@ export class SplitTerminalAction extends Action {
 		super(id, label, 'terminal-action split');
 	}
 
-	public run(event?: any): PromiseLike<any> {
+	public run(event?: any): Promise<any> {
 		const instance = this._terminalService.getActiveInstance();
 		if (!instance) {
 			return Promise.resolve(void 0);
@@ -957,7 +957,7 @@ export class RenameTerminalAction extends Action {
 		super(id, label);
 	}
 
-	public run(entry?: TerminalEntry): PromiseLike<any> {
+	public run(entry?: TerminalEntry): Promise<any> {
 		const terminalInstance = entry ? entry.instance : this.terminalService.getActiveInstance();
 		if (!terminalInstance) {
 			return Promise.resolve(void 0);
@@ -1042,7 +1042,7 @@ export class QuickOpenTermAction extends Action {
 		super(id, label);
 	}
 
-	public run(): PromiseLike<void> {
+	public run(): Promise<void> {
 		return this.quickOpenService.show(TERMINAL_PICKER_PREFIX, null);
 	}
 }
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
index d2948cd4e4c..254251f7652 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
@@ -263,7 +263,7 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 			});
 	}
 
-	private _validateShellPaths(label: string, potentialPaths: string[]): PromiseLike<[string, string]> {
+	private _validateShellPaths(label: string, potentialPaths: string[]): Promise<[string, string]> {
 		const current = potentialPaths.shift();
 		return pfs.fileExists(current).then(exists => {
 			if (!exists) {
@@ -281,7 +281,7 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 		return activeInstance ? activeInstance : this.createTerminal(undefined, wasNewTerminalAction);
 	}
 
-	protected _showTerminalCloseConfirmation(): PromiseLike<boolean> {
+	protected _showTerminalCloseConfirmation(): Promise<boolean> {
 		let message;
 		if (this.terminalInstances.length === 1) {
 			message = nls.localize('terminalService.terminalCloseConfirmationSingular', "There is an active terminal session, do you want to kill it?");
diff --git a/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts b/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts
index c8d414391e7..2c48d75d8a6 100644
--- a/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts
+++ b/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts
@@ -42,7 +42,7 @@ export class SelectColorThemeAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.themeService.getColorThemes().then(themes => {
 			const currentTheme = this.themeService.getColorTheme();
 
@@ -104,7 +104,7 @@ class SelectIconThemeAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<void> {
+	run(): Promise<void> {
 		return this.themeService.getFileIconThemes().then(themes => {
 			const currentTheme = this.themeService.getFileIconTheme();
 
@@ -193,7 +193,7 @@ class GenerateColorThemeAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		let theme = this.themeService.getColorTheme();
 		let colors = Registry.as<IColorRegistry>(ColorRegistryExtensions.ColorContribution).getColors();
 		let colorIds = colors.map(c => c.id).sort();
diff --git a/src/vs/workbench/parts/themes/test/electron-browser/themes.test.contribution.ts b/src/vs/workbench/parts/themes/test/electron-browser/themes.test.contribution.ts
index f2696c752d3..19aaed04708 100644
--- a/src/vs/workbench/parts/themes/test/electron-browser/themes.test.contribution.ts
+++ b/src/vs/workbench/parts/themes/test/electron-browser/themes.test.contribution.ts
@@ -214,7 +214,7 @@ class Snapper {
 		}
 	}
 
-	public captureSyntaxTokens(fileName: string, content: string): Thenable<IToken[]> {
+	public captureSyntaxTokens(fileName: string, content: string): Promise<IToken[]> {
 		const modeId = this.modeService.getModeIdByFilepathOrFirstLine(fileName);
 		return this.textMateService.createGrammar(modeId).then((grammar) => {
 			let lines = content.split(/\r\n|\r|\n/);
diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
index 417f3060132..81e3ab1ff77 100644
--- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
@@ -47,7 +47,7 @@ function renderBody(
 
 export class ReleaseNotesManager {
 
-	private _releaseNotesCache: { [version: string]: Thenable<string>; } = Object.create(null);
+	private _releaseNotesCache: { [version: string]: Promise<string>; } = Object.create(null);
 
 	private _currentReleaseNotes: WebviewEditorInput | undefined = undefined;
 	private _lastText: string;
@@ -110,7 +110,7 @@ export class ReleaseNotesManager {
 		return true;
 	}
 
-	private loadReleaseNotes(version: string): Thenable<string> {
+	private loadReleaseNotes(version: string): Promise<string> {
 		const match = /^(\d+\.\d+)\./.exec(version);
 		if (!match) {
 			return Promise.reject(new Error('not found'));
@@ -189,7 +189,7 @@ export class ReleaseNotesManager {
 	}
 
 	private async getRenderer(text: string): Promise<marked.Renderer> {
-		let result: Thenable<ITokenizationSupport>[] = [];
+		let result: Promise<ITokenizationSupport>[] = [];
 		const renderer = new marked.Renderer();
 		renderer.code = (_code, lang) => {
 			const modeId = this._modeService.getModeIdForLanguageName(lang);
diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index 2ea9c281be0..afd15901fb1 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -46,7 +46,7 @@ export class OpenLatestReleaseNotesInBrowserAction extends Action {
 		super('update.openLatestReleaseNotes', nls.localize('releaseNotes', "Release Notes"), null, true);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		if (product.releaseNotesUrl) {
 			const uri = URI.parse(product.releaseNotesUrl);
 			return this.openerService.open(uri);
@@ -66,7 +66,7 @@ export abstract class AbstractShowReleaseNotesAction extends Action {
 		super(id, label, null, true);
 	}
 
-	run(): Thenable<boolean> {
+	run(): Promise<boolean> {
 		if (!this.enabled) {
 			return Promise.resolve(false);
 		}
diff --git a/src/vs/workbench/parts/url/electron-browser/url.contribution.ts b/src/vs/workbench/parts/url/electron-browser/url.contribution.ts
index 1bb42f5e8b9..efde9da784b 100644
--- a/src/vs/workbench/parts/url/electron-browser/url.contribution.ts
+++ b/src/vs/workbench/parts/url/electron-browser/url.contribution.ts
@@ -26,7 +26,7 @@ export class OpenUrlAction extends Action {
 		super(id, label);
 	}
 
-	run(): Thenable<any> {
+	run(): Promise<any> {
 		return this.quickInputService.input({ prompt: 'URL to open' }).then(input => {
 			const uri = URI.parse(input);
 			this.urlService.open(uri);
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts b/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts
index dd66bdbff8d..4f42f3bf403 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts
@@ -54,7 +54,7 @@ export class OpenWebviewDeveloperToolsAction extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		const elements = document.querySelectorAll('webview.ready');
 		for (let i = 0; i < elements.length; i++) {
 			try {
@@ -79,7 +79,7 @@ export class ReloadWebviewAction extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<any> {
+	public run(): Promise<any> {
 		for (const webview of this.getVisibleWebviews()) {
 			webview.reload();
 		}
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
index cb43fb212b3..40896f71e7f 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
@@ -158,7 +158,7 @@ export class WebviewEditor extends BaseWebviewEditor {
 		super.clearInput();
 	}
 
-	setInput(input: WebviewEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: WebviewEditorInput, options: EditorOptions, token: CancellationToken): Promise<void> {
 		if (this.input) {
 			(this.input as WebviewEditorInput).releaseWebview(this);
 			this._webview = undefined;
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
index 8535a2c253b..4da45eee721 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
@@ -215,7 +215,7 @@ export class WebviewEditorInput extends EditorInput {
 		}
 	}
 
-	public resolve(): Thenable<IEditorModel> {
+	public resolve(): Promise<IEditorModel> {
 		if (this.reviver && !this._revived) {
 			this._revived = true;
 			return this.reviver.reviveWebview(this).then(() => new EditorModel());
diff --git a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts
index 97b869c2526..ab6f0fbbf0a 100644
--- a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts
+++ b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts
@@ -121,7 +121,7 @@ export class WelcomeOverlayAction extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<void> {
+	public run(): Promise<void> {
 		if (!welcomeOverlay) {
 			welcomeOverlay = this.instantiationService.createInstance(WelcomeOverlay);
 		}
@@ -142,7 +142,7 @@ export class HideWelcomeOverlayAction extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<void> {
+	public run(): Promise<void> {
 		if (welcomeOverlay) {
 			welcomeOverlay.hide();
 		}
diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
index 09303ad142d..536af2f0491 100644
--- a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
+++ b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
@@ -129,7 +129,7 @@ export class WelcomePageAction extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<void> {
+	public run(): Promise<void> {
 		return this.instantiationService.createInstance(WelcomePage)
 			.openEditor()
 			.then(() => undefined);
@@ -290,7 +290,7 @@ class WelcomePage {
 		return this.editorService.openEditor(this.editorInput, { pinned: false });
 	}
 
-	private onReady(container: HTMLElement, recentlyOpened: Thenable<{ files: URI[]; workspaces: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[]; }>, installedExtensions: Promise<IExtensionStatus[]>): void {
+	private onReady(container: HTMLElement, recentlyOpened: Promise<{ files: URI[]; workspaces: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[]; }>, installedExtensions: Promise<IExtensionStatus[]>): void {
 		const enabled = isWelcomePageEnabled(this.configurationService, this.contextService);
 		const showOnStartup = <HTMLInputElement>container.querySelector('#showOnStartup');
 		if (enabled) {
diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.ts
index eda710840e1..fd9080cdabd 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.ts
@@ -35,7 +35,7 @@ export class EditorWalkThroughAction extends Action {
 		super(id, label);
 	}
 
-	public run(): Thenable<void> {
+	public run(): Promise<void> {
 		const input = this.instantiationService.createInstance(WalkThroughInput, inputOptions);
 		return this.editorService.openEditor(input, { pinned: true })
 			.then(() => void (0));
diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
index 1bd289fda4d..11de28ddead 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
@@ -251,7 +251,7 @@ export class WalkThroughPart extends BaseEditor {
 		this.scrollbar.setScrollPosition({ scrollTop: scrollPosition.scrollTop + scrollDimensions.height });
 	}
 
-	setInput(input: WalkThroughInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: WalkThroughInput, options: EditorOptions, token: CancellationToken): Promise<void> {
 		if (this.input instanceof WalkThroughInput) {
 			this.saveTextEditorViewState(this.input);
 		}
diff --git a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts
index 37d2c37008d..45629ee297d 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts
@@ -25,9 +25,9 @@ export class WalkThroughContentProvider implements ITextModelContentProvider, IW
 		this.textModelResolverService.registerTextModelContentProvider(Schemas.walkThrough, this);
 	}
 
-	public provideTextContent(resource: URI): Thenable<ITextModel> {
+	public provideTextContent(resource: URI): Promise<ITextModel> {
 		const query = resource.query ? JSON.parse(resource.query) : {};
-		const content: Thenable<string | ITextBufferFactory> = (query.moduleId ? new Promise<string>((resolve, reject) => {
+		const content: Promise<string | ITextBufferFactory> = (query.moduleId ? new Promise<string>((resolve, reject) => {
 			require([query.moduleId], content => {
 				try {
 					resolve(content.default());
@@ -60,7 +60,7 @@ export class WalkThroughSnippetContentProvider implements ITextModelContentProvi
 		this.textModelResolverService.registerTextModelContentProvider(Schemas.walkThroughSnippet, this);
 	}
 
-	public provideTextContent(resource: URI): Thenable<ITextModel> {
+	public provideTextContent(resource: URI): Promise<ITextModel> {
 		return this.textFileService.resolveTextContent(URI.file(resource.fsPath)).then(content => {
 			let codeEditorModel = this.modelService.getModel(resource);
 			if (!codeEditorModel) {
diff --git a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts
index 78b0275ca9b..1b7bb164121 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts
@@ -50,7 +50,7 @@ export class WalkThroughInput extends EditorInput {
 
 	private disposables: IDisposable[] = [];
 
-	private promise: Thenable<WalkThroughModel> | null;
+	private promise: Promise<WalkThroughModel> | null;
 
 	private maxTopScroll = 0;
 	private maxBottomScroll = 0;
@@ -100,7 +100,7 @@ export class WalkThroughInput extends EditorInput {
 		return this.options.onReady;
 	}
 
-	resolve(): Thenable<WalkThroughModel> {
+	resolve(): Promise<WalkThroughModel> {
 		if (!this.promise) {
 			this.promise = this.textModelResolverService.createModelReference(this.options.resource)
 				.then(ref => {
@@ -108,7 +108,7 @@ export class WalkThroughInput extends EditorInput {
 						return new WalkThroughModel(ref, []);
 					}
 
-					const snippets: Thenable<IReference<ITextEditorModel>>[] = [];
+					const snippets: Promise<IReference<ITextEditorModel>>[] = [];
 					let i = 0;
 					const renderer = new marked.Renderer();
 					renderer.code = (code, lang) => {
diff --git a/src/vs/workbench/services/backup/common/backup.ts b/src/vs/workbench/services/backup/common/backup.ts
index 1d7c2cadbb5..614248c44e4 100644
--- a/src/vs/workbench/services/backup/common/backup.ts
+++ b/src/vs/workbench/services/backup/common/backup.ts
@@ -22,7 +22,7 @@ export interface IBackupFileService {
 	/**
 	 * Finds out if there are any backups stored.
 	 */
-	hasBackups(): Thenable<boolean>;
+	hasBackups(): Promise<boolean>;
 
 	/**
 	 * Loads the backup resource for a particular resource within the current workspace.
@@ -30,7 +30,7 @@ export interface IBackupFileService {
 	 * @param resource The resource that is backed up.
 	 * @return The backup resource if any.
 	 */
-	loadBackupResource(resource: Uri): Thenable<Uri | undefined>;
+	loadBackupResource(resource: Uri): Promise<Uri | undefined>;
 
 	/**
 	 * Given a resource, returns the associated backup resource.
@@ -47,14 +47,14 @@ export interface IBackupFileService {
 	 * @param content The content of the resource as snapshot.
 	 * @param versionId The version id of the resource to backup.
 	 */
-	backupResource(resource: Uri, content: ITextSnapshot, versionId?: number): Thenable<void>;
+	backupResource(resource: Uri, content: ITextSnapshot, versionId?: number): Promise<void>;
 
 	/**
 	 * Gets a list of file backups for the current workspace.
 	 *
 	 * @return The list of backups.
 	 */
-	getWorkspaceFileBackups(): Thenable<Uri[]>;
+	getWorkspaceFileBackups(): Promise<Uri[]>;
 
 	/**
 	 * Resolves the backup for the given resource.
@@ -62,18 +62,18 @@ export interface IBackupFileService {
 	 * @param value The contents from a backup resource as stream.
 	 * @return The backup file's backed up content as text buffer factory.
 	 */
-	resolveBackupContent(backup: Uri): Thenable<ITextBufferFactory | undefined>;
+	resolveBackupContent(backup: Uri): Promise<ITextBufferFactory | undefined>;
 
 	/**
 	 * Discards the backup associated with a resource if it exists..
 	 *
 	 * @param resource The resource whose backup is being discarded discard to back up.
 	 */
-	discardResourceBackup(resource: Uri): Thenable<void>;
+	discardResourceBackup(resource: Uri): Promise<void>;
 
 	/**
 	 * Discards all backups associated with the current workspace and prevents further backups from
 	 * being made.
 	 */
-	discardAllWorkspaceBackups(): Thenable<void>;
+	discardAllWorkspaceBackups(): Promise<void>;
 }
diff --git a/src/vs/workbench/services/backup/node/backupFileService.ts b/src/vs/workbench/services/backup/node/backupFileService.ts
index 1d7b890e388..2a19636ebc0 100644
--- a/src/vs/workbench/services/backup/node/backupFileService.ts
+++ b/src/vs/workbench/services/backup/node/backupFileService.ts
@@ -16,7 +16,7 @@ import { createTextBufferFactoryFromStream, createTextBufferFactoryFromSnapshot
 import { keys } from 'vs/base/common/map';
 
 export interface IBackupFilesModel {
-	resolve(backupRoot: string): Thenable<IBackupFilesModel>;
+	resolve(backupRoot: string): Promise<IBackupFilesModel>;
 
 	add(resource: Uri, versionId?: number): void;
 	has(resource: Uri, versionId?: number): boolean;
@@ -50,7 +50,7 @@ export class BackupSnapshot implements ITextSnapshot {
 export class BackupFilesModel implements IBackupFilesModel {
 	private cache: { [resource: string]: number /* version ID */ } = Object.create(null);
 
-	resolve(backupRoot: string): Thenable<IBackupFilesModel> {
+	resolve(backupRoot: string): Promise<IBackupFilesModel> {
 		return pfs.readDirsInDir(backupRoot).then(backupSchemas => {
 
 			// For all supported schemas
@@ -113,7 +113,7 @@ export class BackupFileService implements IBackupFileService {
 	private backupWorkspacePath: string;
 
 	private isShuttingDown: boolean;
-	private ready: Thenable<IBackupFilesModel>;
+	private ready: Promise<IBackupFilesModel>;
 	private ioOperationQueues: ResourceQueue; // queue IO operations to ensure write order
 
 	constructor(
@@ -132,19 +132,19 @@ export class BackupFileService implements IBackupFileService {
 		this.ready = this.init();
 	}
 
-	private init(): Thenable<IBackupFilesModel> {
+	private init(): Promise<IBackupFilesModel> {
 		const model = new BackupFilesModel();
 
 		return model.resolve(this.backupWorkspacePath);
 	}
 
-	hasBackups(): Thenable<boolean> {
+	hasBackups(): Promise<boolean> {
 		return this.ready.then(model => {
 			return model.count() > 0;
 		});
 	}
 
-	loadBackupResource(resource: Uri): Thenable<Uri | undefined> {
+	loadBackupResource(resource: Uri): Promise<Uri | undefined> {
 		return this.ready.then(model => {
 
 			// Return directly if we have a known backup with that resource
@@ -157,7 +157,7 @@ export class BackupFileService implements IBackupFileService {
 		});
 	}
 
-	backupResource(resource: Uri, content: ITextSnapshot, versionId?: number): Thenable<void> {
+	backupResource(resource: Uri, content: ITextSnapshot, versionId?: number): Promise<void> {
 		if (this.isShuttingDown) {
 			return Promise.resolve();
 		}
@@ -177,7 +177,7 @@ export class BackupFileService implements IBackupFileService {
 		});
 	}
 
-	discardResourceBackup(resource: Uri): Thenable<void> {
+	discardResourceBackup(resource: Uri): Promise<void> {
 		return this.ready.then(model => {
 			const backupResource = this.toBackupResource(resource);
 
@@ -187,7 +187,7 @@ export class BackupFileService implements IBackupFileService {
 		});
 	}
 
-	discardAllWorkspaceBackups(): Thenable<void> {
+	discardAllWorkspaceBackups(): Promise<void> {
 		this.isShuttingDown = true;
 
 		return this.ready.then(model => {
@@ -195,9 +195,9 @@ export class BackupFileService implements IBackupFileService {
 		});
 	}
 
-	getWorkspaceFileBackups(): Thenable<Uri[]> {
+	getWorkspaceFileBackups(): Promise<Uri[]> {
 		return this.ready.then(model => {
-			const readPromises: Thenable<Uri>[] = [];
+			const readPromises: Promise<Uri>[] = [];
 
 			model.get().forEach(fileBackup => {
 				readPromises.push(
@@ -209,7 +209,7 @@ export class BackupFileService implements IBackupFileService {
 		});
 	}
 
-	resolveBackupContent(backup: Uri): Thenable<ITextBufferFactory> {
+	resolveBackupContent(backup: Uri): Promise<ITextBufferFactory> {
 		return this.fileService.resolveStreamContent(backup, BACKUP_FILE_RESOLVE_OPTIONS).then(content => {
 
 			// Add a filter method to filter out everything until the meta marker
@@ -247,11 +247,11 @@ export class InMemoryBackupFileService implements IBackupFileService {
 
 	private backups: Map<string, ITextSnapshot> = new Map();
 
-	hasBackups(): Thenable<boolean> {
+	hasBackups(): Promise<boolean> {
 		return Promise.resolve(this.backups.size > 0);
 	}
 
-	loadBackupResource(resource: Uri): Thenable<Uri | undefined> {
+	loadBackupResource(resource: Uri): Promise<Uri | undefined> {
 		const backupResource = this.toBackupResource(resource);
 		if (this.backups.has(backupResource.toString())) {
 			return Promise.resolve(backupResource);
@@ -260,14 +260,14 @@ export class InMemoryBackupFileService implements IBackupFileService {
 		return Promise.resolve();
 	}
 
-	backupResource(resource: Uri, content: ITextSnapshot, versionId?: number): Thenable<void> {
+	backupResource(resource: Uri, content: ITextSnapshot, versionId?: number): Promise<void> {
 		const backupResource = this.toBackupResource(resource);
 		this.backups.set(backupResource.toString(), content);
 
 		return Promise.resolve();
 	}
 
-	resolveBackupContent(backupResource: Uri): Thenable<ITextBufferFactory | undefined> {
+	resolveBackupContent(backupResource: Uri): Promise<ITextBufferFactory | undefined> {
 		const snapshot = this.backups.get(backupResource.toString());
 		if (snapshot) {
 			return Promise.resolve(createTextBufferFactoryFromSnapshot(snapshot));
@@ -276,17 +276,17 @@ export class InMemoryBackupFileService implements IBackupFileService {
 		return Promise.resolve();
 	}
 
-	getWorkspaceFileBackups(): Thenable<Uri[]> {
+	getWorkspaceFileBackups(): Promise<Uri[]> {
 		return Promise.resolve(keys(this.backups).map(key => Uri.parse(key)));
 	}
 
-	discardResourceBackup(resource: Uri): Thenable<void> {
+	discardResourceBackup(resource: Uri): Promise<void> {
 		this.backups.delete(this.toBackupResource(resource).toString());
 
 		return Promise.resolve();
 	}
 
-	discardAllWorkspaceBackups(): Thenable<void> {
+	discardAllWorkspaceBackups(): Promise<void> {
 		this.backups.clear();
 
 		return Promise.resolve();
diff --git a/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.ts b/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.ts
index 1774512d1e8..1337b1f1fb6 100644
--- a/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.ts
+++ b/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.ts
@@ -171,7 +171,7 @@ class BulkEditModel implements IDisposable {
 		}
 
 		this._tasks = [];
-		const promises: Thenable<any>[] = [];
+		const promises: Promise<any>[] = [];
 
 		this._edits.forEach((value, key) => {
 			const promise = this._textModelResolverService.createModelReference(URI.parse(key)).then(ref => {
diff --git a/src/vs/workbench/services/codeEditor/browser/codeEditorService.ts b/src/vs/workbench/services/codeEditor/browser/codeEditorService.ts
index 87f25ef8129..fec2a83d837 100644
--- a/src/vs/workbench/services/codeEditor/browser/codeEditorService.ts
+++ b/src/vs/workbench/services/codeEditor/browser/codeEditorService.ts
@@ -33,7 +33,7 @@ export class CodeEditorService extends CodeEditorServiceImpl {
 		return null;
 	}
 
-	openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Thenable<ICodeEditor | null> {
+	openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null> {
 
 		// Special case: If the active editor is a diff editor and the request to open originates and
 		// targets the modified side of it, we just apply the request there to prevent opening the modified
@@ -60,7 +60,7 @@ export class CodeEditorService extends CodeEditorServiceImpl {
 		return this.doOpenCodeEditor(input, source, sideBySide);
 	}
 
-	private doOpenCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Thenable<ICodeEditor | null> {
+	private doOpenCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null> {
 		return this.editorService.openEditor(input, sideBySide ? SIDE_GROUP : ACTIVE_GROUP).then(control => {
 			if (control) {
 				const widget = control.getControl();
diff --git a/src/vs/workbench/services/commands/common/commandService.ts b/src/vs/workbench/services/commands/common/commandService.ts
index 4bcf865fc8f..502d4f99f1a 100644
--- a/src/vs/workbench/services/commands/common/commandService.ts
+++ b/src/vs/workbench/services/commands/common/commandService.ts
@@ -35,7 +35,7 @@ export class CommandService extends Disposable implements ICommandService {
 		// we don't wait for it when the extension
 		// host didn't yet start and the command is already registered
 
-		const activation: Thenable<any> = this._extensionService.activateByEvent(`onCommand:${id}`);
+		const activation: Promise<any> = this._extensionService.activateByEvent(`onCommand:${id}`);
 		const commandIsRegistered = !!CommandsRegistry.getCommand(id);
 
 		if (!this._extensionHostIsReady && commandIsRegistered) {
diff --git a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
index f0a9488c435..0a5b6f6d487 100644
--- a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
+++ b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
@@ -30,13 +30,13 @@ export interface IConfigurationResolverService {
 	 * @param section For example, 'tasks' or 'debug'. Used for resolving inputs.
 	 * @param variables Aliases for commands.
 	 */
-	resolveWithInteractionReplace(folder: IWorkspaceFolder, config: any, section?: string, variables?: IStringDictionary<string>): Thenable<any>;
+	resolveWithInteractionReplace(folder: IWorkspaceFolder, config: any, section?: string, variables?: IStringDictionary<string>): Promise<any>;
 
 	/**
 	 * Similar to resolveWithInteractionReplace, except without the replace. Returns a map of variables and their resolution.
 	 * Keys in the map will be of the format input:variableName or command:variableName.
 	 */
-	resolveWithInteraction(folder: IWorkspaceFolder, config: any, section?: string, variables?: IStringDictionary<string>): Thenable<Map<string, string>>;
+	resolveWithInteraction(folder: IWorkspaceFolder, config: any, section?: string, variables?: IStringDictionary<string>): Promise<Map<string, string>>;
 }
 
 export const enum ConfiguredInputType {
diff --git a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
index 7e34b197669..37f675765aa 100644
--- a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
@@ -82,7 +82,7 @@ export class ConfigurationResolverService extends AbstractVariableResolverServic
 		}, envVariables);
 	}
 
-	public resolveWithInteractionReplace(folder: IWorkspaceFolder, config: any, section?: string, variables?: IStringDictionary<string>): Thenable<any> {
+	public resolveWithInteractionReplace(folder: IWorkspaceFolder, config: any, section?: string, variables?: IStringDictionary<string>): Promise<any> {
 		// resolve any non-interactive variables
 		config = this.resolveAny(folder, config);
 
@@ -99,7 +99,7 @@ export class ConfigurationResolverService extends AbstractVariableResolverServic
 		});
 	}
 
-	public resolveWithInteraction(folder: IWorkspaceFolder, config: any, section?: string, variables?: IStringDictionary<string>): Thenable<Map<string, string>> {
+	public resolveWithInteraction(folder: IWorkspaceFolder, config: any, section?: string, variables?: IStringDictionary<string>): Promise<Map<string, string>> {
 		// resolve any non-interactive variables
 		const resolved = this.resolveAnyMap(folder, config);
 		config = resolved.newConfig;
@@ -143,7 +143,7 @@ export class ConfigurationResolverService extends AbstractVariableResolverServic
 	 * @param configuration
 	 * @param variableToCommandMap Aliases for commands
 	 */
-	private resolveWithCommands(configuration: any, variableToCommandMap: IStringDictionary<string>): Thenable<IStringDictionary<string>> {
+	private resolveWithCommands(configuration: any, variableToCommandMap: IStringDictionary<string>): Promise<IStringDictionary<string>> {
 		if (!configuration) {
 			return Promise.resolve(undefined);
 		}
@@ -155,7 +155,7 @@ export class ConfigurationResolverService extends AbstractVariableResolverServic
 		let cancelled = false;
 		const commandValueMapping: IStringDictionary<string> = Object.create(null);
 
-		const factory: { (): Thenable<any> }[] = commands.map(commandVariable => {
+		const factory: { (): Promise<any> }[] = commands.map(commandVariable => {
 			return () => {
 				let commandId = variableToCommandMap ? variableToCommandMap[commandVariable] : undefined;
 				if (!commandId) {
diff --git a/src/vs/workbench/services/configurationResolver/node/variableResolver.ts b/src/vs/workbench/services/configurationResolver/node/variableResolver.ts
index 6f47dc5b3ea..af4d991f3d3 100644
--- a/src/vs/workbench/services/configurationResolver/node/variableResolver.ts
+++ b/src/vs/workbench/services/configurationResolver/node/variableResolver.ts
@@ -82,11 +82,11 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe
 		return { newConfig, resolvedVariables };
 	}
 
-	public resolveWithInteractionReplace(folder: IWorkspaceFolder, config: any): Thenable<any> {
+	public resolveWithInteractionReplace(folder: IWorkspaceFolder, config: any): Promise<any> {
 		throw new Error('resolveWithInteractionReplace not implemented.');
 	}
 
-	public resolveWithInteraction(folder: IWorkspaceFolder, config: any): Thenable<any> {
+	public resolveWithInteraction(folder: IWorkspaceFolder, config: any): Promise<any> {
 		throw new Error('resolveWithInteraction not implemented.');
 	}
 
diff --git a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
index 860f6bb85fc..28d3f526e7a 100644
--- a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
+++ b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
@@ -495,9 +495,9 @@ class MockCommandService implements ICommandService {
 class MockQuickInputService implements IQuickInputService {
 	_serviceBrand: any;
 
-	public pick<T extends IQuickPickItem>(picks: Thenable<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: IPickOptions<T> & { canPickMany: true }, token?: CancellationToken): Promise<T[]>;
-	public pick<T extends IQuickPickItem>(picks: Thenable<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: IPickOptions<T> & { canPickMany: false }, token?: CancellationToken): Promise<T>;
-	public pick<T extends IQuickPickItem>(picks: Thenable<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: Omit<IPickOptions<T>, 'canPickMany'>, token?: CancellationToken): Promise<T> {
+	public pick<T extends IQuickPickItem>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: IPickOptions<T> & { canPickMany: true }, token?: CancellationToken): Promise<T[]>;
+	public pick<T extends IQuickPickItem>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: IPickOptions<T> & { canPickMany: false }, token?: CancellationToken): Promise<T>;
+	public pick<T extends IQuickPickItem>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: Omit<IPickOptions<T>, 'canPickMany'>, token?: CancellationToken): Promise<T> {
 		if (Types.isArray(picks)) {
 			return Promise.resolve(<T>{ label: 'selectedPick', description: 'pick description' });
 		} else {
diff --git a/src/vs/workbench/services/decorations/browser/decorations.ts b/src/vs/workbench/services/decorations/browser/decorations.ts
index e8098f9484b..73cfd4cce86 100644
--- a/src/vs/workbench/services/decorations/browser/decorations.ts
+++ b/src/vs/workbench/services/decorations/browser/decorations.ts
@@ -31,7 +31,7 @@ export interface IDecoration {
 export interface IDecorationsProvider {
 	readonly label: string;
 	readonly onDidChange: Event<URI[]>;
-	provideDecorations(uri: URI, token: CancellationToken): IDecorationData | Thenable<IDecorationData> | undefined;
+	provideDecorations(uri: URI, token: CancellationToken): IDecorationData | Promise<IDecorationData> | undefined;
 }
 
 export interface IResourceDecorationChangeEvent {
diff --git a/src/vs/workbench/services/decorations/browser/decorationsService.ts b/src/vs/workbench/services/decorations/browser/decorationsService.ts
index abf01097120..fbe224d33d3 100644
--- a/src/vs/workbench/services/decorations/browser/decorationsService.ts
+++ b/src/vs/workbench/services/decorations/browser/decorationsService.ts
@@ -222,7 +222,7 @@ class FileDecorationChangeEvent implements IResourceDecorationChangeEvent {
 class DecorationDataRequest {
 	constructor(
 		readonly source: CancellationTokenSource,
-		readonly thenable: Thenable<void>,
+		readonly thenable: Promise<void>,
 	) { }
 }
 
diff --git a/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts b/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts
index f6ab8c3654e..4d43f2bb30b 100644
--- a/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts
+++ b/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts
@@ -43,7 +43,7 @@ export class DialogService implements IDialogService {
 		@ILogService private logService: ILogService
 	) { }
 
-	confirm(confirmation: IConfirmation): Thenable<IConfirmationResult> {
+	confirm(confirmation: IConfirmation): Promise<IConfirmationResult> {
 		this.logService.trace('DialogService#confirm', confirmation.message);
 
 		const { options, buttonIndexMap } = this.massageMessageBoxOptions(this.getConfirmOptions(confirmation));
@@ -93,7 +93,7 @@ export class DialogService implements IDialogService {
 		return opts;
 	}
 
-	show(severity: Severity, message: string, buttons: string[], dialogOptions?: IDialogOptions): Thenable<number> {
+	show(severity: Severity, message: string, buttons: string[], dialogOptions?: IDialogOptions): Promise<number> {
 		this.logService.trace('DialogService#show', message);
 
 		const { options, buttonIndexMap } = this.massageMessageBoxOptions({
@@ -212,7 +212,7 @@ export class FileDialogService implements IFileDialogService {
 		};
 	}
 
-	public pickFileFolderAndOpen(options: IPickAndOpenOptions): Thenable<any> {
+	public pickFileFolderAndOpen(options: IPickAndOpenOptions): Promise<any> {
 		let defaultUri = options.defaultUri;
 		if (!defaultUri) {
 			options.defaultUri = this.defaultFilePath(Schemas.file);
@@ -221,7 +221,7 @@ export class FileDialogService implements IFileDialogService {
 
 	}
 
-	public pickFileAndOpen(options: IPickAndOpenOptions): Thenable<any> {
+	public pickFileAndOpen(options: IPickAndOpenOptions): Promise<any> {
 		let defaultUri = options.defaultUri;
 		if (!defaultUri) {
 			options.defaultUri = this.defaultFilePath(Schemas.file);
@@ -229,7 +229,7 @@ export class FileDialogService implements IFileDialogService {
 		return this.windowService.pickFileAndOpen(this.toNativeOpenDialogOptions(options));
 	}
 
-	public pickFolderAndOpen(options: IPickAndOpenOptions): Thenable<any> {
+	public pickFolderAndOpen(options: IPickAndOpenOptions): Promise<any> {
 		let defaultUri = options.defaultUri;
 		if (!defaultUri) {
 			options.defaultUri = this.defaultFolderPath(Schemas.file);
@@ -237,7 +237,7 @@ export class FileDialogService implements IFileDialogService {
 		return this.windowService.pickFolderAndOpen(this.toNativeOpenDialogOptions(options));
 	}
 
-	public pickWorkspaceAndOpen(options: IPickAndOpenOptions): Thenable<void> {
+	public pickWorkspaceAndOpen(options: IPickAndOpenOptions): Promise<void> {
 		let defaultUri = options.defaultUri;
 		if (!defaultUri) {
 			options.defaultUri = this.defaultWorkspacePath(Schemas.file);
@@ -254,7 +254,7 @@ export class FileDialogService implements IFileDialogService {
 		};
 	}
 
-	public showSaveDialog(options: ISaveDialogOptions): Thenable<URI> {
+	public showSaveDialog(options: ISaveDialogOptions): Promise<URI> {
 		const defaultUri = options.defaultUri;
 		if (defaultUri && defaultUri.scheme !== Schemas.file) {
 			return Promise.reject(new Error('Not supported - Save-dialogs can only be opened on `file`-uris.'));
@@ -267,7 +267,7 @@ export class FileDialogService implements IFileDialogService {
 		});
 	}
 
-	public showOpenDialog(options: IOpenDialogOptions): Thenable<URI[] | undefined> {
+	public showOpenDialog(options: IOpenDialogOptions): Promise<URI[] | undefined> {
 		const defaultUri = options.defaultUri;
 		if (defaultUri && defaultUri.scheme !== Schemas.file) {
 			return Promise.reject(new Error('Not supported - Open-dialogs can only be opened on `file`-uris.'));
diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts
index 710eae571f9..bf52d2fe1b3 100644
--- a/src/vs/workbench/services/editor/browser/editorService.ts
+++ b/src/vs/workbench/services/editor/browser/editorService.ts
@@ -215,11 +215,11 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 
 	//#region openEditor()
 
-	openEditor(editor: IEditorInput, options?: IEditorOptions | ITextEditorOptions, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Thenable<IEditor>;
-	openEditor(editor: IResourceInput | IUntitledResourceInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Thenable<ITextEditor>;
-	openEditor(editor: IResourceDiffInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Thenable<ITextDiffEditor>;
-	openEditor(editor: IResourceSideBySideInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Thenable<ITextSideBySideEditor>;
-	openEditor(editor: IEditorInput | IResourceEditor, optionsOrGroup?: IEditorOptions | ITextEditorOptions | IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE, group?: GroupIdentifier): Thenable<IEditor> {
+	openEditor(editor: IEditorInput, options?: IEditorOptions | ITextEditorOptions, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<IEditor>;
+	openEditor(editor: IResourceInput | IUntitledResourceInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<ITextEditor>;
+	openEditor(editor: IResourceDiffInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<ITextDiffEditor>;
+	openEditor(editor: IResourceSideBySideInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<ITextSideBySideEditor>;
+	openEditor(editor: IEditorInput | IResourceEditor, optionsOrGroup?: IEditorOptions | ITextEditorOptions | IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE, group?: GroupIdentifier): Promise<IEditor> {
 
 		// Typed Editor Support
 		if (editor instanceof EditorInput) {
@@ -242,7 +242,7 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 		return Promise.resolve(null);
 	}
 
-	protected doOpenEditor(group: IEditorGroup, editor: IEditorInput, options?: IEditorOptions): Thenable<IEditor> {
+	protected doOpenEditor(group: IEditorGroup, editor: IEditorInput, options?: IEditorOptions): Promise<IEditor> {
 		return group.openEditor(editor, options);
 	}
 
@@ -327,9 +327,9 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 
 	//#region openEditors()
 
-	openEditors(editors: IEditorInputWithOptions[], group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Thenable<IEditor[]>;
-	openEditors(editors: IResourceEditor[], group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Thenable<IEditor[]>;
-	openEditors(editors: (IEditorInputWithOptions | IResourceEditor)[], group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Thenable<IEditor[]> {
+	openEditors(editors: IEditorInputWithOptions[], group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<IEditor[]>;
+	openEditors(editors: IResourceEditor[], group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<IEditor[]>;
+	openEditors(editors: (IEditorInputWithOptions | IResourceEditor)[], group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<IEditor[]> {
 
 		// Convert to typed editors and options
 		const typedEditors: IEditorInputWithOptions[] = [];
@@ -360,7 +360,7 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 		}
 
 		// Open in targets
-		const result: Thenable<IEditor>[] = [];
+		const result: Promise<IEditor>[] = [];
 		mapGroupToEditors.forEach((editorsWithOptions, group) => {
 			result.push(group.openEditors(editorsWithOptions));
 		});
@@ -436,9 +436,9 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 
 	//#region replaceEditors()
 
-	replaceEditors(editors: IResourceEditorReplacement[], group: IEditorGroup | GroupIdentifier): Thenable<void>;
-	replaceEditors(editors: IEditorReplacement[], group: IEditorGroup | GroupIdentifier): Thenable<void>;
-	replaceEditors(editors: (IEditorReplacement | IResourceEditorReplacement)[], group: IEditorGroup | GroupIdentifier): Thenable<void> {
+	replaceEditors(editors: IResourceEditorReplacement[], group: IEditorGroup | GroupIdentifier): Promise<void>;
+	replaceEditors(editors: IEditorReplacement[], group: IEditorGroup | GroupIdentifier): Promise<void>;
+	replaceEditors(editors: (IEditorReplacement | IResourceEditorReplacement)[], group: IEditorGroup | GroupIdentifier): Promise<void> {
 		const typedEditors: IEditorReplacement[] = [];
 
 		editors.forEach(replaceEditorArg => {
@@ -599,7 +599,7 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 }
 
 export interface IEditorOpenHandler {
-	(group: IEditorGroup, editor: IEditorInput, options?: IEditorOptions | ITextEditorOptions): Thenable<IEditor>;
+	(group: IEditorGroup, editor: IEditorInput, options?: IEditorOptions | ITextEditorOptions): Promise<IEditor>;
 }
 
 /**
@@ -631,7 +631,7 @@ export class DelegatingEditorService extends EditorService {
 		this.editorOpenHandler = handler;
 	}
 
-	protected doOpenEditor(group: IEditorGroup, editor: IEditorInput, options?: IEditorOptions): Thenable<IEditor> {
+	protected doOpenEditor(group: IEditorGroup, editor: IEditorInput, options?: IEditorOptions): Promise<IEditor> {
 		if (!this.editorOpenHandler) {
 			return super.doOpenEditor(group, editor, options);
 		}
diff --git a/src/vs/workbench/services/editor/common/editorService.ts b/src/vs/workbench/services/editor/common/editorService.ts
index ad2df382382..cccd6dd730e 100644
--- a/src/vs/workbench/services/editor/common/editorService.ts
+++ b/src/vs/workbench/services/editor/common/editorService.ts
@@ -36,7 +36,7 @@ export interface IOpenEditorOverride {
 	 * If defined, will prevent the opening of an editor and replace the resulting
 	 * promise with the provided promise for the openEditor() call.
 	 */
-	override?: Thenable<IEditor>;
+	override?: Promise<IEditor>;
 }
 
 export interface IEditorService {
@@ -114,10 +114,10 @@ export interface IEditorService {
 	 * @returns the editor that opened or NULL if the operation failed or the editor was not
 	 * opened to be active.
 	 */
-	openEditor(editor: IEditorInput, options?: IEditorOptions | ITextEditorOptions, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Thenable<IEditor>;
-	openEditor(editor: IResourceInput | IUntitledResourceInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Thenable<ITextEditor>;
-	openEditor(editor: IResourceDiffInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Thenable<ITextDiffEditor>;
-	openEditor(editor: IResourceSideBySideInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Thenable<ITextSideBySideEditor>;
+	openEditor(editor: IEditorInput, options?: IEditorOptions | ITextEditorOptions, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<IEditor>;
+	openEditor(editor: IResourceInput | IUntitledResourceInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<ITextEditor>;
+	openEditor(editor: IResourceDiffInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<ITextDiffEditor>;
+	openEditor(editor: IResourceSideBySideInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<ITextSideBySideEditor>;
 
 	/**
 	 * Open editors in an editor group.
@@ -130,8 +130,8 @@ export interface IEditorService {
 	 * @returns the editors that opened. The array can be empty or have less elements for editors
 	 * that failed to open or were instructed to open as inactive.
 	 */
-	openEditors(editors: IEditorInputWithOptions[], group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Thenable<ReadonlyArray<IEditor>>;
-	openEditors(editors: IResourceEditor[], group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Thenable<ReadonlyArray<IEditor>>;
+	openEditors(editors: IEditorInputWithOptions[], group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<ReadonlyArray<IEditor>>;
+	openEditors(editors: IResourceEditor[], group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<ReadonlyArray<IEditor>>;
 
 	/**
 	 * Replaces editors in an editor group with the provided replacement.
@@ -141,8 +141,8 @@ export interface IEditorService {
 	 * @returns a promise that is resolved when the replaced active
 	 * editor (if any) has finished loading.
 	 */
-	replaceEditors(editors: IResourceEditorReplacement[], group: IEditorGroup | GroupIdentifier): Thenable<void>;
-	replaceEditors(editors: IEditorReplacement[], group: IEditorGroup | GroupIdentifier): Thenable<void>;
+	replaceEditors(editors: IResourceEditorReplacement[], group: IEditorGroup | GroupIdentifier): Promise<void>;
+	replaceEditors(editors: IEditorReplacement[], group: IEditorGroup | GroupIdentifier): Promise<void>;
 
 	/**
 	 * Find out if the provided editor (or resource of an editor) is opened in any or
diff --git a/src/vs/workbench/services/editor/test/browser/editorService.test.ts b/src/vs/workbench/services/editor/test/browser/editorService.test.ts
index 6a58ba3ebfa..c391d7e4abf 100644
--- a/src/vs/workbench/services/editor/test/browser/editorService.test.ts
+++ b/src/vs/workbench/services/editor/test/browser/editorService.test.ts
@@ -33,7 +33,7 @@ export class TestEditorControl extends BaseEditor {
 
 	constructor(@ITelemetryService telemetryService: ITelemetryService) { super('MyTestEditorForEditorService', NullTelemetryService, new TestThemeService(), new TestStorageService()); }
 
-	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Promise<void> {
 		super.setInput(input, options, token);
 
 		return input.resolve().then(() => void 0);
@@ -50,7 +50,7 @@ export class TestEditorInput extends EditorInput implements IFileEditorInput {
 	constructor(private resource: URI) { super(); }
 
 	getTypeId() { return 'testEditorInputForEditorService'; }
-	resolve(): Thenable<IEditorModel> { return !this.fails ? Promise.resolve(null) : Promise.reject(new Error('fails')); }
+	resolve(): Promise<IEditorModel> { return !this.fails ? Promise.resolve(null) : Promise.reject(new Error('fails')); }
 	matches(other: TestEditorInput): boolean { return other && other.resource && this.resource.toString() === other.resource.toString() && other instanceof TestEditorInput; }
 	setEncoding(encoding: string) { }
 	getEncoding(): string { return null; }
diff --git a/src/vs/workbench/services/extensions/common/extensions.ts b/src/vs/workbench/services/extensions/common/extensions.ts
index aa72b1b6ca1..ab067f5c283 100644
--- a/src/vs/workbench/services/extensions/common/extensions.ts
+++ b/src/vs/workbench/services/extensions/common/extensions.ts
@@ -129,7 +129,7 @@ export const ExtensionHostLogFileName = 'exthost';
 
 export interface IWillActivateEvent {
 	readonly event: string;
-	readonly activation: Thenable<void>;
+	readonly activation: Promise<void>;
 }
 
 export interface IResponsiveStateChangeEvent {
@@ -170,7 +170,7 @@ export interface IExtensionService extends ICpuProfilerTarget {
 	/**
 	 * Send an activation event and activate interested extensions.
 	 */
-	activateByEvent(activationEvent: string): Thenable<void>;
+	activateByEvent(activationEvent: string): Promise<void>;
 
 	/**
 	 * An promise that resolves when the installed extensions are registered after
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
index ebf5d91b83e..11ddcb6af1f 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
@@ -42,7 +42,7 @@ import { IExtensionDescription } from 'vs/workbench/services/extensions/common/e
 
 export interface IExtensionHostStarter {
 	readonly onCrashed: Event<[number, string]>;
-	start(): Thenable<IMessagePassingProtocol>;
+	start(): Promise<IMessagePassingProtocol>;
 	getInspectPort(): number;
 	dispose(): void;
 }
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHostProcessManager.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHostProcessManager.ts
index 188a2894f35..55354a43674 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionHostProcessManager.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionHostProcessManager.ts
@@ -42,7 +42,7 @@ export class ExtensionHostProcessManager extends Disposable {
 	/**
 	 * winjs believes a proxy is a promise because it has a `then` method, so wrap the result in an object.
 	 */
-	private _extensionHostProcessProxy: Thenable<{ value: ExtHostExtensionServiceShape; }>;
+	private _extensionHostProcessProxy: Promise<{ value: ExtHostExtensionServiceShape; }>;
 
 	constructor(
 		extensionHostProcessWorker: IExtensionHostStarter,
@@ -137,7 +137,7 @@ export class ExtensionHostProcessManager extends Disposable {
 		return this._extensionHostProcessRPCProtocol.getProxy(ExtHostContext.ExtHostExtensionService);
 	}
 
-	public activateByEvent(activationEvent: string): Thenable<void> {
+	public activateByEvent(activationEvent: string): Promise<void> {
 		if (this._extensionHostProcessFinishedActivateEvents[activationEvent] || !this._extensionHostProcessProxy) {
 			return NO_OP_VOID_PROMISE;
 		}
@@ -173,11 +173,11 @@ export class ExtensionHostProcessManager extends Disposable {
 		return 0;
 	}
 
-	public resolveAuthority(remoteAuthority: string): Thenable<ResolvedAuthority> {
+	public resolveAuthority(remoteAuthority: string): Promise<ResolvedAuthority> {
 		return this._extensionHostProcessProxy.then(proxy => proxy.value.$resolveAuthority(remoteAuthority));
 	}
 
-	public start(enabledExtensionIds: string[]): Thenable<void> {
+	public start(enabledExtensionIds: string[]): Promise<void> {
 		return this._extensionHostProcessProxy.then(proxy => proxy.value.$startExtensionHost(enabledExtensionIds));
 	}
 }
diff --git a/src/vs/workbench/services/extensions/electron-browser/runtimeExtensionsInput.ts b/src/vs/workbench/services/extensions/electron-browser/runtimeExtensionsInput.ts
index 7300441bd25..61c9190fb65 100644
--- a/src/vs/workbench/services/extensions/electron-browser/runtimeExtensionsInput.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/runtimeExtensionsInput.ts
@@ -30,7 +30,7 @@ export class RuntimeExtensionsInput extends EditorInput {
 		return true;
 	}
 
-	resolve(): Thenable<any> {
+	resolve(): Promise<any> {
 		return Promise.resolve(null);
 	}
 
diff --git a/src/vs/workbench/services/extensions/node/lazyPromise.ts b/src/vs/workbench/services/extensions/node/lazyPromise.ts
index e6b59dc3a38..df9e72be45c 100644
--- a/src/vs/workbench/services/extensions/node/lazyPromise.ts
+++ b/src/vs/workbench/services/extensions/node/lazyPromise.ts
@@ -5,7 +5,7 @@
 
 import { onUnexpectedError } from 'vs/base/common/errors';
 
-export class LazyPromise implements Thenable<any> {
+export class LazyPromise implements Promise<any> {
 
 	private _actual: Promise<any> | null;
 	private _actualOk: ((value?: any) => any) | null;
@@ -78,4 +78,8 @@ export class LazyPromise implements Thenable<any> {
 	public then(success: any, error: any): any {
 		return this._ensureActual().then(success, error);
 	}
+
+	public catch(error: any): any {
+		return this._ensureActual().then(undefined, error);
+	}
 }
diff --git a/src/vs/workbench/services/extensions/node/rpcProtocol.ts b/src/vs/workbench/services/extensions/node/rpcProtocol.ts
index dba47b26571..4830e74ea6b 100644
--- a/src/vs/workbench/services/extensions/node/rpcProtocol.ts
+++ b/src/vs/workbench/services/extensions/node/rpcProtocol.ts
@@ -354,7 +354,7 @@ export class RPCProtocol extends Disposable implements IRPCProtocol {
 		}
 		const callId = String(req);
 
-		let promise: Thenable<any>;
+		let promise: Promise<any>;
 		let cancel: () => void;
 		if (usesCancellationToken) {
 			const cancellationTokenSource = new CancellationTokenSource();
@@ -441,7 +441,7 @@ export class RPCProtocol extends Disposable implements IRPCProtocol {
 		pendingReply.resolveErr(err);
 	}
 
-	private _invokeHandler(rpcId: number, methodName: string, args: any[]): Thenable<any> {
+	private _invokeHandler(rpcId: number, methodName: string, args: any[]): Promise<any> {
 		try {
 			return Promise.resolve(this._doInvokeHandler(rpcId, methodName, args));
 		} catch (err) {
@@ -461,7 +461,7 @@ export class RPCProtocol extends Disposable implements IRPCProtocol {
 		return method.apply(actor, args);
 	}
 
-	private _remoteCall(rpcId: number, methodName: string, args: any[]): Thenable<any> {
+	private _remoteCall(rpcId: number, methodName: string, args: any[]): Promise<any> {
 		if (this._isDisposed) {
 			return Promise.reject<any>(errors.canceled());
 		}
diff --git a/src/vs/workbench/services/extensions/test/node/rpcProtocol.test.ts b/src/vs/workbench/services/extensions/test/node/rpcProtocol.test.ts
index ff8bf3918f6..73716a48619 100644
--- a/src/vs/workbench/services/extensions/test/node/rpcProtocol.test.ts
+++ b/src/vs/workbench/services/extensions/test/node/rpcProtocol.test.ts
@@ -32,7 +32,7 @@ suite('RPCProtocol', () => {
 	let delegate: (a1: any, a2: any) => any;
 	let bProxy: BClass;
 	class BClass {
-		$m(a1: any, a2: any): Thenable<any> {
+		$m(a1: any, a2: any): Promise<any> {
 			return Promise.resolve(delegate.call(null, a1, a2));
 		}
 	}
diff --git a/src/vs/workbench/services/files/electron-browser/fileService.ts b/src/vs/workbench/services/files/electron-browser/fileService.ts
index 0515e869268..1e4bd774d75 100644
--- a/src/vs/workbench/services/files/electron-browser/fileService.ts
+++ b/src/vs/workbench/services/files/electron-browser/fileService.ts
@@ -207,7 +207,7 @@ export class FileService extends Disposable implements IFileService {
 		throw new Error('not implemented');
 	}
 
-	activateProvider(scheme: string): Thenable<void> {
+	activateProvider(scheme: string): Promise<void> {
 		return Promise.reject(new Error('not implemented'));
 	}
 
@@ -215,20 +215,20 @@ export class FileService extends Disposable implements IFileService {
 		return resource.scheme === Schemas.file;
 	}
 
-	resolveFile(resource: uri, options?: IResolveFileOptions): Thenable<IFileStat> {
+	resolveFile(resource: uri, options?: IResolveFileOptions): Promise<IFileStat> {
 		return this.resolve(resource, options);
 	}
 
-	resolveFiles(toResolve: { resource: uri, options?: IResolveFileOptions }[]): Thenable<IResolveFileResult[]> {
+	resolveFiles(toResolve: { resource: uri, options?: IResolveFileOptions }[]): Promise<IResolveFileResult[]> {
 		return Promise.all(toResolve.map(resourceAndOptions => this.resolve(resourceAndOptions.resource, resourceAndOptions.options)
 			.then(stat => ({ stat, success: true }), error => ({ stat: void 0, success: false }))));
 	}
 
-	existsFile(resource: uri): Thenable<boolean> {
+	existsFile(resource: uri): Promise<boolean> {
 		return this.resolveFile(resource).then(() => true, () => false);
 	}
 
-	resolveContent(resource: uri, options?: IResolveContentOptions): Thenable<IContent> {
+	resolveContent(resource: uri, options?: IResolveContentOptions): Promise<IContent> {
 		return this.resolveStreamContent(resource, options).then(streamContent => {
 			return new Promise<IContent>((resolve, reject) => {
 
@@ -251,7 +251,7 @@ export class FileService extends Disposable implements IFileService {
 		});
 	}
 
-	resolveStreamContent(resource: uri, options?: IResolveContentOptions): Thenable<IStreamContent> {
+	resolveStreamContent(resource: uri, options?: IResolveContentOptions): Promise<IStreamContent> {
 
 		// Guard early against attempts to resolve an invalid file path
 		if (resource.scheme !== Schemas.file || !resource.fsPath) {
@@ -341,7 +341,7 @@ export class FileService extends Disposable implements IFileService {
 			return onStatError(err);
 		});
 
-		let completePromise: Thenable<void>;
+		let completePromise: Promise<void>;
 
 		// await the stat iff we already have an etag so that we compare the
 		// etag from the stat before we actually read the file again.
@@ -391,14 +391,14 @@ export class FileService extends Disposable implements IFileService {
 		});
 	}
 
-	private fillInContents(content: IStreamContent, resource: uri, options: IResolveContentOptions, token: CancellationToken): Thenable<void> {
+	private fillInContents(content: IStreamContent, resource: uri, options: IResolveContentOptions, token: CancellationToken): Promise<void> {
 		return this.resolveFileData(resource, options, token).then(data => {
 			content.encoding = data.encoding;
 			content.value = data.stream;
 		});
 	}
 
-	private resolveFileData(resource: uri, options: IResolveContentOptions, token: CancellationToken): Thenable<IContentData> {
+	private resolveFileData(resource: uri, options: IResolveContentOptions, token: CancellationToken): Promise<IContentData> {
 		const chunkBuffer = Buffer.allocUnsafe(64 * 1024);
 
 		const result: IContentData = {
@@ -542,7 +542,7 @@ export class FileService extends Disposable implements IFileService {
 		});
 	}
 
-	updateContent(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): Thenable<IFileStat> {
+	updateContent(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): Promise<IFileStat> {
 		if (options.writeElevated) {
 			return this.doUpdateContentElevated(resource, value, options);
 		}
@@ -550,12 +550,12 @@ export class FileService extends Disposable implements IFileService {
 		return this.doUpdateContent(resource, value, options);
 	}
 
-	private doUpdateContent(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): Thenable<IFileStat> {
+	private doUpdateContent(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): Promise<IFileStat> {
 		const absolutePath = this.toAbsolutePath(resource);
 
 		// 1.) check file for writing
 		return this.checkFileBeforeWriting(absolutePath, options).then(exists => {
-			let createParentsPromise: Thenable<boolean>;
+			let createParentsPromise: Promise<boolean>;
 			if (exists) {
 				createParentsPromise = Promise.resolve();
 			} else {
@@ -565,7 +565,7 @@ export class FileService extends Disposable implements IFileService {
 			// 2.) create parents as needed
 			return createParentsPromise.then(() => {
 				const encodingToWrite = this._encoding.getWriteEncoding(resource, options.encoding);
-				let addBomPromise: Thenable<boolean> = Promise.resolve(false);
+				let addBomPromise: Promise<boolean> = Promise.resolve(false);
 
 				// UTF_16 BE and LE as well as UTF_8 with BOM always have a BOM
 				if (encodingToWrite === encoding.UTF16be || encodingToWrite === encoding.UTF16le || encodingToWrite === encoding.UTF8_with_bom) {
@@ -635,7 +635,7 @@ export class FileService extends Disposable implements IFileService {
 		});
 	}
 
-	private doSetContentsAndResolve(resource: uri, absolutePath: string, value: string | ITextSnapshot, addBOM: boolean, encodingToWrite: string, options?: { mode?: number; flag?: string; }): Thenable<IFileStat> {
+	private doSetContentsAndResolve(resource: uri, absolutePath: string, value: string | ITextSnapshot, addBOM: boolean, encodingToWrite: string, options?: { mode?: number; flag?: string; }): Promise<IFileStat> {
 		// Configure encoding related options as needed
 		const writeFileOptions: extfs.IWriteFileOptions = options ? options : Object.create(null);
 		if (addBOM || encodingToWrite !== encoding.UTF8) {
@@ -645,7 +645,7 @@ export class FileService extends Disposable implements IFileService {
 			};
 		}
 
-		let writeFilePromise: Thenable<void>;
+		let writeFilePromise: Promise<void>;
 		if (typeof value === 'string') {
 			writeFilePromise = pfs.writeFile(absolutePath, value, writeFileOptions);
 		} else {
@@ -660,7 +660,7 @@ export class FileService extends Disposable implements IFileService {
 		});
 	}
 
-	private doUpdateContentElevated(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): Thenable<IFileStat> {
+	private doUpdateContentElevated(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): Promise<IFileStat> {
 		const absolutePath = this.toAbsolutePath(resource);
 
 		// 1.) check file for writing
@@ -722,10 +722,10 @@ export class FileService extends Disposable implements IFileService {
 		});
 	}
 
-	createFile(resource: uri, content: string = '', options: ICreateFileOptions = Object.create(null)): Thenable<IFileStat> {
+	createFile(resource: uri, content: string = '', options: ICreateFileOptions = Object.create(null)): Promise<IFileStat> {
 		const absolutePath = this.toAbsolutePath(resource);
 
-		let checkFilePromise: Thenable<boolean>;
+		let checkFilePromise: Promise<boolean>;
 		if (options.overwrite) {
 			checkFilePromise = Promise.resolve(false);
 		} else {
@@ -753,13 +753,13 @@ export class FileService extends Disposable implements IFileService {
 		});
 	}
 
-	readFolder(resource: uri): Thenable<string[]> {
+	readFolder(resource: uri): Promise<string[]> {
 		const absolutePath = this.toAbsolutePath(resource);
 
 		return pfs.readdir(absolutePath);
 	}
 
-	createFolder(resource: uri): Thenable<IFileStat> {
+	createFolder(resource: uri): Promise<IFileStat> {
 
 		// 1.) Create folder
 		const absolutePath = this.toAbsolutePath(resource);
@@ -776,7 +776,7 @@ export class FileService extends Disposable implements IFileService {
 		});
 	}
 
-	private checkFileBeforeWriting(absolutePath: string, options: IUpdateContentOptions = Object.create(null), ignoreReadonly?: boolean): Thenable<boolean /* exists */> {
+	private checkFileBeforeWriting(absolutePath: string, options: IUpdateContentOptions = Object.create(null), ignoreReadonly?: boolean): Promise<boolean /* exists */> {
 		return pfs.exists(absolutePath).then(exists => {
 			if (exists) {
 				return pfs.stat(absolutePath).then(stat => {
@@ -830,7 +830,7 @@ export class FileService extends Disposable implements IFileService {
 		});
 	}
 
-	private readOnlyError<T>(options: IUpdateContentOptions): Thenable<T> {
+	private readOnlyError<T>(options: IUpdateContentOptions): Promise<T> {
 		return Promise.reject(new FileOperationError(
 			nls.localize('fileReadOnlyError', "File is Read Only"),
 			FileOperationResult.FILE_READ_ONLY,
@@ -838,15 +838,15 @@ export class FileService extends Disposable implements IFileService {
 		));
 	}
 
-	moveFile(source: uri, target: uri, overwrite?: boolean): Thenable<IFileStat> {
+	moveFile(source: uri, target: uri, overwrite?: boolean): Promise<IFileStat> {
 		return this.moveOrCopyFile(source, target, false, overwrite);
 	}
 
-	copyFile(source: uri, target: uri, overwrite?: boolean): Thenable<IFileStat> {
+	copyFile(source: uri, target: uri, overwrite?: boolean): Promise<IFileStat> {
 		return this.moveOrCopyFile(source, target, true, overwrite);
 	}
 
-	private moveOrCopyFile(source: uri, target: uri, keepCopy: boolean, overwrite: boolean): Thenable<IFileStat> {
+	private moveOrCopyFile(source: uri, target: uri, keepCopy: boolean, overwrite: boolean): Promise<IFileStat> {
 		const sourcePath = this.toAbsolutePath(source);
 		const targetPath = this.toAbsolutePath(target);
 
@@ -864,7 +864,7 @@ export class FileService extends Disposable implements IFileService {
 		});
 	}
 
-	private doMoveOrCopyFile(sourcePath: string, targetPath: string, keepCopy: boolean, overwrite: boolean): Thenable<boolean /* exists */> {
+	private doMoveOrCopyFile(sourcePath: string, targetPath: string, keepCopy: boolean, overwrite: boolean): Promise<boolean /* exists */> {
 
 		// 1.) validate operation
 		if (isParent(targetPath, sourcePath, !isLinux)) {
@@ -882,7 +882,7 @@ export class FileService extends Disposable implements IFileService {
 			}
 
 			// 3.) make sure target is deleted before we move/copy unless this is a case rename of the same file
-			let deleteTargetPromise: Thenable<void> = Promise.resolve();
+			let deleteTargetPromise: Promise<void> = Promise.resolve();
 			if (exists && !isCaseRename) {
 				if (isEqualOrParent(sourcePath, targetPath, !isLinux /* ignorecase */)) {
 					return Promise.reject(new Error(nls.localize('unableToMoveCopyError', "Unable to move/copy. File would replace folder it is contained in."))); // catch this corner case!
@@ -909,7 +909,7 @@ export class FileService extends Disposable implements IFileService {
 		});
 	}
 
-	del(resource: uri, options?: { useTrash?: boolean, recursive?: boolean }): Thenable<void> {
+	del(resource: uri, options?: { useTrash?: boolean, recursive?: boolean }): Promise<void> {
 		if (options && options.useTrash) {
 			return this.doMoveItemToTrash(resource);
 		}
@@ -917,7 +917,7 @@ export class FileService extends Disposable implements IFileService {
 		return this.doDelete(resource, options && options.recursive);
 	}
 
-	private doMoveItemToTrash(resource: uri): Thenable<void> {
+	private doMoveItemToTrash(resource: uri): Promise<void> {
 		const absolutePath = resource.fsPath;
 
 		const shell = (require('electron') as any as Electron.RendererInterface).shell; // workaround for being able to run tests out of VSCode debugger
@@ -931,10 +931,10 @@ export class FileService extends Disposable implements IFileService {
 		return Promise.resolve();
 	}
 
-	private doDelete(resource: uri, recursive: boolean): Thenable<void> {
+	private doDelete(resource: uri, recursive: boolean): Promise<void> {
 		const absolutePath = this.toAbsolutePath(resource);
 
-		let assertNonRecursiveDelete: Thenable<void>;
+		let assertNonRecursiveDelete: Promise<void>;
 		if (!recursive) {
 			assertNonRecursiveDelete = pfs.stat(absolutePath).then(stat => {
 				if (!stat.isDirectory()) {
@@ -977,11 +977,11 @@ export class FileService extends Disposable implements IFileService {
 		return paths.normalize(resource.fsPath);
 	}
 
-	private resolve(resource: uri, options: IResolveFileOptions = Object.create(null)): Thenable<IFileStat> {
+	private resolve(resource: uri, options: IResolveFileOptions = Object.create(null)): Promise<IFileStat> {
 		return this.toStatResolver(resource).then(model => model.resolve(options));
 	}
 
-	private toStatResolver(resource: uri): Thenable<StatResolver> {
+	private toStatResolver(resource: uri): Promise<StatResolver> {
 		const absolutePath = this.toAbsolutePath(resource);
 
 		return pfs.statLink(absolutePath).then(({ isSymbolicLink, stat }) => {
@@ -1141,7 +1141,7 @@ export class StatResolver {
 		this.etag = etag(size, mtime);
 	}
 
-	resolve(options: IResolveFileOptions): Thenable<IFileStat> {
+	resolve(options: IResolveFileOptions): Promise<IFileStat> {
 
 		// General Data
 		const fileStat: IFileStat = {
diff --git a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
index 49b7bcbf074..50e9196ad2d 100644
--- a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
+++ b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
@@ -36,7 +36,7 @@ class TypeOnlyStat implements IStat {
 	size: number = 0;
 }
 
-function toIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], recurse?: (tuple: [URI, IStat]) => boolean): Thenable<IFileStat> {
+function toIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], recurse?: (tuple: [URI, IStat]) => boolean): Promise<IFileStat> {
 	const [resource, stat] = tuple;
 	const fileStat: IFileStat = {
 		resource,
@@ -70,7 +70,7 @@ function toIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], recurse
 	return Promise.resolve(fileStat);
 }
 
-export function toDeepIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], to: URI[]): Thenable<IFileStat> {
+export function toDeepIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], to: URI[]): Promise<IFileStat> {
 
 	const trie = TernarySearchTree.forPaths<true>();
 	trie.set(tuple[0].toString(), true);
@@ -205,7 +205,7 @@ export class RemoteFileService extends FileService {
 		};
 	}
 
-	activateProvider(scheme: string): Thenable<void> {
+	activateProvider(scheme: string): Promise<void> {
 		return this._extensionService.activateByEvent('onFileSystem:' + scheme);
 	}
 
@@ -269,7 +269,7 @@ export class RemoteFileService extends FileService {
 		});
 	}
 
-	existsFile(resource: URI): Thenable<boolean> {
+	existsFile(resource: URI): Promise<boolean> {
 		if (resource.scheme === Schemas.file) {
 			return super.existsFile(resource);
 		} else {
@@ -277,7 +277,7 @@ export class RemoteFileService extends FileService {
 		}
 	}
 
-	resolveFile(resource: URI, options?: IResolveFileOptions): Thenable<IFileStat> {
+	resolveFile(resource: URI, options?: IResolveFileOptions): Promise<IFileStat> {
 		if (resource.scheme === Schemas.file) {
 			return super.resolveFile(resource, options);
 		} else {
@@ -294,7 +294,7 @@ export class RemoteFileService extends FileService {
 		}
 	}
 
-	resolveFiles(toResolve: { resource: URI; options?: IResolveFileOptions; }[]): Thenable<IResolveFileResult[]> {
+	resolveFiles(toResolve: { resource: URI; options?: IResolveFileOptions; }[]): Promise<IResolveFileResult[]> {
 
 		// soft-groupBy, keep order, don't rearrange/merge groups
 		let groups: (typeof toResolve)[] = [];
@@ -307,7 +307,7 @@ export class RemoteFileService extends FileService {
 			group.push(request);
 		}
 
-		const promises: Thenable<IResolveFileResult[]>[] = [];
+		const promises: Promise<IResolveFileResult[]>[] = [];
 		for (const group of groups) {
 			if (group[0].resource.scheme === Schemas.file) {
 				promises.push(super.resolveFiles(group));
@@ -336,7 +336,7 @@ export class RemoteFileService extends FileService {
 
 	// --- resolve
 
-	resolveContent(resource: URI, options?: IResolveContentOptions): Thenable<IContent> {
+	resolveContent(resource: URI, options?: IResolveContentOptions): Promise<IContent> {
 		if (resource.scheme === Schemas.file) {
 			return super.resolveContent(resource, options);
 		} else {
@@ -344,7 +344,7 @@ export class RemoteFileService extends FileService {
 		}
 	}
 
-	resolveStreamContent(resource: URI, options?: IResolveContentOptions): Thenable<IStreamContent> {
+	resolveStreamContent(resource: URI, options?: IResolveContentOptions): Promise<IStreamContent> {
 		if (resource.scheme === Schemas.file) {
 			return super.resolveStreamContent(resource, options);
 		} else {
@@ -438,7 +438,7 @@ export class RemoteFileService extends FileService {
 		return provider;
 	}
 
-	createFile(resource: URI, content?: string, options?: ICreateFileOptions): Thenable<IFileStat> {
+	createFile(resource: URI, content?: string, options?: ICreateFileOptions): Promise<IFileStat> {
 		if (resource.scheme === Schemas.file) {
 			return super.createFile(resource, content, options);
 		} else {
@@ -461,7 +461,7 @@ export class RemoteFileService extends FileService {
 		}
 	}
 
-	updateContent(resource: URI, value: string | ITextSnapshot, options?: IUpdateContentOptions): Thenable<IFileStat> {
+	updateContent(resource: URI, value: string | ITextSnapshot, options?: IUpdateContentOptions): Promise<IFileStat> {
 		if (resource.scheme === Schemas.file) {
 			return super.updateContent(resource, value, options);
 		} else {
@@ -507,7 +507,7 @@ export class RemoteFileService extends FileService {
 
 	// --- delete
 
-	del(resource: URI, options?: { useTrash?: boolean, recursive?: boolean }): Thenable<void> {
+	del(resource: URI, options?: { useTrash?: boolean, recursive?: boolean }): Promise<void> {
 		if (resource.scheme === Schemas.file) {
 			return super.del(resource, options);
 		} else {
@@ -519,7 +519,7 @@ export class RemoteFileService extends FileService {
 		}
 	}
 
-	readFolder(resource: URI): Thenable<string[]> {
+	readFolder(resource: URI): Promise<string[]> {
 		if (resource.scheme === Schemas.file) {
 			return super.readFolder(resource);
 		} else {
@@ -529,7 +529,7 @@ export class RemoteFileService extends FileService {
 		}
 	}
 
-	createFolder(resource: URI): Thenable<IFileStat> {
+	createFolder(resource: URI): Promise<IFileStat> {
 		if (resource.scheme === Schemas.file) {
 			return super.createFolder(resource);
 		} else {
@@ -546,7 +546,7 @@ export class RemoteFileService extends FileService {
 		}
 	}
 
-	moveFile(source: URI, target: URI, overwrite?: boolean): Thenable<IFileStat> {
+	moveFile(source: URI, target: URI, overwrite?: boolean): Promise<IFileStat> {
 		if (source.scheme !== target.scheme) {
 			return this._doMoveAcrossScheme(source, target);
 		} else if (source.scheme === Schemas.file) {
@@ -578,7 +578,7 @@ export class RemoteFileService extends FileService {
 		});
 	}
 
-	private _doMoveAcrossScheme(source: URI, target: URI, overwrite?: boolean): Thenable<IFileStat> {
+	private _doMoveAcrossScheme(source: URI, target: URI, overwrite?: boolean): Promise<IFileStat> {
 		return this.copyFile(source, target, overwrite).then(() => {
 			return this.del(source, { recursive: true });
 		}).then(() => {
@@ -589,7 +589,7 @@ export class RemoteFileService extends FileService {
 		});
 	}
 
-	copyFile(source: URI, target: URI, overwrite?: boolean): Thenable<IFileStat> {
+	copyFile(source: URI, target: URI, overwrite?: boolean): Promise<IFileStat> {
 		if (source.scheme === target.scheme && source.scheme === Schemas.file) {
 			return super.copyFile(source, target, overwrite);
 		}
@@ -646,7 +646,7 @@ export class RemoteFileService extends FileService {
 		});
 	}
 
-	private _activeWatches = new Map<string, { unwatch: Thenable<IDisposable>, count: number }>();
+	private _activeWatches = new Map<string, { unwatch: Promise<IDisposable>, count: number }>();
 
 	watchFileChanges(resource: URI, opts?: IWatchOptions): void {
 		if (resource.scheme === Schemas.file) {
diff --git a/src/vs/workbench/services/files/electron-browser/streams.ts b/src/vs/workbench/services/files/electron-browser/streams.ts
index da7005c7faf..eabf557773a 100644
--- a/src/vs/workbench/services/files/electron-browser/streams.ts
+++ b/src/vs/workbench/services/files/electron-browser/streams.ts
@@ -125,7 +125,7 @@ function createReadable(provider: IFileSystemProvider, resource: URI, position:
 
 function createSimpleReadable(provider: IFileSystemProvider, resource: URI, position: number): Readable {
 	return new class extends Readable {
-		_readOperation: Thenable<any>;
+		_readOperation: Promise<any>;
 		_read(size?: number): void {
 			if (this._readOperation) {
 				return;
diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts b/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
index f2d0ae09869..ffd35ca59df 100644
--- a/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
@@ -27,7 +27,7 @@ interface IWatcherObjet {
 }
 
 interface IPathWatcher {
-	ready: Thenable<IWatcherObjet>;
+	ready: Promise<IWatcherObjet>;
 	watcher?: IWatcherObjet;
 	ignored: glob.ParsedPattern[];
 }
@@ -176,8 +176,8 @@ export class NsfwWatcherService implements IWatcherService {
 		});
 	}
 
-	public setRoots(roots: IWatcherRequest[]): Thenable<void> {
-		const promises: Thenable<void>[] = [];
+	public setRoots(roots: IWatcherRequest[]): Promise<void> {
+		const promises: Promise<void>[] = [];
 		const normalizedRoots = this._normalizeRoots(roots);
 
 		// Gather roots that are not currently being watched
@@ -214,12 +214,12 @@ export class NsfwWatcherService implements IWatcherService {
 		return Promise.all(promises).then(() => void 0);
 	}
 
-	public setVerboseLogging(enabled: boolean): Thenable<void> {
+	public setVerboseLogging(enabled: boolean): Promise<void> {
 		this._verboseLogging = enabled;
 		return Promise.resolve(void 0);
 	}
 
-	public stop(): Thenable<void> {
+	public stop(): Promise<void> {
 		for (let path in this._pathWatchers) {
 			let watcher = this._pathWatchers[path];
 			watcher.ready.then(watcher => watcher.stop());
diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/watcher.ts b/src/vs/workbench/services/files/node/watcher/nsfw/watcher.ts
index b921d2bb7b4..366d39fc184 100644
--- a/src/vs/workbench/services/files/node/watcher/nsfw/watcher.ts
+++ b/src/vs/workbench/services/files/node/watcher/nsfw/watcher.ts
@@ -21,7 +21,7 @@ export interface IWatchError {
 
 export interface IWatcherService {
 	watch(options: IWatcherOptions): Event<IRawFileChange[] | IWatchError>;
-	setRoots(roots: IWatcherRequest[]): Thenable<void>;
-	setVerboseLogging(enabled: boolean): Thenable<void>;
-	stop(): Thenable<void>;
+	setRoots(roots: IWatcherRequest[]): Promise<void>;
+	setVerboseLogging(enabled: boolean): Promise<void>;
+	stop(): Promise<void>;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/watcherIpc.ts b/src/vs/workbench/services/files/node/watcher/nsfw/watcherIpc.ts
index 501ba00fc5e..691db8f251f 100644
--- a/src/vs/workbench/services/files/node/watcher/nsfw/watcherIpc.ts
+++ b/src/vs/workbench/services/files/node/watcher/nsfw/watcherIpc.ts
@@ -20,7 +20,7 @@ export class WatcherChannel implements IServerChannel {
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	call(_, command: string, arg?: any): Thenable<any> {
+	call(_, command: string, arg?: any): Promise<any> {
 		switch (command) {
 			case 'setRoots': return this.service.setRoots(arg);
 			case 'setVerboseLogging': return this.service.setVerboseLogging(arg);
@@ -39,15 +39,15 @@ export class WatcherChannelClient implements IWatcherService {
 		return this.channel.listen('watch', options);
 	}
 
-	setVerboseLogging(enable: boolean): Thenable<void> {
+	setVerboseLogging(enable: boolean): Promise<void> {
 		return this.channel.call('setVerboseLogging', enable);
 	}
 
-	setRoots(roots: IWatcherRequest[]): Thenable<void> {
+	setRoots(roots: IWatcherRequest[]): Promise<void> {
 		return this.channel.call('setRoots', roots);
 	}
 
-	stop(): Thenable<void> {
+	stop(): Promise<void> {
 		return this.channel.call('stop');
 	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts b/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts
index bd1205d67c4..ba4ada4cd68 100644
--- a/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts
@@ -57,13 +57,13 @@ export class ChokidarWatcherService implements IWatcherService {
 		return this.onWatchEvent;
 	}
 
-	public setVerboseLogging(enabled: boolean): Thenable<void> {
+	public setVerboseLogging(enabled: boolean): Promise<void> {
 		this._verboseLogging = enabled;
 
 		return Promise.resolve();
 	}
 
-	public setRoots(requests: IWatcherRequest[]): Thenable<void> {
+	public setRoots(requests: IWatcherRequest[]): Promise<void> {
 		const watchers = Object.create(null);
 		const newRequests: string[] = [];
 
@@ -269,7 +269,7 @@ export class ChokidarWatcherService implements IWatcherService {
 		return watcher;
 	}
 
-	public stop(): Thenable<void> {
+	public stop(): Promise<void> {
 		for (let path in this._watchers) {
 			let watcher = this._watchers[path];
 			watcher.stop();
diff --git a/src/vs/workbench/services/files/node/watcher/unix/watcher.ts b/src/vs/workbench/services/files/node/watcher/unix/watcher.ts
index b921d2bb7b4..366d39fc184 100644
--- a/src/vs/workbench/services/files/node/watcher/unix/watcher.ts
+++ b/src/vs/workbench/services/files/node/watcher/unix/watcher.ts
@@ -21,7 +21,7 @@ export interface IWatchError {
 
 export interface IWatcherService {
 	watch(options: IWatcherOptions): Event<IRawFileChange[] | IWatchError>;
-	setRoots(roots: IWatcherRequest[]): Thenable<void>;
-	setVerboseLogging(enabled: boolean): Thenable<void>;
-	stop(): Thenable<void>;
+	setRoots(roots: IWatcherRequest[]): Promise<void>;
+	setVerboseLogging(enabled: boolean): Promise<void>;
+	stop(): Promise<void>;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/files/node/watcher/unix/watcherIpc.ts b/src/vs/workbench/services/files/node/watcher/unix/watcherIpc.ts
index 501ba00fc5e..691db8f251f 100644
--- a/src/vs/workbench/services/files/node/watcher/unix/watcherIpc.ts
+++ b/src/vs/workbench/services/files/node/watcher/unix/watcherIpc.ts
@@ -20,7 +20,7 @@ export class WatcherChannel implements IServerChannel {
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	call(_, command: string, arg?: any): Thenable<any> {
+	call(_, command: string, arg?: any): Promise<any> {
 		switch (command) {
 			case 'setRoots': return this.service.setRoots(arg);
 			case 'setVerboseLogging': return this.service.setVerboseLogging(arg);
@@ -39,15 +39,15 @@ export class WatcherChannelClient implements IWatcherService {
 		return this.channel.listen('watch', options);
 	}
 
-	setVerboseLogging(enable: boolean): Thenable<void> {
+	setVerboseLogging(enable: boolean): Promise<void> {
 		return this.channel.call('setVerboseLogging', enable);
 	}
 
-	setRoots(roots: IWatcherRequest[]): Thenable<void> {
+	setRoots(roots: IWatcherRequest[]): Promise<void> {
 		return this.channel.call('setRoots', roots);
 	}
 
-	stop(): Thenable<void> {
+	stop(): Promise<void> {
 		return this.channel.call('stop');
 	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/group/common/editorGroupsService.ts b/src/vs/workbench/services/group/common/editorGroupsService.ts
index 091977929c5..77759b057c8 100644
--- a/src/vs/workbench/services/group/common/editorGroupsService.ts
+++ b/src/vs/workbench/services/group/common/editorGroupsService.ts
@@ -379,7 +379,7 @@ export interface IEditorGroup {
 	 * @returns a promise that resolves around an IEditor instance unless
 	 * the call failed, or the editor was not opened as active editor.
 	 */
-	openEditor(editor: IEditorInput, options?: IEditorOptions | ITextEditorOptions): Thenable<IEditor>;
+	openEditor(editor: IEditorInput, options?: IEditorOptions | ITextEditorOptions): Promise<IEditor>;
 
 	/**
 	 * Opens editors in this group.
@@ -389,7 +389,7 @@ export interface IEditorGroup {
 	 * a group can only ever have one active editor, even if many editors are
 	 * opened, the result will only be one editor.
 	 */
-	openEditors(editors: IEditorInputWithOptions[]): Thenable<IEditor>;
+	openEditors(editors: IEditorInputWithOptions[]): Promise<IEditor>;
 
 	/**
 	 * Find out if the provided editor is opened in the group.
@@ -429,7 +429,7 @@ export interface IEditorGroup {
 	 *
 	 * @returns a promise when the editor is closed.
 	 */
-	closeEditor(editor?: IEditorInput): Thenable<void>;
+	closeEditor(editor?: IEditorInput): Promise<void>;
 
 	/**
 	 * Closes specific editors in this group. This may trigger a confirmation dialog if
@@ -437,7 +437,7 @@ export interface IEditorGroup {
 	 *
 	 * @returns a promise when all editors are closed.
 	 */
-	closeEditors(editors: IEditorInput[] | ICloseEditorsFilter): Thenable<void>;
+	closeEditors(editors: IEditorInput[] | ICloseEditorsFilter): Promise<void>;
 
 	/**
 	 * Closes all editors from the group. This may trigger a confirmation dialog if
@@ -445,7 +445,7 @@ export interface IEditorGroup {
 	 *
 	 * @returns a promise when all editors are closed.
 	 */
-	closeAllEditors(): Thenable<void>;
+	closeAllEditors(): Promise<void>;
 
 	/**
 	 * Replaces editors in this group with the provided replacement.
@@ -455,7 +455,7 @@ export interface IEditorGroup {
 	 * @returns a promise that is resolved when the replaced active
 	 * editor (if any) has finished loading.
 	 */
-	replaceEditors(editors: IEditorReplacement[]): Thenable<void>;
+	replaceEditors(editors: IEditorReplacement[]): Promise<void>;
 
 	/**
 	 * Set an editor to be pinned. A pinned editor is not replaced
diff --git a/src/vs/workbench/services/group/test/browser/editorGroupsService.test.ts b/src/vs/workbench/services/group/test/browser/editorGroupsService.test.ts
index 15dc2897979..173e001cdec 100644
--- a/src/vs/workbench/services/group/test/browser/editorGroupsService.test.ts
+++ b/src/vs/workbench/services/group/test/browser/editorGroupsService.test.ts
@@ -26,7 +26,7 @@ export class TestEditorControl extends BaseEditor {
 
 	constructor(@ITelemetryService telemetryService: ITelemetryService) { super('MyFileEditorForEditorGroupService', NullTelemetryService, new TestThemeService(), new TestStorageService()); }
 
-	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Promise<void> {
 		super.setInput(input, options, token);
 
 		return input.resolve().then(() => void 0);
@@ -42,7 +42,7 @@ export class TestEditorInput extends EditorInput implements IFileEditorInput {
 	constructor(private resource: URI) { super(); }
 
 	getTypeId() { return 'testEditorInputForEditorGroupService'; }
-	resolve(): Thenable<IEditorModel> { return Promise.resolve(); }
+	resolve(): Promise<IEditorModel> { return Promise.resolve(); }
 	matches(other: TestEditorInput): boolean { return other && this.resource.toString() === other.resource.toString() && other instanceof TestEditorInput; }
 	setEncoding(encoding: string) { }
 	getEncoding(): string { return null; }
diff --git a/src/vs/workbench/services/history/electron-browser/history.ts b/src/vs/workbench/services/history/electron-browser/history.ts
index 6299cccc5e7..8593497d206 100644
--- a/src/vs/workbench/services/history/electron-browser/history.ts
+++ b/src/vs/workbench/services/history/electron-browser/history.ts
@@ -406,7 +406,7 @@ export class HistoryService extends Disposable implements IHistoryService {
 		always(this.doNavigate(this.stack[this.index], !acrossEditors), () => this.navigatingInStack = false);
 	}
 
-	private doNavigate(location: IStackEntry, withSelection: boolean): Thenable<IBaseEditor> {
+	private doNavigate(location: IStackEntry, withSelection: boolean): Promise<IBaseEditor> {
 		const options: ITextEditorOptions = {
 			revealIfOpened: true // support to navigate across editor groups
 		};
diff --git a/src/vs/workbench/services/issue/common/issue.ts b/src/vs/workbench/services/issue/common/issue.ts
index 6d34b184bf9..2cc057f6bcc 100644
--- a/src/vs/workbench/services/issue/common/issue.ts
+++ b/src/vs/workbench/services/issue/common/issue.ts
@@ -10,6 +10,6 @@ export const IWorkbenchIssueService = createDecorator<IWorkbenchIssueService>('w
 
 export interface IWorkbenchIssueService {
 	_serviceBrand: any;
-	openReporter(dataOverrides?: Partial<IssueReporterData>): Thenable<void>;
-	openProcessExplorer(): Thenable<void>;
+	openReporter(dataOverrides?: Partial<IssueReporterData>): Promise<void>;
+	openProcessExplorer(): Promise<void>;
 }
diff --git a/src/vs/workbench/services/issue/electron-browser/workbenchIssueService.ts b/src/vs/workbench/services/issue/electron-browser/workbenchIssueService.ts
index 681a73dbfda..6193a6c7136 100644
--- a/src/vs/workbench/services/issue/electron-browser/workbenchIssueService.ts
+++ b/src/vs/workbench/services/issue/electron-browser/workbenchIssueService.ts
@@ -56,7 +56,7 @@ export class WorkbenchIssueService implements IWorkbenchIssueService {
 		});
 	}
 
-	openProcessExplorer(): Thenable<void> {
+	openProcessExplorer(): Promise<void> {
 		const theme = this.themeService.getTheme();
 		const data: ProcessExplorerData = {
 			pid: this.windowService.getConfiguration().mainPid,
diff --git a/src/vs/workbench/services/keybinding/common/keybindingEditing.ts b/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
index b7e3ec19337..3e7f51d3990 100644
--- a/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
+++ b/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
@@ -32,11 +32,11 @@ export interface IKeybindingEditingService {
 
 	_serviceBrand: ServiceIdentifier<any>;
 
-	editKeybinding(key: string, keybindingItem: ResolvedKeybindingItem): Thenable<void>;
+	editKeybinding(key: string, keybindingItem: ResolvedKeybindingItem): Promise<void>;
 
-	removeKeybinding(keybindingItem: ResolvedKeybindingItem): Thenable<void>;
+	removeKeybinding(keybindingItem: ResolvedKeybindingItem): Promise<void>;
 
-	resetKeybinding(keybindingItem: ResolvedKeybindingItem): Thenable<void>;
+	resetKeybinding(keybindingItem: ResolvedKeybindingItem): Promise<void>;
 }
 
 export class KeybindingsEditingService extends Disposable implements IKeybindingEditingService {
@@ -57,19 +57,19 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 		this.queue = new Queue<void>();
 	}
 
-	editKeybinding(key: string, keybindingItem: ResolvedKeybindingItem): Thenable<void> {
+	editKeybinding(key: string, keybindingItem: ResolvedKeybindingItem): Promise<void> {
 		return this.queue.queue(() => this.doEditKeybinding(key, keybindingItem)); // queue up writes to prevent race conditions
 	}
 
-	resetKeybinding(keybindingItem: ResolvedKeybindingItem): Thenable<void> {
+	resetKeybinding(keybindingItem: ResolvedKeybindingItem): Promise<void> {
 		return this.queue.queue(() => this.doResetKeybinding(keybindingItem)); // queue up writes to prevent race conditions
 	}
 
-	removeKeybinding(keybindingItem: ResolvedKeybindingItem): Thenable<void> {
+	removeKeybinding(keybindingItem: ResolvedKeybindingItem): Promise<void> {
 		return this.queue.queue(() => this.doRemoveKeybinding(keybindingItem)); // queue up writes to prevent race conditions
 	}
 
-	private doEditKeybinding(key: string, keybindingItem: ResolvedKeybindingItem): Thenable<void> {
+	private doEditKeybinding(key: string, keybindingItem: ResolvedKeybindingItem): Promise<void> {
 		return this.resolveAndValidate()
 			.then(reference => {
 				const model = reference.object.textEditorModel;
@@ -83,7 +83,7 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 			});
 	}
 
-	private doRemoveKeybinding(keybindingItem: ResolvedKeybindingItem): Thenable<void> {
+	private doRemoveKeybinding(keybindingItem: ResolvedKeybindingItem): Promise<void> {
 		return this.resolveAndValidate()
 			.then(reference => {
 				const model = reference.object.textEditorModel;
@@ -96,7 +96,7 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 			});
 	}
 
-	private doResetKeybinding(keybindingItem: ResolvedKeybindingItem): Thenable<void> {
+	private doResetKeybinding(keybindingItem: ResolvedKeybindingItem): Promise<void> {
 		return this.resolveAndValidate()
 			.then(reference => {
 				const model = reference.object.textEditorModel;
@@ -108,7 +108,7 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 			});
 	}
 
-	private save(): Thenable<any> {
+	private save(): Promise<any> {
 		return this.textFileService.save(this.resource);
 	}
 
@@ -197,16 +197,16 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 	}
 
 
-	private resolveModelReference(): Thenable<IReference<ITextEditorModel>> {
+	private resolveModelReference(): Promise<IReference<ITextEditorModel>> {
 		return this.fileService.existsFile(this.resource)
 			.then(exists => {
 				const EOL = this.configurationService.getValue('files', { overrideIdentifier: 'json' })['eol'];
-				const result: Thenable<any> = exists ? Promise.resolve(null) : this.fileService.updateContent(this.resource, this.getEmptyContent(EOL), { encoding: 'utf8' });
+				const result: Promise<any> = exists ? Promise.resolve(null) : this.fileService.updateContent(this.resource, this.getEmptyContent(EOL), { encoding: 'utf8' });
 				return result.then(() => this.textModelResolverService.createModelReference(this.resource));
 			});
 	}
 
-	private resolveAndValidate(): Thenable<IReference<ITextEditorModel>> {
+	private resolveAndValidate(): Promise<IReference<ITextEditorModel>> {
 
 		// Target cannot be dirty if not writing into buffer
 		if (this.textFileService.isDirty(this.resource)) {
diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts
index cd0ebbf40f4..fa538e2d316 100644
--- a/src/vs/workbench/services/preferences/browser/preferencesService.ts
+++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts
@@ -103,7 +103,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return this.getEditableSettingsURI(ConfigurationTarget.WORKSPACE_FOLDER, resource);
 	}
 
-	resolveModel(uri: URI): Thenable<ITextModel> {
+	resolveModel(uri: URI): Promise<ITextModel> {
 		if (this.isDefaultSettingsResource(uri)) {
 
 			const target = this.getConfigurationTargetFromDefaultSettingsResource(uri);
@@ -150,7 +150,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return Promise.resolve(null);
 	}
 
-	createPreferencesEditorModel(uri: URI): Thenable<IPreferencesEditorModel<any>> {
+	createPreferencesEditorModel(uri: URI): Promise<IPreferencesEditorModel<any>> {
 		if (this.isDefaultSettingsResource(uri)) {
 			return this.createDefaultSettingsEditorModel(uri);
 		}
@@ -171,15 +171,15 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return Promise.resolve<IPreferencesEditorModel<any>>(null);
 	}
 
-	openRawDefaultSettings(): Thenable<IEditor> {
+	openRawDefaultSettings(): Promise<IEditor> {
 		return this.editorService.openEditor({ resource: this.defaultSettingsRawResource });
 	}
 
-	openRawUserSettings(): Thenable<IEditor> {
+	openRawUserSettings(): Promise<IEditor> {
 		return this.editorService.openEditor({ resource: this.userSettingsResource });
 	}
 
-	openSettings(jsonEditor?: boolean): Thenable<IEditor> {
+	openSettings(jsonEditor?: boolean): Promise<IEditor> {
 		jsonEditor = typeof jsonEditor === 'undefined' ?
 			this.configurationService.getValue('workbench.settings.editor') === 'json' :
 			jsonEditor;
@@ -194,13 +194,13 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return this.openOrSwitchSettings(target, resource);
 	}
 
-	private openSettings2(): Thenable<IEditor> {
+	private openSettings2(): Promise<IEditor> {
 		const input = this.settingsEditor2Input;
 		return this.editorGroupService.activeGroup.openEditor(input)
 			.then(() => this.editorGroupService.activeGroup.activeControl);
 	}
 
-	openGlobalSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Thenable<IEditor> {
+	openGlobalSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Promise<IEditor> {
 		jsonEditor = typeof jsonEditor === 'undefined' ?
 			this.configurationService.getValue('workbench.settings.editor') === 'json' :
 			jsonEditor;
@@ -210,7 +210,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			this.openOrSwitchSettings2(ConfigurationTarget.USER, undefined, options, group);
 	}
 
-	openWorkspaceSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Thenable<IEditor> {
+	openWorkspaceSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Promise<IEditor> {
 		jsonEditor = typeof jsonEditor === 'undefined' ?
 			this.configurationService.getValue('workbench.settings.editor') === 'json' :
 			jsonEditor;
@@ -225,7 +225,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			this.openOrSwitchSettings2(ConfigurationTarget.WORKSPACE, undefined, options, group);
 	}
 
-	openFolderSettings(folder: URI, jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Thenable<IEditor> {
+	openFolderSettings(folder: URI, jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Promise<IEditor> {
 		jsonEditor = typeof jsonEditor === 'undefined' ?
 			this.configurationService.getValue('workbench.settings.editor') === 'json' :
 			jsonEditor;
@@ -235,7 +235,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			this.openOrSwitchSettings2(ConfigurationTarget.WORKSPACE_FOLDER, folder, options, group);
 	}
 
-	switchSettings(target: ConfigurationTarget, resource: URI, jsonEditor?: boolean): Thenable<void> {
+	switchSettings(target: ConfigurationTarget, resource: URI, jsonEditor?: boolean): Promise<void> {
 		if (!jsonEditor) {
 			return this.doOpenSettings2(target, resource).then(() => null);
 		}
@@ -248,7 +248,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		}
 	}
 
-	openGlobalKeybindingSettings(textual: boolean): Thenable<void> {
+	openGlobalKeybindingSettings(textual: boolean): Promise<void> {
 		/* __GDPR__
 			"openKeybindings" : {
 				"textual" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
@@ -278,7 +278,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return this.editorService.openEditor(this.instantiationService.createInstance(KeybindingsEditorInput), { pinned: true, revealIfOpened: true }).then(() => null);
 	}
 
-	openDefaultKeybindingsFile(): Thenable<IEditor> {
+	openDefaultKeybindingsFile(): Promise<IEditor> {
 		return this.editorService.openEditor({ resource: this.defaultKeybindingsResource, label: nls.localize('defaultKeybindings', "Default Keybindings") });
 	}
 
@@ -300,7 +300,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 				}));
 	}
 
-	private openOrSwitchSettings(configurationTarget: ConfigurationTarget, resource: URI, options?: ISettingsEditorOptions, group: IEditorGroup = this.editorGroupService.activeGroup): Thenable<IEditor> {
+	private openOrSwitchSettings(configurationTarget: ConfigurationTarget, resource: URI, options?: ISettingsEditorOptions, group: IEditorGroup = this.editorGroupService.activeGroup): Promise<IEditor> {
 		const editorInput = this.getActiveSettingsEditorInput(group);
 		if (editorInput && editorInput.master.getResource().fsPath !== resource.fsPath) {
 			return this.doSwitchSettings(configurationTarget, resource, editorInput, group, options);
@@ -308,11 +308,11 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return this.doOpenSettings(configurationTarget, resource, options, group);
 	}
 
-	private openOrSwitchSettings2(configurationTarget: ConfigurationTarget, folderUri?: URI, options?: ISettingsEditorOptions, group: IEditorGroup = this.editorGroupService.activeGroup): Thenable<IEditor> {
+	private openOrSwitchSettings2(configurationTarget: ConfigurationTarget, folderUri?: URI, options?: ISettingsEditorOptions, group: IEditorGroup = this.editorGroupService.activeGroup): Promise<IEditor> {
 		return this.doOpenSettings2(configurationTarget, folderUri, options, group);
 	}
 
-	private doOpenSettings(configurationTarget: ConfigurationTarget, resource: URI, options?: ISettingsEditorOptions, group?: IEditorGroup): Thenable<IEditor> {
+	private doOpenSettings(configurationTarget: ConfigurationTarget, resource: URI, options?: ISettingsEditorOptions, group?: IEditorGroup): Promise<IEditor> {
 		const openDefaultSettings = !!this.configurationService.getValue(DEFAULT_SETTINGS_EDITOR_SETTING);
 
 		return this.getOrCreateEditableSettingsEditorInput(configurationTarget, resource)
@@ -340,7 +340,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return this.instantiationService.createInstance(Settings2EditorModel, this.getDefaultSettings(ConfigurationTarget.USER));
 	}
 
-	private doOpenSettings2(target: ConfigurationTarget, folderUri: URI | undefined, options?: IEditorOptions, group?: IEditorGroup): Thenable<IEditor> {
+	private doOpenSettings2(target: ConfigurationTarget, folderUri: URI | undefined, options?: IEditorOptions, group?: IEditorGroup): Promise<IEditor> {
 		const input = this.settingsEditor2Input;
 		const settingsOptions: ISettingsEditorOptions = {
 			...options,
@@ -351,7 +351,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return this.editorService.openEditor(input, SettingsEditorOptions.create(settingsOptions), group);
 	}
 
-	private doSwitchSettings(target: ConfigurationTarget, resource: URI, input: PreferencesEditorInput, group: IEditorGroup, options?: ISettingsEditorOptions): Thenable<IEditor> {
+	private doSwitchSettings(target: ConfigurationTarget, resource: URI, input: PreferencesEditorInput, group: IEditorGroup, options?: ISettingsEditorOptions): Promise<IEditor> {
 		return this.getOrCreateEditableSettingsEditorInput(target, this.getEditableSettingsURI(target, resource))
 			.then(toInput => {
 				return group.openEditor(input).then(() => {
@@ -426,12 +426,12 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return target === ConfigurationTarget.WORKSPACE_FOLDER ? nls.localize('folderSettingsName', "{0} (Folder Settings)", name) : name;
 	}
 
-	private getOrCreateEditableSettingsEditorInput(target: ConfigurationTarget, resource: URI): Thenable<EditorInput> {
+	private getOrCreateEditableSettingsEditorInput(target: ConfigurationTarget, resource: URI): Promise<EditorInput> {
 		return this.createSettingsIfNotExists(target, resource)
 			.then(() => <EditorInput>this.editorService.createInput({ resource }));
 	}
 
-	private createEditableSettingsEditorModel(configurationTarget: ConfigurationTarget, resource: URI): Thenable<SettingsEditorModel> {
+	private createEditableSettingsEditorModel(configurationTarget: ConfigurationTarget, resource: URI): Promise<SettingsEditorModel> {
 		const settingsUri = this.getEditableSettingsURI(configurationTarget, resource);
 		if (settingsUri) {
 			const workspace = this.contextService.getWorkspace();
@@ -445,7 +445,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return Promise.resolve<SettingsEditorModel>(null);
 	}
 
-	private createDefaultSettingsEditorModel(defaultSettingsUri: URI): Thenable<DefaultSettingsEditorModel> {
+	private createDefaultSettingsEditorModel(defaultSettingsUri: URI): Promise<DefaultSettingsEditorModel> {
 		return this.textModelResolverService.createModelReference(defaultSettingsUri)
 			.then(reference => {
 				const target = this.getConfigurationTargetFromDefaultSettingsResource(defaultSettingsUri);
@@ -489,7 +489,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return null;
 	}
 
-	private createSettingsIfNotExists(target: ConfigurationTarget, resource: URI): Thenable<void> {
+	private createSettingsIfNotExists(target: ConfigurationTarget, resource: URI): Promise<void> {
 		if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE && target === ConfigurationTarget.WORKSPACE) {
 			const workspaceConfig = this.contextService.getWorkspace().configuration;
 			if (!workspaceConfig) {
@@ -507,7 +507,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return this.createIfNotExists(resource, emptyEditableSettingsContent).then(() => { });
 	}
 
-	private createIfNotExists(resource: URI, contents: string): Thenable<any> {
+	private createIfNotExists(resource: URI, contents: string): Promise<any> {
 		return this.fileService.resolveContent(resource, { acceptTextOnly: true }).then(void 0, error => {
 			if ((<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
 				return this.fileService.updateContent(resource, contents).then(void 0, error => {
@@ -535,7 +535,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		];
 	}
 
-	private addLanguageOverrideEntry(language: string, settingsModel: IPreferencesEditorModel<ISetting>, codeEditor: ICodeEditor): Thenable<IPosition> {
+	private addLanguageOverrideEntry(language: string, settingsModel: IPreferencesEditorModel<ISetting>, codeEditor: ICodeEditor): Promise<IPosition> {
 		const languageKey = `[${language}]`;
 		let setting = settingsModel.getPreference(languageKey);
 		const model = codeEditor.getModel();
diff --git a/src/vs/workbench/services/preferences/common/keybindingsEditorModel.ts b/src/vs/workbench/services/preferences/common/keybindingsEditorModel.ts
index f6b5d30cf38..004a43e4305 100644
--- a/src/vs/workbench/services/preferences/common/keybindingsEditorModel.ts
+++ b/src/vs/workbench/services/preferences/common/keybindingsEditorModel.ts
@@ -161,7 +161,7 @@ export class KeybindingsEditorModel extends EditorModel {
 		return result;
 	}
 
-	public resolve(editorActionsLabels: { [id: string]: string; }): Thenable<EditorModel> {
+	public resolve(editorActionsLabels: { [id: string]: string; }): Promise<EditorModel> {
 		const workbenchActionsRegistry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
 
 		this._keybindingItemsSortedByPrecedence = [];
diff --git a/src/vs/workbench/services/preferences/common/preferences.ts b/src/vs/workbench/services/preferences/common/preferences.ts
index e816d316601..e001698baa3 100644
--- a/src/vs/workbench/services/preferences/common/preferences.ts
+++ b/src/vs/workbench/services/preferences/common/preferences.ts
@@ -201,18 +201,18 @@ export interface IPreferencesService {
 	workspaceSettingsResource: URI;
 	getFolderSettingsResource(resource: URI): URI;
 
-	resolveModel(uri: URI): Thenable<ITextModel>;
-	createPreferencesEditorModel<T>(uri: URI): Thenable<IPreferencesEditorModel<T>>;
+	resolveModel(uri: URI): Promise<ITextModel>;
+	createPreferencesEditorModel<T>(uri: URI): Promise<IPreferencesEditorModel<T>>;
 	createSettings2EditorModel(): Settings2EditorModel; // TODO
 
-	openRawDefaultSettings(): Thenable<IEditor>;
-	openSettings(jsonEditor?: boolean): Thenable<IEditor>;
-	openGlobalSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Thenable<IEditor>;
-	openWorkspaceSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Thenable<IEditor>;
-	openFolderSettings(folder: URI, jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Thenable<IEditor>;
-	switchSettings(target: ConfigurationTarget, resource: URI, jsonEditor?: boolean): Thenable<void>;
-	openGlobalKeybindingSettings(textual: boolean): Thenable<void>;
-	openDefaultKeybindingsFile(): Thenable<IEditor>;
+	openRawDefaultSettings(): Promise<IEditor>;
+	openSettings(jsonEditor?: boolean): Promise<IEditor>;
+	openGlobalSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Promise<IEditor>;
+	openWorkspaceSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Promise<IEditor>;
+	openFolderSettings(folder: URI, jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Promise<IEditor>;
+	switchSettings(target: ConfigurationTarget, resource: URI, jsonEditor?: boolean): Promise<void>;
+	openGlobalKeybindingSettings(textual: boolean): Promise<void>;
+	openDefaultKeybindingsFile(): Promise<IEditor>;
 
 	configureSettingsForLanguage(language: string): void;
 }
diff --git a/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts b/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
index 06bb10d0a47..0ec4aed029b 100644
--- a/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
+++ b/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
@@ -69,7 +69,7 @@ export class KeybindingsEditorInput extends EditorInput {
 		return nls.localize('keybindingsInputName', "Keyboard Shortcuts");
 	}
 
-	resolve(): Thenable<KeybindingsEditorModel> {
+	resolve(): Promise<KeybindingsEditorModel> {
 		return Promise.resolve(this.keybindingsModel);
 	}
 
@@ -107,7 +107,7 @@ export class SettingsEditor2Input extends EditorInput {
 		return nls.localize('settingsEditor2InputName', "Settings");
 	}
 
-	resolve(): Thenable<Settings2EditorModel> {
+	resolve(): Promise<Settings2EditorModel> {
 		return Promise.resolve(this._settingsModel);
 	}
 
diff --git a/src/vs/workbench/services/progress/browser/progressService.ts b/src/vs/workbench/services/progress/browser/progressService.ts
index f2432e817eb..e4b63c6f079 100644
--- a/src/vs/workbench/services/progress/browser/progressService.ts
+++ b/src/vs/workbench/services/progress/browser/progressService.ts
@@ -15,7 +15,7 @@ interface ProgressState {
 	total?: number;
 	worked?: number;
 	done?: boolean;
-	whilePromise?: Thenable<any>;
+	whilePromise?: Promise<any>;
 	whileStart?: number;
 	whileDelay?: number;
 }
@@ -205,7 +205,7 @@ export class ScopedProgressService extends ScopedService implements IProgressSer
 		};
 	}
 
-	showWhile(promise: Thenable<any>, delay?: number): Thenable<void> {
+	showWhile(promise: Promise<any>, delay?: number): Promise<void> {
 		let stack: boolean = !!this.progressState.whilePromise;
 
 		// Reset State
@@ -286,7 +286,7 @@ export class ProgressService implements IProgressService {
 		};
 	}
 
-	showWhile(promise: Thenable<any>, delay?: number): Thenable<void> {
+	showWhile(promise: Promise<any>, delay?: number): Promise<void> {
 		const stop = () => {
 			this.progressbar.stop().hide();
 		};
diff --git a/src/vs/workbench/services/progress/browser/progressService2.ts b/src/vs/workbench/services/progress/browser/progressService2.ts
index c7ec6fba35c..7a5b5a94d08 100644
--- a/src/vs/workbench/services/progress/browser/progressService2.ts
+++ b/src/vs/workbench/services/progress/browser/progressService2.ts
@@ -30,7 +30,7 @@ export class ProgressService2 implements IProgressService2 {
 		@IStatusbarService private readonly _statusbarService: IStatusbarService,
 	) { }
 
-	withProgress<P extends Thenable<R>, R=any>(options: IProgressOptions, task: (progress: IProgress<IProgressStep>) => P, onDidCancel?: () => void): P {
+	withProgress<P extends Promise<R>, R=any>(options: IProgressOptions, task: (progress: IProgress<IProgressStep>) => P, onDidCancel?: () => void): P {
 
 		const { location } = options;
 		if (typeof location === 'string') {
@@ -59,7 +59,7 @@ export class ProgressService2 implements IProgressService2 {
 		}
 	}
 
-	private _withWindowProgress<P extends Thenable<R>, R=any>(options: IProgressOptions, callback: (progress: IProgress<{ message?: string }>) => P): P {
+	private _withWindowProgress<P extends Promise<R>, R=any>(options: IProgressOptions, callback: (progress: IProgress<{ message?: string }>) => P): P {
 
 		const task: [IProgressOptions, Progress<IProgressStep>] = [options, new Progress<IProgressStep>(() => this._updateWindowProgress())];
 
@@ -128,7 +128,7 @@ export class ProgressService2 implements IProgressService2 {
 		}
 	}
 
-	private _withNotificationProgress<P extends Thenable<R>, R=any>(options: IProgressOptions, callback: (progress: IProgress<{ message?: string, increment?: number }>) => P, onDidCancel?: () => void): P {
+	private _withNotificationProgress<P extends Promise<R>, R=any>(options: IProgressOptions, callback: (progress: IProgress<{ message?: string, increment?: number }>) => P, onDidCancel?: () => void): P {
 		const toDispose: IDisposable[] = [];
 
 		const createNotification = (message: string, increment?: number): INotificationHandle => {
@@ -143,7 +143,7 @@ export class ProgressService2 implements IProgressService2 {
 						super('progress.cancel', localize('cancel', "Cancel"), null, true);
 					}
 
-					run(): Thenable<any> {
+					run(): Promise<any> {
 						if (typeof onDidCancel === 'function') {
 							onDidCancel();
 						}
@@ -223,7 +223,7 @@ export class ProgressService2 implements IProgressService2 {
 		return p;
 	}
 
-	private _withViewletProgress<P extends Thenable<R>, R=any>(viewletId: string, task: (progress: IProgress<{ message?: string }>) => P): P {
+	private _withViewletProgress<P extends Promise<R>, R=any>(viewletId: string, task: (progress: IProgress<{ message?: string }>) => P): P {
 
 		const promise = task(emptyProgress);
 
diff --git a/src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts b/src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts
index 6d21a8fa62a..b34f4545be5 100644
--- a/src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts
+++ b/src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts
@@ -40,8 +40,8 @@ export class RemoteAgentService implements IRemoteAgentService {
 class RemoteAgentConnection extends Disposable implements IRemoteAgentConnection {
 
 	readonly remoteAuthority: string;
-	private _connection: Thenable<Client<RemoteAgentConnectionContext>> | null;
-	private _environment: Thenable<IRemoteAgentEnvironment | null> | null;
+	private _connection: Promise<Client<RemoteAgentConnectionContext>> | null;
+	private _environment: Promise<IRemoteAgentEnvironment | null> | null;
 
 	constructor(
 		remoteAuthority: string,
@@ -55,7 +55,7 @@ class RemoteAgentConnection extends Disposable implements IRemoteAgentConnection
 		this._environment = null;
 	}
 
-	getEnvironment(): Thenable<IRemoteAgentEnvironment | null> {
+	getEnvironment(): Promise<IRemoteAgentEnvironment | null> {
 		if (!this._environment) {
 			const client = new RemoteExtensionEnvironmentChannelClient(this.getChannel('remoteextensionsenvironment'));
 
@@ -74,7 +74,7 @@ class RemoteAgentConnection extends Disposable implements IRemoteAgentConnection
 		this._getOrCreateConnection().then(client => client.registerChannel(channelName, channel));
 	}
 
-	private _getOrCreateConnection(): Thenable<Client<RemoteAgentConnectionContext>> {
+	private _getOrCreateConnection(): Promise<Client<RemoteAgentConnectionContext>> {
 		if (!this._connection) {
 			this._connection = this._remoteAuthorityResolverService.resolveAuthority(this.remoteAuthority).then((resolvedAuthority) => {
 				return connectRemoteAgentManagement(this.remoteAuthority, resolvedAuthority.host, resolvedAuthority.port, `renderer`);
diff --git a/src/vs/workbench/services/remote/node/remoteAgentEnvironmentChannel.ts b/src/vs/workbench/services/remote/node/remoteAgentEnvironmentChannel.ts
index 321d169c711..d9ae2e0d561 100644
--- a/src/vs/workbench/services/remote/node/remoteAgentEnvironmentChannel.ts
+++ b/src/vs/workbench/services/remote/node/remoteAgentEnvironmentChannel.ts
@@ -25,7 +25,7 @@ export class RemoteExtensionEnvironmentChannelClient {
 
 	constructor(private channel: IChannel) { }
 
-	getEnvironmentData(remoteAuthority: string, extensionDevelopmentPath?: URI): Thenable<IRemoteAgentEnvironment> {
+	getEnvironmentData(remoteAuthority: string, extensionDevelopmentPath?: URI): Promise<IRemoteAgentEnvironment> {
 		return this.channel.call<IRemoteAgentEnvironmentDTO>('getEnvironmentData', [remoteAuthority, extensionDevelopmentPath])
 			.then((data: IRemoteAgentEnvironmentDTO): IRemoteAgentEnvironment => {
 				return {
diff --git a/src/vs/workbench/services/remote/node/remoteAgentService.ts b/src/vs/workbench/services/remote/node/remoteAgentService.ts
index 836bc845e99..c9acd0e18d1 100644
--- a/src/vs/workbench/services/remote/node/remoteAgentService.ts
+++ b/src/vs/workbench/services/remote/node/remoteAgentService.ts
@@ -35,7 +35,7 @@ export interface IRemoteAgentService {
 export interface IRemoteAgentConnection {
 	readonly remoteAuthority: string;
 
-	getEnvironment(): Thenable<IRemoteAgentEnvironment | null>;
+	getEnvironment(): Promise<IRemoteAgentEnvironment | null>;
 
 	getChannel<T extends IChannel>(channelName: string): T;
 	registerChannel<T extends IServerChannel<RemoteAgentConnectionContext>>(channelName: string, channel: T);
diff --git a/src/vs/workbench/services/scm/common/scm.ts b/src/vs/workbench/services/scm/common/scm.ts
index 915c7c8230f..30efc419ad4 100644
--- a/src/vs/workbench/services/scm/common/scm.ts
+++ b/src/vs/workbench/services/scm/common/scm.ts
@@ -12,7 +12,7 @@ import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
 import { ISequence } from 'vs/base/common/sequence';
 
 export interface IBaselineResourceProvider {
-	getBaselineResource(resource: URI): Thenable<URI>;
+	getBaselineResource(resource: URI): Promise<URI>;
 }
 
 export const ISCMService = createDecorator<ISCMService>('scm');
@@ -33,7 +33,7 @@ export interface ISCMResource {
 	readonly resourceGroup: ISCMResourceGroup;
 	readonly sourceUri: URI;
 	readonly decorations: ISCMResourceDecorations;
-	open(): Thenable<void>;
+	open(): Promise<void>;
 }
 
 export interface ISCMResourceGroup extends ISequence<ISCMResource> {
@@ -63,7 +63,7 @@ export interface ISCMProvider extends IDisposable {
 	readonly statusBarCommands?: Command[];
 	readonly onDidChange: Event<void>;
 
-	getOriginalResource(uri: URI): Thenable<URI>;
+	getOriginalResource(uri: URI): Promise<URI>;
 }
 
 export const enum InputValidationType {
@@ -78,7 +78,7 @@ export interface IInputValidation {
 }
 
 export interface IInputValidator {
-	(value: string, cursorPosition: number): Thenable<IInputValidation | undefined>;
+	(value: string, cursorPosition: number): Promise<IInputValidation | undefined>;
 }
 
 export interface ISCMInput {
diff --git a/src/vs/workbench/services/search/node/legacy/worker/searchWorkerIpc.ts b/src/vs/workbench/services/search/node/legacy/worker/searchWorkerIpc.ts
index 1a8fb436fd6..f255eab7b6a 100644
--- a/src/vs/workbench/services/search/node/legacy/worker/searchWorkerIpc.ts
+++ b/src/vs/workbench/services/search/node/legacy/worker/searchWorkerIpc.ts
@@ -24,9 +24,9 @@ export interface ISearchWorkerSearchResult {
 }
 
 export interface ISearchWorker {
-	initialize(): Thenable<void>;
-	search(args: ISearchWorkerSearchArgs): Thenable<ISearchWorkerSearchResult>;
-	cancel(): Thenable<void>;
+	initialize(): Promise<void>;
+	search(args: ISearchWorkerSearchArgs): Promise<ISearchWorkerSearchResult>;
+	cancel(): Promise<void>;
 }
 
 export class SearchWorkerChannel implements IServerChannel {
@@ -50,15 +50,15 @@ export class SearchWorkerChannel implements IServerChannel {
 export class SearchWorkerChannelClient implements ISearchWorker {
 	constructor(private channel: IChannel) { }
 
-	initialize(): Thenable<void> {
+	initialize(): Promise<void> {
 		return this.channel.call('initialize');
 	}
 
-	search(args: ISearchWorkerSearchArgs): Thenable<ISearchWorkerSearchResult> {
+	search(args: ISearchWorkerSearchArgs): Promise<ISearchWorkerSearchResult> {
 		return this.channel.call('search', args);
 	}
 
-	cancel(): Thenable<void> {
+	cancel(): Promise<void> {
 		return this.channel.call('cancel');
 	}
 }
diff --git a/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts b/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts
index 0c3478effa6..56651b440d0 100644
--- a/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts
+++ b/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts
@@ -20,7 +20,7 @@ export class RipgrepSearchProvider implements vscode.TextSearchProvider {
 		return this.withToken(token, token => engine.provideTextSearchResults(query, options, progress, token));
 	}
 
-	private async withToken<T>(token: vscode.CancellationToken, fn: (token: vscode.CancellationToken) => Thenable<T>): Promise<T> {
+	private async withToken<T>(token: vscode.CancellationToken, fn: (token: vscode.CancellationToken) => Promise<T>): Promise<T> {
 		const merged = mergedTokenSource(token);
 		this.inProgress.add(merged);
 		const result = await fn(merged.token);
diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
index cc50d58f16e..b8064f40895 100644
--- a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
+++ b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
@@ -22,7 +22,7 @@ export class RipgrepTextSearchEngine {
 
 	constructor(private outputChannel: IOutputChannel) { }
 
-	provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<vscode.TextSearchComplete> {
+	provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Promise<vscode.TextSearchComplete> {
 		this.outputChannel.appendLine(`provideTextSearchResults ${query.pattern}, ${JSON.stringify({
 			...options,
 			...{
diff --git a/src/vs/workbench/services/search/node/search.ts b/src/vs/workbench/services/search/node/search.ts
index 631a515b463..965d5c0a6bf 100644
--- a/src/vs/workbench/services/search/node/search.ts
+++ b/src/vs/workbench/services/search/node/search.ts
@@ -16,7 +16,7 @@ export interface ITelemetryEvent {
 export interface IRawSearchService {
 	fileSearch(search: IRawFileQuery): Event<ISerializedSearchProgressItem | ISerializedSearchComplete>;
 	textSearch(search: IRawTextQuery): Event<ISerializedSearchProgressItem | ISerializedSearchComplete>;
-	clearCache(cacheKey: string): Thenable<void>;
+	clearCache(cacheKey: string): Promise<void>;
 }
 
 export interface IRawFileMatch {
diff --git a/src/vs/workbench/services/search/node/searchIpc.ts b/src/vs/workbench/services/search/node/searchIpc.ts
index 484aea61897..d6ef91388c6 100644
--- a/src/vs/workbench/services/search/node/searchIpc.ts
+++ b/src/vs/workbench/services/search/node/searchIpc.ts
@@ -20,7 +20,7 @@ export class SearchChannel implements IServerChannel {
 		throw new Error('Event not found');
 	}
 
-	call(_, command: string, arg?: any): Thenable<any> {
+	call(_, command: string, arg?: any): Promise<any> {
 		switch (command) {
 			case 'clearCache': return this.service.clearCache(arg);
 		}
@@ -40,7 +40,7 @@ export class SearchChannelClient implements IRawSearchService {
 		return this.channel.listen('textSearch', search);
 	}
 
-	clearCache(cacheKey: string): Thenable<void> {
+	clearCache(cacheKey: string): Promise<void> {
 		return this.channel.call('clearCache', cacheKey);
 	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/search/node/searchService.ts b/src/vs/workbench/services/search/node/searchService.ts
index 8fb29ea2bc2..c6bd9d7437d 100644
--- a/src/vs/workbench/services/search/node/searchService.ts
+++ b/src/vs/workbench/services/search/node/searchService.ts
@@ -123,7 +123,7 @@ export class SearchService extends Disposable implements ISearchService {
 	private doSearch(query: ISearchQuery, token?: CancellationToken, onProgress?: (item: ISearchProgressItem) => void): Promise<ISearchComplete> {
 		const schemesInQuery = this.getSchemesInQuery(query);
 
-		const providerActivations: Thenable<any>[] = [Promise.resolve(null)];
+		const providerActivations: Promise<any>[] = [Promise.resolve(null)];
 		schemesInQuery.forEach(scheme => providerActivations.push(this.extensionService.activateByEvent(`onSearch:${scheme}`)));
 		providerActivations.push(this.extensionService.activateByEvent('onSearch:file'));
 
@@ -191,7 +191,7 @@ export class SearchService extends Disposable implements ISearchService {
 		const e2eSW = StopWatch.create(false);
 
 		const diskSearchQueries: IFolderQuery[] = [];
-		const searchPs: Thenable<ISearchComplete>[] = [];
+		const searchPs: Promise<ISearchComplete>[] = [];
 
 		const fqs = this.groupFolderQueriesByScheme(query);
 		keys(fqs).forEach(scheme => {
@@ -601,7 +601,7 @@ export class DiskSearch implements ISearchResultProvider {
 		return fileMatch;
 	}
 
-	public clearCache(cacheKey: string): Thenable<void> {
+	public clearCache(cacheKey: string): Promise<void> {
 		return this.raw.clearCache(cacheKey);
 	}
 }
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index 2d7cc54f0c2..df3727422ac 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -70,7 +70,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	private saveSequentializer: SaveSequentializer;
 	private disposed: boolean;
 	private lastSaveAttemptTime: number;
-	private createTextEditorModelPromise: Thenable<TextFileEditorModel>;
+	private createTextEditorModelPromise: Promise<TextFileEditorModel>;
 	private inConflictMode: boolean;
 	private inOrphanMode: boolean;
 	private inErrorMode: boolean;
@@ -150,7 +150,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		}
 
 		if (fileEventImpactsModel && this.inOrphanMode !== newInOrphanModeGuess) {
-			let checkOrphanedPromise: Thenable<boolean>;
+			let checkOrphanedPromise: Promise<boolean>;
 			if (newInOrphanModeGuess) {
 				// We have received reports of users seeing delete events even though the file still
 				// exists (network shares issue: https://github.com/Microsoft/vscode/issues/13665).
@@ -204,7 +204,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		return this.versionId;
 	}
 
-	revert(soft?: boolean): Thenable<void> {
+	revert(soft?: boolean): Promise<void> {
 		if (!this.isResolved()) {
 			return Promise.resolve(null);
 		}
@@ -215,7 +215,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		// Unset flags
 		const undo = this.setDirty(false);
 
-		let loadPromise: Thenable<TextFileEditorModel>;
+		let loadPromise: Promise<TextFileEditorModel>;
 		if (soft) {
 			loadPromise = Promise.resolve();
 		} else {
@@ -235,7 +235,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		});
 	}
 
-	load(options?: ILoadOptions): Thenable<TextFileEditorModel> {
+	load(options?: ILoadOptions): Promise<TextFileEditorModel> {
 		this.logService.trace('load() - enter', this.resource);
 
 		// It is very important to not reload the model when the model is dirty.
@@ -256,7 +256,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		return this.loadFromFile(options);
 	}
 
-	private loadFromBackup(options?: ILoadOptions): Thenable<TextFileEditorModel> {
+	private loadFromBackup(options?: ILoadOptions): Promise<TextFileEditorModel> {
 		return this.backupFileService.loadBackupResource(this.resource).then(backup => {
 
 			// Make sure meanwhile someone else did not suceed or start loading
@@ -284,7 +284,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		});
 	}
 
-	private loadFromFile(options?: ILoadOptions): Thenable<TextFileEditorModel> {
+	private loadFromFile(options?: ILoadOptions): Promise<TextFileEditorModel> {
 		const forceReadFromDisk = options && options.forceReadFromDisk;
 		const allowBinary = this.isResolved() /* always allow if we resolved previously */ || (options && options.allowBinary);
 
@@ -347,7 +347,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			});
 	}
 
-	private loadWithContent(content: IRawTextContent, options?: ILoadOptions, backup?: URI): Thenable<TextFileEditorModel> {
+	private loadWithContent(content: IRawTextContent, options?: ILoadOptions, backup?: URI): Promise<TextFileEditorModel> {
 		return this.doLoadWithContent(content, backup).then(model => {
 			// Telemetry: We log the fileGet telemetry event after the model has been loaded to ensure a good mimetype
 			const settingsType = this.getTypeIfSettings();
@@ -373,7 +373,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		});
 	}
 
-	private doLoadWithContent(content: IRawTextContent, backup?: URI): Thenable<TextFileEditorModel> {
+	private doLoadWithContent(content: IRawTextContent, backup?: URI): Promise<TextFileEditorModel> {
 		this.logService.trace('load() - resolved content', this.resource);
 
 		// Update our resolved disk stat model
@@ -435,7 +435,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		this.updateSavedVersionId();
 	}
 
-	private doCreateTextModel(resource: URI, value: ITextBufferFactory, backup: URI): Thenable<TextFileEditorModel> {
+	private doCreateTextModel(resource: URI, value: ITextBufferFactory, backup: URI): Promise<TextFileEditorModel> {
 		this.logService.trace('load() - created text editor model', this.resource);
 
 		this.createTextEditorModelPromise = this.doLoadBackup(backup).then(backupContent => {
@@ -483,7 +483,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		this._register(this.textEditorModel.onDidChangeContent(() => this.onModelContentChanged()));
 	}
 
-	private doLoadBackup(backup: URI): Thenable<ITextBufferFactory> {
+	private doLoadBackup(backup: URI): Promise<ITextBufferFactory> {
 		if (!backup) {
 			return Promise.resolve(null);
 		}
@@ -581,7 +581,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		}
 	}
 
-	save(options: ISaveOptions = Object.create(null)): Thenable<void> {
+	save(options: ISaveOptions = Object.create(null)): Promise<void> {
 		if (!this.isResolved()) {
 			return Promise.resolve(null);
 		}
@@ -594,7 +594,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		return this.doSave(this.versionId, options);
 	}
 
-	private doSave(versionId: number, options: ISaveOptions): Thenable<void> {
+	private doSave(versionId: number, options: ISaveOptions): Promise<void> {
 		if (isUndefinedOrNull(options.reason)) {
 			options.reason = SaveReason.EXPLICIT;
 		}
@@ -650,7 +650,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		// we do not want to trigger another auto save or similar, so we block this
 		// In addition we update our version right after in case it changed because of a model change
 		// Save participants can also be skipped through API.
-		let saveParticipantPromise: Thenable<number> = Promise.resolve(versionId);
+		let saveParticipantPromise: Promise<number> = Promise.resolve(versionId);
 		if (TextFileEditorModel.saveParticipant && !options.skipSaveParticipants) {
 			const onCompleteOrError = () => {
 				this.blockModelContentChange = false;
@@ -833,7 +833,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		return telemetryData;
 	}
 
-	private doTouch(versionId: number): Thenable<void> {
+	private doTouch(versionId: number): Promise<void> {
 		return this.saveSequentializer.setPending(versionId, this.fileService.updateContent(this.lastResolvedDiskStat.resource, this.createSnapshot(), {
 			mtime: this.lastResolvedDiskStat.mtime,
 			encoding: this.getEncoding(),
@@ -1035,14 +1035,14 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 
 interface IPendingSave {
 	versionId: number;
-	promise: Thenable<void>;
+	promise: Promise<void>;
 }
 
 interface ISaveOperation {
-	promise: Thenable<void>;
+	promise: Promise<void>;
 	promiseResolve: () => void;
 	promiseReject: (error: Error) => void;
-	run: () => Thenable<void>;
+	run: () => Promise<void>;
 }
 
 export class SaveSequentializer {
@@ -1061,11 +1061,11 @@ export class SaveSequentializer {
 		return !!this._pendingSave;
 	}
 
-	get pendingSave(): Thenable<void> {
+	get pendingSave(): Promise<void> {
 		return this._pendingSave ? this._pendingSave.promise : void 0;
 	}
 
-	setPending(versionId: number, promise: Thenable<void>): Thenable<void> {
+	setPending(versionId: number, promise: Promise<void>): Promise<void> {
 		this._pendingSave = { versionId, promise };
 
 		promise.then(() => this.donePending(versionId), () => this.donePending(versionId));
@@ -1094,7 +1094,7 @@ export class SaveSequentializer {
 		}
 	}
 
-	setNext(run: () => Thenable<void>): Thenable<void> {
+	setNext(run: () => Promise<void>): Promise<void> {
 
 		// this is our first next save, so we create associated promise with it
 		// so that we can return a promise that completes when the save operation
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
index ba4e37af07f..1ae42707919 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
@@ -47,7 +47,7 @@ export class TextFileEditorModelManager extends Disposable implements ITextFileE
 	private mapResourceToStateChangeListener: ResourceMap<IDisposable>;
 	private mapResourceToModelContentChangeListener: ResourceMap<IDisposable>;
 	private mapResourceToModel: ResourceMap<ITextFileEditorModel>;
-	private mapResourceToPendingModelLoaders: ResourceMap<Thenable<ITextFileEditorModel>>;
+	private mapResourceToPendingModelLoaders: ResourceMap<Promise<ITextFileEditorModel>>;
 
 	constructor(
 		@ILifecycleService private lifecycleService: ILifecycleService,
@@ -59,7 +59,7 @@ export class TextFileEditorModelManager extends Disposable implements ITextFileE
 		this.mapResourceToDisposeListener = new ResourceMap<IDisposable>();
 		this.mapResourceToStateChangeListener = new ResourceMap<IDisposable>();
 		this.mapResourceToModelContentChangeListener = new ResourceMap<IDisposable>();
-		this.mapResourceToPendingModelLoaders = new ResourceMap<Thenable<ITextFileEditorModel>>();
+		this.mapResourceToPendingModelLoaders = new ResourceMap<Promise<ITextFileEditorModel>>();
 
 		this.registerListeners();
 	}
@@ -121,7 +121,7 @@ export class TextFileEditorModelManager extends Disposable implements ITextFileE
 		return this.mapResourceToModel.get(resource);
 	}
 
-	loadOrCreate(resource: URI, options?: IModelLoadOrCreateOptions): Thenable<ITextFileEditorModel> {
+	loadOrCreate(resource: URI, options?: IModelLoadOrCreateOptions): Promise<ITextFileEditorModel> {
 
 		// Return early if model is currently being loaded
 		const pendingLoad = this.mapResourceToPendingModelLoaders.get(resource);
@@ -129,7 +129,7 @@ export class TextFileEditorModelManager extends Disposable implements ITextFileE
 			return pendingLoad;
 		}
 
-		let modelPromise: Thenable<ITextFileEditorModel>;
+		let modelPromise: Promise<ITextFileEditorModel>;
 
 		// Model exists
 		let model = this.get(resource);
diff --git a/src/vs/workbench/services/textfile/common/textFileService.ts b/src/vs/workbench/services/textfile/common/textFileService.ts
index e2d4b35294e..7519e50143a 100644
--- a/src/vs/workbench/services/textfile/common/textFileService.ts
+++ b/src/vs/workbench/services/textfile/common/textFileService.ts
@@ -96,11 +96,11 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		return this._models;
 	}
 
-	abstract resolveTextContent(resource: URI, options?: IResolveContentOptions): Thenable<IRawTextContent>;
+	abstract resolveTextContent(resource: URI, options?: IResolveContentOptions): Promise<IRawTextContent>;
 
-	abstract promptForPath(resource: URI, defaultPath: URI): Thenable<URI>;
+	abstract promptForPath(resource: URI, defaultPath: URI): Promise<URI>;
 
-	abstract confirmSave(resources?: URI[]): Thenable<ConfirmResult>;
+	abstract confirmSave(resources?: URI[]): Promise<ConfirmResult>;
 
 	private registerListeners(): void {
 
@@ -116,7 +116,7 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		}));
 	}
 
-	private beforeShutdown(reason: ShutdownReason): boolean | Thenable<boolean> {
+	private beforeShutdown(reason: ShutdownReason): boolean | Promise<boolean> {
 
 		// Dirty files need treatment on shutdown
 		const dirty = this.getDirty();
@@ -145,7 +145,7 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		return this.noVeto({ cleanUpBackups: true });
 	}
 
-	private handleDirtyBeforeShutdown(dirty: URI[], reason: ShutdownReason): boolean | Thenable<boolean> {
+	private handleDirtyBeforeShutdown(dirty: URI[], reason: ShutdownReason): boolean | Promise<boolean> {
 
 		// If hot exit is enabled, backup dirty files and allow to exit without confirmation
 		if (this.isHotExitEnabled) {
@@ -168,7 +168,7 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		return this.confirmBeforeShutdown();
 	}
 
-	private backupBeforeShutdown(dirtyToBackup: URI[], textFileEditorModelManager: ITextFileEditorModelManager, reason: ShutdownReason): Thenable<IBackupResult> {
+	private backupBeforeShutdown(dirtyToBackup: URI[], textFileEditorModelManager: ITextFileEditorModelManager, reason: ShutdownReason): Promise<IBackupResult> {
 		return this.windowsService.getWindowCount().then(windowCount => {
 
 			// When quit is requested skip the confirm callback and attempt to backup all workspaces.
@@ -214,7 +214,7 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		});
 	}
 
-	private backupAll(dirtyToBackup: URI[], textFileEditorModelManager: ITextFileEditorModelManager): Thenable<void> {
+	private backupAll(dirtyToBackup: URI[], textFileEditorModelManager: ITextFileEditorModelManager): Promise<void> {
 
 		// split up between files and untitled
 		const filesToBackup: ITextFileEditorModel[] = [];
@@ -230,7 +230,7 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		return this.doBackupAll(filesToBackup, untitledToBackup);
 	}
 
-	private doBackupAll(dirtyFileModels: ITextFileEditorModel[], untitledResources: URI[]): Thenable<void> {
+	private doBackupAll(dirtyFileModels: ITextFileEditorModel[], untitledResources: URI[]): Promise<void> {
 
 		// Handle file resources first
 		return Promise.all(dirtyFileModels.map(model => this.backupFileService.backupResource(model.getResource(), model.createSnapshot(), model.getVersionId()))).then(results => {
@@ -250,7 +250,7 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		});
 	}
 
-	private confirmBeforeShutdown(): boolean | Thenable<boolean> {
+	private confirmBeforeShutdown(): boolean | Promise<boolean> {
 		return this.confirmSave().then(confirm => {
 
 			// Save
@@ -283,7 +283,7 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		});
 	}
 
-	private noVeto(options: { cleanUpBackups: boolean }): boolean | Thenable<boolean> {
+	private noVeto(options: { cleanUpBackups: boolean }): boolean | Promise<boolean> {
 		if (!options.cleanUpBackups) {
 			return false;
 		}
@@ -295,7 +295,7 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		return this.cleanupBackupsBeforeShutdown().then(() => false, () => false);
 	}
 
-	protected cleanupBackupsBeforeShutdown(): Thenable<void> {
+	protected cleanupBackupsBeforeShutdown(): Promise<void> {
 		if (this.environmentService.isExtensionDevelopment) {
 			return Promise.resolve(void 0);
 		}
@@ -380,7 +380,7 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		return this.untitledEditorService.getDirty().some(dirty => !resource || dirty.toString() === resource.toString());
 	}
 
-	save(resource: URI, options?: ISaveOptions): Thenable<boolean> {
+	save(resource: URI, options?: ISaveOptions): Promise<boolean> {
 
 		// Run a forced save if we detect the file is not dirty so that save participants can still run
 		if (options && options.force && this.fileService.canHandleResource(resource) && !this.isDirty(resource)) {
@@ -399,9 +399,9 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		return this.saveAll([resource], options).then(result => result.results.length === 1 && result.results[0].success);
 	}
 
-	saveAll(includeUntitled?: boolean, options?: ISaveOptions): Thenable<ITextFileOperationResult>;
-	saveAll(resources: URI[], options?: ISaveOptions): Thenable<ITextFileOperationResult>;
-	saveAll(arg1?: any, options?: ISaveOptions): Thenable<ITextFileOperationResult> {
+	saveAll(includeUntitled?: boolean, options?: ISaveOptions): Promise<ITextFileOperationResult>;
+	saveAll(resources: URI[], options?: ISaveOptions): Promise<ITextFileOperationResult>;
+	saveAll(arg1?: any, options?: ISaveOptions): Promise<ITextFileOperationResult> {
 
 		// get all dirty
 		let toSave: URI[] = [];
@@ -425,7 +425,7 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		return this.doSaveAll(filesToSave, untitledToSave, options);
 	}
 
-	private doSaveAll(fileResources: URI[], untitledResources: URI[], options?: ISaveOptions): Thenable<ITextFileOperationResult> {
+	private doSaveAll(fileResources: URI[], untitledResources: URI[], options?: ISaveOptions): Promise<ITextFileOperationResult> {
 
 		// Handle files first that can just be saved
 		return this.doSaveAllFiles(fileResources, options).then(async result => {
@@ -459,7 +459,7 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 			}
 
 			// Handle untitled
-			const untitledSaveAsPromises: Thenable<void>[] = [];
+			const untitledSaveAsPromises: Promise<void>[] = [];
 			targetsForUntitled.forEach((target, index) => {
 				const untitledSaveAsPromise = this.saveAs(untitledResources[index], target).then(uri => {
 					result.results.push({
@@ -476,7 +476,7 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		});
 	}
 
-	private doSaveAllFiles(resources?: URI[], options: ISaveOptions = Object.create(null)): Thenable<ITextFileOperationResult> {
+	private doSaveAllFiles(resources?: URI[], options: ISaveOptions = Object.create(null)): Promise<ITextFileOperationResult> {
 		const dirtyFileModels = this.getDirtyFileModels(Array.isArray(resources) ? resources : void 0 /* Save All */)
 			.filter(model => {
 				if ((model.hasState(ModelState.CONFLICT) || model.hasState(ModelState.ERROR)) && (options.reason === SaveReason.AUTO || options.reason === SaveReason.FOCUS_CHANGE || options.reason === SaveReason.WINDOW_CHANGE)) {
@@ -523,10 +523,10 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		return this.getFileModels(arg1).filter(model => model.isDirty());
 	}
 
-	saveAs(resource: URI, target?: URI, options?: ISaveOptions): Thenable<URI> {
+	saveAs(resource: URI, target?: URI, options?: ISaveOptions): Promise<URI> {
 
 		// Get to target resource
-		let targetPromise: Thenable<URI>;
+		let targetPromise: Promise<URI>;
 		if (target) {
 			targetPromise = Promise.resolve(target);
 		} else {
@@ -553,10 +553,10 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		});
 	}
 
-	private doSaveAs(resource: URI, target?: URI, options?: ISaveOptions): Thenable<URI> {
+	private doSaveAs(resource: URI, target?: URI, options?: ISaveOptions): Promise<URI> {
 
 		// Retrieve text model from provided resource if any
-		let modelPromise: Thenable<ITextFileEditorModel | UntitledEditorModel> = Promise.resolve(null);
+		let modelPromise: Promise<ITextFileEditorModel | UntitledEditorModel> = Promise.resolve(null);
 		if (this.fileService.canHandleResource(resource)) {
 			modelPromise = Promise.resolve(this._models.get(resource));
 		} else if (resource.scheme === Schemas.untitled && this.untitledEditorService.exists(resource)) {
@@ -583,8 +583,8 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		});
 	}
 
-	private doSaveTextFileAs(sourceModel: ITextFileEditorModel | UntitledEditorModel, resource: URI, target: URI, options?: ISaveOptions): Thenable<void> {
-		let targetModelResolver: Thenable<ITextFileEditorModel>;
+	private doSaveTextFileAs(sourceModel: ITextFileEditorModel | UntitledEditorModel, resource: URI, target: URI, options?: ISaveOptions): Promise<void> {
+		let targetModelResolver: Promise<ITextFileEditorModel>;
 
 		// Prefer an existing model if it is already loaded for the given target resource
 		const targetModel = this.models.get(target);
@@ -637,11 +637,11 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		return URI.file(untitledFileName);
 	}
 
-	revert(resource: URI, options?: IRevertOptions): Thenable<boolean> {
+	revert(resource: URI, options?: IRevertOptions): Promise<boolean> {
 		return this.revertAll([resource], options).then(result => result.results.length === 1 && result.results[0].success);
 	}
 
-	revertAll(resources?: URI[], options?: IRevertOptions): Thenable<ITextFileOperationResult> {
+	revertAll(resources?: URI[], options?: IRevertOptions): Promise<ITextFileOperationResult> {
 
 		// Revert files first
 		return this.doRevertAllFiles(resources, options).then(operation => {
@@ -654,7 +654,7 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		});
 	}
 
-	private doRevertAllFiles(resources?: URI[], options?: IRevertOptions): Thenable<ITextFileOperationResult> {
+	private doRevertAllFiles(resources?: URI[], options?: IRevertOptions): Promise<ITextFileOperationResult> {
 		const fileModels = options && options.force ? this.getFileModels(resources) : this.getDirtyFileModels(resources);
 
 		const mapResourceToResult = new ResourceMap<IResult>();
@@ -686,7 +686,7 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		})).then(r => ({ results: mapResourceToResult.values() }));
 	}
 
-	create(resource: URI, contents?: string, options?: { overwrite?: boolean }): Thenable<void> {
+	create(resource: URI, contents?: string, options?: { overwrite?: boolean }): Promise<void> {
 		const existingModel = this.models.get(resource);
 
 		return this.fileService.createFile(resource, contents, options).then(() => {
@@ -703,20 +703,20 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		});
 	}
 
-	delete(resource: URI, options?: { useTrash?: boolean, recursive?: boolean }): Thenable<void> {
+	delete(resource: URI, options?: { useTrash?: boolean, recursive?: boolean }): Promise<void> {
 		const dirtyFiles = this.getDirty().filter(dirty => isEqualOrParent(dirty, resource, !platform.isLinux /* ignorecase */));
 
 		return this.revertAll(dirtyFiles, { soft: true }).then(() => this.fileService.del(resource, options));
 	}
 
-	move(source: URI, target: URI, overwrite?: boolean): Thenable<void> {
-		const waitForPromises: Thenable<any>[] = [];
+	move(source: URI, target: URI, overwrite?: boolean): Promise<void> {
+		const waitForPromises: Promise<any>[] = [];
 
 		// Event
 		this._onWillMove.fire({
 			oldResource: source,
 			newResource: target,
-			waitUntil(promise: Thenable<any>) {
+			waitUntil(promise: Promise<any>) {
 				waitForPromises.push(promise.then(void 0, errors.onUnexpectedError));
 			}
 		});
@@ -727,7 +727,7 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 		return Promise.all(waitForPromises).then(() => {
 
 			// Handle target models if existing (if target URI is a folder, this can be multiple)
-			let handleTargetModelPromise: Thenable<any> = Promise.resolve();
+			let handleTargetModelPromise: Promise<any> = Promise.resolve();
 			const dirtyTargetModels = this.getDirtyFileModels().filter(model => isEqualOrParent(model.getResource(), target, false /* do not ignorecase, see https://github.com/Microsoft/vscode/issues/56384 */));
 			if (dirtyTargetModels.length) {
 				handleTargetModelPromise = this.revertAll(dirtyTargetModels.map(targetModel => targetModel.getResource()), { soft: true });
@@ -736,7 +736,7 @@ export abstract class TextFileService extends Disposable implements ITextFileSer
 			return handleTargetModelPromise.then(() => {
 
 				// Handle dirty source models if existing (if source URI is a folder, this can be multiple)
-				let handleDirtySourceModels: Thenable<any>;
+				let handleDirtySourceModels: Promise<any>;
 				const dirtySourceModels = this.getDirtyFileModels().filter(model => isEqualOrParent(model.getResource(), source, !platform.isLinux /* ignorecase */));
 				const dirtyTargetModels: URI[] = [];
 				if (dirtySourceModels.length) {
diff --git a/src/vs/workbench/services/textfile/common/textfiles.ts b/src/vs/workbench/services/textfile/common/textfiles.ts
index 21857f98d8d..a6991132dbc 100644
--- a/src/vs/workbench/services/textfile/common/textfiles.ts
+++ b/src/vs/workbench/services/textfile/common/textfiles.ts
@@ -29,7 +29,7 @@ export interface ISaveParticipant {
 	/**
 	 * Participate in a save of a model. Allows to change the model before it is being saved to disk.
 	 */
-	participate(model: ITextFileEditorModel, env: { reason: SaveReason }): Thenable<void>;
+	participate(model: ITextFileEditorModel, env: { reason: SaveReason }): Promise<void>;
 }
 
 /**
@@ -193,7 +193,7 @@ export interface ITextFileEditorModelManager {
 
 	getAll(resource?: URI): ITextFileEditorModel[];
 
-	loadOrCreate(resource: URI, options?: IModelLoadOrCreateOptions): Thenable<ITextFileEditorModel>;
+	loadOrCreate(resource: URI, options?: IModelLoadOrCreateOptions): Promise<ITextFileEditorModel>;
 
 	disposeModel(model: ITextFileEditorModel): void;
 }
@@ -240,11 +240,11 @@ export interface ITextFileEditorModel extends ITextEditorModel, IEncodingSupport
 
 	updatePreferredEncoding(encoding: string): void;
 
-	save(options?: ISaveOptions): Thenable<void>;
+	save(options?: ISaveOptions): Promise<void>;
 
-	load(options?: ILoadOptions): Thenable<ITextFileEditorModel>;
+	load(options?: ILoadOptions): Promise<ITextFileEditorModel>;
 
-	revert(soft?: boolean): Thenable<void>;
+	revert(soft?: boolean): Promise<void>;
 
 	createSnapshot(): ITextSnapshot;
 
@@ -259,7 +259,7 @@ export interface ITextFileEditorModel extends ITextEditorModel, IEncodingSupport
 export interface IWillMoveEvent {
 	oldResource: URI;
 	newResource: URI;
-	waitUntil(p: Thenable<any>): void;
+	waitUntil(p: Promise<any>): void;
 }
 
 export interface ITextFileService extends IDisposable {
@@ -280,7 +280,7 @@ export interface ITextFileService extends IDisposable {
 	/**
 	 * Resolve the contents of a file identified by the resource.
 	 */
-	resolveTextContent(resource: URI, options?: IResolveContentOptions): Thenable<IRawTextContent>;
+	resolveTextContent(resource: URI, options?: IResolveContentOptions): Promise<IRawTextContent>;
 
 	/**
 	 * A resource is dirty if it has unsaved changes or is an untitled file not yet saved.
@@ -305,7 +305,7 @@ export interface ITextFileService extends IDisposable {
 	 * @param options optional save options
 	 * @return true if the resource was saved.
 	 */
-	save(resource: URI, options?: ISaveOptions): Thenable<boolean>;
+	save(resource: URI, options?: ISaveOptions): Promise<boolean>;
 
 	/**
 	 * Saves the provided resource asking the user for a file name or using the provided one.
@@ -315,7 +315,7 @@ export interface ITextFileService extends IDisposable {
 	 * @param options optional save options
 	 * @return true if the file was saved.
 	 */
-	saveAs(resource: URI, targetResource?: URI, options?: ISaveOptions): Thenable<URI>;
+	saveAs(resource: URI, targetResource?: URI, options?: ISaveOptions): Promise<URI>;
 
 	/**
 	 * Saves the set of resources and returns a promise with the operation result.
@@ -323,8 +323,8 @@ export interface ITextFileService extends IDisposable {
 	 * @param resources can be null to save all.
 	 * @param includeUntitled to save all resources and optionally exclude untitled ones.
 	 */
-	saveAll(includeUntitled?: boolean, options?: ISaveOptions): Thenable<ITextFileOperationResult>;
-	saveAll(resources: URI[], options?: ISaveOptions): Thenable<ITextFileOperationResult>;
+	saveAll(includeUntitled?: boolean, options?: ISaveOptions): Promise<ITextFileOperationResult>;
+	saveAll(resources: URI[], options?: ISaveOptions): Promise<ITextFileOperationResult>;
 
 	/**
 	 * Reverts the provided resource.
@@ -332,28 +332,28 @@ export interface ITextFileService extends IDisposable {
 	 * @param resource the resource of the file to revert.
 	 * @param force to force revert even when the file is not dirty
 	 */
-	revert(resource: URI, options?: IRevertOptions): Thenable<boolean>;
+	revert(resource: URI, options?: IRevertOptions): Promise<boolean>;
 
 	/**
 	 * Reverts all the provided resources and returns a promise with the operation result.
 	 */
-	revertAll(resources?: URI[], options?: IRevertOptions): Thenable<ITextFileOperationResult>;
+	revertAll(resources?: URI[], options?: IRevertOptions): Promise<ITextFileOperationResult>;
 
 	/**
 	 * Create a file. If the file exists it will be overwritten with the contents if
 	 * the options enable to overwrite.
 	 */
-	create(resource: URI, contents?: string, options?: { overwrite?: boolean }): Thenable<void>;
+	create(resource: URI, contents?: string, options?: { overwrite?: boolean }): Promise<void>;
 
 	/**
 	 * Delete a file. If the file is dirty, it will get reverted and then deleted from disk.
 	 */
-	delete(resource: URI, options?: { useTrash?: boolean, recursive?: boolean }): Thenable<void>;
+	delete(resource: URI, options?: { useTrash?: boolean, recursive?: boolean }): Promise<void>;
 
 	/**
 	 * Move a file. If the file is dirty, its contents will be preserved and restored.
 	 */
-	move(source: URI, target: URI, overwrite?: boolean): Thenable<void>;
+	move(source: URI, target: URI, overwrite?: boolean): Promise<void>;
 
 	/**
 	 * Brings up the confirm dialog to either save, don't save or cancel.
@@ -361,7 +361,7 @@ export interface ITextFileService extends IDisposable {
 	 * @param resources the resources of the files to ask for confirmation or null if
 	 * confirming for all dirty resources.
 	 */
-	confirmSave(resources?: URI[]): Thenable<ConfirmResult>;
+	confirmSave(resources?: URI[]): Promise<ConfirmResult>;
 
 	/**
 	 * Convinient fast access to the current auto save mode.
diff --git a/src/vs/workbench/services/textfile/electron-browser/textFileService.ts b/src/vs/workbench/services/textfile/electron-browser/textFileService.ts
index ec9da978174..070eaa3c3ba 100644
--- a/src/vs/workbench/services/textfile/electron-browser/textFileService.ts
+++ b/src/vs/workbench/services/textfile/electron-browser/textFileService.ts
@@ -55,7 +55,7 @@ export class TextFileService extends AbstractTextFileService {
 		super(lifecycleService, contextService, configurationService, fileService, untitledEditorService, instantiationService, notificationService, environmentService, backupFileService, windowsService, windowService, historyService, contextKeyService, modelService);
 	}
 
-	resolveTextContent(resource: URI, options?: IResolveContentOptions): Thenable<IRawTextContent> {
+	resolveTextContent(resource: URI, options?: IResolveContentOptions): Promise<IRawTextContent> {
 		return this.fileService.resolveStreamContent(resource, options).then(streamContent => {
 			return createTextBufferFactoryFromStream(streamContent.value).then(res => {
 				const r: IRawTextContent = {
@@ -72,7 +72,7 @@ export class TextFileService extends AbstractTextFileService {
 		});
 	}
 
-	confirmSave(resources?: URI[]): Thenable<ConfirmResult> {
+	confirmSave(resources?: URI[]): Promise<ConfirmResult> {
 		if (this.environmentService.isExtensionDevelopment) {
 			return Promise.resolve(ConfirmResult.DONT_SAVE); // no veto when we are in extension dev mode because we cannot assum we run interactive (e.g. tests)
 		}
@@ -103,7 +103,7 @@ export class TextFileService extends AbstractTextFileService {
 		});
 	}
 
-	promptForPath(resource: URI, defaultUri: URI): Thenable<URI> {
+	promptForPath(resource: URI, defaultUri: URI): Promise<URI> {
 
 		// Help user to find a name for the file by opening it first
 		return this.editorService.openEditor({ resource, options: { revealIfOpened: true, preserveFocus: true, } }).then(() => {
diff --git a/src/vs/workbench/services/textfile/test/textFileService.test.ts b/src/vs/workbench/services/textfile/test/textFileService.test.ts
index a5af3f11c99..1dfdc4bdcc2 100644
--- a/src/vs/workbench/services/textfile/test/textFileService.test.ts
+++ b/src/vs/workbench/services/textfile/test/textFileService.test.ts
@@ -38,10 +38,10 @@ class ServiceAccessor {
 
 class BeforeShutdownEventImpl implements BeforeShutdownEvent {
 
-	public value: boolean | Thenable<boolean>;
+	public value: boolean | Promise<boolean>;
 	public reason = ShutdownReason.CLOSE;
 
-	veto(value: boolean | Thenable<boolean>): void {
+	veto(value: boolean | Promise<boolean>): void {
 		this.value = value;
 	}
 }
@@ -147,7 +147,7 @@ suite('Files - TextFileService', () => {
 			const event = new BeforeShutdownEventImpl();
 			accessor.lifecycleService.fireWillShutdown(event);
 
-			return (<Thenable<boolean>>event.value).then(veto => {
+			return (<Promise<boolean>>event.value).then(veto => {
 				assert.ok(!veto);
 				assert.ok(!model.isDirty());
 			});
@@ -426,7 +426,7 @@ suite('Files - TextFileService', () => {
 			});
 		});
 
-		function hotExitTest(this: any, setting: string, shutdownReason: ShutdownReason, multipleWindows: boolean, workspace: true, shouldVeto: boolean): Thenable<void> {
+		function hotExitTest(this: any, setting: string, shutdownReason: ShutdownReason, multipleWindows: boolean, workspace: true, shouldVeto: boolean): Promise<void> {
 			model = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/file.txt'), 'utf8');
 			(<TextFileEditorModelManager>accessor.textFileService.models).add(model.getResource(), model);
 
@@ -453,7 +453,7 @@ suite('Files - TextFileService', () => {
 				event.reason = shutdownReason;
 				accessor.lifecycleService.fireWillShutdown(event);
 
-				return (<Thenable<boolean>>event.value).then(veto => {
+				return (<Promise<boolean>>event.value).then(veto => {
 					// When hot exit is set, backups should never be cleaned since the confirm result is cancel
 					assert.ok(!service.cleanupBackupsBeforeShutdownCalled);
 					assert.equal(veto, shouldVeto);
diff --git a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
index ff3e60fb3ec..38845a0e2fc 100644
--- a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
+++ b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
@@ -17,7 +17,7 @@ import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/un
 import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
 import { IFileService } from 'vs/platform/files/common/files';
 
-class ResourceModelCollection extends ReferenceCollection<Thenable<ITextEditorModel>> {
+class ResourceModelCollection extends ReferenceCollection<Promise<ITextEditorModel>> {
 
 	private providers: { [scheme: string]: ITextModelContentProvider[] } = Object.create(null);
 	private modelsToDispose = new Set<string>();
@@ -30,7 +30,7 @@ class ResourceModelCollection extends ReferenceCollection<Thenable<ITextEditorMo
 		super();
 	}
 
-	createReferencedObject(key: string, skipActivateProvider?: boolean): Thenable<ITextEditorModel> {
+	createReferencedObject(key: string, skipActivateProvider?: boolean): Promise<ITextEditorModel> {
 		this.modelsToDispose.delete(key);
 
 		const resource = URI.parse(key);
@@ -53,7 +53,7 @@ class ResourceModelCollection extends ReferenceCollection<Thenable<ITextEditorMo
 		return Promise.reject(new Error('resource is not available'));
 	}
 
-	destroyReferencedObject(key: string, modelPromise: Thenable<ITextEditorModel>): void {
+	destroyReferencedObject(key: string, modelPromise: Promise<ITextEditorModel>): void {
 		this.modelsToDispose.add(key);
 
 		modelPromise.then(model => {
@@ -96,7 +96,7 @@ class ResourceModelCollection extends ReferenceCollection<Thenable<ITextEditorMo
 		});
 	}
 
-	private resolveTextModelContent(key: string): Thenable<ITextModel> {
+	private resolveTextModelContent(key: string): Promise<ITextModel> {
 		const resource = URI.parse(key);
 		const providers = this.providers[resource.scheme] || [];
 		const factories = providers.map(p => () => Promise.resolve(p.provideTextContent(resource)));
@@ -125,11 +125,11 @@ export class TextModelResolverService implements ITextModelService {
 		this.resourceModelCollection = instantiationService.createInstance(ResourceModelCollection);
 	}
 
-	createModelReference(resource: URI): Thenable<IReference<ITextEditorModel>> {
+	createModelReference(resource: URI): Promise<IReference<ITextEditorModel>> {
 		return this._createModelReference(resource);
 	}
 
-	private _createModelReference(resource: URI): Thenable<IReference<ITextEditorModel>> {
+	private _createModelReference(resource: URI): Promise<IReference<ITextEditorModel>> {
 
 		// Untitled Schema: go through cached input
 		if (resource.scheme === network.Schemas.untitled) {
diff --git a/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts b/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts
index 11eb7c5710a..0ddaa02741b 100644
--- a/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts
+++ b/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts
@@ -56,7 +56,7 @@ suite('Workbench - TextModelResolverService', () => {
 
 	test('resolve resource', function () {
 		const dispose = accessor.textModelResolverService.registerTextModelContentProvider('test', {
-			provideTextContent: function (resource: URI): Thenable<ITextModel> {
+			provideTextContent: function (resource: URI): Promise<ITextModel> {
 				if (resource.scheme === 'test') {
 					let modelContent = 'Hello Test';
 					let languageSelection = accessor.modeService.create('json');
@@ -136,7 +136,7 @@ suite('Workbench - TextModelResolverService', () => {
 		let waitForIt = new Promise(c => resolveModel = c);
 
 		const disposable = accessor.textModelResolverService.registerTextModelContentProvider('test', {
-			provideTextContent: (resource: URI): Thenable<ITextModel> => {
+			provideTextContent: (resource: URI): Promise<ITextModel> => {
 				return waitForIt.then(_ => {
 					let modelContent = 'Hello Test';
 					let languageSelection = accessor.modeService.create('json');
diff --git a/src/vs/workbench/services/themes/common/workbenchThemeService.ts b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
index 5fa7344a2d4..97b02993975 100644
--- a/src/vs/workbench/services/themes/common/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
@@ -53,15 +53,15 @@ export interface IFileIconTheme extends IIconTheme {
 
 export interface IWorkbenchThemeService extends IThemeService {
 	_serviceBrand: any;
-	setColorTheme(themeId: string, settingsTarget: ConfigurationTarget): Thenable<IColorTheme>;
+	setColorTheme(themeId: string, settingsTarget: ConfigurationTarget): Promise<IColorTheme>;
 	getColorTheme(): IColorTheme;
-	getColorThemes(): Thenable<IColorTheme[]>;
+	getColorThemes(): Promise<IColorTheme[]>;
 	onDidColorThemeChange: Event<IColorTheme>;
 	restoreColorTheme();
 
-	setFileIconTheme(iconThemeId: string, settingsTarget: ConfigurationTarget): Thenable<IFileIconTheme>;
+	setFileIconTheme(iconThemeId: string, settingsTarget: ConfigurationTarget): Promise<IFileIconTheme>;
 	getFileIconTheme(): IFileIconTheme;
-	getFileIconThemes(): Thenable<IFileIconTheme[]>;
+	getFileIconThemes(): Promise<IFileIconTheme[]>;
 	onDidFileIconThemeChange: Event<IFileIconTheme>;
 }
 
diff --git a/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts b/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
index 6631de0dfac..46eb3d579da 100644
--- a/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
+++ b/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
@@ -134,7 +134,7 @@ export class ColorThemeData implements IColorTheme {
 		}
 	}
 
-	public ensureLoaded(fileService: IFileService): Thenable<void> {
+	public ensureLoaded(fileService: IFileService): Promise<void> {
 		if (!this.isLoaded) {
 			if (this.location) {
 				return _loadColorTheme(fileService, this.location, this.themeTokenColors, this.colorMap).then(_ => {
@@ -271,7 +271,7 @@ function toCSSSelector(str: string) {
 	return str;
 }
 
-function _loadColorTheme(fileService: IFileService, themeLocation: URI, resultRules: ITokenColorizationRule[], resultColors: IColorMap): Thenable<any> {
+function _loadColorTheme(fileService: IFileService, themeLocation: URI, resultRules: ITokenColorizationRule[], resultColors: IColorMap): Promise<any> {
 	if (Paths.extname(themeLocation.path) === '.json') {
 		return fileService.resolveContent(themeLocation, { encoding: 'utf8' }).then(content => {
 			let errors: Json.ParseError[] = [];
@@ -279,7 +279,7 @@ function _loadColorTheme(fileService: IFileService, themeLocation: URI, resultRu
 			if (errors.length > 0) {
 				return Promise.reject(new Error(nls.localize('error.cannotparsejson', "Problems parsing JSON theme file: {0}", errors.map(e => getParseErrorMessage(e.error)).join(', '))));
 			}
-			let includeCompletes: Thenable<any> = Promise.resolve(null);
+			let includeCompletes: Promise<any> = Promise.resolve(null);
 			if (contentValue.include) {
 				includeCompletes = _loadColorTheme(fileService, resources.joinPath(resources.dirname(themeLocation), contentValue.include), resultRules, resultColors);
 			}
@@ -320,12 +320,12 @@ function _loadColorTheme(fileService: IFileService, themeLocation: URI, resultRu
 	}
 }
 
-let pListParser: Thenable<{ parse(content: string) }>;
+let pListParser: Promise<{ parse(content: string) }>;
 function getPListParser() {
 	return pListParser || import('fast-plist');
 }
 
-function _loadSyntaxTokens(fileService: IFileService, themeLocation: URI, resultRules: ITokenColorizationRule[], resultColors: IColorMap): Thenable<any> {
+function _loadSyntaxTokens(fileService: IFileService, themeLocation: URI, resultRules: ITokenColorizationRule[], resultColors: IColorMap): Promise<any> {
 	return fileService.resolveContent(themeLocation, { encoding: 'utf8' }).then(content => {
 		return getPListParser().then(parser => {
 			try {
diff --git a/src/vs/workbench/services/themes/electron-browser/colorThemeStore.ts b/src/vs/workbench/services/themes/electron-browser/colorThemeStore.ts
index 2ee79f5abc6..471dfffb9f3 100644
--- a/src/vs/workbench/services/themes/electron-browser/colorThemeStore.ts
+++ b/src/vs/workbench/services/themes/electron-browser/colorThemeStore.ts
@@ -106,7 +106,7 @@ export class ColorThemeStore {
 		});
 	}
 
-	public findThemeData(themeId: string, defaultId?: string): Thenable<ColorThemeData> {
+	public findThemeData(themeId: string, defaultId?: string): Promise<ColorThemeData> {
 		return this.getColorThemes().then(allThemes => {
 			let defaultTheme: ColorThemeData = void 0;
 			for (let t of allThemes) {
@@ -121,7 +121,7 @@ export class ColorThemeStore {
 		});
 	}
 
-	public findThemeDataBySettingsId(settingsId: string, defaultId: string): Thenable<ColorThemeData> {
+	public findThemeDataBySettingsId(settingsId: string, defaultId: string): Promise<ColorThemeData> {
 		return this.getColorThemes().then(allThemes => {
 			let defaultTheme: ColorThemeData = void 0;
 			for (let t of allThemes) {
@@ -136,7 +136,7 @@ export class ColorThemeStore {
 		});
 	}
 
-	public getColorThemes(): Thenable<IColorTheme[]> {
+	public getColorThemes(): Promise<IColorTheme[]> {
 		return this.extensionService.whenInstalledExtensionsRegistered().then(isReady => {
 			return this.extensionsColorThemes;
 		});
diff --git a/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.ts b/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.ts
index bc1449601f0..d1f0a073413 100644
--- a/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.ts
+++ b/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.ts
@@ -28,7 +28,7 @@ export class FileIconThemeData implements IFileIconTheme {
 
 	private constructor() { }
 
-	public ensureLoaded(fileService: IFileService): Thenable<string> {
+	public ensureLoaded(fileService: IFileService): Promise<string> {
 		if (!this.isLoaded) {
 			if (this.location) {
 				return _loadIconThemeDocument(fileService, this.location).then(iconThemeDocument => {
@@ -155,7 +155,7 @@ interface IconThemeDocument extends IconsAssociation {
 	hidesExplorerArrows?: boolean;
 }
 
-function _loadIconThemeDocument(fileService: IFileService, location: URI): Thenable<IconThemeDocument> {
+function _loadIconThemeDocument(fileService: IFileService, location: URI): Promise<IconThemeDocument> {
 	return fileService.resolveContent(location, { encoding: 'utf8' }).then((content) => {
 		let errors: Json.ParseError[] = [];
 		let contentValue = Json.parse(content.value.toString(), errors);
diff --git a/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.ts b/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.ts
index 41bd8bee59e..a8b9e9a0024 100644
--- a/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.ts
+++ b/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.ts
@@ -105,7 +105,7 @@ export class FileIconThemeStore {
 
 	}
 
-	public findThemeData(iconTheme: string): Thenable<FileIconThemeData | null> {
+	public findThemeData(iconTheme: string): Promise<FileIconThemeData | null> {
 		return this.getFileIconThemes().then(allIconSets => {
 			for (let iconSet of allIconSets) {
 				if (iconSet.id === iconTheme) {
@@ -116,7 +116,7 @@ export class FileIconThemeStore {
 		});
 	}
 
-	public findThemeBySettingsId(settingsId: string): Thenable<FileIconThemeData | null> {
+	public findThemeBySettingsId(settingsId: string): Promise<FileIconThemeData | null> {
 		return this.getFileIconThemes().then(allIconSets => {
 			for (let iconSet of allIconSets) {
 				if (iconSet.settingsId === settingsId) {
@@ -127,7 +127,7 @@ export class FileIconThemeStore {
 		});
 	}
 
-	public getFileIconThemes(): Thenable<FileIconThemeData[]> {
+	public getFileIconThemes(): Promise<FileIconThemeData[]> {
 		return this.extensionService.whenInstalledExtensionsRegistered().then(isReady => {
 			return this.knownIconThemes;
 		});
diff --git a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
index 46c61805803..5086b9c4126 100644
--- a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
@@ -199,7 +199,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		return this.onColorThemeChange.event;
 	}
 
-	private initialize(): Thenable<[IColorTheme, IFileIconTheme]> {
+	private initialize(): Promise<[IColorTheme, IFileIconTheme]> {
 		let detectHCThemeSetting = this.configurationService.getValue<boolean>(DETECT_HC_SETTING);
 
 		let colorThemeSetting: string;
@@ -263,7 +263,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		return this.currentColorTheme;
 	}
 
-	public getColorThemes(): Thenable<IColorTheme[]> {
+	public getColorThemes(): Promise<IColorTheme[]> {
 		return this.colorThemeStore.getColorThemes();
 	}
 
@@ -271,7 +271,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		return this.getColorTheme();
 	}
 
-	public setColorTheme(themeId: string, settingsTarget: ConfigurationTarget): Thenable<IColorTheme> {
+	public setColorTheme(themeId: string, settingsTarget: ConfigurationTarget): Promise<IColorTheme> {
 		if (!themeId) {
 			return Promise.resolve(null);
 		}
@@ -329,7 +329,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		_applyRules(cssRules.join('\n'), colorThemeRulesClassName);
 	}
 
-	private applyTheme(newTheme: ColorThemeData, settingsTarget: ConfigurationTarget, silent = false): Thenable<IColorTheme> {
+	private applyTheme(newTheme: ColorThemeData, settingsTarget: ConfigurationTarget, silent = false): Promise<IColorTheme> {
 		if (this.container) {
 			if (this.currentColorTheme) {
 				removeClasses(this.container, this.currentColorTheme.id);
@@ -357,7 +357,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		return this.writeColorThemeConfiguration(settingsTarget);
 	}
 
-	private writeColorThemeConfiguration(settingsTarget: ConfigurationTarget): Thenable<IColorTheme> {
+	private writeColorThemeConfiguration(settingsTarget: ConfigurationTarget): Promise<IColorTheme> {
 		if (!types.isUndefinedOrNull(settingsTarget)) {
 			return this.configurationWriter.writeConfiguration(COLOR_THEME_SETTING, this.currentColorTheme.settingsId, settingsTarget).then(_ => this.currentColorTheme);
 		}
@@ -390,7 +390,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		}
 	}
 
-	public getFileIconThemes(): Thenable<IFileIconTheme[]> {
+	public getFileIconThemes(): Promise<IFileIconTheme[]> {
 		return this.iconThemeStore.getFileIconThemes();
 	}
 
@@ -402,7 +402,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		return this.currentIconTheme;
 	}
 
-	public setFileIconTheme(iconTheme: string, settingsTarget: ConfigurationTarget): Thenable<IFileIconTheme> {
+	public setFileIconTheme(iconTheme: string, settingsTarget: ConfigurationTarget): Promise<IFileIconTheme> {
 		iconTheme = iconTheme || '';
 		if (iconTheme === this.currentIconTheme.id && this.currentIconTheme.isLoaded) {
 			return this.writeFileIconConfiguration(settingsTarget);
@@ -443,7 +443,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 
 	}
 
-	private writeFileIconConfiguration(settingsTarget: ConfigurationTarget): Thenable<IFileIconTheme> {
+	private writeFileIconConfiguration(settingsTarget: ConfigurationTarget): Promise<IFileIconTheme> {
 		if (!types.isUndefinedOrNull(settingsTarget)) {
 			return this.configurationWriter.writeConfiguration(ICON_THEME_SETTING, this.currentIconTheme.settingsId, settingsTarget).then(_ => this.currentIconTheme);
 		}
@@ -471,7 +471,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 	}
 }
 
-function _applyIconTheme(data: FileIconThemeData, onApply: (theme: FileIconThemeData) => Thenable<IFileIconTheme>): Thenable<IFileIconTheme> {
+function _applyIconTheme(data: FileIconThemeData, onApply: (theme: FileIconThemeData) => Promise<IFileIconTheme>): Promise<IFileIconTheme> {
 	_applyRules(data.styleSheetContent, iconThemeRulesClassName);
 	return onApply(data);
 }
@@ -496,7 +496,7 @@ class ConfigurationWriter {
 	constructor(@IConfigurationService private configurationService: IConfigurationService) {
 	}
 
-	public writeConfiguration(key: string, value: any, settingsTarget: ConfigurationTarget): Thenable<void> {
+	public writeConfiguration(key: string, value: any, settingsTarget: ConfigurationTarget): Promise<void> {
 		let settings = this.configurationService.inspect(key);
 		if (settingsTarget === ConfigurationTarget.USER) {
 			if (value === settings.user) {
diff --git a/src/vs/workbench/services/untitled/common/untitledEditorService.ts b/src/vs/workbench/services/untitled/common/untitledEditorService.ts
index 7629337e713..6790f90a21e 100644
--- a/src/vs/workbench/services/untitled/common/untitledEditorService.ts
+++ b/src/vs/workbench/services/untitled/common/untitledEditorService.ts
@@ -85,7 +85,7 @@ export interface IUntitledEditorService {
 	 * It is valid to pass in a file resource. In that case the path will be used as identifier.
 	 * The use case is to be able to create a new file with a specific path with VSCode.
 	 */
-	loadOrCreate(options: IModelLoadOrCreateOptions): Thenable<UntitledEditorModel>;
+	loadOrCreate(options: IModelLoadOrCreateOptions): Promise<UntitledEditorModel>;
 
 	/**
 	 * A check to find out if a untitled resource has a file path associated or not.
@@ -180,7 +180,7 @@ export class UntitledEditorService extends Disposable implements IUntitledEditor
 			.map(i => i.getResource());
 	}
 
-	loadOrCreate(options: IModelLoadOrCreateOptions = Object.create(null)): Thenable<UntitledEditorModel> {
+	loadOrCreate(options: IModelLoadOrCreateOptions = Object.create(null)): Promise<UntitledEditorModel> {
 		return this.createOrGet(options.resource, options.modeId, options.initialValue, options.encoding, options.useResourcePath).resolve();
 	}
 
diff --git a/src/vs/workbench/services/viewlet/browser/viewlet.ts b/src/vs/workbench/services/viewlet/browser/viewlet.ts
index 88e0be01c41..7ae5e2acc4f 100644
--- a/src/vs/workbench/services/viewlet/browser/viewlet.ts
+++ b/src/vs/workbench/services/viewlet/browser/viewlet.ts
@@ -22,7 +22,7 @@ export interface IViewletService {
 	/**
 	 * Opens a viewlet with the given identifier and pass keyboard focus to it if specified.
 	 */
-	openViewlet(id: string, focus?: boolean): Thenable<IViewlet>;
+	openViewlet(id: string, focus?: boolean): Promise<IViewlet>;
 
 	/**
 	 * Returns the current active viewlet or null if none.
diff --git a/src/vs/workbench/services/workspace/common/workspaceEditing.ts b/src/vs/workbench/services/workspace/common/workspaceEditing.ts
index 33e5bafe81c..db73788241f 100644
--- a/src/vs/workbench/services/workspace/common/workspaceEditing.ts
+++ b/src/vs/workbench/services/workspace/common/workspaceEditing.ts
@@ -17,38 +17,38 @@ export interface IWorkspaceEditingService {
 	 * Add folders to the existing workspace.
 	 * When `donotNotifyError` is `true`, error will be bubbled up otherwise, the service handles the error with proper message and action
 	 */
-	addFolders(folders: IWorkspaceFolderCreationData[], donotNotifyError?: boolean): Thenable<void>;
+	addFolders(folders: IWorkspaceFolderCreationData[], donotNotifyError?: boolean): Promise<void>;
 
 	/**
 	 * Remove folders from the existing workspace
 	 * When `donotNotifyError` is `true`, error will be bubbled up otherwise, the service handles the error with proper message and action
 	 */
-	removeFolders(folders: URI[], donotNotifyError?: boolean): Thenable<void>;
+	removeFolders(folders: URI[], donotNotifyError?: boolean): Promise<void>;
 
 	/**
 	 * Allows to add and remove folders to the existing workspace at once.
 	 * When `donotNotifyError` is `true`, error will be bubbled up otherwise, the service handles the error with proper message and action
 	 */
-	updateFolders(index: number, deleteCount?: number, foldersToAdd?: IWorkspaceFolderCreationData[], donotNotifyError?: boolean): Thenable<void>;
+	updateFolders(index: number, deleteCount?: number, foldersToAdd?: IWorkspaceFolderCreationData[], donotNotifyError?: boolean): Promise<void>;
 
 	/**
 	 * enters the workspace with the provided path.
 	 */
-	enterWorkspace(path: string): Thenable<void>;
+	enterWorkspace(path: string): Promise<void>;
 
 	/**
 	 * creates a new workspace with the provided folders and opens it. if path is provided
 	 * the workspace will be saved into that location.
 	 */
-	createAndEnterWorkspace(folders?: IWorkspaceFolderCreationData[], path?: string): Thenable<void>;
+	createAndEnterWorkspace(folders?: IWorkspaceFolderCreationData[], path?: string): Promise<void>;
 
 	/**
 	 * saves the workspace to the provided path and opens it. requires a workspace to be opened.
 	 */
-	saveAndEnterWorkspace(path: string): Thenable<void>;
+	saveAndEnterWorkspace(path: string): Promise<void>;
 
 	/**
 	 * copies current workspace settings to the target workspace.
 	 */
-	copyWorkspaceSettings(toWorkspace: IWorkspaceIdentifier): Thenable<void>;
+	copyWorkspaceSettings(toWorkspace: IWorkspaceIdentifier): Promise<void>;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/workspace/node/workspaceEditingService.ts b/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
index 81466a22ac3..c3d35053004 100644
--- a/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
+++ b/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
@@ -42,7 +42,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 	) {
 	}
 
-	updateFolders(index: number, deleteCount?: number, foldersToAdd?: IWorkspaceFolderCreationData[], donotNotifyError?: boolean): Thenable<void> {
+	updateFolders(index: number, deleteCount?: number, foldersToAdd?: IWorkspaceFolderCreationData[], donotNotifyError?: boolean): Promise<void> {
 		const folders = this.contextService.getWorkspace().folders;
 
 		let foldersToDelete: URI[] = [];
@@ -87,16 +87,16 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 		}
 	}
 
-	private doUpdateFolders(foldersToAdd: IWorkspaceFolderCreationData[], foldersToDelete: URI[], index?: number, donotNotifyError: boolean = false): Thenable<void> {
+	private doUpdateFolders(foldersToAdd: IWorkspaceFolderCreationData[], foldersToDelete: URI[], index?: number, donotNotifyError: boolean = false): Promise<void> {
 		return this.contextService.updateFolders(foldersToAdd, foldersToDelete, index)
 			.then(() => null, error => donotNotifyError ? Promise.reject(error) : this.handleWorkspaceConfigurationEditingError(error));
 	}
 
-	addFolders(foldersToAdd: IWorkspaceFolderCreationData[], donotNotifyError: boolean = false): Thenable<void> {
+	addFolders(foldersToAdd: IWorkspaceFolderCreationData[], donotNotifyError: boolean = false): Promise<void> {
 		return this.doAddFolders(foldersToAdd, void 0, donotNotifyError);
 	}
 
-	private doAddFolders(foldersToAdd: IWorkspaceFolderCreationData[], index?: number, donotNotifyError: boolean = false): Thenable<void> {
+	private doAddFolders(foldersToAdd: IWorkspaceFolderCreationData[], index?: number, donotNotifyError: boolean = false): Promise<void> {
 		const state = this.contextService.getWorkbenchState();
 
 		// If we are in no-workspace or single-folder workspace, adding folders has to
@@ -118,7 +118,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 			.then(() => null, error => donotNotifyError ? Promise.reject(error) : this.handleWorkspaceConfigurationEditingError(error));
 	}
 
-	removeFolders(foldersToRemove: URI[], donotNotifyError: boolean = false): Thenable<void> {
+	removeFolders(foldersToRemove: URI[], donotNotifyError: boolean = false): Promise<void> {
 
 		// If we are in single-folder state and the opened folder is to be removed,
 		// we create an empty workspace and enter it.
@@ -140,19 +140,19 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 		return false;
 	}
 
-	enterWorkspace(path: string): Thenable<void> {
+	enterWorkspace(path: string): Promise<void> {
 		return this.doEnterWorkspace(() => this.windowService.enterWorkspace(path));
 	}
 
-	createAndEnterWorkspace(folders?: IWorkspaceFolderCreationData[], path?: string): Thenable<void> {
+	createAndEnterWorkspace(folders?: IWorkspaceFolderCreationData[], path?: string): Promise<void> {
 		return this.doEnterWorkspace(() => this.windowService.createAndEnterWorkspace(folders, path));
 	}
 
-	saveAndEnterWorkspace(path: string): Thenable<void> {
+	saveAndEnterWorkspace(path: string): Promise<void> {
 		return this.doEnterWorkspace(() => this.windowService.saveAndEnterWorkspace(path));
 	}
 
-	private handleWorkspaceConfigurationEditingError(error: JSONEditingError): Thenable<void> {
+	private handleWorkspaceConfigurationEditingError(error: JSONEditingError): Promise<void> {
 		switch (error.code) {
 			case JSONEditingErrorCode.ERROR_INVALID_FILE:
 				this.onInvalidWorkspaceConfigurationFileError();
@@ -185,7 +185,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 		);
 	}
 
-	private doEnterWorkspace(mainSidePromise: () => Thenable<IEnterWorkspaceResult>): Thenable<void> {
+	private doEnterWorkspace(mainSidePromise: () => Promise<IEnterWorkspaceResult>): Promise<void> {
 
 		// Stop the extension host first to give extensions most time to shutdown
 		this.extensionService.stopExtensionHost();
@@ -223,7 +223,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 		});
 	}
 
-	private migrate(toWorkspace: IWorkspaceIdentifier): Thenable<void> {
+	private migrate(toWorkspace: IWorkspaceIdentifier): Promise<void> {
 
 		// Storage migration
 		return this.migrateStorage(toWorkspace).then(() => {
@@ -237,21 +237,21 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 		});
 	}
 
-	private migrateStorage(toWorkspace: IWorkspaceIdentifier): Thenable<void> {
+	private migrateStorage(toWorkspace: IWorkspaceIdentifier): Promise<void> {
 		const storageImpl = this.storageService as StorageService;
 
 		return storageImpl.migrate(toWorkspace);
 	}
 
-	private migrateWorkspaceSettings(toWorkspace: IWorkspaceIdentifier): Thenable<void> {
+	private migrateWorkspaceSettings(toWorkspace: IWorkspaceIdentifier): Promise<void> {
 		return this.doCopyWorkspaceSettings(toWorkspace, setting => setting.scope === ConfigurationScope.WINDOW);
 	}
 
-	copyWorkspaceSettings(toWorkspace: IWorkspaceIdentifier): Thenable<void> {
+	copyWorkspaceSettings(toWorkspace: IWorkspaceIdentifier): Promise<void> {
 		return this.doCopyWorkspaceSettings(toWorkspace);
 	}
 
-	private doCopyWorkspaceSettings(toWorkspace: IWorkspaceIdentifier, filter?: (config: IConfigurationPropertySchema) => boolean): Thenable<void> {
+	private doCopyWorkspaceSettings(toWorkspace: IWorkspaceIdentifier, filter?: (config: IConfigurationPropertySchema) => boolean): Promise<void> {
 		const configurationProperties = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).getConfigurationProperties();
 		const targetWorkspaceConfiguration = {};
 		for (const key of this.workspaceConfigurationService.keys().workspace) {
diff --git a/src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts b/src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts
index 7ee20f5b44d..98dc31ccfe4 100644
--- a/src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts
@@ -267,7 +267,7 @@ suite('Workbench base editor', () => {
 				super();
 			}
 			public getTypeId() { return 'testEditorInput'; }
-			public resolve(): Thenable<IEditorModel> { return Promise.resolve(null); }
+			public resolve(): Promise<IEditorModel> { return Promise.resolve(null); }
 
 			public matches(other: TestEditorInput): boolean {
 				return other && this.id === other.id && other instanceof TestEditorInput;
diff --git a/src/vs/workbench/test/browser/quickopen.test.ts b/src/vs/workbench/test/browser/quickopen.test.ts
index ec12845a4ac..9e9cf9515a9 100644
--- a/src/vs/workbench/test/browser/quickopen.test.ts
+++ b/src/vs/workbench/test/browser/quickopen.test.ts
@@ -28,7 +28,7 @@ export class TestQuickOpenService implements IQuickOpenService {
 	close(): void {
 	}
 
-	show(prefix?: string, options?: any): Thenable<void> {
+	show(prefix?: string, options?: any): Promise<void> {
 		if (this.callback) {
 			this.callback(prefix);
 		}
diff --git a/src/vs/workbench/test/common/editor/editor.test.ts b/src/vs/workbench/test/common/editor/editor.test.ts
index d4a63b75575..1e88e3763c0 100644
--- a/src/vs/workbench/test/common/editor/editor.test.ts
+++ b/src/vs/workbench/test/common/editor/editor.test.ts
@@ -32,7 +32,7 @@ class FileEditorInput extends EditorInput {
 		return this.resource;
 	}
 
-	resolve(): Thenable<IEditorModel> {
+	resolve(): Promise<IEditorModel> {
 		return Promise.resolve(null);
 	}
 }
diff --git a/src/vs/workbench/test/common/editor/editorDiffModel.test.ts b/src/vs/workbench/test/common/editor/editorDiffModel.test.ts
index f593133f898..599f44c7bbc 100644
--- a/src/vs/workbench/test/common/editor/editorDiffModel.test.ts
+++ b/src/vs/workbench/test/common/editor/editorDiffModel.test.ts
@@ -37,7 +37,7 @@ suite('Workbench editor model', () => {
 
 	test('TextDiffEditorModel', () => {
 		const dispose = accessor.textModelResolverService.registerTextModelContentProvider('test', {
-			provideTextContent: function (resource: URI): Thenable<ITextModel> {
+			provideTextContent: function (resource: URI): Promise<ITextModel> {
 				if (resource.scheme === 'test') {
 					let modelContent = 'Hello Test';
 					let languageSelection = accessor.modeService.create('json');
diff --git a/src/vs/workbench/test/common/editor/editorGroups.test.ts b/src/vs/workbench/test/common/editor/editorGroups.test.ts
index 14164935ab0..bb4dccb4605 100644
--- a/src/vs/workbench/test/common/editor/editorGroups.test.ts
+++ b/src/vs/workbench/test/common/editor/editorGroups.test.ts
@@ -77,7 +77,7 @@ class TestEditorInput extends EditorInput {
 		super();
 	}
 	getTypeId() { return 'testEditorInputForGroups'; }
-	resolve(): Thenable<IEditorModel> { return Promise.resolve(null); }
+	resolve(): Promise<IEditorModel> { return Promise.resolve(null); }
 
 	matches(other: TestEditorInput): boolean {
 		return other && this.id === other.id && other instanceof TestEditorInput;
@@ -97,7 +97,7 @@ class NonSerializableTestEditorInput extends EditorInput {
 		super();
 	}
 	getTypeId() { return 'testEditorInputForGroups-nonSerializable'; }
-	resolve(): Thenable<IEditorModel> { return Promise.resolve(null); }
+	resolve(): Promise<IEditorModel> { return Promise.resolve(null); }
 
 	matches(other: NonSerializableTestEditorInput): boolean {
 		return other && this.id === other.id && other instanceof NonSerializableTestEditorInput;
@@ -110,7 +110,7 @@ class TestFileEditorInput extends EditorInput implements IFileEditorInput {
 		super();
 	}
 	getTypeId() { return 'testFileEditorInputForGroups'; }
-	resolve(): Thenable<IEditorModel> { return Promise.resolve(null); }
+	resolve(): Promise<IEditorModel> { return Promise.resolve(null); }
 
 	matches(other: TestFileEditorInput): boolean {
 		return other && this.id === other.id && other instanceof TestFileEditorInput;
diff --git a/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts b/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
index 182b591e34c..b82ff807e28 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
@@ -50,7 +50,7 @@ let commands: ExtHostCommands;
 let disposables: vscode.Disposable[] = [];
 let originalErrorHandler: (e: any) => any;
 
-function assertRejects(fn: () => Thenable<any>, message: string = 'Expected rejection') {
+function assertRejects(fn: () => Promise<any>, message: string = 'Expected rejection') {
 	return fn().then(() => assert.ok(false, message), _err => assert.ok(true));
 }
 
diff --git a/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts b/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
index 18c5c7078ae..29255835306 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
@@ -179,7 +179,7 @@ suite('ExtHostSearch', () => {
 
 		test('no results', async () => {
 			await registerTestFileSearchProvider({
-				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Promise<URI[]> {
 					return Promise.resolve(null);
 				}
 			});
@@ -197,7 +197,7 @@ suite('ExtHostSearch', () => {
 			];
 
 			await registerTestFileSearchProvider({
-				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Promise<URI[]> {
 					return Promise.resolve(reportedResults);
 				}
 			});
@@ -211,7 +211,7 @@ suite('ExtHostSearch', () => {
 		test('Search canceled', async () => {
 			let cancelRequested = false;
 			await registerTestFileSearchProvider({
-				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Promise<URI[]> {
 					return new Promise((resolve, reject) => {
 						token.onCancellationRequested(() => {
 							cancelRequested = true;
@@ -229,7 +229,7 @@ suite('ExtHostSearch', () => {
 
 		test('provider returns null', async () => {
 			await registerTestFileSearchProvider({
-				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Promise<URI[]> {
 					return null;
 				}
 			});
@@ -244,7 +244,7 @@ suite('ExtHostSearch', () => {
 
 		test('all provider calls get global include/excludes', async () => {
 			await registerTestFileSearchProvider({
-				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Promise<URI[]> {
 					assert(options.excludes.length === 2 && options.includes.length === 2, 'Missing global include/excludes');
 					return Promise.resolve(null);
 				}
@@ -273,7 +273,7 @@ suite('ExtHostSearch', () => {
 
 		test('global/local include/excludes combined', async () => {
 			await registerTestFileSearchProvider({
-				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Promise<URI[]> {
 					if (options.folder.toString() === rootFolderA.toString()) {
 						assert.deepEqual(options.includes.sort(), ['*.ts', 'foo']);
 						assert.deepEqual(options.excludes.sort(), ['*.js', 'bar']);
@@ -315,7 +315,7 @@ suite('ExtHostSearch', () => {
 
 		test('include/excludes resolved correctly', async () => {
 			await registerTestFileSearchProvider({
-				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Promise<URI[]> {
 					assert.deepEqual(options.includes.sort(), ['*.jsx', '*.ts']);
 					assert.deepEqual(options.excludes.sort(), []);
 
@@ -358,7 +358,7 @@ suite('ExtHostSearch', () => {
 			];
 
 			await registerTestFileSearchProvider({
-				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Promise<URI[]> {
 					return Promise.resolve(reportedResults
 						.map(relativePath => joinPath(options.folder, relativePath)));
 				}
@@ -389,7 +389,7 @@ suite('ExtHostSearch', () => {
 		test('multiroot sibling exclude clause', async () => {
 
 			await registerTestFileSearchProvider({
-				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Promise<URI[]> {
 					let reportedResults: URI[];
 					if (options.folder.fsPath === rootFolderA.fsPath) {
 						reportedResults = [
@@ -459,7 +459,7 @@ suite('ExtHostSearch', () => {
 
 			let wasCanceled = false;
 			await registerTestFileSearchProvider({
-				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Promise<URI[]> {
 					token.onCancellationRequested(() => wasCanceled = true);
 
 					return Promise.resolve(reportedResults);
@@ -495,7 +495,7 @@ suite('ExtHostSearch', () => {
 
 			let wasCanceled = false;
 			await registerTestFileSearchProvider({
-				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Promise<URI[]> {
 					token.onCancellationRequested(() => wasCanceled = true);
 
 					return Promise.resolve(reportedResults);
@@ -530,7 +530,7 @@ suite('ExtHostSearch', () => {
 
 			let wasCanceled = false;
 			await registerTestFileSearchProvider({
-				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Promise<URI[]> {
 					token.onCancellationRequested(() => wasCanceled = true);
 
 					return Promise.resolve(reportedResults);
@@ -603,7 +603,7 @@ suite('ExtHostSearch', () => {
 			];
 
 			await registerTestFileSearchProvider({
-				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Thenable<URI[]> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, token: vscode.CancellationToken): Promise<URI[]> {
 					return Promise.resolve(reportedResults);
 				}
 			}, fancyScheme);
@@ -714,7 +714,7 @@ suite('ExtHostSearch', () => {
 
 		test('no results', async () => {
 			await registerTestTextSearchProvider({
-				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<vscode.TextSearchComplete> {
+				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Promise<vscode.TextSearchComplete> {
 					return Promise.resolve(null);
 				}
 			});
@@ -731,7 +731,7 @@ suite('ExtHostSearch', () => {
 			];
 
 			await registerTestTextSearchProvider({
-				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<vscode.TextSearchComplete> {
+				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Promise<vscode.TextSearchComplete> {
 					providedResults.forEach(r => progress.report(r));
 					return Promise.resolve(null);
 				}
@@ -744,7 +744,7 @@ suite('ExtHostSearch', () => {
 
 		test('all provider calls get global include/excludes', async () => {
 			await registerTestTextSearchProvider({
-				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<vscode.TextSearchComplete> {
+				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Promise<vscode.TextSearchComplete> {
 					assert.equal(options.includes.length, 1);
 					assert.equal(options.excludes.length, 1);
 					return Promise.resolve(null);
@@ -774,7 +774,7 @@ suite('ExtHostSearch', () => {
 
 		test('global/local include/excludes combined', async () => {
 			await registerTestTextSearchProvider({
-				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<vscode.TextSearchComplete> {
+				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Promise<vscode.TextSearchComplete> {
 					if (options.folder.toString() === rootFolderA.toString()) {
 						assert.deepEqual(options.includes.sort(), ['*.ts', 'foo']);
 						assert.deepEqual(options.excludes.sort(), ['*.js', 'bar']);
@@ -816,7 +816,7 @@ suite('ExtHostSearch', () => {
 
 		test('include/excludes resolved correctly', async () => {
 			await registerTestTextSearchProvider({
-				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<vscode.TextSearchComplete> {
+				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Promise<vscode.TextSearchComplete> {
 					assert.deepEqual(options.includes.sort(), ['*.jsx', '*.ts']);
 					assert.deepEqual(options.excludes.sort(), []);
 
@@ -854,7 +854,7 @@ suite('ExtHostSearch', () => {
 
 		test('provider fail', async () => {
 			await registerTestTextSearchProvider({
-				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<vscode.TextSearchComplete> {
+				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Promise<vscode.TextSearchComplete> {
 					throw new Error('Provider fail');
 				}
 			});
@@ -885,7 +885,7 @@ suite('ExtHostSearch', () => {
 			];
 
 			await registerTestTextSearchProvider({
-				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<vscode.TextSearchComplete> {
+				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Promise<vscode.TextSearchComplete> {
 					providedResults.forEach(r => progress.report(r));
 					return Promise.resolve(null);
 				}
@@ -930,7 +930,7 @@ suite('ExtHostSearch', () => {
 			};
 
 			await registerTestTextSearchProvider({
-				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<vscode.TextSearchComplete> {
+				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Promise<vscode.TextSearchComplete> {
 					let reportedResults;
 					if (options.folder.fsPath === rootFolderA.fsPath) {
 						reportedResults = [
@@ -995,7 +995,7 @@ suite('ExtHostSearch', () => {
 			];
 
 			await registerTestTextSearchProvider({
-				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<vscode.TextSearchComplete> {
+				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Promise<vscode.TextSearchComplete> {
 					providedResults.forEach(r => progress.report(r));
 					return Promise.resolve(null);
 				}
@@ -1026,7 +1026,7 @@ suite('ExtHostSearch', () => {
 
 			let wasCanceled = false;
 			await registerTestTextSearchProvider({
-				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<vscode.TextSearchComplete> {
+				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Promise<vscode.TextSearchComplete> {
 					token.onCancellationRequested(() => wasCanceled = true);
 					providedResults.forEach(r => progress.report(r));
 					return Promise.resolve(null);
@@ -1059,7 +1059,7 @@ suite('ExtHostSearch', () => {
 
 			let wasCanceled = false;
 			await registerTestTextSearchProvider({
-				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<vscode.TextSearchComplete> {
+				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Promise<vscode.TextSearchComplete> {
 					token.onCancellationRequested(() => wasCanceled = true);
 					providedResults.forEach(r => progress.report(r));
 					return Promise.resolve(null);
@@ -1091,7 +1091,7 @@ suite('ExtHostSearch', () => {
 
 			let wasCanceled = false;
 			await registerTestTextSearchProvider({
-				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<vscode.TextSearchComplete> {
+				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Promise<vscode.TextSearchComplete> {
 					token.onCancellationRequested(() => wasCanceled = true);
 					providedResults.forEach(r => progress.report(r));
 					return Promise.resolve(null);
@@ -1123,7 +1123,7 @@ suite('ExtHostSearch', () => {
 			];
 
 			await registerTestTextSearchProvider({
-				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<vscode.TextSearchComplete> {
+				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Promise<vscode.TextSearchComplete> {
 					providedResults.forEach(r => progress.report(r));
 					return Promise.resolve({ limitHit: true });
 				}
@@ -1185,7 +1185,7 @@ suite('ExtHostSearch', () => {
 			];
 
 			await registerTestTextSearchProvider({
-				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<vscode.TextSearchComplete> {
+				provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Promise<vscode.TextSearchComplete> {
 					providedResults.forEach(r => progress.report(r));
 					return Promise.resolve(null);
 				}
diff --git a/src/vs/workbench/test/electron-browser/api/testRPCProtocol.ts b/src/vs/workbench/test/electron-browser/api/testRPCProtocol.ts
index d2a5259f9f1..4bd240bee45 100644
--- a/src/vs/workbench/test/electron-browser/api/testRPCProtocol.ts
+++ b/src/vs/workbench/test/electron-browser/api/testRPCProtocol.ts
@@ -102,7 +102,7 @@ export class TestRPCProtocol implements IExtHostContext {
 			const instance = this._locals[proxyId];
 			// pretend the args went over the wire... (invoke .toJSON on objects...)
 			const wireArgs = simulateWireTransfer(args);
-			let p: Thenable<any>;
+			let p: Promise<any>;
 			try {
 				let result = (<Function>instance[path]).apply(instance, wireArgs);
 				p = isThenable(result) ? result : Promise.resolve(result);
diff --git a/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts b/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts
index f8ebc1b5809..6ca70c16b49 100644
--- a/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts
+++ b/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts
@@ -135,7 +135,7 @@ suite.skip('QuickOpen performance (integration)', () => {
 				if (testWorkspaceArg || verboseResults) { // Don't measure by default
 					const cachedEvents: Timer.ITimerEvent[] = [];
 					let i = n;
-					return (function iterate(): Thenable<Timer.ITimerEvent> {
+					return (function iterate(): Promise<Timer.ITimerEvent> {
 						if (!i--) {
 							return undefined;
 						}
diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts
index aa1f83507cf..49c0433cdb3 100644
--- a/src/vs/workbench/test/workbenchTestServices.ts
+++ b/src/vs/workbench/test/workbenchTestServices.ts
@@ -204,7 +204,7 @@ export class TestTextFileService extends TextFileService {
 		this.resolveTextContentError = error;
 	}
 
-	public resolveTextContent(resource: URI, options?: IResolveContentOptions): Thenable<IRawTextContent> {
+	public resolveTextContent(resource: URI, options?: IResolveContentOptions): Promise<IRawTextContent> {
 		if (this.resolveTextContentError) {
 			const error = this.resolveTextContentError;
 			this.resolveTextContentError = null;
@@ -224,11 +224,11 @@ export class TestTextFileService extends TextFileService {
 		});
 	}
 
-	public promptForPath(_resource: URI, _defaultPath: URI): Thenable<URI> {
+	public promptForPath(_resource: URI, _defaultPath: URI): Promise<URI> {
 		return Promise.resolve(this.promptPath);
 	}
 
-	public confirmSave(_resources?: URI[]): Thenable<ConfirmResult> {
+	public confirmSave(_resources?: URI[]): Promise<ConfirmResult> {
 		return Promise.resolve(this.confirmResult);
 	}
 
@@ -236,7 +236,7 @@ export class TestTextFileService extends TextFileService {
 		super.onFilesConfigurationChange(configuration);
 	}
 
-	protected cleanupBackupsBeforeShutdown(): Thenable<void> {
+	protected cleanupBackupsBeforeShutdown(): Promise<void> {
 		this.cleanupBackupsBeforeShutdownCalled = true;
 		return Promise.resolve();
 	}
@@ -310,7 +310,7 @@ export class TestExtensionService implements IExtensionService {
 	onDidChangeExtensionsStatus: Event<string[]> = Event.None;
 	onWillActivateByEvent: Event<IWillActivateEvent> = Event.None;
 	onDidChangeResponsiveChange: Event<IResponsiveStateChangeEvent> = Event.None;
-	activateByEvent(_activationEvent: string): Thenable<void> { return Promise.resolve(void 0); }
+	activateByEvent(_activationEvent: string): Promise<void> { return Promise.resolve(void 0); }
 	whenInstalledExtensionsRegistered(): Promise<boolean> { return Promise.resolve(true); }
 	getExtensions(): Promise<IExtensionDescription[]> { return Promise.resolve([]); }
 	getExtension() { return Promise.resolve(undefined); }
@@ -385,11 +385,11 @@ export class TestDialogService implements IDialogService {
 
 	public _serviceBrand: any;
 
-	public confirm(_confirmation: IConfirmation): Thenable<IConfirmationResult> {
+	public confirm(_confirmation: IConfirmation): Promise<IConfirmationResult> {
 		return Promise.resolve({ confirmed: false });
 	}
 
-	public show(_severity: Severity, _message: string, _buttons: string[], _options?: IDialogOptions): Thenable<number> {
+	public show(_severity: Severity, _message: string, _buttons: string[], _options?: IDialogOptions): Promise<number> {
 		return Promise.resolve(0);
 	}
 }
@@ -407,22 +407,22 @@ export class TestFileDialogService implements IFileDialogService {
 	public defaultWorkspacePath(_schemeFilter: string): URI {
 		return void 0;
 	}
-	public pickFileFolderAndOpen(_options: IPickAndOpenOptions): Thenable<any> {
+	public pickFileFolderAndOpen(_options: IPickAndOpenOptions): Promise<any> {
 		return Promise.resolve(0);
 	}
-	public pickFileAndOpen(_options: IPickAndOpenOptions): Thenable<any> {
+	public pickFileAndOpen(_options: IPickAndOpenOptions): Promise<any> {
 		return Promise.resolve(0);
 	}
-	public pickFolderAndOpen(_options: IPickAndOpenOptions): Thenable<any> {
+	public pickFolderAndOpen(_options: IPickAndOpenOptions): Promise<any> {
 		return Promise.resolve(0);
 	}
-	public pickWorkspaceAndOpen(_options: IPickAndOpenOptions): Thenable<any> {
+	public pickWorkspaceAndOpen(_options: IPickAndOpenOptions): Promise<any> {
 		return Promise.resolve(0);
 	}
-	public showSaveDialog(_options: ISaveDialogOptions): Thenable<URI> {
+	public showSaveDialog(_options: ISaveDialogOptions): Promise<URI> {
 		return Promise.resolve();
 	}
-	public showOpenDialog(_options: IOpenDialogOptions): Thenable<URI[]> {
+	public showOpenDialog(_options: IOpenDialogOptions): Promise<URI[]> {
 		return Promise.resolve();
 	}
 }
@@ -485,13 +485,13 @@ export class TestPartService implements IPartService {
 		return false;
 	}
 
-	public setSideBarHidden(_hidden: boolean): Thenable<void> { return Promise.resolve(null); }
+	public setSideBarHidden(_hidden: boolean): Promise<void> { return Promise.resolve(null); }
 
 	public isPanelHidden(): boolean {
 		return false;
 	}
 
-	public setPanelHidden(_hidden: boolean): Thenable<void> { return Promise.resolve(null); }
+	public setPanelHidden(_hidden: boolean): Promise<void> { return Promise.resolve(null); }
 
 	public toggleMaximizedPanel(): void { }
 
@@ -511,7 +511,7 @@ export class TestPartService implements IPartService {
 		return 0;
 	}
 
-	public setPanelPosition(_position: PartPosition): Thenable<void> {
+	public setPanelPosition(_position: PartPosition): Promise<void> {
 		return Promise.resolve(null);
 	}
 
@@ -541,7 +541,7 @@ export class TestEditorGroupsService implements EditorGroupsServiceImpl {
 	onDidMoveGroup: Event<IEditorGroup> = Event.None;
 
 	orientation: any;
-	whenRestored: Thenable<void> = Promise.resolve(void 0);
+	whenRestored: Promise<void> = Promise.resolve(void 0);
 
 	get activeGroup(): IEditorGroup {
 		return this.groups[0];
@@ -620,7 +620,7 @@ export class TestEditorGroup implements IEditorGroupView {
 	disposed: boolean;
 	editors: ReadonlyArray<IEditorInput> = [];
 	label: string;
-	whenRestored: Thenable<void> = Promise.resolve(void 0);
+	whenRestored: Promise<void> = Promise.resolve(void 0);
 	element: HTMLElement;
 	minimumWidth: number;
 	maximumWidth: number;
@@ -648,11 +648,11 @@ export class TestEditorGroup implements IEditorGroupView {
 		return -1;
 	}
 
-	openEditor(_editor: IEditorInput, _options?: IEditorOptions): Thenable<IEditor> {
+	openEditor(_editor: IEditorInput, _options?: IEditorOptions): Promise<IEditor> {
 		return Promise.resolve(null);
 	}
 
-	openEditors(_editors: IEditorInputWithOptions[]): Thenable<IEditor> {
+	openEditors(_editors: IEditorInputWithOptions[]): Promise<IEditor> {
 		return Promise.resolve(null);
 	}
 
@@ -672,19 +672,19 @@ export class TestEditorGroup implements IEditorGroupView {
 
 	copyEditor(_editor: IEditorInput, _target: IEditorGroup, _options?: ICopyEditorOptions): void { }
 
-	closeEditor(_editor?: IEditorInput): Thenable<void> {
+	closeEditor(_editor?: IEditorInput): Promise<void> {
 		return Promise.resolve();
 	}
 
-	closeEditors(_editors: IEditorInput[] | { except?: IEditorInput; direction?: CloseDirection; savedOnly?: boolean; }): Thenable<void> {
+	closeEditors(_editors: IEditorInput[] | { except?: IEditorInput; direction?: CloseDirection; savedOnly?: boolean; }): Promise<void> {
 		return Promise.resolve();
 	}
 
-	closeAllEditors(): Thenable<void> {
+	closeAllEditors(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	replaceEditors(_editors: IEditorReplacement[]): Thenable<void> {
+	replaceEditors(_editors: IEditorReplacement[]): Promise<void> {
 		return Promise.resolve();
 	}
 
@@ -795,7 +795,7 @@ export class TestFileService implements IFileService {
 		this._onAfterOperation.fire(event);
 	}
 
-	resolveFile(resource: URI, _options?: IResolveFileOptions): Thenable<IFileStat> {
+	resolveFile(resource: URI, _options?: IResolveFileOptions): Promise<IFileStat> {
 		return Promise.resolve({
 			resource,
 			etag: Date.now().toString(),
@@ -806,15 +806,15 @@ export class TestFileService implements IFileService {
 		});
 	}
 
-	resolveFiles(toResolve: { resource: URI, options?: IResolveFileOptions }[]): Thenable<IResolveFileResult[]> {
+	resolveFiles(toResolve: { resource: URI, options?: IResolveFileOptions }[]): Promise<IResolveFileResult[]> {
 		return Promise.all(toResolve.map(resourceAndOption => this.resolveFile(resourceAndOption.resource, resourceAndOption.options))).then(stats => stats.map(stat => ({ stat, success: true })));
 	}
 
-	existsFile(_resource: URI): Thenable<boolean> {
+	existsFile(_resource: URI): Promise<boolean> {
 		return Promise.resolve(null);
 	}
 
-	resolveContent(resource: URI, _options?: IResolveContentOptions): Thenable<IContent> {
+	resolveContent(resource: URI, _options?: IResolveContentOptions): Promise<IContent> {
 		return Promise.resolve({
 			resource: resource,
 			value: this.content,
@@ -825,7 +825,7 @@ export class TestFileService implements IFileService {
 		});
 	}
 
-	resolveStreamContent(resource: URI, _options?: IResolveContentOptions): Thenable<IStreamContent> {
+	resolveStreamContent(resource: URI, _options?: IResolveContentOptions): Promise<IStreamContent> {
 		return Promise.resolve({
 			resource: resource,
 			value: {
@@ -845,7 +845,7 @@ export class TestFileService implements IFileService {
 		});
 	}
 
-	updateContent(resource: URI, _value: string | ITextSnapshot, _options?: IUpdateContentOptions): Thenable<IFileStat> {
+	updateContent(resource: URI, _value: string | ITextSnapshot, _options?: IUpdateContentOptions): Promise<IFileStat> {
 		return timeout(0).then(() => ({
 			resource,
 			etag: 'index.txt',
@@ -856,15 +856,15 @@ export class TestFileService implements IFileService {
 		}));
 	}
 
-	moveFile(_source: URI, _target: URI, _overwrite?: boolean): Thenable<IFileStat> {
+	moveFile(_source: URI, _target: URI, _overwrite?: boolean): Promise<IFileStat> {
 		return Promise.resolve(null);
 	}
 
-	copyFile(_source: URI, _target: URI, _overwrite?: boolean): Thenable<IFileStat> {
+	copyFile(_source: URI, _target: URI, _overwrite?: boolean): Promise<IFileStat> {
 		return Promise.resolve(null);
 	}
 
-	createFile(_resource: URI, _content?: string, _options?: ICreateFileOptions): Thenable<IFileStat> {
+	createFile(_resource: URI, _content?: string, _options?: ICreateFileOptions): Promise<IFileStat> {
 		return Promise.resolve(null);
 	}
 
@@ -872,7 +872,7 @@ export class TestFileService implements IFileService {
 		return Promise.resolve([]);
 	}
 
-	createFolder(_resource: URI): Thenable<IFileStat> {
+	createFolder(_resource: URI): Promise<IFileStat> {
 		return Promise.resolve(null);
 	}
 
@@ -890,7 +890,7 @@ export class TestFileService implements IFileService {
 		return resource.scheme === 'file';
 	}
 
-	del(_resource: URI, _options?: { useTrash?: boolean, recursive?: boolean }): Thenable<void> {
+	del(_resource: URI, _options?: { useTrash?: boolean, recursive?: boolean }): Promise<void> {
 		return Promise.resolve(null);
 	}
 
@@ -911,15 +911,15 @@ export class TestFileService implements IFileService {
 export class TestBackupFileService implements IBackupFileService {
 	public _serviceBrand: any;
 
-	public hasBackups(): Thenable<boolean> {
+	public hasBackups(): Promise<boolean> {
 		return Promise.resolve(false);
 	}
 
-	public hasBackup(_resource: URI): Thenable<boolean> {
+	public hasBackup(_resource: URI): Promise<boolean> {
 		return Promise.resolve(false);
 	}
 
-	public loadBackupResource(resource: URI): Thenable<URI> {
+	public loadBackupResource(resource: URI): Promise<URI> {
 		return this.hasBackup(resource).then(hasBackup => {
 			if (hasBackup) {
 				return this.toBackupResource(resource);
@@ -929,11 +929,11 @@ export class TestBackupFileService implements IBackupFileService {
 		});
 	}
 
-	public registerResourceForBackup(_resource: URI): Thenable<void> {
+	public registerResourceForBackup(_resource: URI): Promise<void> {
 		return Promise.resolve();
 	}
 
-	public deregisterResourceForBackup(_resource: URI): Thenable<void> {
+	public deregisterResourceForBackup(_resource: URI): Promise<void> {
 		return Promise.resolve();
 	}
 
@@ -941,11 +941,11 @@ export class TestBackupFileService implements IBackupFileService {
 		return null;
 	}
 
-	public backupResource(_resource: URI, _content: ITextSnapshot): Thenable<void> {
+	public backupResource(_resource: URI, _content: ITextSnapshot): Promise<void> {
 		return Promise.resolve();
 	}
 
-	public getWorkspaceFileBackups(): Thenable<URI[]> {
+	public getWorkspaceFileBackups(): Promise<URI[]> {
 		return Promise.resolve([]);
 	}
 
@@ -956,15 +956,15 @@ export class TestBackupFileService implements IBackupFileService {
 		return textBuffer.getValueInRange(range, EndOfLinePreference.TextDefined);
 	}
 
-	public resolveBackupContent(_backup: URI): Thenable<ITextBufferFactory> {
+	public resolveBackupContent(_backup: URI): Promise<ITextBufferFactory> {
 		return Promise.resolve(null);
 	}
 
-	public discardResourceBackup(_resource: URI): Thenable<void> {
+	public discardResourceBackup(_resource: URI): Promise<void> {
 		return Promise.resolve();
 	}
 
-	public discardAllWorkspaceBackups(): Thenable<void> {
+	public discardAllWorkspaceBackups(): Promise<void> {
 		return Promise.resolve();
 	}
 }
@@ -991,7 +991,7 @@ export class TestCodeEditorService implements ICodeEditorService {
 	setTransientModelProperty(_model: ITextModel, _key: string, _value: any): void { }
 	getTransientModelProperty(_model: ITextModel, _key: string) { }
 	getActiveCodeEditor(): ICodeEditor { return null; }
-	openCodeEditor(_input: IResourceInput, _source: ICodeEditor, _sideBySide?: boolean): Thenable<ICodeEditor> { return Promise.resolve(); }
+	openCodeEditor(_input: IResourceInput, _source: ICodeEditor, _sideBySide?: boolean): Promise<ICodeEditor> { return Promise.resolve(); }
 }
 
 export class TestWindowService implements IWindowService {
@@ -1003,11 +1003,11 @@ export class TestWindowService implements IWindowService {
 
 	hasFocus = true;
 
-	isFocused(): Thenable<boolean> {
+	isFocused(): Promise<boolean> {
 		return Promise.resolve(false);
 	}
 
-	isMaximized(): Thenable<boolean> {
+	isMaximized(): Promise<boolean> {
 		return Promise.resolve(false);
 	}
 
@@ -1019,111 +1019,111 @@ export class TestWindowService implements IWindowService {
 		return 0;
 	}
 
-	pickFileFolderAndOpen(_options: INativeOpenDialogOptions): Thenable<void> {
+	pickFileFolderAndOpen(_options: INativeOpenDialogOptions): Promise<void> {
 		return Promise.resolve();
 	}
 
-	pickFileAndOpen(_options: INativeOpenDialogOptions): Thenable<void> {
+	pickFileAndOpen(_options: INativeOpenDialogOptions): Promise<void> {
 		return Promise.resolve();
 	}
 
-	pickFolderAndOpen(_options: INativeOpenDialogOptions): Thenable<void> {
+	pickFolderAndOpen(_options: INativeOpenDialogOptions): Promise<void> {
 		return Promise.resolve();
 	}
 
-	pickWorkspaceAndOpen(_options: INativeOpenDialogOptions): Thenable<void> {
+	pickWorkspaceAndOpen(_options: INativeOpenDialogOptions): Promise<void> {
 		return Promise.resolve();
 	}
 
-	reloadWindow(): Thenable<void> {
+	reloadWindow(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	openDevTools(): Thenable<void> {
+	openDevTools(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	toggleDevTools(): Thenable<void> {
+	toggleDevTools(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	closeWorkspace(): Thenable<void> {
+	closeWorkspace(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	enterWorkspace(_path: string): Thenable<IEnterWorkspaceResult> {
+	enterWorkspace(_path: string): Promise<IEnterWorkspaceResult> {
 		return Promise.resolve();
 	}
 
-	createAndEnterWorkspace(_folders?: IWorkspaceFolderCreationData[], _path?: string): Thenable<IEnterWorkspaceResult> {
+	createAndEnterWorkspace(_folders?: IWorkspaceFolderCreationData[], _path?: string): Promise<IEnterWorkspaceResult> {
 		return Promise.resolve();
 	}
 
-	saveAndEnterWorkspace(_path: string): Thenable<IEnterWorkspaceResult> {
+	saveAndEnterWorkspace(_path: string): Promise<IEnterWorkspaceResult> {
 		return Promise.resolve();
 	}
 
-	toggleFullScreen(): Thenable<void> {
+	toggleFullScreen(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	setRepresentedFilename(_fileName: string): Thenable<void> {
+	setRepresentedFilename(_fileName: string): Promise<void> {
 		return Promise.resolve();
 	}
 
-	getRecentlyOpened(): Thenable<IRecentlyOpened> {
+	getRecentlyOpened(): Promise<IRecentlyOpened> {
 		return Promise.resolve();
 	}
 
-	focusWindow(): Thenable<void> {
+	focusWindow(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	maximizeWindow(): Thenable<void> {
+	maximizeWindow(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	unmaximizeWindow(): Thenable<void> {
+	unmaximizeWindow(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	minimizeWindow(): Thenable<void> {
+	minimizeWindow(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	openWindow(_paths: URI[], _options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean }): Thenable<void> {
+	openWindow(_paths: URI[], _options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean }): Promise<void> {
 		return Promise.resolve();
 	}
 
-	closeWindow(): Thenable<void> {
+	closeWindow(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	setDocumentEdited(_flag: boolean): Thenable<void> {
+	setDocumentEdited(_flag: boolean): Promise<void> {
 		return Promise.resolve();
 	}
 
-	onWindowTitleDoubleClick(): Thenable<void> {
+	onWindowTitleDoubleClick(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	show(): Thenable<void> {
+	show(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	showMessageBox(_options: Electron.MessageBoxOptions): Thenable<IMessageBoxResult> {
+	showMessageBox(_options: Electron.MessageBoxOptions): Promise<IMessageBoxResult> {
 		return Promise.resolve({ button: 0 });
 	}
 
-	showSaveDialog(_options: Electron.SaveDialogOptions): Thenable<string> {
+	showSaveDialog(_options: Electron.SaveDialogOptions): Promise<string> {
 		return Promise.resolve(void 0);
 	}
 
-	showOpenDialog(_options: Electron.OpenDialogOptions): Thenable<string[]> {
+	showOpenDialog(_options: Electron.OpenDialogOptions): Promise<string[]> {
 		return Promise.resolve(void 0);
 	}
 
-	updateTouchBar(_items: ISerializableCommandAction[][]): Thenable<void> {
+	updateTouchBar(_items: ISerializableCommandAction[][]): Promise<void> {
 		return Promise.resolve();
 	}
 
@@ -1143,7 +1143,7 @@ export class TestLifecycleService implements ILifecycleService {
 	private _onWillShutdown = new Emitter<WillShutdownEvent>();
 	private _onShutdown = new Emitter<void>();
 
-	when(): Thenable<void> {
+	when(): Promise<void> {
 		return Promise.resolve();
 	}
 
@@ -1184,211 +1184,211 @@ export class TestWindowsService implements IWindowsService {
 	onWindowUnmaximize: Event<number>;
 	onRecentlyOpenedChange: Event<void>;
 
-	isFocused(_windowId: number): Thenable<boolean> {
+	isFocused(_windowId: number): Promise<boolean> {
 		return Promise.resolve(false);
 	}
 
-	pickFileFolderAndOpen(_options: INativeOpenDialogOptions): Thenable<void> {
+	pickFileFolderAndOpen(_options: INativeOpenDialogOptions): Promise<void> {
 		return Promise.resolve();
 	}
 
-	pickFileAndOpen(_options: INativeOpenDialogOptions): Thenable<void> {
+	pickFileAndOpen(_options: INativeOpenDialogOptions): Promise<void> {
 		return Promise.resolve();
 	}
 
-	pickFolderAndOpen(_options: INativeOpenDialogOptions): Thenable<void> {
+	pickFolderAndOpen(_options: INativeOpenDialogOptions): Promise<void> {
 		return Promise.resolve();
 	}
 
-	pickWorkspaceAndOpen(_options: INativeOpenDialogOptions): Thenable<void> {
+	pickWorkspaceAndOpen(_options: INativeOpenDialogOptions): Promise<void> {
 		return Promise.resolve();
 	}
 
-	reloadWindow(_windowId: number): Thenable<void> {
+	reloadWindow(_windowId: number): Promise<void> {
 		return Promise.resolve();
 	}
 
-	openDevTools(_windowId: number): Thenable<void> {
+	openDevTools(_windowId: number): Promise<void> {
 		return Promise.resolve();
 	}
 
-	toggleDevTools(_windowId: number): Thenable<void> {
+	toggleDevTools(_windowId: number): Promise<void> {
 		return Promise.resolve();
 	}
 
-	closeWorkspace(_windowId: number): Thenable<void> {
+	closeWorkspace(_windowId: number): Promise<void> {
 		return Promise.resolve();
 	}
 
-	enterWorkspace(_windowId: number, _path: string): Thenable<IEnterWorkspaceResult> {
+	enterWorkspace(_windowId: number, _path: string): Promise<IEnterWorkspaceResult> {
 		return Promise.resolve();
 	}
 
-	createAndEnterWorkspace(_windowId: number, _folders?: IWorkspaceFolderCreationData[], _path?: string): Thenable<IEnterWorkspaceResult> {
+	createAndEnterWorkspace(_windowId: number, _folders?: IWorkspaceFolderCreationData[], _path?: string): Promise<IEnterWorkspaceResult> {
 		return Promise.resolve();
 	}
 
-	saveAndEnterWorkspace(_windowId: number, _path: string): Thenable<IEnterWorkspaceResult> {
+	saveAndEnterWorkspace(_windowId: number, _path: string): Promise<IEnterWorkspaceResult> {
 		return Promise.resolve();
 	}
 
-	toggleFullScreen(_windowId: number): Thenable<void> {
+	toggleFullScreen(_windowId: number): Promise<void> {
 		return Promise.resolve();
 	}
 
-	setRepresentedFilename(_windowId: number, _fileName: string): Thenable<void> {
+	setRepresentedFilename(_windowId: number, _fileName: string): Promise<void> {
 		return Promise.resolve();
 	}
 
-	addRecentlyOpened(_files: URI[]): Thenable<void> {
+	addRecentlyOpened(_files: URI[]): Promise<void> {
 		return Promise.resolve();
 	}
 
-	removeFromRecentlyOpened(_paths: URI[]): Thenable<void> {
+	removeFromRecentlyOpened(_paths: URI[]): Promise<void> {
 		return Promise.resolve();
 	}
 
-	clearRecentlyOpened(): Thenable<void> {
+	clearRecentlyOpened(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	getRecentlyOpened(_windowId: number): Thenable<IRecentlyOpened> {
+	getRecentlyOpened(_windowId: number): Promise<IRecentlyOpened> {
 		return Promise.resolve();
 	}
 
-	focusWindow(_windowId: number): Thenable<void> {
+	focusWindow(_windowId: number): Promise<void> {
 		return Promise.resolve();
 	}
 
-	closeWindow(_windowId: number): Thenable<void> {
+	closeWindow(_windowId: number): Promise<void> {
 		return Promise.resolve();
 	}
 
-	isMaximized(_windowId: number): Thenable<boolean> {
+	isMaximized(_windowId: number): Promise<boolean> {
 		return Promise.resolve();
 	}
 
-	maximizeWindow(_windowId: number): Thenable<void> {
+	maximizeWindow(_windowId: number): Promise<void> {
 		return Promise.resolve();
 	}
 
-	minimizeWindow(_windowId: number): Thenable<void> {
+	minimizeWindow(_windowId: number): Promise<void> {
 		return Promise.resolve();
 	}
 
-	unmaximizeWindow(_windowId: number): Thenable<void> {
+	unmaximizeWindow(_windowId: number): Promise<void> {
 		return Promise.resolve();
 	}
 
-	onWindowTitleDoubleClick(_windowId: number): Thenable<void> {
+	onWindowTitleDoubleClick(_windowId: number): Promise<void> {
 		return Promise.resolve();
 	}
 
-	setDocumentEdited(_windowId: number, _flag: boolean): Thenable<void> {
+	setDocumentEdited(_windowId: number, _flag: boolean): Promise<void> {
 		return Promise.resolve();
 	}
 
-	quit(): Thenable<void> {
+	quit(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	relaunch(_options: { addArgs?: string[], removeArgs?: string[] }): Thenable<void> {
+	relaunch(_options: { addArgs?: string[], removeArgs?: string[] }): Promise<void> {
 		return Promise.resolve();
 	}
 
-	whenSharedProcessReady(): Thenable<void> {
+	whenSharedProcessReady(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	toggleSharedProcess(): Thenable<void> {
+	toggleSharedProcess(): Promise<void> {
 		return Promise.resolve();
 	}
 
 	// Global methods
-	openWindow(_windowId: number, _paths: URI[], _options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean }): Thenable<void> {
+	openWindow(_windowId: number, _paths: URI[], _options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean }): Promise<void> {
 		return Promise.resolve();
 	}
 
-	openNewWindow(): Thenable<void> {
+	openNewWindow(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	showWindow(_windowId: number): Thenable<void> {
+	showWindow(_windowId: number): Promise<void> {
 		return Promise.resolve();
 	}
 
-	getWindows(): Thenable<{ id: number; workspace?: IWorkspaceIdentifier; folderUri?: ISingleFolderWorkspaceIdentifier; title: string; filename?: string; }[]> {
+	getWindows(): Promise<{ id: number; workspace?: IWorkspaceIdentifier; folderUri?: ISingleFolderWorkspaceIdentifier; title: string; filename?: string; }[]> {
 		return Promise.resolve();
 	}
 
-	getWindowCount(): Thenable<number> {
+	getWindowCount(): Promise<number> {
 		return Promise.resolve(this.windowCount);
 	}
 
-	log(_severity: string, ..._messages: string[]): Thenable<void> {
+	log(_severity: string, ..._messages: string[]): Promise<void> {
 		return Promise.resolve();
 	}
 
-	showItemInFolder(_path: string): Thenable<void> {
+	showItemInFolder(_path: string): Promise<void> {
 		return Promise.resolve();
 	}
 
-	newWindowTab(): Thenable<void> {
+	newWindowTab(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	showPreviousWindowTab(): Thenable<void> {
+	showPreviousWindowTab(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	showNextWindowTab(): Thenable<void> {
+	showNextWindowTab(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	moveWindowTabToNewWindow(): Thenable<void> {
+	moveWindowTabToNewWindow(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	mergeAllWindowTabs(): Thenable<void> {
+	mergeAllWindowTabs(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	toggleWindowTabsBar(): Thenable<void> {
+	toggleWindowTabsBar(): Promise<void> {
 		return Promise.resolve();
 	}
 
-	updateTouchBar(_windowId: number, _items: ISerializableCommandAction[][]): Thenable<void> {
+	updateTouchBar(_windowId: number, _items: ISerializableCommandAction[][]): Promise<void> {
 		return Promise.resolve();
 	}
 
-	getActiveWindowId(): Thenable<number | undefined> {
+	getActiveWindowId(): Promise<number | undefined> {
 		return Promise.resolve(undefined);
 	}
 
 	// This needs to be handled from browser process to prevent
 	// foreground ordering issues on Windows
-	openExternal(_url: string): Thenable<boolean> {
+	openExternal(_url: string): Promise<boolean> {
 		return Promise.resolve(true);
 	}
 
 	// TODO: this is a bit backwards
-	startCrashReporter(_config: Electron.CrashReporterStartOptions): Thenable<void> {
+	startCrashReporter(_config: Electron.CrashReporterStartOptions): Promise<void> {
 		return Promise.resolve();
 	}
 
-	showMessageBox(_windowId: number, _options: Electron.MessageBoxOptions): Thenable<IMessageBoxResult> {
+	showMessageBox(_windowId: number, _options: Electron.MessageBoxOptions): Promise<IMessageBoxResult> {
 		return Promise.resolve();
 	}
 
-	showSaveDialog(_windowId: number, _options: Electron.SaveDialogOptions): Thenable<string> {
+	showSaveDialog(_windowId: number, _options: Electron.SaveDialogOptions): Promise<string> {
 		return Promise.resolve();
 	}
 
-	showOpenDialog(_windowId: number, _options: Electron.OpenDialogOptions): Thenable<string[]> {
+	showOpenDialog(_windowId: number, _options: Electron.OpenDialogOptions): Promise<string[]> {
 		return Promise.resolve();
 	}
 
-	openAboutDialog(): Thenable<void> {
+	openAboutDialog(): Promise<void> {
 		return Promise.resolve();
 	}