From a711e908d560af71542a63a16ff18bed4ce0d558 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Fri, 3 Oct 2014 10:45:37 -0700 Subject: [PATCH] :lipstick: --- spec/config-spec.coffee | 4 +--- src/config.coffee | 2 +- src/language-mode.coffee | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/spec/config-spec.coffee b/spec/config-spec.coffee index 473b029c7..c42add20c 100644 --- a/spec/config-spec.coffee +++ b/spec/config-spec.coffee @@ -883,10 +883,8 @@ describe "Config", -> expect(atom.config.get([".source.coffee", ".string.quoted.single.double"], "foo.bar.baz")).toBe 22 describe 'when there are global defaults', -> - beforeEach -> - atom.config.setDefaults("foo", hasDefault: 'ok') - it 'falls back to the global when there is no scoped property specified', -> + atom.config.setDefaults("foo", hasDefault: 'ok') expect(atom.config.get([".source.coffee", ".string.quoted.single"], "foo.hasDefault")).toBe 'ok' describe ".set(scope, keyPath, value)", -> diff --git a/src/config.coffee b/src/config.coffee index 80501e768..cdf2aede5 100644 --- a/src/config.coffee +++ b/src/config.coffee @@ -357,7 +357,7 @@ class Config message = "`callNow` was set to false. Use ::onDidChange instead. Note that ::onDidChange calls back with different arguments." if options.callNow == false deprecate "Config::observe no longer supports options; see https://atom.io/docs/api/latest/Config. #{message}" else - console.warn 'An unsupported form of Config::observe is being used. See https://atom.io/docs/api/latest/Config for details' + console.error 'An unsupported form of Config::observe is being used. See https://atom.io/docs/api/latest/Config for details' return if scopeDescriptor? diff --git a/src/language-mode.coffee b/src/language-mode.coffee index 32112309e..34d7f3032 100644 --- a/src/language-mode.coffee +++ b/src/language-mode.coffee @@ -30,7 +30,7 @@ class LanguageMode # Returns an {Array} of the commented {Ranges}. toggleLineCommentsForBufferRows: (start, end) -> scopes = @editor.scopesForBufferPosition([start, 0]) - properties = atom.config.settingsForScopeDescriptor(scopes, "editor.commentStart")[0] + properties = atom.config.settingsForScopeDescriptor(scopes, 'editor.commentStart')[0] return unless properties commentStartString = _.valueForKeyPath(properties, 'editor.commentStart')