Merge pull request #125 from atom/wl-save-commands

Add commands to save with/without whitespace

Author: iolsen

lib/whitespace.coffee

@@ -11,6 +11,15 @@ class Whitespace
       'whitespace:remove-trailing-whitespace': =>
         if editor = atom.workspace.getActiveTextEditor()
           @removeTrailingWhitespace(editor, editor.getGrammar().scopeName)
+      'whitespace:save-with-trailing-whitespace': =>
+        if editor = atom.workspace.getActiveTextEditor()
+          @ignore = true
+          editor.save()
+          @ignore = false
+      'whitespace:save-without-trailing-whitespace': =>
+        if editor = atom.workspace.getActiveTextEditor()
+          @removeTrailingWhitespace(editor, editor.getGrammar().scopeName)
+          editor.save()
       'whitespace:convert-tabs-to-spaces': =>
         if editor = atom.workspace.getActiveTextEditor()
           @convertTabsToSpaces(editor)
@@ -29,7 +38,7 @@ class Whitespace
     bufferSavedSubscription = buffer.onWillSave =>
       buffer.transact =>
         scopeDescriptor = editor.getRootScopeDescriptor()
-        if atom.config.get('whitespace.removeTrailingWhitespace', scope: scopeDescriptor)
+        if atom.config.get('whitespace.removeTrailingWhitespace', scope: scopeDescriptor) and not @ignore
           @removeTrailingWhitespace(editor, editor.getGrammar().scopeName)
         if atom.config.get('whitespace.ensureSingleTrailingNewline', scope: scopeDescriptor)
           @ensureSingleTrailingNewline(editor)

menus/whitespace.cson

@@ -5,6 +5,8 @@
       'label': 'Whitespace'
       'submenu': [
         { 'label': 'Remove Trailing Whitespace', 'command': 'whitespace:remove-trailing-whitespace' }
+        { 'label': 'Save With Trailing Whitespace', 'command': 'whitespace:save-with-trailing-whitespace' }
+        { 'label': 'Save Without Trailing Whitespace', 'command': 'whitespace:save-without-trailing-whitespace' }
         { 'label': 'Convert Tabs To Spaces', 'command': 'whitespace:convert-tabs-to-spaces' }
         { 'label': 'Convert Spaces To Tabs', 'command': 'whitespace:convert-spaces-to-tabs' }
         { 'label': 'Convert All Tabs To Spaces', 'command': 'whitespace:convert-all-tabs-to-spaces' }

spec/whitespace-spec.coffee

@@ -345,6 +345,28 @@ describe "Whitespace", ->
       atom.packages.deactivatePackage 'whitespace'
       expect(buffer.getText()).toBe "foo   \nbar\t   \n\nbaz"
 
+  describe "when the 'whitespace:save-with-trailing-whitespace' command is run", ->
+    beforeEach ->
+      atom.config.set("whitespace.removeTrailingWhitespace", true)
+      atom.config.set("whitespace.ensureSingleTrailingNewline", false)
+      buffer.setText("foo   \nbar\t   \n\nbaz")
+
+    it "saves the file without removing any trailing whitespace", ->
+      atom.commands.dispatch(workspaceElement, 'whitespace:save-with-trailing-whitespace')
+      expect(buffer.getText()).toBe "foo   \nbar\t   \n\nbaz"
+      expect(buffer.isModified()).toBe false
+
+  describe "when the 'whitespace:save-without-trailing-whitespace' command is run", ->
+    beforeEach ->
+      atom.config.set("whitespace.removeTrailingWhitespace", false)
+      atom.config.set("whitespace.ensureSingleTrailingNewline", false)
+      buffer.setText("foo   \nbar\t   \n\nbaz")
+
+    it "saves the file and removes any trailing whitespace", ->
+      atom.commands.dispatch(workspaceElement, 'whitespace:save-without-trailing-whitespace')
+      expect(buffer.getText()).toBe "foo\nbar\n\nbaz"
+      expect(buffer.isModified()).toBe false
+
   describe "when the 'whitespace:convert-tabs-to-spaces' command is run", ->
     it "removes leading \\t characters and replaces them with spaces using the configured tab length", ->
       editor.setTabLength(2)