Merge branch 'master' into mb-defer-work-when-opening-files

This commit is contained in:
Max Brunsfeld
2016-10-14 12:20:41 -07:00
26 changed files with 537 additions and 266 deletions

View File

@@ -2887,7 +2887,7 @@ class TextEditor extends Model
# whitespace.
usesSoftTabs: ->
for bufferRow in [0..@buffer.getLastRow()]
continue if @tokenizedBuffer.tokenizedLineForRow(bufferRow).isComment()
continue if @tokenizedBuffer.tokenizedLines[bufferRow]?.isComment()
line = @buffer.lineForRow(bufferRow)
return true if line[0] is ' '