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

Rename jet -> kotlin in idea: quickfixes

Browse Source 
org.jetbrains.jet.plugin.quickfix -> org.jetbrains.kotlin.idea.quickfix
This commit is contained in:
Alexander Udalov
2015-01-12 17:05:06 +03:00
parent 17227bb4fe
commit 0b64f028b6
152 changed files with 712 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/quickfix/addStarProjections/afterUnqualifiedMapOneArg.kt
+2 -2
View File
@@ -1,5 +1,5 @@
// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false"
// ERROR: 2 type arguments expected
public fun foo(a: Any) {
a is Map<Int>
}
}
idea/testData/quickfix/addStarProjections/beforeUnqualifiedMapOneArg.kt
+2 -2
View File
@@ -1,5 +1,5 @@
// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false"
// ERROR: 2 type arguments expected
public fun foo(a: Any) {
a is <caret>Map<Int>
}
}
idea/testData/quickfix/addStarProjections/javaClass/afterFooOfC2.kt
+2 -2
View File
@@ -1,4 +1,4 @@
// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false"
// ERROR: Type argument expected
class C2<T>
@@ -6,4 +6,4 @@ fun foo<T>() {}
fun test() {
foo<C2<caret>>()
}
}
idea/testData/quickfix/addStarProjections/javaClass/afterJavaClassOfCRuntime.kt
+2 -2
View File
@@ -1,6 +1,6 @@
// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false"
class C
fun test() {
javaClass<C<caret>>
}
}
idea/testData/quickfix/addStarProjections/javaClass/beforeFooOfC2.kt
+2 -2
View File
@@ -1,4 +1,4 @@
// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false"
// ERROR: Type argument expected
class C2<T>
@@ -6,4 +6,4 @@ fun foo<T>() {}
fun test() {
foo<C2<caret>>()
}
}
idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfCRuntime.kt
+2 -2
View File
@@ -1,6 +1,6 @@
// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false"
class C
fun test() {
javaClass<C<caret>>()
}
}
idea/testData/quickfix/addStarProjections/when/afterUnqualifiedMapOneArg.kt
+2 -2
View File
@@ -1,8 +1,8 @@
// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false"
// ERROR: 2 type arguments expected
public fun foo(a: Any) {
when (a) {
is Map<Int> -> {}
else -> {}
}
}
}
idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMapOneArg.kt
+2 -2
View File
@@ -1,8 +1,8 @@
// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false"
// ERROR: 2 type arguments expected
public fun foo(a: Any) {
when (a) {
is <caret>Map<Int> -> {}
else -> {}
}
}
}
idea/testData/quickfix/changeSignature/afterNotAvailableForSynthesized.kt
+2 -2
View File
@@ -1,8 +1,8 @@
// "class org.jetbrains.jet.plugin.quickfix.AddFunctionParametersFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix" "false"
//ERROR: Too many arguments for internal final fun component1(): kotlin.Int defined in Data
data class Data(val i: Int) {}
fun usage(d: Data) {
d.component1(2)
}
}
idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForBuiltins.kt
+2 -2
View File
@@ -1,6 +1,6 @@
// "class org.jetbrains.jet.plugin.quickfix.AddFunctionParametersFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix" "false"
// 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")
}
}
idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForLibrary.kt
+2 -2
View File
@@ -1,6 +1,6 @@
// "class org.jetbrains.jet.plugin.quickfix.AddFunctionParametersFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix" "false"
// 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")
}
}
idea/testData/quickfix/changeSignature/beforeNotAvailableForSynthesized.kt
+2 -2
View File
@@ -1,8 +1,8 @@
// "class org.jetbrains.jet.plugin.quickfix.AddFunctionParametersFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix" "false"
//ERROR: Too many arguments for internal final fun component1(): kotlin.Int defined in Data
data class Data(val i: Int) {}
fun usage(d: Data) {
d.component1(<caret>2)
}
}
idea/testData/quickfix/changeSignature/beforeRemoveParameterNotAvailableForBuiltins.kt
+2 -2
View File
@@ -1,6 +1,6 @@
// "class org.jetbrains.jet.plugin.quickfix.RemoveFunctionParametersFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.RemoveFunctionParametersFix" "false"
// ERROR: No value passed for parameter other
fun f(d: Boolean) {
d.or(<caret>)
}
}
idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumSupertype.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "class org.jetbrains.jet.plugin.quickfix.AddOpenModifierToClassDeclarationFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.AddOpenModifierToClassDeclarationFix" "false"
// ERROR: This type is final, so it cannot be inherited from
// ERROR: Cannot access '<init>': it is 'private' in 'E'
enum class E {}
idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumUpperBound.kt
+1 -1
View File
@@ -1,3 +1,3 @@
// "class org.jetbrains.jet.plugin.quickfix.AddOpenModifierToClassDeclarationFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.AddOpenModifierToClassDeclarationFix" "false"
enum class E {}
class A<T : E<caret>> {}
idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibrarySupertype.kt
+1 -1
View File
@@ -1,3 +1,3 @@
// "class org.jetbrains.jet.plugin.quickfix.AddOpenModifierToClassDeclarationFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.AddOpenModifierToClassDeclarationFix" "false"
// ERROR: This type is final, so it cannot be inherited from
class A : String<caret>() {}
idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibraryUpperBound.kt
+1 -1
View File
@@ -1,2 +1,2 @@
// "class org.jetbrains.jet.plugin.quickfix.AddOpenModifierToClassDeclarationFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.AddOpenModifierToClassDeclarationFix" "false"
class A<T : String<caret>> {}
idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/FinalJavaSupertype.before.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "class org.jetbrains.jet.plugin.quickfix.AddOpenModifierToClassDeclarationFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.AddOpenModifierToClassDeclarationFix" "false"
// ERROR: This type is final, so it cannot be inherited from
import testPackage.*
idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/FinalJavaUpperBound.before.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "class org.jetbrains.jet.plugin.quickfix.AddOpenModifierToClassDeclarationFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.AddOpenModifierToClassDeclarationFix" "false"
import testPackage.*
class foo<T : JavaClass>() {}
idea/testData/quickfix/modifiers/beforeCannotMakeClassAnnotation.kt
+1 -1
View File
@@ -1,3 +1,3 @@
// "class org.jetbrains.jet.plugin.quickfix.MakeClassAnAnnotationClassFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.MakeClassAnAnnotationClassFix" "false"
// ERROR: 'String' is not an annotation class
[String<caret>] class foo {}
idea/testData/quickfix/override/beforeOverridingFinalJavaMethod.kt
+2 -2
View File
@@ -1,5 +1,5 @@
// "class org.jetbrains.jet.plugin.quickfix.MakeOverriddenMemberOpenFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix" "false"
// ERROR: 'notify' in 'Object' is final and cannot be overridden
class A : Object() {
override<caret> fun notify() {}
}
}
idea/testData/quickfix/override/beforeOverridingWritableAndNotWritableFinalMembers.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "class org.jetbrains.jet.plugin.quickfix.MakeOverriddenMemberOpenFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix" "false"
// ERROR: This type is final, so it cannot be inherited from
// ERROR: Cannot access '<init>': it is 'private' in 'E'
// ERROR: 'ordinal' in 'E' is final and cannot be overridden
idea/testData/quickfix/override/beforeParameterNameChangedAmbiguousRename.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "class org.jetbrains.jet.plugin.quickfix.RenameParameterToMatchOverriddenMethodFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.RenameParameterToMatchOverriddenMethodFix" "false"
abstract class A {
abstract fun foo(arg : Int) : Int;
idea/testData/quickfix/override/nothingToOverride/beforeNoOpenSuperFunction.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "class org.jetbrains.jet.plugin.quickfix.ChangeMemberFunctionSignatureFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.ChangeMemberFunctionSignatureFix" "false"
// ERROR: 'f' overrides nothing
open class A {
open fun foo() {}
idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt
+2 -2
View File
@@ -1,4 +1,4 @@
// "class org.jetbrains.jet.plugin.quickfix.ChangeVariableTypeFix" "false"
// "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>
trait A {
var x: Int
@@ -10,4 +10,4 @@ trait B {
trait C : A, B {
override var x: String<caret>
}
}
idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangePropertyTypeToMatchOverridenProperties.kt
+2 -2
View File
@@ -1,4 +1,4 @@
// "class org.jetbrains.jet.plugin.quickfix.ChangeVariableTypeFix" "false"
// "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>
trait A {
var x: String
@@ -10,4 +10,4 @@ trait B {
trait C : A, B {
override var x: Int<caret>
}
}
idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeReturnTypeOfOverriddenFunction.kt
+2 -2
View File
@@ -1,4 +1,4 @@
// "class org.jetbrains.jet.plugin.quickfix.ChangeFunctionReturnTypeFix" "false"
// "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>
trait A {
fun foo(): Int
@@ -10,4 +10,4 @@ trait B {
trait C : A, B {
override fun foo(): Long
}
}
idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitialized.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "class org.jetbrains.jet.plugin.quickfix.ChangeToConstructorInvocationFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.ChangeToConstructorInvocationFix" "false"
// ERROR: This type has a constructor, and thus must be initialized here
open class A(x : Int) {}
class B : A<caret> {}
idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch4.kt
+2 -2
View File
@@ -1,8 +1,8 @@
// "class org.jetbrains.jet.plugin.quickfix.CastExpressionFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.CastExpressionFix" "false"
// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>B</td></tr><tr><td>Found:</td><td>A</td></tr></table></html>
open class A
class B : A()
fun foo(a: A): B {
return a: A<caret>
}
}
idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType5.kt
+2 -2
View File
@@ -1,5 +1,5 @@
// "class org.jetbrains.jet.plugin.quickfix.ChangeParameterTypeFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.ChangeParameterTypeFix" "false"
// 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)
}
}
idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeMultiFakeOverride.kt
+2 -2
View File
@@ -1,4 +1,4 @@
// "class org.jetbrains.jet.plugin.quickfix.ChangeParameterTypeFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.ChangeParameterTypeFix" "false"
// 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>
trait A {
fun f(i: Int): Boolean
@@ -10,4 +10,4 @@ open class AA {
class AAA: AA(), A
val c = AAA().f("<caret>")
val c = AAA().f("<caret>")
idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt
+2 -2
View File
@@ -1,3 +1,3 @@
// "class org.jetbrains.jet.plugin.quickfix.ChangeFunctionReturnTypeFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.ChangeFunctionReturnTypeFix" "false"
// 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
fun foo(): Int = if (true) ""<caret>: Int else 4
idea/testData/quickfix/when/beforeTwoElseBranchesInWhen.kt
+2 -2
View File
@@ -1,4 +1,4 @@
// "class org.jetbrains.jet.plugin.quickfix.MoveWhenElseBranchFix" "false"
// "class org.jetbrains.kotlin.idea.quickfix.MoveWhenElseBranchFix" "false"
// ERROR: 'else' entry must be the last one in a when-expression
// ERROR: 'else' entry must be the last one in a when-expression
// WARNING: Unreachable code
@@ -13,4 +13,4 @@ fun foo() {
else -> { /* second else branch */ }
3 -> { /* some other code */ }
}
}
}