Skip to content

Commit d788872

Browse files
jeremie-stripejeanp413
authored andcommitted
spread originalConfig rather than reconstructing it
1 parent df19227 commit d788872

1 file changed

Lines changed: 1 addition & 6 deletions

File tree

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

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

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

0 commit comments

Comments
 (0)