Merge from vscode e5834d3280fcd04898efeac32b9cf1b893f9b127 (#9385)

* Merge from vscode e5834d3280fcd04898efeac32b9cf1b893f9b127

* distro
This commit is contained in:
Anthony Dresser
2020-02-28 00:37:06 -08:00
committed by GitHub
parent 70851716f7
commit 5d13ebf0d2
143 changed files with 1711 additions and 934 deletions

View File

@@ -1238,7 +1238,10 @@ export class SettingTreeRenderers {
private getActionsForSetting(setting: ISetting): IAction[] {
const enableSync = this._userDataSyncEnablementService.isEnabled();
return enableSync && !setting.disallowSyncIgnore ?
[this._instantiationService.createInstance(SyncSettingAction, setting)] :
[
new Separator(),
this._instantiationService.createInstance(SyncSettingAction, setting)
] :
[];
}