diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt index 4f1848c8869..7176033f05a 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt @@ -19,20 +19,19 @@ import org.jetbrains.kotlin.fir.declarations.addDefaultBoundIfNecessary import org.jetbrains.kotlin.fir.declarations.builder.FirTypeParameterBuilder import org.jetbrains.kotlin.fir.declarations.builder.buildConstructedClassTypeParameterRef import org.jetbrains.kotlin.fir.declarations.builder.buildOuterClassTypeParameterRef -import org.jetbrains.kotlin.fir.java.declarations.* -import org.jetbrains.kotlin.fir.resolve.providers.AbstractFirSymbolProvider -import org.jetbrains.kotlin.fir.resolve.constructType import org.jetbrains.kotlin.fir.generateValueOfFunction import org.jetbrains.kotlin.fir.generateValuesFunction -import org.jetbrains.kotlin.fir.java.declarations.FirJavaClass +import org.jetbrains.kotlin.fir.java.declarations.* +import org.jetbrains.kotlin.fir.resolve.constructType +import org.jetbrains.kotlin.fir.resolve.providers.AbstractFirSymbolProvider import org.jetbrains.kotlin.fir.resolve.scopes.wrapScopeWithJvmMapped import org.jetbrains.kotlin.fir.scopes.FirScope import org.jetbrains.kotlin.fir.scopes.impl.lazyNestedClassifierScope import org.jetbrains.kotlin.fir.scopes.impl.nestedClassifierScope import org.jetbrains.kotlin.fir.symbols.CallableId import org.jetbrains.kotlin.fir.symbols.impl.* -import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef import org.jetbrains.kotlin.fir.toFirPsiSourceElement +import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl import org.jetbrains.kotlin.load.java.JavaClassFinder import org.jetbrains.kotlin.load.java.JvmAnnotationNames @@ -85,7 +84,7 @@ class JavaSymbolProvider( val stored = javaTypeParameterStack.safeGet(this) if (stored != null) return stored to true val firSymbol = FirTypeParameterSymbol() - javaTypeParameterStack.add(this, firSymbol) + javaTypeParameterStack.addParameter(this, firSymbol) return firSymbol to false } diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaTypeParameterStack.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaTypeParameterStack.kt index eaccd51180c..b7bff48d8af 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaTypeParameterStack.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaTypeParameterStack.kt @@ -12,7 +12,7 @@ internal class JavaTypeParameterStack { private val typeParameterMap = mutableMapOf() - fun add(javaTypeParameter: JavaTypeParameter, symbol: FirTypeParameterSymbol) { + fun addParameter(javaTypeParameter: JavaTypeParameter, symbol: FirTypeParameterSymbol) { typeParameterMap[javaTypeParameter] = symbol } @@ -20,10 +20,6 @@ internal class JavaTypeParameterStack { typeParameterMap += javaTypeParameterStack.typeParameterMap } - fun remove(javaTypeParameter: JavaTypeParameter) { - typeParameterMap.remove(javaTypeParameter) - } - operator fun get(javaTypeParameter: JavaTypeParameter): FirTypeParameterSymbol { return safeGet(javaTypeParameter) ?: throw IllegalArgumentException("Cannot find Java type parameter $javaTypeParameter in stack") @@ -34,4 +30,4 @@ internal class JavaTypeParameterStack { companion object { val EMPTY: JavaTypeParameterStack = JavaTypeParameterStack() } -} \ No newline at end of file +}