New J2K: correctly retrieve all type variables in printing

2019-05-16 14:37:39 +03:00
parent 7db4958a17
commit c9decd5dc9
1 changed files with 4 additions and 2 deletions
@@ -71,8 +71,10 @@ internal class Printer(private val analysisContext: AnalysisContext) {

 private class Namer(analysisContext: AnalysisContext) {
    val names = run {
-        val typeVariables = (analysisContext.typeElementToTypeVariable.values +
-                analysisContext.declarationToTypeVariable.values)
+        val typeVariables =
+            analysisContext.typeVariableOwners.flatMap { owner ->
+                owner.allTypeVariables.flatMap { it.innerTypeVariables() + it }
+            }
        typeVariables.mapIndexed { index, typeVariable ->
            typeVariable to "T$index"
        }.toMap()