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

[FIR] Fix unexpected primary constructor scope in secondary constructor

Browse Source 
^KTIJ-23720
^KT-56353 Fixed
This commit is contained in:
aleksandrina-streltsova
2023-02-02 11:49:05 +02:00
committed by Space Team
parent c25a5bc9c1
commit 7db32f6430
7 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerFirTestdataTestGenerated.java
Generated
+6
View File
@@ -1663,6 +1663,12 @@ public class DiagnosisCompilerFirTestdataTestGenerated extends AbstractDiagnosis
runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/notASupertype.kt");
}
@Test
@TestMetadata("primaryConstructorParametersInSecondaryConstructor.kt")
public void testPrimaryConstructorParametersInSecondaryConstructor() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/primaryConstructorParametersInSecondaryConstructor.kt");
}
@Test
@TestMetadata("primaryConstructorRequiredForDataClass.kt")
public void testPrimaryConstructorRequiredForDataClass() throws Exception {
compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/LazyBodyIsNotTouchedTilContractsPhaseTestGenerated.java
Generated
+5
View File
@@ -1449,6 +1449,11 @@ public class LazyBodyIsNotTouchedTilContractsPhaseTestGenerated extends Abstract
runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/notASupertype.kt");
}
@TestMetadata("primaryConstructorParametersInSecondaryConstructor.kt")
public void testPrimaryConstructorParametersInSecondaryConstructor() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/primaryConstructorParametersInSecondaryConstructor.kt");
}
@TestMetadata("primaryConstructorRequiredForDataClass.kt")
public void testPrimaryConstructorRequiredForDataClass() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/primaryConstructorRequiredForDataClass.kt");
compiler/fir/analysis-tests/testData/resolve/diagnostics/primaryConstructorParametersInSecondaryConstructor.fir.txt
Vendored
+11
View File
@@ -0,0 +1,11 @@
FILE: primaryConstructorParametersInSecondaryConstructor.kt
public final class A : R|kotlin/Any| {
public constructor(x: R|kotlin/Int|): R|A| {
super<R|kotlin/Any|>()
}
public constructor(y: R|kotlin/String|, z: R|kotlin/Int| = <Unresolved name: x>#): R|A| {
this<R|A|>(R|<local>/z|)
}
}
compiler/fir/analysis-tests/testData/resolve/diagnostics/primaryConstructorParametersInSecondaryConstructor.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
class A(x: Int) {
constructor(y: String, z: Int = <!UNRESOLVED_REFERENCE!>x<!>): this(z)
}
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java
Generated
+6
View File
@@ -1663,6 +1663,12 @@ public class FirDiagnosticTestGenerated extends AbstractFirDiagnosticTest {
runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/notASupertype.kt");
}
@Test
@TestMetadata("primaryConstructorParametersInSecondaryConstructor.kt")
public void testPrimaryConstructorParametersInSecondaryConstructor() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/primaryConstructorParametersInSecondaryConstructor.kt");
}
@Test
@TestMetadata("primaryConstructorRequiredForDataClass.kt")
public void testPrimaryConstructorRequiredForDataClass() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java
Generated
+6
View File
@@ -1663,6 +1663,12 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/notASupertype.kt");
}
@Test
@TestMetadata("primaryConstructorParametersInSecondaryConstructor.kt")
public void testPrimaryConstructorParametersInSecondaryConstructor() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/diagnostics/primaryConstructorParametersInSecondaryConstructor.kt");
}
@Test
@TestMetadata("primaryConstructorRequiredForDataClass.kt")
public void testPrimaryConstructorRequiredForDataClass() throws Exception {
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveContext.kt
+4 -2
View File
@@ -631,8 +631,10 @@ class BodyResolveContext(
* special towerDataContext
*/
withTowerDataMode(FirTowerDataMode.CONSTRUCTOR_HEADER) {
getPrimaryConstructorAllParametersScope()?.let { addLocalScope(it) }
f()
withTowerDataCleanup {
getPrimaryConstructorAllParametersScope()?.let { addLocalScope(it) }
f()
}
}
} else {
withTowerDataCleanup {