From 4f6687324e394e7f3f067206ad9ce338c842c551 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Tue, 26 Apr 2016 12:09:38 +0200
Subject: [PATCH] Include bufferRange in `decorationsStateForScreenRowRange`

---
 spec/text-editor-spec.coffee  | 11 +++++++++++
 src/decoration-manager.coffee |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/spec/text-editor-spec.coffee b/spec/text-editor-spec.coffee
index 466d1b501..565f92430 100644
--- a/spec/text-editor-spec.coffee
+++ b/spec/text-editor-spec.coffee
@@ -5888,6 +5888,7 @@ describe "TextEditor", ->
         expect(editor.decorationsStateForScreenRowRange(0, 5)[decoration.id]).toEqual {
           properties: {type: 'highlight', class: 'foo'}
           screenRange: marker.getScreenRange(),
+          bufferRange: marker.getBufferRange(),
           rangeIsReversed: false
         }
 
@@ -5908,26 +5909,31 @@ describe "TextEditor", ->
         expect(decorationState["#{layer1Decoration1.id}-#{marker1.id}"]).toEqual {
           properties: {type: 'highlight', class: 'foo'},
           screenRange: marker1.getRange(),
+          bufferRange: marker1.getRange(),
           rangeIsReversed: false
         }
         expect(decorationState["#{layer1Decoration1.id}-#{marker2.id}"]).toEqual {
           properties: {type: 'highlight', class: 'foo'},
           screenRange: marker2.getRange(),
+          bufferRange: marker2.getRange(),
           rangeIsReversed: false
         }
         expect(decorationState["#{layer1Decoration2.id}-#{marker1.id}"]).toEqual {
           properties: {type: 'highlight', class: 'bar'},
           screenRange: marker1.getRange(),
+          bufferRange: marker1.getRange(),
           rangeIsReversed: false
         }
         expect(decorationState["#{layer1Decoration2.id}-#{marker2.id}"]).toEqual {
           properties: {type: 'highlight', class: 'bar'},
           screenRange: marker2.getRange(),
+          bufferRange: marker2.getRange(),
           rangeIsReversed: false
         }
         expect(decorationState["#{layer2Decoration.id}-#{marker3.id}"]).toEqual {
           properties: {type: 'highlight', class: 'baz'},
           screenRange: marker3.getRange(),
+          bufferRange: marker3.getRange(),
           rangeIsReversed: false
         }
 
@@ -5939,16 +5945,19 @@ describe "TextEditor", ->
         expect(decorationState["#{layer1Decoration2.id}-#{marker1.id}"]).toEqual {
           properties: {type: 'highlight', class: 'bar'},
           screenRange: marker1.getRange(),
+          bufferRange: marker1.getRange(),
           rangeIsReversed: false
         }
         expect(decorationState["#{layer1Decoration2.id}-#{marker2.id}"]).toEqual {
           properties: {type: 'highlight', class: 'bar'},
           screenRange: marker2.getRange(),
+          bufferRange: marker2.getRange(),
           rangeIsReversed: false
         }
         expect(decorationState["#{layer2Decoration.id}-#{marker3.id}"]).toEqual {
           properties: {type: 'highlight', class: 'baz'},
           screenRange: marker3.getRange(),
+          bufferRange: marker3.getRange(),
           rangeIsReversed: false
         }
 
@@ -5957,6 +5966,7 @@ describe "TextEditor", ->
         expect(decorationState["#{layer1Decoration2.id}-#{marker1.id}"]).toEqual {
           properties: {type: 'highlight', class: 'quux'},
           screenRange: marker1.getRange(),
+          bufferRange: marker1.getRange(),
           rangeIsReversed: false
         }
 
@@ -5965,6 +5975,7 @@ describe "TextEditor", ->
         expect(decorationState["#{layer1Decoration2.id}-#{marker1.id}"]).toEqual {
           properties: {type: 'highlight', class: 'bar'},
           screenRange: marker1.getRange(),
+          bufferRange: marker1.getRange(),
           rangeIsReversed: false
         }
 
diff --git a/src/decoration-manager.coffee b/src/decoration-manager.coffee
index e96727fe3..edb9dfb33 100644
--- a/src/decoration-manager.coffee
+++ b/src/decoration-manager.coffee
@@ -84,20 +84,21 @@ class DecorationManager extends Model
 
       for marker in layer.findMarkers(intersectsScreenRowRange: [startScreenRow, endScreenRow]) when marker.isValid()
         screenRange = marker.getScreenRange()
+        bufferRange = marker.getBufferRange()
         rangeIsReversed = marker.isReversed()
 
         if decorations = @decorationsByMarkerId[marker.id]
           for decoration in decorations
             decorationsState[decoration.id] = {
               properties: decoration.properties
-              screenRange, rangeIsReversed
+              screenRange, bufferRange, rangeIsReversed
             }
 
         if layerDecorations = @layerDecorationsByMarkerLayerId[layerId]
           for layerDecoration in layerDecorations
             decorationsState["#{layerDecoration.id}-#{marker.id}"] = {
               properties: layerDecoration.overridePropertiesByMarkerId[marker.id] ? layerDecoration.properties
-              screenRange, rangeIsReversed
+              screenRange, bufferRange, rangeIsReversed
             }
 
     decorationsState