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

Avoid tokens shim in suggestedIndent code

Browse Source
This commit is contained in:
Nathan Sobo
2015-05-14 17:39:23 +02:00
parent 64c0ef8bd8
commit 64f576624e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/language-mode.coffee
View File

@@ -2,6 +2,7 @@
_ = require 'underscore-plus'
{OnigRegExp} = require 'oniguruma'
ScopeDescriptor = require './scope-descriptor'
TokenIterator = require './token-iterator'
module.exports =
class LanguageMode
@@ -242,8 +243,9 @@ class LanguageMode
@suggestedIndentForTokenizedLineAtBufferRow(bufferRow, tokenizedLine, options)
suggestedIndentForTokenizedLineAtBufferRow: (bufferRow, tokenizedLine, options) ->
scopes = tokenizedLine.tokens[0].scopes
scopeDescriptor = new ScopeDescriptor({scopes})
iterator = TokenIterator.instance.reset(tokenizedLine)
iterator.next()
scopeDescriptor = new ScopeDescriptor(scopes: iterator.getScopes())
currentIndentLevel = @editor.indentationForBufferRow(bufferRow)
return currentIndentLevel unless increaseIndentRegex = @increaseIndentRegexForScopeDescriptor(scopeDescriptor)