Skip to content

Commit d76be8e

Browse files
jeremie-stripejeanp413
authored andcommitted
spread originalConfig rather than reconstructing it
Tool: gitpod/catfood.gitpod.cloud
1 parent 60b33f7 commit d76be8e

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -602,20 +602,15 @@ function readCookie(name: string): string | undefined {
602602
const secretStorageCrypto = secretStorageKeyPath && ServerKeyedAESCrypto.supported()
603603
? new ServerKeyedAESCrypto(secretStorageKeyPath) : new TransparentCrypto();
604604
const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents; workspaceUri?: UriComponents; callbackRoute: string } = {
605+
...originalConfig,
605606
remoteAuthority: window.location.host,
606-
developmentOptions: originalConfig.developmentOptions,
607-
settingsSyncOptions: originalConfig.settingsSyncOptions,
608-
folderUri: originalConfig.folderUri,
609-
workspaceUri: originalConfig.workspaceUri,
610-
callbackRoute: originalConfig.callbackRoute
611607
};
612608

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

0 commit comments

Comments
 (0)