Improved rendering of whitespace leading unexpected tokens (#109)

j-mie6 · Feb 10, 2022 · 13f2d25 · 13f2d25
1 parent 7bd71fb
commit 13f2d25
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/scala/parsley/errors/helpers.scala b/src/main/scala/parsley/errors/helpers.scala
@@ -7,12 +7,15 @@ import scala.util.matching.Regex
 // $COVERAGE-OFF$
 private [parsley] object helpers {
     def renderRawString(s: String): String = s match {
-        case "\n"            => "newline"
-        case "\t"            => "tab"
-        case " "             => "space"
+        case cs if cs.head.isWhitespace => cs.head match {
+            case c if c.isSpaceChar  => "space"
+            case '\n'                => "newline"
+            case '\t'                => "tab"
+            case _                   => "whitespace character"
+        }
         case Unprintable(up) => f"unprintable character (\\u${up.head.toInt}%04X)"
         // Do we want this only in unexpecteds?
-        case cs              => "\"" + cs.takeWhile(c => c != '\n' && c != ' ') + "\""
+        case cs              => "\"" + cs.takeWhile(!_.isWhitespace) + "\""
     }
 
     def combineAsList(elems: List[String]): Option[String] = elems.sorted.reverse match {