Skip to content

Commit fbf3e8e

Browse files
committed
Revert memberInfo extraction for typedefs
1 parent 804a111 commit fbf3e8e

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -395,10 +395,9 @@ trait ClassLikeSupport:
395395
case LambdaTypeTree(params, body) => isTreeAbstract(body)
396396
case _ => false
397397
}
398-
val memberInfo = unwrapMemberInfo(c, typeDef.symbol)
399-
val generics = memberInfo.genericTypes.values.map(_.typeSymbol.tree).collect {
400-
case t: TypeDef => mkTypeArgument(t)
401-
}.toSeq
398+
val (generics, tpeTree) = typeDef.rhs match
399+
case LambdaTypeTree(params, body) => (params.map(mkTypeArgument(_)), body)
400+
case tpe => (Nil, tpe)
402401

403402
val kind = Kind.Type(!isTreeAbstract(typeDef.rhs), typeDef.symbol.isOpaque, generics)
404403
mkMember(typeDef.symbol, kind, tpeTree.asSignature)(deprecated = typeDef.symbol.isDeprecated())

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,6 @@ trait TypesSupport:
159159
}
160160
}
161161
case t @ AppliedType(tpe, typeList) =>
162-
// if tpe.typeSymbol.normalizedName == "SomeTraitWithHKTs" then
163-
// println(typeList)
164162
import dotty.tools.dotc.util.Chars._
165163
if !t.typeSymbol.name.forall(isIdentifierPart) && typeList.size == 2 then
166164
inner(typeList.head)

scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ object ScalaSignatureProvider:
141141
.name(typeDef.name, typeDef.dri)
142142
.generics(tpe.typeParams)
143143
if(!tpe.opaque){
144-
bdr.signature(typeDef.signature)
144+
(if tpe.concreate then bdr.text(" = ") else bdr)
145+
.signature(typeDef.signature)
145146
} else bdr
146147

147148

0 commit comments

Comments
 (0)