Fixes more node 12 typing errors (#85420)

* Fixes more node 12 typing errors

For #82514

* Remove Symbol.toStringTag usage for now

* Reverting a few fixes that are not comptible with current node typings

* Revert one more use of StringDecoder

Must wait until we actually pick up the new typings
This commit is contained in:
Matt Bierner
2019-11-25 19:30:21 -08:00
committed by GitHub
parent 52bdec0d4e
commit d4ab1fcda5
13 changed files with 18 additions and 17 deletions

View File

@@ -155,11 +155,11 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
if (!isPromiseCanceledError(err)) {
return Promise.reject(err);
}
return undefined;
return null;
});
}
$startTextSearch(pattern: IPatternInfo, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete> {
$startTextSearch(pattern: IPatternInfo, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | undefined> {
const workspace = this._contextService.getWorkspace();
const folders = workspace.folders.map(folder => folder.uri);
@@ -198,14 +198,14 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
return this._searchService.fileSearch(query, token).then(
result => {
return result.limitHit;
return !!result.limitHit;
},
err => {
if (!isPromiseCanceledError(err)) {
return Promise.reject(err);
}
return undefined;
return false;
});
}