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 33a65245075e4d18908652865a79cf5489c30f40 (#9279)

Browse Source 
* Merge from vscode 33a65245075e4d18908652865a79cf5489c30f40

* remove github
This commit is contained in:
Anthony Dresser
2020-02-21 23:42:19 -08:00
committed by GitHub
parent c446cea3a0
commit de5f1eb780
250 changed files with 3724 additions and 2756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ import { ExcludeSettingWidget, IListChangeEvent, IListDataItem, ListSettingWidge
import { SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU } from 'vs/workbench/contrib/preferences/common/preferences';
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
import { ISetting, ISettingsGroup, SettingValueType } from 'vs/workbench/services/preferences/common/preferences';
import { IUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
import { IUserDataSyncEnablementService, getDefaultIgnoredSettings } from 'vs/platform/userDataSync/common/userDataSync';
const $ = DOM.$;
@@ -1238,7 +1238,7 @@ export class SettingTreeRenderers {
private getActionsForSetting(setting: ISetting): IAction[] {
const enableSync = this._userDataSyncEnablementService.isEnabled();
return enableSync && !setting.disallowSyncIgnore ?
[this._instantiationService.createInstance(StopSyncingSettingAction, setting)] :
[this._instantiationService.createInstance(SyncSettingAction, setting)] :
[];
}
@@ -1622,7 +1622,7 @@ class CopySettingAsJSONAction extends Action {
}
}
class StopSyncingSettingAction extends Action {
class SyncSettingAction extends Action {
static readonly ID = 'settings.stopSyncingSetting';
static readonly LABEL = localize('stopSyncingSetting', "Sync This Setting");
@@ -1630,24 +1630,38 @@ class StopSyncingSettingAction extends Action {
private readonly setting: ISetting,
@IConfigurationService private readonly configService: IConfigurationService,
) {
super(StopSyncingSettingAction.ID, StopSyncingSettingAction.LABEL);
super(SyncSettingAction.ID, SyncSettingAction.LABEL);
this._register(Event.filter(configService.onDidChangeConfiguration, e => e.affectsConfiguration('sync.ignoredSettings'))(() => this.update()));
this.update();
}
update() {
const ignoredSettings = getIgnoredSettings(this.configService);
async update() {
const ignoredSettings = getIgnoredSettings(getDefaultIgnoredSettings(), this.configService);
this.checked = !ignoredSettings.includes(this.setting.key);
}
async run(): Promise<void> {
// first remove the current setting completely from ignored settings
let currentValue = [...this.configService.getValue<string[]>('sync.ignoredSettings')];
if (this.checked) {
currentValue.push(this.setting.key);
} else {
currentValue = currentValue.filter(v => v !== this.setting.key);
currentValue = currentValue.filter(v => v !== this.setting.key && v !== `-${this.setting.key}`);
const defaultIgnoredSettings = getDefaultIgnoredSettings();
const isDefaultIgnored = defaultIgnoredSettings.includes(this.setting.key);
const askedToSync = !this.checked;
// If asked to sync, then add only if it is ignored by default
if (askedToSync && isDefaultIgnored) {
currentValue.push(`-${this.setting.key}`);
}
// If asked not to sync, then add only if it is not ignored by default
if (!askedToSync && !isDefaultIgnored) {
currentValue.push(this.setting.key);
}
this.configService.updateValue('sync.ignoredSettings', currentValue.length ? currentValue : undefined, ConfigurationTarget.USER);
return Promise.resolve(undefined);
}
}

4
src/vs/workbench/contrib/preferences/test/common/smartSnippetInserter.test.ts
View File

@@ -5,13 +5,13 @@
import * as assert from 'assert';
import { SmartSnippetInserter } from 'vs/workbench/contrib/preferences/common/smartSnippetInserter';
import { TextModel } from 'vs/editor/common/model/textModel';
import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
import { Position } from 'vs/editor/common/core/position';
suite('SmartSnippetInserter', () => {
function testSmartSnippetInserter(text: string[], runner: (assert: (desiredPos: Position, pos: Position, prepend: string, append: string) => void) => void): void {
let model = TextModel.createFromString(text.join('\n'));
let model = createTextModel(text.join('\n'));
runner((desiredPos, pos, prepend, append) => {
let actual = SmartSnippetInserter.insertSnippet(model, desiredPos);
let expected = {