FIR: Adjust testData for spec tests: invoke on nullable receiver
It's a design problem, see related issue ^KT-30415
This commit is contained in:
@@ -0,0 +1,13 @@
|
|||||||
|
class A {
|
||||||
|
operator fun invoke() {}
|
||||||
|
}
|
||||||
|
|
||||||
|
class B {
|
||||||
|
val bar: () -> Unit = {}
|
||||||
|
val foo: A = A()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun main(b: B?) {
|
||||||
|
b?.bar() // allowed in FIR, prohibited in old FE
|
||||||
|
b?.foo() // allowed in FIR, prohibited in old FE
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
FILE: safeCallInvoke.kt
|
||||||
|
public final class A : R|kotlin/Any| {
|
||||||
|
public constructor(): R|A| {
|
||||||
|
super<R|kotlin/Any|>()
|
||||||
|
}
|
||||||
|
|
||||||
|
public final operator fun invoke(): R|kotlin/Unit| {
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
public final class B : R|kotlin/Any| {
|
||||||
|
public constructor(): R|B| {
|
||||||
|
super<R|kotlin/Any|>()
|
||||||
|
}
|
||||||
|
|
||||||
|
public final val bar: R|() -> kotlin/Unit| = fun <anonymous>(): R|kotlin/Unit| {
|
||||||
|
^ Unit
|
||||||
|
}
|
||||||
|
|
||||||
|
public get(): R|() -> kotlin/Unit|
|
||||||
|
|
||||||
|
public final val foo: R|A| = R|/A.A|()
|
||||||
|
public get(): R|A|
|
||||||
|
|
||||||
|
}
|
||||||
|
public final fun main(b: R|B?|): R|kotlin/Unit| {
|
||||||
|
R|<local>/b|?.R|/B.bar|?.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()
|
||||||
|
R|<local>/b|?.R|/B.foo|?.R|/A.invoke|()
|
||||||
|
}
|
||||||
Generated
+5
@@ -1643,6 +1643,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
|
|||||||
public void testMultipleJavaClassesInOneFile() throws Exception {
|
public void testMultipleJavaClassesInOneFile() throws Exception {
|
||||||
runTest("compiler/fir/analysis-tests/testData/resolve/problems/multipleJavaClassesInOneFile.kt");
|
runTest("compiler/fir/analysis-tests/testData/resolve/problems/multipleJavaClassesInOneFile.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("safeCallInvoke.kt")
|
||||||
|
public void testSafeCallInvoke() throws Exception {
|
||||||
|
runTest("compiler/fir/analysis-tests/testData/resolve/problems/safeCallInvoke.kt");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@TestMetadata("compiler/fir/analysis-tests/testData/resolve/properties")
|
@TestMetadata("compiler/fir/analysis-tests/testData/resolve/properties")
|
||||||
|
|||||||
+5
@@ -1643,6 +1643,11 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
|
|||||||
public void testMultipleJavaClassesInOneFile() throws Exception {
|
public void testMultipleJavaClassesInOneFile() throws Exception {
|
||||||
runTest("compiler/fir/analysis-tests/testData/resolve/problems/multipleJavaClassesInOneFile.kt");
|
runTest("compiler/fir/analysis-tests/testData/resolve/problems/multipleJavaClassesInOneFile.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("safeCallInvoke.kt")
|
||||||
|
public void testSafeCallInvoke() throws Exception {
|
||||||
|
runTest("compiler/fir/analysis-tests/testData/resolve/problems/safeCallInvoke.kt");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@TestMetadata("compiler/fir/analysis-tests/testData/resolve/properties")
|
@TestMetadata("compiler/fir/analysis-tests/testData/resolve/properties")
|
||||||
|
|||||||
+95
@@ -0,0 +1,95 @@
|
|||||||
|
// !LANGUAGE: +NewInference
|
||||||
|
// !DIAGNOSTICS: -UNUSED_VARIABLE -UNREACHABLE_CODE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION -IMPLICIT_NOTHING_RETURN_TYPE -DEBUG_INFO_LEAKING_THIS -EXTENSION_SHADOWED_BY_MEMBER
|
||||||
|
// SKIP_TXT
|
||||||
|
|
||||||
|
/*
|
||||||
|
* KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
|
||||||
|
*
|
||||||
|
* SPEC VERSION: 0.1-280
|
||||||
|
* PLACE: overload-resolution, building-the-overload-candidate-set-ocs, call-with-named-parameters -> paragraph 1 -> sentence 2
|
||||||
|
* RELEVANT PLACES: overload-resolution, building-the-overload-candidate-set-ocs, call-with-named-parameters -> paragraph 3 -> sentence 1
|
||||||
|
* overload-resolution, building-the-overload-candidate-set-ocs, call-with-named-parameters -> paragraph 2 -> sentence 1
|
||||||
|
* overload-resolution, building-the-overload-candidate-set-ocs, call-with-named-parameters -> paragraph 4 -> sentence 1
|
||||||
|
* NUMBER: 1
|
||||||
|
* DESCRIPTION: Implicit receiver: sets of non-extension member callables, local, explicitly imported, declared in the package scope and star-imported extension callables
|
||||||
|
*/
|
||||||
|
|
||||||
|
// TESTCASE NUMBER: 1, 2, 3, 4, 5
|
||||||
|
|
||||||
|
// FILE: Marker.kt
|
||||||
|
package libPackage
|
||||||
|
|
||||||
|
class Marker {
|
||||||
|
fun foo(y: Int) = TODO()
|
||||||
|
val foo: Marker = this
|
||||||
|
operator fun invoke(x: Int) = TODO()
|
||||||
|
}
|
||||||
|
|
||||||
|
// FILE: Tests.kt
|
||||||
|
package tests
|
||||||
|
import libPackage.Marker
|
||||||
|
|
||||||
|
// TESTCASE NUMBER: 1
|
||||||
|
|
||||||
|
class Case1() {
|
||||||
|
fun Marker.foo(y: Int) = TODO()
|
||||||
|
|
||||||
|
fun test() {
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.foo; typeCall: function")!>foo(y=1)<!>
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x=1)<!>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun case1() {
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.foo; typeCall: function")!>foo(y=1)<!>
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x=1)<!>
|
||||||
|
}
|
||||||
|
|
||||||
|
// TESTCASE NUMBER: 2
|
||||||
|
class Case2() {
|
||||||
|
fun test() {
|
||||||
|
fun Marker.foo(x:Int) = TODO()
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.foo; typeCall: function")!>foo(y=1)<!>
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x=1)<!>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun Marker.foo(x:Int) = TODO()
|
||||||
|
|
||||||
|
fun case2() {
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.foo; typeCall: function")!>foo(y=1)<!>
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x=1)<!>
|
||||||
|
}
|
||||||
|
|
||||||
|
// TESTCASE NUMBER: 3
|
||||||
|
fun case3() {
|
||||||
|
fun Marker.foo(y:Int) = TODO()
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.foo; typeCall: function")!>foo(y=1)<!>
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x=1)<!>
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* TESTCASE NUMBER: 4
|
||||||
|
* UNEXPECTED BEHAVIOUR
|
||||||
|
* ISSUES: KT-37391
|
||||||
|
*/
|
||||||
|
fun case4(marker : Marker?) {
|
||||||
|
marker?.<!DEBUG_INFO_CALL("fqName: libPackage.Marker.foo; typeCall: function")!>foo(y=1)<!>
|
||||||
|
marker?.<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x=1)<!><!INAPPLICABLE_CANDIDATE!>><!><!SYNTAX!><!>
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* TESTCASE NUMBER: 5
|
||||||
|
* UNEXPECTED BEHAVIOUR
|
||||||
|
* ISSUES: KT-37391
|
||||||
|
*/
|
||||||
|
fun case5(marker : Marker?) {
|
||||||
|
fun bar(){
|
||||||
|
fun Marker.foo(y:Int) = TODO()
|
||||||
|
marker?.<!DEBUG_INFO_CALL("fqName: libPackage.Marker.foo; typeCall: function")!>foo(y=1)<!>
|
||||||
|
marker?.<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x=1)<!>
|
||||||
|
}
|
||||||
|
marker?.<!DEBUG_INFO_CALL("fqName: libPackage.Marker.foo; typeCall: function")!>foo(y=1)<!>
|
||||||
|
marker?.<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x=1)<!>
|
||||||
|
}
|
||||||
+95
@@ -0,0 +1,95 @@
|
|||||||
|
// !LANGUAGE: +NewInference
|
||||||
|
// !DIAGNOSTICS: -UNUSED_VARIABLE -UNREACHABLE_CODE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION -IMPLICIT_NOTHING_RETURN_TYPE -DEBUG_INFO_LEAKING_THIS -EXTENSION_SHADOWED_BY_MEMBER
|
||||||
|
// SKIP_TXT
|
||||||
|
|
||||||
|
/*
|
||||||
|
* KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
|
||||||
|
*
|
||||||
|
* SPEC VERSION: 0.1-300
|
||||||
|
* PLACE: overload-resolution, building-the-overload-candidate-set-ocs, call-with-trailing-lambda-expressions -> paragraph 1 -> sentence 2
|
||||||
|
* RELEVANT PLACES: overload-resolution, building-the-overload-candidate-set-ocs, call-with-named-parameters -> paragraph 3 -> sentence 1
|
||||||
|
* overload-resolution, building-the-overload-candidate-set-ocs, call-with-named-parameters -> paragraph 2 -> sentence 1
|
||||||
|
* overload-resolution, building-the-overload-candidate-set-ocs, call-with-named-parameters -> paragraph 4 -> sentence 1
|
||||||
|
* NUMBER: 1
|
||||||
|
* DESCRIPTION: call-with-trailing-lambda-expressions,Implicit receiver: sets of non-extension member callables, local, explicitly imported, declared in the package scope and star-imported extension callables
|
||||||
|
*/
|
||||||
|
|
||||||
|
// TESTCASE NUMBER: 1, 2, 3, 4, 5
|
||||||
|
|
||||||
|
// FILE: Marker.kt
|
||||||
|
package libPackage
|
||||||
|
|
||||||
|
class Marker {
|
||||||
|
fun foo(y: () -> Int) = TODO()
|
||||||
|
val foo: Marker = this
|
||||||
|
operator fun invoke(x: () -> Int) = TODO()
|
||||||
|
}
|
||||||
|
|
||||||
|
// FILE: Tests.kt
|
||||||
|
package tests
|
||||||
|
import libPackage.Marker
|
||||||
|
|
||||||
|
// TESTCASE NUMBER: 1
|
||||||
|
|
||||||
|
class Case1() {
|
||||||
|
fun Marker.foo(y: ()->Int) = TODO()
|
||||||
|
|
||||||
|
fun test() {
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.foo; typeCall: function")!>foo(y = { 1 })<!>
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x = { 1 })<!>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun case1() {
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.foo; typeCall: function")!>foo(y = { 1 })<!>
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x = { 1 })<!>
|
||||||
|
}
|
||||||
|
|
||||||
|
// TESTCASE NUMBER: 2
|
||||||
|
class Case2() {
|
||||||
|
fun test() {
|
||||||
|
fun Marker.foo(x: ()->Int) = TODO()
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.foo; typeCall: function")!>foo(y = { 1 })<!>
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x = { 1 })<!>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun Marker.foo(x: ()->Int) = TODO()
|
||||||
|
|
||||||
|
fun case2() {
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.foo; typeCall: function")!>foo(y = { 1 })<!>
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x = { 1 })<!>
|
||||||
|
}
|
||||||
|
|
||||||
|
// TESTCASE NUMBER: 3
|
||||||
|
fun case3() {
|
||||||
|
fun Marker.foo(y: ()->Int) = TODO()
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.foo; typeCall: function")!>foo(y = { 1 })<!>
|
||||||
|
Marker().<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x = { 1 })<!>
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* TESTCASE NUMBER: 4
|
||||||
|
* UNEXPECTED BEHAVIOUR
|
||||||
|
* ISSUES: KT-37391
|
||||||
|
*/
|
||||||
|
fun case4(marker: Marker?) {
|
||||||
|
marker?.<!DEBUG_INFO_CALL("fqName: libPackage.Marker.foo; typeCall: function")!>foo(y = { 1 })<!>
|
||||||
|
marker?.<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x = { 1 })<!><!INAPPLICABLE_CANDIDATE!>><!><!SYNTAX!><!>
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* TESTCASE NUMBER: 5
|
||||||
|
* UNEXPECTED BEHAVIOUR
|
||||||
|
* ISSUES: KT-37391
|
||||||
|
*/
|
||||||
|
fun case5(marker: Marker?) {
|
||||||
|
fun bar() {
|
||||||
|
fun Marker.foo(y: ()->Int) = TODO()
|
||||||
|
marker?.<!DEBUG_INFO_CALL("fqName: libPackage.Marker.foo; typeCall: function")!>foo(y = { 1 })<!>
|
||||||
|
marker?.<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x = { 1 })<!>
|
||||||
|
}
|
||||||
|
marker?.<!DEBUG_INFO_CALL("fqName: libPackage.Marker.foo; typeCall: function")!>foo(y = { 1 })<!>
|
||||||
|
marker?.<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x = { 1 })<!>
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user