From 137df72a603be40ed56f885c781b25f2c848bd35 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Thu, 23 Oct 2014 17:10:45 -0700 Subject: [PATCH] Give the user settings a priority Base index 1000 --- src/config.coffee | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/config.coffee b/src/config.coffee index 163116f71..b30925cac 100644 --- a/src/config.coffee +++ b/src/config.coffee @@ -314,6 +314,7 @@ class Config @settings = {} @scopedSettingsStore = new ScopedPropertyStore @usersScopedSettings = new CompositeDisposable + @usersScopedSettingPriority = {indexBase: 1000} @configFileHasErrors = false @configFilePath = fs.resolve(@configDirPath, 'config', ['json', 'cson']) @configFilePath ?= path.join(@configDirPath, 'config.cson') @@ -537,7 +538,7 @@ class Config settings = @scopedSettingsStore.propertiesForSourceAndSelector('user-config', scopeSelector) @scopedSettingsStore.removePropertiesForSourceAndSelector('user-config', scopeSelector) _.setValueForKeyPath(settings, keyPath, undefined) - @addScopedSettings('user-config', scopeSelector, settings) + @addScopedSettings('user-config', scopeSelector, settings, @usersScopedSettingPriority) @save() unless @configFileHasErrors @getDefault(scopeSelector, keyPath) else @@ -881,13 +882,13 @@ class Config resetUserScopedSettings: (newScopedSettings) -> @usersScopedSettings?.dispose() @usersScopedSettings = new CompositeDisposable - @usersScopedSettings.add @scopedSettingsStore.addProperties('user-config', newScopedSettings) + @usersScopedSettings.add @scopedSettingsStore.addProperties('user-config', newScopedSettings, @usersScopedSettingPriority) @emitter.emit 'did-change' - addScopedSettings: (source, selector, value) -> + addScopedSettings: (source, selector, value, options) -> settingsBySelector = {} settingsBySelector[selector] = value - disposable = @scopedSettingsStore.addProperties(source, settingsBySelector) + disposable = @scopedSettingsStore.addProperties(source, settingsBySelector, options) @emitter.emit 'did-change' new Disposable => disposable.dispose() @@ -901,7 +902,7 @@ class Config settingsBySelector = {} settingsBySelector[selector] = value - @usersScopedSettings.add @scopedSettingsStore.addProperties('user-config', settingsBySelector) + @usersScopedSettings.add @scopedSettingsStore.addProperties('user-config', settingsBySelector, @usersScopedSettingPriority) @emitter.emit 'did-change' getRawScopedValue: (scopeDescriptor, keyPath) ->