Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 03:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplication around checking isRemote

Browse Source
This commit is contained in:
Matt Bierner
2021-05-20 16:00:31 -07:00
parent 55c2fc5604
commit 07a2aab8f2
7 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/api/common/shared/webview.ts
View File

@@ -38,21 +38,21 @@ export const webviewGenericCspSource = 'https://*.vscode-webview-test.com';
*
* @param uuid Unique id of the webview.
* @param resource Uri of the resource to load.
* @param fromAuthority Optional remote authority that specifies where `resource` should be resolved from.
* @param remoteInfo Optional information about the remote that specifies where `resource` should be resolved from.
*/
export function asWebviewUri(
uuid: string,
resource: vscode.Uri,
fromAuthority: string | undefined
remoteInfo?: { authority: string | undefined, isRemote: boolean }
): vscode.Uri {
if (resource.scheme === Schemas.http || resource.scheme === Schemas.https) {
return resource;
}
if (fromAuthority && resource.scheme === Schemas.file) {
if (remoteInfo && remoteInfo.authority && remoteInfo.isRemote && resource.scheme === Schemas.file) {
resource = URI.from({
scheme: Schemas.vscodeRemote,
authority: fromAuthority,
authority: remoteInfo.authority,
path: resource.path,
});
}