Fix rebase breakage and update scala3doc files

odersky · odersky · commit f4052352f133 · 2020-12-09T17:01:48.000+01:00
diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
diff --git a/docs/sidebar.yml b/docs/sidebar.yml
@@ -188,7 +188,7 @@ sidebar:
             - title: "[this] Qualifier"
               url: docs/reference/dropped-features/this-qualifier.html
         - title: Syntax Summary
-          url: doc/reference/syntax.html
+          url: docs/reference/syntax.html
     - title: Contributing
       subsection:
         - title: Contribute Knowledge
diff --git a/library/src/scala/quoted/Quotes.scala b/library/src/scala/quoted/Quotes.scala
@@ -331,7 +331,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
 
     /** Extension methods of `Export` */
     trait ExportMethods:
-      extension (self: Export):
+      extension (self: Export)
         def expr: Term
         def selectors: List[Selector]
       end extension
diff --git a/scala3doc-testcases/src/tests/extensionMethodSignatures.scala b/scala3doc-testcases/src/tests/extensionMethodSignatures.scala
@@ -23,7 +23,7 @@ class ClassOne
       = ???
 
   extension (c:ClassTwo)
-  :
+
     def getString(a: String): String
        = a
 
diff --git a/scala3doc/src/dotty/dokka/DocContext.scala b/scala3doc/src/dotty/dokka/DocContext.scala
@@ -57,7 +57,7 @@ private def createMessage(
       case throwable: Throwable =>
          s"$localizedMessage \ncaused by: ${throwableToString(throwable)}"
 
-extension (r: report.type):
+extension (r: report.type)
   def error(m: String, f: File, e: Throwable | Null = null)(using CompilerContext): Unit =
     r.error(createMessage(m, f, e), sourcePostionFor(f))
 
diff --git a/scala3doc/src/dotty/dokka/DottyDokkaPlugin.scala b/scala3doc/src/dotty/dokka/DottyDokkaPlugin.scala
@@ -170,7 +170,7 @@ class DottyDokkaPlugin extends DokkaJavaPlugin:
   )
 
 // TODO (https://github.com/lampepfl/scala3doc/issues/232): remove once problem is fixed in Dokka
-extension [T]  (builder: ExtensionBuilder[T]):
+extension [T]  (builder: ExtensionBuilder[T])
   def ordered(before: Seq[Extension[_, _, _]], after: Seq[Extension[_, _, _]]): ExtensionBuilder[T] =
     val byDsl = new OrderingKind.ByDsl(dsl => {
       dsl.after(after:_*)
diff --git a/scala3doc/src/dotty/dokka/Scala3docArgs.scala b/scala3doc/src/dotty/dokka/Scala3docArgs.scala
@@ -46,7 +46,7 @@ object Scala3docArgs:
       processArguments(initialSummary, processAll = true, skipped = Nil)
     val newContext = rootCtx.fresh
 
-    extension[T](arg: Setting[T]):
+    extension[T](arg: Setting[T])
       def get = arg.valueIn(summary.sstate)
       def withDefault(default: => T) =
         if arg.get == arg.default then default else arg.get
diff --git a/scala3doc/src/dotty/dokka/compat.scala b/scala3doc/src/dotty/dokka/compat.scala
@@ -34,37 +34,37 @@ val topLevelDri = org.jetbrains.dokka.links.DRI.Companion.getTopLevel
 type SourceSetWrapper = DokkaConfiguration$DokkaSourceSet
 type DokkaSourceSet = DokkaConfiguration.DokkaSourceSet
 
-extension [T] (wrapper: SourceSetWrapper):
+extension [T] (wrapper: SourceSetWrapper)
     def toSet: JSet[DokkaConfiguration$DokkaSourceSet] = JSet(wrapper)
     def toMap(value: T): JMap[DokkaConfiguration$DokkaSourceSet, T] = JMap(wrapper -> value)
 
-extension [T] (wrapper: DokkaSourceSet):
+extension [T] (wrapper: DokkaSourceSet)
     // when named `toSet` fails in runtime -- TODO: create a minimal!
     // def toSet: JSet[DokkaConfiguration$DokkaSourceSet] = JSet(wrapper.asInstanceOf[SourceSetWrapper])
     def asSet: JSet[DokkaConfiguration$DokkaSourceSet] = JSet(wrapper.asInstanceOf[SourceSetWrapper])
     def asMap(value: T): JMap[DokkaConfiguration$DokkaSourceSet, T] = JMap(wrapper.asInstanceOf[SourceSetWrapper] -> value)
 
-extension (sourceSets: JList[DokkaSourceSet]):
+extension (sourceSets: JList[DokkaSourceSet])
   def asDokka: JSet[SourceSetWrapper] = sourceSets.asScala.toSet.asJava.asInstanceOf[JSet[SourceSetWrapper]]
   def toDisplaySourceSet = sourceSets.asScala.map(ss => DisplaySourceSet(ss.asInstanceOf[SourceSetWrapper])).toSet.asJava
 
-extension (sourceSets: Set[SourceSetWrapper]):
+extension (sourceSets: Set[SourceSetWrapper])
   def toDisplay = sourceSets.map(DisplaySourceSet(_)).asJava
 
-extension [V] (a: WithExtraProperties[_]):
+extension [V] (a: WithExtraProperties[_])
   def get(key: ExtraProperty.Key[_, V]): V = a.getExtra().getMap().get(key).asInstanceOf[V]
 
-extension [E <: WithExtraProperties[E]] (a: E):
+extension [E <: WithExtraProperties[E]] (a: E)
   def put(value: ExtraProperty[_ >: E]): E = a.withNewExtras(a.getExtra plus value)
 
-extension [V] (map: JMap[SourceSetWrapper, V]):
+extension [V] (map: JMap[SourceSetWrapper, V])
   def defaultValue: V = map.values.asScala.head
 
-extension [V](jlist: JList[V]):
+extension [V](jlist: JList[V])
   def ++ (other: JList[V]): JList[V] =
     Stream.of(jlist, other).flatMap(_.stream).collect(Collectors.toList())
 
-extension [V](jset: JSet[V]):
+extension [V](jset: JSet[V])
   def ++ (other: JSet[V]): JSet[V] =
     Stream.of(jset, other).flatMap(_.stream).collect(Collectors.toSet())
 
diff --git a/scala3doc/src/dotty/dokka/model/api/api.scala b/scala3doc/src/dotty/dokka/model/api/api.scala
@@ -94,7 +94,7 @@ type Signature = Seq[String | Link]
 object Signature:
   def apply(names: (String | Link)*): Signature = names // TO batter dotty shortcommings in union types
 
-extension (s: Signature):
+extension (s: Signature)
   def join(a: Signature): Signature = s ++ a
 
 case class LinkToType(signature: Signature, dri: DRI, kind: Kind)
@@ -116,7 +116,7 @@ object Member:
   def unapply(d: Documentable): Option[(String, DRI, Visibility, Kind, Origin)] =
     d.memberExt.map(v => (d.getName, d.getDri, v.visibility, v.kind, v.origin))
 
-extension[T] (member: Member):
+extension[T] (member: Member)
 
   private[api] def memberExt = MemberExtension.getFrom(member)
 
@@ -145,7 +145,7 @@ extension[T] (member: Member):
   def membersBy(op: Member => Boolean): (Seq[Member], Seq[Member]) = allMembers.filter(op).partition(_.origin == Origin.DefinedWithin)
 
 
-extension (module: DModule):
+extension (module: DModule)
   def driMap: Map[DRI, Member] = ModuleExtension.getFrom(module).fold(Map.empty)(_.driMap)
 
 case class TastyDocumentableSource(val path: String, val lineNumber: Int)
diff --git a/scala3doc/src/dotty/dokka/model/api/internalExtensions.scala b/scala3doc/src/dotty/dokka/model/api/internalExtensions.scala
@@ -50,7 +50,7 @@ object CompositeMemberExtension extends BaseKey[Documentable, CompositeMemberExt
     new MergeStrategy$Replace(left.copy(members = left.members ++ right.members))
       .asInstanceOf[MergeStrategy[Documentable]]
 
-extension (member: Member):
+extension (member: Member)
   private def putInMember(ext: MemberExtension) =
     val memberWithExtra = member.asInstanceOf[WithExtraProperties[Member]]
     memberWithExtra.withNewExtras(memberWithExtra.getExtra plus ext).asInstanceOf[Member]
@@ -93,7 +93,7 @@ extension (member: Member):
 
   def updateRecusivly(op: Member => Member) = op(member).withMembers(member.allMembers.map(op))
 
-extension (bound: Bound):
+extension (bound: Bound)
   def asSignature: Signature = bound match
     case tc: TypeConstructor =>
       tc.getProjections.asScala.toSeq.map {
@@ -102,7 +102,7 @@ extension (bound: Bound):
           Link(link.getName, link.getDri)
       }
 
-extension (m: DModule):
+extension (m: DModule)
   def updatePackages(op: Seq[DPackage] => Seq[DPackage]): DModule =
     m.copy(
             m.getName,
diff --git a/scala3doc/src/dotty/dokka/tasty/BasicSupport.scala b/scala3doc/src/dotty/dokka/tasty/BasicSupport.scala
@@ -34,7 +34,7 @@ trait BasicSupport:
     Annotation(dri, params)
 
 
-  extension (sym: Symbol):
+  extension (sym: Symbol)
     def documentation = sym.docstring match
       case Some(docstring) =>
           Map(ctx.sourceSet -> parseComment(docstring, sym.tree))
diff --git a/scala3doc/src/dotty/dokka/tasty/ClassLikeSupport.scala b/scala3doc/src/dotty/dokka/tasty/ClassLikeSupport.scala
@@ -188,7 +188,7 @@ trait ClassLikeSupport:
     case other => parseMember(other)
   ).map(_.withOrigin(Origin.InheritedFrom(s.symbol.owner.normalizedName, s.symbol.owner.dri)))
 
-  extension (c: ClassDef):
+  extension (c: ClassDef)
     def membersToDocument = c.body.filterNot(_.symbol.isHiddenByVisibility)
 
     def getNonTrivialInheritedMemberTrees =
diff --git a/scala3doc/src/dotty/dokka/tasty/SymOps.scala b/scala3doc/src/dotty/dokka/tasty/SymOps.scala
@@ -14,7 +14,7 @@ class SymOps[Q <: Quotes](val q: Q):
   import q.reflect._
 
   given Q = q
-  extension (sym: Symbol):
+  extension (sym: Symbol)
     def packageName: String =
       if (sym.isPackageDef) sym.fullName
       else sym.maybeOwner.packageName
diff --git a/scala3doc/src/dotty/dokka/tasty/SyntheticSupport.scala b/scala3doc/src/dotty/dokka/tasty/SyntheticSupport.scala
@@ -7,7 +7,7 @@ trait SyntheticsSupport:
 
   import qctx.reflect._
 
-  extension (t: TypeRepr):
+  extension (t: TypeRepr)
     def isTupleType: Boolean = hackIsTupleType(using qctx)(t)
 
     def isCompiletimeAppliedType: Boolean = hackIsCompiletimeAppliedType(using qctx)(t)
@@ -24,7 +24,7 @@ trait SyntheticsSupport:
       val tpe = rtpe.asInstanceOf[dotc.core.Types.Type]
       ctx.definitions.isCompiletimeAppliedType(tpe.typeSymbol)
 
-  extension (s: Symbol):
+  extension (s: Symbol)
     def isSyntheticFunc: Boolean = s.flags.is(Flags.Synthetic) || s.flags.is(Flags.FieldAccessor) || isDefaultHelperMethod
 
     def isSuperBridgeMethod: Boolean = s.name.contains("$super$")
diff --git a/scala3doc/src/dotty/dokka/tasty/TypesSupport.scala b/scala3doc/src/dotty/dokka/tasty/TypesSupport.scala
@@ -36,7 +36,7 @@ trait TypesSupport:
   }
 
   given TreeSyntax: AnyRef with
-    extension (tpeTree: Tree):
+    extension (tpeTree: Tree)
       def dokkaType: Bound =
         val data = tpeTree match
           case TypeBoundsTree(low, high) => typeBound(low.tpe, low = true) ++ typeBound(high.tpe, low = false)
@@ -46,7 +46,7 @@ trait TypesSupport:
         new GenericTypeConstructor(tpeTree.symbol.dri, data.asJava, null)
 
   given TypeSyntax: AnyRef with
-    extension (tpe: TypeRepr):
+    extension (tpe: TypeRepr)
       def dokkaType: Bound =
         val data = inner(tpe)
         val dri = data.collect{
diff --git a/scala3doc/src/dotty/dokka/translators/ScalaPageCreator.scala b/scala3doc/src/dotty/dokka/translators/ScalaPageCreator.scala
@@ -159,7 +159,7 @@ class ScalaPageCreator(
 
   override def contentForFunction(f: DFunction) = contentForMember(f)
 
-  extension (b: DocBuilder):
+  extension (b: DocBuilder)
     def descriptionIfNotEmpty(d: Documentable): DocBuilder = {
       val desc = this.contentForDescription(d).asScala.toSeq
       val res = if desc.isEmpty then b else b
diff --git a/scala3doc/src/dotty/dokka/utils.scala b/scala3doc/src/dotty/dokka/utils.scala
@@ -31,7 +31,7 @@ def getFromExtra[V](e: WithExtraProperties[_], k: ExtraProperty.Key[_, V]): Opti
   Option(e.getExtra.getMap.get(k)).asInstanceOf[Option[V]]
 
 
-extension (f: DFunction):
+extension (f: DFunction)
   def isRightAssociative(): Boolean = f.getName.endsWith(":")
 
 def modifyContentGroup(originalContentNodeWithParents: Seq[ContentGroup], modifiedContentNode: ContentGroup): ContentGroup =
diff --git a/scala3doc/test/dotty/dokka/ScaladocTest.scala b/scala3doc/test/dotty/dokka/ScaladocTest.scala
@@ -59,7 +59,7 @@ enum Assertion:
   case AfterPagesTransformation(fn: RootPageNode => Unit)
   case AfterRendering(fn: (RootPageNode, DokkaContext) => Unit)
 
-extension (s: Seq[Assertion]):
+extension (s: Seq[Assertion])
   def asTestMethods: TestMethods =
     import Assertion._
     TestMethods(
@@ -74,5 +74,5 @@ extension (s: Seq[Assertion]):
       ((root, context) => s.collect { case AfterRendering(fn) => fn(root, context)}.kUnit)
     )
 
-extension [T] (s: T):
+extension [T] (s: T)
   private def kUnit = kotlin.Unit.INSTANCE
diff --git a/scala3doc/test/dotty/dokka/SignatureTest.scala b/scala3doc/test/dotty/dokka/SignatureTest.scala
@@ -75,7 +75,7 @@ abstract class SignatureTest(
   private def findMissingSingatures(expected: Seq[String], actual: Seq[String]): Set[String] =
     expected.toSet &~ actual.toSet
 
-  extension (s: String):
+  extension (s: String)
     private def startWithAnyOfThese(c: String*) = c.exists(s.startsWith)
     private def compactWhitespaces = whitespaceRegex.replaceAllIn(s, " ")
 

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ class DottyDokkaPlugin extends DokkaJavaPlugin:`
`170`	`170`	`)`
`171`	`171`
`172`	`172`	`// TODO (https://github.com/lampepfl/scala3doc/issues/232): remove once problem is fixed in Dokka`
`173`		`-extension [T] (builder: ExtensionBuilder[T]):`
	`173`	`+extension [T] (builder: ExtensionBuilder[T])`
`174`	`174`	`def ordered(before: Seq[Extension[_, _, _]], after: Seq[Extension[_, _, _]]): ExtensionBuilder[T] =`
`175`	`175`	`val byDsl = new OrderingKind.ByDsl(dsl => {`
`176`	`176`	`dsl.after(after:_*)`