Merge branch 'rs-line-break-around-conditional-cop' into 'master'

Fix LineBreakAroundConditionalBlock cop for a conditional after rescue

See merge request gitlab-org/gitlab-ce!21535

rubocop/cop/line_break_around_conditional_block.rb

@@ -77,7 +77,8 @@ module RuboCop
           start_clause_line?(previous_line(node)) ||
           block_start?(previous_line(node)) ||
           begin_line?(previous_line(node)) ||
-          assignment_line?(previous_line(node))
+          assignment_line?(previous_line(node)) ||
+          rescue_line?(previous_line(node))
       end
 
       def last_line_valid?(node)
@@ -111,6 +112,10 @@ module RuboCop
         line =~ /^\s*.*=/
       end
 
+      def rescue_line?(line)
+        line =~ /^\s*rescue/
+      end
+
       def block_start?(line)
         line.match(/ (do|{)( \|.*?\|)?\s?$/)
       end

spec/rubocop/cop/line_break_around_conditional_block_spec.rb

@@ -328,6 +328,22 @@ describe RuboCop::Cop::LineBreakAroundConditionalBlock do
       expect(cop.offenses).to be_empty
     end
 
+    it "doesn't flag violation for #{conditional} preceded by a rescue" do
+      source = <<~RUBY
+        def a_method
+          do_something
+        rescue
+          #{conditional} condition
+            do_something
+          end
+        end
+      RUBY
+
+      inspect_source(source)
+
+      expect(cop.offenses).to be_empty
+    end
+
     it "doesn't flag violation for #{conditional} followed by a rescue" do
       source = <<~RUBY
             def a_method