Fix "Open Workspace Settings" when User Settings is open (fixes #148709) (#225311)

r3m0t · web-flow · commit 1900f9c05ec8 · 2024-08-14T02:05:06.000+02:00
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
@@ -482,8 +482,7 @@ export class SettingsEditor2 extends EditorPane {
 
 		const target: SettingsTarget | undefined = options.folderUri ?? recoveredViewState?.settingsTarget ?? <SettingsTarget | undefined>options.target;
 		if (target) {
-			this.settingsTargetsWidget.settingsTarget = target;
-			this.viewState.settingsTarget = target;
+			this.settingsTargetsWidget.updateTarget(target);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -482,8 +482,7 @@ export class SettingsEditor2 extends EditorPane {`
`482`	`482`
`483`	`483`	`const target: SettingsTarget \| undefined = options.folderUri ?? recoveredViewState?.settingsTarget ?? <SettingsTarget \| undefined>options.target;`
`484`	`484`	`if (target) {`
`485`		`- this.settingsTargetsWidget.settingsTarget = target;`
`486`		`- this.viewState.settingsTarget = target;`
	`485`	`+ this.settingsTargetsWidget.updateTarget(target);`
`487`	`486`	`}`
`488`	`487`	`}`
`489`	`488`