Drop staticOnly paraaeter

Author: odersky

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

@@ -7,6 +7,7 @@ import core.Contexts._, core.Symbols._
 import core.SymbolLoader
 import core.SymDenotations.SymDenotation
 import core.StdNames.nme
+import core.Flags.Module
 
 /** The platform dependent pieces of Global.
  */
@@ -36,12 +37,10 @@ abstract class Platform {
   /** The given symbol is a method with the right name and signature to be a runnable program. */
   def isMainMethod(sym: SymDenotation)(implicit ctx: Context): Boolean
 
-  /** The given class has a main method.
-   *  @param  staticOnly   only static main methods count
-   */
-  final def hasMainMethod(sym: Symbol, staticOnly: Boolean = false)(implicit ctx: Context): Boolean =
+  /** The given class has a main method. */
+  final def hasMainMethod(sym: Symbol)(implicit ctx: Context): Boolean =
     sym.info.member(nme.main).hasAltWith {
-      case x: SymDenotation => isMainMethod(x) && (!staticOnly || x.isStatic)
+      case x: SymDenotation => isMainMethod(x) && (sym.is(Module) || x.isStatic)
       case _ => false
     }
 }

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

@@ -230,8 +230,7 @@ private class ExtractAPICollector(implicit val ctx: Context) extends ThunkHolder
 
     allNonLocalClassesInSrc += cl
 
-    if (sym.isStatic && !sym.is(Trait) &&
-        ctx.platform.hasMainMethod(sym, staticOnly = !sym.is(Module))) {
+    if (sym.isStatic && !sym.is(Trait) && ctx.platform.hasMainMethod(sym)) {
        // If sym is an object, all main methods count, otherwise only @static ones count.
       _mainClasses += name
     }