Skip to content

Commit d9d49a6

Browse files
jeremie-stripejeanp413
authored andcommitted
spread originalConfig rather than reconstructing it
Tool: gitpod/catfood.gitpod.cloud
1 parent 9881f4a commit d9d49a6

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
@@ -603,20 +603,15 @@ function readCookie(name: string): string | undefined {
603603
const secretStorageCrypto = secretStorageKeyPath && ServerKeyedAESCrypto.supported()
604604
? new ServerKeyedAESCrypto(secretStorageKeyPath) : new TransparentCrypto();
605605
const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents; workspaceUri?: UriComponents; callbackRoute: string } = {
606+
...originalConfig,
606607
remoteAuthority: window.location.host,
607-
developmentOptions: originalConfig.developmentOptions,
608-
settingsSyncOptions: originalConfig.settingsSyncOptions,
609-
folderUri: originalConfig.folderUri,
610-
workspaceUri: originalConfig.workspaceUri,
611-
callbackRoute: originalConfig.callbackRoute
612608
};
613609

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

0 commit comments

Comments
 (0)