AST: fix interpolated regex tokens (#5262)

* this property

* clean up AST tests

* updated grammar

* export location data

* export default class location data

* fix interpolated regex tokens

Author: helixbass

lib/coffeescript/lexer.js

@@ -480,16 +480,16 @@ exports.Lexer = class Lexer
         @validateUnicodeCodePointEscapes body, {delimiter}
         @token 'REGEX', "/#{body}/#{flags}", {length: end, origin, data: {delimiter}}
       else
-        @token 'REGEX_START', '(',    {length: 0, origin}
-        @token 'IDENTIFIER', 'RegExp', length: 0
-        @token 'CALL_START', '(',      length: 0
+        @token 'REGEX_START', '(',    {length: 0, origin, generated: yes}
+        @token 'IDENTIFIER', 'RegExp', length: 0, generated: yes
+        @token 'CALL_START', '(',      length: 0, generated: yes
         @mergeInterpolationTokens tokens, {double: yes, heregex: {flags}, endOffset: end - flags.length, quote: '///'}, (str) =>
           @validateUnicodeCodePointEscapes str, {delimiter}
         if flags
-          @token ',', ',',                    offset: index - 1, length: 0
-          @token 'STRING', '"' + flags + '"', offset: index - 1, length: flags.length
-        @token ')', ')',                      offset: end,       length: 0
-        @token 'REGEX_END', ')',              offset: end,       length: 0
+          @token ',', ',',                    offset: index - 1, length: 0, generated: yes
+          @token 'STRING', '"' + flags + '"', offset: index,     length: flags.length
+        @token ')', ')',                      offset: end,       length: 0, generated: yes
+        @token 'REGEX_END', ')',              offset: end,       length: 0, generated: yes
 
     # Explicitly attach any heregex comments to the REGEX/REGEX_END token.
     if commentTokens?.length
@@ -1008,7 +1008,7 @@ exports.Lexer = class Lexer
           lastToken[2].range[1]
         ]
       ]
-      lparen[2] = lparen.origin[2]
+      lparen[2] = lparen.origin[2] unless quote?.length
       rparen = @token 'STRING_END', ')', offset: endOffset - (quote ? '').length, length: quote?.length ? 0, generated: not quote?.length
 
   # Pairs up a closing token, ensuring that all listed pairs of tokens are

src/lexer.coffee

@@ -607,9 +607,9 @@ test "Verify heregexes with interpolations have the right ending position", ->
   arrayEndColumn = arrayEnd[2].first_column
   for token in [comma]
     assertColumn token, arrayEndColumn - 2
-  for token in [flagsString]
-    assertColumn token, arrayEndColumn - 2, 1
-  for token in [regexCallEnd, regexEnd, fnCallEnd]
+  for token in [flagsString, regexCallEnd]
+    assertColumn token, arrayEndColumn - 1, 1
+  for token in [regexEnd, fnCallEnd]
     assertColumn token, arrayEndColumn
   assertColumn arrayEnd, arrayEndColumn, 1