Merge from master

src/vs/workbench/browser/quickopen.ts

@@ -2,10 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import * as nls from 'vs/nls';
-import { TPromise } from 'vs/base/common/winjs.base';
 import * as objects from 'vs/base/common/objects';
 import * as arrays from 'vs/base/common/arrays';
 import * as strings from 'vs/base/common/strings';
@@ -19,8 +17,11 @@ import { IResourceInput, IEditorOptions } from 'vs/platform/editor/common/editor
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { IConstructorSignature0, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const CLOSE_ON_FOCUS_LOST_CONFIG = 'workbench.quickOpen.closeOnFocusLost';
+export const PRESERVE_INPUT_CONFIG = 'workbench.quickOpen.preserveInput';
+export const SEARCH_EDITOR_HISTORY = 'search.quickOpen.includeHistory';
 
 export interface IWorkbenchQuickOpenConfiguration {
 	workbench: {
@@ -42,8 +43,8 @@ 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): TPromise<IModel<any>> {
-		return TPromise.as(null);
+	getResults(searchValue: string, token: CancellationToken): Thenable<IModel<any>> {
+		return Promise.resolve(null);
 	}
 
 	/**
@@ -324,11 +325,11 @@ export class QuickOpenAction extends Action {
 		this.enabled = !!this.quickOpenService;
 	}
 
-	run(context?: any): TPromise<void> {
+	run(context?: any): Promise<void> {
 
 		// Show with prefix
 		this.quickOpenService.show(this.prefix);
 
-		return TPromise.as(null);
+		return Promise.resolve(null);
 	}
 }