Reorder and Rename methods for consistency

scala · Jan 21, 2022 · 36b5c8a · 36b5c8a
1 parent 43a1a26
commit 36b5c8a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala
@@ -130,7 +130,10 @@ trait ClassLikeSupport:
       case dd: DefDef if isDocumentableExtension(dd.symbol) =>
         dd.symbol.extendedSymbol.map { extSym =>
           val memberInfo = unwrapMemberInfo(c, dd.symbol)
-          val typeParams = dd.symbol.extendedTypeParams.map(mkTypeArgument(_, memberInfo.genericTypes))
+          val typeParams = dd.symbol.extendedTypeParamList.map(mkTypeArgument(_, memberInfo.genericTypes))
+          //println(dd.name)
+          //println("MemberInfo:\n" + memberInfo.paramLists)
+          //println("extended...:\n" + dd.symbol.extendedTermParamLists)
           val termParams = dd.symbol.extendedTermParamLists.zipWithIndex.flatMap { case (paramList, index) =>
             memberInfo.paramLists(index) match
               case EvidenceOnlyParameterList => Nil
@@ -328,7 +331,7 @@ trait ClassLikeSupport:
     ): Member =
     val method = methodSymbol.tree.asInstanceOf[DefDef]
     val paramLists: List[TermParamClause] = methodSymbol.nonExtensionTermParamLists
-    val genericTypes: List[TypeDef] = if (methodSymbol.isClassConstructor) Nil else methodSymbol.nonExtensionLeadingTypeParams
+    val genericTypes: List[TypeDef] = if (methodSymbol.isClassConstructor) Nil else methodSymbol.nonExtensionTypeParamList
 
     val memberInfo = unwrapMemberInfo(c, methodSymbol)
 

diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala
@@ -200,26 +200,25 @@ object SymOps:
       //println(res._2.map(_.params.map(_.show)).mkString("NonExtensionPart:\n","\n","\n"))
       res
 
+
     def extendedParamLists: List[reflect.ParamClause] =
       sym.splitExtensionParamLists._1
-
-    def extendedTypeParams: List[reflect.TypeDef] =
-      val typeParamss: List[reflect.TypeParamClause] = sym.extendedParamLists.collect{case types: reflect.TypeParamClause => types}
-      typeParamss.headOption.map(_.params).getOrElse(List()) // only one type param clause on LHS
-
-
 
     def extendedTermParamLists: List[reflect.TermParamClause] =
       sym.extendedParamLists.collect{case terms: reflect.TermParamClause => terms}
 
-    def nonExtensionTermParamLists: List[reflect.TermParamClause] =
-      sym.nonExtensionParamLists.collect{case terms: reflect.TermParamClause => terms}
+    def extendedTypeParamList: List[reflect.TypeDef] =
+      val typeParamss: List[reflect.TypeParamClause] = sym.extendedParamLists.collect{case types: reflect.TypeParamClause => types}
+      typeParamss.headOption.map(_.params).getOrElse(List()) // only one type param clause on LHS
+
 
     def nonExtensionParamLists: List[reflect.ParamClause] =
       sym.splitExtensionParamLists._2
 
-
-    def nonExtensionLeadingTypeParams: List[reflect.TypeDef] =
+    def nonExtensionTermParamLists: List[reflect.TermParamClause] =
+      sym.nonExtensionParamLists.collect{case terms: reflect.TermParamClause => terms}
+
+    def nonExtensionTypeParamList: List[reflect.TypeDef] =
       val typeParamss: List[reflect.TypeParamClause] = sym.nonExtensionParamLists.collect{case types: reflect.TypeParamClause => types}
       typeParamss.headOption.map(_.params).getOrElse(List()) // only one type param clause on RHS