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

[FIR IDE] Unwrap typealias SAM constructor in AAPI/FE10

Browse Source 
This commit fixes KtFe10ResolveCallTestGenerated#testSamConstructorCall().
This commit is contained in:
Yan Zhulanow
2021-11-02 21:20:35 +09:00
parent 2cdaa48e75
commit a653a57593
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSamConstructorSymbol.kt
+6 -3
View File
@@ -21,13 +21,16 @@ import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.calls.inference.returnTypeOrNothing
import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension
import org.jetbrains.kotlin.resolve.sam.SamConstructorDescriptor
import org.jetbrains.kotlin.resolve.sam.SamTypeAliasConstructorDescriptor
internal class KtFe10DescSamConstructorSymbol(
override val descriptor: SamConstructorDescriptor,
override val analysisContext: Fe10AnalysisContext
) : KtSamConstructorSymbol(), KtFe10DescSymbol<SamConstructorDescriptor> {
private val expandedDescriptor: SamConstructorDescriptor
get() = (descriptor as? SamTypeAliasConstructorDescriptor)?.expandedConstructorDescriptor ?: descriptor
override val name: Name
get() = withValidityAssertion { descriptor.name }
get() = withValidityAssertion { expandedDescriptor.name }
override val valueParameters: List<KtValueParameterSymbol>
get() = withValidityAssertion { descriptor.valueParameters.map { KtFe10DescValueParameterSymbol(it, analysisContext) } }
@@ -36,7 +39,7 @@ internal class KtFe10DescSamConstructorSymbol(
get() = withValidityAssertion { descriptor.ktHasStableParameterNames }
override val callableIdIfNonLocal: CallableId?
get() = withValidityAssertion { descriptor.callableIdIfNotLocal }
get() = withValidityAssertion { expandedDescriptor.callableIdIfNotLocal }
override val annotatedType: KtTypeAndAnnotations
get() = withValidityAssertion { descriptor.returnTypeOrNothing.toKtTypeAndAnnotations(analysisContext) }
@@ -48,7 +51,7 @@ internal class KtFe10DescSamConstructorSymbol(
get() = withValidityAssertion { descriptor.isExtension }
override val origin: KtSymbolOrigin
get() = withValidityAssertion { descriptor.getSymbolOrigin(analysisContext) }
get() = withValidityAssertion { expandedDescriptor.getSymbolOrigin(analysisContext) }
override fun createPointer(): KtSymbolPointer<KtSamConstructorSymbol> = withValidityAssertion {
val pointerByPsi = KtPsiBasedSymbolPointer.createForSymbolFromSource(this)
core/descriptors/src/org/jetbrains/kotlin/resolve/sam/SamTypeAliasConstructorDescriptor.kt
+9 -8
View File
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl
interface SamTypeAliasConstructorDescriptor : SamConstructorDescriptor, DeclarationDescriptorWithNavigationSubstitute {
val typeAliasDescriptor: TypeAliasDescriptor
val expandedConstructorDescriptor: SamConstructorDescriptor
override val substitute: DeclarationDescriptor
get() = typeAliasDescriptor
@@ -17,15 +18,15 @@ interface SamTypeAliasConstructorDescriptor : SamConstructorDescriptor, Declarat
class SamTypeAliasConstructorDescriptorImpl(
override val typeAliasDescriptor: TypeAliasDescriptor,
private val samInterfaceConstructorDescriptor: SamConstructorDescriptor
override val expandedConstructorDescriptor: SamConstructorDescriptor
) : SimpleFunctionDescriptorImpl(
typeAliasDescriptor.containingDeclaration,
null,
samInterfaceConstructorDescriptor.baseDescriptorForSynthetic.annotations,
typeAliasDescriptor.name,
CallableMemberDescriptor.Kind.SYNTHESIZED,
typeAliasDescriptor.source
typeAliasDescriptor.containingDeclaration,
null,
expandedConstructorDescriptor.baseDescriptorForSynthetic.annotations,
typeAliasDescriptor.name,
CallableMemberDescriptor.Kind.SYNTHESIZED,
typeAliasDescriptor.source
), SamTypeAliasConstructorDescriptor {
override val baseDescriptorForSynthetic: ClassDescriptor
get() = samInterfaceConstructorDescriptor.baseDescriptorForSynthetic
get() = expandedConstructorDescriptor.baseDescriptorForSynthetic
}