Merge pull request #4451 from som-snytt/issue/3368-remediate

SI-3368 Default to coalescing for 2.11

8 files changed, 390 insertions, 2 deletions

diff --git a/test/files/run/t3368-b.check b/test/files/run/t3368-b.check
new file mode 100644
index 0000000000..4cbe98c577
--- /dev/null
+++ b/test/files/run/t3368-b.check
@@ -0,0 +1,89 @@
+[[syntax trees at end of                    parser]] // newSource1.scala
+package <empty> {
+  abstract trait X extends scala.AnyRef {
+    def $init$() = {
+      ()
+    };
+    def x = {
+      val $buf = new _root_.scala.xml.NodeBuffer();
+      $buf.$amp$plus(new _root_.scala.xml.PCData("hi & bye"));
+      $buf.$amp$plus(new _root_.scala.xml.PCData("red & black"));
+      $buf
+    }
+  };
+  abstract trait Y extends scala.AnyRef {
+    def $init$() = {
+      ()
+    };
+    def y = {
+      {
+        new _root_.scala.xml.Elem(null, "a", _root_.scala.xml.Null, $scope, false, ({
+          val $buf = new _root_.scala.xml.NodeBuffer();
+          $buf.$amp$plus({
+            {
+              new _root_.scala.xml.Elem(null, "b", _root_.scala.xml.Null, $scope, true)
+            }
+          });
+          $buf.$amp$plus(new _root_.scala.xml.Text("start"));
+          $buf.$amp$plus(new _root_.scala.xml.PCData("hi & bye"));
+          $buf.$amp$plus({
+            {
+              new _root_.scala.xml.Elem(null, "c", _root_.scala.xml.Null, $scope, true)
+            }
+          });
+          $buf.$amp$plus(new _root_.scala.xml.Text("world"));
+          $buf.$amp$plus({
+            {
+              new _root_.scala.xml.Elem(null, "d", _root_.scala.xml.Null, $scope, true)
+            }
+          });
+          $buf.$amp$plus(new _root_.scala.xml.Text("stuff"));
+          $buf.$amp$plus(new _root_.scala.xml.PCData("red & black"));
+          $buf
+        }: _*))
+      }
+    }
+  };
+  abstract trait Z extends scala.AnyRef {
+    def $init$() = {
+      ()
+    };
+    def d = new _root_.scala.xml.PCData("hello, world");
+    def e = {
+      val $buf = new _root_.scala.xml.NodeBuffer();
+      $buf.$amp$plus(new _root_.scala.xml.PCData("hello, world"));
+      $buf.$amp$plus(new _root_.scala.xml.PCData("hello, world"));
+      $buf
+    };
+    def f = {
+      {
+        new _root_.scala.xml.Elem(null, "foo", _root_.scala.xml.Null, $scope, false, ({
+          val $buf = new _root_.scala.xml.NodeBuffer();
+          $buf.$amp$plus(new _root_.scala.xml.Text("x"));
+          $buf.$amp$plus(new _root_.scala.xml.PCData("hello, world"));
+          $buf
+        }: _*))
+      }
+    };
+    def g = {
+      {
+        new _root_.scala.xml.Elem(null, "foo", _root_.scala.xml.Null, $scope, false, ({
+          val $buf = new _root_.scala.xml.NodeBuffer();
+          $buf.$amp$plus(new _root_.scala.xml.PCData("hello, world"));
+          $buf
+        }: _*))
+      }
+    };
+    def h = {
+      {
+        new _root_.scala.xml.Elem(null, "foo", _root_.scala.xml.Null, $scope, false, ({
+          val $buf = new _root_.scala.xml.NodeBuffer();
+          $buf.$amp$plus(new _root_.scala.xml.PCData("hello, world"));
+          $buf.$amp$plus(new _root_.scala.xml.PCData("hello, world"));
+          $buf
+        }: _*))
+      }
+    }
+  }
+}
+
diff --git a/test/files/run/t3368-b.scala b/test/files/run/t3368-b.scala
new file mode 100644
index 0000000000..108cb9a5ee
--- /dev/null
+++ b/test/files/run/t3368-b.scala
@@ -0,0 +1,26 @@
+
+import scala.tools.partest.ParserTest
+
+
+object Test extends ParserTest {
+
+  override def code = """
+  trait X {
+    // error: in XML literal: name expected, but char '!' cannot start a name
+    def x = <![CDATA[hi & bye]]> <![CDATA[red & black]]>
+  }
+  trait Y {
+    def y = <a><b/>start<![CDATA[hi & bye]]><c/>world<d/>stuff<![CDATA[red & black]]></a>
+  }
+  trait Z {
+    def d = <![CDATA[hello, world]]>
+    def e = <![CDATA[hello, world]]><![CDATA[hello, world]]>            // top level not coalesced
+    def f = <foo>x<![CDATA[hello, world]]></foo>                        // adjoining text
+    def g = <foo><![CDATA[hello, world]]></foo>                         // text node when coalescing
+    def h = <foo><![CDATA[hello, world]]><![CDATA[hello, world]]></foo>
+  }
+  """
+
+  // not coalescing
+  override def extraSettings = s"${super.extraSettings} -Xxml:-coalescing"
+}
diff --git a/test/files/run/t3368-c.check b/test/files/run/t3368-c.check
new file mode 100644
index 0000000000..e0c10cc0dd
--- /dev/null
+++ b/test/files/run/t3368-c.check
@@ -0,0 +1,85 @@
+[[syntax trees at end of                    parser]] // newSource1.scala
+package <empty> {
+  abstract trait X extends scala.AnyRef {
+    def $init$() = {
+      ()
+    };
+    def x = {
+      val $buf = new _root_.scala.xml.NodeBuffer();
+      $buf.$amp$plus(new _root_.scala.xml.Text("hi & bye"));
+      $buf.$amp$plus(new _root_.scala.xml.Text("red & black"));
+      $buf
+    }
+  };
+  abstract trait Y extends scala.AnyRef {
+    def $init$() = {
+      ()
+    };
+    def y = {
+      {
+        new _root_.scala.xml.Elem(null, "a", _root_.scala.xml.Null, $scope, false, ({
+          val $buf = new _root_.scala.xml.NodeBuffer();
+          $buf.$amp$plus({
+            {
+              new _root_.scala.xml.Elem(null, "b", _root_.scala.xml.Null, $scope, true)
+            }
+          });
+          $buf.$amp$plus(new _root_.scala.xml.Text("starthi & bye"));
+          $buf.$amp$plus({
+            {
+              new _root_.scala.xml.Elem(null, "c", _root_.scala.xml.Null, $scope, true)
+            }
+          });
+          $buf.$amp$plus(new _root_.scala.xml.Text("world"));
+          $buf.$amp$plus({
+            {
+              new _root_.scala.xml.Elem(null, "d", _root_.scala.xml.Null, $scope, true)
+            }
+          });
+          $buf.$amp$plus(new _root_.scala.xml.Text("stuffred & black"));
+          $buf
+        }: _*))
+      }
+    }
+  };
+  abstract trait Z extends scala.AnyRef {
+    def $init$() = {
+      ()
+    };
+    def d = new _root_.scala.xml.Text("hello, world");
+    def e = {
+      val $buf = new _root_.scala.xml.NodeBuffer();
+      $buf.$amp$plus(new _root_.scala.xml.Text("hello, world"));
+      $buf.$amp$plus(new _root_.scala.xml.Text("hello, world"));
+      $buf
+    };
+    def f = {
+      {
+        new _root_.scala.xml.Elem(null, "foo", _root_.scala.xml.Null, $scope, false, ({
+          val $buf = new _root_.scala.xml.NodeBuffer();
+          $buf.$amp$plus(new _root_.scala.xml.Text("xhello, world"));
+          $buf
+        }: _*))
+      }
+    };
+    def g = {
+      {
+        new _root_.scala.xml.Elem(null, "foo", _root_.scala.xml.Null, $scope, false, ({
+          val $buf = new _root_.scala.xml.NodeBuffer();
+          $buf.$amp$plus(new _root_.scala.xml.Text("hello, world"));
+          $buf
+        }: _*))
+      }
+    };
+    def h = {
+      {
+        new _root_.scala.xml.Elem(null, "foo", _root_.scala.xml.Null, $scope, false, ({
+          val $buf = new _root_.scala.xml.NodeBuffer();
+          $buf.$amp$plus(new _root_.scala.xml.Text("hello, worldhello, world"));
+          $buf
+        }: _*))
+      }
+    }
+  }
+}
+
diff --git a/test/files/run/t3368-c.scala b/test/files/run/t3368-c.scala
new file mode 100644
index 0000000000..5121794463
--- /dev/null
+++ b/test/files/run/t3368-c.scala
@@ -0,0 +1,26 @@
+
+import scala.tools.partest.ParserTest
+
+
+object Test extends ParserTest {
+
+  override def code = """
+  trait X {
+    // error: in XML literal: name expected, but char '!' cannot start a name
+    def x = <![CDATA[hi & bye]]> <![CDATA[red & black]]>
+  }
+  trait Y {
+    def y = <a><b/>start<![CDATA[hi & bye]]><c/>world<d/>stuff<![CDATA[red & black]]></a>
+  }
+  trait Z {
+    def d = <![CDATA[hello, world]]>
+    def e = <![CDATA[hello, world]]><![CDATA[hello, world]]>            // top level not coalesced
+    def f = <foo>x<![CDATA[hello, world]]></foo>                        // adjoining text
+    def g = <foo><![CDATA[hello, world]]></foo>                         // text node when coalescing
+    def h = <foo><![CDATA[hello, world]]><![CDATA[hello, world]]></foo>
+  }
+  """
+
+  // default coalescing behavior, whatever that is today.
+  //override def extraSettings = s"${super.extraSettings} -Xxml:coalescing"
+}
diff --git a/test/files/run/t3368-d.check b/test/files/run/t3368-d.check
new file mode 100644
index 0000000000..4cbe98c577
--- /dev/null
+++ b/test/files/run/t3368-d.check
@@ -0,0 +1,89 @@
+[[syntax trees at end of                    parser]] // newSource1.scala
+package <empty> {
+  abstract trait X extends scala.AnyRef {
+    def $init$() = {
+      ()
+    };
+    def x = {
+      val $buf = new _root_.scala.xml.NodeBuffer();
+      $buf.$amp$plus(new _root_.scala.xml.PCData("hi & bye"));
+      $buf.$amp$plus(new _root_.scala.xml.PCData("red & black"));
+      $buf
+    }
+  };
+  abstract trait Y extends scala.AnyRef {
+    def $init$() = {
+      ()
+    };
+    def y = {
+      {
+        new _root_.scala.xml.Elem(null, "a", _root_.scala.xml.Null, $scope, false, ({
+          val $buf = new _root_.scala.xml.NodeBuffer();
+          $buf.$amp$plus({
+            {
+              new _root_.scala.xml.Elem(null, "b", _root_.scala.xml.Null, $scope, true)
+            }
+          });
+          $buf.$amp$plus(new _root_.scala.xml.Text("start"));
+          $buf.$amp$plus(new _root_.scala.xml.PCData("hi & bye"));
+          $buf.$amp$plus({
+            {
+              new _root_.scala.xml.Elem(null, "c", _root_.scala.xml.Null, $scope, true)
+            }
+          });
+          $buf.$amp$plus(new _root_.scala.xml.Text("world"));
+          $buf.$amp$plus({
+            {
+              new _root_.scala.xml.Elem(null, "d", _root_.scala.xml.Null, $scope, true)
+            }
+          });
+          $buf.$amp$plus(new _root_.scala.xml.Text("stuff"));
+          $buf.$amp$plus(new _root_.scala.xml.PCData("red & black"));
+          $buf
+        }: _*))
+      }
+    }
+  };
+  abstract trait Z extends scala.AnyRef {
+    def $init$() = {
+      ()
+    };
+    def d = new _root_.scala.xml.PCData("hello, world");
+    def e = {
+      val $buf = new _root_.scala.xml.NodeBuffer();
+      $buf.$amp$plus(new _root_.scala.xml.PCData("hello, world"));
+      $buf.$amp$plus(new _root_.scala.xml.PCData("hello, world"));
+      $buf
+    };
+    def f = {
+      {
+        new _root_.scala.xml.Elem(null, "foo", _root_.scala.xml.Null, $scope, false, ({
+          val $buf = new _root_.scala.xml.NodeBuffer();
+          $buf.$amp$plus(new _root_.scala.xml.Text("x"));
+          $buf.$amp$plus(new _root_.scala.xml.PCData("hello, world"));
+          $buf
+        }: _*))
+      }
+    };
+    def g = {
+      {
+        new _root_.scala.xml.Elem(null, "foo", _root_.scala.xml.Null, $scope, false, ({
+          val $buf = new _root_.scala.xml.NodeBuffer();
+          $buf.$amp$plus(new _root_.scala.xml.PCData("hello, world"));
+          $buf
+        }: _*))
+      }
+    };
+    def h = {
+      {
+        new _root_.scala.xml.Elem(null, "foo", _root_.scala.xml.Null, $scope, false, ({
+          val $buf = new _root_.scala.xml.NodeBuffer();
+          $buf.$amp$plus(new _root_.scala.xml.PCData("hello, world"));
+          $buf.$amp$plus(new _root_.scala.xml.PCData("hello, world"));
+          $buf
+        }: _*))
+      }
+    }
+  }
+}
+
diff --git a/test/files/run/t3368-d.scala b/test/files/run/t3368-d.scala
new file mode 100644
index 0000000000..5777c1a81e
--- /dev/null
+++ b/test/files/run/t3368-d.scala
@@ -0,0 +1,26 @@
+
+import scala.tools.partest.ParserTest
+
+
+object Test extends ParserTest {
+
+  override def code = """
+  trait X {
+    // error: in XML literal: name expected, but char '!' cannot start a name
+    def x = <![CDATA[hi & bye]]> <![CDATA[red & black]]>
+  }
+  trait Y {
+    def y = <a><b/>start<![CDATA[hi & bye]]><c/>world<d/>stuff<![CDATA[red & black]]></a>
+  }
+  trait Z {
+    def d = <![CDATA[hello, world]]>
+    def e = <![CDATA[hello, world]]><![CDATA[hello, world]]>            // top level not coalesced
+    def f = <foo>x<![CDATA[hello, world]]></foo>                        // adjoining text
+    def g = <foo><![CDATA[hello, world]]></foo>                         // text node when coalescing
+    def h = <foo><![CDATA[hello, world]]><![CDATA[hello, world]]></foo>
+  }
+  """
+
+  // default under 2.12 is not coalescing
+  override def extraSettings = s"${super.extraSettings} -Xsource:212"
+}
diff --git a/test/files/run/t3368.check b/test/files/run/t3368.check
index 1d9dd677f6..e0c10cc0dd 100644
--- a/test/files/run/t3368.check
+++ b/test/files/run/t3368.check
@@ -6,8 +6,8 @@ package <empty> {
     };
     def x = {
       val $buf = new _root_.scala.xml.NodeBuffer();
-      $buf.$amp$plus(new _root_.scala.xml.PCData("hi & bye"));
-      $buf.$amp$plus(new _root_.scala.xml.PCData("red & black"));
+      $buf.$amp$plus(new _root_.scala.xml.Text("hi & bye"));
+      $buf.$amp$plus(new _root_.scala.xml.Text("red & black"));
       $buf
     }
   };
@@ -41,6 +41,45 @@ package <empty> {
         }: _*))
       }
     }
+  };
+  abstract trait Z extends scala.AnyRef {
+    def $init$() = {
+      ()
+    };
+    def d = new _root_.scala.xml.Text("hello, world");
+    def e = {
+      val $buf = new _root_.scala.xml.NodeBuffer();
+      $buf.$amp$plus(new _root_.scala.xml.Text("hello, world"));
+      $buf.$amp$plus(new _root_.scala.xml.Text("hello, world"));
+      $buf
+    };
+    def f = {
+      {
+        new _root_.scala.xml.Elem(null, "foo", _root_.scala.xml.Null, $scope, false, ({
+          val $buf = new _root_.scala.xml.NodeBuffer();
+          $buf.$amp$plus(new _root_.scala.xml.Text("xhello, world"));
+          $buf
+        }: _*))
+      }
+    };
+    def g = {
+      {
+        new _root_.scala.xml.Elem(null, "foo", _root_.scala.xml.Null, $scope, false, ({
+          val $buf = new _root_.scala.xml.NodeBuffer();
+          $buf.$amp$plus(new _root_.scala.xml.Text("hello, world"));
+          $buf
+        }: _*))
+      }
+    };
+    def h = {
+      {
+        new _root_.scala.xml.Elem(null, "foo", _root_.scala.xml.Null, $scope, false, ({
+          val $buf = new _root_.scala.xml.NodeBuffer();
+          $buf.$amp$plus(new _root_.scala.xml.Text("hello, worldhello, world"));
+          $buf
+        }: _*))
+      }
+    }
   }
 }
 
diff --git a/test/files/run/t3368.scala b/test/files/run/t3368.scala
index 15acba5099..284fed0784 100644
--- a/test/files/run/t3368.scala
+++ b/test/files/run/t3368.scala
@@ -12,7 +12,15 @@ object Test extends ParserTest {
   trait Y {
     def y = <a><b/>start<![CDATA[hi & bye]]><c/>world<d/>stuff<![CDATA[red & black]]></a>
   }
+  trait Z {
+    def d = <![CDATA[hello, world]]>
+    def e = <![CDATA[hello, world]]><![CDATA[hello, world]]>            // top level not coalesced
+    def f = <foo>x<![CDATA[hello, world]]></foo>                        // adjoining text
+    def g = <foo><![CDATA[hello, world]]></foo>                         // text node when coalescing
+    def h = <foo><![CDATA[hello, world]]><![CDATA[hello, world]]></foo>
+  }
   """
 
+  // coalescing
   override def extraSettings = s"${super.extraSettings} -Xxml:coalescing"
 }