From 32c950dee8417073bdc997fc8bbd33a65eab415a Mon Sep 17 00:00:00 2001 From: probablycorey Date: Mon, 1 Apr 2013 09:39:56 -0700 Subject: [PATCH] Rename strip-trailing-whitespace package to whitespace Because it does more than strip trailing whitespace --- src/packages/strip-trailing-whitespace/package.cson | 1 - .../lib/whitespace.coffee} | 6 +++--- src/packages/whitespace/package.cson | 1 + .../spec/whitespace-spec.coffee} | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 src/packages/strip-trailing-whitespace/package.cson rename src/packages/{strip-trailing-whitespace/lib/strip-trailing-whitespace.coffee => whitespace/lib/whitespace.coffee} (66%) create mode 100644 src/packages/whitespace/package.cson rename src/packages/{strip-trailing-whitespace/spec/strip-trailing-whitespace-spec.coffee => whitespace/spec/whitespace-spec.coffee} (82%) diff --git a/src/packages/strip-trailing-whitespace/package.cson b/src/packages/strip-trailing-whitespace/package.cson deleted file mode 100644 index 0daeeb412..000000000 --- a/src/packages/strip-trailing-whitespace/package.cson +++ /dev/null @@ -1 +0,0 @@ -'main': './lib/strip-trailing-whitespace' diff --git a/src/packages/strip-trailing-whitespace/lib/strip-trailing-whitespace.coffee b/src/packages/whitespace/lib/whitespace.coffee similarity index 66% rename from src/packages/strip-trailing-whitespace/lib/strip-trailing-whitespace.coffee rename to src/packages/whitespace/lib/whitespace.coffee index 1f93f4a68..13cf429a1 100644 --- a/src/packages/strip-trailing-whitespace/lib/strip-trailing-whitespace.coffee +++ b/src/packages/whitespace/lib/whitespace.coffee @@ -1,13 +1,13 @@ module.exports = activate: -> - rootView.eachBuffer (buffer) => @stripTrailingWhitespaceBeforeSave(buffer) + rootView.eachBuffer (buffer) => @whitespaceBeforeSave(buffer) - stripTrailingWhitespaceBeforeSave: (buffer) -> + whitespaceBeforeSave: (buffer) -> buffer.on 'will-be-saved', -> buffer.transact -> buffer.scan /[ \t]+$/g, (match, range, { replace }) -> replace('') - if config.get('stripTrailingWhitespace.singleTrailingNewline') + if config.get('whitespace.singleTrailingNewline') if buffer.getLastLine() is '' row = buffer.getLastRow() - 1 while row and buffer.lineForRow(row) is '' diff --git a/src/packages/whitespace/package.cson b/src/packages/whitespace/package.cson new file mode 100644 index 000000000..fb9bfc916 --- /dev/null +++ b/src/packages/whitespace/package.cson @@ -0,0 +1 @@ +'main': './lib/whitespace' diff --git a/src/packages/strip-trailing-whitespace/spec/strip-trailing-whitespace-spec.coffee b/src/packages/whitespace/spec/whitespace-spec.coffee similarity index 82% rename from src/packages/strip-trailing-whitespace/spec/strip-trailing-whitespace-spec.coffee rename to src/packages/whitespace/spec/whitespace-spec.coffee index e41d2d3ab..e8ca73684 100644 --- a/src/packages/strip-trailing-whitespace/spec/strip-trailing-whitespace-spec.coffee +++ b/src/packages/whitespace/spec/whitespace-spec.coffee @@ -1,7 +1,7 @@ RootView = require 'root-view' fs = require 'fs-utils' -describe "StripTrailingWhitespace", -> +describe "Whitespace", -> [editor, path] = [] beforeEach -> @@ -10,7 +10,7 @@ describe "StripTrailingWhitespace", -> window.rootView = new RootView rootView.open(path) - atom.activatePackage('strip-trailing-whitespace') + atom.activatePackage('whitespace') rootView.focus() editor = rootView.getActiveView() @@ -34,15 +34,15 @@ describe "StripTrailingWhitespace", -> editor.getBuffer().save() expect(editor.getText()).toBe 'Some text.\n' - describe "stripTrailingWhitespace.singleTrailingNewline config", -> + describe "whitespace.singleTrailingNewline config", -> [originalConfigValue] = [] beforeEach -> - originalConfigValue = config.get("stripTrailingWhitespace.singleTrailingNewline") - config.set("stripTrailingWhitespace.singleTrailingNewline", true) + originalConfigValue = config.get("whitespace.singleTrailingNewline") + config.set("whitespace.singleTrailingNewline", true) config.update() afterEach -> - config.set("stripTrailingWhitespace.singleTrailingNewline", originalConfigValue) + config.set("whitespace.singleTrailingNewline", originalConfigValue) config.update() it "adds a trailing newline when there is no trailing newline", ->