diff --git a/src/vs/platform/userDataSync/common/extensionsSync.ts b/src/vs/platform/userDataSync/common/extensionsSync.ts index b05d1d9f032..f635ed1fa87 100644 --- a/src/vs/platform/userDataSync/common/extensionsSync.ts +++ b/src/vs/platform/userDataSync/common/extensionsSync.ts @@ -70,7 +70,7 @@ export class ExtensionsSynchroniser extends Disposable implements ISynchroniser } async sync(): Promise { - if (!this.configurationService.getValue('userConfiguration.syncExtensions')) { + if (!this.configurationService.getValue('configurtionSync.enableExtensions')) { return false; } @@ -144,7 +144,7 @@ export class ExtensionsSynchroniser extends Disposable implements ISynchroniser * - Update remote with those local extension which are newly added or updated or removed and untouched in remote. */ private merge(localExtensions: ISyncExtension[], remoteExtensions: ISyncExtension[] | null, lastSyncExtensions: ISyncExtension[] | null): { added: ISyncExtension[], removed: IExtensionIdentifier[], updated: ISyncExtension[], remote: ISyncExtension[] | null } { - const ignoredExtensions = this.configurationService.getValue('userConfiguration.ignoredExtensions') || []; + const ignoredExtensions = this.configurationService.getValue('configurtionSync.extensionsToIgnore') || []; // First time sync if (!remoteExtensions) { return { added: [], removed: [], updated: [], remote: localExtensions.filter(({ identifier }) => ignoredExtensions.some(id => id.toLowerCase() === identifier.id.toLowerCase())) }; diff --git a/src/vs/platform/userDataSync/common/settingsSync.ts b/src/vs/platform/userDataSync/common/settingsSync.ts index de939c2c7e2..da95e8542db 100644 --- a/src/vs/platform/userDataSync/common/settingsSync.ts +++ b/src/vs/platform/userDataSync/common/settingsSync.ts @@ -80,7 +80,7 @@ export class SettingsSynchroniser extends Disposable implements ISynchroniser { } async sync(_continue?: boolean): Promise { - if (!this.configurationService.getValue('userConfiguration.syncSettings')) { + if (!this.configurationService.getValue('configurtionSync.enableSettings')) { return false; } @@ -214,7 +214,7 @@ export class SettingsSynchroniser extends Disposable implements ISynchroniser { } private getIgnoredSettings(settingsContent?: string): string[] { - const value: string[] = (settingsContent ? parse(settingsContent)['userConfiguration.ignoredSettings'] : this.configurationService.getValue('userConfiguration.ignoredSettings')) || []; + const value: string[] = (settingsContent ? parse(settingsContent)['configurtionSync.settingsToIgnore'] : this.configurationService.getValue('configurtionSync.settingsToIgnore')) || []; const added: string[] = [], removed: string[] = []; for (const key of value) { if (startsWith(key, '-')) { diff --git a/src/vs/platform/userDataSync/common/userDataSync.ts b/src/vs/platform/userDataSync/common/userDataSync.ts index c65b795d758..78cf23b61d7 100644 --- a/src/vs/platform/userDataSync/common/userDataSync.ts +++ b/src/vs/platform/userDataSync/common/userDataSync.ts @@ -15,48 +15,48 @@ import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/plat import { IJSONSchema } from 'vs/base/common/jsonSchema'; export const DEFAULT_IGNORED_SETTINGS = [ - 'userConfiguration.enableSync', - 'userConfiguration.syncSettings', - 'userConfiguration.syncExtensions', + 'configurationSync.enable', + 'configurtionSync.enableSettings', + 'configurtionSync.enableExtensions', ]; export function registerConfiguration(): IDisposable { const ignoredSettingsSchemaId = 'vscode://schemas/ignoredSettings'; const configurationRegistry = Registry.as(ConfigurationExtensions.Configuration); configurationRegistry.registerConfiguration({ - id: 'userConfiguration', + id: 'configurationSync', order: 30, - title: localize('userConfiguration', "User Configuration"), + title: localize('configurationSync', "Configuration Sync"), type: 'object', properties: { - 'userConfiguration.enableSync': { + 'configurationSync.enable': { type: 'boolean', - description: localize('userConfiguration.enableSync', "When enabled, synchronises User Configuration: Settings, Keybindings, Extensions & Snippets."), + description: localize('configurationSync.enable', "When enabled, synchronises configuration that includes Settings and Extensions."), default: true, scope: ConfigurationScope.APPLICATION }, - 'userConfiguration.syncSettings': { + 'configurtionSync.enableSettings': { type: 'boolean', - description: localize('userConfiguration.syncSettings', "When enabled settings are synchronised while synchronising user configuration."), + description: localize('configurtionSync.enableSettings', "When enabled settings are synchronised while synchronising configuration."), default: true, scope: ConfigurationScope.APPLICATION, }, - 'userConfiguration.syncExtensions': { + 'configurtionSync.enableExtensions': { type: 'boolean', - description: localize('userConfiguration.syncExtensions', "When enabled extensions are synchronised while synchronising user configuration."), + description: localize('configurtionSync.enableExtensions', "When enabled extensions are synchronised while synchronising configuration."), default: true, scope: ConfigurationScope.APPLICATION, }, - 'userConfiguration.ignoredExtensions': { + 'configurtionSync.extensionsToIgnore': { 'type': 'array', - description: localize('userConfiguration.ignoredExtensions', "Configure extensions which will be ignored while syncing."), + description: localize('configurtionSync.extensionsToIgnore', "Configure extensions to be ignored while syncing."), 'default': [], 'scope': ConfigurationScope.APPLICATION, uniqueItems: true }, - 'userConfiguration.ignoredSettings': { + 'configurtionSync.settingsToIgnore': { 'type': 'array', - description: localize('userConfiguration.ignoredSettings', "Configure settings which will be ignored while syncing. \nDefault Ignored Settings:\n\n{0}", DEFAULT_IGNORED_SETTINGS.sort().map(setting => `- ${setting}`).join('\n')), + description: localize('configurtionSync.settingsToIgnore', "Configure settings to be ignored while syncing. \nDefault Ignored Settings:\n\n{0}", DEFAULT_IGNORED_SETTINGS.sort().map(setting => `- ${setting}`).join('\n')), 'default': [], 'scope': ConfigurationScope.APPLICATION, $ref: ignoredSettingsSchemaId, diff --git a/src/vs/platform/userDataSync/common/userDataSyncService.ts b/src/vs/platform/userDataSync/common/userDataSyncService.ts index 4db123c4a02..e006ab2a7ed 100644 --- a/src/vs/platform/userDataSync/common/userDataSyncService.ts +++ b/src/vs/platform/userDataSync/common/userDataSyncService.ts @@ -112,7 +112,7 @@ export class UserDataAutoSync extends Disposable { super(); if (userDataSyncStoreService.enabled) { this.sync(true); - this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('userConfiguration.enableSync'))(() => this.sync(true))); + this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('configurationSync.enable'))(() => this.sync(true))); // Sync immediately if there is a local change. this._register(Event.debounce(this.userDataSyncService.onDidChangeLocal, () => undefined, 500)(() => this.sync(false))); @@ -134,7 +134,7 @@ export class UserDataAutoSync extends Disposable { } private isSyncEnabled(): boolean { - return this.configurationService.getValue('userConfiguration.enableSync'); + return this.configurationService.getValue('configurationSync.enable'); } } diff --git a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts index 945a4981851..b89a65204bf 100644 --- a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts +++ b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts @@ -197,9 +197,9 @@ export const tocData: ITOCEntry = { settings: ['telemetry.*'] }, { - id: 'application/sync', - label: localize('sync', "Sync"), - settings: ['userConfiguration.*'] + id: 'application/configurationSync', + label: localize('configuration sync', "Configuration Sync"), + settings: ['configurationSync.*'] } ] } diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts index ba89fb5267a..eb4ab48d8e8 100644 --- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts +++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts @@ -166,11 +166,11 @@ class SyncActionsContribution extends Disposable implements IWorkbenchContributi group: '5_sync', command: { id: 'workbench.userData.actions.syncStart', - title: localize('start sync', "Sync: Start") + title: localize('start sync', "Configuration Sync: Turn On") }, - when: ContextKeyExpr.and(CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized), ContextKeyExpr.not('config.userConfiguration.enableSync')), + when: ContextKeyExpr.and(CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized), ContextKeyExpr.not('config.configurationSync.enable')), }; - CommandsRegistry.registerCommand(startSyncMenuItem.command.id, () => this.configurationService.updateValue('userConfiguration.enableSync', true)); + CommandsRegistry.registerCommand(startSyncMenuItem.command.id, () => this.configurationService.updateValue('configurationSync.enable', true)); MenuRegistry.appendMenuItem(MenuId.GlobalActivity, startSyncMenuItem); MenuRegistry.appendMenuItem(MenuId.CommandPalette, startSyncMenuItem); @@ -178,11 +178,11 @@ class SyncActionsContribution extends Disposable implements IWorkbenchContributi group: '5_sync', command: { id: 'workbench.userData.actions.stopSync', - title: localize('stop sync', "Sync: Stop") + title: localize('stop sync', "Configuration Sync: Turn Off") }, - when: ContextKeyExpr.and(CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized), ContextKeyExpr.has('config.userConfiguration.enableSync')), + when: ContextKeyExpr.and(CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized), ContextKeyExpr.has('config.configurationSync.enable')), }; - CommandsRegistry.registerCommand(stopSyncMenuItem.command.id, () => this.configurationService.updateValue('userConfiguration.enableSync', false)); + CommandsRegistry.registerCommand(stopSyncMenuItem.command.id, () => this.configurationService.updateValue('configurationSync.enable', false)); MenuRegistry.appendMenuItem(MenuId.GlobalActivity, stopSyncMenuItem); MenuRegistry.appendMenuItem(MenuId.CommandPalette, stopSyncMenuItem); @@ -190,7 +190,7 @@ class SyncActionsContribution extends Disposable implements IWorkbenchContributi group: '5_sync', command: { id: 'sync.resolveConflicts', - title: localize('resolveConflicts', "Sync: Resolve Conflicts"), + title: localize('resolveConflicts', "Configuration Sync: Resolve Conflicts"), }, when: CONTEXT_SYNC_STATE.isEqualTo(SyncStatus.HasConflicts), }; @@ -203,14 +203,14 @@ class SyncActionsContribution extends Disposable implements IWorkbenchContributi MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: continueSyncCommandId, - title: localize('continue sync', "Sync: Continue") + title: localize('continue sync', "Configuration Sync: Continue") }, when: ContextKeyExpr.and(CONTEXT_SYNC_STATE.isEqualTo(SyncStatus.HasConflicts)), }); MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: continueSyncCommandId, - title: localize('continue sync', "Sync: Continue"), + title: localize('continue sync', "Configuration Sync: Continue"), iconLocation: { light: SYNC_PUSH_LIGHT_ICON_URI, dark: SYNC_PUSH_DARK_ICON_URI