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

[NI] Update annotation used in testdata

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-05-21 13:28:41 +03:00
parent e9ef6dbc28
commit 82ce2e7b7c
16 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.fir.kt
Vendored
+5 -5
View File
@@ -2,18 +2,18 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
// ISSUE: KT-11265
// FILE: FactoryPattern.kt
// FILE: OverloadResolutionByLambdaReturnType.kt
package annotations
package kotlin
annotation class FactoryPattern
annotation class OverloadResolutionByLambdaReturnType
// FILE: main.kt
import annotations.FactoryPattern
import kotlin.OverloadResolutionByLambdaReturnType
@kotlin.jvm.JvmName("myFlatMapIterable")
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun <T, R> Sequence<T>.myFlatMap(transform: (T) -> Iterable<R>): Sequence<R> {
TODO()
}
compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.kt
Vendored
+5 -5
View File
@@ -2,18 +2,18 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
// ISSUE: KT-11265
// FILE: FactoryPattern.kt
// FILE: OverloadResolutionByLambdaReturnType.kt
package annotations
package kotlin
annotation class FactoryPattern
annotation class OverloadResolutionByLambdaReturnType
// FILE: main.kt
import annotations.FactoryPattern
import kotlin.OverloadResolutionByLambdaReturnType
@kotlin.jvm.JvmName("myFlatMapIterable")
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun <T, R> Sequence<T>.myFlatMap(transform: (T) -> Iterable<R>): Sequence<R> {
TODO()
}
compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.txt
Vendored
+4 -4
View File
@@ -2,7 +2,7 @@ package
public fun </*0*/ K : kotlin.Any> elvis(/*0*/ x: K?, /*1*/ y: K): K
public fun test(/*0*/ a: A): kotlin.Unit
@kotlin.jvm.JvmName(name = "myFlatMapIterable") @annotations.FactoryPattern public fun </*0*/ T, /*1*/ R> kotlin.sequences.Sequence<T>.myFlatMap(/*0*/ transform: (T) -> kotlin.collections.Iterable<R>): kotlin.sequences.Sequence<R>
@kotlin.jvm.JvmName(name = "myFlatMapIterable") @kotlin.OverloadResolutionByLambdaReturnType public fun </*0*/ T, /*1*/ R> kotlin.sequences.Sequence<T>.myFlatMap(/*0*/ transform: (T) -> kotlin.collections.Iterable<R>): kotlin.sequences.Sequence<R>
public fun </*0*/ T, /*1*/ R> kotlin.sequences.Sequence<T>.myFlatMap(/*0*/ transform: (T) -> kotlin.sequences.Sequence<R>): kotlin.sequences.Sequence<R>
public interface A {
@@ -25,10 +25,10 @@ public interface C {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
package annotations {
package kotlin {
public final annotation class FactoryPattern : kotlin.Annotation {
public constructor FactoryPattern()
public final annotation class OverloadResolutionByLambdaReturnType : kotlin.Annotation {
public constructor OverloadResolutionByLambdaReturnType()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.fir.kt
Vendored
+6 -6
View File
@@ -2,22 +2,22 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION -EXPERIMENTAL_API_USAGE -EXPERIMENTAL_UNSIGNED_LITERALS
// ISSUE: KT-11265
// FILE: FactoryPattern.kt
// FILE: OverloadResolutionByLambdaReturnType.kt
package annotations
package kotlin
annotation class FactoryPattern
annotation class OverloadResolutionByLambdaReturnType
// FILE: main.kt
import annotations.FactoryPattern
import kotlin.OverloadResolutionByLambdaReturnType
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun <R> UByteArray.fooMap(t: (UByte) -> Iterable<R>): List<R> {
TODO("ub.fm")
}
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun <T, R> Iterable<T>.fooMap(t: (T) -> Iterable<R>): List<R> {
TODO("i.fm(i)")
}
compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.kt
Vendored
+6 -6
View File
@@ -2,22 +2,22 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION -EXPERIMENTAL_API_USAGE -EXPERIMENTAL_UNSIGNED_LITERALS
// ISSUE: KT-11265
// FILE: FactoryPattern.kt
// FILE: OverloadResolutionByLambdaReturnType.kt
package annotations
package kotlin
annotation class FactoryPattern
annotation class OverloadResolutionByLambdaReturnType
// FILE: main.kt
import annotations.FactoryPattern
import kotlin.OverloadResolutionByLambdaReturnType
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun <R> UByteArray.fooMap(t: (UByte) -> Iterable<R>): List<R> {
TODO("ub.fm")
}
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun <T, R> Iterable<T>.fooMap(t: (T) -> Iterable<R>): List<R> {
TODO("i.fm(i)")
}
compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.txt
Vendored
+5 -5
View File
@@ -2,14 +2,14 @@ package
public fun takeUByteList(/*0*/ list: kotlin.collections.List<kotlin.UByte>): kotlin.Unit
public fun test(): kotlin.Unit
@annotations.FactoryPattern public fun </*0*/ R> kotlin.UByteArray.fooMap(/*0*/ t: (kotlin.UByte) -> kotlin.collections.Iterable<R>): kotlin.collections.List<R>
@annotations.FactoryPattern public fun </*0*/ T, /*1*/ R> kotlin.collections.Iterable<T>.fooMap(/*0*/ t: (T) -> kotlin.collections.Iterable<R>): kotlin.collections.List<R>
@kotlin.OverloadResolutionByLambdaReturnType public fun </*0*/ R> kotlin.UByteArray.fooMap(/*0*/ t: (kotlin.UByte) -> kotlin.collections.Iterable<R>): kotlin.collections.List<R>
@kotlin.OverloadResolutionByLambdaReturnType public fun </*0*/ T, /*1*/ R> kotlin.collections.Iterable<T>.fooMap(/*0*/ t: (T) -> kotlin.collections.Iterable<R>): kotlin.collections.List<R>
@kotlin.jvm.JvmName(name = "fooMapSeq") public fun </*0*/ T, /*1*/ R> kotlin.collections.Iterable<T>.fooMap(/*0*/ t: (T) -> kotlin.sequences.Sequence<R>): kotlin.collections.List<R>
package annotations {
package kotlin {
public final annotation class FactoryPattern : kotlin.Annotation {
public constructor FactoryPattern()
public final annotation class OverloadResolutionByLambdaReturnType : kotlin.Annotation {
public constructor OverloadResolutionByLambdaReturnType()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.fir.kt
Vendored
+7 -7
View File
@@ -2,21 +2,21 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION -EXPERIMENTAL_API_USAGE -EXPERIMENTAL_UNSIGNED_LITERALS
// ISSUE: KT-11265
// FILE: FactoryPattern.kt
// FILE: OverloadResolutionByLambdaReturnType.kt
package annotations
package kotlin
annotation class FactoryPattern
annotation class OverloadResolutionByLambdaReturnType
// FILE: main.kt
import annotations.FactoryPattern
import kotlin.OverloadResolutionByLambdaReturnType
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun <T, R : Comparable<R>> Iterable<T>.myMaxOf(selector: (T) -> R): R = TODO()
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun <T> Iterable<T>.myMaxOf(selector: (T) -> Double): Double = TODO()
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun <T> Iterable<T>.myMaxOf(selector: (T) -> Float): Float = TODO()
fun Double.pow(v: Int): Double = this
compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.kt
Vendored
+7 -7
View File
@@ -2,21 +2,21 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION -EXPERIMENTAL_API_USAGE -EXPERIMENTAL_UNSIGNED_LITERALS
// ISSUE: KT-11265
// FILE: FactoryPattern.kt
// FILE: OverloadResolutionByLambdaReturnType.kt
package annotations
package kotlin
annotation class FactoryPattern
annotation class OverloadResolutionByLambdaReturnType
// FILE: main.kt
import annotations.FactoryPattern
import kotlin.OverloadResolutionByLambdaReturnType
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun <T, R : Comparable<R>> Iterable<T>.myMaxOf(selector: (T) -> R): R = TODO()
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun <T> Iterable<T>.myMaxOf(selector: (T) -> Double): Double = TODO()
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun <T> Iterable<T>.myMaxOf(selector: (T) -> Float): Float = TODO()
fun Double.pow(v: Int): Double = this
compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.txt
Vendored
+6 -6
View File
@@ -2,15 +2,15 @@ package
public fun takeDouble(/*0*/ value: kotlin.Double): kotlin.Unit
public fun test(): kotlin.Unit
@annotations.FactoryPattern public fun </*0*/ T, /*1*/ R : kotlin.Comparable<R>> kotlin.collections.Iterable<T>.myMaxOf(/*0*/ selector: (T) -> R): R
@annotations.FactoryPattern public fun </*0*/ T> kotlin.collections.Iterable<T>.myMaxOf(/*0*/ selector: (T) -> kotlin.Double): kotlin.Double
@annotations.FactoryPattern public fun </*0*/ T> kotlin.collections.Iterable<T>.myMaxOf(/*0*/ selector: (T) -> kotlin.Float): kotlin.Float
@kotlin.OverloadResolutionByLambdaReturnType public fun </*0*/ T, /*1*/ R : kotlin.Comparable<R>> kotlin.collections.Iterable<T>.myMaxOf(/*0*/ selector: (T) -> R): R
@kotlin.OverloadResolutionByLambdaReturnType public fun </*0*/ T> kotlin.collections.Iterable<T>.myMaxOf(/*0*/ selector: (T) -> kotlin.Double): kotlin.Double
@kotlin.OverloadResolutionByLambdaReturnType public fun </*0*/ T> kotlin.collections.Iterable<T>.myMaxOf(/*0*/ selector: (T) -> kotlin.Float): kotlin.Float
public fun kotlin.Double.pow(/*0*/ v: kotlin.Int): kotlin.Double
package annotations {
package kotlin {
public final annotation class FactoryPattern : kotlin.Annotation {
public constructor FactoryPattern()
public final annotation class OverloadResolutionByLambdaReturnType : kotlin.Annotation {
public constructor OverloadResolutionByLambdaReturnType()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.fir.kt
Vendored
+7 -7
View File
@@ -2,17 +2,17 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
// ISSUE: KT-11265
// FILE: FactoryPattern.kt
// FILE: OverloadResolutionByLambdaReturnType.kt
package annotations
package kotlin
annotation class FactoryPattern
annotation class OverloadResolutionByLambdaReturnType
// FILE: main.kt
import annotations.FactoryPattern
import kotlin.OverloadResolutionByLambdaReturnType
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun create(f: (Int) -> Int): Int = 1
fun create(f: (Int) -> String): String = ""
@@ -33,7 +33,7 @@ fun test_3() {
val x = <!AMBIGUITY!>create<!> { 1.0 }
}
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun <K> create(x: K, f: (K) -> Int): Int = 1
fun <T> create(x: T, f: (T) -> String): String = ""
@@ -45,4 +45,4 @@ fun test_4() {
fun test_5() {
val x = <!AMBIGUITY!>create<!>("") { 1 }
takeInt(x)
}
}
compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.kt
Vendored
+6 -6
View File
@@ -2,17 +2,17 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
// ISSUE: KT-11265
// FILE: FactoryPattern.kt
// FILE: OverloadResolutionByLambdaReturnType.kt
package annotations
package kotlin
annotation class FactoryPattern
annotation class OverloadResolutionByLambdaReturnType
// FILE: main.kt
import annotations.FactoryPattern
import kotlin.OverloadResolutionByLambdaReturnType
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun create(f: (Int) -> Int): Int = 1
fun create(f: (Int) -> String): String = ""
@@ -33,7 +33,7 @@ fun test_3() {
val x = <!OVERLOAD_RESOLUTION_AMBIGUITY!>create<!> { 1.0 }
}
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun <K> create(x: K, f: (K) -> Int): Int = 1
fun <T> create(x: T, f: (T) -> String): String = ""
compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.txt
Vendored
+5 -5
View File
@@ -1,8 +1,8 @@
package
@annotations.FactoryPattern public fun create(/*0*/ f: (kotlin.Int) -> kotlin.Int): kotlin.Int
@kotlin.OverloadResolutionByLambdaReturnType public fun create(/*0*/ f: (kotlin.Int) -> kotlin.Int): kotlin.Int
public fun create(/*0*/ f: (kotlin.Int) -> kotlin.String): kotlin.String
@annotations.FactoryPattern public fun </*0*/ K> create(/*0*/ x: K, /*1*/ f: (K) -> kotlin.Int): kotlin.Int
@kotlin.OverloadResolutionByLambdaReturnType public fun </*0*/ K> create(/*0*/ x: K, /*1*/ f: (K) -> kotlin.Int): kotlin.Int
public fun </*0*/ T> create(/*0*/ x: T, /*1*/ f: (T) -> kotlin.String): kotlin.String
public fun takeInt(/*0*/ s: kotlin.Int): kotlin.Unit
public fun takeString(/*0*/ s: kotlin.String): kotlin.Unit
@@ -12,10 +12,10 @@ public fun test_3(): kotlin.Unit
public fun test_4(): kotlin.Unit
public fun test_5(): kotlin.Unit
package annotations {
package kotlin {
public final annotation class FactoryPattern : kotlin.Annotation {
public constructor FactoryPattern()
public final annotation class OverloadResolutionByLambdaReturnType : kotlin.Annotation {
public constructor OverloadResolutionByLambdaReturnType()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.fir.kt
Vendored
+7 -7
View File
@@ -2,17 +2,17 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
// ISSUE: KT-11265
// FILE: FactoryPattern.kt
// FILE: OverloadResolutionByLambdaReturnType.kt
package annotations
package kotlin
annotation class FactoryPattern
annotation class OverloadResolutionByLambdaReturnType
// FILE: main.kt
import annotations.FactoryPattern
import kotlin.OverloadResolutionByLambdaReturnType
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun create(f: (Int) -> Int): Int = 1
fun create(f: (Int) -> String): String = ""
@@ -33,7 +33,7 @@ fun test_3() {
val x = <!AMBIGUITY!>create<!> { 1.0 }
}
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun <K> create(x: K, f: (K) -> Int): Int = 1
fun <T> create(x: T, f: (T) -> String): String = ""
@@ -45,4 +45,4 @@ fun test_4() {
fun test_5() {
val x = <!AMBIGUITY!>create<!>("") { 1 }
takeInt(x)
}
}
compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.kt
Vendored
+7 -7
View File
@@ -2,17 +2,17 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
// ISSUE: KT-11265
// FILE: FactoryPattern.kt
// FILE: OverloadResolutionByLambdaReturnType.kt
package annotations
package kotlin
annotation class FactoryPattern
annotation class OverloadResolutionByLambdaReturnType
// FILE: main.kt
import annotations.FactoryPattern
import kotlin.OverloadResolutionByLambdaReturnType
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun create(f: (Int) -> Int): Int = 1
fun create(f: (Int) -> String): String = ""
@@ -30,10 +30,10 @@ fun test_2() {
}
fun test_3() {
val x = create { <!CONSTANT_EXPECTED_TYPE_MISMATCH, CONSTANT_EXPECTED_TYPE_MISMATCH!>1.0<!> }
val x = create <!TYPE_MISMATCH!>{ <!CONSTANT_EXPECTED_TYPE_MISMATCH!>1.0<!> }<!>
}
@FactoryPattern
@OverloadResolutionByLambdaReturnType
fun <K> create(x: K, f: (K) -> Int): Int = 1
fun <T> create(x: T, f: (T) -> String): String = ""
compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.txt
Vendored
+5 -5
View File
@@ -1,8 +1,8 @@
package
@annotations.FactoryPattern public fun create(/*0*/ f: (kotlin.Int) -> kotlin.Int): kotlin.Int
@kotlin.OverloadResolutionByLambdaReturnType public fun create(/*0*/ f: (kotlin.Int) -> kotlin.Int): kotlin.Int
public fun create(/*0*/ f: (kotlin.Int) -> kotlin.String): kotlin.String
@annotations.FactoryPattern public fun </*0*/ K> create(/*0*/ x: K, /*1*/ f: (K) -> kotlin.Int): kotlin.Int
@kotlin.OverloadResolutionByLambdaReturnType public fun </*0*/ K> create(/*0*/ x: K, /*1*/ f: (K) -> kotlin.Int): kotlin.Int
public fun </*0*/ T> create(/*0*/ x: T, /*1*/ f: (T) -> kotlin.String): kotlin.String
public fun takeInt(/*0*/ s: kotlin.Int): kotlin.Unit
public fun takeString(/*0*/ s: kotlin.String): kotlin.Unit
@@ -12,10 +12,10 @@ public fun test_3(): kotlin.Unit
public fun test_4(): kotlin.Unit
public fun test_5(): kotlin.Unit
package annotations {
package kotlin {
public final annotation class FactoryPattern : kotlin.Annotation {
public constructor FactoryPattern()
public final annotation class OverloadResolutionByLambdaReturnType : kotlin.Annotation {
public constructor OverloadResolutionByLambdaReturnType()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled_no_annotation.fir.kt
Vendored
+1 -1
View File
@@ -33,4 +33,4 @@ fun test_4() {
fun test_5() {
val x = <!AMBIGUITY!>create<!>("") { 1 }
takeInt(x)
}
}