From c9e6b4bbcec3f2805594de718edc0e10c6581dcc Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Tue, 3 Jul 2018 09:10:41 +0200
Subject: [PATCH] avoid async and winjs.promise, #53442

---
 src/vs/workbench/node/extensionHostMain.ts                | 4 ++--
 .../parts/comments/electron-browser/commentService.ts     | 2 +-
 .../parts/debug/electron-browser/terminalSupport.ts       | 2 +-
 .../preferences/electron-browser/preferencesSearch.ts     | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/node/extensionHostMain.ts b/src/vs/workbench/node/extensionHostMain.ts
index 4aa8811e6f3..6bf7a628602 100644
--- a/src/vs/workbench/node/extensionHostMain.ts
+++ b/src/vs/workbench/node/extensionHostMain.ts
@@ -234,7 +234,7 @@ export class ExtensionHostMain {
 		return TPromise.join([fileNamePromise, globPatternPromise]).then(() => { });
 	}
 
-	private async activateIfFileName(extensionId: string, fileName: string): TPromise<void> {
+	private async activateIfFileName(extensionId: string, fileName: string): Promise<void> {
 
 		// find exact path
 		for (const { uri } of this._workspace.folders) {
@@ -250,7 +250,7 @@ export class ExtensionHostMain {
 		return undefined;
 	}
 
-	private async activateIfGlobPatterns(extensionId: string, globPatterns: string[]): TPromise<void> {
+	private async activateIfGlobPatterns(extensionId: string, globPatterns: string[]): Promise<void> {
 		this._extHostLogService.trace(`extensionHostMain#activateIfGlobPatterns: fileSearch, extension: ${extensionId}, entryPoint: workspaceContains`);
 
 		if (globPatterns.length === 0) {
diff --git a/src/vs/workbench/parts/comments/electron-browser/commentService.ts b/src/vs/workbench/parts/comments/electron-browser/commentService.ts
index 80aa7b9359e..ff0fe6655d1 100644
--- a/src/vs/workbench/parts/comments/electron-browser/commentService.ts
+++ b/src/vs/workbench/parts/comments/electron-browser/commentService.ts
@@ -115,7 +115,7 @@ export class CommentService extends Disposable implements ICommentService {
 		return null;
 	}
 
-	async getComments(resource: URI): TPromise<CommentInfo[]> {
+	getComments(resource: URI): TPromise<CommentInfo[]> {
 		const result = [];
 		for (const handle of keys(this._commentProviders)) {
 			const provider = this._commentProviders.get(handle);
diff --git a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
index f05ab8af4a4..91fc2c53456 100644
--- a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
@@ -22,7 +22,7 @@ export class TerminalLauncher implements ITerminalLauncher {
 	) {
 	}
 
-	async runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
+	runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
 
 		if (args.kind === 'external') {
 			return this.nativeTerminalService.runInTerminal(args.title, args.cwd, args.args, args.env || {});
diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
index 3b40c62f656..f0037613a93 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
@@ -155,7 +155,7 @@ class RemoteSearchProvider implements ISearchProvider {
 		@ILogService private logService: ILogService
 	) {
 		this._remoteSearchP = this.options.filter ?
-			this.getSettingsForFilter(this.options.filter) :
+			TPromise.wrap(this.getSettingsForFilter(this.options.filter)) :
 			TPromise.wrap(null);
 	}
 
@@ -196,7 +196,7 @@ class RemoteSearchProvider implements ISearchProvider {
 		});
 	}
 
-	private async getSettingsForFilter(filter: string): TPromise<IFilterMetadata> {
+	private async getSettingsForFilter(filter: string): Promise<IFilterMetadata> {
 		const allRequestDetails: IBingRequestDetails[] = [];
 
 		// Only send MAX_REQUESTS requests in total just to keep it sane
@@ -308,7 +308,7 @@ class RemoteSearchProvider implements ISearchProvider {
 		};
 	}
 
-	private async prepareRequest(query: string, filterPage = 0): TPromise<IBingRequestDetails> {
+	private async prepareRequest(query: string, filterPage = 0): Promise<IBingRequestDetails> {
 		const verbatimQuery = query;
 		query = escapeSpecialChars(query);
 		const boost = 10;
@@ -526,4 +526,4 @@ class SettingMatches {
 			endColumn: setting.valueRange.startColumn + match.end + 1
 		};
 	}
-}
\ No newline at end of file
+}