From 76b6ca5043a83cffa5c4c44fb9cd3691b5fcffaa Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 3 Dec 2015 11:52:45 -0800
Subject: [PATCH] Make CRLF word-movement tests pass

---
 spec/text-editor-spec.coffee | 22 +++++++++-----------
 src/cursor.coffee            | 40 +++++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/spec/text-editor-spec.coffee b/spec/text-editor-spec.coffee
index dbc5289f7..23312ca2b 100644
--- a/spec/text-editor-spec.coffee
+++ b/spec/text-editor-spec.coffee
@@ -762,17 +762,16 @@ describe "TextEditor", ->
         editor.moveToBeginningOfWord()
         expect(editor.getCursorBufferPosition()).toEqual [10, 0]
 
-      it "works when the current line is blank", ->
-        editor.setCursorBufferPosition([10, 0])
-        editor.moveToBeginningOfWord()
-        expect(editor.getCursorBufferPosition()).toEqual [9, 2]
-
       it "treats lines with only whitespace as a word (CRLF line ending)", ->
         editor.buffer.setText(buffer.getText().replace(/\n/g, "\r\n"))
         editor.setCursorBufferPosition([11, 0])
         editor.moveToBeginningOfWord()
         expect(editor.getCursorBufferPosition()).toEqual [10, 0]
-        editor.buffer.setText(buffer.getText().replace(/\r\n/g, "\n"))
+
+      it "works when the current line is blank", ->
+        editor.setCursorBufferPosition([10, 0])
+        editor.moveToBeginningOfWord()
+        expect(editor.getCursorBufferPosition()).toEqual [9, 2]
 
       it "works when the current line is blank (CRLF line ending)", ->
         editor.buffer.setText(buffer.getText().replace(/\n/g, "\r\n"))
@@ -835,23 +834,22 @@ describe "TextEditor", ->
         editor.moveToEndOfWord()
         expect(editor.getCursorBufferPosition()).toEqual [10, 0]
 
-      it "works when the current line is blank", ->
-        editor.setCursorBufferPosition([10, 0])
-        editor.moveToEndOfWord()
-        expect(editor.getCursorBufferPosition()).toEqual [11, 8]
-
       it "treats lines with only whitespace as a word (CRLF line ending)", ->
         editor.buffer.setText(buffer.getText().replace(/\n/g, "\r\n"))
         editor.setCursorBufferPosition([9, 4])
         editor.moveToEndOfWord()
         expect(editor.getCursorBufferPosition()).toEqual [10, 0]
 
+      it "works when the current line is blank", ->
+        editor.setCursorBufferPosition([10, 0])
+        editor.moveToEndOfWord()
+        expect(editor.getCursorBufferPosition()).toEqual [11, 8]
+
       it "works when the current line is blank (CRLF line ending)", ->
         editor.buffer.setText(buffer.getText().replace(/\n/g, "\r\n"))
         editor.setCursorBufferPosition([10, 0])
         editor.moveToEndOfWord()
         expect(editor.getCursorBufferPosition()).toEqual [11, 8]
-        editor.buffer.setText(buffer.getText().replace(/\r\n/g, "\n"))
 
     describe ".moveToBeginningOfNextWord()", ->
       it "moves the cursor before the first character of the next word", ->
diff --git a/src/cursor.coffee b/src/cursor.coffee
index 9368a5a9c..c63485fd2 100644
--- a/src/cursor.coffee
+++ b/src/cursor.coffee
@@ -467,10 +467,13 @@ class Cursor extends Model
     scanRange = [[previousNonBlankRow, 0], currentBufferPosition]
 
     beginningOfWordPosition = null
-    @editor.backwardsScanInBufferRange (options.wordRegex ? @wordRegExp(options)), scanRange, ({range, stop}) ->
-      if range.end.isGreaterThanOrEqual(currentBufferPosition) or allowPrevious
-        beginningOfWordPosition = range.start
-      if not beginningOfWordPosition?.isEqual(currentBufferPosition)
+    @editor.backwardsScanInBufferRange (options.wordRegex ? @wordRegExp(options)), scanRange, ({range, matchText, stop}) ->
+      # Ignore 'empty line' matches between '\r' and '\n'
+      return if matchText is '' and range.start.column isnt 0
+
+      if range.start.isLessThan(currentBufferPosition)
+        if range.end.isGreaterThanOrEqual(currentBufferPosition) or allowPrevious
+          beginningOfWordPosition = range.start
         stop()
 
     if beginningOfWordPosition?
@@ -496,13 +499,12 @@ class Cursor extends Model
     scanRange = [currentBufferPosition, @editor.getEofBufferPosition()]
 
     endOfWordPosition = null
-    @editor.scanInBufferRange (options.wordRegex ? @wordRegExp(options)), scanRange, ({range, stop}) ->
-      if allowNext
-        if range.end.isGreaterThan(currentBufferPosition)
-          endOfWordPosition = range.end
-          stop()
-      else
-        if range.start.isLessThanOrEqual(currentBufferPosition)
+    @editor.scanInBufferRange (options.wordRegex ? @wordRegExp(options)), scanRange, ({range, matchText, stop}) ->
+      # Ignore 'empty line' matches between '\r' and '\n'
+      return if matchText is '' and range.start.column isnt 0
+
+      if range.end.isGreaterThan(currentBufferPosition)
+        if allowNext or range.start.isLessThanOrEqual(currentBufferPosition)
           endOfWordPosition = range.end
         stop()
 
@@ -603,14 +605,14 @@ class Cursor extends Model
   #     non-word characters in the regex. (default: true)
   #
   # Returns a {RegExp}.
-  wordRegExp: ({includeNonWordCharacters}={}) ->
-    includeNonWordCharacters ?= true
-    nonWordCharacters = @config.get('editor.nonWordCharacters', scope: @getScopeDescriptor())
-    segments = ["\\r?\\n[\\t\\s]*\\r?\\n"]
-    segments.push("[^\\s#{_.escapeRegExp(nonWordCharacters)}]+")
-    if includeNonWordCharacters
-      segments.push("[#{_.escapeRegExp(nonWordCharacters)}]+")
-    new RegExp(segments.join("|"), "g")
+  wordRegExp: (options) ->
+    scope = @getScopeDescriptor()
+    nonWordCharacters = _.escapeRegExp(@config.get('editor.nonWordCharacters', {scope}))
+
+    source = "^[\t ]*$|[^\\s#{nonWordCharacters}]+"
+    if options?.includeNonWordCharacters ? true
+      source += "|" + "[#{nonWordCharacters}]+"
+    new RegExp(source, "g")
 
   # Public: Get the RegExp used by the cursor to determine what a "subword" is.
   #