From 783f5fc65d484334f1322a31a8ec3adc70fdbba6 Mon Sep 17 00:00:00 2001
From: Chris Roberts <croberts@hashicorp.com>
Date: Mon, 14 Oct 2019 16:56:40 -0700
Subject: [PATCH 1/2] Update UI to properly retain newlines when adding prefix

When using a Prefixed UI instance prevent new line characters from
being removed when adding prefix formatting to output messages.

Fixes #11044
---
 lib/vagrant/ui.rb            | 10 ++++++----
 test/unit/vagrant/ui_test.rb |  8 ++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/vagrant/ui.rb b/lib/vagrant/ui.rb
index 70474d111..f4ebfb378 100644
--- a/lib/vagrant/ui.rb
+++ b/lib/vagrant/ui.rb
@@ -329,10 +329,12 @@ module Vagrant
         target = opts[:target] if opts.key?(:target)
         target = "#{target}:" if target != ""
 
-        # Get the lines. The first default is because if the message
-        # is an empty string, then we want to still use the empty string.
-        lines = [message]
-        lines = message.split("\n") if message != ""
+        lines = [].tap do |l|
+          message.scan(/(.*?)(\n|$)/).each do |m|
+            l << m.first if m.first != "" || (m.first == "" && m.last == "\n")
+          end
+        end
+        lines << "" if message.end_with?("\n")
 
         # Otherwise, make sure to prefix every line properly
         lines.map do |line|
diff --git a/test/unit/vagrant/ui_test.rb b/test/unit/vagrant/ui_test.rb
index c1eb89211..4bc185ec1 100644
--- a/test/unit/vagrant/ui_test.rb
+++ b/test/unit/vagrant/ui_test.rb
@@ -406,4 +406,12 @@ describe Vagrant::UI::Prefixed do
       subject.output("foo", target: "bar")
     end
   end
+
+  describe "#format_message" do
+    it "should return the same number of new lines as given" do
+      ["no new line", "one\nnew line", "two\nnew lines\n", "three\nnew lines\n\n"].each do |msg|
+        expect(subject.format_message(:detail, msg).count("\n")).to eq(msg.count("\n"))
+      end
+    end
+  end
 end

From 318dca294af926bd0157a4130fea365a7d2f7f22 Mon Sep 17 00:00:00 2001
From: Chris Roberts <croberts@hashicorp.com>
Date: Tue, 15 Oct 2019 08:54:24 -0700
Subject: [PATCH 2/2] Ensure empty message values are properly formatted

---
 lib/vagrant/ui.rb            | 11 +++++++----
 test/unit/vagrant/ui_test.rb |  5 +++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/vagrant/ui.rb b/lib/vagrant/ui.rb
index f4ebfb378..ee3547fc8 100644
--- a/lib/vagrant/ui.rb
+++ b/lib/vagrant/ui.rb
@@ -329,12 +329,15 @@ module Vagrant
         target = opts[:target] if opts.key?(:target)
         target = "#{target}:" if target != ""
 
-        lines = [].tap do |l|
-          message.scan(/(.*?)(\n|$)/).each do |m|
-            l << m.first if m.first != "" || (m.first == "" && m.last == "\n")
+        lines = [message]
+        if message != ""
+          lines = [].tap do |l|
+            message.scan(/(.*?)(\n|$)/).each do |m|
+              l << m.first if m.first != "" || (m.first == "" && m.last == "\n")
+            end
           end
+          lines << "" if message.end_with?("\n")
         end
-        lines << "" if message.end_with?("\n")
 
         # Otherwise, make sure to prefix every line properly
         lines.map do |line|
diff --git a/test/unit/vagrant/ui_test.rb b/test/unit/vagrant/ui_test.rb
index 4bc185ec1..5cc1722d8 100644
--- a/test/unit/vagrant/ui_test.rb
+++ b/test/unit/vagrant/ui_test.rb
@@ -413,5 +413,10 @@ describe Vagrant::UI::Prefixed do
         expect(subject.format_message(:detail, msg).count("\n")).to eq(msg.count("\n"))
       end
     end
+
+    it "should properly format a blank message" do
+      expect(subject.format_message(:detail, "", target: "default", prefix: true)).
+        to match(/\s+default:\s+/)
+    end
   end
 end