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

Adjust testData to new labels syntax

Browse Source
This commit is contained in:
Denis Zharkov
2015-04-27 14:39:46 +03:00
parent 5977302465
commit 44a55e5bf6
191 changed files with 747 additions and 747 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/testData/keywords/BreakContinue.kt
+3 -3
View File
@@ -1,9 +1,9 @@
fun foo() {
@myFor
myFor@
for (i in 1..10) {
@myWhile
myWhile@
while (x()) {
@myDo
myDo@
do {
<caret>
} while (y())
idea/idea-completion/testData/keywords/BreakWithLabel.kt
+3 -3
View File
@@ -1,9 +1,9 @@
fun foo() {
@myFor
myFor@
for (i in 1..10) {
@myWhile
myWhile@
while (x()) {
@myDo
myDo@
do {
break@<caret>
} while (y())
idea/idea-completion/testData/keywords/ContinueWithLabel.kt
+3 -3
View File
@@ -1,9 +1,9 @@
fun foo() {
@myFor
myFor@
for (i in 1..10) {
@myWhile
myWhile@
while (x()) {
@myDo
myDo@
do {
continue@<caret>
} while (y())
idea/idea-completion/testData/keywords/LabeledLambdaThis.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun foo(): String.() -> Unit {
return (@label {
return (label@ {
f {
<caret>
}
idea/idea-completion/testData/keywords/NoBreak1.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun foo() {
@myFor
myFor@
for (i in 1..10) {
while (x()) {
fun localFun(a: Int) {
idea/idea-completion/testData/keywords/NoBreak2.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun foo() {
@myFor
myFor@
for (i in 1..10) {
while (x()) {
"abc".filter {
idea/idea-completion/testData/keywords/NoContinue.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun foo() {
@myFor
myFor@
for (i in 1..10) {
while (x()) {
fun localFun(a: Int) {
idea/idea-completion/testData/keywords/Return4.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun foo() {
takeHandler @label {
takeHandler label@ {
<caret>
}
}
idea/idea-completion/testData/keywords/Return5.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun foo() {
takeHandler @label {
takeHandler label@ {
<caret>
}
}
idea/testData/checker/BreakContinue.kt
+4 -4
View File
@@ -1,8 +1,8 @@
class C {
fun f (<warning>a</warning> : Boolean, <warning>b</warning> : Boolean) {
@b (<error descr="[EXPRESSION_EXPECTED] While is not an expression, and only expressions are allowed here">while (true)
@a {
b@ (<error descr="[EXPRESSION_EXPECTED] While is not an expression, and only expressions are allowed here">while (true)
a@ {
<error>break@f</error>
break
break@b
@@ -11,8 +11,8 @@ class C {
<error>continue</error>
@b (<error descr="[EXPRESSION_EXPECTED] While is not an expression, and only expressions are allowed here">while (true)
@a {
b@ (<error descr="[EXPRESSION_EXPECTED] While is not an expression, and only expressions are allowed here">while (true)
a@ {
<error>continue@f</error>
continue
continue@b
idea/testData/checker/FunctionReturnTypes.kt
+1 -1
View File
@@ -6,7 +6,7 @@ fun unitEmptyReturn() : Unit {return}
fun unitIntReturn() : Unit {return <error>1</error>}
fun unitUnitReturn() : Unit {return Unit}
fun test1() : Any = { <error>return</error> }
fun test2() : Any = @a {return@a 1}
fun test2() : Any = a@ {return@a 1}
fun test3() : Any { <error>return</error> }
fun bbb() {
idea/testData/checker/QualifiedThisInClosures.kt
+3 -3
View File
@@ -8,9 +8,9 @@
fun Char.xx() : Double.() -> Unit {
this : Char
val <warning>a</warning>: Double.() -> Unit = { this : Double + this@xx : Char}
val <warning>b</warning>: Double.() -> Unit = @a{this@a : Double + this@xx : Char}
val <warning>c</warning> = @a{<error>this@a</error> <error>+</error> this@xx : Char}
return (@a{this@a : Double + this@xx : Char})
val <warning>b</warning>: Double.() -> Unit = a@{this@a : Double + this@xx : Char}
val <warning>c</warning> = a@{<error>this@a</error> <error>+</error> this@xx : Char}
return (a@{this@a : Double + this@xx : Char})
}
}
}
idea/testData/expressionSelection/labelledStatement.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun f() {
@loop while (true) {
loop@ while (true) {
break@lo<selection>o</selection>p
}
}
idea/testData/formatter/ReturnExpression.after.kt
+1 -1
View File
@@ -23,7 +23,7 @@ fun test4(): Int {
fun test5(): Int {
return synchronized(this) {(): Int ->
return@synchronized 12
return @synchronized 12
}
}
idea/testData/intentions/moveLambdaInsideParentheses/moveLabeledLambda1.kt
+1 -1
View File
@@ -1,6 +1,6 @@
// IS_APPLICABLE: true
fun foo() {
bar(2) <caret>@l{ it * 3 }
bar(2) <caret>l@{ it * 3 }
}
fun bar(a: Int, b: (Int) -> Int) {
idea/testData/intentions/moveLambdaInsideParentheses/moveLabeledLambda1.kt.after
+1 -1
View File
@@ -1,6 +1,6 @@
// IS_APPLICABLE: true
fun foo() {
bar(2, @l{ it * 3 })
bar(2, l@{ it * 3 })
}
fun bar(a: Int, b: (Int) -> Int) {
idea/testData/intentions/moveLambdaInsideParentheses/moveLabeledLambda2.kt
+1 -1
View File
@@ -1,6 +1,6 @@
// IS_APPLICABLE: true
fun foo() {
bar <caret>@l{ it * 3 }
bar <caret>l@{ it * 3 }
}
fun bar(b: (Int) -> Int) {
idea/testData/intentions/moveLambdaInsideParentheses/moveLabeledLambda2.kt.after
+1 -1
View File
@@ -1,6 +1,6 @@
// IS_APPLICABLE: true
fun foo() {
bar(@l{ it * 3 })
bar(l@{ it * 3 })
}
fun bar(b: (Int) -> Int) {
idea/testData/intentions/moveLambdaOutsideParentheses/labeledLambda.kt
+1 -1
View File
@@ -1,6 +1,6 @@
// IS_APPLICABLE: true
fun foo() {
bar<caret>(2, @l{ it })
bar<caret>(2, l@{ it })
}
fun bar(a: Int, b: (Int) -> Int) {
idea/testData/intentions/moveLambdaOutsideParentheses/labeledLambda.kt.after
+1 -1
View File
@@ -1,6 +1,6 @@
// IS_APPLICABLE: true
fun foo() {
bar(2) @l{ it }
bar(2) l@{ it }
}
fun bar(a: Int, b: (Int) -> Int) {
idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses2.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// IS_APPLICABLE: false
fun foo() : Any {
return <caret>(@a{})
return <caret>(a@{})
}
idea/testData/quickfix/migration/lambdaSyntax/afterLambdaInsideLambda.kt
+1 -1
View File
@@ -4,7 +4,7 @@ class A
fun foo(a: Any) {}
val a = foo @a {
val a = foo a@ {
val a = fun (): Int = 1
}
idea/testData/quickfix/migration/lambdaSyntax/beforeLabelInLiteralArgument.kt
+1 -1
View File
@@ -4,7 +4,7 @@ class A
fun foo(a: Int.(String) -> A) {}
val a = foo @a { <caret>Int.(a: String): A ->
val a = foo a@ { <caret>Int.(a: String): A ->
A()
A()
}
idea/testData/quickfix/migration/lambdaSyntax/beforeLabelInLiteralArgumentImplicitReceiverType.kt
+1 -1
View File
@@ -4,7 +4,7 @@ class A
fun foo(a: Int.(String) -> A) {}
val a = foo @a { <caret>(a: String): A ->
val a = foo a@ { <caret>(a: String): A ->
A()
A()
}
idea/testData/quickfix/migration/lambdaSyntax/beforeLabelInLiteralArgumentImplicitReturnType.kt
+1 -1
View File
@@ -4,7 +4,7 @@ class A
fun foo(a: Int.(String) -> A) {}
val a = foo @a { <caret>Int.(a: String) ->
val a = foo a@ { <caret>Int.(a: String) ->
A()
A()
}
idea/testData/quickfix/migration/lambdaSyntax/beforeLabelInLiteralArgumentOneStatement.kt
+1 -1
View File
@@ -4,6 +4,6 @@ class A
fun foo(a: Any) {}
val a = foo @a { <caret>Int.(a: String): A ->
val a = foo a@ { <caret>Int.(a: String): A ->
A()
}
idea/testData/quickfix/migration/lambdaSyntax/beforeLambdaInsideLambda.kt
+1 -1
View File
@@ -4,7 +4,7 @@ class A
fun foo(a: Any) {}
val a = foo @a {
val a = foo a@ {
val a = { <caret>(): Int -> 1 }
}
idea/testData/quickfix/migration/lambdaSyntax/lambdaSyntaxMultiple.after.data.Sample.kt
+1 -1
View File
@@ -1,6 +1,6 @@
val h = { -> }
val l = @bar (fun Int.bar() {
val l = bar@ (fun Int.bar() {
})
val s = (fun (): Int = 5)()
idea/testData/quickfix/migration/lambdaSyntax/lambdaSyntaxMultiple.before.data.Sample.kt
+1 -1
View File
@@ -1,5 +1,5 @@
val h = { () -> }
val l = @bar { Int.() -> }
val l = bar@ { Int.() -> }
val s = {(): Int -> 5}()
idea/testData/quickfix/suppress/forStatement/afterLabeled.kt
+1 -1
View File
@@ -2,5 +2,5 @@
fun foo() {
[suppress("UNNECESSARY_NOT_NULL_ASSERTION")]
@label""<caret>!!
label@""<caret>!!
}
idea/testData/quickfix/suppress/forStatement/beforeLabeled.kt
+1 -1
View File
@@ -1,5 +1,5 @@
// "Suppress 'UNNECESSARY_NOT_NULL_ASSERTION' for statement " "true"
fun foo() {
@label""<caret>!!
label@""<caret>!!
}
idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakContinueAndDefault.kt
+2 -2
View File
@@ -5,8 +5,8 @@
// SIBLING:
fun foo(a: Int) {
val b: Int = 1
@loop1 for (p in 1..b) {
@loop2 for (n in 1..b) {
loop1@ for (p in 1..b) {
loop2@ for (n in 1..b) {
<selection>if (a > 0) throw Exception("")
if (a + b > 0) break@loop2
if (a - b > 0) continue@loop1</selection>
idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakContinueAndDefault.kt.after
+2 -2
View File
@@ -5,8 +5,8 @@
// SIBLING:
fun foo(a: Int) {
val b: Int = 1
@loop1 for (p in 1..b) {
@loop2 for (n in 1..b) {
loop1@ for (p in 1..b) {
loop2@ for (n in 1..b) {
if (b(a, b)) break@loop2
}
}
idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/multipleBreaks.kt
+2 -2
View File
@@ -1,8 +1,8 @@
// SIBLING:
fun foo(a: Int) {
val b: Int = 1
@loop1 for (p in 1..b) {
@loop2 for (n in 1..b) {
loop1@ for (p in 1..b) {
loop2@ for (n in 1..b) {
<selection>if (a > 0) throw Exception("")
if (a + b > 0) break@loop1
println(a - b)
idea/testData/resolve/partialBodyResolve/LabeledBreak.dump
+1 -1
View File
@@ -1,7 +1,7 @@
Resolve target: val x: kotlin.Any?
----------------------------------------------
fun foo() {
@MainLoop
MainLoop@
for (i in 1..10) {
val x = take()
if (x == null) {
idea/testData/resolve/partialBodyResolve/LabeledBreak.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun foo() {
@MainLoop
MainLoop@
for (i in 1..10) {
val x = take()
if (x == null) {
idea/testData/resolve/partialBodyResolve/LabeledContinue.dump
+1 -1
View File
@@ -1,7 +1,7 @@
Resolve target: val x: kotlin.Any?
----------------------------------------------
fun foo() {
@MainLoop
MainLoop@
for (i in 1..10) {
val x = take()
if (x == null) {
idea/testData/resolve/partialBodyResolve/LabeledContinue.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun foo() {
@MainLoop
MainLoop@
for (i in 1..10) {
val x = take()
if (x == null) {
idea/testData/resolve/references/invoke/lambdaNoParLabel.kt
+1 -1
View File
@@ -3,7 +3,7 @@ class Foo {
}
fun test(f: Foo) {
f @f <caret>{}
f f@ <caret>{}
}
// REF: (in Foo).invoke(Any)
idea/testData/smartSelection/labelledStatement.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun f() {
@loop while (true) {
loop@ while (true) {
break@lo<caret>op
}
}
idea/testData/unifier/equivalence/controlStructures/break.kt
+3 -3
View File
@@ -1,13 +1,13 @@
fun foo(a: Int) {
@A
A@
while (true) {
@B
B@
while (true) {
if (a > 0) break@A
if (a < 0) <selection>break@B</selection>
}
@B
B@
while (true) {
if (a > 0) break@A
if (a < 0) break@B
idea/testData/unifier/equivalence/controlStructures/continue.kt
+3 -3
View File
@@ -1,13 +1,13 @@
fun foo(a: Int) {
@A
A@
while (true) {
@B
B@
while (true) {
if (a > 0) <selection>continue@A</selection>
if (a < 0) continue@B
}
@B
B@
while (true) {
if (a > 0) continue@A
if (a < 0) continue@B