Skip to content

Commit

Permalink
spread originalConfig rather than reconstructing it
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremie-stripe authored and jeanp413 committed Aug 12, 2024
1 parent 731f278 commit 3d2597d
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions src/vs/code/browser/workbench/workbench.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3d2597d

Please sign in to comment.