Avoid using legacy patch hunk fields

Signed-off-by: Nathan Sobo <nathan@github.com>
atom · Mar 6, 2017 · 8a40a6f · 8a40a6f
1 parent 2217578
commit 8a40a6f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/helpers.coffee b/src/helpers.coffee
@@ -1,4 +1,5 @@
 Point = require './point'
+{traversal} = require './point-helpers'
 
 MULTI_LINE_REGEX_REGEX = /\\s|\\r|\\n|\r|\n|^\[\^|[^\\]\[\^/
 
@@ -28,8 +29,8 @@ module.exports =
   normalizePatchChanges: (changes) ->
     changes.map (change) -> {
       start: Point.fromObject(change.newStart)
-      oldExtent: Point.fromObject(change.oldExtent)
-      newExtent: Point.fromObject(change.newExtent)
+      oldExtent: traversal(change.oldEnd, change.oldStart)
+      newExtent: traversal(change.newEnd, change.newStart)
       newText: change.newText
     }
 

diff --git a/src/text-buffer.coffee b/src/text-buffer.coffee
@@ -13,6 +13,7 @@ MarkerLayer = require './marker-layer'
 MatchIterator = require './match-iterator'
 DisplayLayer = require './display-layer'
 {spliceArray, newlineRegex, normalizePatchChanges, regexIsSingleLine} = require './helpers'
+{traversal} = require './point-helpers'
 
 class TransactionAbortedError extends Error
   constructor: -> super
@@ -622,7 +623,14 @@ class TextBuffer
 
     oldRange = @clipRange(range)
     oldText = @getTextInRange(oldRange)
-    change = {newStart: oldRange.start, oldExtent: oldRange.getExtent(), oldText, newText, normalizeLineEndings}
+    change = {
+      oldStart: oldRange.start,
+      newStart: oldRange.start,
+      oldEnd: oldRange.end,
+      oldText,
+      newText,
+      normalizeLineEndings
+    }
     @applyChange(change, undo isnt 'skip')
 
   # Public: Insert text at the given position.
@@ -651,9 +659,10 @@ class TextBuffer
 
   # Applies a change to the buffer based on its old range and new text.
   applyChange: (change, pushToHistory = false) ->
-    {newStart, oldExtent, oldText, newText, normalizeLineEndings} = change
+    {newStart, oldStart, oldEnd, oldText, newText, normalizeLineEndings} = change
     @cachedText = null
 
+    oldExtent = traversal(oldEnd, oldStart)
     start = Point.fromObject(newStart)
     oldRange = Range(start, start.traverse(oldExtent))
     oldRange.freeze()
@@ -693,6 +702,7 @@ class TextBuffer
     newRange.freeze()
 
     if pushToHistory
+      change.oldExtent ?= oldExtent
       change.newExtent ?= newExtent
       @history?.pushChange(change)