Trivial refactor for reading

Author: som-snytt

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -1365,8 +1365,10 @@ object Parsers {
     def literal(negOffset: Int = in.offset, inPattern: Boolean = false, inTypeOrSingleton: Boolean = false, inStringInterpolation: Boolean = false): Tree = {
       def literalOf(token: Token): Tree = {
         val isNegated = negOffset < in.offset
-        def digits0 = in.removeNumberSeparators(in.strVal)
-        def digits = if (isNegated) "-" + digits0 else digits0
+        def digits =
+          val s = in.strVal
+          val digits0 = if s.indexOf('_') == -1 then s else s.replace("_", "")
+          if isNegated then "-" + digits0 else digits0
         if !inTypeOrSingleton then
           token match {
             case INTLIT  => return Number(digits, NumberKind.Whole(in.base))

compiler/src/dotty/tools/dotc/parsing/Scanners.scala

@@ -163,9 +163,7 @@ object Scanners {
       strVal = litBuf.toString
       litBuf.clear()
 
-    @inline def isNumberSeparator(c: Char): Boolean = c == '_'
-
-    @inline def removeNumberSeparators(s: String): String = if (s.indexOf('_') == -1) s else s.replace("_", "")
+    inline def isNumberSeparator(c: Char): Boolean = c == '_'
 
     // disallow trailing numeric separator char, but continue lexing
     def checkNoTrailingSeparator(): Unit =
@@ -307,7 +305,7 @@ object Scanners {
         println(s"\nSTART SKIP AT ${sourcePos().line + 1}, $this in $currentRegion")
       var noProgress = 0
         // Defensive measure to ensure we always get out of the following while loop
-        // even if source file is weirly formatted (i.e. we never reach EOF)
+        // even if source file is weirdly formatted (i.e. we never reach EOF)
       var prevOffset = offset
       while !atStop && noProgress < 3 do
         nextToken()
@@ -789,20 +787,18 @@ object Scanners {
           then return true
       false
 
-    /** Is there a blank line between the current token and the last one?
-     *  A blank line consists only of characters <= ' '.
-     *  @pre  afterLineEnd().
+    /** Is there a blank line between the last token and the current one?
+     *  A blank line is a sequence of only characters <= ' ', between two LFs (or FFs).
      */
-    private def pastBlankLine: Boolean = {
+    private def pastBlankLine: Boolean =
       val end = offset
       def recur(idx: Offset, isBlank: Boolean): Boolean =
         idx < end && {
           val ch = buf(idx)
-          if (ch == LF || ch == FF) isBlank || recur(idx + 1, true)
-          else recur(idx + 1, isBlank && ch <= ' ')
+          if ch == LF || ch == FF then isBlank || recur(idx + 1, isBlank = true)
+          else recur(idx + 1, isBlank = isBlank && ch <= ' ')
         }
-      recur(lastOffset, false)
-    }
+      recur(lastOffset, isBlank = false)
 
     import Character.{isHighSurrogate, isLowSurrogate, isUnicodeIdentifierPart, isUnicodeIdentifierStart, isValidCodePoint, toCodePoint}
 

compiler/src/dotty/tools/repl/JLineTerminal.scala

@@ -109,26 +109,26 @@ class JLineTerminal extends java.io.Closeable {
       def words = java.util.Collections.emptyList[String]
     }
 
-    def parse(input: String, cursor: Int, context: ParseContext): reader.ParsedLine = {
-      def parsedLine(word: String, wordCursor: Int) =
-        new ParsedLine(cursor, input, word, wordCursor)
+    def parse(input: String, cursor: Int, context: ParseContext): reader.ParsedLine =
+      def parsedLine(word: String, wordCursor: Int) = ParsedLine(cursor, input, word, wordCursor)
       // Used when no word is being completed
       def defaultParsedLine = parsedLine("", 0)
 
-      def incomplete(): Nothing = throw new EOFError(
+      def incomplete(): Nothing = throw EOFError(
         // Using dummy values, not sure what they are used for
         /* line    = */ -1,
         /* column  = */ -1,
         /* message = */ "",
         /* missing = */ newLinePrompt)
 
       case class TokenData(token: Token, start: Int, end: Int)
-      def currentToken: TokenData /* | Null */ = {
+
+      def currentToken: TokenData /* | Null */ =
         val source = SourceFile.virtual("<completions>", input)
         val scanner = new Scanner(source)(using ctx.fresh.setReporter(Reporter.NoReporter))
         var lastBacktickErrorStart: Option[Int] = None
 
-        while (scanner.token != EOF) {
+        while scanner.token != EOF do
           val start = scanner.offset
           val token = scanner.token
           scanner.nextToken()
@@ -138,15 +138,13 @@ class JLineTerminal extends java.io.Closeable {
           if (isCurrentToken)
             return TokenData(token, lastBacktickErrorStart.getOrElse(start), end)
 
-
           // we need to enclose the last backtick, which unclosed produces ERROR token
           if (token == ERROR && input(start) == '`') then
             lastBacktickErrorStart = Some(start)
           else
             lastBacktickErrorStart = None
-        }
         null
-      }
+      end currentToken
 
       def acceptLine = {
         val onLastLine = !input.substring(cursor).contains(System.lineSeparator)
@@ -162,9 +160,9 @@ class JLineTerminal extends java.io.Closeable {
         // complete we need to ensure that the :<partial-word> isn't split into
         // 2 tokens, but rather the entire thing is treated as the "word", in
         //   order to insure the : is replaced in the completion.
-        case ParseContext.COMPLETE if
-          ParseResult.commands.exists(command => command._1.startsWith(input)) =>
-            parsedLine(input, cursor)
+        case ParseContext.COMPLETE
+        if ParseResult.commands.exists(command => command._1.startsWith(input)) =>
+          parsedLine(input, cursor)
 
         case ParseContext.COMPLETE =>
           // Parse to find completions (typically after a Tab).
@@ -181,6 +179,6 @@ class JLineTerminal extends java.io.Closeable {
         case _ =>
           incomplete()
       }
-    }
+    end parse
   }
 }

compiler/src/dotty/tools/repl/ParseResult.scala

@@ -211,28 +211,26 @@ object ParseResult {
     maybeIncomplete(sourceCode, maybeIncomplete = false)
 
   private def maybeIncomplete(sourceCode: String, maybeIncomplete: Boolean)(using state: State): ParseResult =
-    apply(SourceFile.virtual(str.REPL_SESSION_LINE + (state.objectIndex + 1), sourceCode, maybeIncomplete = maybeIncomplete))
+    apply:
+      SourceFile.virtual(str.REPL_SESSION_LINE + (state.objectIndex + 1), sourceCode, maybeIncomplete)
 
   /** Check if the input is incomplete.
    *
    *  This can be used in order to check if a newline can be inserted without
    *  having to evaluate the expression.
    */
   def isIncomplete(sourceCode: String)(using Context): Boolean =
-    sourceCode match {
-      case CommandExtract(_) | "" => false
-      case _ => {
-        val reporter = newStoreReporter
-        val source   = SourceFile.virtual("<incomplete-handler>", sourceCode, maybeIncomplete = true)
-        val unit     = CompilationUnit(source, mustExist = false)
-        val localCtx = ctx.fresh
-                          .setCompilationUnit(unit)
-                          .setReporter(reporter)
-        var needsMore = false
-        reporter.withIncompleteHandler((_, _) => needsMore = true) {
-          parseStats(using localCtx)
-        }
-        !reporter.hasErrors && needsMore
-      }
-    }
+    sourceCode match
+    case CommandExtract(_) | "" => false
+    case _ =>
+      val reporter = newStoreReporter
+      val source   = SourceFile.virtual("<incomplete-handler>", sourceCode, maybeIncomplete = true)
+      val unit     = CompilationUnit(source, mustExist = false)
+      val localCtx = ctx.fresh
+                        .setCompilationUnit(unit)
+                        .setReporter(reporter)
+      var needsMore = false
+      reporter.withIncompleteHandler((_, _) => needsMore = true):
+        parseStats(using localCtx)
+      !reporter.hasErrors && needsMore
 }

compiler/test/dotty/tools/repl/ReplCompilerTests.scala

@@ -511,6 +511,13 @@ class ReplCompilerTests extends ReplTest:
     val all = lines()
     assertTrue(hints.forall(hint => all.exists(_.contains(hint))))
 
+  @Test def `i22844 regression colon eol`: Unit = initially:
+    run:
+      """|println:
+         |  "hello, world"
+         |""".stripMargin // outdent, but this test does not exercise the bug
+    assertEquals(List("hello, world"), lines())
+
 object ReplCompilerTests:
 
   private val pattern = Pattern.compile("\\r[\\n]?|\\n");