Skip to content

Commit 6fc1afb

Browse files
committed
Apply review comments
1 parent 5406cb7 commit 6fc1afb

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -171,24 +171,20 @@ private class ExtractDependenciesCollector(rec: DependencyRecorder) extends tpd.
171171
lazy val allowsDependencyByMacroExpansion =
172172
classOf[DependencyContext].getFields().exists(_.getName() == "DependencyByMacroExpansion")
173173

174-
private def addMacroDependency(sym: Symbol)(using Context): Unit =
174+
private def addMacroDependency(trees: List[Tree])(using Context): Unit =
175175
if (allowsDependencyByMacroExpansion) {
176-
if (!ignoreDependency(sym)) {
177-
if (!sym.is(Package)) {
178-
val enclOrModuleClass = if (sym.is(ModuleVal)) sym.moduleClass else sym.enclosingClass
179-
assert(enclOrModuleClass.isClass, s"$enclOrModuleClass, $sym")
176+
val traverser = new TypeDependencyTraverser {
177+
def addDependency(symbol: Symbol) =
178+
if (!ignoreDependency(symbol)) {
179+
val enclOrModuleClass = if (symbol.is(ModuleVal)) symbol.moduleClass else symbol.enclosingClass
180+
assert(enclOrModuleClass.isClass, s"$enclOrModuleClass, $symbol")
180181

181-
rec.addClassDependency(enclOrModuleClass, DependencyByMacroExpansion)
182-
}
182+
rec.addClassDependency(enclOrModuleClass, DependencyByMacroExpansion)
183+
}
183184
}
185+
trees.foreach(tree => traverser.traverse(tree.tpe))
184186
}
185187

186-
private def addMacroDependency(trees: List[Tree])(using Context): Unit =
187-
val traverser = new TypeDependencyTraverser {
188-
def addDependency(symbol: Symbol) = addMacroDependency(symbol)
189-
}
190-
trees.foreach(tree => traverser.traverse(tree.tpe))
191-
192188
private def depContextOf(cls: Symbol)(using Context): DependencyContext =
193189
if cls.isLocal then LocalDependencyByInheritance
194190
else DependencyByInheritance

0 commit comments

Comments
 (0)