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

Corrected test data

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-09-15 22:24:52 +03:00
parent 073845ebd4
commit 7f0063013c
23 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/FunctionParameterWithoutType.txt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
package
public val bar: (a: ???) -> kotlin.Unit
public val la: (a: ???) -> kotlin.Unit
public val bar: (???) -> kotlin.Unit
public val la: (???) -> kotlin.Unit
public val las: (a: kotlin.Int) -> kotlin.Unit
public fun test(/*0*/ a: [ERROR : Type annotation was missing for parameter a]): kotlin.Unit
compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public val a: (x: ???) -> ???
public val a: (???) -> ???
public val b: (kotlin.Int) -> kotlin.Int
public val c: (kotlin.Int, kotlin.String) -> kotlin.Int
public val d: (kotlin.Int, kotlin.String) -> kotlin.Int
compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public /*synthesized*/ fun </*0*/ T : kotlin.CharSequence!> Predicate(/*0*/ function: (t: @kotlin.ParameterName(name = "t") T) -> kotlin.Boolean): Predicate<T>
public /*synthesized*/ fun </*0*/ T : kotlin.CharSequence!> Predicate(/*0*/ function: (t: T) -> kotlin.Boolean): Predicate<T>
public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
public fun process(/*0*/ x: Predicate<kotlin.String>): kotlin.Unit
compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.txt
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
package
public final class A : (categoryName: [ERROR : No type element]) -> [ERROR : No type element] {
public final class A : ([ERROR : No type element]) -> [ERROR : No type element] {
public constructor A()
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 abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ categoryName: [ERROR : No type element]): [ERROR : No type element]
public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: [ERROR : No type element]): [ERROR : No type element]
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.txt
Vendored
+2 -2
View File
@@ -2,11 +2,11 @@ package
package typeReferenceError {
public final class Pair : (c: [ERROR : No type element]) -> [ERROR : main] {
public final class Pair : ([ERROR : No type element]) -> [ERROR : main] {
public constructor Pair()
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 abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ c: [ERROR : No type element]): [ERROR : main]
public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: [ERROR : No type element]): [ERROR : main]
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
compiler/testData/diagnostics/tests/j+k/computeIfAbsentConcurrent.txt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
package
public /*synthesized*/ fun </*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> ConcMap(/*0*/ function: (key: @kotlin.ParameterName(name = "key") K!, MyFunc<in K!, out V!>!) -> V!): ConcMap<K, V>
public /*synthesized*/ fun </*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> MyFunc(/*0*/ function: (String: @kotlin.ParameterName(name = "String") K!) -> V!): MyFunc<K, V>
public /*synthesized*/ fun </*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> ConcMap(/*0*/ function: (key: K!, mappingFunction: MyFunc<in K!, out V!>!) -> V!): ConcMap<K, V>
public /*synthesized*/ fun </*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> MyFunc(/*0*/ function: (String: K!) -> V!): MyFunc<K, V>
public fun concurrentMap(): kotlin.Unit
public open class ConcHashMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> : ConcMap<K!, V!> {
compiler/testData/diagnostics/tests/j+k/overrideWithSamAndTypeParameter.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public /*synthesized*/ fun </*0*/ K : kotlin.Any!> A(/*0*/ function: (key: @kotlin.ParameterName(name = "key") K!, MyFunc!) -> K!): A<K>
public /*synthesized*/ fun </*0*/ K : kotlin.Any!> A(/*0*/ function: (key: K!, f: MyFunc!) -> K!): A<K>
public /*synthesized*/ fun MyFunc(/*0*/ function: (x: kotlin.String!) -> kotlin.String!): MyFunc
public fun main(): kotlin.Unit
compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInReturnType.txt
Vendored
+3 -3
View File
@@ -1,6 +1,6 @@
package
public /*synthesized*/ fun </*0*/ E : kotlin.Any!> EventListener(/*0*/ function: (kotlin.String!) -> E!): EventListener<E>
public /*synthesized*/ fun </*0*/ E : kotlin.Any!> EventListener(/*0*/ function: (x: kotlin.String!) -> E!): EventListener<E>
public fun main(): kotlin.Unit
public open class A {
@@ -11,9 +11,9 @@ public open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun bar(/*0*/ l: ((kotlin.String!) -> kotlin.Any!)!): kotlin.Unit
public final /*synthesized*/ fun bar(/*0*/ l: ((x: kotlin.String!) -> kotlin.Any!)!): kotlin.Unit
public open fun bar(/*0*/ l: EventListener<*>!): kotlin.Unit
public final /*synthesized*/ fun baz(/*0*/ l: ((kotlin.String!) -> kotlin.CharSequence!)!): kotlin.Unit
public final /*synthesized*/ fun baz(/*0*/ l: ((x: kotlin.String!) -> kotlin.CharSequence!)!): kotlin.Unit
public open fun baz(/*0*/ l: EventListener<out kotlin.CharSequence!>!): kotlin.Unit
}
compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInValueParameter.txt
Vendored
+3 -3
View File
@@ -1,6 +1,6 @@
package
public /*synthesized*/ fun </*0*/ E : kotlin.Any!> EventListener(/*0*/ function: (e: @kotlin.ParameterName(name = "e") E!) -> kotlin.Unit): EventListener<E>
public /*synthesized*/ fun </*0*/ E : kotlin.Any!> EventListener(/*0*/ function: (e: E!) -> kotlin.Unit): EventListener<E>
public fun main(): kotlin.Unit
public open class A {
@@ -11,9 +11,9 @@ public open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun bar(/*0*/ l: ((e: @kotlin.ParameterName(name = "e") kotlin.Any!) -> kotlin.Unit)!): kotlin.Unit
public final /*synthesized*/ fun bar(/*0*/ l: ((e: kotlin.Any!) -> kotlin.Unit)!): kotlin.Unit
public open fun bar(/*0*/ l: EventListener<*>!): kotlin.Unit
public final /*synthesized*/ fun baz(/*0*/ l: ((e: @kotlin.ParameterName(name = "e") kotlin.CharSequence!) -> kotlin.Unit)!): kotlin.Unit
public final /*synthesized*/ fun baz(/*0*/ l: ((e: kotlin.CharSequence!) -> kotlin.Unit)!): kotlin.Unit
public open fun baz(/*0*/ l: EventListener<out kotlin.CharSequence!>!): kotlin.Unit
}
compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericSuperWildcard.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
package
public /*synthesized*/ fun </*0*/ E : kotlin.Any!> EventListener(/*0*/ function: (e: @kotlin.ParameterName(name = "e") E!) -> kotlin.Unit): EventListener<E>
public /*synthesized*/ fun </*0*/ E : kotlin.Any!> EventListener(/*0*/ function: (e: E!) -> kotlin.Unit): EventListener<E>
public fun main(): kotlin.Unit
public open class A {
@@ -11,7 +11,7 @@ public open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun bar(/*0*/ l: ((e: @kotlin.ParameterName(name = "e") kotlin.String!) -> kotlin.Unit)!): kotlin.Unit
public final /*synthesized*/ fun bar(/*0*/ l: ((e: kotlin.String!) -> kotlin.Unit)!): kotlin.Unit
public open fun bar(/*0*/ l: EventListener<in kotlin.String!>!): kotlin.Unit
}
compiler/testData/diagnostics/tests/j+k/samByProjectedType/noAdapterBecuaseOfRecursiveUpperBound.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public /*synthesized*/ fun </*0*/ E : kotlin.CharSequence!, /*1*/ F : kotlin.collections.(Mutable)Map<kotlin.String!, E!>!> Function(/*0*/ function: (f: @kotlin.ParameterName(name = "f") F!) -> E!): Function<E, F>
public /*synthesized*/ fun </*0*/ E : kotlin.CharSequence!, /*1*/ F : kotlin.collections.(Mutable)Map<kotlin.String!, E!>!> Function(/*0*/ function: (f: F!) -> E!): Function<E, F>
public fun main(): kotlin.Unit
public open class A {
compiler/testData/diagnostics/tests/j+k/samByProjectedType/starProjectionComplexUpperBound.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
package
public /*synthesized*/ fun </*0*/ E : kotlin.collections.(Mutable)Map<kotlin.String!, kotlin.Int!>!, /*1*/ F : kotlin.CharSequence!> Function(/*0*/ function: (e: @kotlin.ParameterName(name = "e") E!) -> F!): Function<E, F>
public /*synthesized*/ fun </*0*/ E : kotlin.collections.(Mutable)Map<kotlin.String!, kotlin.Int!>!, /*1*/ F : kotlin.CharSequence!> Function(/*0*/ function: (e: E!) -> F!): Function<E, F>
public fun main(): kotlin.Unit
public open class A {
@@ -11,7 +11,7 @@ public open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun bar(/*0*/ l: ((e: (@kotlin.ParameterName(name = "e") kotlin.collections.MutableMap<kotlin.String!, kotlin.Int!>..@kotlin.ParameterName(name = "e") kotlin.collections.Map<kotlin.String!, kotlin.Int!>?)) -> kotlin.CharSequence!)!): kotlin.Unit
public final /*synthesized*/ fun bar(/*0*/ l: ((e: kotlin.collections.(Mutable)Map<kotlin.String!, kotlin.Int!>!) -> kotlin.CharSequence!)!): kotlin.Unit
public open fun bar(/*0*/ l: Function<*, *>!): kotlin.Unit
}
compiler/testData/diagnostics/tests/platformTypes/noAnnotationInClassPath.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
package
public /*synthesized*/ fun </*0*/ T : kotlin.Any!> A(/*0*/ function: (y: @kotlin.ParameterName(name = "y") T?) -> kotlin.Boolean): A<T>
public /*synthesized*/ fun </*0*/ T : kotlin.Any!> A(/*0*/ function: (y: T?) -> kotlin.Boolean): A<T>
public fun test(): kotlin.Unit
public interface A</*0*/ T : kotlin.Any!> {
@@ -17,6 +17,6 @@ public open class B {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun bar(/*0*/ y: ((y: @kotlin.ParameterName(name = "y") kotlin.String?) -> kotlin.Boolean)!): kotlin.Unit
public final /*synthesized*/ fun bar(/*0*/ y: ((y: kotlin.String?) -> kotlin.Boolean)!): kotlin.Unit
public open fun bar(/*0*/ y: A<kotlin.String!>!): kotlin.Unit
}
compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/enhancementFromAnnotation.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public /*synthesized*/ fun </*0*/ T : kotlin.Any!> A(/*0*/ function: (x: @kotlin.ParameterName(name = "x") T) -> kotlin.Unit): A<T>
public /*synthesized*/ fun </*0*/ T : kotlin.Any!> A(/*0*/ function: (x: T) -> kotlin.Unit): A<T>
public fun test(): kotlin.Unit
public interface A</*0*/ T : kotlin.Any!> {
compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public /*synthesized*/ fun </*0*/ T : kotlin.Any!> A(/*0*/ function: (t: @kotlin.ParameterName(name = "t") T!) -> kotlin.Boolean): A<T>
public /*synthesized*/ fun </*0*/ T : kotlin.Any!> A(/*0*/ function: (t: T!) -> kotlin.Boolean): A<T>
public fun main(): kotlin.Unit
public interface A</*0*/ T : kotlin.Any!> {
compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public /*synthesized*/ fun </*0*/ T : kotlin.Any!> A(/*0*/ function: (x: @kotlin.ParameterName(name = "x") T, y: @kotlin.ParameterName(name = "y") T?) -> kotlin.Unit): A<T>
public /*synthesized*/ fun </*0*/ T : kotlin.Any!> A(/*0*/ function: (x: T, y: T?) -> kotlin.Unit): A<T>
public /*synthesized*/ fun B1(/*0*/ function: (x: kotlin.String, y: kotlin.String?) -> kotlin.Unit): B1
public /*synthesized*/ fun B2(/*0*/ function: (x: kotlin.String, y: kotlin.String?) -> kotlin.Unit): B2
public /*synthesized*/ fun B3(/*0*/ function: (x: kotlin.String!, y: kotlin.String!) -> kotlin.Unit): B3
compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.txt
Vendored
+1 -1
View File
@@ -17,5 +17,5 @@ public open class JavaClass</*0*/ T : kotlin.Any!> {
}
// Static members
public final /*synthesized*/ fun </*0*/ X : kotlin.Any!> Inner(/*0*/ function: (t: T!, x: @kotlin.ParameterName(name = "x") X!, java.lang.Runnable!) -> T!): JavaClass.Inner<X>
public final /*synthesized*/ fun </*0*/ X : kotlin.Any!> Inner(/*0*/ function: (t: T!, x: X!, runnable: java.lang.Runnable!) -> T!): JavaClass.Inner<X>
}
compiler/testData/diagnostics/tests/typealias/typeAliasNotNull.txt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
package
public fun x(/*0*/ handler: Handler /* = (kotlin.String) -> Processor? /* = ((kotlin.Int) -> kotlin.Unit)? */ */): kotlin.Unit
public fun x(/*0*/ handler: Handler /* = (kotlin.String) -> Processor? /* = ((number: kotlin.Int) -> kotlin.Unit)? */ */): kotlin.Unit
public typealias Handler = (kotlin.String) -> Processor?
public typealias Processor = (kotlin.Int) -> kotlin.Unit
public typealias Processor = (number: kotlin.Int) -> kotlin.Unit
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after
Vendored
+1 -1
View File
@@ -15,4 +15,4 @@ fun foo(n: Int): Int {
return bar()
}
private fun i(baz: (Int) -> Int, n: Int) = baz(n + 1)
private fun i(baz: (m: Int) -> Int, n: Int) = baz(n + 1)
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after
Vendored
+1 -1
View File
@@ -9,4 +9,4 @@ fun foo(n: Int): Int {
return i(Int::bar, n)
}
private fun i(bar: Int.(Int) -> Int, n: Int) = n.bar(n + 1)
private fun i(bar: Int.(m: Int) -> Int, n: Int) = n.bar(n + 1)
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after
Vendored
+1 -1
View File
@@ -12,4 +12,4 @@ fun foo(n: Int): Int {
return i(Int::bar1, Int::bar2, n)
}
private fun i(bar1: Int.(Int) -> Int, bar2: Int.(Int) -> Int, n: Int) = n.bar1(n + 1).bar2(n + 2)
private fun i(bar1: Int.(m: Int) -> Int, bar2: Int.(m: Int) -> Int, n: Int) = n.bar1(n + 1).bar2(n + 2)
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after
Vendored
+1 -1
View File
@@ -9,4 +9,4 @@ fun foo(n: Int): Int {
return i(Int::bar, n)
}
private fun i(bar: Int.(Int) -> Int, n: Int) = n bar (n + 1)
private fun i(bar: Int.(m: Int) -> Int, n: Int) = n bar (n + 1)
idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after
Vendored
+1 -1
View File
@@ -9,4 +9,4 @@ fun foo(n: Int): Int {
return i(::bar, n)
}
private fun i(bar: (Int) -> Int, n: Int) = bar(n + 1)
private fun i(bar: (m: Int) -> Int, n: Int) = bar(n + 1)