Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix an incorrect auto-correct for Style/AndOr #9646

Merged

Conversation

@koic
Copy link
Member

@koic koic commented Mar 30, 2021

This PR fixes the following incorrect auto-correct for EnforcedStyle: require_parentheses of Style/MethodCallWithArgsParentheses with EnforcedStyle: conditionals of Style/AndOr.

% cat example.rb
if foo and bar :arg
end

% rubocop --only Style/AndOr,Style/MethodCallWithArgsParentheses -a
(snip)

Offenses:

example.rb:1:8: C: [Corrected] Style/AndOr: Use && instead of and.
if foo and bar :arg
       ^^^
example.rb:1:12: C: [Corrected] Style/MethodCallWithArgsParentheses: Use
parentheses for method calls with arguments.
if foo and bar :arg
           ^^^^^^^^

1 file inspected, 2 offenses detected, 2 offenses corrected

Before

% cat example.rb
if foo && bar(:arg))
end

% ruby -c example.rb
example.rb:1: syntax error, unexpected ')', expecting `then' or ';' or '\n'
if foo && bar(:arg))

After

% cat example.rb
if foo && bar(:arg)
end

Before submitting the PR make sure the following are checked:

  • The PR relates to only one subject with a clear title and description in grammatically correct, complete sentences.
  • Wrote good commit messages.
  • Commit message starts with [Fix #issue-number] (if the related issue exists).
  • Feature branch is up-to-date with master (if not - rebase it).
  • Squashed related commits together.
  • Added tests.
  • Ran bundle exec rake default. It executes all tests and runs RuboCop on its own code.
  • Added an entry (file) to the changelog folder named {change_type}_{change_description}.md if the new code introduces user-observable changes. See changelog entry format for details.
This PR fixes the following incorrect auto-correct for `EnforcedStyle: require_parentheses` of
`Style/MethodCallWithArgsParentheses` with `EnforcedStyle: conditionals` of `Style/AndOr`.

```console
% cat example.rb
if foo and bar :arg
end

% rubocop --only Style/AndOr,Style/MethodCallWithArgsParentheses -a
(snip)

Offenses:

example.rb:1:8: C: [Corrected] Style/AndOr: Use && instead of and.
if foo and bar :arg
       ^^^
example.rb:1:12: C: [Corrected] Style/MethodCallWithArgsParentheses: Use
parentheses for method calls with arguments.
if foo and bar :arg
           ^^^^^^^^

1 file inspected, 2 offenses detected, 2 offenses corrected
```

## Before

```console
% cat example.rb
if foo && bar(:arg))
end

% ruby -c example.rb
example.rb:1: syntax error, unexpected ')', expecting `then' or ';' or '\n'
if foo && bar(:arg))
```

## After

```console
% cat example.rb
if foo && bar(:arg)
end
```
@koic koic force-pushed the koic:fix_incorrect_autocorrect_for_style_and_or branch from 71bb713 to c6a6e7b Mar 30, 2021
@koic koic merged commit 2d1fd7b into rubocop:master Mar 31, 2021
31 checks passed
31 checks passed
@github-actions
windows 2.4
Details
@github-actions
windows 2.5
Details
@github-actions
windows 2.6
Details
@github-actions
windows 2.7
Details
@github-actions
windows 3.0
Details
@github-actions
windows mingw
Details
@mergify
Summary 2 potential rules
Details
ci/circleci: cc-setup Your tests passed on CircleCI!
Details
ci/circleci: cc-upload-coverage Your tests passed on CircleCI!
Details
ci/circleci: documentation-checks Your tests passed on CircleCI!
Details
ci/circleci: jruby-9.2-ascii_spec Your tests passed on CircleCI!
Details
ci/circleci: jruby-9.2-rubocop Your tests passed on CircleCI!
Details
ci/circleci: jruby-9.2-spec Your tests passed on CircleCI!
Details
ci/circleci: ruby-2.4-ascii_spec Your tests passed on CircleCI!
Details
ci/circleci: ruby-2.4-rubocop Your tests passed on CircleCI!
Details
ci/circleci: ruby-2.4-spec Your tests passed on CircleCI!
Details
ci/circleci: ruby-2.5-ascii_spec Your tests passed on CircleCI!
Details
ci/circleci: ruby-2.5-rubocop Your tests passed on CircleCI!
Details
ci/circleci: ruby-2.5-spec Your tests passed on CircleCI!
Details
ci/circleci: ruby-2.6-ascii_spec Your tests passed on CircleCI!
Details
ci/circleci: ruby-2.6-rubocop Your tests passed on CircleCI!
Details
ci/circleci: ruby-2.6-spec Your tests passed on CircleCI!
Details
ci/circleci: ruby-2.7-ascii_spec Your tests passed on CircleCI!
Details
ci/circleci: ruby-2.7-rubocop Your tests passed on CircleCI!
Details
ci/circleci: ruby-2.7-spec Your tests passed on CircleCI!
Details
ci/circleci: ruby-3.0-ascii_spec Your tests passed on CircleCI!
Details
ci/circleci: ruby-3.0-rubocop Your tests passed on CircleCI!
Details
ci/circleci: ruby-3.0-spec Your tests passed on CircleCI!
Details
ci/circleci: ruby-head-ascii_spec Your tests passed on CircleCI!
Details
ci/circleci: ruby-head-rubocop Your tests passed on CircleCI!
Details
ci/circleci: ruby-head-spec Your tests passed on CircleCI!
Details
@koic koic deleted the koic:fix_incorrect_autocorrect_for_style_and_or branch Mar 31, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

1 participant