diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-11-08 01:40:38 -0800 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-11-08 01:40:38 -0800 |
| commit | 0354d4bea7f900d329c17542d414f6969b239901 (patch) | |
| tree | 1d968824f2de887d3d7f55192fb02658285f9448 /src/compiler/scala | |
| parent | 79788afa615d165203c331533291b5f74c28738f (diff) | |
| parent | 6045a05b833c930dfaf343215ac645f4f32f3e2a (diff) | |
| download | scala-0354d4bea7f900d329c17542d414f6969b239901.tar.gz scala-0354d4bea7f900d329c17542d414f6969b239901.tar.bz2 scala-0354d4bea7f900d329c17542d414f6969b239901.zip | |
Merge pull request #3105 from retronym/ticket/completion
Fix completion after application with implicit arguments
Diffstat (limited to 'src/compiler/scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/interactive/Global.scala | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala index 84670750d7..49f6cb2373 100644 --- a/src/compiler/scala/tools/nsc/interactive/Global.scala +++ b/src/compiler/scala/tools/nsc/interactive/Global.scala @@ -999,7 +999,13 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "") val context = doLocateContext(pos) - if (tree.tpe == null) + val shouldTypeQualifier = tree.tpe match { + case null => true + case mt: MethodType => mt.isImplicit + case _ => false + } + + if (shouldTypeQualifier) // TODO: guard with try/catch to deal with ill-typed qualifiers. tree = analyzer.newTyper(context).typedQualifier(tree) @@ -1192,4 +1198,3 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "") } object CancelException extends Exception - |