Don't handle newlines if next token is set

odersky · odersky · commit dfa68fbd6b77 · 2020-04-04T13:58:43.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
@@ -350,7 +350,7 @@ object Scanners {
         next.token = EMPTY
       }
 
-      if (isAfterLineEnd) handleNewLine(lastToken)
+      if (isAfterLineEnd && next.token == EMPTY) handleNewLine(lastToken)
       postProcessToken()
       //printState()
     }

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ object Scanners {`
`350`	`350`	`next.token = EMPTY`
`351`	`351`	`}`
`352`	`352`
`353`		`- if (isAfterLineEnd) handleNewLine(lastToken)`
	`353`	`+ if (isAfterLineEnd && next.token == EMPTY) handleNewLine(lastToken)`
`354`	`354`	`postProcessToken()`
`355`	`355`	`//printState()`
`356`	`356`	`}`