Merge pull request rubocop#13159 from koic/fix_an_error_for_style_one…

…_line_conditional

Fix an error for `StyleOneLineConditional`

changelog/fix_an_error_for_style_one_line_conditional.md

@@ -0,0 +1 @@
+* [#13159](https://github.com/rubocop/rubocop/pull/13159): Fix an error for `Style/OneLineConditional` when using if/then/else/end with multiple expressions in the `then` body. ([@koic][])

lib/rubocop/cop/style/one_line_conditional.rb

@@ -42,7 +42,7 @@ class OneLineConditional < Base
         def on_normal_if_unless(node)
           return unless node.single_line?
           return unless node.else_branch
-          return if node.elsif?
+          return if node.elsif? || node.if_branch&.begin_type?
 
           message = message(node)
           add_offense(node, message: message) do |corrector|

spec/rubocop/cop/style/one_line_conditional_spec.rb

@@ -53,6 +53,12 @@
       expect_no_offenses('if cond then run end')
     end
 
+    it 'does not register an offense when using if/then/else/end with multiple expressions in the `then` body' do
+      expect_no_offenses(<<~RUBY)
+        if cond then x; y else z end
+      RUBY
+    end
+
     it 'registers and corrects an offense with ternary operator for unless/then/else/end' do
       expect_offense(<<~RUBY)
         unless cond then run else dont end