diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-11-29 11:19:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 11:19:41 +0100 |
| commit | b02e3914b6dee6b7da1c3da1864343ccdce5ca3c (patch) | |
| tree | fad9cb4f05be35ac5bd214bcc4b8418eb27c6b09 /src | |
| parent | 2bc92e0b2fa9f6de2b2a6c8f9ef4b85492e7df4d (diff) | |
| parent | 4fba067fc845551041b8f32b82268ecdd5d6f757 (diff) | |
| download | scala-b02e3914b6dee6b7da1c3da1864343ccdce5ca3c.tar.gz scala-b02e3914b6dee6b7da1c3da1864343ccdce5ca3c.tar.bz2 scala-b02e3914b6dee6b7da1c3da1864343ccdce5ca3c.zip | |
Merge pull request #5561 from retronym/topic/merge-2.11.x-to-2.12.x-20161129
Merge 2.11.x to 2.12.x [ci: last-only]
Diffstat (limited to 'src')
| -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)) ) |