diff --git a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala
index 7388ecf16386..46ade7d88944 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala
@@ -117,7 +117,7 @@ trait MarkupParsers {
* | `{` scalablock `}`
*/
def xAttributes = {
- val aMap = mutable.HashMap[String, Tree]()
+ val aMap = mutable.LinkedHashMap[String, Tree]()
while (isNameStart(ch)) {
val start = curOffset
diff --git a/test/files/jvm/serialization.check b/test/files/jvm/serialization.check
index bc56387f8188..f58f763a7646 100644
--- a/test/files/jvm/serialization.check
+++ b/test/files/jvm/serialization.check
@@ -206,7 +206,7 @@ x equals y: true, y equals x: true
x =
-
+
Last Name |
First Name |
@@ -226,7 +226,7 @@ x =
y =
-
+
Last Name |
First Name |
diff --git a/test/files/run/xml-attribute.check b/test/files/run/xml-attribute.check
new file mode 100644
index 000000000000..3ae20346844a
--- /dev/null
+++ b/test/files/run/xml-attribute.check
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/files/run/xml-attribute.scala b/test/files/run/xml-attribute.scala
index 8b261acc944c..eb3956c41bc0 100644
--- a/test/files/run/xml-attribute.scala
+++ b/test/files/run/xml-attribute.scala
@@ -12,12 +12,11 @@ object Test {
assert(noAttr == preAttrNull)
assert(noAttr == preAttrNone)
- val noAttrStr = ""
- assert(noAttr.toString() == noAttrStr)
- assert(attrNull.toString() == noAttrStr)
- assert(attrNone.toString() == noAttrStr)
- assert(preAttrNull.toString() == noAttrStr)
- assert(preAttrNone.toString() == noAttrStr)
+ println(noAttr)
+ println(attrNull)
+ println(attrNone)
+ println(preAttrNull)
+ println(preAttrNone)
val xml1 =
val xml2 =
@@ -25,9 +24,14 @@ object Test {
assert(xml1 == xml2)
assert(xml1 == xml3)
- val xml1Str = ""
- assert(xml1.toString() == xml1Str)
- assert(xml2.toString() == xml1Str)
- assert(xml3.toString() == xml1Str)
+ println(xml1)
+ println(xml2)
+ println(xml3)
+
+ // Check if attribute order is retained
+ println()
+ println()
+ println()
+ println()
}
}
diff --git a/test/scaladoc/scala/html/HtmlFactoryTest.scala b/test/scaladoc/scala/html/HtmlFactoryTest.scala
index d03094d0ab25..e2687dd51047 100644
--- a/test/scaladoc/scala/html/HtmlFactoryTest.scala
+++ b/test/scaladoc/scala/html/HtmlFactoryTest.scala
@@ -192,7 +192,7 @@ object Test extends Properties("HtmlFactory") {
val html = node.toString
html.contains("+:") &&
html.contains("-:") &&
- html.contains("""(n: Int): Int""")
+ html.contains("""(n: Int): Int""")
}
case _ => false
}