development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-20 02:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

web - receive proper uris

Browse source
This commit is contained in:
Benjamin Pasero 2019-06-14 11:20:39 +02:00
parent bfc5fb4fd2
commit ee630a0895
2 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/vs/code/browser/workbench/workbench.html
View file

@ -16,7 +16,8 @@
self.WINDOW_CONFIGURATION = {
folderUri: '{{FOLDER}}',
workspaceUri: '{{WORKSPACE}}',
userDataUri: '{{USER_DATA}}'
userDataUri: '{{USER_DATA}}',
authority: '{{AUTHORITY}}'
}
</script>

26
src/vs/workbench/browser/web.main.ts
View file

@ -24,7 +24,7 @@ import { Schemas } from 'vs/base/common/network';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { onUnexpectedError } from 'vs/base/common/errors';
import { URI } from 'vs/base/common/uri';
import { URI, UriComponents } from 'vs/base/common/uri';
import { IWorkspaceInitializationPayload } from 'vs/platform/workspaces/common/workspaces';
import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService';
import { ConfigurationCache } from 'vs/workbench/services/configuration/browser/configurationCache';
@ -185,26 +185,20 @@ class CodeRendererMain extends Disposable {
}
export interface IWindowConfigurationContents {
userDataUri: string;
folderUri?: string;
workspaceUri?: string;
authority: string;
userDataUri: UriComponents;
folderUri?: UriComponents;
workspaceUri?: UriComponents;
}
export function main(windowConfigurationContents: IWindowConfigurationContents): Promise<void> {
const windowConfiguration: IWindowConfiguration = {
userDataUri: toResource(windowConfigurationContents.userDataUri),
folderUri: windowConfigurationContents.folderUri ? toResource(windowConfigurationContents.folderUri) : undefined,
workspaceUri: windowConfigurationContents.workspaceUri ? toResource(windowConfigurationContents.workspaceUri) : undefined,
remoteAuthority: document.location.host
userDataUri: URI.revive(windowConfigurationContents.userDataUri),
remoteAuthority: windowConfigurationContents.authority,
folderUri: windowConfigurationContents.folderUri ? URI.revive(windowConfigurationContents.folderUri) : undefined,
workspaceUri: windowConfigurationContents.workspaceUri ? URI.revive(windowConfigurationContents.workspaceUri) : undefined
};
const renderer = new CodeRendererMain(windowConfiguration);
return renderer.open();
}
function toResource(uri: string): URI {
return URI.parse(uri).with({
scheme: Schemas.vscodeRemote,
authority: document.location.host
});
}
}