Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 19:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

debt - remove TPromise from ExtHostUrls

Browse Source
This commit is contained in:
Johannes Rieken
2018-09-06 14:13:26 +02:00
parent 66ba38c55d
commit 3a444bfeb1
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/node/extHost.protocol.ts
View File

@@ -466,7 +466,7 @@ export interface MainThreadUrlsShape extends IDisposable {
}
export interface ExtHostUrlsShape {
$handleExternalUri(handle: number, uri: UriComponents): TPromise<void>;
$handleExternalUri(handle: number, uri: UriComponents): Thenable<void>;
}
export interface MainThreadWorkspaceShape extends IDisposable {

11
src/vs/workbench/api/node/extHostUrls.ts
View File

@@ -8,7 +8,7 @@ import { MainContext, IMainContext, ExtHostUrlsShape, MainThreadUrlsShape } from
import { URI, UriComponents } from 'vs/base/common/uri';
import { TPromise } from 'vs/base/common/winjs.base';
import { toDisposable } from 'vs/base/common/lifecycle';
import { asWinJsPromise } from 'vs/base/common/async';
import { onUnexpectedError } from 'vs/base/common/errors';
export class ExtHostUrls implements ExtHostUrlsShape {
@@ -41,14 +41,17 @@ export class ExtHostUrls implements ExtHostUrlsShape {
});
}
$handleExternalUri(handle: number, uri: UriComponents): TPromise<void> {
$handleExternalUri(handle: number, uri: UriComponents): Thenable<void> {
const handler = this.handlers.get(handle);
if (!handler) {
return TPromise.as(null);
}
asWinJsPromise(_ => handler.handleUri(URI.revive(uri)));
try {
handler.handleUri(URI.revive(uri));
} catch (err) {
onUnexpectedError(err);
}
return TPromise.as(null);
}