Merge pull request #9642 from dvandersluis/issue/9641

[Fix #9641] Fix `Layout/MultilineMethodCallIndentation` triggering on method calls that look like operators

changelog/fix_fix_layoutmultilinemethodcallindentation.md

@@ -0,0 +1 @@
+* [#9641](https://github.com/rubocop/rubocop/issues/9641): Fix `Layout/MultilineMethodCallIndentation` triggering on method calls that look like operators. ([@dvandersluis][])

lib/rubocop/cop/layout/multiline_method_call_indentation.rb

@@ -72,6 +72,18 @@ def relevant_node?(send_node)
           send_node.loc.dot # Only check method calls with dot operator
         end
 
+        def right_hand_side(send_node)
+          dot = send_node.loc.dot
+          selector = send_node.loc.selector
+          if send_node.dot? && selector && dot.line == selector.line
+            dot.join(selector)
+          elsif selector
+            selector
+          elsif send_node.implicit_call?
+            dot.join(send_node.loc.begin)
+          end
+        end
+
         def offending_range(node, lhs, rhs, given_style)
           return false unless begins_its_line?(rhs)
           return false if not_for_this_cop?(node)

lib/rubocop/cop/layout/multiline_operation_indentation.rb

@@ -118,6 +118,10 @@ def message(node, lhs, rhs)
               "spaces for indenting #{what} spanning multiple lines."
           end
         end
+
+        def right_hand_side(send_node)
+          send_node.first_argument.source_range
+        end
       end
     end
   end

lib/rubocop/cop/mixin/multiline_expression_indentation.rb

@@ -35,26 +35,6 @@ def left_hand_side(lhs)
         lhs
       end
 
-      def right_hand_side(send_node)
-        if send_node.operator_method? && send_node.arguments?
-          send_node.first_argument.source_range # not used for method calls
-        else
-          regular_method_right_hand_side(send_node)
-        end
-      end
-
-      def regular_method_right_hand_side(send_node)
-        dot = send_node.loc.dot
-        selector = send_node.loc.selector
-        if send_node.dot? && selector && dot.line == selector.line
-          dot.join(selector)
-        elsif selector
-          selector
-        elsif send_node.implicit_call?
-          dot.join(send_node.loc.begin)
-        end
-      end
-
       # The correct indentation of `node` is usually `IndentationWidth`, with
       # one exception: prefix keywords.
       #

spec/rubocop/cop/layout/multiline_method_call_indentation_spec.rb

@@ -95,6 +95,15 @@
           .my_method
       RUBY
     end
+
+    it 'accepts alignment of method with assignment and operator-like method' do
+      expect_no_offenses(<<~RUBY)
+        query = x.|(
+          foo,
+          bar
+        )
+      RUBY
+    end
   end
 
   shared_examples 'common for aligned and indented' do

spec/rubocop/cop/layout/multiline_operation_indentation_spec.rb

@@ -81,6 +81,11 @@
         .a
           .b(c)
 
+        Foo.&(
+            foo,
+            bar
+        )
+
         expect { Foo.new }.
           to change { Bar.count }.
               from(1).to(2)