Skip to content

Commit

Permalink
[Fix rubocop#210] Change enforced style to conditionals for `Style/An…
Browse files Browse the repository at this point in the history
…dOr`

Resolves rubocop#210.

The following idioms exist for `return` and` raise` in Ruby.

- `do_something and return`
- `do_something || raise`

And Rails will also show users the error message using this idiom.

> `"redirect_to(...) and return\"`

https://github.com/rails/rails/blob/v6.0.2.2/actionpack/lib/abstract_controller/rendering.rb#L10

This is the same for `render :action and return` and others.

`Style/AndOr` cop default rule (`EnforcedStyle: always`) does seem to
unmatch for these cases. I think these cases need to be accepted.

So, this PR changes it to `EnforcedStyle: conditionals` at least in Rails.
The enforced style cannot catch all cases, but probably the closest to
solving the issue.
  • Loading branch information
koic committed Mar 29, 2020
1 parent 3ba2b30 commit 25cbf30
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
* [#215](https://github.com/rubocop-hq/rubocop-rails/issues/215): Fix a false positive for `Rails/UniqueValidationWithoutIndex` when using Expression Indexes. ([@koic][])
* [#214](https://github.com/rubocop-hq/rubocop-rails/issues/214): Fix an error for `Rails/UniqueValidationWithoutIndex`when a table has no column definition. ([@koic][])

### Changes

* [#210](https://github.com/rubocop-hq/rubocop-rails/issues/210): Accept `redirecto_to(...) and return` and similar cases. ([@koic][])

## 2.5.0 (2020-03-24)

### New features
Expand Down
4 changes: 4 additions & 0 deletions config/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -535,3 +535,7 @@ Rails/Validation:
VersionChanged: '0.41'
Include:
- app/models/**/*.rb

# Accept `redirecto_to(...) and return` and similar cases.
Style/AndOr:
EnforcedStyle: conditionals

0 comments on commit 25cbf30

Please sign in to comment.