Merge commit '57290a1' into topic/merge-2.11.x-to-2.12.x-20161129

Conflicts:
    spec/_layouts/default.yml
    test/junit/scala/tools/nsc/interpreter/CompletionTest.scala

Fixes scala/scala-dev#272

1 files changed, 8 insertions, 0 deletions

diff --git a/test/junit/scala/tools/nsc/interpreter/CompletionTest.scala b/test/junit/scala/tools/nsc/interpreter/CompletionTest.scala
index 1233e8b1cc..a216b319a8 100644
--- a/test/junit/scala/tools/nsc/interpreter/CompletionTest.scala
+++ b/test/junit/scala/tools/nsc/interpreter/CompletionTest.scala
@@ -185,6 +185,14 @@ class CompletionTest {
     checkExact(completer, "p1.p2.p3.Ping.Po")("Pong")
   }
 
+  @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)
   }