azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New J2K: correctly retrieve all type variables in printing

Browse Source
This commit is contained in:
Ilya Kirillov
2019-05-16 14:37:39 +03:00
parent 7db4958a17
commit c9decd5dc9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/nullabilityAnalysis/printing.kt
+4 -2
View File
@@ -71,8 +71,10 @@ internal class Printer(private val analysisContext: AnalysisContext) {
private class Namer(analysisContext: AnalysisContext) { private class Namer(analysisContext: AnalysisContext) {
val names = run { val names = run {
val typeVariables = (analysisContext.typeElementToTypeVariable.values + val typeVariables =
analysisContext.declarationToTypeVariable.values) analysisContext.typeVariableOwners.flatMap { owner ->
owner.allTypeVariables.flatMap { it.innerTypeVariables() + it }
}
typeVariables.mapIndexed { index, typeVariable -> typeVariables.mapIndexed { index, typeVariable ->
typeVariable to "T$index" typeVariable to "T$index"
}.toMap() }.toMap()