Mark HeredocArgumentClosingParenthesis as incompatible with TrailingC…

…ommaInArguments

CHANGELOG.md

@@ -19,6 +19,7 @@
 ### Bug fixes
 
 * [#6936](https://github.com/rubocop-hq/rubocop/issues/6936): Fix `Layout/MultilineMethodArgumentLineBreaks` when bracket hash assignment on multiple lines. ([@maxh][])
+* Mark `Layout/HeredocArgumentClosingParenthesis` incompatible with `Style/TrailingCommaInArguments`. ([@maxh][])
 
 ## 0.70.0 (2019-05-21)
 

lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb

@@ -108,6 +108,10 @@ def autocorrect(node)
           end
         end
 
+        def self.autocorrect_incompatible_with
+          [Style::TrailingCommaInArguments]
+        end
+
         private
 
         def outermost_send_on_same_line(heredoc)

lib/rubocop/cop/style/trailing_comma_in_arguments.rb

@@ -65,6 +65,10 @@ def autocorrect(range)
           PunctuationCorrector.swap_comma(range)
         end
 
+        def self.autocorrect_incompatible_with
+          [Layout::HeredocArgumentClosingParenthesis]
+        end
+
         private
 
         def avoid_autocorrect?(args)

spec/rubocop/cli/cli_autocorrect_spec.rb

@@ -1563,4 +1563,35 @@ def method_a
       end
     RUBY
   end
+
+  it 'corrects HeredocArgumentClosingParenthesis offenses and ' \
+     'ignores TrailingCommaInArguments offense' do
+    create_file('example.rb', <<~RUBY)
+      result = foo(
+        # comment
+        <<~SQL.squish
+          SELECT * FROM bar
+        SQL
+      )
+    RUBY
+    create_file('.rubocop.yml', <<~YAML)
+      Layout/HeredocArgumentClosingParenthesis:
+        Enabled: true
+      Style/TrailingCommaInArguments:
+        Enabled: true
+        EnforcedStyleForMultiline: comma
+    YAML
+
+    expect(cli.run(%w[--auto-correct])).to eq(1)
+    expect($stderr.string).to eq('')
+    expect(IO.read('example.rb')).to eq(<<~RUBY)
+      # frozen_string_literal: true
+
+      result = foo(
+        # comment
+        <<~SQL.squish)
+          SELECT * FROM bar
+        SQL
+    RUBY
+  end
 end