         @indentRow({row: row, blockIndent: tokenStack[token.parentTokenIdx].firstCharIndentation, jsxIndent: 1, allowAdditionalIndents: true })
       when SWITCH_CASE, SWITCH_DEFAULT
         @indentRow({row: row, blockIndent: token.firstCharIndentation, jsxIndent: 1 })
-      when TEMPLATE_START
+      when TEMPLATE_START, TEMPLATE_END
         return; # don't touch templates
-      when TEMPLATE_END
-        @indentRow({row: row, blockIndent: token.firstCharIndentation, jsxIndent: 1 })
 
   # get the token at the given match position or return truthy false
   getToken: (bufferRow, match) ->

              if parentTokenIdx >=0 then tokenStack[parentTokenIdx].termsThisTagIdx = idxOfToken
              idxOfToken++

          # case, default statement of switch
          when SWITCH_CASE, SWITCH_DEFAULT
            tokenOnThisLine = true

    indent =  0
    isFirstTagOfBlock = true
    @JSXREGEXP.lastIndex = 0
    @templateDepth = 0

    for row in [range.start.row..range.end.row]
      isFirstTokenOfLine = true
