diff options
Diffstat (limited to 'src/compiler/scala/tools/nsc/util/SourceFile.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/util/SourceFile.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/util/SourceFile.scala b/src/compiler/scala/tools/nsc/util/SourceFile.scala index 92cb3b44ed..9df275fa2f 100644 --- a/src/compiler/scala/tools/nsc/util/SourceFile.scala +++ b/src/compiler/scala/tools/nsc/util/SourceFile.scala @@ -94,10 +94,11 @@ class BatchSourceFile(val file : AbstractFile, val content: Array[Char]) extends } def isLineBreak(idx: Int) = - if (idx >= length) false else content(idx) match { + if (idx >= length) false else { + val ch = content(idx) // don't identify the CR in CR LF as a line break, since LF will do. - case CR => (idx + 1 == length) || (content(idx + 1) != LF) - case x => isLineBreakChar(x.toChar) + if (ch == CR) (idx + 1 == length) || (content(idx + 1) != LF) + else isLineBreakChar(ch) } private lazy val lineIndices: Array[Int] = { |