diff options
author | Miles Sabin <miles@milessabin.com> | 2010-02-19 15:31:36 +0000 |
---|---|---|
committer | Miles Sabin <miles@milessabin.com> | 2010-02-19 15:31:36 +0000 |
commit | dd89e9c089c33874e321573b061e9a7317848d42 (patch) | |
tree | b9cc42643e53ab6548921dd52518cf9250b7935b | |
parent | a2da1ebe6165254e6ce28bf61857e18dff8b1e7f (diff) | |
download | scala-dd89e9c089c33874e321573b061e9a7317848d42.tar.gz scala-dd89e9c089c33874e321573b061e9a7317848d42.tar.bz2 scala-dd89e9c089c33874e321573b061e9a7317848d42.zip |
Fixed #3043 and #3043; fixed a regression with ...
Fixed #3043 and #3043; fixed a regression with hover/hyperlinks on
import statements; don't attempt to parse out top-level types from
non-Scala sources. Review by community.
-rw-r--r-- | src/compiler/scala/tools/nsc/interactive/Global.scala | 2 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala index 99117e014b..d8ea6df97d 100644 --- a/src/compiler/scala/tools/nsc/interactive/Global.scala +++ b/src/compiler/scala/tools/nsc/interactive/Global.scala @@ -494,7 +494,7 @@ self => println("starting typedTreeAt") val tree = locateTree(pos) println("at pos "+pos+" was found: "+tree+tree.pos.show) - if (tree.tpe ne null) { + if (stabilizedType(tree) ne null) { println("already attributed") tree } else { diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index e39f552458..cd2cc3a3a6 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -3519,7 +3519,7 @@ trait Typers { self: Analyzer => if (!reallyExists(sym)) { if (settings.debug.value) Console.err.println("qual = "+qual+":"+qual.tpe+"\nSymbol="+qual.tpe.termSymbol+"\nsymbol-info = "+qual.tpe.termSymbol.info+"\nscope-id = "+qual.tpe.termSymbol.info.decls.hashCode()+"\nmembers = "+qual.tpe.members+"\nname = "+name+"\nfound = "+sym+"\nowner = "+context.enclClass.owner) - if (!qual.tpe.widen.isErroneous) { + if (!qual.tpe.widen.isErroneous && !onlyPresentation) { error(tree.pos, if (name == nme.CONSTRUCTOR) qual.tpe.widen+" does not have a constructor" |