Skip to content

Commit 5436d91

Browse files
jeremie-stripemustard-mh
authored andcommitted
spread originalConfig rather than reconstructing it
Tool: gitpod/catfood.gitpod.cloud
1 parent 06aca0c commit 5436d91

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
@@ -607,20 +607,15 @@ function readCookie(name: string): string | undefined {
607607
const secretStorageCrypto = secretStorageKeyPath && ServerKeyedAESCrypto.supported()
608608
? new ServerKeyedAESCrypto(secretStorageKeyPath) : new TransparentCrypto();
609609
const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents; workspaceUri?: UriComponents; callbackRoute: string } = {
610+
...originalConfig,
610611
remoteAuthority: window.location.host,
611-
developmentOptions: originalConfig.developmentOptions,
612-
settingsSyncOptions: originalConfig.settingsSyncOptions,
613-
folderUri: originalConfig.folderUri,
614-
workspaceUri: originalConfig.workspaceUri,
615-
callbackRoute: originalConfig.callbackRoute
616612
};
617613

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

0 commit comments

Comments
 (0)