fix: take into account preface for repl commands

scala · Mar 7, 2022 · 57ca75c · 57ca75c
1 parent f4a6e9e
commit 57ca75c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala
@@ -211,7 +211,15 @@ class ReplDriver(settings: Array[String],
     }
 
     if expr.startsWith(":") then
-      ParseResult.commands.map(command => makeCandidate(command._1))
+      ParseResult.commands.collect {
+        // If expr is only : then we return the commands with : since jline
+        // correctly handles them
+        case command if expr == ":" => makeCandidate(command._1)
+        // However if there is more than just the : we filter by it and then
+        // drop the : since jline will correctly complete it but you'll end up
+        // with ::import for example instead of :import
+        case command if command._1.startsWith(expr) => makeCandidate(command._1.drop(1))
+      }
     else
       given state: State = newRun(state0)
       compiler

diff --git a/compiler/test/dotty/tools/repl/TabcompleteTests.scala b/compiler/test/dotty/tools/repl/TabcompleteTests.scala
@@ -147,4 +147,12 @@ class TabcompleteTests extends ReplTest {
       tabComplete(":")
     )
   }
+
+  @Test def commandPreface = initially {
+    // This looks odd, but if we return :doc here it will result in ::doc in the REPL
+    assertEquals(
+      List("doc"),
+      tabComplete(":d")
+    )
+  }
 }