diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-02-19 10:25:59 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-02-19 10:25:59 -0800 |
| commit | a3a794fc3ba7128342310517da43e1ec143f85bd (patch) | |
| tree | 74c9b733f0eb21723460c684a39cc0031b757f32 /src/compiler | |
| parent | 2d26cacd24b396c7f7449e731f059811d0d1fac4 (diff) | |
| parent | 9cd5c881fc13acbd9aca08fd6ae2830292e5f1b4 (diff) | |
| download | scala-a3a794fc3ba7128342310517da43e1ec143f85bd.tar.gz scala-a3a794fc3ba7128342310517da43e1ec143f85bd.tar.bz2 scala-a3a794fc3ba7128342310517da43e1ec143f85bd.zip | |
Merge pull request #4340 from retronym/topic/infix-completion
SI-9153 More complete and stable results for completions
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index 71558273a6..d3cd26f256 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -609,7 +609,7 @@ trait Implicits { val itree2 = if (!isView) fallback else pt match { case Function1(arg1, arg2) => typed1( - atPos(itree0.pos)(Apply(itree1, List(Ident("<argument>") setType approximate(arg1)))), + atPos(itree0.pos)(Apply(itree1, List(Ident(nme.argument) setType approximate(arg1)))), EXPRmode, approximate(arg2) ) match { @@ -918,7 +918,7 @@ trait Implicits { /** Returns all eligible ImplicitInfos and their SearchResults in a map. */ - def findAll() = mapFrom(eligible)(typedImplicit(_, ptChecked = false, isLocalToCallsite)) + def findAll() = linkedMapFrom(eligible)(typedImplicit(_, ptChecked = false, isLocalToCallsite)) /** Returns the SearchResult of the best match. */ @@ -963,7 +963,7 @@ trait Implicits { * symbols of the same name in succeeding lists. * @return map from infos to search results */ - def applicableInfos(iss: Infoss, isLocalToCallsite: Boolean): Map[ImplicitInfo, SearchResult] = { + def applicableInfos(iss: Infoss, isLocalToCallsite: Boolean): mutable.LinkedHashMap[ImplicitInfo, SearchResult] = { val start = if (Statistics.canEnable) Statistics.startCounter(subtypeAppInfos) else null val computation = new ImplicitComputation(iss, isLocalToCallsite) { } val applicable = computation.findAll() |