Fix line splitting

Linyxus · Linyxus · commit 19ffcb35e758 · 2025-12-10T14:02:15.000+01:00
diff --git a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala
@@ -285,8 +285,12 @@ trait MessageRendering {
         case _ => false
       }
       val (line, rest0) = arr.span(!pred(_))
-      val (_, rest) = rest0.span(pred)
-      new String(line) :: { if (rest.isEmpty) Nil else linesFrom(rest) }
+      // Only consume one line terminator (CRLF counts as one)
+      val rest =
+        if rest0.isEmpty then rest0
+        else if rest0(0) == CR && rest0.length > 1 && rest0(1) == LF then rest0.drop(2)
+        else rest0.drop(1)
+      new String(line) :: { if rest.isEmpty then Nil else linesFrom(rest) }
     }
 
     val lines = linesFrom(syntax)

Original file line number	Diff line number	Diff line change
`@@ -285,8 +285,12 @@ trait MessageRendering {`
`285`	`285`	`case _ => false`
`286`	`286`	`}`
`287`	`287`	`val (line, rest0) = arr.span(!pred(_))`
`288`		`- val (_, rest) = rest0.span(pred)`
`289`		`- new String(line) :: { if (rest.isEmpty) Nil else linesFrom(rest) }`
	`288`	`+ // Only consume one line terminator (CRLF counts as one)`
	`289`	`+ val rest =`
	`290`	`+ if rest0.isEmpty then rest0`
	`291`	`+ else if rest0(0) == CR && rest0.length > 1 && rest0(1) == LF then rest0.drop(2)`
	`292`	`+ else rest0.drop(1)`
	`293`	`+ new String(line) :: { if rest.isEmpty then Nil else linesFrom(rest) }`
`290`	`294`	`}`
`291`	`295`
`292`	`296`	`val lines = linesFrom(syntax)`