Rename Extension annotation to ExtensionFunctionType

The old one is kept temporarily and will be removed later
This commit is contained in:
Alexander Udalov
2015-11-25 19:29:20 +03:00
parent 6d40d94127
commit 7449ad2763
36 changed files with 80 additions and 64 deletions
@@ -10,7 +10,7 @@ public final class FunctionTypes public constructor() {
public final fun f3(f: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit { /* compiled code */ }
public final fun f4(f: kotlin.List<@kotlin.Extension kotlin.Function1<*, *>>): kotlin.Unit { /* compiled code */ }
public final fun f4(f: kotlin.List<@kotlin.ExtensionFunctionType kotlin.Function1<*, *>>): kotlin.Unit { /* compiled code */ }
public final fun <A> (A.(A) -> A)?.bar(): kotlin.Unit { /* compiled code */ }
@@ -19,4 +19,4 @@ public final class FunctionTypes public constructor() {
public final fun <IP, R, P1> ((IP) -> R).compose2(f: (P1) -> IP): (P1) -> R { /* compiled code */ }
public final fun <A> (A.(A) -> A).foo(): kotlin.Unit { /* compiled code */ }
}
}
@@ -21,9 +21,9 @@ class FunctionTypes {
public fun f2(f: Function2<Int, *, String>) {
}
public fun f3(f: @Extension Function2<Int, Int, Unit>) {
public fun f3(f: @ExtensionFunctionType Function2<Int, Int, Unit>) {
}
public fun f4(f: List<@Extension Function1<*, *>>) {
public fun f4(f: List<@ExtensionFunctionType Function1<*, *>>) {
}
}
+3 -3
View File
@@ -19,7 +19,7 @@ abstract class Types {
abstract val starList: List<*>
abstract val starFun: Function1<*, *>
abstract val extFun: @Extension Function2<Int, Int, Unit>
abstract val listExtStarFun: List<@Extension Function1<*, *>>
abstract val extFun: @ExtensionFunctionType Function2<Int, Int, Unit>
abstract val listExtStarFun: List<@ExtensionFunctionType Function1<*, *>>
abstract val funTypeWithStarAndNonStar: Function1<*, Int>
}
}
+2 -2
View File
@@ -252,13 +252,13 @@ PsiJetFileStubImpl[package=test]
TYPE_ARGUMENT_LIST:
TYPE_PROJECTION:[projectionKind=NONE]
TYPE_REFERENCE:
ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Extension]
ANNOTATION_ENTRY:[hasValueArguments=false, shortName=ExtensionFunctionType]
CONSTRUCTOR_CALLEE:
TYPE_REFERENCE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=Extension]
REFERENCE_EXPRESSION:[referencedName=ExtensionFunctionType]
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
+1 -1
View File
@@ -4,4 +4,4 @@ val c: <selection>() -> String</selection> = { "" }
val d: () -> kotlin.String = { "" }
val e: () -> Unit = { }
val f: Any.() -> String = { "" }
val g: @Extension Function1<String, String> = { "" }
val g: @ExtensionFunctionType Function1<String, String> = { "" }
+2 -2
View File
@@ -5,6 +5,6 @@ val d: (n: Int) -> kotlin.String = { "" }
val e: (String) -> Int = { 0 }
val f: () -> Int = { 0 }
val g: Int.() -> String = { "" }
val h: @Extension Function2<Int, Int, String> = { "" }
val h: @ExtensionFunctionType Function2<Int, Int, String> = { "" }
val i: (m: Int) -> kotlin.String = { "" }
val j: @Extension Function1<Int, String> = { "" }
val j: @ExtensionFunctionType Function1<Int, String> = { "" }
+1 -1
View File
@@ -10,4 +10,4 @@ Int.() -> String
(m: Int) -> kotlin.String
@Extension Function1<Int, String>
@ExtensionFunctionType Function1<Int, String>
+2 -2
View File
@@ -6,6 +6,6 @@ val e: (String) -> Int = { 0 }
val f: () -> Int = { 0 }
val g: Any.(Int) -> String = { "" }
val h: Int.(Any) -> String = { "" }
val i: @Extension Function3<Any, Any, Int, String> = { a, b -> "" }
val i: @ExtensionFunctionType Function3<Any, Any, Int, String> = { a, b -> "" }
val j: (t: Any, u: Int) -> kotlin.String = { a, b -> "" }
val k: @Extension Function2<Any, Int, String> = { "" }
val k: @ExtensionFunctionType Function2<Any, Int, String> = { "" }
+1 -1
View File
@@ -10,4 +10,4 @@ Any.(Int) -> String
(t: Any, u: Int) -> kotlin.String
@Extension Function2<Any, Int, String>
@ExtensionFunctionType Function2<Any, Int, String>