From 7f5428e2a460641700bcff992e62026fe939dd5f Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Wed, 1 Oct 2014 12:18:38 -0700 Subject: [PATCH 1/4] Update config schema to use some new features. --- src/config-schema.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config-schema.coffee b/src/config-schema.coffee index d841907cc..4f7779dda 100644 --- a/src/config-schema.coffee +++ b/src/config-schema.coffee @@ -73,7 +73,7 @@ module.exports = tabLength: type: 'integer' default: 2 - minimum: 1 + enum: [1, 2, 4, 6, 8] softWrap: type: 'boolean' default: false @@ -94,6 +94,7 @@ module.exports = useHardwareAcceleration: type: 'boolean' default: true + description: 'Disabling will improve editor font rendering but reduce scrolling performance.' confirmCheckoutHeadRevision: type: 'boolean' default: true From 72f40ae6479f14a3a89e25b59518c69e235a9c78 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Wed, 1 Oct 2014 14:25:07 -0700 Subject: [PATCH 2/4] Fix :memo: --- src/config.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config.coffee b/src/config.coffee index 56d3efa9d..19acf887e 100644 --- a/src/config.coffee +++ b/src/config.coffee @@ -12,10 +12,10 @@ pathWatcher = require 'pathwatcher' # # An instance of this class is always available as the `atom.config` global. # -# ## Getting and setting config settings. Note that with no value set, {::get} -# returns the setting's default value. +# ## Getting and setting config settings. # # ```coffee +# # Note that with no value set, ::get returns the setting's default value. # atom.config.get('my-package.myKey') # -> 'defaultValue' # # atom.config.set('my-package.myKey', 'value') From 28ee1f35989041019c1b317a9c611f1da0757d63 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Wed, 1 Oct 2014 14:53:31 -0700 Subject: [PATCH 3/4] Fix spec --- spec/text-editor-spec.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/text-editor-spec.coffee b/spec/text-editor-spec.coffee index fa24d8266..1f1f8dcbd 100644 --- a/spec/text-editor-spec.coffee +++ b/spec/text-editor-spec.coffee @@ -113,7 +113,7 @@ describe "TextEditor", -> expect(editor1.isSoftWrapped()).toBe true expect(editor1.getSoftTabs()).toBe false - atom.config.set('editor.tabLength', 100) + atom.config.set('editor.tabLength', 8) atom.config.set('editor.softWrap', false) atom.config.set('editor.softTabs', true) @@ -121,7 +121,7 @@ describe "TextEditor", -> atom.workspace.open('b').then (o) -> editor2 = o runs -> - expect(editor2.getTabLength()).toBe 100 + expect(editor2.getTabLength()).toBe 8 expect(editor2.isSoftWrapped()).toBe false expect(editor2.getSoftTabs()).toBe true From e44f4fbc841c3ffd162d04ca4a39b1d9a0811867 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 1 Oct 2014 17:04:34 -0600 Subject: [PATCH 4/4] Fix renaming error throwing exception in checkout-head-revision command --- src/text-editor-component.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/text-editor-component.coffee b/src/text-editor-component.coffee index 5b2dd61d4..249a15d67 100644 --- a/src/text-editor-component.coffee +++ b/src/text-editor-component.coffee @@ -500,7 +500,7 @@ TextEditorComponent = React.createClass 'editor:fold-at-indent-level-9': -> editor.foldAllAtIndentLevel(8) 'editor:toggle-line-comments': -> editor.toggleLineCommentsInSelection() 'editor:log-cursor-scope': -> editor.logCursorScope() - 'editor:checkout-head-revision': -> atom.project.getRepositories()[0]()?.checkoutHeadForEditor(editor) + 'editor:checkout-head-revision': -> atom.project.getRepositories()[0]?.checkoutHeadForEditor(editor) 'editor:copy-path': -> editor.copyPathToClipboard() 'editor:move-line-up': -> editor.moveLineUp() 'editor:move-line-down': -> editor.moveLineDown()