Merge branch '33220-fix-cop-line-break-around-conditional-block' into 'master'

Fix Cop/LineBreakAroundConditionalBlock for block+comment

Closes #33220

See merge request gitlab-org/gitlab!18002

rubocop/cop/line_break_around_conditional_block.rb

@@ -117,7 +117,7 @@ module RuboCop
       end
 
       def block_start?(line)
-        line.match(/ (do|{)( \|.*?\|)?\s?$/)
+        line.match(/ (do|{)( \|.*?\|)?\s?(#.+)?\z/)
       end
 
       def end_line?(line)

spec/rubocop/cop/line_break_around_conditional_block_spec.rb

@@ -132,6 +132,19 @@ describe RuboCop::Cop::LineBreakAroundConditionalBlock do
       expect(cop.offenses).to be_empty
     end
 
+    it "doesn't flag violation for #{conditional} preceded by a block definition with a comment" do
+      source = <<~RUBY
+          on_block(param_a) do |item| # a short comment
+            #{conditional} condition
+              do_something
+            end
+          end
+      RUBY
+      inspect_source(source)
+
+      expect(cop.offenses).to be_empty
+    end
+
     it "doesn't flag violation for #{conditional} preceded by a block definition using brackets" do
       source = <<~RUBY
           on_block(param_a) { |item|