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

Deprecate ExtensionFunctionType on a non-function types

Browse Source 
Related to KT-43527
This commit is contained in:
Mikhail Glukhikh
2022-01-12 17:13:37 +03:00
parent d0fa3eb1d3
commit 1274e2b90a
17 changed files with 61 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ fun foo(a: (String) -> Unit) {
interface A : (String) -> Unit {}
fun foo(a: @ExtensionFunctionType A) {
fun foo(a: <!WRONG_EXTENSION_FUNCTION_TYPE_WARNING!>@ExtensionFunctionType<!> A) {
// @Extension annotation on an unrelated type shouldn't have any effect on this diagnostic.
// Only kotlin.Function{n} type annotated with @Extension should
"".a()
compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ fun foo(a: (String) -> Unit) {
interface A : (String) -> Unit {}
fun foo(a: @ExtensionFunctionType A) {
fun foo(a: <!WRONG_EXTENSION_FUNCTION_TYPE_WARNING!>@ExtensionFunctionType<!> A) {
// @Extension annotation on an unrelated type shouldn't have any effect on this diagnostic.
// Only kotlin.Function{n} type annotated with @Extension should
"".<!UNRESOLVED_REFERENCE!>a<!>()
compiler/testData/diagnostics/tests/annotations/extensionFunctionType.fir.kt
Vendored
+3
View File
@@ -1,4 +1,5 @@
// WITH_STDLIB
// !LANGUAGE: +ForbidExtensionFunctionTypeOnNonFunctionTypes
// This test checks that annotations on extension function types are preserved. See the corresponding .txt file
@Target(AnnotationTarget.TYPE)
@@ -17,4 +18,6 @@ interface Some {
}
fun f7(x: <!WRONG_EXTENSION_FUNCTION_TYPE!>@ExtensionFunctionType<!> Function0<Int>)
fun f8(x: <!WRONG_EXTENSION_FUNCTION_TYPE!>@ExtensionFunctionType<!> Int)
}
compiler/testData/diagnostics/tests/annotations/extensionFunctionType.kt
Vendored
+3
View File
@@ -1,4 +1,5 @@
// WITH_STDLIB
// !LANGUAGE: +ForbidExtensionFunctionTypeOnNonFunctionTypes
// This test checks that annotations on extension function types are preserved. See the corresponding .txt file
@Target(AnnotationTarget.TYPE)
@@ -17,4 +18,6 @@ interface Some {
}
fun f7(x: <!WRONG_EXTENSION_FUNCTION_TYPE!>@ExtensionFunctionType<!> Function0<Int>)
fun f8(x: <!WRONG_EXTENSION_FUNCTION_TYPE!>@ExtensionFunctionType<!> Int)
}
compiler/testData/diagnostics/tests/annotations/extensionFunctionType.txt
Vendored
+1
View File
@@ -9,6 +9,7 @@ public interface Some {
public abstract fun f5(): kotlin.Int.(???) -> kotlin.Int
public open fun f6(/*0*/ x: kotlin.Int.(???) -> kotlin.Int): kotlin.Unit
public abstract fun f7(/*0*/ x: kotlin.Int.(???) -> kotlin.Int): kotlin.Unit
public abstract fun f8(/*0*/ x: @kotlin.ExtensionFunctionType kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/typealias/typealiasRhsAnnotations.kt
Vendored
+2 -2
View File
@@ -1,4 +1,5 @@
// FIR_IDENTICAL
// !LANGUAGE: -ForbidExtensionFunctionTypeOnNonFunctionTypes
@Target(AnnotationTarget.TYPE)
annotation class Ann1
@@ -9,8 +10,7 @@ typealias Alias1 = @Ann1 String
typealias Alias2 = @Ann2 Alias1
fun test1(a: Alias2) = a
// NB @ExtensionFunctionType on non-functional type is not an error
typealias Alias3 = @ExtensionFunctionType Alias1
typealias Alias3 = <!WRONG_EXTENSION_FUNCTION_TYPE_WARNING!>@ExtensionFunctionType<!> Alias1
fun test2(a: Alias3) = a
typealias LA1 = List<@Ann2 Alias1>