Return correct compilation units for class files

scala-ide · Oct 1, 2014 · e105bad · e105bad
1 parent 20dcf96
commit e105bad
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/org.scala-ide.sdt.core/src/org/scalaide/core/internal/ScalaPlugin.scala b/org.scala-ide.sdt.core/src/org/scalaide/core/internal/ScalaPlugin.scala
@@ -70,6 +70,8 @@ import org.eclipse.core.resources.IResourceDeltaVisitor
 import org.scalaide.util.internal.Utils._
 import org.scalaide.core.internal.jdt.model.ScalaCompilationUnit
 import org.scalaide.ui.internal.editor.ScalaDocumentProvider
+import org.scalaide.core.internal.jdt.model.ScalaClassFile
+import org.eclipse.jdt.core.IClassFile
 
 object ScalaPlugin {
 
@@ -148,8 +150,16 @@ class ScalaPlugin extends IScalaPlugin with PluginLogConfigurator with IResource
   // Scala project instances
   private val projects = new mutable.HashMap[IProject, ScalaProject]
 
-  override def scalaCompilationUnit(input: IEditorInput): Option[ScalaCompilationUnit] =
-    Option(documentProvider.getWorkingCopy(input).asInstanceOf[ScalaCompilationUnit])
+  override def scalaCompilationUnit(input: IEditorInput): Option[ScalaCompilationUnit] = {
+    def unitOfSourceFile = Option(documentProvider.getWorkingCopy(input).asInstanceOf[ScalaCompilationUnit])
+
+    def unitOfClassFile = input.getAdapter(classOf[IClassFile]) match {
+      case tr: ScalaClassFile => Some(tr)
+      case _                  => None
+    }
+
+    unitOfSourceFile orElse unitOfClassFile
+  }
 
   def getJavaProject(project: IProject) = JavaCore.create(project)