github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-06 03:02:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove null guard in scopeDescriptorForPosition

Browse Source
This commit is contained in:
Antonio Scandurra
2016-10-12 12:18:58 +02:00
parent ea80483cbe
commit 633e68f4d5
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/tokenized-buffer.coffee
View File

@@ -357,18 +357,16 @@ class TokenizedBuffer extends Model
scopeDescriptorForPosition: (position) ->
{row, column} = @buffer.clipPosition(Point.fromObject(position))
if iterator = @tokenizedLineForRow(row)?.getTokenIterator()
while iterator.next()
if iterator.getBufferEnd() > column
scopes = iterator.getScopes()
break
# rebuild scope of last token if we iterated off the end
unless scopes?
iterator = @tokenizedLineForRow(row).getTokenIterator()
while iterator.next()
if iterator.getBufferEnd() > column
scopes = iterator.getScopes()
scopes.push(iterator.getScopeEnds().reverse()...)
else
scopes = []
break
# rebuild scope of last token if we iterated off the end
unless scopes?
scopes = iterator.getScopes()
scopes.push(iterator.getScopeEnds().reverse()...)
new ScopeDescriptor({scopes})