Merge remote-tracking branch 'origin/master'

This commit is contained in:
svtk
2011-11-28 13:15:35 +04:00
173 changed files with 1110 additions and 696 deletions
+10 -7
View File
@@ -13,15 +13,18 @@ fun foo() : Int {
1 + <error>a</error> => 1
in 1..<error>a</error> => 1
!in 1..<error>a</error> => 1
.<error>a</error> => 1
.equals(1).<error>a</error> => 1
<warning>?.</warning>equals(1) => 1
// Commented for KT-621 .<!error>a</!error> => 1
// Commented for KT-621 .equals(1).<!error>a</!error> => 1
// Commented for KT-621 <!warning>?.</!warning>equals(1) => 1
else => 1
}
return when (<warning>x</warning>?:null) {
<error>.</error>foo() => 1
?.equals(1).equals(2) => 1
}
// Commented for KT-621
// return when (<!warning>x</!warning>?:null) {
// <!error>.</!error>foo() => 1
// ?.equals(1).equals(2) => 1
// }
return 0
}
val _type_test : Int = foo() // this is needed to ensure the inferred return type of foo()
@@ -1,7 +0,0 @@
// "Replace with dot call" "true"
fun foo(a: Any) {
when (a) {
<caret>?.equals(0) => true
else => false
}
}