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.

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"