mirror of
https://github.com/microsoft/vscode.git
synced 2026-09-29 18:09:01 +01:00
Matt Bierner
c42b385bce
Fixes #114543 External and internal callers to openExternal may not expect (or want) their urls to be handled by a contributed opener. This change makes it so you have to explicitly enable using contributed openers when calling openExternal. It also enables using contributed openers for a few places in our codebase
68 lines
2.6 KiB
TypeScript
68 lines
2.6 KiB
TypeScript
/*---------------------------------------------------------------------------------------------
|
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
*--------------------------------------------------------------------------------------------*/
|
|
|
|
import { Event } from 'vs/base/common/event';
|
|
import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
|
|
import { URI, UriComponents } from 'vs/base/common/uri';
|
|
import { IOpenerService } from 'vs/platform/opener/common/opener';
|
|
import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
|
|
import { ExtHostContext, ExtHostWindowShape, IExtHostContext, IOpenUriOptions, MainContext, MainThreadWindowShape } from '../common/extHost.protocol';
|
|
import { IHostService } from 'vs/workbench/services/host/browser/host';
|
|
|
|
@extHostNamedCustomer(MainContext.MainThreadWindow)
|
|
export class MainThreadWindow implements MainThreadWindowShape {
|
|
|
|
private readonly proxy: ExtHostWindowShape;
|
|
private readonly disposables = new DisposableStore();
|
|
private readonly resolved = new Map<number, IDisposable>();
|
|
|
|
constructor(
|
|
extHostContext: IExtHostContext,
|
|
@IHostService private readonly hostService: IHostService,
|
|
@IOpenerService private readonly openerService: IOpenerService,
|
|
) {
|
|
this.proxy = extHostContext.getProxy(ExtHostContext.ExtHostWindow);
|
|
|
|
Event.latch(hostService.onDidChangeFocus)
|
|
(this.proxy.$onDidChangeWindowFocus, this.proxy, this.disposables);
|
|
}
|
|
|
|
dispose(): void {
|
|
this.disposables.dispose();
|
|
|
|
for (const value of this.resolved.values()) {
|
|
value.dispose();
|
|
}
|
|
this.resolved.clear();
|
|
}
|
|
|
|
$getWindowVisibility(): Promise<boolean> {
|
|
return Promise.resolve(this.hostService.hasFocus);
|
|
}
|
|
|
|
async $openUri(uriComponents: UriComponents, uriString: string | undefined, options: IOpenUriOptions): Promise<boolean> {
|
|
const uri = URI.from(uriComponents);
|
|
let target: URI | string;
|
|
if (uriString && URI.parse(uriString).toString() === uri.toString()) {
|
|
// called with string and no transformation happened -> keep string
|
|
target = uriString;
|
|
} else {
|
|
// called with URI or transformed -> use uri
|
|
target = uri;
|
|
}
|
|
return this.openerService.open(target, {
|
|
openExternal: true,
|
|
allowTunneling: options.allowTunneling,
|
|
allowContributedOpeners: options.allowContributedOpeners,
|
|
});
|
|
}
|
|
|
|
async $asExternalUri(uriComponents: UriComponents, options: IOpenUriOptions): Promise<UriComponents> {
|
|
const uri = URI.revive(uriComponents);
|
|
const result = await this.openerService.resolveExternalUri(uri, options);
|
|
return result.resolved;
|
|
}
|
|
}
|