[CS2] Fix handling of tabbed code blocks in .litcoffee files

src/helpers.coffee

@@ -82,20 +82,26 @@ exports.some = Array::some ? (fn) ->
 # out all non-code blocks, producing a string of CoffeeScript code that can
 # be compiled “normally.”
 exports.invertLiterate = (code) ->
- # Create a placeholder for tabs, that isn’t used anywhere in `code`, and then
- # re-insert the tabs after code extraction.
- generateRandomToken = ->
- "#{Math.random() * Date.now()}"
- while token is undefined or code.indexOf(token) isnt -1
- token = generateRandomToken()
-
- code = code.replace "\t", token
- # Parse as markdown, discard everything except code blocks.
- out = ""
- for item in marked.lexer code, {}
- out += "#{item.text}\n" if item.type is 'code'
- # Put the tabs back in.
- out.replace token, "\t"
+ # `marked` really doesn’t process tabs too well. All this code is headed
+ # into JavaScript anyway, so replace the tabs with two spaces to make
+ # `marked`’s job a little easier.
+ code = code.replace /^(\t)+/gm, (match) ->
+ spaces = ''
+ spaces += ' ' for tab in [0..match.length]
+ spaces
+
+ out = ''
+ for section in marked.lexer code, {}
+ if section.type is 'code'
+ out += section.text + '\n\n'
+ # Keep the non-code sections (that have text) so as to hopefully
+ # preserve the correct line numbers. Lists can screw this up. For better
+ # stack traces, don’t wrap your own list items like our tests do but rather
+ # let them run free and rely on your editor to wrap your lines for you.
+ else if section.text?
+ out += '# ' + section.text.trim().replace(/\n/g, '\n# ') + '\n\n'
+ else if section.type is 'hr'
+ out += '# ---\n\n'
  out
 
 # Merge two jison-style location data objects together.

test/literate.litcoffee

@@ -1,5 +1,4 @@
-Literate CoffeeScript Test
---------------------------
+# Literate CoffeeScript Test
 
 comment comment
 

test/literate_tabbed.litcoffee

@@ -0,0 +1,164 @@
+# Tabbed Literate CoffeeScript Test
+
+comment comment
+
+ test "basic literate CoffeeScript parsing", ->
+ ok yes
+
+now with a...
+
+ test "broken up indentation", ->
+
+... broken up ...
+
+ do ->
+
+... nested block.
+
+ ok yes
+
+Code must be separated from text by a blank line.
+
+ test "code blocks must be preceded by a blank line", ->
+
+The next line is part of the text and will not be executed.
+ fail()
+
+ ok yes
+
+Code in `backticks is not parsed` and...
+
+ test "comments in indented blocks work", ->
+ do ->
+ do ->
+ # Regular comment.
+
+ ###
+ Block comment.
+ ###
+
+ ok yes
+
+Regular [Markdown](http://example.com/markdown) features, like links
+and unordered lists, are fine:
+
+ * I
+
+ * Am
+
+ * A
+
+ * List
+
+Spaces work too:
+
+ test "spaced code", ->
+ ok yes
+
+---
+
+ # keep track of whether code blocks are executed or not
+ executed = false
+
+<p>
+
+ executed = true # should not execute, this is just HTML para, not code!
+
+</p>
+
+ test "should ignore indented sections inside HTML", ->
+ eq executed, false
+
+---
+
+* A list item with a code block:
+
+ test "basic literate CoffeeScript parsing", ->
+ ok yes
+
+---
+
+* Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+ Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
+ viverra nec, fringilla in, laoreet vitae, risus.
+
+* Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
+ Suspendisse id sem consectetuer libero luctus adipiscing.
+
+---
+
+1. This is a list item with two paragraphs. Lorem ipsum dolor
+ sit amet, consectetuer adipiscing elit. Aliquam hendrerit
+ mi posuere lectus.
+
+ Vestibulum enim wisi, viverra nec, fringilla in, laoreet
+ vitae, risus. Donec sit amet nisl. Aliquam semper ipsum
+ sit amet velit.
+
+2. Suspendisse id sem consectetuer libero luctus adipiscing.
+
+---
+
+1. This is a list item with two paragraphs. Lorem ipsum dolor
+ sit amet, consectetuer adipiscing elit. Aliquam hendrerit
+ mi posuere lectus.
+
+ Vestibulum enim wisi, viverra nec, fringilla in, laoreet
+ vitae, risus. Donec sit amet nisl. Aliquam semper ipsum
+ sit amet velit.
+
+2. Suspendisse id sem consectetuer libero luctus adipiscing.
+
+---
+
+* A list item with a blockquote:
+
+ > This is a blockquote
+ > inside a list item.
+
+---
+
+This next one probably passes because a string is inoffensive in compiled js, also, can't get `marked` to parse it correctly, and not sure if empty line is permitted between title and reference
+
+This is [an example][id] reference-style link.
+[id]: http://example.com/
+
+ "Optional Title Here"
+
+---
+
+ executed = no
+
+1986. What a great season.
+ executed = yes
+
+and test...
+
+ test "should recognise indented code blocks in lists", ->
+ ok executed
+
+---
+
+ executed = no
+
+1986. What a great season.
+
+ executed = yes
+
+and test...
+
+ test "should recognise indented code blocks in lists with empty line as separator", ->
+ ok executed
+
+---
+
+ executed = no
+
+1986\. What a great season.
+ executed = yes
+
+and test...
+
+ test "should ignore indented code in escaped list like number", ->
+ eq executed, no
+