提交 291f9af1 编写于 作者: J Johannes Rieken

debt - less TPromise usage

上级 711217ac
...@@ -13,7 +13,6 @@ import { isLinux } from 'vs/base/common/platform'; ...@@ -13,7 +13,6 @@ import { isLinux } from 'vs/base/common/platform';
import { basenameOrAuthority, dirname, isEqual } from 'vs/base/common/resources'; import { basenameOrAuthority, dirname, isEqual } from 'vs/base/common/resources';
import { compare } from 'vs/base/common/strings'; import { compare } from 'vs/base/common/strings';
import { URI } from 'vs/base/common/uri'; import { URI } from 'vs/base/common/uri';
import { TPromise } from 'vs/base/common/winjs.base';
import { localize } from 'vs/nls'; import { localize } from 'vs/nls';
import { ILogService } from 'vs/platform/log/common/log'; import { ILogService } from 'vs/platform/log/common/log';
import { Severity } from 'vs/platform/notification/common/notification'; import { Severity } from 'vs/platform/notification/common/notification';
...@@ -373,7 +372,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape { ...@@ -373,7 +372,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
} }
if (token && token.isCancellationRequested) { if (token && token.isCancellationRequested) {
return TPromise.wrap([]); return Promise.resolve([]);
} }
return this._proxy.$startFileSearch(includePattern, includeFolder, excludePatternOrDisregardExcludes, maxResults, token) return this._proxy.$startFileSearch(includePattern, includeFolder, excludePatternOrDisregardExcludes, maxResults, token)
...@@ -433,18 +432,16 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape { ...@@ -433,18 +432,16 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
}; };
if (token.isCancellationRequested) { if (token.isCancellationRequested) {
return TPromise.wrap(undefined); return Promise.resolve(undefined);
} }
return this._proxy.$startTextSearch(query, queryOptions, requestId, token).then( return this._proxy.$startTextSearch(query, queryOptions, requestId, token).then(result => {
result => { delete this._activeSearchCallbacks[requestId];
delete this._activeSearchCallbacks[requestId]; return result;
return result; }, err => {
}, delete this._activeSearchCallbacks[requestId];
err => { return Promise.reject(err);
delete this._activeSearchCallbacks[requestId]; });
return TPromise.wrapError(err);
});
} }
$handleTextSearchResult(result: IRawFileMatch2, requestId: number): void { $handleTextSearchResult(result: IRawFileMatch2, requestId: number): void {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册