fix microsoft#188794 (microsoft#188908)

sandy081 · web-flow · commit 1b0c1fa5b6c5 · 2023-07-26T14:15:40.000+02:00
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -2526,8 +2526,11 @@ class ApplySettingToAllProfilesAction extends Action {
 		}
 
 		const newValue = distinct(value);
-		await this.configService.updateValue(APPLY_ALL_PROFILES_SETTING, newValue.length ? newValue : undefined, ConfigurationTarget.USER_LOCAL);
-		if (!this.checked) {
+		if (this.checked) {
+			await this.configService.updateValue(this.setting.key, this.configService.inspect(this.setting.key).userLocal?.value, ConfigurationTarget.USER_LOCAL);
+			await this.configService.updateValue(APPLY_ALL_PROFILES_SETTING, newValue.length ? newValue : undefined, ConfigurationTarget.USER_LOCAL);
+		} else {
+			await this.configService.updateValue(APPLY_ALL_PROFILES_SETTING, newValue.length ? newValue : undefined, ConfigurationTarget.USER_LOCAL);
 			await this.configService.updateValue(this.setting.key, this.configService.inspect(this.setting.key).userLocal?.value, ConfigurationTarget.USER_LOCAL);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -2526,8 +2526,11 @@ class ApplySettingToAllProfilesAction extends Action {`
`2526`	`2526`	`}`
`2527`	`2527`
`2528`	`2528`	`const newValue = distinct(value);`
`2529`		`- await this.configService.updateValue(APPLY_ALL_PROFILES_SETTING, newValue.length ? newValue : undefined, ConfigurationTarget.USER_LOCAL);`
`2530`		`- if (!this.checked) {`
	`2529`	`+ if (this.checked) {`
	`2530`	`+ await this.configService.updateValue(this.setting.key, this.configService.inspect(this.setting.key).userLocal?.value, ConfigurationTarget.USER_LOCAL);`
	`2531`	`+ await this.configService.updateValue(APPLY_ALL_PROFILES_SETTING, newValue.length ? newValue : undefined, ConfigurationTarget.USER_LOCAL);`
	`2532`	`+ } else {`
	`2533`	`+ await this.configService.updateValue(APPLY_ALL_PROFILES_SETTING, newValue.length ? newValue : undefined, ConfigurationTarget.USER_LOCAL);`
`2531`	`2534`	`await this.configService.updateValue(this.setting.key, this.configService.inspect(this.setting.key).userLocal?.value, ConfigurationTarget.USER_LOCAL);`
`2532`	`2535`	`}`
`2533`	`2536`	`}`