Merge remote-tracking branch 'upstream/master'

Author: michelou

.gitmodules

@@ -25,9 +25,6 @@
 [submodule "community-build/community-projects/stdLib213"]
 	path = community-build/community-projects/stdLib213
 	url = https://github.com/dotty-staging/scala
-[submodule "community-build/community-projects/pdbp"]
-	path = community-build/community-projects/pdbp
-	url = https://github.com/dotty-staging/pdbp
 [submodule "community-build/community-projects/sourcecode"]
 	path = community-build/community-projects/sourcecode
 	url = https://github.com/dotty-staging/sourcecode
@@ -193,3 +190,6 @@
 [submodule "community-build/community-projects/cask"]
 	path = community-build/community-projects/cask
 	url = https://github.com/dotty-staging/cask.git
+[submodule "community-build/community-projects/psbp"]
+	path = community-build/community-projects/psbp
+	url = https://github.com/dotty-staging/psbp-library.github.io

community-build/community-projects/pdbp

@@ -362,11 +362,10 @@ object projects:
     sbtDocCommand    = "set ThisBuild / useEffpiPlugin := false; effpi/doc; benchmarks/doc; examples/doc; pluginBenchmarks/doc",
   )
 
-  // TODO @odersky? It got broken by #5458
-  // val pdbp = test(
-  //   project       = "pdbp",
-  //   sbtTestCommand   = "compile",
-  // )
+  val psbp = SbtCommunityProject(
+    project       = "psbp",
+    sbtTestCommand   = "compile",
+  )
 
   lazy val sconfig = SbtCommunityProject(
     project       = "sconfig",
@@ -709,6 +708,7 @@ def allProjects = List(
   projects.akka,
   projects.protoquill,
   projects.onnxScala,
+  projects.psbp,
 )
 
 lazy val projectMap = allProjects.groupBy(_.project)

community-build/community-projects/psbp

@@ -102,6 +102,7 @@ class CommunityBuildTestA extends CommunityBuildTest:
   // @Test def scissSpan       = projects.scissSpan      .run()
   @Test def scissLucre = projects.scissLucre.run()
   @Test def zio = projects.zio.run()
+  @Test def psbp = projects.psbp.run()
 end CommunityBuildTestA
 
 @Category(Array(classOf[TestCategory]))

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

@@ -290,12 +290,12 @@ class JSCodeGen()(using genCtx: Context) {
         "genScalaClass() must be called only for normal classes: "+sym)
     assert(sym.superClass != NoSymbol, sym)
 
-    /*if (hasDefaultCtorArgsAndRawJSModule(sym)) {
-      reporter.error(pos,
-          "Implementation restriction: constructors of " +
-          "Scala classes cannot have default parameters " +
-          "if their companion module is JS native.")
-    }*/
+    if (hasDefaultCtorArgsAndJSModule(sym)) {
+      report.error(
+          "Implementation restriction: " +
+          "constructors of Scala classes cannot have default parameters if their companion module is JS native.",
+          td)
+    }
 
     val classIdent = encodeClassNameIdent(sym)
     val originalName = originalNameOfClass(sym)
@@ -965,9 +965,8 @@ class JSCodeGen()(using genCtx: Context) {
 
     if (hasDefaultCtorArgsAndJSModule(classSym)) {
       report.error(
-          "Implementation restriction: constructors of " +
-          "non-native JS classes cannot have default parameters " +
-          "if their companion module is JS native.",
+          "Implementation restriction: " +
+          "constructors of non-native JS classes cannot have default parameters if their companion module is JS native.",
           classSym.srcPos)
       val ctorDef = js.JSMethodDef(js.MemberFlags.empty,
           js.StringLiteral("constructor"), Nil, None, js.Skip())(
@@ -1067,9 +1066,10 @@ class JSCodeGen()(using genCtx: Context) {
         Some(js.MethodDef(js.MemberFlags.empty, methodName, originalName,
             jsParams, toIRType(patchedResultType(sym)), None)(
             OptimizerHints.empty, None))
-      } else /*if (isJSNativeCtorDefaultParam(sym)) {
+      } else if (sym.isJSNativeCtorDefaultParam) {
+        // #11592
         None
-      } else if (sym.isClassConstructor && isHijackedBoxedClass(sym.owner)) {
+      } else /*if (sym.isClassConstructor && isHijackedBoxedClass(sym.owner)) {
         None
       } else*/ {
         /*def isTraitImplForwarder = dd.rhs match {

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

@@ -4,6 +4,7 @@ package transform
 
 import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.core.Decorators._
+import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Flags._
 import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.transform.MegaPhase.MiniPhase
@@ -37,7 +38,10 @@ class InlineVals extends MiniPhase:
           if !isPureExpr(rhs) then
             val details = if enclosingInlineds.isEmpty then "" else em"but was: $rhs"
             report.error(s"inline value must be pure$details", rhs.srcPos)
-        case _ =>
-          val pos = if tpt.span.isZeroExtent then rhs.srcPos else tpt.srcPos
-          report.error(em"inline value must have a literal constant type", pos)
+        case tp =>
+          if tp.derivesFrom(defn.StringClass) || defn.ScalaValueClasses().exists(tp.derivesFrom(_)) then
+            val pos = if tpt.span.isZeroExtent then rhs.srcPos else tpt.srcPos
+            report.error(em"inline value must have a literal constant type", pos)
+          else
+            report.error(em"inline value must contain a literal constant value.\n\nTo inline more complex types consider using `inline def`", rhs)
   }

compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala

@@ -158,6 +158,13 @@ object JSSymUtils {
       }
     }
 
+    /** Is this symbol a default param accessor for the constructor of a native JS class? */
+    def isJSNativeCtorDefaultParam(using Context): Boolean = {
+      sym.name.is(DefaultGetterName)
+        && sym.name.exclude(DefaultGetterName) == nme.CONSTRUCTOR
+        && sym.owner.linkedClass.hasAnnotation(jsdefn.JSNativeAnnot)
+    }
+
     def jsCallingConvention(using Context): JSCallingConvention =
       JSCallingConvention.of(sym)
 

compiler/src/dotty/tools/dotc/transform/InlineVals.scala

@@ -84,11 +84,13 @@ object FromExpr {
     def unapply(expr: Expr[T])(using Quotes) =
       import quotes.reflect._
       def rec(tree: Term): Option[T] = tree match {
-        case Literal(c) if c.value != null => Some(c.value.asInstanceOf[T])
-        case Block(Nil, e) => rec(e)
+        case Block(stats, e) => if stats.isEmpty then rec(e) else None
+        case Inlined(_, bindings, e) => if bindings.isEmpty then rec(e) else None
         case Typed(e, _) => rec(e)
-        case Inlined(_, Nil, e) => rec(e)
-        case _  => None
+        case _ =>
+          tree.tpe.widenTermRefByName match
+            case ConstantType(c) => Some(c.value.asInstanceOf[T])
+            case _ => None
       }
       rec(expr.asTerm)
   }

compiler/src/dotty/tools/dotc/transform/sjs/JSSymUtils.scala

@@ -9,8 +9,7 @@ object AnObject:
 /**
  * Broken link, that should result a warning not break compilation
  * [[tests.links.AnObject]]
-
  */
 class LinksTest:
   def verifyIfLinksTestIsGenerated(b: Int): Int
-    = 123
+    = 123

library/src/scala/quoted/FromExpr.scala

@@ -0,0 +1,20 @@
+package tests
+package lookupInheritedMembers.pack1 {
+  class A:
+    def x = 1
+    val y = 1
+    type MyType
+
+}
+package lookupInheritedMembers.pack2 {
+  class B extends tests.lookupInheritedMembers.pack1.A
+}
+
+package lookupInheritedMembers {
+  /**
+   * [[tests.lookupInheritedMembers.pack2.B.x]]
+   * [[tests.lookupInheritedMembers.pack2.B.y]]
+   * [[tests.lookupInheritedMembers.pack2.B.MyType]]
+   */
+  class LookupInheritedMembers
+}

scaladoc-testcases/src/tests/links.scala

@@ -131,6 +131,10 @@ class B extends A {
   class BB
 }
 
+class BModule {
+  def foo = "foo"
+}
+
 /** Companion object to test linking.
   *
   * This is my member: [[B$.Z]]
@@ -141,7 +145,7 @@ class B extends A {
   *
   * And this is my term member, addressed differently: [[this.Z$]]
   */
-object B {
+object B extends BModule {
   type Z = Int
   val Z: Int = 0
 }

scaladoc-testcases/src/tests/lookupInheritedMembers.scala

@@ -190,3 +190,8 @@ class SymOps[Q <: Quotes](val q: Q) extends JavadocAnchorCreator with Scaladoc2A
           // For some reason it contains `$$$` instrad of symbol name
           s"${sym.name}${sym.fullName}/${sym.signature.resultSig}/[${sym.signature.paramSigs.mkString("/")}]"
         )
+
+    def driInContextOfInheritingParent(par: Symbol)(using dctx: DocContext): DRI = sym.dri.copy(
+      location = par.dri.location,
+      externalLink = None
+    )

scaladoc-testcases/src/tests/tests.scala

@@ -80,8 +80,12 @@ case class ScaladocTastyInspector()(using ctx: DocContext) extends DocTastyInspe
     def driFor(link: String): Option[DRI] =
       val symOps = new SymOps[q.type](q)
       import symOps._
-      Try(QueryParser(link).readQuery()).toOption.flatMap(q =>
-        MemberLookup.lookupOpt(q, None).map{ case (sym, _) => sym.dri}
+      Try(QueryParser(link).readQuery()).toOption.flatMap(query =>
+        MemberLookup.lookupOpt(query, None).map {
+          case (sym, _, inheritingParent) => inheritingParent match
+            case Some(parent) => sym.driInContextOfInheritingParent(parent)
+            case None => sym.dri
+        }
       )
 
     ctx.staticSiteContext.foreach(_.memberLinkResolver = driFor)

scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala

@@ -83,6 +83,7 @@ abstract class MarkupConversion[T](val repr: Repr)(using DocContext) {
 
   object SymOps extends SymOps[qctx.type](qctx)
   export SymOps.dri
+  export SymOps.driInContextOfInheritingParent
 
   def resolveLink(queryStr: String): DocLink =
     if SchemeUri.matches(queryStr) then DocLink.ToURL(queryStr)
@@ -94,8 +95,11 @@ abstract class MarkupConversion[T](val repr: Repr)(using DocContext) {
         DocLink.UnresolvedDRI(queryStr, msg)
       case Right(query) =>
         MemberLookup.lookup(using qctx)(query, owner) match
-          case Some((sym, targetText)) =>
-            DocLink.ToDRI(sym.dri, targetText)
+          case Some((sym, targetText, inheritingParent)) =>
+            var dri = inheritingParent match
+              case Some(parent) => sym.driInContextOfInheritingParent(parent)
+              case None => sym.dri
+            DocLink.ToDRI(dri, targetText)
           case None =>
             val txt = s"No DRI found for query"
             val msg = s"$txt: $queryStr"