Preserve attribute order in inline XML

scala · Jan 14, 2012 · 126469f · 126469f
1 parent 066b1a1
commit 126469f
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 14 deletions.
diff --git 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
@@ -206,7 +206,7 @@ x equals y: true, y equals x: true
 
 x = <html>
       <body>
-        <table cellspacing="0" cellpadding="2">
+        <table cellpadding="2" cellspacing="0">
         <tr>
           <th>Last Name</th>
           <th>First Name</th>
@@ -226,7 +226,7 @@ x = <html>
       </html>
 y = <html>
       <body>
-        <table cellspacing="0" cellpadding="2">
+        <table cellpadding="2" cellspacing="0">
         <tr>
           <th>Last Name</th>
           <th>First Name</th>

diff --git a/test/files/run/xml-attribute.check b/test/files/run/xml-attribute.check
@@ -0,0 +1,12 @@
+<t></t>
+<t></t>
+<t></t>
+<t></t>
+<t></t>
+<t b="1" d="2"></t>
+<t b="1" d="2"></t>
+<t b="1" d="2"></t>
+<t a="1" d="2"></t>
+<t b="1" d="2"></t>
+<t a="1" b="2" c="3"></t>
+<t g="1" e="2" p:a="3" f:e="4" mgruhu:ji="5"></t>
diff --git a/test/files/run/xml-attribute.scala b/test/files/run/xml-attribute.scala
@@ -12,22 +12,26 @@ object Test {
     assert(noAttr == preAttrNull)
     assert(noAttr == preAttrNone)
 
-    val noAttrStr = "<t></t>"
-    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 = <t b="1" d="2"/>
     val xml2 = <t a={ null: String } p:a={ null: String } b="1" c={ null: String } d="2"/>
     val xml3 = <t b="1" c={ null: String } d="2" a={ null: String } p:a={ null: String }/>
     assert(xml1 == xml2)
     assert(xml1 == xml3)
 
-    val xml1Str = "<t d=\"2\" b=\"1\"></t>"
-    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(<t a="1" d="2"/>)
+    println(<t b="1" d="2"/>)
+    println(<t a="1" b="2" c="3"/>)
+    println(<t g="1" e="2" p:a="3" f:e="4" mgruhu:ji="5"/>)
   }
 }
diff --git 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("<span title=\"gt4s: $plus$colon\" class=\"name\">+:</span>") &&
           html.contains("<span title=\"gt4s: $minus$colon\" class=\"name\">-:</span>") &&
-            html.contains("""<span class="params">(<span name="n">n: <span name="scala.Int" class="extype">Int</span></span>)</span><span class="result">: <span name="scala.Int" class="extype">Int</span></span>""")
+            html.contains("""<span class="params">(<span name="n">n: <span class="extype" name="scala.Int">Int</span></span>)</span><span class="result">: <span class="extype" name="scala.Int">Int</span></span>""")
       }
       case _ => false
     }