Updated JavaScript token regexes per @lydell

jashkenas · Nov 15, 2016 · 45b7193 · 45b7193
1 parent 3200259
commit 45b7193
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/lib/coffee-script/lexer.js b/lib/coffee-script/lexer.js
diff --git a/src/lexer.coffee b/src/lexer.coffee
@@ -292,7 +292,8 @@ exports.Lexer = class Lexer
 
   # Matches JavaScript interpolated directly into the source via backticks.
   jsToken: ->
-    return 0 unless @chunk.charAt(0) is '`' and match = JSTOKEN.exec @chunk
+    return 0 unless @chunk.charAt(0) is '`' and
+      (match = HERE_JSTOKEN.exec(@chunk) or JSTOKEN.exec(@chunk))
     [js] = match
     script = if js[0..2] is '```' then js[3...-3] else js[1...-1]
     script = script.replace /\\`/g, '`' # Convert escaped backticks to backticks
@@ -903,7 +904,10 @@ CODE       = /^[-=]>/
 
 MULTI_DENT = /^(?:\n[^\n\S]*)+/
 
-JSTOKEN    = /^```([\s\S]*?)(?:\\`(```)|```)|^`[^\\`]*(?:\\.[^\\`]*)*`/
+JSTOKEN      = ///^ `(?!``) ((?: [^`\\] | \\[\s\S]           )*) `   ///
+HERE_JSTOKEN = ///^ ```     ((?: [^`\\] | \\[\s\S] | `(?!``) )*) ``` ///
+
+
 
 # String-matching-regexes.
 STRING_START   = /^(?:'''|"""|'|")/