Revert removeal of escMap import in de0b47e

ashawley · ashawley · commit 60cfbde348a7 · 2017-05-24T12:03:00.000-04:00
diff --git a/shared/src/main/scala/scala/xml/Utility.scala b/shared/src/main/scala/scala/xml/Utility.scala
@@ -102,7 +102,7 @@ object Utility extends AnyRef with parsing.TokenTests {
     val escMap = (pairs - "apos") map { case (s, c) => c -> ("&%s;" format s) }
     val unescMap = pairs
   }
-  import Escapes.unescMap
+  import Escapes.{ escMap, unescMap }
 
   /**
    * Appends escaped string to `s`.
@@ -113,7 +113,7 @@ object Utility extends AnyRef with parsing.TokenTests {
     text.iterator.foldLeft(s) { (s, c) =>
       escMap.get(c) match {
         case Some(str)                             => s ++= str
-        case _ => if c >= ' ' || "\n\r\t".contains(c) => s += c
+        case _ if c >= ' ' || "\n\r\t".contains(c) => s += c
         case _ => s // noop
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ object Utility extends AnyRef with parsing.TokenTests {`
`102`	`102`	`val escMap = (pairs - "apos") map { case (s, c) => c -> ("&%s;" format s) }`
`103`	`103`	`val unescMap = pairs`
`104`	`104`	`}`
`105`		`- import Escapes.unescMap`
	`105`	`+ import Escapes.{ escMap, unescMap }`
`106`	`106`
`107`	`107`	`/**`
`108`	`108`	* Appends escaped string to `s`.
`@@ -113,7 +113,7 @@ object Utility extends AnyRef with parsing.TokenTests {`
`113`	`113`	`text.iterator.foldLeft(s) { (s, c) =>`
`114`	`114`	`escMap.get(c) match {`
`115`	`115`	`case Some(str) => s ++= str`
`116`		`- case _ => if c >= ' ' \|\| "\n\r\t".contains(c) => s += c`
	`116`	`+ case _ if c >= ' ' \|\| "\n\r\t".contains(c) => s += c`
`117`	`117`	`case _ => s // noop`
`118`	`118`	`}`
`119`	`119`	`}`