Rename in FIR provider: getSymbolByFqName -> getClassLikeSymbolByFqName

compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt

@@ -25,7 +25,7 @@ class JavaSymbolProvider(
         return emptyList()
     }
 
-    override fun getSymbolByFqName(classId: ClassId): ConeSymbol? {
+    override fun getClassLikeSymbolByFqName(classId: ClassId): ConeSymbol? {
         return classCache.lookupCacheOrCalculate(classId) {
             val facade = KotlinJavaPsiFacade.getInstance(project)
             val foundClass = facade.findClass(JavaClassFinder.Request(classId), searchScope)

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt

@@ -31,7 +31,7 @@ class FirTypeDeserializer(
 
     private fun computeClassifier(fqNameIndex: Int): ConeSymbol? {
         val id = nameResolver.getClassId(fqNameIndex)
-        return symbolProvider.getSymbolByFqName(id)
+        return symbolProvider.getClassLikeSymbolByFqName(id)
     }
 
     fun type(proto: ProtoBuf.Type): ConeKotlinType {

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/FirProvider.kt

@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.name.FqName
 interface FirProvider : FirSymbolProvider {
     fun getFirClassifierByFqName(fqName: ClassId): FirMemberDeclaration?
 
-    override fun getSymbolByFqName(classId: ClassId): ConeSymbol?
+    override fun getClassLikeSymbolByFqName(classId: ClassId): ConeSymbol?
 
     override fun getPackage(fqName: FqName): FqName? {
         if (getFirFilesByPackage(fqName).isNotEmpty()) return fqName

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/FirSymbolProvider.kt

@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.name.FqName
 
 interface FirSymbolProvider {
 
-    fun getSymbolByFqName(classId: ClassId): ConeSymbol?
+    fun getClassLikeSymbolByFqName(classId: ClassId): ConeSymbol?
 
     fun getCallableSymbols(callableId: CallableId): List<ConeSymbol>
 

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirCompositeSymbolProvider.kt

@@ -25,7 +25,7 @@ class FirCompositeSymbolProvider(val providers: List<FirSymbolProvider>) : FirSy
         return providers.firstNotNullResult { it.getPackage(fqName) }
     }
 
-    override fun getSymbolByFqName(classId: ClassId): ConeSymbol? {
+    override fun getClassLikeSymbolByFqName(classId: ClassId): ConeSymbol? {
-        return providers.firstNotNullResult { it.getSymbolByFqName(classId) }
+        return providers.firstNotNullResult { it.getClassLikeSymbolByFqName(classId) }
     }
 }

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirDependenciesSymbolProviderImpl.kt

@@ -28,10 +28,10 @@ class FirDependenciesSymbolProviderImpl(val session: FirSession) : AbstractFirSy
         }.toList()
     }
 
-    override fun getSymbolByFqName(classId: ClassId): ConeSymbol? {
+    override fun getClassLikeSymbolByFqName(classId: ClassId): ConeSymbol? {
         return classCache.lookupCacheOrCalculate(classId) {
             for (provider in dependencyProviders) {
-                provider.getSymbolByFqName(classId)?.let {
+                provider.getClassLikeSymbolByFqName(classId)?.let {
                     return@lookupCacheOrCalculate it
                 }
             }

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirLibrarySymbolProviderImpl.kt

@@ -98,7 +98,7 @@ class FirLibrarySymbolProviderImpl(val session: FirSession) : FirSymbolProvider
 
     private val fictitiousFunctionSymbols = mutableMapOf<Int, ConeSymbol>()
 
-    override fun getSymbolByFqName(classId: ClassId): ConeSymbol? {
+    override fun getClassLikeSymbolByFqName(classId: ClassId): ConeSymbol? {
         return allPackageFragments[classId.packageFqName]?.firstNotNullResult {
             it.getSymbolByFqName(classId, this)
         } ?: with(classId) {

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirProviderImpl.kt

@@ -24,7 +24,7 @@ class FirProviderImpl(val session: FirSession) : FirProvider {
         }
     }
 
-    override fun getSymbolByFqName(classId: ClassId): ConeSymbol? {
+    override fun getClassLikeSymbolByFqName(classId: ClassId): ConeSymbol? {
         return (getFirClassifierByFqName(classId) as? FirSymbolOwner<*>)?.symbol
     }
 

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirQualifierResolverImpl.kt

@@ -23,7 +23,7 @@ class FirQualifierResolverImpl(val session: FirSession) : FirQualifierResolver {
             parts.drop(1).fold(prefix.relativeClassName) { prefix, suffix -> prefix.child(suffix.name) },
             false
         )
-        return symbolProvider.getSymbolByFqName(fqName) ?: return null
+        return symbolProvider.getClassLikeSymbolByFqName(fqName) ?: return null
     }
 
     override fun resolveSymbol(parts: List<FirQualifierPart>): ConeSymbol? {
@@ -38,7 +38,7 @@ class FirQualifierResolverImpl(val session: FirSession) : FirQualifierResolver {
                 firstPart.removeAt(firstPart.lastIndex)
 
                 val fqName = ClassId(firstPart.toFqName(), lastPart.toFqName(), false)
-                val foundSymbol = firProvider.getSymbolByFqName(fqName)
+                val foundSymbol = firProvider.getClassLikeSymbolByFqName(fqName)
                 if (foundSymbol != null) {
                     return foundSymbol
                 }

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirImportResolveTransformer.kt

@@ -53,7 +53,7 @@ class FirImportResolveTransformer() : FirAbstractTreeTransformer() {
                 firstPart = firstPart.parent()
 
                 val resolvedFqName = ClassId(firstPart, FqName(lastPart.toString()), false)
-                val foundSymbol = symbolProvider.getSymbolByFqName(resolvedFqName)
+                val foundSymbol = symbolProvider.getClassLikeSymbolByFqName(resolvedFqName)
 
                 if (foundSymbol != null) {
                     return FirResolvedImportImpl(import, resolvedFqName).compose()

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractSimpleImportingScope.kt

@@ -26,7 +26,7 @@ abstract class FirAbstractSimpleImportingScope(val session: FirSession) : FirSco
         if (imports.isEmpty()) return true
         val provider = FirSymbolProvider.getInstance(session)
         for (import in imports) {
-            val symbol = provider.getSymbolByFqName(import.resolvedFqName) ?: continue
+            val symbol = provider.getClassLikeSymbolByFqName(import.resolvedFqName) ?: continue
             if (!processor(symbol)) {
                 return false
             }

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractStarImportingScope.kt

@@ -30,7 +30,7 @@ abstract class FirAbstractStarImportingScope(
             } else {
                 ClassId(import.packageFqName, relativeClassName.child(name), false)
             }
-            val symbol = provider.getSymbolByFqName(classId) ?: continue
+            val symbol = provider.getClassLikeSymbolByFqName(classId) ?: continue
             if (!processor(symbol)) {
                 return false
             }

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirNestedClassifierScope.kt

@@ -23,7 +23,7 @@ class FirNestedClassifierScope(
         processor: (ConeSymbol) -> Boolean
     ): Boolean {
         val child = classId.createNestedClassId(name)
-        val symbol = symbolProvider.getSymbolByFqName(child)
+        val symbol = symbolProvider.getClassLikeSymbolByFqName(child)
 
         return symbol == null || processor(symbol)
     }

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirSelfImportingScope.kt

@@ -32,7 +32,7 @@ class FirSelfImportingScope(val fqName: FqName, val session: FirSession) : FirSc
         if (name in absentKeys) return true
         val symbol = cache[name] ?: run {
             val unambiguousFqName = ClassId(fqName, name)
-            val computed = symbolProvider.getSymbolByFqName(unambiguousFqName)
+            val computed = symbolProvider.getClassLikeSymbolByFqName(unambiguousFqName)
             if (computed == null) {
                 absentKeys += name
             } else {