Skip to content

Commit 19ef092

Browse files
committed
Fix type thingies using constructors that cause crashes
1 parent 2e25695 commit 19ef092

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Diff for: scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ trait ClassLikeSupport:
130130
case dd: DefDef if isDocumentableExtension(dd.symbol) =>
131131
dd.symbol.extendedSymbol.map { extSym =>
132132
val memberInfo = unwrapMemberInfo(c, dd.symbol)
133-
val typeParams = dd.symbol.extendedTypeParams.params.map(mkTypeArgument(_, memberInfo.genericTypes))
133+
val typeParams = dd.symbol.extendedTypeParamList.map(mkTypeArgument(_, memberInfo.genericTypes))
134134
//println(dd.name)
135135
//println("MemberInfo:\n" + memberInfo.paramLists)
136136
//println("extended...:\n" + dd.symbol.extendedTermParamLists)
@@ -331,7 +331,7 @@ trait ClassLikeSupport:
331331
): Member =
332332
val method = methodSymbol.tree.asInstanceOf[DefDef]
333333
val paramLists: List[TermParamClause] = methodSymbol.nonExtensionTermParamLists
334-
val genericTypes: List[TypeDef] = if (methodSymbol.isClassConstructor) Nil else methodSymbol.nonExtensionTypeParams.params
334+
val genericTypes: List[TypeDef] = if (methodSymbol.isClassConstructor) Nil else methodSymbol.nonExtensionTypeParamList
335335

336336
val memberInfo = unwrapMemberInfo(c, methodSymbol)
337337

Diff for: scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -206,16 +206,16 @@ object SymOps:
206206
def extendedTermParamLists: List[reflect.TermParamClause] =
207207
sym.extendedParamLists.collect{case terms: reflect.TermParamClause => terms}
208208

209-
def extendedTypeParams: reflect.TypeParamClause =
209+
def extendedTypeParamList: List[reflect.TypeDef] =
210210
val typeParamss: List[reflect.TypeParamClause] = sym.extendedParamLists.collect{case types: reflect.TypeParamClause => types}
211-
typeParamss.headOption.getOrElse(reflect.TypeParamClause(List())) // only one type param clause on LHS
211+
typeParamss.headOption.map(_.params).getOrElse(List()) // only one type param clause on LHS
212212

213213
def nonExtensionParamLists: List[reflect.ParamClause] =
214214
sym.splitExtensionParamLists._2
215215

216-
def nonExtensionTypeParams: reflect.TypeParamClause =
216+
def nonExtensionTypeParamList: List[reflect.TypeDef] =
217217
val typeParamss: List[reflect.TypeParamClause] = sym.nonExtensionParamLists.collect{case types: reflect.TypeParamClause => types}
218-
typeParamss.headOption.getOrElse(reflect.TypeParamClause(List())) // only one type param clause on RHS
218+
typeParamss.headOption.map(_.params).getOrElse(List()) // only one type param clause on RHS
219219

220220
def nonExtensionTermParamLists: List[reflect.TermParamClause] =
221221
sym.nonExtensionParamLists.collect{case terms: reflect.TermParamClause => terms}

0 commit comments

Comments
 (0)