Merge pull request #14456 from dotty-staging/mb/windows-explain-eol

nicolasstucki · web-flow · commit ddac9282f8c2 · 2022-02-12T18:23:07.000+01:00
Fix explain rendering with Windows EOL
diff --git a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala
@@ -254,7 +254,7 @@ trait MessageRendering {
       sb.append(EOL).append(newBox())
       sb.append(EOL).append(offsetBox).append(" Explanation (enabled by `-explain`)")
       sb.append(EOL).append(newBox(soft = true))
-      dia.msg.explanation.split(EOL).foreach { line =>
+      dia.msg.explanation.split(raw"\R").foreach { line =>
         sb.append(EOL).append(offsetBox).append(if line.isEmpty then "" else " ").append(line)
       }
       sb.append(EOL).append(endBox)

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ trait MessageRendering {`
`254`	`254`	`sb.append(EOL).append(newBox())`
`255`	`255`	sb.append(EOL).append(offsetBox).append(" Explanation (enabled by `-explain`)")
`256`	`256`	`sb.append(EOL).append(newBox(soft = true))`
`257`		`- dia.msg.explanation.split(EOL).foreach { line =>`
	`257`	`+ dia.msg.explanation.split(raw"\R").foreach { line =>`
`258`	`258`	`sb.append(EOL).append(offsetBox).append(if line.isEmpty then "" else " ").append(line)`
`259`	`259`	`}`
`260`	`260`	`sb.append(EOL).append(endBox)`