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

FIR: Clear JavaTypeParameterStack

Browse Source 
- Remove unused method
- Rename method to make it findable through "Find usages"
This commit is contained in:
Denis Zharkov
2020-06-25 15:26:08 +03:00
parent f3e4e9b162
commit b607cecc2b
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt
+5 -6
View File
@@ -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
}
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaTypeParameterStack.kt
+2 -6
View File
@@ -12,7 +12,7 @@ internal class JavaTypeParameterStack {
private val typeParameterMap = mutableMapOf<JavaTypeParameter, FirTypeParameterSymbol>()
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()
}
}
}