Merge pull request #5553 from retronym/ticket/SD-271

Improve performance of REPL autocompletion
scala · Nov 29, 2016 · 57290a1 · 57290a1
2 parents 73687e9 + 76155fa
commit 57290a1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/interactive/scala/tools/nsc/interactive/Global.scala b/src/interactive/scala/tools/nsc/interactive/Global.scala
@@ -1202,7 +1202,8 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "")
             case Nil => entered.isEmpty && matchCount > 0
             case head :: tail =>
               val enteredAlternatives = Set(entered, entered.capitalize)
-              head.inits.filter(_.length <= entered.length).exists(init =>
+              val n = (head, entered).zipped.count {case (c, e) => c == e || (c.isUpper && c == e.toUpper)}
+              head.take(n).inits.exists(init =>
                 enteredAlternatives.exists(entered =>
                   lenientMatch(entered.stripPrefix(init), tail, matchCount + (if (init.isEmpty) 0 else 1))
                 )

diff --git a/test/junit/scala/tools/nsc/interpreter/CompletionTest.scala b/test/junit/scala/tools/nsc/interpreter/CompletionTest.scala
@@ -174,6 +174,14 @@ class CompletionTest {
     checkExact(completer, "case class D(a: Int, b: Int) { this.a")("a", "asInstanceOf")
   }
 
+  @Test
+  def performanceOfLenientMatch(): Unit = {
+    val intp = newIMain()
+    val completer = new PresentationCompilerCompleter(intp)
+    val ident: String = "thisIsAReallyLongMethodNameWithManyManyManyManyChunks"
+    checkExact(completer, s"($ident: Int) => tia")(ident)
+  }
+
   def checkExact(completer: PresentationCompilerCompleter, before: String, after: String = "")(expected: String*): Unit = {
     assertEquals(expected.toSet, completer.complete(before, after).candidates.toSet)
   }