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

[FIR] Fix errors related to expect classes/delegated constructors

Browse Source 
^KT-60384 fixed

Merge-request: KT-MR-11835
Merged-by: Egor Kulikov <Egor.Kulikov@jetbrains.com>
This commit is contained in:
Egor Kulikov
2023-08-29 08:39:36 +00:00
committed by Space Team
parent dbddac3e80
commit d7f2f22b4b
15 changed files with 211 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/testdata/lazyResolve/expectClass.kt
Vendored
+1
View File
@@ -0,0 +1 @@
expect class F<caret>oo
analysis/low-level-api-fir/testdata/lazyResolve/expectClass.txt
Vendored
+69
View File
@@ -0,0 +1,69 @@
RAW_FIR:
FILE: [ResolvedTo(RAW_FIR)] expectClass.kt
public? final? expect [ResolvedTo(RAW_FIR)] class Foo : R|kotlin/Any| {
}
IMPORTS:
FILE: [ResolvedTo(IMPORTS)] expectClass.kt
public? final? expect [ResolvedTo(RAW_FIR)] class Foo : R|kotlin/Any| {
}
COMPILER_REQUIRED_ANNOTATIONS:
FILE: [ResolvedTo(IMPORTS)] expectClass.kt
public? final? expect [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class Foo : R|kotlin/Any| {
}
COMPANION_GENERATION:
FILE: [ResolvedTo(IMPORTS)] expectClass.kt
public? final? expect [ResolvedTo(COMPANION_GENERATION)] class Foo : R|kotlin/Any| {
}
SUPER_TYPES:
FILE: [ResolvedTo(IMPORTS)] expectClass.kt
public? final? expect [ResolvedTo(SUPER_TYPES)] class Foo : R|kotlin/Any| {
}
TYPES:
FILE: [ResolvedTo(IMPORTS)] expectClass.kt
public? final? expect [ResolvedTo(TYPES)] class Foo : R|kotlin/Any| {
}
STATUS:
FILE: [ResolvedTo(IMPORTS)] expectClass.kt
public final expect [ResolvedTo(STATUS)] class Foo : R|kotlin/Any| {
}
EXPECT_ACTUAL_MATCHING:
FILE: [ResolvedTo(IMPORTS)] expectClass.kt
public final expect [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class Foo : R|kotlin/Any| {
}
ARGUMENTS_OF_ANNOTATIONS:
FILE: [ResolvedTo(IMPORTS)] expectClass.kt
public final expect [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class Foo : R|kotlin/Any| {
}
CONTRACTS:
FILE: [ResolvedTo(IMPORTS)] expectClass.kt
public final expect [ResolvedTo(CONTRACTS)] class Foo : R|kotlin/Any| {
}
IMPLICIT_TYPES_BODY_RESOLVE:
FILE: [ResolvedTo(IMPORTS)] expectClass.kt
public final expect [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Foo : R|kotlin/Any| {
}
ANNOTATIONS_ARGUMENTS_MAPPING:
FILE: [ResolvedTo(IMPORTS)] expectClass.kt
public final expect [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class Foo : R|kotlin/Any| {
}
BODY_RESOLVE:
FILE: [ResolvedTo(IMPORTS)] expectClass.kt
public final expect [ResolvedTo(BODY_RESOLVE)] class Foo : R|kotlin/Any| {
}
FILE RAW TO BODY:
FILE: [ResolvedTo(BODY_RESOLVE)] expectClass.kt
public final expect [ResolvedTo(BODY_RESOLVE)] class Foo : R|kotlin/Any| {
}
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/FirOutOfContentRootLazyBodiesCalculatorTestGenerated.java
Generated
+6
View File
@@ -147,6 +147,12 @@ public class FirOutOfContentRootLazyBodiesCalculatorTestGenerated extends Abstra
runTest("compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/expectActual.kt");
}
@Test
@TestMetadata("expectClassesAndFunctions.kt")
public void testExpectClassesAndFunctions() throws Exception {
runTest("compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/expectClassesAndFunctions.kt");
}
@Test
@TestMetadata("external.kt")
public void testExternal() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/FirOutOfContentRootLazyDeclarationResolveTestGenerated.java
Generated
+6
View File
@@ -234,6 +234,12 @@ public class FirOutOfContentRootLazyDeclarationResolveTestGenerated extends Abst
runTest("analysis/low-level-api-fir/testdata/lazyResolve/enumValues.kt");
}
@Test
@TestMetadata("expectClass.kt")
public void testExpectClass() throws Exception {
runTest("analysis/low-level-api-fir/testdata/lazyResolve/expectClass.kt");
}
@Test
@TestMetadata("fakeOverride.kt")
public void testFakeOverride() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/FirSourceLazyBodiesCalculatorTestGenerated.java
Generated
+6
View File
@@ -147,6 +147,12 @@ public class FirSourceLazyBodiesCalculatorTestGenerated extends AbstractFirSourc
runTest("compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/expectActual.kt");
}
@Test
@TestMetadata("expectClassesAndFunctions.kt")
public void testExpectClassesAndFunctions() throws Exception {
runTest("compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/expectClassesAndFunctions.kt");
}
@Test
@TestMetadata("external.kt")
public void testExternal() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/FirSourceLazyDeclarationResolveTestGenerated.java
Generated
+6
View File
@@ -234,6 +234,12 @@ public class FirSourceLazyDeclarationResolveTestGenerated extends AbstractFirSou
runTest("analysis/low-level-api-fir/testdata/lazyResolve/enumValues.kt");
}
@Test
@TestMetadata("expectClass.kt")
public void testExpectClass() throws Exception {
runTest("analysis/low-level-api-fir/testdata/lazyResolve/expectClass.kt");
}
@Test
@TestMetadata("fakeOverride.kt")
public void testFakeOverride() throws Exception {
compiler/fir/raw-fir/light-tree2fir/tests-gen/org/jetbrains/kotlin/fir/lightTree/LightTree2FirConverterTestCaseGenerated.java
Generated
+5
View File
@@ -136,6 +136,11 @@ public class LightTree2FirConverterTestCaseGenerated extends AbstractLightTree2F
runTest("compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/expectActual.kt");
}
@TestMetadata("expectClassesAndFunctions.kt")
public void testExpectClassesAndFunctions() throws Exception {
runTest("compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/expectClassesAndFunctions.kt");
}
@TestMetadata("external.kt")
public void testExternal() throws Exception {
runTest("compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/external.kt");
compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt
+25 -24
View File
@@ -49,6 +49,7 @@ import org.jetbrains.kotlin.types.expressions.OperatorConventions
import org.jetbrains.kotlin.util.OperatorNameConventions
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
import org.jetbrains.kotlin.utils.addToStdlib.runIf
import org.jetbrains.kotlin.utils.addToStdlib.runUnless
import org.jetbrains.kotlin.utils.addToStdlib.shouldNotBeCalled
import org.jetbrains.kotlin.utils.exceptions.errorWithAttachment
import org.jetbrains.kotlin.utils.exceptions.requireWithAttachment
@@ -1033,34 +1034,34 @@ open class PsiRawFirBuilder(
?: owner.toKtPsiSourceElement(KtFakeSourceElementKind.ImplicitConstructor)
fun buildDelegatedCall(superTypeCallEntry: KtSuperTypeCallEntry?, delegatedTypeRef: FirTypeRef): FirDelegatedConstructorCall? {
val constructorCall = superTypeCallEntry?.toFirSourceElement()
return if (containingClassIsExpectClass) null else {
val constructedTypeRef = if (copyConstructedTypeRefWithImplicitSource) {
delegatedTypeRef.copyWithNewSourceKind(KtFakeSourceElementKind.ImplicitTypeRef)
} else {
delegatedTypeRef
}
buildOrLazyDelegatedConstructorCall(isThis = false, constructedTypeRef) {
buildDelegatedConstructorCall {
source = constructorCall ?: constructorSource.fakeElement(KtFakeSourceElementKind.DelegatingConstructorCall)
this.constructedTypeRef = constructedTypeRef
isThis = false
calleeReference = buildExplicitSuperReference {
source =
superTypeCallEntry?.calleeExpression?.toFirSourceElement(KtFakeSourceElementKind.DelegatingConstructorCall)
?: this@buildDelegatedConstructorCall.source?.fakeElement(KtFakeSourceElementKind.DelegatingConstructorCall)
superTypeRef = this@buildDelegatedConstructorCall.constructedTypeRef
}
superTypeCallEntry?.extractArgumentsTo(this)
val constructedTypeRef = if (copyConstructedTypeRefWithImplicitSource) {
delegatedTypeRef.copyWithNewSourceKind(KtFakeSourceElementKind.ImplicitTypeRef)
} else {
delegatedTypeRef
}
return buildOrLazyDelegatedConstructorCall(isThis = false, constructedTypeRef) {
buildDelegatedConstructorCall {
source = constructorCall ?: constructorSource.fakeElement(KtFakeSourceElementKind.DelegatingConstructorCall)
this.constructedTypeRef = constructedTypeRef
isThis = false
calleeReference = buildExplicitSuperReference {
source =
superTypeCallEntry?.calleeExpression?.toFirSourceElement(KtFakeSourceElementKind.DelegatingConstructorCall)
?: this@buildDelegatedConstructorCall.source?.fakeElement(KtFakeSourceElementKind.DelegatingConstructorCall)
superTypeRef = this@buildDelegatedConstructorCall.constructedTypeRef
}
superTypeCallEntry?.extractArgumentsTo(this)
}
}
}
val firDelegatedCall = if (allSuperTypeCallEntries.size <= 1 ) {
buildDelegatedCall(superTypeCallEntry, delegatedSuperTypeRef!!)
} else {
buildMultiDelegatedConstructorCall {
allSuperTypeCallEntries.mapTo(delegatedConstructorCalls) { (superTypeCallEntry, delegatedTypeRef) ->
buildDelegatedCall(superTypeCallEntry, delegatedTypeRef)!!
val firDelegatedCall = runUnless(containingClassIsExpectClass) {
if (allSuperTypeCallEntries.size <= 1) {
buildDelegatedCall(superTypeCallEntry, delegatedSuperTypeRef!!)
} else {
buildMultiDelegatedConstructorCall {
allSuperTypeCallEntries.mapTo(delegatedConstructorCalls) { (superTypeCallEntry, delegatedTypeRef) ->
buildDelegatedCall(superTypeCallEntry, delegatedTypeRef)!!
}
}
}
}
compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/expectClassesAndFunctions.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
expect class A
open class B
open class C
expect class D: B()
expect class E: B(), C()
expect fun f()
expect annotation class G
compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/expectClassesAndFunctions.lazyBodies.txt
Vendored
+26
View File
@@ -0,0 +1,26 @@
FILE: expectClassesAndFunctions.kt
public? final? expect class A : R|kotlin/Any| {
}
public? open class B : R|kotlin/Any| {
public? constructor(): R|B| {
LAZY_super<R|kotlin/Any|>
}
}
public? open class C : R|kotlin/Any| {
public? constructor(): R|C| {
LAZY_super<R|kotlin/Any|>
}
}
public? final? expect class D : B {
public? expect error_constructor(): R|D|
}
public? final? expect class E : B, C {
public? expect error_constructor(): R|E|
}
public? final? expect fun f(): R|kotlin/Unit|
public? final? expect annotation class G : R|kotlin/Annotation| {
}
compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/expectClassesAndFunctions.txt
Vendored
+26
View File
@@ -0,0 +1,26 @@
FILE: expectClassesAndFunctions.kt
public? final? expect class A : R|kotlin/Any| {
}
public? open class B : R|kotlin/Any| {
public? [ContainingClassKey=B] constructor(): R|B| {
super<R|kotlin/Any|>()
}
}
public? open class C : R|kotlin/Any| {
public? [ContainingClassKey=C] constructor(): R|C| {
super<R|kotlin/Any|>()
}
}
public? final? expect class D : B {
public? expect [ContainingClassKey=D] error_constructor(): R|D|
}
public? final? expect class E : B, C {
public? expect [ContainingClassKey=E] error_constructor(): R|E|
}
public? final? expect fun f(): R|kotlin/Unit|
public? final? expect annotation class G : R|kotlin/Annotation| {
}
compiler/fir/raw-fir/psi2fir/tests-gen/org/jetbrains/kotlin/fir/builder/RawFirBuilderLazyBodiesTestCaseGenerated.java
Generated
+5
View File
@@ -136,6 +136,11 @@ public class RawFirBuilderLazyBodiesTestCaseGenerated extends AbstractRawFirBuil
runTest("compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/expectActual.kt");
}
@TestMetadata("expectClassesAndFunctions.kt")
public void testExpectClassesAndFunctions() throws Exception {
runTest("compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/expectClassesAndFunctions.kt");
}
@TestMetadata("external.kt")
public void testExternal() throws Exception {
runTest("compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/external.kt");
compiler/fir/raw-fir/psi2fir/tests-gen/org/jetbrains/kotlin/fir/builder/RawFirBuilderTestCaseGenerated.java
Generated
+5
View File
@@ -136,6 +136,11 @@ public class RawFirBuilderTestCaseGenerated extends AbstractRawFirBuilderTestCas
runTest("compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/expectActual.kt");
}
@TestMetadata("expectClassesAndFunctions.kt")
public void testExpectClassesAndFunctions() throws Exception {
runTest("compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/expectClassesAndFunctions.kt");
}
@TestMetadata("external.kt")
public void testExternal() throws Exception {
runTest("compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/external.kt");
compiler/visualizer/tests-gen/org/jetbrains/kotlin/visualizer/fir/FirVisualizerForRawFirDataGenerated.java
Generated
+6
View File
@@ -147,6 +147,12 @@ public class FirVisualizerForRawFirDataGenerated extends AbstractFirVisualizerTe
runTest("compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/expectActual.kt");
}
@Test
@TestMetadata("expectClassesAndFunctions.kt")
public void testExpectClassesAndFunctions() throws Exception {
runTest("compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/expectClassesAndFunctions.kt");
}
@Test
@TestMetadata("external.kt")
public void testExternal() throws Exception {
compiler/visualizer/tests-gen/org/jetbrains/kotlin/visualizer/psi/PsiVisualizerForRawFirDataGenerated.java
Generated
+6
View File
@@ -147,6 +147,12 @@ public class PsiVisualizerForRawFirDataGenerated extends AbstractPsiVisualizerTe
runTest("compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/expectActual.kt");
}
@Test
@TestMetadata("expectClassesAndFunctions.kt")
public void testExpectClassesAndFunctions() throws Exception {
runTest("compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/expectClassesAndFunctions.kt");
}
@Test
@TestMetadata("external.kt")
public void testExternal() throws Exception {