[decompiler] fix ambiguities to builtin members resolve in K2 IDE
If a user has multiple kotlin-stdlib libraries in a project, all those stdlib libraries will contain builtins which will result in resolution ambiguities. To prevent such kind of ambiguities inside LLFirDependenciesSymbolProvider, callables are grouped by facade class name. Only matching callables from the first facade are used. Facade is a Kotlin/JVM-term so right now it works only for JVM targets. Builtins are also used in JVM, so the current solution is to have a Facade name also for builtins. ^KTIJ-26760
This commit is contained in:
committed by
Space Team
parent
866368cf69
commit
9ea344fe76
+2
-2
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.analysis.providers.createPackageProvider
|
||||
import org.jetbrains.kotlin.fir.FirSession
|
||||
import org.jetbrains.kotlin.fir.caches.FirCache
|
||||
import org.jetbrains.kotlin.fir.caches.firCachesFactory
|
||||
import org.jetbrains.kotlin.fir.caches.getValue
|
||||
import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
|
||||
import org.jetbrains.kotlin.fir.deserialization.SingleModuleDataProvider
|
||||
import org.jetbrains.kotlin.fir.java.deserialization.KotlinBuiltins
|
||||
@@ -28,7 +29,6 @@ import org.jetbrains.kotlin.psi.*
|
||||
import org.jetbrains.kotlin.psi.stubs.impl.*
|
||||
import org.jetbrains.kotlin.resolve.jvm.JvmClassName
|
||||
import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty
|
||||
import org.jetbrains.kotlin.fir.caches.getValue
|
||||
|
||||
typealias DeserializedTypeAliasPostProcessor = (FirTypeAliasSymbol) -> Unit
|
||||
|
||||
@@ -124,7 +124,7 @@ internal open class StubBasedFirDeserializedSymbolProvider(
|
||||
StubBasedAnnotationDeserializer(session),
|
||||
kotlinScopeProvider,
|
||||
parentContext = context,
|
||||
containerSource = if (initialOrigin == FirDeclarationOrigin.BuiltIns) null else JvmStubDeserializedContainerSource(classId),
|
||||
containerSource = JvmStubDeserializedContainerSource(classId),
|
||||
deserializeNestedClass = this::getClass,
|
||||
initialOrigin = initialOrigin
|
||||
)
|
||||
|
||||
+1
-1
@@ -169,7 +169,7 @@ internal class StubBasedFirDeserializationContext(
|
||||
callableId.packageName,
|
||||
callableId.className,
|
||||
parameterListOwner,
|
||||
containerSource = containerSource.takeIf { initialOrigin != FirDeclarationOrigin.BuiltIns },
|
||||
containerSource = containerSource,
|
||||
outerClassSymbol = null,
|
||||
symbol,
|
||||
initialOrigin
|
||||
|
||||
Reference in New Issue
Block a user