diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-13 12:01:32 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-13 13:24:55 -0800 |
commit | bd53838125ba3a3cec3abffe5a075dad539bb32e (patch) | |
tree | 50dd0ece8740f26801e94539f91da9acdd5932b6 /src/interactive | |
parent | 2321072c8f795d6b20a9ab552bdac8dd6c731b66 (diff) | |
parent | 6045a05b833c930dfaf343215ac645f4f32f3e2a (diff) | |
download | scala-bd53838125ba3a3cec3abffe5a075dad539bb32e.tar.gz scala-bd53838125ba3a3cec3abffe5a075dad539bb32e.tar.bz2 scala-bd53838125ba3a3cec3abffe5a075dad539bb32e.zip |
Merge commit '6045a05b83' into merge-2.10
Conflicts:
src/interactive/scala/tools/nsc/interactive/Global.scala
Diffstat (limited to 'src/interactive')
-rw-r--r-- | src/interactive/scala/tools/nsc/interactive/Global.scala | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/interactive/scala/tools/nsc/interactive/Global.scala b/src/interactive/scala/tools/nsc/interactive/Global.scala index 94f9aef38b..da838e0f83 100644 --- a/src/interactive/scala/tools/nsc/interactive/Global.scala +++ b/src/interactive/scala/tools/nsc/interactive/Global.scala @@ -1056,8 +1056,15 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "") case t => t } val context = doLocateContext(pos) + + val shouldTypeQualifier = tree0.tpe match { + case null => true + case mt: MethodType => mt.isImplicit + case _ => false + } + // TODO: guard with try/catch to deal with ill-typed qualifiers. - val tree = if (tree0.tpe eq null) analyzer newTyper context typedQualifier tree0 else tree0 + val tree = if (shouldTypeQualifier) analyzer newTyper context typedQualifier tree0 else tree0 debugLog("typeMembers at "+tree+" "+tree.tpe) val superAccess = tree.isInstanceOf[Super] @@ -1231,4 +1238,3 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "") } object CancelException extends Exception - |