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

K2: Fix current behavior for KT-37375 and KT-58943

Browse Source
This commit is contained in:
Denis.Zharkov
2023-05-26 17:38:14 +02:00
committed by Space Team
parent f37dc27974
commit acb1859154
11 changed files with 184 additions and 0 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/DiagnosticCompilerTestFE10TestdataTestGenerated.java
Generated
+18
View File
@@ -27449,6 +27449,18 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/invoke"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform");
}
@Test
@TestMetadata("closeInvokesFarVariable.kt")
public void testCloseInvokesFarVariable() throws Exception {
runTest("compiler/testData/diagnostics/tests/resolve/invoke/closeInvokesFarVariable.kt");
}
@Test
@TestMetadata("closerVariableMatterMore.kt")
public void testCloserVariableMatterMore() throws Exception {
runTest("compiler/testData/diagnostics/tests/resolve/invoke/closerVariableMatterMore.kt");
}
@Test
@TestMetadata("completePropertyBeforeInvoke.kt")
public void testCompletePropertyBeforeInvoke() throws Exception {
@@ -27467,6 +27479,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
runTest("compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.kt");
}
@Test
@TestMetadata("implicitAndInvokeExtensionPriority.kt")
public void testImplicitAndInvokeExtensionPriority() throws Exception {
runTest("compiler/testData/diagnostics/tests/resolve/invoke/implicitAndInvokeExtensionPriority.kt");
}
@Test
@TestMetadata("implicitInvoke.kt")
public void testImplicitInvoke() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
Generated
+18
View File
@@ -27449,6 +27449,18 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/invoke"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform");
}
@Test
@TestMetadata("closeInvokesFarVariable.kt")
public void testCloseInvokesFarVariable() throws Exception {
runTest("compiler/testData/diagnostics/tests/resolve/invoke/closeInvokesFarVariable.kt");
}
@Test
@TestMetadata("closerVariableMatterMore.kt")
public void testCloserVariableMatterMore() throws Exception {
runTest("compiler/testData/diagnostics/tests/resolve/invoke/closerVariableMatterMore.kt");
}
@Test
@TestMetadata("completePropertyBeforeInvoke.kt")
public void testCompletePropertyBeforeInvoke() throws Exception {
@@ -27467,6 +27479,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
runTest("compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.kt");
}
@Test
@TestMetadata("implicitAndInvokeExtensionPriority.kt")
public void testImplicitAndInvokeExtensionPriority() throws Exception {
runTest("compiler/testData/diagnostics/tests/resolve/invoke/implicitAndInvokeExtensionPriority.kt");
}
@Test
@TestMetadata("implicitInvoke.kt")
public void testImplicitInvoke() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
+18
View File
@@ -27449,6 +27449,18 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/invoke"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform");
}
@Test
@TestMetadata("closeInvokesFarVariable.kt")
public void testCloseInvokesFarVariable() throws Exception {
runTest("compiler/testData/diagnostics/tests/resolve/invoke/closeInvokesFarVariable.kt");
}
@Test
@TestMetadata("closerVariableMatterMore.kt")
public void testCloserVariableMatterMore() throws Exception {
runTest("compiler/testData/diagnostics/tests/resolve/invoke/closerVariableMatterMore.kt");
}
@Test
@TestMetadata("completePropertyBeforeInvoke.kt")
public void testCompletePropertyBeforeInvoke() throws Exception {
@@ -27467,6 +27479,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.kt");
}
@Test
@TestMetadata("implicitAndInvokeExtensionPriority.kt")
public void testImplicitAndInvokeExtensionPriority() throws Exception {
runTest("compiler/testData/diagnostics/tests/resolve/invoke/implicitAndInvokeExtensionPriority.kt");
}
@Test
@TestMetadata("implicitInvoke.kt")
public void testImplicitInvoke() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+18
View File
@@ -27461,6 +27461,18 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/invoke"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform");
}
@Test
@TestMetadata("closeInvokesFarVariable.kt")
public void testCloseInvokesFarVariable() throws Exception {
runTest("compiler/testData/diagnostics/tests/resolve/invoke/closeInvokesFarVariable.kt");
}
@Test
@TestMetadata("closerVariableMatterMore.kt")
public void testCloserVariableMatterMore() throws Exception {
runTest("compiler/testData/diagnostics/tests/resolve/invoke/closerVariableMatterMore.kt");
}
@Test
@TestMetadata("completePropertyBeforeInvoke.kt")
public void testCompletePropertyBeforeInvoke() throws Exception {
@@ -27479,6 +27491,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.kt");
}
@Test
@TestMetadata("implicitAndInvokeExtensionPriority.kt")
public void testImplicitAndInvokeExtensionPriority() throws Exception {
runTest("compiler/testData/diagnostics/tests/resolve/invoke/implicitAndInvokeExtensionPriority.kt");
}
@Test
@TestMetadata("implicitInvoke.kt")
public void testImplicitInvoke() throws Exception {
compiler/testData/diagnostics/tests/resolve/invoke/closeInvokesFarVariable.fir.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
// ISSUE: KT-37375
val foo: Any = Any()
fun bar() {
operator fun Any.invoke(): String = ""
fun baz() {
operator fun Any.invoke(): Int = 1
fun barbaz() {
takeInt(<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>())
}
}
}
fun takeInt(x: Int) {}
compiler/testData/diagnostics/tests/resolve/invoke/closeInvokesFarVariable.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
// ISSUE: KT-37375
val foo: Any = Any()
fun bar() {
operator fun Any.invoke(): String = ""
fun baz() {
operator fun Any.invoke(): Int = 1
fun barbaz() {
takeInt(foo())
}
}
}
fun takeInt(x: Int) {}
compiler/testData/diagnostics/tests/resolve/invoke/closerVariableMatterMore.fir.kt
Vendored
+14
View File
@@ -0,0 +1,14 @@
// ISSUE: KT-37375
fun takeDouble(x: Double) {}
val bar: Int = 1
operator fun Double.invoke(): Double = 1.0 // (1)
fun test_1() {
val bar: Double = 2.0
operator fun Int.invoke(): Int = 1 // (2)
val res = bar() // should resolve to (1)
takeDouble(<!ARGUMENT_TYPE_MISMATCH!>res<!>) // should be OK
}
compiler/testData/diagnostics/tests/resolve/invoke/closerVariableMatterMore.kt
Vendored
+14
View File
@@ -0,0 +1,14 @@
// ISSUE: KT-37375
fun takeDouble(x: Double) {}
val bar: Int = 1
operator fun Double.invoke(): Double = 1.0 // (1)
fun test_1() {
val bar: Double = 2.0
operator fun Int.invoke(): Int = 1 // (2)
val res = bar() // should resolve to (1)
takeDouble(res) // should be OK
}
compiler/testData/diagnostics/tests/resolve/invoke/implicitAndInvokeExtensionPriority.fir.kt
Vendored
+16
View File
@@ -0,0 +1,16 @@
// ISSUE: KT-58943
class A {
fun bar() {
val foo: String.() -> Int = { 1 } // (1)
fun String.foo(): String = "" // (2)
with("2") {
// In K1, foo variable + invokeExtension on implicit receiver is more prioritized than `foo() + implicit receiver`
// So, for now, we're going to preserve that behavior in K2
// For design, see KT-59528
takeInt(<!ARGUMENT_TYPE_MISMATCH!>foo()<!>)
}
}
}
fun takeInt(x: Int) {}
compiler/testData/diagnostics/tests/resolve/invoke/implicitAndInvokeExtensionPriority.kt
Vendored
+16
View File
@@ -0,0 +1,16 @@
// ISSUE: KT-58943
class A {
fun bar() {
val foo: String.() -> Int = { 1 } // (1)
fun String.foo(): String = "" // (2)
with("2") {
// In K1, foo variable + invokeExtension on implicit receiver is more prioritized than `foo() + implicit receiver`
// So, for now, we're going to preserve that behavior in K2
// For design, see KT-59528
takeInt(foo())
}
}
}
fun takeInt(x: Int) {}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+18
View File
@@ -28293,6 +28293,18 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/invoke"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
}
@Test
@TestMetadata("closeInvokesFarVariable.kt")
public void testCloseInvokesFarVariable() throws Exception {
runTest("compiler/testData/diagnostics/tests/resolve/invoke/closeInvokesFarVariable.kt");
}
@Test
@TestMetadata("closerVariableMatterMore.kt")
public void testCloserVariableMatterMore() throws Exception {
runTest("compiler/testData/diagnostics/tests/resolve/invoke/closerVariableMatterMore.kt");
}
@Test
@TestMetadata("completePropertyBeforeInvoke.kt")
public void testCompletePropertyBeforeInvoke() throws Exception {
@@ -28311,6 +28323,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.kt");
}
@Test
@TestMetadata("implicitAndInvokeExtensionPriority.kt")
public void testImplicitAndInvokeExtensionPriority() throws Exception {
runTest("compiler/testData/diagnostics/tests/resolve/invoke/implicitAndInvokeExtensionPriority.kt");
}
@Test
@TestMetadata("implicitInvoke.kt")
public void testImplicitInvoke() throws Exception {