Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update product.json #548

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Prev Previous commit
Next Next commit
spread originalConfig rather than reconstructing it
  • Loading branch information
jeremie-stripe authored and jeanp413 committed Jan 18, 2024
commit 418ecc5ac0e014ae878e0bdba1ac30abea3c7f9b
7 changes: 1 addition & 6 deletions src/vs/code/browser/workbench/workbench.ts
Original file line number Diff line number Diff line change
@@ -574,20 +574,15 @@ function readCookie(name: string): string | undefined {
const secretStorageCrypto = secretStorageKeyPath && ServerKeyedAESCrypto.supported()
? new ServerKeyedAESCrypto(secretStorageKeyPath) : new TransparentCrypto();
const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents; workspaceUri?: UriComponents; callbackRoute: string } = {
...originalConfig,
remoteAuthority: window.location.host,
developmentOptions: originalConfig.developmentOptions,
settingsSyncOptions: originalConfig.settingsSyncOptions,
folderUri: originalConfig.folderUri,
workspaceUri: originalConfig.workspaceUri,
callbackRoute: originalConfig.callbackRoute
};

// Create workbench
create(mainWindow.document.body, {
...config,
windowIndicator: config.windowIndicator ?? { label: '$(remote)', tooltip: `${product.nameShort} Web` },
settingsSyncOptions: config.settingsSyncOptions ? { enabled: config.settingsSyncOptions.enabled, } : undefined,
developmentOptions: { ...config.developmentOptions },
workspaceProvider: WorkspaceProvider.create(config),
urlCallbackProvider: new LocalStorageURLCallbackProvider(config.callbackRoute),
secretStorageProvider: config.remoteAuthority && !secretStorageKeyPath