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 #8283] Fix length calculation for Style/IfUnlessModifier #8435

Merged

Conversation

dmytro-savochkin
Copy link

Fixes #8283.
Fixes #8226.
Fixes #8025, #8006, #7969 (look like duplicates).

  1. The code to calculate line length for Style/IfUnlessModifier when considering conversion to single-line form now uses the same method that actually computes the replacement. This allows us to take into account a comment on a first line of the if-end condition or some code that is on the same line before the if-condition (which both contribute to the line length).
  2. Added code so that if-end condition that is either an element of an array or a value of a hash now correctly converted to a single-line form with parentheses.

Before submitting the PR make sure the following are checked:

  • Wrote [good commit messages][1].
  • 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.
  • Added an entry to the Changelog if the new code introduces user-observable changes. See changelog entry format.
  • The PR relates to only one subject with a clear title and description in grammatically correct, complete sentences.
  • Run bundle exec rake default. It executes all tests and RuboCop for itself, and generates the documentation.

@bbatsov bbatsov merged commit 34a9d79 into rubocop:master Aug 3, 2020
@bbatsov
Copy link
Collaborator

bbatsov commented Aug 3, 2020

The changes look good to me. Thanks!

@AlexWayfer
Copy link
Contributor

Thank you! ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants