From 1f9606f7471894c29ac0e433c74dd599fef1bff3 Mon Sep 17 00:00:00 2001 From: Sean McDirmid Date: Thu, 3 Jul 2008 11:12:45 +0000 Subject: Ingo's fix that I didn't actually committ a few... Ingo's fix that I didn't actually committ a few days ago as I thought. --- src/compiler/scala/tools/nsc/symtab/IdeSupport.scala | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/compiler/scala/tools/nsc/symtab/IdeSupport.scala b/src/compiler/scala/tools/nsc/symtab/IdeSupport.scala index 44a6c1d95b..b9bb67309e 100644 --- a/src/compiler/scala/tools/nsc/symtab/IdeSupport.scala +++ b/src/compiler/scala/tools/nsc/symtab/IdeSupport.scala @@ -193,9 +193,15 @@ trait IdeSupport extends SymbolTable { // added to global, not analyzers. if (sym.rawInfo != NoType && !sym.rawInfo.isComplete) { Console.println("XXX uncompleted: " + sym) } - val resetType = sym.info == NoType || hasError(sym.info) - if (!resetType && !compareTypes(sym.info, oldType,Nil)(sym => tracedTypes.get(sym) match { - case None => sym.info + val syminfo = try { + sym.info + } catch { + case e => check(false, ""+e); NoType + } + + val resetType = syminfo == NoType || hasError(syminfo) + if (!resetType && !compareTypes(syminfo, oldType,Nil)(sym => tracedTypes.get(sym) match { + case None => syminfo case Some(oldType) => oldType })) (trackedTypes.removeKey(sym) match { case Some(set) => set.foreach(_.changed) -- cgit v1.2.3