Skip to content

Commit 36b5c8a

Browse files
committed
Reorder and Rename methods for consistency
1 parent 43a1a26 commit 36b5c8a

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,10 @@ 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.map(mkTypeArgument(_, memberInfo.genericTypes))
133+
val typeParams = dd.symbol.extendedTypeParamList.map(mkTypeArgument(_, memberInfo.genericTypes))
134+
//println(dd.name)
135+
//println("MemberInfo:\n" + memberInfo.paramLists)
136+
//println("extended...:\n" + dd.symbol.extendedTermParamLists)
134137
val termParams = dd.symbol.extendedTermParamLists.zipWithIndex.flatMap { case (paramList, index) =>
135138
memberInfo.paramLists(index) match
136139
case EvidenceOnlyParameterList => Nil
@@ -328,7 +331,7 @@ trait ClassLikeSupport:
328331
): Member =
329332
val method = methodSymbol.tree.asInstanceOf[DefDef]
330333
val paramLists: List[TermParamClause] = methodSymbol.nonExtensionTermParamLists
331-
val genericTypes: List[TypeDef] = if (methodSymbol.isClassConstructor) Nil else methodSymbol.nonExtensionLeadingTypeParams
334+
val genericTypes: List[TypeDef] = if (methodSymbol.isClassConstructor) Nil else methodSymbol.nonExtensionTypeParamList
332335

333336
val memberInfo = unwrapMemberInfo(c, methodSymbol)
334337

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

+9-10
Original file line numberDiff line numberDiff line change
@@ -200,26 +200,25 @@ object SymOps:
200200
//println(res._2.map(_.params.map(_.show)).mkString("NonExtensionPart:\n","\n","\n"))
201201
res
202202

203+
203204
def extendedParamLists: List[reflect.ParamClause] =
204205
sym.splitExtensionParamLists._1
205-
206-
def extendedTypeParams: List[reflect.TypeDef] =
207-
val typeParamss: List[reflect.TypeParamClause] = sym.extendedParamLists.collect{case types: reflect.TypeParamClause => types}
208-
typeParamss.headOption.map(_.params).getOrElse(List()) // only one type param clause on LHS
209-
210-
211206

212207
def extendedTermParamLists: List[reflect.TermParamClause] =
213208
sym.extendedParamLists.collect{case terms: reflect.TermParamClause => terms}
214209

215-
def nonExtensionTermParamLists: List[reflect.TermParamClause] =
216-
sym.nonExtensionParamLists.collect{case terms: reflect.TermParamClause => terms}
210+
def extendedTypeParamList: List[reflect.TypeDef] =
211+
val typeParamss: List[reflect.TypeParamClause] = sym.extendedParamLists.collect{case types: reflect.TypeParamClause => types}
212+
typeParamss.headOption.map(_.params).getOrElse(List()) // only one type param clause on LHS
213+
217214

218215
def nonExtensionParamLists: List[reflect.ParamClause] =
219216
sym.splitExtensionParamLists._2
220217

221-
222-
def nonExtensionLeadingTypeParams: List[reflect.TypeDef] =
218+
def nonExtensionTermParamLists: List[reflect.TermParamClause] =
219+
sym.nonExtensionParamLists.collect{case terms: reflect.TermParamClause => terms}
220+
221+
def nonExtensionTypeParamList: List[reflect.TypeDef] =
223222
val typeParamss: List[reflect.TypeParamClause] = sym.nonExtensionParamLists.collect{case types: reflect.TypeParamClause => types}
224223
typeParamss.headOption.map(_.params).getOrElse(List()) // only one type param clause on RHS
225224

0 commit comments

Comments
 (0)