Skip to content

Commit 0be1443

Browse files
jeremie-stripemustard-mh
authored andcommitted
spread originalConfig rather than reconstructing it
Tool: gitpod/catfood.gitpod.cloud
1 parent dd8bfd0 commit 0be1443

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
@@ -587,20 +587,15 @@ function readCookie(name: string): string | undefined {
587587
const secretStorageCrypto = secretStorageKeyPath && ServerKeyedAESCrypto.supported()
588588
? new ServerKeyedAESCrypto(secretStorageKeyPath) : new TransparentCrypto();
589589
const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents; workspaceUri?: UriComponents; callbackRoute: string } = {
590+
...originalConfig,
590591
remoteAuthority: window.location.host,
591-
developmentOptions: originalConfig.developmentOptions,
592-
settingsSyncOptions: originalConfig.settingsSyncOptions,
593-
folderUri: originalConfig.folderUri,
594-
workspaceUri: originalConfig.workspaceUri,
595-
callbackRoute: originalConfig.callbackRoute
596592
};
597593

598594
// Create workbench
599595
create(mainWindow.document.body, {
600596
...config,
601597
windowIndicator: config.windowIndicator ?? { label: '$(remote)', tooltip: `${product.nameShort} Web` },
602598
settingsSyncOptions: config.settingsSyncOptions ? { enabled: config.settingsSyncOptions.enabled, } : undefined,
603-
developmentOptions: { ...config.developmentOptions },
604599
workspaceProvider: WorkspaceProvider.create(config),
605600
urlCallbackProvider: new LocalStorageURLCallbackProvider(config.callbackRoute),
606601
secretStorageProvider: config.remoteAuthority && !secretStorageKeyPath

0 commit comments

Comments
 (0)