Record used name for packages

Oleiva · Apr 18, 2018 · 6f3cd28 · 6f3cd28
1 parent 33da2b6
commit 6f3cd28
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala
@@ -295,8 +295,12 @@ private class ExtractDependenciesCollector extends tpd.TreeTraverser { thisTreeT
       val fromClass = resolveDependencySource
       if (fromClass.exists) { // can happen when visiting imports
         assert(fromClass.isClass)
-        _dependencies += ClassDependency(fromClass, enclOrModuleClass, DependencyByMemberRef)
+
         addUsedName(fromClass, mangledName(sym), UseScope.Default)
+        // packages have class symbol. Only record them as used names but bot dependency
+        if (!sym.is(Package)) {
+          _dependencies += ClassDependency(fromClass, enclOrModuleClass, DependencyByMemberRef)
+        }
       }
     }
 
@@ -315,7 +319,6 @@ private class ExtractDependenciesCollector extends tpd.TreeTraverser { thisTreeT
     !sym.exists ||
     sym.unforcedIsAbsent || // ignore dependencies that have a symbol but do not exist.
                             // e.g. java.lang.Object companion object
-    sym.is(Package) ||
     sym.isEffectiveRoot ||
     sym.isAnonymousFunction ||
     sym.isAnonymousClass

diff --git a/sbt-bridge/test/xsbt/ExtractUsedNamesSpecification.scala b/sbt-bridge/test/xsbt/ExtractUsedNamesSpecification.scala
@@ -15,7 +15,7 @@ class ExtractUsedNamesSpecification {
                 |}""".stripMargin
     val compilerForTesting = new ScalaCompilerForUnitTesting
     val usedNames = compilerForTesting.extractUsedNamesFromSrc(src)
-    val expectedNames = standardNames ++ Set("A", "A2")
+    val expectedNames = standardNames ++ Set("a", "A", "A2", "b")
     // names used at top level are attributed to the first class defined in a compilation unit
 
     assertEquals(expectedNames, usedNames("a.A"))
@@ -43,7 +43,7 @@ class ExtractUsedNamesSpecification {
                   |}""".stripMargin
     val compilerForTesting = new ScalaCompilerForUnitTesting
     val usedNames = compilerForTesting.extractUsedNamesFromSrc(srcA, srcB)
-    val expectedNames = standardNames ++ Set("A", "B", "C", "D", "BB")
+    val expectedNames = standardNames ++ Set("a", "c", "A", "B", "C", "D", "b", "BB")
     assertEquals(expectedNames, usedNames("b.X"))
   }
 
@@ -286,7 +286,8 @@ class ExtractUsedNamesSpecification {
     val compilerForTesting = new ScalaCompilerForUnitTesting
     val usedNames = compilerForTesting.extractUsedNamesFromSrc(src)
 
-    assertEquals(standardNames + "List", usedNames("Test"))
+    val expectedNames = standardNames ++ Set("java", "util", "List")
+    assertEquals(expectedNames, usedNames("Test"))
   }
 
   /**