diff options
| author | Miles Sabin <miles@milessabin.com> | 2010-08-31 10:56:53 +0000 |
|---|---|---|
| committer | Miles Sabin <miles@milessabin.com> | 2010-08-31 10:56:53 +0000 |
| commit | 64fab04e4ba442f547fd0f23d5811226462786e5 (patch) | |
| tree | 135a39bf98375ab74038d673eb2b0b30305a84a5 /src | |
| parent | b0c8e271562411b761aba42a812982adc7772f9d (diff) | |
| download | scala-64fab04e4ba442f547fd0f23d5811226462786e5.tar.gz scala-64fab04e4ba442f547fd0f23d5811226462786e5.tar.bz2 scala-64fab04e4ba442f547fd0f23d5811226462786e5.zip | |
Fix for #3765.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Scanners.scala | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala index 5e9cc3f46e..445d869681 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala @@ -173,6 +173,9 @@ trait Scanners { // Read a token or copy it from `next` tokenData if (next.token == EMPTY) { lastOffset = charOffset - 1 + if(lastOffset > 0 && buf(lastOffset) == '\n' && buf(lastOffset - 1) == '\r') { + lastOffset -= 1 + } fetchToken() } else { this copyFrom next |