ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-31 01:00:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode e6a45f4242ebddb7aa9a229f85555e8a3bd987e2 (#9253)

Browse Source 
* Merge from vscode e6a45f4242ebddb7aa9a229f85555e8a3bd987e2

* skip failing tests

* remove github-authentication extensions

* ignore github compile steps

* ignore github compile steps

* check in compiled files
This commit is contained in:
Anthony Dresser
2020-02-21 12:11:51 -08:00
committed by GitHub
parent c74bac3746
commit 1b78a9b1e0
179 changed files with 3200 additions and 1830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/workbench/contrib/preferences/browser/settingsTree.ts
View File

@@ -1237,7 +1237,7 @@ export class SettingTreeRenderers {
private getActionsForSetting(setting: ISetting): IAction[] {
const enableSync = this._userDataSyncEnablementService.isEnabled();
return enableSync ?
return enableSync && !setting.disallowSyncIgnore ?
[this._instantiationService.createInstance(StopSyncingSettingAction, setting)] :
[];
}
@@ -1624,7 +1624,7 @@ class CopySettingAsJSONAction extends Action {
class StopSyncingSettingAction extends Action {
static readonly ID = 'settings.stopSyncingSetting';
static readonly LABEL = localize('stopSyncingSetting', "Don't Sync This Setting");
static readonly LABEL = localize('stopSyncingSetting', "Sync This Setting");
constructor(
private readonly setting: ISetting,
@@ -1636,15 +1636,15 @@ class StopSyncingSettingAction extends Action {
update() {
const ignoredSettings = getIgnoredSettings(this.configService);
this.checked = ignoredSettings.includes(this.setting.key);
this.checked = !ignoredSettings.includes(this.setting.key);
}
async run(): Promise<void> {
let currentValue = [...this.configService.getValue<string[]>('sync.ignoredSettings')];
if (this.checked) {
currentValue = currentValue.filter(v => v !== this.setting.key);
} else {
currentValue.push(this.setting.key);
} else {
currentValue = currentValue.filter(v => v !== this.setting.key);
}
this.configService.updateValue('sync.ignoredSettings', currentValue.length ? currentValue : undefined, ConfigurationTarget.USER);