kotovalexarian-likes-github/jashkenas--coffeescript
1
0
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2022-11-09 12:23:24 -05:00
Code Releases Activity

Place ending heregex tokens one index earlier

Browse source 
This is an upstream port of https://github.com/decaffeinate/coffeescript/pull/17

The lexer generates fake tokens for interpolated heregexes, and the ending
tokens were being placed where the start (inclusive) and end (inclusive) index
were one past the end of the heregex. This meant that in a case like
`[a ///#{b}///]`, the end tokens of the heregex and also the implicit function
call end were all being placed at the `]`, so the AST location data would say
that the function call ends at the end of the `]`.

To fix, I can just subtract 1 from the position of those ending heregex tokens
so that their end lines up with the end of the heregex itself. This is similar
to previous fixes that changed `OUTDENT` and `CALL_END` tokens so that the end
of the token lines up with the end of the AST node.
This commit is contained in:
Alan Pierce 2017-01-02 19:14:20 -08:00
parent 0d132318ce
commit f757614334
3 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/coffee-script/lexer.js
View file

@ -403,11 +403,11 @@
double: true double: true
}, this.formatHeregex); }, this.formatHeregex);
if (flags) { if (flags) {
this.token(',', ',', index, 0); this.token(',', ',', index - 1, 0);
this.token('STRING', '"' + flags + '"', index, flags.length); this.token('STRING', '"' + flags + '"', index - 1, flags.length);
} }
this.token(')', ')', end, 0); this.token(')', ')', end - 1, 0);
this.token('REGEX_END', ')', end, 0); this.token('REGEX_END', ')', end - 1, 0);
} }
return end; return end;
}; };

8
src/lexer.coffee
View file

@ -332,10 +332,10 @@ exports.Lexer = class Lexer
@token 'CALL_START', '(', 0, 0 @token 'CALL_START', '(', 0, 0
@mergeInterpolationTokens tokens, {delimiter: '"', double: yes}, @formatHeregex @mergeInterpolationTokens tokens, {delimiter: '"', double: yes}, @formatHeregex
if flags if flags
@token ',', ',', index, 0 @token ',', ',', index - 1, 0
@token 'STRING', '"' + flags + '"', index, flags.length @token 'STRING', '"' + flags + '"', index - 1, flags.length
@token ')', ')', end, 0 @token ')', ')', end - 1, 0
@token 'REGEX_END', ')', end, 0 @token 'REGEX_END', ')', end - 1, 0
end end

23
test/location.coffee
View file

@ -564,6 +564,29 @@ test "Verify indented heredocs have the right position", ->
eq stringToken[2].last_line, 3 eq stringToken[2].last_line, 3
eq stringToken[2].last_column, 4 eq stringToken[2].last_column, 4
test "Verify heregexes with interpolations have the right ending position", ->
source = '''
[a ///#{b}///g]
'''
[..., stringEnd, comma, flagsString, regexCallEnd, regexEnd, fnCallEnd,
arrayEnd, terminator] = CoffeeScript.tokens source
eq comma[0], ','
eq arrayEnd[0], ']'
assertColumn = (token, column) ->
eq token[2].first_line, 0
eq token[2].first_column, column
eq token[2].last_line, 0
eq token[2].last_column, column
arrayEndColumn = arrayEnd[2].first_column
for token in [comma, flagsString]
assertColumn token, arrayEndColumn - 2
for token in [regexCallEnd, regexEnd, fnCallEnd]
assertColumn token, arrayEndColumn - 1
assertColumn arrayEnd, arrayEndColumn
test "Verify all tokens get a location", -> test "Verify all tokens get a location", ->
doesNotThrow -> doesNotThrow ->
tokens = CoffeeScript.tokens testScript tokens = CoffeeScript.tokens testScript