Avoid updating screen lines in DisplayBuffer

This commit is contained in:
Nathan Sobo
2016-01-19 14:51:24 -07:00
parent ed79413de1
commit 21b1f79fab
2 changed files with 7 additions and 10 deletions

View File

@@ -118,6 +118,7 @@ class DisplayBuffer extends Model
})
updateAllScreenLines: ->
return # TODO: After DisplayLayer is finished, delete these code paths
@maxLineLength = 0
@screenLines = []
@rowMap = new RowMap
@@ -376,11 +377,8 @@ class DisplayBuffer extends Model
#
# Returns an {Array} of buffer rows as {Numbers}s.
bufferRowsForScreenRows: (startScreenRow, endScreenRow) ->
if @largeFileMode
[startScreenRow..endScreenRow]
else
for screenRow in [startScreenRow..endScreenRow]
@rowMap.bufferRowRangeForScreenRow(screenRow)[0]
for screenRow in [startScreenRow..endScreenRow]
@bufferRowForScreenRow(screenRow)
# Creates a new fold between two row numbers.
#
@@ -441,10 +439,7 @@ class DisplayBuffer extends Model
#
# Returns a {Number}.
bufferRowForScreenRow: (screenRow) ->
if @largeFileMode
screenRow
else
@rowMap.bufferRowRangeForScreenRow(screenRow)[0]
@displayLayer.translateScreenPosition(Point(screenRow, 0)).row
# Given a buffer range, this converts it into a screen position.
#
@@ -870,6 +865,8 @@ class DisplayBuffer extends Model
@updateScreenLines(start, end + 1, delta, refreshMarkers: false)
updateScreenLines: (startBufferRow, endBufferRow, bufferDelta=0, options={}) ->
return # TODO: After DisplayLayer is finished, delete these code paths
return if @largeFileMode
return if @isDestroyed()

View File

@@ -171,7 +171,7 @@ class TextEditor extends Model
@disposables.add @selectionsMarkerLayer.onDidCreateMarker @addSelection.bind(this)
@disposables.add @displayBuffer.onDidChangeGrammar @handleGrammarChange.bind(this)
@disposables.add @displayBuffer.onDidTokenize @handleTokenization.bind(this)
@disposables.add @displayBuffer.onDidChange (e) =>
@disposables.add @displayLayer.onDidChangeSync (e) =>
@mergeIntersectingSelections()
@emitter.emit 'did-change', e