Skip to content

Commit 1c2d0aa

Browse files
committed
Handle imports when checking required base package - rename
1 parent 9ec4d1b commit 1c2d0aa

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

commons-analyzer/src/main/scala/com/avsystem/commons/analyzer/BasePackage.scala

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,23 @@ class BasePackage(g: Global) extends AnalyzerRule(g, "basePackage") {
88

99
import global._
1010

11-
object ImportsList {
12-
@tailrec def unapply(stats: List[Tree]): Option[Tree] =
13-
stats match {
14-
case Nil => None
15-
case List(stat) => Some(stat)
16-
case head :: next =>
17-
head match {
18-
case Import(_, _) => unapply(next)
19-
case _ => None
20-
}
11+
object ImportsOnlyOrEmptyList {
12+
@tailrec def unapply(stats: List[Tree]): Option[Tree] = stats match {
13+
case Nil => None
14+
case List(stat) => Some(stat)
15+
case head :: next => head match {
16+
case Import(_, _) => unapply(next)
17+
case _ => None
2118
}
19+
}
2220
}
2321

2422
def analyze(unit: CompilationUnit): Unit = if (argument != null) {
2523
val requiredBasePackage = argument
2624

2725
@tailrec def validate(tree: Tree): Unit = tree match {
2826
case PackageDef(pid, _) if pid.symbol.hasPackageFlag && pid.symbol.fullName == requiredBasePackage =>
29-
case PackageDef(_, ImportsList(stat)) => validate(stat)
27+
case PackageDef(_, ImportsOnlyOrEmptyList(stat)) => validate(stat)
3028
case t => report(t.pos, s"`$requiredBasePackage` must be one of the base packages in this file")
3129
}
3230

0 commit comments

Comments
 (0)