[FIR] Fix copy paste error in receiver enhancement
This commit is contained in:
committed by
Space Team
parent
8a90032e93
commit
29a9d3cdd9
+6
@@ -22756,6 +22756,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
|
|||||||
runTest("compiler/testData/diagnostics/tests/j+k/rawUpperBounds.kt");
|
runTest("compiler/testData/diagnostics/tests/j+k/rawUpperBounds.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("receiverEnhancement.kt")
|
||||||
|
public void testReceiverEnhancement() {
|
||||||
|
runTest("compiler/testData/diagnostics/tests/j+k/receiverEnhancement.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("recursionWithJavaSyntheticProperty.kt")
|
@TestMetadata("recursionWithJavaSyntheticProperty.kt")
|
||||||
public void testRecursionWithJavaSyntheticProperty() {
|
public void testRecursionWithJavaSyntheticProperty() {
|
||||||
|
|||||||
+6
@@ -22756,6 +22756,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
|
|||||||
runTest("compiler/testData/diagnostics/tests/j+k/rawUpperBounds.kt");
|
runTest("compiler/testData/diagnostics/tests/j+k/rawUpperBounds.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("receiverEnhancement.kt")
|
||||||
|
public void testReceiverEnhancement() {
|
||||||
|
runTest("compiler/testData/diagnostics/tests/j+k/receiverEnhancement.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("recursionWithJavaSyntheticProperty.kt")
|
@TestMetadata("recursionWithJavaSyntheticProperty.kt")
|
||||||
public void testRecursionWithJavaSyntheticProperty() {
|
public void testRecursionWithJavaSyntheticProperty() {
|
||||||
|
|||||||
+6
@@ -22750,6 +22750,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
|
|||||||
runTest("compiler/testData/diagnostics/tests/j+k/rawUpperBounds.kt");
|
runTest("compiler/testData/diagnostics/tests/j+k/rawUpperBounds.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("receiverEnhancement.kt")
|
||||||
|
public void testReceiverEnhancement() {
|
||||||
|
runTest("compiler/testData/diagnostics/tests/j+k/receiverEnhancement.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("recursionWithJavaSyntheticProperty.kt")
|
@TestMetadata("recursionWithJavaSyntheticProperty.kt")
|
||||||
public void testRecursionWithJavaSyntheticProperty() {
|
public void testRecursionWithJavaSyntheticProperty() {
|
||||||
|
|||||||
+6
@@ -22756,6 +22756,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
|
|||||||
runTest("compiler/testData/diagnostics/tests/j+k/rawUpperBounds.kt");
|
runTest("compiler/testData/diagnostics/tests/j+k/rawUpperBounds.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("receiverEnhancement.kt")
|
||||||
|
public void testReceiverEnhancement() {
|
||||||
|
runTest("compiler/testData/diagnostics/tests/j+k/receiverEnhancement.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("recursionWithJavaSyntheticProperty.kt")
|
@TestMetadata("recursionWithJavaSyntheticProperty.kt")
|
||||||
public void testRecursionWithJavaSyntheticProperty() {
|
public void testRecursionWithJavaSyntheticProperty() {
|
||||||
|
|||||||
+1
-1
@@ -368,7 +368,7 @@ class FirSignatureEnhancement(
|
|||||||
typeParameterSubstitutor?.substituteOrNull(newReturnTypeRef.coneType)
|
typeParameterSubstitutor?.substituteOrNull(newReturnTypeRef.coneType)
|
||||||
)
|
)
|
||||||
val substitutedReceiverTypeRef = newReceiverTypeRef?.withReplacedConeType(
|
val substitutedReceiverTypeRef = newReceiverTypeRef?.withReplacedConeType(
|
||||||
typeParameterSubstitutor?.substituteOrNull(newReturnTypeRef.coneType)
|
typeParameterSubstitutor?.substituteOrNull(newReceiverTypeRef.coneType)
|
||||||
)
|
)
|
||||||
receiverParameter = substitutedReceiverTypeRef?.let { receiverType ->
|
receiverParameter = substitutedReceiverTypeRef?.let { receiverType ->
|
||||||
buildReceiverParameter {
|
buildReceiverParameter {
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
// FIR_IDENTICAL
|
||||||
|
// FILE: J.java
|
||||||
|
public class J extends Foo {
|
||||||
|
@Override
|
||||||
|
public <T> T bar(String $this$bar) {
|
||||||
|
super.bar($this$bar);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// FILE: test.kt
|
||||||
|
open class Foo {
|
||||||
|
fun <T> String.bar(): T {
|
||||||
|
@Suppress("UNCHECKED_CAST")
|
||||||
|
return null as T
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun J.test(s1: String?, s2: String) {
|
||||||
|
s1<!UNSAFE_CALL!>.<!>bar<Int>()
|
||||||
|
s1?.bar<Int>()
|
||||||
|
s2.bar<Int>()
|
||||||
|
s2<!UNNECESSARY_SAFE_CALL!>?.<!>bar<Int>()
|
||||||
|
}
|
||||||
Generated
+6
@@ -22756,6 +22756,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
|
|||||||
runTest("compiler/testData/diagnostics/tests/j+k/rawUpperBounds.kt");
|
runTest("compiler/testData/diagnostics/tests/j+k/rawUpperBounds.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@TestMetadata("receiverEnhancement.kt")
|
||||||
|
public void testReceiverEnhancement() {
|
||||||
|
runTest("compiler/testData/diagnostics/tests/j+k/receiverEnhancement.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@TestMetadata("recursionWithJavaSyntheticProperty.kt")
|
@TestMetadata("recursionWithJavaSyntheticProperty.kt")
|
||||||
public void testRecursionWithJavaSyntheticProperty() {
|
public void testRecursionWithJavaSyntheticProperty() {
|
||||||
|
|||||||
Reference in New Issue
Block a user