From 64f576624ec22b41d9209efdaa929a7734e52270 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Thu, 14 May 2015 17:39:23 +0200
Subject: [PATCH] Avoid tokens shim in suggestedIndent code

---
 src/language-mode.coffee | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/language-mode.coffee b/src/language-mode.coffee
index b5529a05e..1d7def178 100644
--- a/src/language-mode.coffee
+++ b/src/language-mode.coffee
@@ -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)