diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-01 09:58:01 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-01 09:58:01 -0800 |
| commit | 09d143306432124db7b364034abd94792947231e (patch) | |
| tree | a725c1ca7b24c0a1723b7d63e6b5f01682003d74 /src/compiler | |
| parent | b403234a27518f35acc360bfa0333b00fdc85175 (diff) | |
| parent | 8350cd947290a9a8beb3ff643a1e3dd2342a9182 (diff) | |
| download | scala-09d143306432124db7b364034abd94792947231e.tar.gz scala-09d143306432124db7b364034abd94792947231e.tar.bz2 scala-09d143306432124db7b364034abd94792947231e.zip | |
Merge pull request #1980 from retronym/backport/1518
[backport] SI-2968 Fix brace healing for `^case (class|object) {`
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Scanners.scala | 6 |
1 files changed, 6 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 046122d83b..79f0bcf149 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala @@ -288,10 +288,16 @@ trait Scanners extends ScannersCommon { prev copyFrom this val nextLastOffset = charOffset - 1 fetchToken() + def resetOffset() { + offset = prev.offset + lastOffset = prev.lastOffset + } if (token == CLASS) { token = CASECLASS + resetOffset() } else if (token == OBJECT) { token = CASEOBJECT + resetOffset() } else { lastOffset = nextLastOffset next copyFrom this |