FIR: Rename FirResolvedCallableReference -> FirResolvedNamedReference

^KT-32725 In Progress
This commit is contained in:
Denis Zharkov
2019-10-23 14:51:05 +03:00
parent 5e322a2dd9
commit 1564e72b59
35 changed files with 139 additions and 122 deletions
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.java.declarations.FirJavaValueParameter
import org.jetbrains.kotlin.fir.java.enhancement.readOnlyToMutable
import org.jetbrains.kotlin.fir.java.types.FirJavaTypeRef
import org.jetbrains.kotlin.fir.references.impl.FirErrorNamedReferenceImpl
import org.jetbrains.kotlin.fir.references.impl.FirResolvedCallableReferenceImpl
import org.jetbrains.kotlin.fir.references.impl.FirResolvedNamedReferenceImpl
import org.jetbrains.kotlin.fir.resolve.constructClassType
import org.jetbrains.kotlin.fir.resolve.firSymbolProvider
import org.jetbrains.kotlin.fir.resolve.getClassDeclaredCallableSymbols
@@ -253,7 +253,7 @@ private fun JavaAnnotationArgument.toFirExpression(
classId, entryName
).firstOrNull()
callableSymbol?.let {
FirResolvedCallableReferenceImpl(null, entryName, it)
FirResolvedNamedReferenceImpl(null, entryName, it)
}
} else {
null
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.java.JavaSymbolProvider
import org.jetbrains.kotlin.fir.java.createConstant
import org.jetbrains.kotlin.fir.java.topLevelName
import org.jetbrains.kotlin.fir.references.impl.FirErrorNamedReferenceImpl
import org.jetbrains.kotlin.fir.references.impl.FirResolvedCallableReferenceImpl
import org.jetbrains.kotlin.fir.references.impl.FirResolvedNamedReferenceImpl
import org.jetbrains.kotlin.fir.resolve.*
import org.jetbrains.kotlin.fir.scopes.FirScope
import org.jetbrains.kotlin.fir.scopes.impl.declaredMemberScope
@@ -214,12 +214,12 @@ class KotlinDeserializedJvmSymbolsProvider(
this.calleeReference = when {
entryClassSymbol != null && (entryClassSymbol as? FirClassSymbol)?.fir is FirEnumEntry -> {
FirResolvedCallableReferenceImpl(
FirResolvedNamedReferenceImpl(
null, name, entryClassSymbol
)
}
entryCallableSymbol != null -> {
FirResolvedCallableReferenceImpl(
FirResolvedNamedReferenceImpl(
null, name, entryCallableSymbol
)
}
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.java.declarations.FirJavaField
import org.jetbrains.kotlin.fir.java.toConeProjection
import org.jetbrains.kotlin.fir.java.toNotNullConeKotlinType
import org.jetbrains.kotlin.fir.java.types.FirJavaTypeRef
import org.jetbrains.kotlin.fir.references.impl.FirResolvedCallableReferenceImpl
import org.jetbrains.kotlin.fir.references.impl.FirResolvedNamedReferenceImpl
import org.jetbrains.kotlin.fir.references.impl.FirSimpleNamedReference
import org.jetbrains.kotlin.fir.resolve.constructType
import org.jetbrains.kotlin.fir.resolve.toSymbol
@@ -261,7 +261,7 @@ internal fun ConeKotlinType.lexicalCastFrom(session: FirSession, value: String):
}
if (firStaticProperty != null) {
FirQualifiedAccessExpressionImpl(null).apply {
calleeReference = FirResolvedCallableReferenceImpl(
calleeReference = FirResolvedNamedReferenceImpl(
null, name, firStaticProperty.symbol as FirCallableSymbol<*>
)
}