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.

Sign up for GitHub

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

Jump to bottom

[Fix #8179] Fix an infinite correction loop for Layout/MultilineBlockLayout #8180

Merged
merged 1 commit into from Jun 21, 2020
Merged

[Fix #8179] Fix an infinite correction loop for Layout/MultilineBlockLayout #8180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@
* [#7979](https://github.com/rubocop-hq/rubocop/issues/7979): Fix "uninitialized constant DidYouMean::SpellChecker" exception. ([@bquorning][])
* [#8098](https://github.com/rubocop-hq/rubocop/issues/8098): Fix a false positive for `Style/RedundantRegexpCharacterClass` when using interpolations. ([@owst][])
* [#8150](https://github.com/rubocop-hq/rubocop/pull/8150): Fix a false positive for `Layout/EmptyLinesAroundAttributeAccessor` when using attribute accessors in `if` ... `else` branches. ([@koic][])
* [#8179](https://github.com/rubocop-hq/rubocop/issues/8179): Fix an infinite correction loop error for `Layout/MultilineBlockLayout` when missing newline before opening parenthesis `(` for block body. ([@koic][])

### Changes

Expand Down
2 changes: 1 addition & 1 deletion lib/rubocop/cop/layout/multiline_block_layout.rb
View file
Open in desktop
Expand Up @@ -121,7 +121,7 @@ def autocorrect_arguments(corrector, node)
end

def autocorrect_body(corrector, node, block_body)
first_node = if block_body.begin_type?
first_node = if block_body.begin_type? && !block_body.source.start_with?('(')
block_body.children.first
else
block_body
Expand Down
18 changes: 18 additions & 0 deletions spec/rubocop/cop/layout/multiline_block_layout_spec.rb
View file
Open in desktop
Expand Up @@ -216,6 +216,24 @@
RUBY
end

it 'registers an offense and corrects for missing newline before opening parenthesis `(` for block body' do
expect_offense(<<~RUBY)
foo do |o| (
^ Block body expression is on the same line as the block start.
bar
)
end
RUBY

expect_correction(<<~RUBY)
foo do |o|
(
bar
)
end
RUBY
end

it 'registers an offense and corrects a line-break within arguments' do
expect_offense(<<~RUBY)
test do |x,
Expand Down