Replace "jet" package name with "kotlin" in testData

This commit is contained in:
Alexander Udalov
2014-02-21 23:29:57 +04:00
parent f2b4c7fa3e
commit f7b6457139
763 changed files with 2314 additions and 2310 deletions
@@ -1,4 +1,4 @@
// "Add '<*>'" "true"
public fun foo(a: Any) {
a is jet.List<*>
a is kotlin.List<*>
}
@@ -1,4 +1,4 @@
// "Add '<*, *>'" "true"
public fun foo(a: Any) {
a is jet.Map<*, *>
a is kotlin.Map<*, *>
}
@@ -1,4 +1,4 @@
// "Add '<*>'" "true"
public fun foo(a: Any) {
a is jet.List<caret>
a is kotlin.List<caret>
}
@@ -1,4 +1,4 @@
// "Add '<*, *>'" "true"
public fun foo(a: Any) {
a is jet.Map<caret>
a is kotlin.Map<caret>
}
@@ -1,7 +1,7 @@
// "Add '<*>'" "true"
public fun foo(a: Any) {
when (a) {
is jet.List<*> -> {}
is kotlin.List<*> -> {}
else -> {}
}
}
@@ -1,7 +1,7 @@
// "Add '<*, *>'" "true"
public fun foo(a: Any) {
when (a) {
is jet.Map<*, *> -> {}
is kotlin.Map<*, *> -> {}
else -> {}
}
}
@@ -1,7 +1,7 @@
// "Add '<*>'" "true"
public fun foo(a: Any) {
when (a) {
is jet.List<caret> -> {}
is kotlin.List<caret> -> {}
else -> {}
}
}
@@ -1,7 +1,7 @@
// "Add '<*, *>'" "true"
public fun foo(a: Any) {
when (a) {
is jet.Map<caret> -> {}
is kotlin.Map<caret> -> {}
else -> {}
}
}
@@ -1,5 +1,5 @@
// "Import" "true"
// ERROR: <html>Unresolved reference. <br/> None of the following candidates is applicable because of receiver type mismatch: <ul><li><b>internal</b> <b>fun</b> jet.String.minus(str: jet.String): jet.String <i>defined in</i> h</li><li><b>internal</b> <b>fun</b> jet.String.minus(i: java.lang.Integer): jet.String <i>defined in</i> h</li></ul></html>
// ERROR: <html>Unresolved reference. <br/> None of the following candidates is applicable because of receiver type mismatch: <ul><li><b>internal</b> <b>fun</b> kotlin.String.minus(str: kotlin.String): kotlin.String <i>defined in</i> h</li><li><b>internal</b> <b>fun</b> kotlin.String.minus(i: java.lang.Integer): kotlin.String <i>defined in</i> h</li></ul></html>
package h
@@ -1,5 +1,5 @@
// "Import" "true"
// ERROR: <html>Unresolved reference. <br/> None of the following candidates is applicable because of receiver type mismatch: <ul><li><b>internal</b> <b>fun</b> jet.String.minus(str: jet.String): jet.String <i>defined in</i> h</li><li><b>internal</b> <b>fun</b> jet.String.minus(i: java.lang.Integer): jet.String <i>defined in</i> h</li></ul></html>
// ERROR: <html>Unresolved reference. <br/> None of the following candidates is applicable because of receiver type mismatch: <ul><li><b>internal</b> <b>fun</b> kotlin.String.minus(str: kotlin.String): kotlin.String <i>defined in</i> h</li><li><b>internal</b> <b>fun</b> kotlin.String.minus(i: java.lang.Integer): kotlin.String <i>defined in</i> h</li></ul></html>
package h
@@ -1,5 +1,5 @@
// "Import" "true"
// ERROR: <html>Unresolved reference. <br/> None of the following candidates is applicable because of receiver type mismatch: <ul><li><b>public</b> <b>fun</b> jet.String?.plus(other: jet.Any?): jet.String <i>defined in</i> jet</li></ul></html>
// ERROR: <html>Unresolved reference. <br/> None of the following candidates is applicable because of receiver type mismatch: <ul><li><b>public</b> <b>fun</b> kotlin.String?.plus(other: kotlin.Any?): kotlin.String <i>defined in</i> kotlin</li></ul></html>
package h
@@ -1,5 +1,5 @@
// "Import" "true"
// ERROR: <html>Unresolved reference. <br/> None of the following candidates is applicable because of receiver type mismatch: <ul><li><b>public</b> <b>fun</b> jet.String?.plus(other: jet.Any?): jet.String <i>defined in</i> jet</li></ul></html>
// ERROR: <html>Unresolved reference. <br/> None of the following candidates is applicable because of receiver type mismatch: <ul><li><b>public</b> <b>fun</b> kotlin.String?.plus(other: kotlin.Any?): kotlin.String <i>defined in</i> kotlin</li></ul></html>
package h
@@ -1,5 +1,5 @@
// "Import" "true"
// ERROR: <html>Unresolved reference. <br/> None of the following candidates is applicable because of receiver type mismatch: <ul><li><b>internal</b> <b>fun</b> h.A.plus(): jet.Int <i>defined in</i> h</li><li><b>public</b> <b>fun</b> jet.String?.plus(other: jet.Any?): jet.String <i>defined in</i> jet</li></ul></html>
// ERROR: <html>Unresolved reference. <br/> None of the following candidates is applicable because of receiver type mismatch: <ul><li><b>internal</b> <b>fun</b> h.A.plus(): kotlin.Int <i>defined in</i> h</li><li><b>public</b> <b>fun</b> kotlin.String?.plus(other: kotlin.Any?): kotlin.String <i>defined in</i> kotlin</li></ul></html>
package h
@@ -1,5 +1,5 @@
// "Import" "true"
// ERROR: <html>Unresolved reference. <br/> None of the following candidates is applicable because of receiver type mismatch: <ul><li><b>internal</b> <b>fun</b> h.A.plus(): jet.Int <i>defined in</i> h</li><li><b>public</b> <b>fun</b> jet.String?.plus(other: jet.Any?): jet.String <i>defined in</i> jet</li></ul></html>
// ERROR: <html>Unresolved reference. <br/> None of the following candidates is applicable because of receiver type mismatch: <ul><li><b>internal</b> <b>fun</b> h.A.plus(): kotlin.Int <i>defined in</i> h</li><li><b>public</b> <b>fun</b> kotlin.String?.plus(other: kotlin.Any?): kotlin.String <i>defined in</i> kotlin</li></ul></html>
package h
@@ -1,5 +1,5 @@
// "class org.jetbrains.jet.plugin.quickfix.AddFunctionParametersFix" "false"
//ERROR: Too many arguments for internal final fun component1(): jet.Int defined in Data
//ERROR: Too many arguments for internal final fun component1(): kotlin.Int defined in Data
data class Data(val i: Int) {}
@@ -1,5 +1,5 @@
// "class org.jetbrains.jet.plugin.quickfix.AddFunctionParametersFix" "false"
// ERROR: Too many arguments for public open fun equals(other: jet.Any?): jet.Boolean defined in jet.Any
// ERROR: Too many arguments for public open fun equals(other: kotlin.Any?): kotlin.Boolean defined in kotlin.Any
fun f(d: Any) {
d.equals("a", <caret>"b")
@@ -1,5 +1,5 @@
// "class org.jetbrains.jet.plugin.quickfix.AddFunctionParametersFix" "false"
// ERROR: Too many arguments for public open fun equals(other: jet.Any?): jet.Boolean defined in java.lang.Object
// ERROR: Too many arguments for public open fun equals(other: kotlin.Any?): kotlin.Boolean defined in java.lang.Object
fun f(d: java.lang.Object) {
d.equals("a", <caret>"b")
@@ -1,5 +1,5 @@
// "class org.jetbrains.jet.plugin.quickfix.AddFunctionParametersFix" "false"
//ERROR: Too many arguments for internal final fun component1(): jet.Int defined in Data
//ERROR: Too many arguments for internal final fun component1(): kotlin.Int defined in Data
data class Data(val i: Int) {}
@@ -1,5 +1,5 @@
// "Change function signature..." "true"
// ERROR: <html>Class 'B' must be declared abstract or implement abstract member<br/><b>internal</b> <b>abstract</b> <b>fun</b> f(a: jet.String): jet.Unit <i>defined in</i> A</html>
// ERROR: <html>Class 'B' must be declared abstract or implement abstract member<br/><b>internal</b> <b>abstract</b> <b>fun</b> f(a: kotlin.String): kotlin.Unit <i>defined in</i> A</html>
trait A {
fun f(a: Int)
fun f(a: String)
@@ -1,5 +1,5 @@
// "Change function signature to 'override fun f(a: Int): Int'" "true"
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>jet.Int</td></tr><tr><td>Found:</td><td>jet.String</td></tr></table></html>
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Int</td></tr><tr><td>Found:</td><td>kotlin.String</td></tr></table></html>
open class A {
open fun f(a: Int): Int = 0
}
@@ -1,5 +1,5 @@
// "Change function signature..." "true"
// ERROR: <html>Class 'B' must be declared abstract or implement abstract member<br/><b>internal</b> <b>abstract</b> <b>fun</b> f(a: jet.String): jet.Unit <i>defined in</i> A</html>
// ERROR: <html>Class 'B' must be declared abstract or implement abstract member<br/><b>internal</b> <b>abstract</b> <b>fun</b> f(a: kotlin.String): kotlin.Unit <i>defined in</i> A</html>
trait A {
fun f(a: Int)
fun f(a: String)
@@ -1,5 +1,5 @@
// "Change function signature to 'override fun f(a: Int): Int'" "true"
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>jet.Int</td></tr><tr><td>Found:</td><td>jet.String</td></tr></table></html>
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Int</td></tr><tr><td>Found:</td><td>kotlin.String</td></tr></table></html>
open class A {
open fun f(a: Int): Int = 0
}
@@ -1,5 +1,5 @@
// "Change 'prop' type to 'Int'" "true"
// ERROR: Null can not be a value of a non-null type jet.Int
// ERROR: Null can not be a value of a non-null type kotlin.Int
trait Test<T> {
val prop : T
}
@@ -1,6 +1,6 @@
// "Change 'A.x' type to '(Int) -> Int'" "false"
// ACTION: Change 'C.x' type to '(String) -> Int'
// ERROR: <html>Return type is '(jet.Int) &rarr; jet.Int', which is not a subtype of overridden<br/><b>internal</b> <b>abstract</b> <b>val</b> x: (jet.String) &rarr; jet.Int <i>defined in</i> A</html>
// ERROR: <html>Return type is '(kotlin.Int) &rarr; kotlin.Int', which is not a subtype of overridden<br/><b>internal</b> <b>abstract</b> <b>val</b> x: (kotlin.String) &rarr; kotlin.Int <i>defined in</i> A</html>
trait A {
val x: (String) -> Int
}
@@ -1,5 +1,5 @@
// "class org.jetbrains.jet.plugin.quickfix.ChangeVariableTypeFix" "false"
// ERROR: <html>Var-property type is 'jet.String', which is not a type of overridden<br/><b>internal</b> <b>abstract</b> <b>var</b> x: jet.Int <i>defined in</i> A</html>
// ERROR: <html>Var-property type is 'kotlin.String', which is not a type of overridden<br/><b>internal</b> <b>abstract</b> <b>var</b> x: kotlin.Int <i>defined in</i> A</html>
trait A {
var x: Int
}
@@ -1,5 +1,5 @@
// "class org.jetbrains.jet.plugin.quickfix.ChangeVariableTypeFix" "false"
// ERROR: <html>Var-property type is 'jet.Int', which is not a type of overridden<br/><b>internal</b> <b>abstract</b> <b>var</b> x: jet.String <i>defined in</i> A</html>
// ERROR: <html>Var-property type is 'kotlin.Int', which is not a type of overridden<br/><b>internal</b> <b>abstract</b> <b>var</b> x: kotlin.String <i>defined in</i> A</html>
trait A {
var x: String
}
@@ -1,5 +1,5 @@
// "class org.jetbrains.jet.plugin.quickfix.ChangeFunctionReturnTypeFix" "false"
// ERROR: <html>Return type is 'jet.Long', which is not a subtype of overridden<br/><b>internal</b> <b>abstract</b> <b>fun</b> foo(): jet.Int <i>defined in</i> A</html>
// ERROR: <html>Return type is 'kotlin.Long', which is not a subtype of overridden<br/><b>internal</b> <b>abstract</b> <b>fun</b> foo(): kotlin.Int <i>defined in</i> A</html>
trait A {
fun foo(): Int
}
@@ -1,5 +1,5 @@
// "Change 'prop' type to 'Int'" "true"
// ERROR: Null can not be a value of a non-null type jet.Int
// ERROR: Null can not be a value of a non-null type kotlin.Int
trait Test<T> {
val prop : T
}
@@ -1,7 +1,7 @@
// "Change 'B.foo' function return type to 'Int'" "false"
// "Change 'B.foo' function return type to 'Long'" "false"
// "Remove explicitly specified return type" "false"
// ERROR: <html>Return type is 'jet.String', which is not a subtype of overridden<br/><b>internal</b> <b>abstract</b> <b>fun</b> foo(): jet.Int <i>defined in</i> A</html>
// ERROR: <html>Return type is 'kotlin.String', which is not a subtype of overridden<br/><b>internal</b> <b>abstract</b> <b>fun</b> foo(): kotlin.Int <i>defined in</i> A</html>
abstract class A {
abstract fun foo() : Int;
}
@@ -1,4 +1,4 @@
// "Change all usages of 'java.lang.Comparable<T>' in this file to 'jet.Comparable<T>'" "true"
// "Change all usages of 'java.lang.Comparable<T>' in this file to 'kotlin.Comparable<T>'" "true"
import java.lang.*
import java.lang
import java.lang as jl
@@ -1,4 +1,4 @@
// "Change all usages of 'java.lang.Comparable<T>' in this file to 'jet.Comparable<T>'" "true"
// "Change all usages of 'java.lang.Comparable<T>' in this file to 'kotlin.Comparable<T>'" "true"
import java.lang.*
import java.lang
import java.lang as jl
@@ -1,4 +1,4 @@
// "Change all usages of 'java.lang.Comparable<T>' in this file to 'jet.Comparable<T>'" "true"
// "Change all usages of 'java.lang.Comparable<T>' in this file to 'kotlin.Comparable<T>'" "true"
import java.lang.*
import java.lang
import java.lang as jl
@@ -1,4 +1,4 @@
// "Change all usages of 'java.lang.Comparable<T>' in this file to 'jet.Comparable<T>'" "true"
// "Change all usages of 'java.lang.Comparable<T>' in this file to 'kotlin.Comparable<T>'" "true"
import java.lang.*
import java.lang.Comparable
import java.lang.Comparable
@@ -1,4 +1,4 @@
// "Change all usages of 'java.lang.Comparable<T>' in this file to 'jet.Comparable<T>'" "true"
// "Change all usages of 'java.lang.Comparable<T>' in this file to 'kotlin.Comparable<T>'" "true"
import java.lang.*
import java.lang.Comparable
import java.lang.Comparable
@@ -1,4 +1,4 @@
// "Change all usages of 'java.lang.Comparable<T>' in this file to 'jet.Comparable<T>'" "true"
// "Change all usages of 'java.lang.Comparable<T>' in this file to 'kotlin.Comparable<T>'" "true"
import java.lang.*
import java.lang.Comparable
import java.lang.Comparable
@@ -1,6 +1,6 @@
// "Suppress 'REDUNDANT_NULLABLE' for fun foo" "true"
// ERROR: An integer literal does not conform to the expected type jet.String
// ERROR: An integer literal does not conform to the expected type jet.String
// ERROR: An integer literal does not conform to the expected type kotlin.String
// ERROR: An integer literal does not conform to the expected type kotlin.String
[suppress(1, "REDUNDANT_NULLABLE")]
fun foo(): String?<caret>? = null
@@ -1,6 +1,6 @@
// "Suppress 'REDUNDANT_NULLABLE' for fun foo" "true"
// ERROR: An integer literal does not conform to the expected type jet.String
// ERROR: An integer literal does not conform to the expected type jet.String
// ERROR: An integer literal does not conform to the expected type kotlin.String
// ERROR: An integer literal does not conform to the expected type kotlin.String
[suppress(1)]
fun foo(): String?<caret>? = null
@@ -6,6 +6,6 @@ import java.util.List
class M {
trait A {
val l: jet.List<Int><caret>
val l: kotlin.List<Int><caret>
}
}
@@ -1,6 +1,6 @@
// "Change 'B.x' type to '(String) -> [ERROR : Ay]'" "false"
// ACTION: Change 'A.x' type to '(Int) -> Int'
// ERROR: <html>Return type is '(jet.Int) &rarr; jet.Int', which is not a subtype of overridden<br/><b>internal</b> <b>abstract</b> <b>val</b> x: (jet.String) &rarr; [ERROR : Ay] <i>defined in</i> A</html>
// ERROR: <html>Return type is '(kotlin.Int) &rarr; kotlin.Int', which is not a subtype of overridden<br/><b>internal</b> <b>abstract</b> <b>val</b> x: (kotlin.String) &rarr; [ERROR : Ay] <i>defined in</i> A</html>
// ERROR: Unresolved reference: Ay
trait A {
val x: (String) -> Ay
@@ -1,5 +1,5 @@
// "???" "false"
//ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>jet.Array&lt;jet.String&gt;</td></tr><tr><td>Found:</td><td>jet.Array&lt;jet.Int&gt;</td></tr></table></html>
//ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Array&lt;kotlin.String&gt;</td></tr><tr><td>Found:</td><td>kotlin.Array&lt;kotlin.Int&gt;</td></tr></table></html>
//this test checks that there is no ArrayIndexOutOfBoundsException when there are more arguments than parameters
fun <T> array1(vararg a : T) = a
@@ -1,5 +1,5 @@
// "Cast expression 'Foo<Number>()' to 'Foo<Int>'" "false"
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>Foo&lt;jet.Int&gt;</td></tr><tr><td>Found:</td><td>Foo&lt;jet.Number&gt;</td></tr></table></html>
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>Foo&lt;kotlin.Int&gt;</td></tr><tr><td>Found:</td><td>Foo&lt;kotlin.Number&gt;</td></tr></table></html>
class Foo<T>
fun foo(): Foo<Int> {
@@ -1,5 +1,5 @@
// "Cast expression 'x' to 'String'" "false"
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>jet.String</td></tr><tr><td>Found:</td><td>jet.Int</td></tr></table></html>
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.String</td></tr><tr><td>Found:</td><td>kotlin.Int</td></tr></table></html>
fun foo(x: Int) {
x<caret>: String
}
@@ -1,5 +1,5 @@
// "Change 'A.component2' function return type to 'Unit'" "true"
// ERROR: An integer literal does not conform to the expected type jet.Unit
// ERROR: An integer literal does not conform to the expected type kotlin.Unit
abstract class A {
abstract fun component1(): Int
fun component2(): Unit = 42
@@ -1,5 +1,5 @@
// "Change 'A.component2' function return type to 'Unit'" "true"
// ERROR: An integer literal does not conform to the expected type jet.Unit
// ERROR: An integer literal does not conform to the expected type kotlin.Unit
abstract class A {
abstract fun component1(): Int
fun component2() = 42
@@ -1,5 +1,5 @@
// "Change parameter 'z' type of function 'foo' to '(Int) -> String'" "false"
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>jet.Int</td></tr><tr><td>Found:</td><td>jet.String</td></tr></table></html>
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Int</td></tr><tr><td>Found:</td><td>kotlin.String</td></tr></table></html>
fun foo(y: Int = 0, z: (Int) -> String = {""}) {
foo {
""<caret>: Int
@@ -1,5 +1,5 @@
// "class org.jetbrains.jet.plugin.quickfix.ChangeParameterTypeFix" "false"
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>jet.Int</td></tr><tr><td>Found:</td><td>jet.String</td></tr></table></html>
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Int</td></tr><tr><td>Found:</td><td>kotlin.String</td></tr></table></html>
fun foo(y: Int = 0, z: (Int) -> String = {""}) {
foo(""<caret>: Int)
}
@@ -1,5 +1,5 @@
// "Change 'foo' function return type to '([ERROR : NoSuchType]) -> Int'" "false"
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>jet.Int</td></tr><tr><td>Found:</td><td>([ERROR : NoSuchType]) &rarr; jet.Int</td></tr></table></html>
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Int</td></tr><tr><td>Found:</td><td>([ERROR : NoSuchType]) &rarr; kotlin.Int</td></tr></table></html>
// ERROR: Unresolved reference: NoSuchType
fun foo(): Int {
return { (x: NoSuchType<caret>) -> 42 }
@@ -1,3 +1,3 @@
// "class org.jetbrains.jet.plugin.quickfix.ChangeFunctionReturnTypeFix" "false"
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>jet.Int</td></tr><tr><td>Found:</td><td>jet.String</td></tr></table></html>
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Int</td></tr><tr><td>Found:</td><td>kotlin.String</td></tr></table></html>
fun foo(): Int = if (true) ""<caret>: Int else 4
@@ -1,4 +1,4 @@
// "Remove useless import for 'jet.List'" "true"
import jet.Double
// "Remove useless import for 'kotlin.List'" "true"
import kotlin.Double
class List {}
@@ -1,5 +1,5 @@
// "Remove useless import for 'jet.List'" "true"
import jet.Double
import jet.List<caret>
// "Remove useless import for 'kotlin.List'" "true"
import kotlin.Double
import kotlin.List<caret>
class List {}