Fix type test for trait parameter arguments

.github/workflows/ci.yaml

@@ -149,6 +149,18 @@ jobs:
         run: sbt ";scala3-bootstrapped/compile"
         shell: cmd
 
+      - name: build binary
+        run: sbt "dist/pack" & bash -version
+        shell: cmd
+
+      - name: cygwin tests
+        run: '"C:\Program Files\cygwin64\bin\bash" ./project/scripts/winCmdTests'
+        shell: cmd
+
+      - name: msys tests
+        run: '"C:\Program Files\Git\bin\bash" ./project/scripts/winCmdTests'
+        shell: cmd
+
       - name: Scala.js Test
         run: sbt ";sjsJUnitTests/test ;sjsCompilerTests/test"
         shell: cmd
@@ -348,12 +360,9 @@ jobs:
       - name: Add SBT proxy repositories
         run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
 
-      - name: Test sbt 1.4.x
+      - name: Test sbt
         run: ./project/scripts/sbt "sbt-dotty/scripted; sbt-community-build/scripted"
 
-      - name: Test sbt 1.5.x
-        run: ./project/scripts/sbt "set \`sbt-dotty\`/scriptedSbt := \"1.5.0-RC1\"; sbt-dotty/scripted sbt-dotty/*"
-
   test_java8:
     runs-on: [self-hosted, Linux]
     container:
@@ -660,3 +669,23 @@ jobs:
       - name: Publish Dotty SBT Plugin Release
         run: |
           ./project/scripts/sbtPublish ";project sbt-dotty ;publishSigned ;sonatypeBundleRelease"
+
+  open_issue_on_failure:
+    runs-on: [self-hosted, Linux]
+    container:
+      image: lampepfl/dotty:2021-03-22
+    needs: [nightly_documentation, test_windows_full]
+    # The `failure()` expression is true iff at least one of the dependencies
+    # of this job (including transitive dependencies) has failed.
+    if: "failure() && github.event_name == 'schedule'"
+    steps:
+      - name: Checkout issue template
+        uses: actions/checkout@v2
+
+      - name: Open an issue
+        uses: JasonEtco/create-an-issue@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          WORKFLOW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+        with:
+          filename: .github/workflows/issue_nightly_failed.md

.github/workflows/issue_nightly_failed.md

@@ -0,0 +1,5 @@
+---
+title: Nightly {{ workflow }} workflow of {{ date | date('YYYY-MM-DD') }} failed
+labels: itype:bug, prio:blocker
+---
+See {{ env.WORKFLOW_RUN_URL }}

community-build/src/scala/dotty/communitybuild/Main.scala

@@ -54,7 +54,10 @@ object Main:
         Seq("rm", "-rf", destStr).!
         Files.createDirectory(dest)
         val (toRun, ignored) =
-          allProjects.partition(_.docCommand != null)
+          allProjects.partition( p =>
+            p.docCommand != null
+            && (!p.requiresExperimental || compilerSupportExperimental)
+          )
 
         val paths = toRun.map { project =>
           val name = project.project

community-build/src/scala/dotty/communitybuild/projects.scala

@@ -40,6 +40,7 @@ sealed trait CommunityProject:
   val dependencies: List[CommunityProject]
   val binaryName: String
   val runCommandsArgs: List[String] = Nil
+  val requiresExperimental: Boolean
 
   final val projectDir = communitybuildDir.resolve("community-projects").resolve(project)
 
@@ -48,6 +49,7 @@ sealed trait CommunityProject:
 
   /** Publish this project to the local Maven repository */
   final def publish(): Unit =
+    // TODO what should this do with .requiresExperimental?
     if !published then
       publishDependencies()
       log(s"Publishing $project")
@@ -59,6 +61,11 @@ sealed trait CommunityProject:
       published = true
 
   final def doc(): Unit =
+    if this.requiresExperimental && !compilerSupportExperimental then
+      log(
+        s"Skipping ${this.project} - it needs experimental features unsupported in this build."
+      )
+      return
     publishDependencies()
     log(s"Documenting $project")
     if docCommand eq null then
@@ -78,6 +85,7 @@ final case class MillCommunityProject(
     baseCommand: String,
     dependencies: List[CommunityProject] = Nil,
     ignoreDocs: Boolean = false,
+    requiresExperimental: Boolean = false,
     ) extends CommunityProject:
   override val binaryName: String = "./mill"
   override val testCommand = s"$baseCommand.test"
@@ -94,20 +102,21 @@ final case class SbtCommunityProject(
     dependencies: List[CommunityProject] = Nil,
     sbtPublishCommand: String = null,
     sbtDocCommand: String = null,
-    scalacOptions: List[String] = SbtCommunityProject.scalacOptions
+    scalacOptions: List[String] = SbtCommunityProject.scalacOptions,
+    requiresExperimental: Boolean = false,
   ) extends CommunityProject:
   override val binaryName: String = "sbt"
 
   private def scalacOptionsString: String =
     scalacOptions.map("\"" + _ + "\"").mkString("List(", ",", ")")
 
   private val baseCommand =
-    "clean; set logLevel in Global := Level.Error; set updateOptions in Global ~= (_.withLatestSnapshots(false)); "
-    ++ (if scalacOptions.isEmpty then "" else s"""set scalacOptions in Global ++= $scalacOptionsString;""")
+    "clean; set Global/logLevel := Level.Error; set Global/updateOptions ~= (_.withLatestSnapshots(false)); "
+    ++ (if scalacOptions.isEmpty then "" else s"""set Global/scalacOptions ++= $scalacOptionsString;""")
     ++ s"++$compilerVersion!; "
 
   override val testCommand =
-    """set testOptions in Global += Tests.Argument(TestFramework("munit.Framework"), "+l"); """
+    """set Global/testOptions += Tests.Argument(TestFramework("munit.Framework"), "+l"); """
     ++ s"$baseCommand$sbtTestCommand"
 
   override val publishCommand =
@@ -124,7 +133,7 @@ final case class SbtCommunityProject(
       case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome")
       case _ => Nil
     extraSbtArgs ++ sbtProps ++ List(
-      "-sbt-version", "1.4.9",
+      "-sbt-version", "1.5.0",
       "-Dsbt.supershell=false",
       s"-Ddotty.communitybuild.dir=$communitybuildDir",
       s"--addPluginSbtFile=$sbtPluginFilePath"
@@ -140,12 +149,12 @@ object projects:
 
   private def forceDoc(projects: String*) =
     projects.map(project =>
-      s""";set $project/Compile/doc/sources ++= ($project/Compile/doc/tastyFiles).value ;$project/doc"""
+      s""";set $project/Compile/doc/sources ++= ($project/Compile/doc/dotty.tools.sbtplugin.DottyPlugin.autoImport.tastyFiles).value ;$project/doc"""
     ).mkString(" ")
 
   private def aggregateDoc(in: String)(projects: String*) =
     val tastyFiles =
-      (in +: projects).map(p => s"($p/Compile/doc/tastyFiles).value").mkString(" ++ ")
+      (in +: projects).map(p => s"($p/Compile/doc/dotty.tools.sbtplugin.DottyPlugin.autoImport.tastyFiles).value").mkString(" ++ ")
     s""";set $in/Compile/doc/sources ++= file("a.scala") +: ($tastyFiles) ;$in/doc"""
 
   lazy val utest = MillCommunityProject(
@@ -237,13 +246,14 @@ object projects:
 
   lazy val scas = MillCommunityProject(
     project = "scas",
-    baseCommand = "scas.application"
+    baseCommand = "scas.application",
   )
 
   lazy val intent = SbtCommunityProject(
     project       = "intent",
     sbtTestCommand   = "test",
-    sbtDocCommand = "doc"
+    sbtDocCommand = "doc",
+    requiresExperimental = true,
   )
 
   lazy val algebra = SbtCommunityProject(
@@ -398,15 +408,17 @@ object projects:
     sbtTestCommand   = "coreJVM/test;coreJS/test",
     sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal",
     sbtDocCommand   = "coreJVM/doc",
-    dependencies = List(munit)
+    dependencies = List(munit),
+    requiresExperimental = true,
   )
 
   lazy val scodec = SbtCommunityProject(
     project          = "scodec",
     sbtTestCommand   = "unitTests/test",
     // Adds <empty> package
     sbtDocCommand   = "coreJVM/doc",
-    dependencies = List(munit, scodecBits)
+    dependencies = List(munit, scodecBits),
+    requiresExperimental = true,
   )
 
   lazy val scalaParserCombinators = SbtCommunityProject(
@@ -512,7 +524,7 @@ object projects:
 
   lazy val cats = SbtCommunityProject(
     project = "cats",
-    sbtTestCommand = "set scalaJSStage in Global := FastOptStage;buildJVM;validateAllJS",
+    sbtTestCommand = "set Global/scalaJSStage := FastOptStage;buildJVM;validateAllJS",
     sbtPublishCommand = "catsJVM/publishLocal;catsJS/publishLocal",
     dependencies = List(discipline, disciplineMunit, scalacheck, simulacrumScalafixAnnotations),
     scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init") // disable -Ysafe-init, due to -Xfatal-warning

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

@@ -20,7 +20,12 @@ abstract class CommunityBuildTest:
    *  and avoid network overhead. See https://github.com/lampepfl/dotty-drone
    *  for more infrastructural details.
    */
-  extension (self: CommunityProject) def run()(using suite: CommunityBuildTest) =
+  extension (self: CommunityProject) def run()(using suite: CommunityBuildTest): Unit =
+    if self.requiresExperimental && !compilerSupportExperimental then
+      println(
+        s"Skipping ${self.project} - it needs experimental features unsupported in this build."
+      )
+      return
     self.dependencies.foreach(_.publish())
     suite.test(self)
 
@@ -116,8 +121,8 @@ class CommunityBuildTestB extends CommunityBuildTest:
   @Test def disciplineSpecs2 = projects.disciplineSpecs2.run()
   @Test def munit = projects.munit.run()
   @Test def perspective = projects.perspective.run()
-  @Test def scodec = if compilerSupportExperimental then projects.scodec.run()
-  @Test def scodecBits = if compilerSupportExperimental then projects.scodecBits.run()
+  @Test def scodec = projects.scodec.run()
+  @Test def scodecBits = projects.scodecBits.run()
   @Test def simulacrumScalafixAnnotations = projects.simulacrumScalafixAnnotations.run()
 end CommunityBuildTestB
 
@@ -134,7 +139,7 @@ class CommunityBuildTestC extends CommunityBuildTest:
   @Test def fansi = projects.fansi.run()
   @Test def fastparse = projects.fastparse.run()
   @Test def geny = projects.geny.run()
-  @Test def intent = if compilerSupportExperimental then projects.intent.run()
+  @Test def intent = projects.intent.run()
   @Test def minitest = projects.minitest.run()
   @Test def onnxScala = projects.onnxScala.run()
   @Test def oslib = projects.oslib.run()

compiler/src/dotty/tools/dotc/ast/Desugar.scala

@@ -7,7 +7,7 @@ import util.Spans._, Types._, Contexts._, Constants._, Names._, NameOps._, Flags
 import Symbols._, StdNames._, Trees._, Phases._, ContextOps._
 import Decorators._, transform.SymUtils._
 import NameKinds.{UniqueName, EvidenceParamName, DefaultGetterName}
-import typer.{FrontEnd, Namer}
+import typer.{FrontEnd, Namer, Checking}
 import util.{Property, SourceFile, SourcePosition}
 import config.Feature.{sourceVersion, migrateTo3, enabled}
 import config.SourceVersion._
@@ -859,16 +859,7 @@ object desugar {
     val mods = mdef.mods
     val moduleName = normalizeName(mdef, impl).asTermName
     def isEnumCase = mods.isEnumCase
-
-    def flagSourcePos(flag: FlagSet) = mods.mods.find(_.flags == flag).fold(mdef.sourcePos)(_.sourcePos)
-
-    if (mods.is(Abstract))
-      report.error(AbstractCannotBeUsedForObjects(mdef), flagSourcePos(Abstract))
-    if (mods.is(Sealed))
-      report.error(ModifierRedundantForObjects(mdef, "sealed"), flagSourcePos(Sealed))
-    // Maybe this should be an error; see https://github.com/scala/bug/issues/11094.
-    if (mods.is(Final) && !mods.is(Synthetic))
-      report.warning(ModifierRedundantForObjects(mdef, "final"), flagSourcePos(Final))
+    Checking.checkWellFormedModule(mdef)
 
     if (mods.is(Package))
       packageModuleDef(mdef)

compiler/src/dotty/tools/dotc/ast/TreeInfo.scala

@@ -652,7 +652,7 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
     }
   }
 
-  /** The type arguemnts of a possibly curried call */
+  /** The type arguments of a possibly curried call */
   def typeArgss(tree: Tree): List[List[Tree]] =
     @tailrec
     def loop(tree: Tree, argss: List[List[Tree]]): List[List[Tree]] = tree match
@@ -661,7 +661,7 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
       case _ => argss
     loop(tree, Nil)
 
-  /** The term arguemnts of a possibly curried call */
+  /** The term arguments of a possibly curried call */
   def termArgss(tree: Tree): List[List[Tree]] =
     @tailrec
     def loop(tree: Tree, argss: List[List[Tree]]): List[List[Tree]] = tree match
@@ -670,7 +670,7 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
       case _ => argss
     loop(tree, Nil)
 
-  /** The type and term arguemnts of a possibly curried call, in the order they are given */
+  /** The type and term arguments of a possibly curried call, in the order they are given */
   def allArgss(tree: Tree): List[List[Tree]] =
     @tailrec
     def loop(tree: Tree, argss: List[List[Tree]]): List[List[Tree]] = tree match

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

@@ -52,36 +52,6 @@ trait CommonScalaSettings { self: Settings.SettingGroup =>
   val showPlugins: Setting[Boolean]        = BooleanSetting      ("-Xplugin-list", "Print a synopsis of loaded plugins.")
   val pluginsDir: Setting[String]         = StringSetting       ("-Xpluginsdir", "path", "Path to search for plugin archives.", Defaults.scalaPluginPath)
   val pluginOptions: Setting[List[String]]      = MultiStringSetting  ("-P", "plugin:opt", "Pass an option to a plugin, e.g. -P:<plugin>:<opt>")
-
-   /** Doctool specific settings */
-  val siteRoot: Setting[String] = StringSetting(
-    "-siteroot",
-    "site root",
-    "A directory containing static files from which to generate documentation.",
-    "./docs"
-  )
-
-
-  val projectName: Setting[String] = StringSetting (
-    "-project",
-    "project title",
-    "The name of the project.",
-    ""
-  )
-
-  val projectVersion: Setting[String] = StringSetting (
-    "-project-version",
-    "project version",
-    "The current version of your project.",
-    ""
-  )
-
-  val projectLogo: Setting[String] = StringSetting(
-    "-project-logo",
-    "project logo filename",
-    "The file that contains the project's logo (in /images).",
-    ""
-  )
 }
 
 class ScalaSettings extends Settings.SettingGroup with CommonScalaSettings {

compiler/src/dotty/tools/dotc/core/CheckRealizable.scala

@@ -32,8 +32,8 @@ object CheckRealizable {
   class HasProblemBaseArg(typ: Type, argBounds: TypeBounds)(using Context)
   extends Realizability(i" has a base type $typ with possibly conflicting parameter bounds ${argBounds.lo} <: ... <: ${argBounds.hi}")
 
-  class HasProblemBase(base1: Type, base2: Type, argStr: String)(using Context)
-  extends Realizability(i" has conflicting base type${argStr}s $base1 and $base2")
+  class HasProblemBase(base1: Type, base2: Type)(using Context)
+  extends Realizability(i" has conflicting base types $base1 and $base2")
 
   class HasProblemField(fld: SingleDenotation, problem: Realizability)(using Context)
   extends Realizability(i" has a member $fld which is not a legal path\nsince ${fld.symbol.name}: ${fld.info}${problem.msg}")
@@ -167,30 +167,17 @@ class CheckRealizable(using Context) {
         new HasProblemBounds(name, mbr.info)
     }
 
-    def baseTypeProblems(base: Type, argStr: String): List[Realizability] = base match {
-      case base: AndType =>
-        def factors(tp: Type): List[Type] = tp match
-          case AndType(tp1, tp2) => factors(tp1) ++ factors(tp2)
-          case _ => tp :: Nil
-        for case AndType(base1, base2) <-
-            factors(base).groupBy(_.classSymbol).values.map(_.reduce(_ & _)).toList
-          // try to merge factors with common class symbols
-          // if we cannot, it's a conflict
-        yield HasProblemBase(base1, base2, argStr)
-      case base: AppliedType =>
-        base.argInfos.lazyZip(base.tycon.typeParams).flatMap { (arg, tparam) =>
-          arg match
-            case bounds @ TypeBounds(lo, hi) if !(lo <:< hi) =>
-              new HasProblemBaseArg(base, bounds) :: Nil
-            case arg if tparam.paramVarianceSign == 0 =>
-              baseTypeProblems(arg, " argument")
-            case _ =>
-              Nil
+    def baseTypeProblems(base: Type) = base match {
+      case AndType(base1, base2) =>
+        new HasProblemBase(base1, base2) :: Nil
+      case base =>
+        base.argInfos.collect {
+          case bounds @ TypeBounds(lo, hi) if !(lo <:< hi) =>
+            new HasProblemBaseArg(base, bounds)
         }
-      case _ => Nil
     }
     val baseProblems =
-      tp.baseClasses.map(_.baseTypeOf(tp)).flatMap(baseTypeProblems(_, ""))
+      tp.baseClasses.map(_.baseTypeOf(tp)).flatMap(baseTypeProblems)
 
     baseProblems.foldLeft(
       refinementProblems.foldLeft(