Merge pull request #12386 from Kevin-Lee/fix_12385_duplicate_eol_chars

liufengyun · web-flow · commit e1557e50bbf2 · 2021-05-10T09:26:36.000+02:00
Fix #12385 - MessageRendering.explanation may have duplicate EOL Chars
diff --git a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala
@@ -138,7 +138,7 @@ trait MessageRendering {
           |${Blue("===========").show}""".stripMargin
     )
     sb.append(EOL).append(m.explanation)
-    if (m.explanation.lastOption != Some(EOL)) sb.append(EOL)
+    if (!m.explanation.endsWith(EOL)) sb.append(EOL)
     sb.toString
   }
 

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ trait MessageRendering {`
`138`	`138`	`\|${Blue("===========").show}""".stripMargin`
`139`	`139`	`)`
`140`	`140`	`sb.append(EOL).append(m.explanation)`
`141`		`- if (m.explanation.lastOption != Some(EOL)) sb.append(EOL)`
	`141`	`+ if (!m.explanation.endsWith(EOL)) sb.append(EOL)`
`142`	`142`	`sb.toString`
`143`	`143`	`}`
`144`	`144`