Fix an incorrect autocorrect for Lint/AmbiguousBlockAssociation

koic · koic · commit 10ec66aabeee · 2023-06-05T14:16:34.000+09:00
This PR fixes the following incorrect autocorrect for
`Lint/AmbiguousBlockAssociation` with `Style/MethodCallWithArgsParentheses`.

```ruby
expect { foo }.not_to change { bar }
```

## Before

```console
$ bundle exec rubocop --only Lint/AmbiguousBlockAssociation,Style/MethodCallWithArgsParentheses -a
Inspecting 1 file
F

Offenses:

example.rb:1:1: W: [Corrected] Lint/AmbiguousBlockAssociation: Parenthesize the param change { bar } to make sure that the block will be associated with the change method call.
expect { foo }.not_to change { bar }
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
example.rb:1:1: C: [Corrected] Style/MethodCallWithArgsParentheses: Use parentheses for method calls with arguments.
expect { foo }.not_to change { bar }
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
example.rb:1:38: F: Lint/Syntax: unexpected token tRPAREN
(Using Ruby 3.2 parser; configure using TargetRubyVersion parameter, under AllCops)
expect { foo }.not_to(change { bar }))
                                     ^

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

Syntax error with redundant closing parentheses.

```diff
$ git diff .
diff --git a/x/example.rb b/x/example.rb
index 142ff55..6de7188 100644
--- a/x/example.rb
+++ b/x/example.rb
@@ -1 +1 @@
-expect { foo }.not_to change { bar }
+expect { foo }.not_to(change { bar }))
```

## After

Valid syntax.

```diff
$ git diff .
diff --git a/x/example.rb b/x/example.rb
index 142ff55..7808ed5 100644
--- a/x/example.rb
+++ b/x/example.rb
@@ -1 +1 @@
-expect { foo }.not_to change { bar }
+expect { foo }.not_to(change { bar })
```
diff --git a/changelog/fix_incorrect_autocorrect_for_lint_ambiguous_block_association.md b/changelog/fix_incorrect_autocorrect_for_lint_ambiguous_block_association.md
@@ -0,0 +1 @@
+* [#11928](https://github.com/rubocop/rubocop/pull/11928): Fix an incorrect autocorrect for `Lint/AmbiguousBlockAssociation`. ([@koic][])
diff --git a/lib/rubocop/cop/lint/ambiguous_block_association.rb b/lib/rubocop/cop/lint/ambiguous_block_association.rb
@@ -97,7 +97,8 @@ def message(send_node)
         def wrap_in_parentheses(corrector, node)
           range = node.loc.selector.end.join(node.first_argument.source_range.begin)
 
-          corrector.replace(range, '(')
+          corrector.remove(range)
+          corrector.insert_before(range, '(')
           corrector.insert_after(node.last_argument, ')')
         end
       end
diff --git a/spec/rubocop/cli/autocorrect_spec.rb b/spec/rubocop/cli/autocorrect_spec.rb
@@ -341,6 +341,28 @@ def batch
     RUBY
   end
 
+  it 'corrects `EnforcedStyle: require_parentheses` of `Style/MethodCallWithArgsParentheses` with ' \
+     '`Lint/AmbiguousBlockAssociation`' do
+    create_file('.rubocop.yml', <<~YAML)
+      Style/MethodCallWithArgsParentheses:
+        EnforcedStyle: require_parentheses
+    YAML
+    create_file('example.rb', <<~RUBY)
+      expect { foo }.not_to change { bar }
+    RUBY
+    expect(
+      cli.run(
+        [
+          '--autocorrect',
+          '--only', 'Style/MethodCallWithArgsParentheses,Lint/AmbiguousBlockAssociation'
+        ]
+      )
+    ).to eq(0)
+    expect(File.read('example.rb')).to eq(<<~RUBY)
+      expect { foo }.not_to(change { bar })
+    RUBY
+  end
+
   it 'corrects `EnforcedStyle: require_parentheses` of `Style/MethodCallWithArgsParentheses` with ' \
      '`Lint/AmbiguousOperator`' do
     create_file('.rubocop.yml', <<~YAML)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+* [#11928](https://github.com/rubocop/rubocop/pull/11928): Fix an incorrect autocorrect for `Lint/AmbiguousBlockAssociation`. ([@koic][])