diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-11-29 13:04:33 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-11-29 13:14:14 +1000 |
| commit | 4fba067fc845551041b8f32b82268ecdd5d6f757 (patch) | |
| tree | fad9cb4f05be35ac5bd214bcc4b8418eb27c6b09 /src/interactive/scala/tools/nsc/interactive | |
| parent | 2e2176edc40c20dd2a3026faafc47d4aeb0a429d (diff) | |
| parent | 57290a1c72d4565892f3595d9d8c3fba1086ec6b (diff) | |
| download | scala-4fba067fc845551041b8f32b82268ecdd5d6f757.tar.gz scala-4fba067fc845551041b8f32b82268ecdd5d6f757.tar.bz2 scala-4fba067fc845551041b8f32b82268ecdd5d6f757.zip | |
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
Diffstat (limited to 'src/interactive/scala/tools/nsc/interactive')
| -rw-r--r-- | src/interactive/scala/tools/nsc/interactive/Global.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/interactive/scala/tools/nsc/interactive/Global.scala b/src/interactive/scala/tools/nsc/interactive/Global.scala index 715ba0d4f3..669a018f10 100644 --- a/src/interactive/scala/tools/nsc/interactive/Global.scala +++ b/src/interactive/scala/tools/nsc/interactive/Global.scala @@ -1189,7 +1189,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)) ) |