avoid async and winjs.promise, microsoft#53442

jrieken · jrieken · commit c9e6b4bbcec3 · 2018-07-03T09:10:41.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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
 		};
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ export class ExtensionHostMain {`
`234`	`234`	`return TPromise.join([fileNamePromise, globPatternPromise]).then(() => { });`
`235`	`235`	`}`
`236`	`236`
`237`		`- private async activateIfFileName(extensionId: string, fileName: string): TPromise<void> {`
	`237`	`+ private async activateIfFileName(extensionId: string, fileName: string): Promise<void> {`
`238`	`238`
`239`	`239`	`// find exact path`
`240`	`240`	`for (const { uri } of this._workspace.folders) {`
`@@ -250,7 +250,7 @@ export class ExtensionHostMain {`
`250`	`250`	`return undefined;`
`251`	`251`	`}`
`252`	`252`
`253`		`- private async activateIfGlobPatterns(extensionId: string, globPatterns: string[]): TPromise<void> {`
	`253`	`+ private async activateIfGlobPatterns(extensionId: string, globPatterns: string[]): Promise<void> {`
`254`	`254`	this._extHostLogService.trace(`extensionHostMain#activateIfGlobPatterns: fileSearch, extension: ${extensionId}, entryPoint: workspaceContains`);
`255`	`255`
`256`	`256`	`if (globPatterns.length === 0) {`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ export class CommentService extends Disposable implements ICommentService {`
`115`	`115`	`return null;`
`116`	`116`	`}`
`117`	`117`
`118`		`- async getComments(resource: URI): TPromise<CommentInfo[]> {`
	`118`	`+ getComments(resource: URI): TPromise<CommentInfo[]> {`
`119`	`119`	`const result = [];`
`120`	`120`	`for (const handle of keys(this._commentProviders)) {`
`121`	`121`	`const provider = this._commentProviders.get(handle);`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ export class TerminalLauncher implements ITerminalLauncher {`
`22`	`22`	`) {`
`23`	`23`	`}`
`24`	`24`
`25`		`- async runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {`
	`25`	`+ runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {`
`26`	`26`
`27`	`27`	`if (args.kind === 'external') {`
`28`	`28`	`return this.nativeTerminalService.runInTerminal(args.title, args.cwd, args.args, args.env \|\| {});`