Merge pull request scala#4205 from retronym/ticket/9011

adriaanm · adriaanm · commit c77b7a7375e5 · 2014-12-23T10:05:37.000-08:00
SI-9011 Speculative fix for CCE in Scala IDE
diff --git a/src/interactive/scala/tools/nsc/interactive/Global.scala b/src/interactive/scala/tools/nsc/interactive/Global.scala
@@ -78,7 +78,11 @@ trait InteractiveAnalyzer extends Analyzer {
         val owningInfo = sym.owner.info
         val existingDerivedSym = owningInfo.decl(sym.name.toTermName).filter(sym => sym.isSynthetic && sym.isMethod)
         existingDerivedSym.alternatives foreach (owningInfo.decls.unlink)
-        enterImplicitWrapper(tree.asInstanceOf[ClassDef])
+        val defTree = tree match {
+          case dd: DocDef => dd.definition // See SI-9011, Scala IDE's presentation compiler incorporates ScalaDocGlobal with InterativeGlobal, so we have to unwrap DocDefs.
+          case _ => tree
+        }
+        enterImplicitWrapper(defTree.asInstanceOf[ClassDef])
       }
       super.enterExistingSym(sym, tree)
     }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,11 @@ trait InteractiveAnalyzer extends Analyzer {`
`78`	`78`	`val owningInfo = sym.owner.info`
`79`	`79`	`val existingDerivedSym = owningInfo.decl(sym.name.toTermName).filter(sym => sym.isSynthetic && sym.isMethod)`
`80`	`80`	`existingDerivedSym.alternatives foreach (owningInfo.decls.unlink)`
`81`		`- enterImplicitWrapper(tree.asInstanceOf[ClassDef])`
	`81`	`+ val defTree = tree match {`
	`82`	`+ case dd: DocDef => dd.definition // See SI-9011, Scala IDE's presentation compiler incorporates ScalaDocGlobal with InterativeGlobal, so we have to unwrap DocDefs.`
	`83`	`+ case _ => tree`
	`84`	`+ }`
	`85`	`+ enterImplicitWrapper(defTree.asInstanceOf[ClassDef])`
`82`	`86`	`}`
`83`	`87`	`super.enterExistingSym(sym, tree)`
`84`	`88`	`}`