From 50f1264a874098deddf27a36809ea9ab1dcd82cd Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 9 Dec 2019 13:40:42 +0100 Subject: [PATCH] Fix #7660: Drop unused `indent` parameter in `LookaheadScanner` It was never passed explicitly, so was always false. To fix the initialization error, don't override `val indentSyntax`, but use a type test in the initializer instead. --- compiler/src/dotty/tools/dotc/parsing/Scanners.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala index 4ec693c6d95e..85c35d402f36 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala @@ -155,8 +155,9 @@ object Scanners { || ctx.settings.oldSyntax.value || isScala2CompatMode val indentSyntax = - (if (Config.defaultIndent) !noindentSyntax else ctx.settings.indent.value) - || rewriteNoIndent + ((if (Config.defaultIndent) !noindentSyntax else ctx.settings.indent.value) + || rewriteNoIndent) + && !isInstanceOf[LookaheadScanner] val colonSyntax = ctx.settings.YindentColons.value || rewriteNoIndent @@ -881,8 +882,7 @@ object Scanners { // Lookahead --------------------------------------------------------------- - class LookaheadScanner(indent: Boolean = false) extends Scanner(source, offset) { - override val indentSyntax = indent + class LookaheadScanner() extends Scanner(source, offset) { override def skipEndMarker(width: IndentWidth) = () override protected def printState() = { print("la:")