From ecb159738f5dd0de857d668bfd646e062bf63b3c Mon Sep 17 00:00:00 2001
From: probablycorey <cj@github.com>
Date: Mon, 1 Apr 2013 09:51:10 -0700
Subject: [PATCH] Rename `singleTrailingNewline` to
 `ensureSingleTrailingNewline`

---
 docs/getting-started.md                             |  4 ++--
 spec/stdlib/cson-spec.coffee                        |  4 ++--
 src/packages/whitespace/lib/whitespace.coffee       |  4 ++--
 src/packages/whitespace/spec/whitespace-spec.coffee | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/getting-started.md b/docs/getting-started.md
index b5abb2d63..d869e9506 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -173,8 +173,8 @@ its own namespace.
   - showInvisibles: Whether to render placeholders for invisible characters (defaults to false)
 - fuzzyFinder
   - ignoredNames: Files to ignore *only* in the fuzzy-finder
-- stripTrailingWhitespace
-  - singleTrailingNewline: Whether to reduce multiple newlines to one at the end of files
+- whitespace
+  - ensureSingleTrailingNewline: Whether to reduce multiple newlines to one at the end of files
 - wrapGuide
   - columns: Array of hashes with a `pattern` and `column` key to match the
              the path of the current editor to a column position.
diff --git a/spec/stdlib/cson-spec.coffee b/spec/stdlib/cson-spec.coffee
index 0171cebfb..bee9e2032 100644
--- a/spec/stdlib/cson-spec.coffee
+++ b/spec/stdlib/cson-spec.coffee
@@ -81,8 +81,8 @@ describe "CSON", ->
         fontSize: 20
         core:
           themes: ['a', 'b']
-        stripTrailingWhitespace:
-          singleTrailingNewline: true
+        whitespace:
+          ensureSingleTrailingNewline: true
 
       cson = CSON.stringify(object)
       CoffeeScript = require 'coffee-script'
diff --git a/src/packages/whitespace/lib/whitespace.coffee b/src/packages/whitespace/lib/whitespace.coffee
index 8bbe4d22b..087bfabd3 100644
--- a/src/packages/whitespace/lib/whitespace.coffee
+++ b/src/packages/whitespace/lib/whitespace.coffee
@@ -3,14 +3,14 @@ module.exports =
     rootView.eachBuffer (buffer) => @whitespaceBeforeSave(buffer)
 
   configDefaults:
-    singleTrailingNewline: true
+    ensureSingleTrailingNewline: true
 
   whitespaceBeforeSave: (buffer) ->
     buffer.on 'will-be-saved', ->
       buffer.transact ->
         buffer.scan /[ \t]+$/g, (match, range, { replace }) -> replace('')
 
-        if config.get('whitespace.singleTrailingNewline')
+        if config.get('whitespace.ensureSingleTrailingNewline')
           if buffer.getLastLine() is ''
             row = buffer.getLastRow() - 1
             while row and buffer.lineForRow(row) is ''
diff --git a/src/packages/whitespace/spec/whitespace-spec.coffee b/src/packages/whitespace/spec/whitespace-spec.coffee
index 2965de7a2..854cf3295 100644
--- a/src/packages/whitespace/spec/whitespace-spec.coffee
+++ b/src/packages/whitespace/spec/whitespace-spec.coffee
@@ -37,14 +37,14 @@ describe "Whitespace", ->
     editor.getBuffer().save()
     expect(editor.getText()).toBe 'Some text.\n'
 
-  describe "whitespace.singleTrailingNewline config", ->
+  describe "whitespace.ensureSingleTrailingNewline config", ->
     [originalConfigValue] = []
     beforeEach ->
-      originalConfigValue = config.get("whitespace.singleTrailingNewline")
+      originalConfigValue = config.get("whitespace.ensureSingleTrailingNewline")
       expect(originalConfigValue).toBe true
 
     afterEach ->
-      config.set("whitespace.singleTrailingNewline", originalConfigValue)
+      config.set("whitespace.ensureSingleTrailingNewline", originalConfigValue)
       config.update()
 
     it "adds a trailing newline when there is no trailing newline", ->
@@ -72,8 +72,8 @@ describe "Whitespace", ->
       editor.getBuffer().save()
       expect(editor.getText()).toBe "\n"
 
-    it "does not add trailing newline if singleTrailingNewline is false", ->
-      config.set("whitespace.singleTrailingNewline", false)
+    it "does not add trailing newline if ensureSingleTrailingNewline is false", ->
+      config.set("whitespace.ensureSingleTrailingNewline", false)
       config.update()
 
       editor.insertText "no trailing newline"