Add Regexp::Expression#loc and #expression. Remove parsed_tree_expr_loc
#8960
Conversation
This file contains 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
We'll be adding references to the source to the nodes, so I can't think of any other way to proceed that won't involve unacceptable memory leaks.
8 tasks
|
cc/ @owst |
owst
suggested changes
Oct 27, 2020
There was a problem hiding this comment.
Really nice @marcandre, I wish I'd thought of this 😄 - a few minor comments.
| @@ -43,7 +43,7 @@ def each_repeated_character_class_element_loc(node) | |||
|
|
|||
| child_source = child.to_s | |||
|
|
|||
| yield node.parsed_tree_expr_loc(child) if seen.include?(child_source) | |||
| yield child.expression if seen.include?(child_source) | |||
marcandre
changed the title
RegexpRegexp::Expression#loc and #expression. Deprecate parsed_tree_expr_locRegexp::Expression#loc and #expression. Deprecate parsed_tree_expr_loc
marcandre
changed the title
Regexp::Expression#loc and #expression. Deprecate parsed_tree_expr_locRegexp::Expression#loc and #expression. Remove parsed_tree_expr_loc
owst
suggested changes
Oct 27, 2020
|
LGTM 👍 |
|
Thanks for the quick review @owst 💛 |
|
Nice improvement! |
ysakasin
added a commit
to ysakasin/rubocop
that referenced
this pull request
Oct 28, 2020
…terClass with %r This commit uses `RegexpNode::RegexpParser#body` (rubocop#8960) instead of `Parser::Source::Range#adjust` in Style/RedundantRegexpCharacterClass. When regular expression are written by %r literal, RedundantRegexpCharacterClass made incorrect loc as following. ``` %r{abc[\d]+} ^^^^^^ ``` This bug are caused by calling`node.loc.begin.adjust` to get range of character class with %r regexp. `Parser::Source::Range#adjust` adjust based on `Parser::Source::Range#begin_pos` but it with %r literal doesn't indicate start of regular expression source, point to location of '%'. So, RedundantRegexpCharacterClass makes incorrect loc if %r literal are used in code. ``` r = %r{abc} ^ # `node.loc.begin.begin_pos` ``` ``` r = %r{abs} ^ # `node.loc.begin.end_pos` ```
bbatsov
pushed a commit
that referenced
this pull request
Oct 29, 2020
…s with %r This commit uses `RegexpNode::RegexpParser#body` (#8960) instead of `Parser::Source::Range#adjust` in Style/RedundantRegexpCharacterClass. When regular expression are written by %r literal, RedundantRegexpCharacterClass made incorrect loc as following. ``` %r{abc[\d]+} ^^^^^^ ``` This bug are caused by calling`node.loc.begin.adjust` to get range of character class with %r regexp. `Parser::Source::Range#adjust` adjust based on `Parser::Source::Range#begin_pos` but it with %r literal doesn't indicate start of regular expression source, point to location of '%'. So, RedundantRegexpCharacterClass makes incorrect loc if %r literal are used in code. ``` r = %r{abc} ^ # `node.loc.begin.begin_pos` ``` ``` r = %r{abs} ^ # `node.loc.begin.end_pos` ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The source information provided by
regexp_parseris difficult to use.This PR adds a
parser-like location map to these nodes. E.g.:Will be useful for #8948