         context.fillStyle = @getDecorationColor(decoration)
         context.fillRect(0,y0,canvasWidth,lineHeight)
 
+      highlightDecorations = @getHighlightDecorationsForRow(firstRow + row, 'under', decorations)
+      for decoration in highlightDecorations
+        @drawHighlightDecoration(context, decoration, y, screenRow, lineHeight, charWidth, canvasWidth)
+
       for token in line.tokens
         w = token.screenDelta
         unless token.isOnlyWhitespace() or token.hasInvisibleCharacters

        else
          x += w * charWidth

      highlightDecorations = @getHighlightDecorationsForRow(firstRow + row, decorations)
      for decoration in highlightDecorations
        @drawHighlightDecoration(context, decoration, y, screenRow, lineHeight, charWidth, canvasWidth)



    out

  getHighlightDecorationsForRow: (row, position, decorations) ->
    out = []
    for id, array of decorations
      for decoration in array
        if decoration.params.type is "highlight-#{position}" and
           decoration.getMarker().getScreenRange().intersectsRow(row)
          out.push decoration

