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

fix tests in org.jetbrains.kotlin.idea.quickfix

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-09-04 23:09:17 +03:00
parent 32c66914fe
commit 92ca057b4a
31 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/quickfix/anonymousObject.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// "Make 'object : T {}' abstract" "false"
// ACTION: Implement members
// ACTION: Split property declaration
// ERROR: <html>Object must be declared abstract or implement abstract member<br/><b>internal</b> <b>abstract</b> <b>fun</b> foo(): kotlin.Unit <i>defined in</i> T</html>
// ERROR: <html>Object must be declared abstract or implement abstract member<br/><b>public</b> <b>abstract</b> <b>fun</b> foo(): kotlin.Unit <i>defined in</i> T</html>
interface T {
fun foo()
}
idea/testData/quickfix/autoImports/minusOperator.after.kt
Vendored
+1 -1
View File
@@ -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> kotlin.String.minus(i: java.lang.Integer): kotlin.String <i>defined in</i> h</li><li><b>internal</b> <b>fun</b> kotlin.String.minus(str: kotlin.String): kotlin.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>public</b> <b>fun</b> kotlin.String.minus(i: java.lang.Integer): kotlin.String <i>defined in</i> h</li><li><b>public</b> <b>fun</b> kotlin.String.minus(str: kotlin.String): kotlin.String <i>defined in</i> h</li></ul></html>
package h
idea/testData/quickfix/autoImports/minusOperator.before.Main.kt
Vendored
+1 -1
View File
@@ -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> kotlin.String.minus(i: java.lang.Integer): kotlin.String <i>defined in</i> h</li><li><b>internal</b> <b>fun</b> kotlin.String.minus(str: kotlin.String): kotlin.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>public</b> <b>fun</b> kotlin.String.minus(i: java.lang.Integer): kotlin.String <i>defined in</i> h</li><li><b>public</b> <b>fun</b> kotlin.String.minus(str: kotlin.String): kotlin.String <i>defined in</i> h</li></ul></html>
package h
idea/testData/quickfix/autoImports/unaryPlusOperator.after.kt
Vendored
+1 -1
View File
@@ -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(): 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>
// 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> 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
idea/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt
Vendored
+1 -1
View File
@@ -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(): 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>
// 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> 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
idea/testData/quickfix/changeSignature/addParameterWithImport.after.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// "Add parameter to function 'foo'" "true"
// ERROR: Too many arguments for internal fun foo(): kotlin.Unit defined in b
// ERROR: Too many arguments for public fun foo(): kotlin.Unit defined in b
package a
import b.foo
idea/testData/quickfix/changeSignature/addParameterWithImport.before.Main.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// "Add parameter to function 'foo'" "true"
// ERROR: Too many arguments for internal fun foo(): kotlin.Unit defined in b
// ERROR: Too many arguments for public fun foo(): kotlin.Unit defined in b
package a
import b.foo
idea/testData/quickfix/changeSignature/notAvailableForSynthesized.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// "class org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix" "false"
//ERROR: Too many arguments for internal final fun component1(): kotlin.Int defined in Data
//ERROR: Too many arguments for public final fun component1(): kotlin.Int defined in Data
data class Data(val i: Int) {}
idea/testData/quickfix/changeSignature/notAvailableForSynthesized.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// "class org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix" "false"
//ERROR: Too many arguments for internal final fun component1(): kotlin.Int defined in Data
//ERROR: Too many arguments for public final fun component1(): kotlin.Int defined in Data
data class Data(val i: Int) {}
idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedGroovyAnnotation.before.Main.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// "Create annotation 'foo'" "false"
// ERROR: Unresolved reference: foo
// ACTION: Make private
// ACTION: Make public
// ACTION: Make internal
J.<caret>foo(1, "2") fun test() {
idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationNotQualifierWithTypeArgs.kt
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@
// ERROR: Unresolved reference: A
package p
fun foo(): <caret>A<Int, String> = throw Throwable("")
internal fun foo(): <caret>A<Int, String> = throw Throwable("")
idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationQualifierNoTypeArgs.kt
Vendored
+1 -1
View File
@@ -8,4 +8,4 @@
// ERROR: Unresolved reference: A
package p
fun foo(): <caret>A.B = throw Throwable("")
internal fun foo(): <caret>A.B = throw Throwable("")
idea/testData/quickfix/createFromUsage/createClass/typeReference/classGroovyTypeReceiver.before.Main.kt
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@
// ACTION: Convert to block body
// ACTION: Remove explicit type specification
// ERROR: Unresolved reference: A
fun foo(): J.<caret>A = throw Throwable("")
internal fun foo(): J.<caret>A = throw Throwable("")
idea/testData/quickfix/createFromUsage/createClass/typeReference/classLibTypeReceiver.kt
Vendored
+1 -1
View File
@@ -4,4 +4,4 @@
// ERROR: Unresolved reference: A
package p
fun foo(): Int.<caret>A = throw Throwable("")
internal fun foo(): Int.<caret>A = throw Throwable("")
idea/testData/quickfix/createFromUsage/createClass/typeReference/enumEntryJavaEnumReceiver.before.Main.kt
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@
// ACTION: Create enum 'A'
// ACTION: Create interface 'A'
// ERROR: Unresolved reference: A
fun foo(): J.<caret>A = throw Throwable("")
internal fun foo(): J.<caret>A = throw Throwable("")
idea/testData/quickfix/createFromUsage/createClass/typeReference/enumEntryNotQualifierNoTypeArgs.kt
Vendored
+1 -1
View File
@@ -8,4 +8,4 @@
// ERROR: Unresolved reference: A
package p
fun foo(): <caret>A = throw Throwable("")
internal fun foo(): <caret>A = throw Throwable("")
idea/testData/quickfix/createFromUsage/createClass/typeReference/enumNotQualifierWithTypeArgs.kt
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@
// ERROR: Unresolved reference: A
package p
fun foo(): <caret>A<Int, String> = throw Throwable("")
internal fun foo(): <caret>A<Int, String> = throw Throwable("")
idea/testData/quickfix/createFromUsage/createClass/typeReference/objectNotQualifierNoTypeArgs.kt
Vendored
+1 -1
View File
@@ -8,4 +8,4 @@
// ERROR: Unresolved reference: A
package p
fun foo(): <caret>A = throw Throwable("")
internal fun foo(): <caret>A = throw Throwable("")
idea/testData/quickfix/createFromUsage/createClass/typeReference/objectNotQualifierWithTypeArgs.kt
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@
// ERROR: Unresolved reference: A
package p
fun foo(): <caret>A<Int, String> = throw Throwable("")
internal fun foo(): <caret>A<Int, String> = throw Throwable("")
idea/testData/quickfix/createFromUsage/createFunction/call/callInAnnotationEntry.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// "Create function 'bar'" "false"
// ACTION: Create annotation 'bar'
// ACTION: Make internal
// ACTION: Make private
// ACTION: Make public
// ERROR: Unresolved reference: foo
// ERROR: Unresolved reference: bar
idea/testData/quickfix/deprecatedSymbolUsage/callWithError.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// "class org.jetbrains.kotlin.idea.quickfix.replaceWith.DeprecatedSymbolUsageFix" "false"
// ERROR: Too many arguments for kotlin.Deprecated internal fun oldFun(): kotlin.Unit defined in root package
// ERROR: Too many arguments for kotlin.Deprecated public fun oldFun(): kotlin.Unit defined in root package
@Deprecated("", ReplaceWith("newFun()"))
fun oldFun() {
idea/testData/quickfix/modifiers/visibilityModiferParameter.kt.after
Vendored
+1 -1
View File
@@ -4,6 +4,6 @@ interface ParseResult<out T> {
public val value : T
}
class Success<T>(<caret>public override val value : T) : ParseResult<T> {
class Success<T>(override val value : T) : ParseResult<T> {
public override val success : Boolean = true
}
idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt
Vendored
+1 -1
View File
@@ -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: kotlin.String): kotlin.Unit <i>defined in</i> A</html>
// ERROR: <html>Class 'B' must be declared abstract or implement abstract member<br/><b>public</b> <b>abstract</b> <b>fun</b> f(a: kotlin.String): kotlin.Unit <i>defined in</i> A</html>
interface A {
fun f(a: Int)
fun f(a: String)
idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt.after
Vendored
+2 -2
View File
@@ -1,10 +1,10 @@
// "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: kotlin.String): kotlin.Unit <i>defined in</i> A</html>
// ERROR: <html>Class 'B' must be declared abstract or implement abstract member<br/><b>public</b> <b>abstract</b> <b>fun</b> f(a: kotlin.String): kotlin.Unit <i>defined in</i> A</html>
interface A {
fun f(a: Int)
fun f(a: String)
}
class B : A {
<caret>override fun f(a: Int) {}
override fun f(a: Int) {}
}
idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt
Vendored
+1 -1
View File
@@ -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 '(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>
// ERROR: <html>Return type is '(kotlin.Int) &rarr; kotlin.Int', which is not a subtype of overridden<br/><b>public</b> <b>abstract</b> <b>val</b> x: (kotlin.String) &rarr; kotlin.Int <i>defined in</i> A</html>
interface A {
val x: (String) -> Int
}
idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// "class org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix" "false"
// 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>
// ERROR: <html>Var-property type is 'kotlin.String', which is not a type of overridden<br/><b>public</b> <b>abstract</b> <b>var</b> x: kotlin.Int <i>defined in</i> A</html>
interface A {
var x: Int
}
idea/testData/quickfix/override/typeMismatchOnOverride/cantChangePropertyTypeToMatchOverridenProperties.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// "class org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix" "false"
// 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>
// ERROR: <html>Var-property type is 'kotlin.Int', which is not a type of overridden<br/><b>public</b> <b>abstract</b> <b>var</b> x: kotlin.String <i>defined in</i> A</html>
interface A {
var x: String
}
idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// "class org.jetbrains.kotlin.idea.quickfix.ChangeFunctionReturnTypeFix" "false"
// 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>
// ERROR: <html>Return type is 'kotlin.Long', which is not a subtype of overridden<br/><b>public</b> <b>abstract</b> <b>fun</b> foo(): kotlin.Int <i>defined in</i> A</html>
interface A {
fun foo(): Int
}
idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverrideAmbiguity.kt
Vendored
+1 -1
View File
@@ -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 '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>
// ERROR: <html>Return type is 'kotlin.String', which is not a subtype of overridden<br/><b>public</b> <b>abstract</b> <b>fun</b> foo(): kotlin.Int <i>defined in</i> A</html>
abstract class A {
abstract fun foo() : Int;
}
idea/testData/quickfix/typeMismatch/dontChangeOverriddenPropertyTypeToErrorType.kt
Vendored
+1 -1
View File
@@ -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 '(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: <html>Return type is '(kotlin.Int) &rarr; kotlin.Int', which is not a subtype of overridden<br/><b>public</b> <b>abstract</b> <b>val</b> x: (kotlin.String) &rarr; [ERROR : Ay] <i>defined in</i> A</html>
// ERROR: Unresolved reference: Ay
interface A {
val x: (String) -> Ay
idea/testData/quickfix/variables/removeValVarFromParameter/constructorParameter.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// "Remove 'val' from parameter" "false"
// ACTION: Make internal
// ACTION: Make private
// ACTION: Make public
class C(<caret>val x: String) {
}