Breaking: syncing start/end with range (fixes #349) #461
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mdjermanovic
reviewed
Dec 4, 2020
mdjermanovic
reviewed
Dec 8, 2020
Member
Author
|
Sorry for the delay, I have update the code as suggested. Let me know if anything else is required to change. |
Comment on lines
+175
to
+180
| this[STATE].templateElements.forEach(templateElement => { | ||
| const terminalDollarBraceL = this.input.slice(templateElement.end, templateElement.end + 2) === "${"; | ||
|
|
||
| templateElement.start--; | ||
| templateElement.end += (terminalDollarBraceL ? 2 : 1); | ||
| }); |
Member
There was a problem hiding this comment.
Can we add a comment about why we decided to modify start/end at this point instead of while finishing the node?
Comment on lines
+82
to
+84
| const ast = espree.parse("/* foo */ bar /* baz */", { | ||
| range: true | ||
| }); |
Member
There was a problem hiding this comment.
Can we add another test like this for Program, but without range: true and loc: true?
Comment on lines
+157
to
+166
| it("should output the same value for loc, range and start and end in templateElement", () => { | ||
| const ast = espree.parse("`foo ${bar}`;", { | ||
| ecmaVersion: 6 | ||
| }); | ||
|
|
||
| assert.strictEqual(ast.body[0].expression.quasis[0].start, 0); | ||
| assert.strictEqual(ast.body[0].expression.quasis[0].end, 7); | ||
| assert.strictEqual(ast.body[0].expression.quasis[1].start, 10); | ||
| assert.strictEqual(ast.body[0].expression.quasis[1].end, 12); | ||
| }); |
Member
There was a problem hiding this comment.
I think the title doesn't explain this test.
Comment on lines
+144
to
+155
| it("should output the same value for loc, range and start and end in templateElement with loc and range", () => { | ||
| const ast = espree.parse("`foo ${bar}`;", { | ||
| ecmaVersion: 6, | ||
| loc: true, | ||
| range: true | ||
| }); | ||
|
|
||
| assert.strictEqual(ast.body[0].expression.quasis[0].start, ast.body[0].expression.quasis[0].loc.start.column); | ||
| assert.strictEqual(ast.body[0].expression.quasis[0].end, ast.body[0].expression.quasis[0].loc.end.column); | ||
| assert.strictEqual(ast.body[0].expression.quasis[1].start, ast.body[0].expression.quasis[1].range[0]); | ||
| assert.strictEqual(ast.body[0].expression.quasis[1].end, ast.body[0].expression.quasis[1].range[1]); | ||
| }); |
Member
There was a problem hiding this comment.
This test is a bit confusing, quasis[0] start/end is compared to loc only, while quasis[1] to range only.
Member
|
@anikethsaha are you still working on this? |
nzakas
approved these changes
Apr 28, 2021
Member
nzakas
left a comment
There was a problem hiding this comment.
Changes look good. I'll address the remaining comments in a separate PR.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Syncing the range and loc with
startandendfor bothprogramandtemplateElementnodes.