diff options
Diffstat (limited to 'src/vs/workbench/services/workspaces/common/workspaceTrust.ts')
| -rw-r--r-- | src/vs/workbench/services/workspaces/common/workspaceTrust.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/vs/workbench/services/workspaces/common/workspaceTrust.ts b/src/vs/workbench/services/workspaces/common/workspaceTrust.ts index 49d6c42d4a8..8a29a82a900 100644 --- a/src/vs/workbench/services/workspaces/common/workspaceTrust.ts +++ b/src/vs/workbench/services/workspaces/common/workspaceTrust.ts @@ -215,22 +215,22 @@ export class WorkspaceTrustManagementService extends Disposable implements IWork this._logService.info('[WT] Enter getCanonicalUri()...'); } + let canonicalUri = uri; if (this.environmentService.remoteAuthority && uri.scheme === Schemas.vscodeRemote) { if (isCI) { this._logService.info('[WT] Return this.remoteAuthorityResolverService.getCanonicalURI(uri)...'); } - return this.remoteAuthorityResolverService.getCanonicalURI(uri); - } - - if (uri.scheme === 'vscode-vfs') { + canonicalUri = await this.remoteAuthorityResolverService.getCanonicalURI(uri); + } else if (uri.scheme === 'vscode-vfs') { const index = uri.authority.indexOf('+'); if (index !== -1) { - return uri.with({ authority: uri.authority.substr(0, index) }); + canonicalUri = uri.with({ authority: uri.authority.substr(0, index) }); } } - return uri; + // ignore query and fragent section of uris always + return canonicalUri.with({ query: null, fragment: null }); } private async resolveCanonicalUris(): Promise<void> { |