Skip to content

Commit f25a54e

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

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
@@ -609,20 +609,15 @@ function readCookie(name: string): string | undefined {
609609
const secretStorageCrypto = secretStorageKeyPath && ServerKeyedAESCrypto.supported()
610610
? new ServerKeyedAESCrypto(secretStorageKeyPath) : new TransparentCrypto();
611611
const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents; workspaceUri?: UriComponents; callbackRoute: string } = {
612+
...originalConfig,
612613
remoteAuthority: window.location.host,
613-
developmentOptions: originalConfig.developmentOptions,
614-
settingsSyncOptions: originalConfig.settingsSyncOptions,
615-
folderUri: originalConfig.folderUri,
616-
workspaceUri: originalConfig.workspaceUri,
617-
callbackRoute: originalConfig.callbackRoute
618614
};
619615

620616
// Create workbench
621617
create(mainWindow.document.body, {
622618
...config,
623619
windowIndicator: config.windowIndicator ?? { label: '$(remote)', tooltip: `${product.nameShort} Web` },
624620
settingsSyncOptions: config.settingsSyncOptions ? { enabled: config.settingsSyncOptions.enabled, } : undefined,
625-
developmentOptions: { ...config.developmentOptions },
626621
workspaceProvider: WorkspaceProvider.create(config),
627622
urlCallbackProvider: new LocalStorageURLCallbackProvider(config.callbackRoute),
628623
secretStorageProvider: config.remoteAuthority && !secretStorageKeyPath

0 commit comments

Comments
 (0)