提交 c9e6b4bb 编写于 作者: J Johannes Rieken

avoid async and winjs.promise, #53442

上级 d8a39866
...@@ -234,7 +234,7 @@ export class ExtensionHostMain { ...@@ -234,7 +234,7 @@ export class ExtensionHostMain {
return TPromise.join([fileNamePromise, globPatternPromise]).then(() => { }); 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 // find exact path
for (const { uri } of this._workspace.folders) { for (const { uri } of this._workspace.folders) {
...@@ -250,7 +250,7 @@ export class ExtensionHostMain { ...@@ -250,7 +250,7 @@ export class ExtensionHostMain {
return undefined; 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`); this._extHostLogService.trace(`extensionHostMain#activateIfGlobPatterns: fileSearch, extension: ${extensionId}, entryPoint: workspaceContains`);
if (globPatterns.length === 0) { if (globPatterns.length === 0) {
......
...@@ -115,7 +115,7 @@ export class CommentService extends Disposable implements ICommentService { ...@@ -115,7 +115,7 @@ export class CommentService extends Disposable implements ICommentService {
return null; return null;
} }
async getComments(resource: URI): TPromise<CommentInfo[]> { getComments(resource: URI): TPromise<CommentInfo[]> {
const result = []; const result = [];
for (const handle of keys(this._commentProviders)) { for (const handle of keys(this._commentProviders)) {
const provider = this._commentProviders.get(handle); const provider = this._commentProviders.get(handle);
......
...@@ -22,7 +22,7 @@ export class TerminalLauncher implements ITerminalLauncher { ...@@ -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') { if (args.kind === 'external') {
return this.nativeTerminalService.runInTerminal(args.title, args.cwd, args.args, args.env || {}); return this.nativeTerminalService.runInTerminal(args.title, args.cwd, args.args, args.env || {});
......
...@@ -155,7 +155,7 @@ class RemoteSearchProvider implements ISearchProvider { ...@@ -155,7 +155,7 @@ class RemoteSearchProvider implements ISearchProvider {
@ILogService private logService: ILogService @ILogService private logService: ILogService
) { ) {
this._remoteSearchP = this.options.filter ? this._remoteSearchP = this.options.filter ?
this.getSettingsForFilter(this.options.filter) : TPromise.wrap(this.getSettingsForFilter(this.options.filter)) :
TPromise.wrap(null); TPromise.wrap(null);
} }
...@@ -196,7 +196,7 @@ class RemoteSearchProvider implements ISearchProvider { ...@@ -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[] = []; const allRequestDetails: IBingRequestDetails[] = [];
// Only send MAX_REQUESTS requests in total just to keep it sane // Only send MAX_REQUESTS requests in total just to keep it sane
...@@ -308,7 +308,7 @@ class RemoteSearchProvider implements ISearchProvider { ...@@ -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; const verbatimQuery = query;
query = escapeSpecialChars(query); query = escapeSpecialChars(query);
const boost = 10; const boost = 10;
...@@ -526,4 +526,4 @@ class SettingMatches { ...@@ -526,4 +526,4 @@ class SettingMatches {
endColumn: setting.valueRange.startColumn + match.end + 1 endColumn: setting.valueRange.startColumn + match.end + 1
}; };
} }
} }
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册