Skip to content

Commit

Permalink
[Fix #8948] Fix autocorrection for Style/RedundantRegexpCharacterClas…
Browse files Browse the repository at this point in the history
…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`
```
  • Loading branch information
ysakasin authored and bbatsov committed Oct 29, 2020
1 parent 8dc26d7 commit 5905396
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
* [#8917](https://github.com/rubocop-hq/rubocop/issues/8917): Fix rubocop comment directives handling of cops with multiple levels in department name. ([@fatkodima][])
* [#8918](https://github.com/rubocop-hq/rubocop/issues/8918): Fix a false positives for `Bundler/DuplicatedGem` when a gem conditionally duplicated within `if-elsif` or `case-when` statements. ([@fatkodima][])
* [#8933](https://github.com/rubocop-hq/rubocop/pull/8933): Fix an error for `Layout/EmptyLinesAroundAccessModifier` when the first line is a comment. ([@matthieugendreau][])
* [#8954](https://github.com/rubocop-hq/rubocop/pull/8954): Fix autocorrection for Style/RedundantRegexpCharacterClass with %r. ([@ysakasin][])

### Changes

Expand Down
6 changes: 6 additions & 0 deletions docs/modules/ROOT/pages/cops_style.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8230,6 +8230,12 @@ r = /[\s]/
# good
r = /\s/
# bad
r = %r{/[b]}
# good
r = %r{/b}
# good
r = /[ab]/
----
Expand Down
10 changes: 7 additions & 3 deletions lib/rubocop/cop/style/redundant_regexp_character_class.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ module Style
# # good
# r = /\s/
#
# # bad
# r = %r{/[b]}
#
# # good
# r = %r{/b}
#
# # good
# r = /[ab]/
class RedundantRegexpCharacterClass < Base
Expand Down Expand Up @@ -48,9 +54,7 @@ def each_redundant_character_class(node)
each_single_element_character_class(node) do |char_class|
next unless redundant_single_element_character_class?(node, char_class)

begin_pos = 1 + char_class.ts
end_pos = begin_pos + char_class.expressions.first.text.length + 1
yield node.loc.begin.adjust(begin_pos: begin_pos, end_pos: end_pos)
yield char_class.loc.body
end
end

Expand Down
68 changes: 68 additions & 0 deletions spec/rubocop/cop/style/redundant_regexp_character_class_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,74 @@
end
end

context 'with %r{} regexp' do
context 'with a character class containing a single character' do
it 'registers an offense and corrects' do
expect_offense(<<~RUBY)
foo = %r{[a]}
^^^ Redundant single-element character class, `[a]` can be replaced with `a`.
RUBY

expect_correction(<<~RUBY)
foo = %r{a}
RUBY
end
end

context 'with multiple character classes containing single characters' do
it 'registers an offense and corrects' do
expect_offense(<<~RUBY)
foo = %r{[a]b[c]d}
^^^ Redundant single-element character class, `[a]` can be replaced with `a`.
^^^ Redundant single-element character class, `[c]` can be replaced with `c`.
RUBY

expect_correction(<<~RUBY)
foo = %r{abcd}
RUBY
end
end

context 'with a character class containing a single character inside a group' do
it 'registers an offense and corrects' do
expect_offense(<<~RUBY)
foo = %r{([a])}
^^^ Redundant single-element character class, `[a]` can be replaced with `a`.
RUBY

expect_correction(<<~RUBY)
foo = %r{(a)}
RUBY
end
end

context 'with a character class containing a single character before `+` quantifier' do
it 'registers an offense and corrects' do
expect_offense(<<~RUBY)
foo = %r{[a]+}
^^^ Redundant single-element character class, `[a]` can be replaced with `a`.
RUBY

expect_correction(<<~RUBY)
foo = %r{a+}
RUBY
end
end

context 'with a character class containing a single character before `{n,m}` quantifier' do
it 'registers an offense and corrects' do
expect_offense(<<~RUBY)
foo = %r{[a]{2,10}}
^^^ Redundant single-element character class, `[a]` can be replaced with `a`.
RUBY

expect_correction(<<~RUBY)
foo = %r{a{2,10}}
RUBY
end
end
end

context 'with a character class containing a single range' do
it 'does not register an offense' do
expect_no_offenses('foo = /[a-z]/')
Expand Down

0 comments on commit 5905396

Please sign in to comment.