Merge pull request #3429 from som-snytt/issue/8205

SI-8205 Don't include CR in line

1 files changed, 22 insertions, 0 deletions

diff --git a/test/junit/scala/reflect/internal/util/SourceFileTest.scala b/test/junit/scala/reflect/internal/util/SourceFileTest.scala
index bbd5685ef7..903e705ba2 100644
--- a/test/junit/scala/reflect/internal/util/SourceFileTest.scala
+++ b/test/junit/scala/reflect/internal/util/SourceFileTest.scala
@@ -30,4 +30,26 @@ class SourceFileTest {
     assertEquals("def", lineContentOf("abc\ndef", 6))
     assertEquals("def", lineContentOf("abc\ndef\n", 7))
   }
+
+  @Test
+  def CRisEOL(): Unit = {
+    assertEquals("", lineContentOf("\r", 0))
+    assertEquals("abc", lineContentOf("abc\rdef", 0))
+    assertEquals("abc", lineContentOf("abc\rdef", 3))
+    assertEquals("def", lineContentOf("abc\rdef", 4))
+    assertEquals("def", lineContentOf("abc\rdef", 6))
+    assertEquals("def", lineContentOf("abc\rdef\r", 7))
+  }
+
+  @Test
+  def CRNLisEOL(): Unit = {
+    assertEquals("", lineContentOf("\r\n", 0))
+    assertEquals("abc", lineContentOf("abc\r\ndef", 0))
+    assertEquals("abc", lineContentOf("abc\r\ndef", 3))
+    assertEquals("abc", lineContentOf("abc\r\ndef", 4))
+    assertEquals("def", lineContentOf("abc\r\ndef", 5))
+    assertEquals("def", lineContentOf("abc\r\ndef", 7))
+    assertEquals("def", lineContentOf("abc\r\ndef", 8))
+    assertEquals("def", lineContentOf("abc\r\ndef\r\n", 9))
+  }
 }