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

Deprecate extension annotation in favor of Extension

Browse Source
This commit is contained in:
Denis Zharkov
2015-09-01 13:44:02 +03:00
parent 3597234165
commit 11fed1674e
36 changed files with 72 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/builtin-classes.txt
Vendored
+4 -4
View File
@@ -427,6 +427,10 @@ public abstract class Enum</*0*/ E : kotlin.Enum<E>> : kotlin.Comparable<E> {
}
}
kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation(mustBeDocumented = true) public final class Extension : kotlin.Annotation {
/*primary*/ public constructor Extension()
}
public final class Float : kotlin.Number, kotlin.Comparable<kotlin.Float> {
/*primary*/ private constructor Float()
public final fun compareTo(/*0*/ other: kotlin.Byte): kotlin.Int
@@ -1262,10 +1266,6 @@ kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER, Annotati
internal final fun <get-value>(): kotlin.String
}
kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation(mustBeDocumented = true) public final class extension : kotlin.Annotation {
/*primary*/ public constructor extension()
}
kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY}) kotlin.annotation.annotation(mustBeDocumented = true, retention = AnnotationRetention.RUNTIME) public final class inline : kotlin.Annotation {
/*primary*/ public constructor inline(/*0*/ strategy: kotlin.InlineStrategy = ...)
public final val strategy: kotlin.InlineStrategy
compiler/testData/codegen/box/regressions/kt3999.kt
Vendored
+3 -3
View File
@@ -11,9 +11,9 @@ fun test1() {
}
fun test2() {
val a: (@extension Function2<*, *, *>).(@extension Function2<*, *, *>)->Unit = {}
val b: (@extension Function2<*, *, *>).(@extension Function2<*, *, *>)->Unit = {"$this $it"}
val c: (@extension Function2<*, *, *>).(@extension Function2<*, *, *>)->Unit = {}
val a: (@Extension Function2<*, *, *>).(@Extension Function2<*, *, *>)->Unit = {}
val b: (@Extension Function2<*, *, *>).(@Extension Function2<*, *, *>)->Unit = {"$this $it"}
val c: (@Extension Function2<*, *, *>).(@Extension Function2<*, *, *>)->Unit = {}
a.b(c)
a b c
}
compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.kt
Vendored
+3 -3
View File
@@ -6,8 +6,8 @@ fun foo(a: (String) -> Unit) {
interface A : (String) -> Unit {}
fun foo(a: @extension A) {
// @extension annotation on an unrelated type shouldn't have any effect on this diagnostic.
// Only kotlin.Function{n} type annotated with @extension should
fun foo(a: @Extension A) {
// @Extension annotation on an unrelated type shouldn't have any effect on this diagnostic.
// Only kotlin.Function{n} type annotated with @Extension should
"".<!FREE_FUNCTION_CALLED_AS_EXTENSION!>a<!>()
}
compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
package
internal fun foo(/*0*/ a: (kotlin.String) -> kotlin.Unit): kotlin.Unit
internal fun foo(/*0*/ a: @[kotlin.extension()] A): kotlin.Unit
internal fun foo(/*0*/ a: @[kotlin.Extension()] A): kotlin.Unit
internal interface A : (kotlin.String) -> kotlin.Unit {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/annotations/extensionFunctionType.kt
Vendored
+2 -2
View File
@@ -4,7 +4,7 @@ annotation class ann
interface Some {
fun f1(): String.() -> Int
fun f2(): @extension String.() -> Int
fun f2(): @Extension String.() -> Int
fun f3(): @ann String.() -> Int
fun f4(): @extension @ann String.() -> Int
fun f4(): @Extension @ann String.() -> Int
}
compiler/testData/diagnostics/tests/annotations/extensionFunctionType.txt
Vendored
+2 -2
View File
@@ -3,9 +3,9 @@ package
internal interface Some {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun f1(): kotlin.String.() -> kotlin.Int
internal abstract fun f2(): @[kotlin.extension()] kotlin.String.() -> kotlin.Int
internal abstract fun f2(): @[kotlin.Extension()] kotlin.String.() -> kotlin.Int
internal abstract fun f3(): @[ann()] kotlin.String.() -> kotlin.Int
internal abstract fun f4(): @[kotlin.extension() ann()] kotlin.String.() -> kotlin.Int
internal abstract fun f4(): @[kotlin.Extension() ann()] kotlin.String.() -> kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.kt
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ fun <T, U, V> Function2<T, U, V>.get(index : Int) {
}
fun <T, U, V, W> @extension Function3<T, U, V, W>.get(index : Int) {
fun <T, U, V, W> @Extension Function3<T, U, V, W>.get(index : Int) {
}
compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.kt
Vendored
+3 -3
View File
@@ -12,14 +12,14 @@ inline fun <T, U> Function1<T, U>.plusAssign(p: Function1<T, U>) {
<!USAGE_IS_NOT_INLINABLE!>p<!> -= <!USAGE_IS_NOT_INLINABLE!>this<!>
}
fun <T, U, V> @extension Function2<T, U, V>.minusAssign(ext : @extension Function2<T, U, V>) {}
fun <T, U, V> @Extension Function2<T, U, V>.minusAssign(ext : @Extension Function2<T, U, V>) {}
inline fun <T, U, V> @extension Function2<T, U, V>.modAssign(ext : @extension Function2<T, U, V>) = {
inline fun <T, U, V> @Extension Function2<T, U, V>.modAssign(ext : @Extension Function2<T, U, V>) = {
this += ext
ext += this
}
inline fun <T, U, V> @extension Function2<T, U, V>.plusAssign(ext : @extension Function2<T, U, V>) {
inline fun <T, U, V> @Extension Function2<T, U, V>.plusAssign(ext : @Extension Function2<T, U, V>) {
<!USAGE_IS_NOT_INLINABLE!>this<!> -= <!USAGE_IS_NOT_INLINABLE!>ext<!>
<!USAGE_IS_NOT_INLINABLE!>ext<!> -= <!USAGE_IS_NOT_INLINABLE!>this<!>
}
compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.kt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ inline fun <T, U, V> inlineFunWithInvoke(s: (p: T) -> U) {
//noinline
fun <T, U, V> Function2<T, U, V>.compareTo(index : Function2<T, U, V>) = 1
fun <T, U, V, W> @extension Function3<T, U, V, W>.compareTo(index : @extension Function3<T, U, V, W>) = 1
fun <T, U, V, W> @Extension Function3<T, U, V, W>.compareTo(index : @Extension Function3<T, U, V, W>) = 1
inline fun <T, U, V, W> inlineFunWithInvoke(s: (p: T, l: U) -> V, ext: T.(p: U, l: V) -> W) {
<!USAGE_IS_NOT_INLINABLE!>s<!> < <!USAGE_IS_NOT_INLINABLE!>s<!>
compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.kt
Vendored
+2 -2
View File
@@ -9,8 +9,8 @@ inline fun <T, U, V> inlineFunWithInvoke(s: (p: T) -> U) {
fun <T, U, V> Function2<T, U, V>.component1() = 1
fun <T, U, V> Function2<T, U, V>.component2() = 2
fun <T, U, V, W> @extension Function3<T, U, V, W>.component1() = 1
fun <T, U, V, W> @extension Function3<T, U, V, W>.component2() = 2
fun <T, U, V, W> @Extension Function3<T, U, V, W>.component1() = 1
fun <T, U, V, W> @Extension Function3<T, U, V, W>.component2() = 2
inline fun <T, U, V, W> inlineFunWithInvoke(s: (p: T, l: U) -> V, ext: T.(p: U, l: V) -> W) {
val (d1, e1) = <!USAGE_IS_NOT_INLINABLE, USAGE_IS_NOT_INLINABLE!>s<!>
compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.kt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ inline fun <T, U, V> inlineFunWithInvoke(s: (p: T) -> U) {
fun <T, U, V> Function2<T, U, V>.contains(p: Function2<T, U, V>): Boolean = false
fun <T, U, V, W> @extension Function3<T, U, V, W>.contains(ext: @extension Function3<T, U, V, W>): Boolean = false
fun <T, U, V, W> @Extension Function3<T, U, V, W>.contains(ext: @Extension Function3<T, U, V, W>): Boolean = false
inline fun <T, U, V> inlineFunWithInvoke(s: (p: T, l: U) -> U, ext: T.(p: U, l: U) -> V) {
<!USAGE_IS_NOT_INLINABLE!>s<!> in <!USAGE_IS_NOT_INLINABLE!>s<!>
compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.kt
Vendored
+3 -3
View File
@@ -3,7 +3,7 @@ fun <T, U> Function1<T, U>.minus(p: Function1<T, U>) {
}
fun <T, U, V> @extension Function2<T, U, V>.minus(p: T.(p: U) -> V) {
fun <T, U, V> @Extension Function2<T, U, V>.minus(p: T.(p: U) -> V) {
}
@@ -11,7 +11,7 @@ inline fun <T, U> Function1<T, U>.plus(p: Function1<T, U>) {
<!USAGE_IS_NOT_INLINABLE!>this<!> - <!USAGE_IS_NOT_INLINABLE!>p<!>
}
inline fun <T, U, V> @extension Function2<T, U, V>.plus(p: T.(p: U) -> V) {
inline fun <T, U, V> @Extension Function2<T, U, V>.plus(p: T.(p: U) -> V) {
<!USAGE_IS_NOT_INLINABLE!>this<!> - <!USAGE_IS_NOT_INLINABLE!>p<!>
}
@@ -29,6 +29,6 @@ inline fun <T, U> Function1<T, U>.submit() {
this + this
}
inline fun <T, U, V> @extension Function2<T, U, V>.submit() {
inline fun <T, U, V> @Extension Function2<T, U, V>.submit() {
this + this
}
compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.kt
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ fun <T, U, V> Function2<T, U, V>.rangeTo(p: Function2<T, U, V>): Range<Int> {
return 1..2
}
fun <T, U, V, W> @extension Function3<T, U, V, W>.rangeTo(ext: @extension Function3<T, U, V, W>): Range<Int> {
fun <T, U, V, W> @Extension Function3<T, U, V, W>.rangeTo(ext: @Extension Function3<T, U, V, W>): Range<Int> {
return 1..2
}
compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.kt
Vendored
+4 -4
View File
@@ -5,10 +5,10 @@ fun <T, V> Function1<T, V>.minus() = this
inline fun <T, V> Function1<T, V>.inc() = <!USAGE_IS_NOT_INLINABLE!>this<!>
fun <T, V> Function1<T, V>.dec() = this
inline fun <T, V> @extension Function2<T, T, V>.plus(){}
fun <T, V> @extension Function2<T, T, V>.minus(){}
inline fun <T, V> @extension Function2<T, T, V>.inc() = <!USAGE_IS_NOT_INLINABLE!>this<!>
fun <T, V> @extension Function2<T, T, V>.dec() = this
inline fun <T, V> @Extension Function2<T, T, V>.plus(){}
fun <T, V> @Extension Function2<T, T, V>.minus(){}
inline fun <T, V> @Extension Function2<T, T, V>.inc() = <!USAGE_IS_NOT_INLINABLE!>this<!>
fun <T, V> @Extension Function2<T, T, V>.dec() = this
inline fun <T, V> inlineFunWithInvoke(s: (p: T) -> V, ext: T.(p: T) -> V) {
+s
compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.kt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ fun <T, U, V> Function2<T, U, V>.not() : Boolean {
return !this
}
fun <T, U, V, W> @extension Function3<T, U, V, W>.not() : Boolean {
fun <T, U, V, W> @Extension Function3<T, U, V, W>.not() : Boolean {
return !this
}
compiler/testData/renderer/FunctionTypes.kt
Vendored
+3 -3
View File
@@ -5,18 +5,18 @@ var v4: Function1<Int, String>
var v4: (() -> Int, (String) -> Unit) -> String
var v5: Int.() -> Int
var v6 : Int.(String, Int) -> Unit
var v7 : @extension Function2<Int, String, Boolean>
var v7 : @Extension Function2<Int, String, Boolean>
class F: Function0<Unit>
var v8: F
class EF: @extension Function1<String, Unit>
class EF: @Extension Function1<String, Unit>
var v9: EF
class GF<T>: Function0<T>
var v10: GF<Any>
class GEF<A, B>: @extension Function1<A, B>
class GEF<A, B>: @Extension Function1<A, B>
var v11: GEF<Any, Any>
var v12: (() -> Unit).() -> Unit
compiler/testData/resolvedCalls/functionTypes/invokeForExtensionFunctionType.txt
Vendored
+1 -1
View File
@@ -8,5 +8,5 @@ Resolved call:
Resulting descriptor: fun Int.invoke(): Unit defined in kotlin.Function1
Explicit receiver kind = BOTH_RECEIVERS
Dispatch receiver = f {[kotlin.extension] Function1<Int, Unit>}
Dispatch receiver = f {[kotlin.Extension] Function1<Int, Unit>}
Extension receiver = 1 {Int}
compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionTypeInvoke.txt
Vendored
+1 -1
View File
@@ -12,5 +12,5 @@ Resolved call:
Resulting descriptor: fun Int.invoke(): Unit defined in kotlin.Function1
Explicit receiver kind = BOTH_RECEIVERS
Dispatch receiver = foo {[kotlin.extension] Function1<Int, Unit>}
Dispatch receiver = foo {[kotlin.Extension] Function1<Int, Unit>}
Extension receiver = 1 {Int}