indent: handle consecutive linebreaks

lib/pry/indent.rb

@@ -160,6 +160,10 @@ def indent(input)
         before.times { prefix.sub! SPACES, '' }
         new_prefix = prefix + SPACES * after
 
+        if !end_with_newline?(output) && already_indented?(output, prefix)
+          prefix = "\n" + prefix
+        end
+
         line = prefix + line.lstrip unless previously_in_string
 
         output += line
@@ -276,6 +280,14 @@ def in_string?
       !open_delimiters.empty?
     end
 
+    def already_indented?(output, prefix)
+      !output.lines.last.nil? && output.lines.last.to_s.start_with?(prefix)
+    end
+
+    def end_with_newline?(output)
+      output.lines.last.to_s.end_with?("\n")
+    end
+
     # Given a string of Ruby code, use CodeRay to export the tokens.
     #
     # @param [String] string The Ruby to lex

spec/indent_spec.rb

@@ -102,6 +102,36 @@ def number
     expect(@indent.indent(input)).to eq output
   end
 
+  it 'should properly indent nested code with consecutive linebreaks' do
+    input = <<TXT.strip
+class C
+  def foo
+    :foo
+  end
+
+  def bar
+    :bar
+  end
+end
+TXT
+
+    # rubocop:disable Layout/TrailingWhitespace
+    output = <<TXT.strip
+class C
+  def foo
+    :foo
+  end
+  
+  def bar
+    :bar
+  end
+end
+TXT
+    # rubocop:enable Layout/TrailingWhitespace
+
+    expect(@indent.indent(input).inspect).to eq output.inspect
+  end
+
   it 'should indent statements such as if, else, etc' do
     input = <<TXT.strip
 if a == 10