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

drop deprecated syntax for anonymous initializer blocks

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-04-24 18:37:27 +02:00
parent 35e82d4574
commit 98b8784ab0
52 changed files with 61 additions and 816 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
+1 -1
View File
@@ -32,7 +32,7 @@ fun main(args : Array<String>) {
<!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>foo1<!>()(<!UNRESOLVED_REFERENCE!>a<!>)
foo2()({})
foo2()<!TOO_MANY_ARGUMENTS, DANGLING_FUNCTION_LITERAL_ARGUMENT_SUSPECTED!>{}<!>
foo2()<!TOO_MANY_ARGUMENTS!>{}<!>
(foo2()){}
(foo2()){<!EXPECTED_PARAMETERS_NUMBER_MISMATCH, CANNOT_INFER_PARAMETER_TYPE!>x<!> -> }
foo2()({<!EXPECTED_PARAMETERS_NUMBER_MISMATCH, CANNOT_INFER_PARAMETER_TYPE!>x<!> -> })
compiler/testData/diagnostics/tests/Varargs.kt
+2 -2
View File
@@ -12,6 +12,6 @@ fun test() {
v1({}, {})
v1({}, <!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>, {})
v1({}, {}, {<!UNUSED_EXPRESSION!>it<!>})
v1({}) <!VARARG_OUTSIDE_PARENTHESES, DANGLING_FUNCTION_LITERAL_ARGUMENT_SUSPECTED!>{}<!>
v1 <!VARARG_OUTSIDE_PARENTHESES, DANGLING_FUNCTION_LITERAL_ARGUMENT_SUSPECTED!>{}<!>
v1({}) <!VARARG_OUTSIDE_PARENTHESES!>{}<!>
v1 <!VARARG_OUTSIDE_PARENTHESES!>{}<!>
}
compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.kt
+1 -1
View File
@@ -10,7 +10,7 @@ fun test() {
bar(<!UNRESOLVED_REFERENCE, TOO_MANY_ARGUMENTS!>xx<!>)
bar <!TOO_MANY_ARGUMENTS, DANGLING_FUNCTION_LITERAL_ARGUMENT_SUSPECTED!>{ }<!>
bar <!TOO_MANY_ARGUMENTS!>{ }<!>
foo(<!TYPE_MISMATCH!>""<!>, <!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>, <!UNRESOLVED_REFERENCE, TOO_MANY_ARGUMENTS!>xx<!>)
compiler/testData/diagnostics/tests/functionLiterals/DanglingFunctionLiteral.kt
-28
View File
@@ -1,28 +0,0 @@
class Foo() {
private val builder = StringBuilder("sdfsd")
init {
}
}
class Foo1() {
private val builder = <!NONE_APPLICABLE!>StringBuilder<!>("sdfsd")
<!DANGLING_FUNCTION_LITERAL_ARGUMENT_SUSPECTED!>{
}<!>
}
fun foo() = {
<!NONE_APPLICABLE!>println<!>(1)
<!DANGLING_FUNCTION_LITERAL_ARGUMENT_SUSPECTED!>{}<!>
}
fun foo1() = {
println(1);
{}
}
fun println(<!UNUSED_PARAMETER!>i<!> : Int) {}
fun println(<!UNUSED_PARAMETER!>s<!> : Byte) {}
fun println() {}
compiler/testData/diagnostics/tests/functionLiterals/DanglingFunctionLiteral.txt
-26
View File
@@ -1,26 +0,0 @@
package
internal fun foo(): () -> ???
internal fun foo1(): () -> () -> kotlin.Unit
internal fun println(): kotlin.Unit
internal fun println(/*0*/ s: kotlin.Byte): kotlin.Unit
internal fun println(/*0*/ i: kotlin.Int): kotlin.Unit
internal final class Foo {
public constructor Foo()
private final val builder: java.lang.StringBuilder
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
}
internal final class Foo1 {
public constructor Foo1()
private final val builder: [ERROR : Type for StringBuilder("sdfsd")
{
}]
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/tests/functionLiterals/NoDanglingFunctionLiteralForNestedCalls.kt
-11
View File
@@ -1,11 +0,0 @@
package baz
fun test() {
<!NONE_APPLICABLE!>foo<!>(1) <!DANGLING_FUNCTION_LITERAL_ARGUMENT_SUSPECTED!>{}<!>
foo( <!NONE_APPLICABLE!>foo<!>(1) {} ) //here
}
fun foo(<!UNUSED_PARAMETER!>i<!>: Int) {}
fun foo() : (i : () -> Unit) -> Unit = {}
compiler/testData/diagnostics/tests/functionLiterals/NoDanglingFunctionLiteralForNestedCalls.txt
-7
View File
@@ -1,7 +0,0 @@
package
package baz {
internal fun foo(): (() -> kotlin.Unit) -> kotlin.Unit
internal fun foo(/*0*/ i: kotlin.Int): kotlin.Unit
internal fun test(): kotlin.Unit
}
compiler/testData/diagnostics/tests/regressions/kt1736.kt
+1 -1
View File
@@ -7,4 +7,4 @@ object Obj {
}
}
val x = Obj.method<!TOO_MANY_ARGUMENTS, DANGLING_FUNCTION_LITERAL_ARGUMENT_SUSPECTED!>{ -> }<!>
val x = Obj.method<!TOO_MANY_ARGUMENTS!>{ -> }<!>
compiler/testData/diagnostics/tests/secondaryConstructors/expectedInitKeywordOnInitializer.kt
-10
View File
@@ -1,10 +0,0 @@
class A {
val x: Int
val y: Int
<!INIT_KEYWORD_BEFORE_CLASS_INITIALIZER_EXPECTED!>{<!>
x = 1
}
init {
y = 1
}
}
compiler/testData/diagnostics/tests/secondaryConstructors/expectedInitKeywordOnInitializer.txt
-10
View File
@@ -1,10 +0,0 @@
package
internal final class A {
public constructor A()
internal final val x: kotlin.Int
internal final val y: kotlin.Int
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
}