Merge branch 'master' of github.com:jashkenas/coffeescript

Cakefile

@@ -191,22 +191,26 @@ buildDocs = (watch = no) ->
  codeFor = require "./documentation/v#{majorVersion}/code.coffee"
 
  htmlFor = ->
- marked = require 'marked'
- markdownRenderer = new marked.Renderer()
- markdownRenderer.heading = (text, level) ->
- "<h#{level}>#{text}</h#{level}>" # Don’t let marked add an id
- markdownRenderer.code = (code) ->
+ markdownRenderer = require('markdown-it')
+ html: yes
+ typographer: yes
+
+ # Add some custom overrides to Markdown-It’s rendering, per
+ # https:/markdown-it/markdown-it/blob/master/docs/architecture.md#renderer
+ defaultFence = markdownRenderer.renderer.rules.fence
+ markdownRenderer.renderer.rules.fence = (tokens, idx, options, env, slf) ->
+ code = tokens[idx].content
  if code.indexOf('codeFor(') is 0 or code.indexOf('releaseHeader(') is 0
  "<%= #{code} %>"
  else
- "<pre><code>#{code}</code></pre>" # Default
+ "<blockquote class=\"uneditable-code-block\">#{defaultFence.apply @, arguments}</blockquote>"
 
  (file, bookmark) ->
  md = fs.readFileSync "#{sectionsSourceFolder}/#{file}.md", 'utf-8'
  md = md.replace /<%= releaseHeader %>/g, releaseHeader
  md = md.replace /<%= majorVersion %>/g, majorVersion
  md = md.replace /<%= fullVersion %>/g, CoffeeScript.VERSION
- html = marked md, renderer: markdownRenderer
+ html = markdownRenderer.render md
  html = _.template(html)
  codeFor: codeFor()
  releaseHeader: releaseHeader

docs/v1/annotated-source/grammar.html

@@ -968,6 +968,7 @@ <h2 id="grammatical-rules">Grammatical Rules</h2>
  o <span class="hljs-string">'Identifier AS Identifier'</span>, <span class="hljs-function">-&gt;</span> <span class="hljs-keyword">new</span> ExportSpecifier $<span class="hljs-number">1</span>, $<span class="hljs-number">3</span>
  o <span class="hljs-string">'Identifier AS DEFAULT'</span>, <span class="hljs-function">-&gt;</span> <span class="hljs-keyword">new</span> ExportSpecifier $<span class="hljs-number">1</span>, <span class="hljs-keyword">new</span> Literal $<span class="hljs-number">3</span>
  o <span class="hljs-string">'DEFAULT'</span>, <span class="hljs-function">-&gt;</span> <span class="hljs-keyword">new</span> ExportSpecifier <span class="hljs-keyword">new</span> Literal $<span class="hljs-number">1</span>
+ o <span class="hljs-string">'DEFAULT AS Identifier'</span>, <span class="hljs-function">-&gt;</span> <span class="hljs-keyword">new</span> ExportSpecifier <span class="hljs-keyword">new</span> Literal($<span class="hljs-number">1</span>), $<span class="hljs-number">3</span>
  ]</pre></div></div>
 
  </li>

docs/v1/annotated-source/lexer.html

@@ -219,6 +219,7 @@ <h2 id="the-lexer-class">The Lexer Class</h2>
  @seenFor = <span class="hljs-literal">no</span> <span class="hljs-comment"># Used to recognize FORIN, FOROF and FORFROM tokens.</span>
  @seenImport = <span class="hljs-literal">no</span> <span class="hljs-comment"># Used to recognize IMPORT FROM? AS? tokens.</span>
  @seenExport = <span class="hljs-literal">no</span> <span class="hljs-comment"># Used to recognize EXPORT FROM? AS? tokens.</span>
+ @importSpecifierList = <span class="hljs-literal">no</span> <span class="hljs-comment"># Used to identify when in an IMPORT {...} FROM? ...</span>
  @exportSpecifierList = <span class="hljs-literal">no</span> <span class="hljs-comment"># Used to identify when in an EXPORT {...} FROM? ...</span>
 
  @chunkLine =
@@ -380,10 +381,10 @@ <h2 id="tokenizers">Tokenizers</h2>
  <span class="hljs-keyword">if</span> @tag() <span class="hljs-keyword">in</span> [<span class="hljs-string">'DEFAULT'</span>, <span class="hljs-string">'IMPORT_ALL'</span>, <span class="hljs-string">'IDENTIFIER'</span>]
  @token <span class="hljs-string">'AS'</span>, id
  <span class="hljs-keyword">return</span> id.length
- <span class="hljs-keyword">if</span> id <span class="hljs-keyword">is</span> <span class="hljs-string">'as'</span> <span class="hljs-keyword">and</span> @seenExport <span class="hljs-keyword">and</span> @tag() <span class="hljs-keyword">is</span> <span class="hljs-string">'IDENTIFIER'</span>
+ <span class="hljs-keyword">if</span> id <span class="hljs-keyword">is</span> <span class="hljs-string">'as'</span> <span class="hljs-keyword">and</span> @seenExport <span class="hljs-keyword">and</span> @tag() <span class="hljs-keyword">in</span> [<span class="hljs-string">'IDENTIFIER'</span>, <span class="hljs-string">'DEFAULT'</span>]
  @token <span class="hljs-string">'AS'</span>, id
  <span class="hljs-keyword">return</span> id.length
- <span class="hljs-keyword">if</span> id <span class="hljs-keyword">is</span> <span class="hljs-string">'default'</span> <span class="hljs-keyword">and</span> @seenExport
+ <span class="hljs-keyword">if</span> id <span class="hljs-keyword">is</span> <span class="hljs-string">'default'</span> <span class="hljs-keyword">and</span> @seenExport <span class="hljs-keyword">and</span> @tag() <span class="hljs-keyword">in</span> [<span class="hljs-string">'EXPORT'</span>, <span class="hljs-string">'AS'</span>]
  @token <span class="hljs-string">'DEFAULT'</span>, id
  <span class="hljs-keyword">return</span> id.length
 
@@ -742,6 +743,8 @@ <h2 id="tokenizers">Tokenizers</h2>
  indent = match[<span class="hljs-number">0</span>]
 
  @seenFor = <span class="hljs-literal">no</span>
+ @seenImport = <span class="hljs-literal">no</span> <span class="hljs-keyword">unless</span> @importSpecifierList
+ @seenExport = <span class="hljs-literal">no</span> <span class="hljs-keyword">unless</span> @exportSpecifierList
 
  size = indent.length - <span class="hljs-number">1</span> - indent.lastIndexOf <span class="hljs-string">'\n'</span>
  noNewlines = @unfinished()
@@ -923,7 +926,11 @@ <h2 id="tokenizers">Tokenizers</h2>
  @error message, origin[<span class="hljs-number">2</span>] <span class="hljs-keyword">if</span> message
  <span class="hljs-keyword">return</span> value.length <span class="hljs-keyword">if</span> skipToken
 
- <span class="hljs-keyword">if</span> value <span class="hljs-keyword">is</span> <span class="hljs-string">'{'</span> <span class="hljs-keyword">and</span> prev?[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'EXPORT'</span>
+ <span class="hljs-keyword">if</span> value <span class="hljs-keyword">is</span> <span class="hljs-string">'{'</span> <span class="hljs-keyword">and</span> @seenImport
+ @importSpecifierList = <span class="hljs-literal">yes</span>
+ <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> @importSpecifierList <span class="hljs-keyword">and</span> value <span class="hljs-keyword">is</span> <span class="hljs-string">'}'</span>
+ @importSpecifierList = <span class="hljs-literal">no</span>
+ <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> value <span class="hljs-keyword">is</span> <span class="hljs-string">'{'</span> <span class="hljs-keyword">and</span> prev?[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'EXPORT'</span>
  @exportSpecifierList = <span class="hljs-literal">yes</span>
  <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> @exportSpecifierList <span class="hljs-keyword">and</span> value <span class="hljs-keyword">is</span> <span class="hljs-string">'}'</span>
  @exportSpecifierList = <span class="hljs-literal">no</span>
@@ -1571,10 +1578,14 @@ <h2 id="helpers">Helpers</h2>
  </div>
 
  <div class="content"><div class='highlight'><pre> validateEscapes: <span class="hljs-function"><span class="hljs-params">(str, options = {})</span> -&gt;</span>
- match = INVALID_ESCAPE.exec str
+ invalidEscapeRegex =
+ <span class="hljs-keyword">if</span> options.isRegex
+ REGEX_INVALID_ESCAPE
+ <span class="hljs-keyword">else</span>
+ STRING_INVALID_ESCAPE
+ match = invalidEscapeRegex.exec str
  <span class="hljs-keyword">return</span> <span class="hljs-keyword">unless</span> match
  [[], before, octal, hex, unicode] = match
- <span class="hljs-keyword">return</span> <span class="hljs-keyword">if</span> options.isRegex <span class="hljs-keyword">and</span> octal <span class="hljs-keyword">and</span> octal.charAt(<span class="hljs-number">0</span>) <span class="hljs-keyword">isnt</span> <span class="hljs-string">'0'</span>
  message =
  <span class="hljs-keyword">if</span> octal
  <span class="hljs-string">"octal escape sequences are not allowed"</span>
@@ -2040,14 +2051,22 @@ <h2 id="constants">Constants</h2>
 
 LINE_CONTINUER = <span class="hljs-regexp">/// ^ \s* (?: , | \??\.(?![.\d]) | :: ) ///</span>
 
-INVALID_ESCAPE  = <span class="hljs-regexp">///
+STRING_INVALID_ESCAPE = <span class="hljs-regexp">///
  ( (?:^|[^\\]) (?:\\\\)* ) <span class="hljs-comment"># make sure the escape isn’t escaped</span>
  \\ (
  ?: (0[0-7]|[1-7]) <span class="hljs-comment"># octal escape</span>
  | (x(?![\da-fA-F]{2}).{0,2}) <span class="hljs-comment"># hex escape</span>
  | (u(?![\da-fA-F]{4}).{0,4}) <span class="hljs-comment"># unicode escape</span>
  )
 ///</span>
+REGEX_INVALID_ESCAPE = <span class="hljs-regexp">///
+ ( (?:^|[^\\]) (?:\\\\)* ) <span class="hljs-comment"># make sure the escape isn’t escaped</span>
+ \\ (
+ ?: (0[0-7]) <span class="hljs-comment"># octal escape</span>
+ | (x(?![\da-fA-F]{2}).{0,2}) <span class="hljs-comment"># hex escape</span>
+ | (u(?![\da-fA-F]{4}).{0,4}) <span class="hljs-comment"># unicode escape</span>
+ )
+///</span>
 
 LEADING_BLANK_LINE = <span class="hljs-regexp">/^[^\n\S]*\n/</span>
 TRAILING_BLANK_LINE = <span class="hljs-regexp">/\n[^\n\S]*$/</span>