From 66697036770043d67d834829ecac71f9fa1cfe36 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Mon, 4 Jan 2016 16:40:56 -0700
Subject: [PATCH] =?UTF-8?q?Force=20a=20sync=20render=20when=20measuring=20?=
 =?UTF-8?q?if=20we=20don=E2=80=99t=20have=20a=20DOM=20node=20for=20a=20row?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spec/text-editor-component-spec.js | 7 +++++++
 src/text-editor-component.coffee   | 2 ++
 src/text-editor-presenter.coffee   | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/spec/text-editor-component-spec.js b/spec/text-editor-component-spec.js
index d5e9f5425..0546926e3 100644
--- a/spec/text-editor-component-spec.js
+++ b/spec/text-editor-component-spec.js
@@ -4567,6 +4567,13 @@ describe('TextEditorComponent', function () {
     })
   })
 
+  describe('::pixelPositionForScreenPosition()', () => {
+    it('returns the correct horizontal position, even if it is on a row that has not yet been rendered (regression)', () => {
+      editor.setTextInBufferRange([[5, 0], [6, 0]], 'hello world\n')
+      expect(wrapperNode.pixelPositionForScreenPosition([5, Infinity]).left).toBeGreaterThan(0)
+    })
+  })
+
   describe('middle mouse paste on Linux', function () {
     let originalPlatform
 
diff --git a/src/text-editor-component.coffee b/src/text-editor-component.coffee
index 03644241b..d97d82d04 100644
--- a/src/text-editor-component.coffee
+++ b/src/text-editor-component.coffee
@@ -440,6 +440,8 @@ class TextEditorComponent
 
     unless @presenter.isRowVisible(screenPosition.row)
       @presenter.setScreenRowsToMeasure([screenPosition.row])
+
+    unless @linesComponent.lineNodeForLineIdAndScreenRow(@presenter.lineIdForScreenRow(screenPosition.row), screenPosition.row)?
       @updateSyncPreMeasurement()
 
     pixelPosition = @linesYardstick.pixelPositionForScreenPosition(screenPosition)
diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee
index 6841cf70e..40ea95514 100644
--- a/src/text-editor-presenter.coffee
+++ b/src/text-editor-presenter.coffee
@@ -1377,3 +1377,6 @@ class TextEditorPresenter
 
   isRowVisible: (row) ->
     @startRow <= row < @endRow
+
+  lineIdForScreenRow: (screenRow) ->
+    @model.tokenizedLineForScreenRow(screenRow)?.id