WIP

Author: retronym

src/compiler/scala/tools/nsc/profile/Profiler.scala

@@ -307,11 +307,10 @@ private [profile] class RealProfiler(reporter : ProfileReporter, val settings: S
   }
 
   private def completionName(root: Global#Symbol, associatedFile: AbstractFile): String = {
-    if (root.hasPackageFlag) root.javaBinaryNameString
+    if (root.hasPackageFlag || root.isTopLevel) root.javaBinaryNameString
     else {
       val enclosing = root.enclosingTopLevelClass
-      if (enclosing == root) enclosing.javaBinaryNameString
-      else enclosing.javaBinaryNameString + "::" + root.rawname.toString
+      enclosing.javaBinaryNameString + "::" + root.rawname.toString
     }
   }
 }

src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala

@@ -215,27 +215,29 @@ abstract class SymbolLoaders {
     }
 
     override def complete(root: Symbol) {
-      val assocFile = associatedFile
+      val assocFile = associatedFile(root)
       currentRunProfilerBeforeCompletion(root, assocFile)
       try {
-        val start = java.util.concurrent.TimeUnit.NANOSECONDS.toMillis(System.nanoTime())
-        val currentphase = phase
-        doComplete(root)
-        phase = currentphase
-        informTime("loaded " + description, start)
-        ok = true
-        setSource(root)
-        setSource(root.companionSymbol) // module -> class, class -> module
-      }
-      catch {
-        case ex @ (_: IOException | _: MissingRequirementError) =>
-          ok = false
-          signalError(root, ex)
+        try {
+          val start = java.util.concurrent.TimeUnit.NANOSECONDS.toMillis(System.nanoTime())
+          val currentphase = phase
+          doComplete(root)
+          phase = currentphase
+          informTime("loaded " + description, start)
+          ok = true
+          setSource(root)
+          setSource(root.companionSymbol) // module -> class, class -> module
+        }
+        catch {
+          case ex@(_: IOException | _: MissingRequirementError) =>
+            ok = false
+            signalError(root, ex)
+        }
+        initRoot(root)
+        if (!root.isPackageClass) initRoot(root.companionSymbol)
       } finally {
         currentRunProfilerAfterCompletion(root, assocFile)
       }
-      initRoot(root)
-      if (!root.isPackageClass) initRoot(root.companionSymbol)
     }
 
     override def load(root: Symbol) { complete(root) }