Skip to content

Commit 5bdab50

Browse files
Merge pull request scala#6973 from dotty-staging/fix-#6972
Fix scala#6972: Parially revert c53f465
2 parents 8b4509d + 0d2400d commit 5bdab50

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

compiler/src/dotty/tools/dotc/config/JavaPlatform.scala

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,10 @@ class JavaPlatform extends Platform {
2222

2323
// The given symbol is a method with the right name and signature to be a runnable java program.
2424
def isMainMethod(sym: SymDenotation)(implicit ctx: Context): Boolean =
25-
sym.name == nme.main &&
26-
(sym.owner.is(Module) || sym.owner.isClass && !sym.owner.is(Trait) && sym.is(JavaStatic)) && {
27-
sym.info match {
28-
case MethodTpe(_, defn.ArrayOf(el) :: Nil, restpe) => el =:= defn.StringType && (restpe isRef defn.UnitClass)
29-
case _ => false
30-
}
31-
}
25+
(sym.name == nme.main) && (sym.info match {
26+
case MethodTpe(_, defn.ArrayOf(el) :: Nil, restpe) => el =:= defn.StringType && (restpe isRef defn.UnitClass)
27+
case _ => false
28+
})
3229

3330
/** Update classpath with a substituted subentry */
3431
def updateClassPath(subst: Map[ClassPath, ClassPath]): Unit = currentClassPath.get match {

0 commit comments

Comments
 (0)