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

KT-64080 [LL] Resolve super calls to BODY_RESOLVE for on-air resolve

Browse Source 
^KT-64080 Fixed
This commit is contained in:
Roman Golyshev
2023-12-06 14:42:24 +01:00
parent 3c7dfc0e5b
commit f266a44356
21 changed files with 289 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt
+19 -1
View File
@@ -456,13 +456,31 @@ object LowLevelFirApiFacadeForResolveOnAir {
private fun bodyResolveRequired(container: KtDeclaration, elementToReplace: PsiElement): Boolean = when {
container == elementToReplace -> true
container is KtDeclarationWithBody -> container.bodyExpression.isAncestor(elementToReplace)
container is KtDeclarationWithBody -> {
val bodyExpression = container.bodyExpression
val secondaryConstructorSuperCallArgs = (container as? KtSecondaryConstructor)?.getDelegationCallOrNull()?.valueArgumentList
bodyExpression.isAncestor(elementToReplace) || secondaryConstructorSuperCallArgs.isAncestor(elementToReplace)
}
container is KtProperty -> container.delegateExpressionOrInitializer.isAncestor(elementToReplace)
container is KtParameter -> container.defaultValue.isAncestor(elementToReplace)
container is KtEnumEntry -> {
container.initializerList.isAncestor(elementToReplace) || container.body.isAncestor(elementToReplace)
}
container is KtClassOrObject -> {
container.superTypeListEntries.any { superTypeEntry ->
when (superTypeEntry) {
is KtSuperTypeCallEntry -> superTypeEntry.valueArgumentList.isAncestor(elementToReplace)
is KtDelegatedSuperTypeEntry -> superTypeEntry.delegateExpression.isAncestor(elementToReplace)
else -> false
}
}
}
container is KtScript || container is KtAnonymousInitializer -> true
else -> false
}
analysis/low-level-api-fir/testData/dependentCopy/superCallArgument_delegatedConstructor.context.txt
Vendored
+19
View File
@@ -0,0 +1,19 @@
Tower Data Context:
Element 0
Scope: FirDefaultStarImportingScope
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Implicit receiver:
FirRegularClassSymbol public final class MyClass : R|kotlin/Any|
Type: test.MyClass
Element 7
Scope: FirLocalScope
analysis/low-level-api-fir/testData/dependentCopy/superCallArgument_delegatedConstructor.fir.txt
Vendored
+6
View File
@@ -0,0 +1,6 @@
KT element: KtNameReferenceExpression
FIR element: FirPropertyAccessExpressionImpl
FIR source kind: KtRealSourceElementKind
FIR element rendered:
R|test/property|
analysis/low-level-api-fir/testData/dependentCopy/superCallArgument_delegatedConstructor.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
val property = 10
class MyClass(i: Int) {
constructor(): this(prop<caret>erty)
}
analysis/low-level-api-fir/testData/dependentCopy/superCallArgument_primaryConstructor.context.txt
Vendored
+19
View File
@@ -0,0 +1,19 @@
Tower Data Context:
Element 0
Scope: FirDefaultStarImportingScope
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Implicit receiver:
FirRegularClassSymbol public final class Child : R|test/Base|
Type: test.Child
Element 7
Scope: FirLocalScope
analysis/low-level-api-fir/testData/dependentCopy/superCallArgument_primaryConstructor.fir.txt
Vendored
+6
View File
@@ -0,0 +1,6 @@
KT element: KtNameReferenceExpression
FIR element: FirPropertyAccessExpressionImpl
FIR source kind: KtRealSourceElementKind
FIR element rendered:
R|test/property|
analysis/low-level-api-fir/testData/dependentCopy/superCallArgument_primaryConstructor.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
open class Base(action: Int)
val property = 10
class Child : Base(prop<caret>erty)
analysis/low-level-api-fir/testData/dependentCopy/superCallArgument_secondaryConstructor.context.txt
Vendored
+19
View File
@@ -0,0 +1,19 @@
Tower Data Context:
Element 0
Scope: FirDefaultStarImportingScope
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Implicit receiver:
FirRegularClassSymbol public final class Child : R|test/Base|
Type: test.Child
Element 7
Scope: FirLocalScope
analysis/low-level-api-fir/testData/dependentCopy/superCallArgument_secondaryConstructor.fir.txt
Vendored
+6
View File
@@ -0,0 +1,6 @@
KT element: KtNameReferenceExpression
FIR element: FirPropertyAccessExpressionImpl
FIR source kind: KtRealSourceElementKind
FIR element rendered:
R|test/property|
analysis/low-level-api-fir/testData/dependentCopy/superCallArgument_secondaryConstructor.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
open class Base(i: Int)
val property = 10
class Child : Base {
constructor(): super(prop<caret>erty)
}
analysis/low-level-api-fir/testData/dependentCopy/superTypeDelegation.context.txt
Vendored
+19
View File
@@ -0,0 +1,19 @@
Tower Data Context:
Element 0
Scope: FirDefaultStarImportingScope
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Implicit receiver:
FirRegularClassSymbol public final class MyClass : R|test/MyInterface|
Type: test.MyClass
Element 7
Scope: FirLocalScope
analysis/low-level-api-fir/testData/dependentCopy/superTypeDelegation.fir.txt
Vendored
+6
View File
@@ -0,0 +1,6 @@
KT element: KtNameReferenceExpression
FIR element: FirPropertyAccessExpressionImpl
FIR source kind: KtRealSourceElementKind
FIR element rendered:
R|test/property|
analysis/low-level-api-fir/testData/dependentCopy/superTypeDelegation.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
interface MyInterface
val property: MyInterface = object : MyInterface {}
class MyClass: MyInterface by prop<caret>erty
analysis/low-level-api-fir/testData/dependentCopy/superTypeDelegation_toCompanion.context.txt
Vendored
+27
View File
@@ -0,0 +1,27 @@
Tower Data Context:
Element 0
Scope: FirDefaultStarImportingScope
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Implicit receiver:
FirRegularClassSymbol public final companion object Companion : R|test/MyInterface|
Type: test.MyClass.Companion
Element 7
Scope: FirNestedClassifierScopeImpl
Classifiers:
FirRegularClassSymbol public final companion object Companion : R|test/MyInterface|
Element 8
Implicit receiver:
FirRegularClassSymbol public final class MyClass : R|test/MyInterface|
Type: test.MyClass
Element 9
Scope: FirLocalScope
analysis/low-level-api-fir/testData/dependentCopy/superTypeDelegation_toCompanion.fir.txt
Vendored
+6
View File
@@ -0,0 +1,6 @@
KT element: KtNameReferenceExpression
FIR element: FirResolvedQualifierImpl
FIR source kind: KtRealSourceElementKind
FIR element rendered:
Q|test/MyClass.Companion|
analysis/low-level-api-fir/testData/dependentCopy/superTypeDelegation_toCompanion.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
interface MyInterface
class MyClass: MyInterface by Comp<caret>anion {
companion object : MyInterface
}
analysis/low-level-api-fir/testData/dependentCopy/superTypeDelegation_toPrimaryConstructorParam.context.txt
Vendored
+17
View File
@@ -0,0 +1,17 @@
Tower Data Context:
Element 0
Scope: FirDefaultStarImportingScope
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Implicit receiver:
FirRegularClassSymbol public final class MyClass : R|test/MyInterface|
Type: test.MyClass
analysis/low-level-api-fir/testData/dependentCopy/superTypeDelegation_toPrimaryConstructorParam.fir.txt
Vendored
+6
View File
@@ -0,0 +1,6 @@
KT element: KtNameReferenceExpression
FIR element: FirPropertyAccessExpressionImpl
FIR source kind: KtRealSourceElementKind
FIR element rendered:
R|<local>/param|
analysis/low-level-api-fir/testData/dependentCopy/superTypeDelegation_toPrimaryConstructorParam.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
package test
interface MyInterface
class MyClass(param: MyInterface): MyInterface by par<caret>am
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/SourceDependentCopyContextTestGenerated.java
Generated
+36
View File
@@ -53,4 +53,40 @@ public class SourceDependentCopyContextTestGenerated extends AbstractSourceDepen
public void testFunction() throws Exception {
runTest("analysis/low-level-api-fir/testData/dependentCopy/function.kt");
}
@Test
@TestMetadata("superCallArgument_delegatedConstructor.kt")
public void testSuperCallArgument_delegatedConstructor() throws Exception {
runTest("analysis/low-level-api-fir/testData/dependentCopy/superCallArgument_delegatedConstructor.kt");
}
@Test
@TestMetadata("superCallArgument_primaryConstructor.kt")
public void testSuperCallArgument_primaryConstructor() throws Exception {
runTest("analysis/low-level-api-fir/testData/dependentCopy/superCallArgument_primaryConstructor.kt");
}
@Test
@TestMetadata("superCallArgument_secondaryConstructor.kt")
public void testSuperCallArgument_secondaryConstructor() throws Exception {
runTest("analysis/low-level-api-fir/testData/dependentCopy/superCallArgument_secondaryConstructor.kt");
}
@Test
@TestMetadata("superTypeDelegation.kt")
public void testSuperTypeDelegation() throws Exception {
runTest("analysis/low-level-api-fir/testData/dependentCopy/superTypeDelegation.kt");
}
@Test
@TestMetadata("superTypeDelegation_toCompanion.kt")
public void testSuperTypeDelegation_toCompanion() throws Exception {
runTest("analysis/low-level-api-fir/testData/dependentCopy/superTypeDelegation_toCompanion.kt");
}
@Test
@TestMetadata("superTypeDelegation_toPrimaryConstructorParam.kt")
public void testSuperTypeDelegation_toPrimaryConstructorParam() throws Exception {
runTest("analysis/low-level-api-fir/testData/dependentCopy/superTypeDelegation_toPrimaryConstructorParam.kt");
}
}
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/SourceDependentCopyFirTestGenerated.java
Generated
+36
View File
@@ -53,4 +53,40 @@ public class SourceDependentCopyFirTestGenerated extends AbstractSourceDependent
public void testFunction() throws Exception {
runTest("analysis/low-level-api-fir/testData/dependentCopy/function.kt");
}
@Test
@TestMetadata("superCallArgument_delegatedConstructor.kt")
public void testSuperCallArgument_delegatedConstructor() throws Exception {
runTest("analysis/low-level-api-fir/testData/dependentCopy/superCallArgument_delegatedConstructor.kt");
}
@Test
@TestMetadata("superCallArgument_primaryConstructor.kt")
public void testSuperCallArgument_primaryConstructor() throws Exception {
runTest("analysis/low-level-api-fir/testData/dependentCopy/superCallArgument_primaryConstructor.kt");
}
@Test
@TestMetadata("superCallArgument_secondaryConstructor.kt")
public void testSuperCallArgument_secondaryConstructor() throws Exception {
runTest("analysis/low-level-api-fir/testData/dependentCopy/superCallArgument_secondaryConstructor.kt");
}
@Test
@TestMetadata("superTypeDelegation.kt")
public void testSuperTypeDelegation() throws Exception {
runTest("analysis/low-level-api-fir/testData/dependentCopy/superTypeDelegation.kt");
}
@Test
@TestMetadata("superTypeDelegation_toCompanion.kt")
public void testSuperTypeDelegation_toCompanion() throws Exception {
runTest("analysis/low-level-api-fir/testData/dependentCopy/superTypeDelegation_toCompanion.kt");
}
@Test
@TestMetadata("superTypeDelegation_toPrimaryConstructorParam.kt")
public void testSuperTypeDelegation_toPrimaryConstructorParam() throws Exception {
runTest("analysis/low-level-api-fir/testData/dependentCopy/superTypeDelegation_toPrimaryConstructorParam.kt");
}
}