Skip to content

Commit 28fba9c

Browse files
jeremie-stripejeanp413
authored andcommitted
spread originalConfig rather than reconstructing it
1 parent 94a9132 commit 28fba9c

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

src/vs/code/browser/workbench/workbench.ts

+1-6
Original file line numberDiff line numberDiff line change
@@ -574,20 +574,15 @@ function readCookie(name: string): string | undefined {
574574
const secretStorageCrypto = secretStorageKeyPath && ServerKeyedAESCrypto.supported()
575575
? new ServerKeyedAESCrypto(secretStorageKeyPath) : new TransparentCrypto();
576576
const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents; workspaceUri?: UriComponents; callbackRoute: string } = {
577+
...originalConfig,
577578
remoteAuthority: window.location.host,
578-
developmentOptions: originalConfig.developmentOptions,
579-
settingsSyncOptions: originalConfig.settingsSyncOptions,
580-
folderUri: originalConfig.folderUri,
581-
workspaceUri: originalConfig.workspaceUri,
582-
callbackRoute: originalConfig.callbackRoute
583579
};
584580

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

0 commit comments

Comments
 (0)