Merge pull request #4441 from GeoffreyBooth/1.12.4

1.12.4
jashkenas · Feb 18, 2017 · 91e3f72 · 91e3f72
2 parents 98c1a3a + 664c7a4
commit 91e3f72
Show file tree

Hide file tree

Showing 24 changed files with 710 additions and 579 deletions.
diff --git a/docs/v1/annotated-source/coffee-script.html b/docs/v1/annotated-source/coffee-script.html
@@ -941,6 +941,7 @@ <h1>coffee-script.coffee</h1>
     answer = compile sources[filename],
       filename: filename
       sourceMap: <span class="hljs-literal">yes</span>
+      literate: helpers.isLiterate filename
     answer.sourceMap
   <span class="hljs-keyword">else</span>
     <span class="hljs-literal">null</span></pre></div></div>

diff --git a/docs/v1/annotated-source/lexer.html b/docs/v1/annotated-source/lexer.html
@@ -710,10 +710,10 @@ <h2 id="tokenizers">Tokenizers</h2>
         @token <span class="hljs-string">'CALL_START'</span>, <span class="hljs-string">'('</span>, <span class="hljs-number">0</span>, <span class="hljs-number">0</span>
         @mergeInterpolationTokens tokens, {delimiter: <span class="hljs-string">'"'</span>, double: <span class="hljs-literal">yes</span>}, @formatHeregex
         <span class="hljs-keyword">if</span> flags
-          @token <span class="hljs-string">','</span>, <span class="hljs-string">','</span>, index, <span class="hljs-number">0</span>
-          @token <span class="hljs-string">'STRING'</span>, <span class="hljs-string">'"'</span> + flags + <span class="hljs-string">'"'</span>, index, flags.length
-        @token <span class="hljs-string">')'</span>, <span class="hljs-string">')'</span>, end, <span class="hljs-number">0</span>
-        @token <span class="hljs-string">'REGEX_END'</span>, <span class="hljs-string">')'</span>, end, <span class="hljs-number">0</span>
+          @token <span class="hljs-string">','</span>, <span class="hljs-string">','</span>, index - <span class="hljs-number">1</span>, <span class="hljs-number">0</span>
+          @token <span class="hljs-string">'STRING'</span>, <span class="hljs-string">'"'</span> + flags + <span class="hljs-string">'"'</span>, index - <span class="hljs-number">1</span>, flags.length
+        @token <span class="hljs-string">')'</span>, <span class="hljs-string">')'</span>, end - <span class="hljs-number">1</span>, <span class="hljs-number">0</span>
+        @token <span class="hljs-string">'REGEX_END'</span>, <span class="hljs-string">')'</span>, end - <span class="hljs-number">1</span>, <span class="hljs-number">0</span>
 
     end</pre></div></div>