github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-24 06:18:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Try to avoid exceptions due to undefined lines in TokenizedBuffer

Browse Source
This commit is contained in:
Nathan Sobo
2015-07-09 00:12:47 -05:00
parent 1dd1770b1a
commit a352a2ca61
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tokenized-buffer.coffee
View File

@@ -369,17 +369,20 @@ class TokenizedBuffer extends Model
tokenizedLineForRow: (bufferRow) ->
if 0 <= bufferRow < @tokenizedLines.length
@tokenizedLines[bufferRow] ?= @buildPlaceholderTokenizedLineForRow(bufferRow)
else
atom.assert false, "Requested tokenized line with out of range buffer row", (error) =>
error.metadata = {bufferRow, maxBufferRow: @tokenizedLines.length}
tokenizedLinesForRows: (startRow, endRow) ->
for row in [startRow..endRow] by 1
@tokenizedLineForRow(row)
stackForRow: (bufferRow) ->
@tokenizedLines[bufferRow]?.ruleStack
@tokenizedLineForRow(bufferRow)?.ruleStack
openScopesForRow: (bufferRow) ->
if bufferRow > 0
precedingLine = @tokenizedLines[bufferRow - 1]
precedingLine = @tokenizedLineForRow(bufferRow - 1)
@scopesFromTags(precedingLine.openScopes, precedingLine.tags)
else
[]
@@ -448,7 +451,7 @@ class TokenizedBuffer extends Model
scopeDescriptorForPosition: (position) ->
{row, column} = @buffer.clipPosition(Point.fromObject(position))
iterator = @tokenizedLines[row].getTokenIterator()
iterator = @tokenizedLineForRow(row).getTokenIterator()
while iterator.next()
if iterator.getBufferEnd() > column
scopes = iterator.getScopes()