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 #6382] Fix Layout/IndentationWidth with Layout/EndAlignment #6685

Merged
merged 1 commit into from Jan 25, 2019

Conversation

dischorde
Copy link
Contributor

Fixes #6382 to allow:

variable =
  if true
    :foo
  else
    :bar
  end

which currently violates Layout/IndentationWidth & Layout/ElseAlignment when Layout/EndAlignment is set to start_of_line.


Before submitting the PR make sure the following are checked:

  • 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.
  • 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.

@Drenmi
Copy link
Collaborator

Drenmi commented Jan 22, 2019

I'm okay with this fix. I just cut a new release, so you'll need to rebase on latest master and fix the conflicts in CHANGELOG.

Thanks for your contribution @dischorde! 🙇

…nment` set to start_of_line.

Add spec for if/else in assignment on newline with end alignment set to start of line

Check line_break_before_keyword? for both variable & start_of_line

Update changelog (fixing Siggy's handle)

Co-Authored-By: Max Helmetag <max.helmetag@procore.com>
Co-Authored-By: Michael Siegfried <michael@procore.com>
@dischorde
Copy link
Contributor Author

@Drenmi Rebased & conflicts addressed. Thanks!

@Drenmi Drenmi merged commit 002aef5 into rubocop:master Jan 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants