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

Fixed availability of "Make abstract" and "Implement members" quickfixes

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-17 12:38:48 +03:00
parent fc10fa66be
commit 963a8992b1
12 changed files with 119 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideImplementMembersHandler.kt
+4 -1
View File
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.core.overrideImplement
import com.intellij.codeInsight.hint.HintManager
import com.intellij.ide.util.MemberChooser
import com.intellij.lang.LanguageCodeInsightActionHandler
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.DialogWrapper
@@ -83,7 +84,9 @@ public abstract class OverrideImplementMembersHandler : LanguageCodeInsightActio
generateMembers(editor, classOrObject, selectedElements)
}
override fun invoke(project: Project, editor: Editor, file: PsiFile) = invoke(project, editor, file, false)
override fun invoke(project: Project, editor: Editor, file: PsiFile) {
invoke(project, editor, file, implementAll = ApplicationManager.getApplication().isUnitTestMode)
}
override fun startInWriteAction(): Boolean = false
idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
+4 -3
View File
@@ -20,8 +20,8 @@ import com.intellij.codeInsight.intention.IntentionAction
import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
import org.jetbrains.kotlin.diagnostics.Errors.*
import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMembersHandler
import org.jetbrains.kotlin.idea.inspections.AddReflectionQuickFix
import org.jetbrains.kotlin.idea.inspections.AddModifierFixFactory
import org.jetbrains.kotlin.idea.inspections.AddReflectionQuickFix
import org.jetbrains.kotlin.idea.intentions.IntroduceBackingPropertyFix
import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createCallable.*
import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass.CreateClassFromCallWithConstructorCalleeActionFactory
@@ -65,7 +65,7 @@ public class QuickFixRegistrar : QuickFixContributor {
MUST_BE_INITIALIZED_OR_BE_ABSTRACT.registerFactory(addAbstractModifierFactory)
ABSTRACT_MEMBER_NOT_IMPLEMENTED.registerFactory(addAbstractModifierFactory)
MANY_IMPL_MEMBER_NOT_IMPLEMENTED.registerFactory(addAbstractModifierFactory)
ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED.registerFactory(addAbstractModifierFactory)
val removeFinalModifierFactory = RemoveModifierFix.createRemoveModifierFromListOwnerFactory(FINAL_KEYWORD)
val addAbstractToClassFactory = AddModifierFix.createFactory(ABSTRACT_KEYWORD, javaClass<JetClass>())
@@ -151,7 +151,8 @@ public class QuickFixRegistrar : QuickFixContributor {
val implementMethodsHandler = ImplementMembersHandler()
ABSTRACT_MEMBER_NOT_IMPLEMENTED.registerActions(implementMethodsHandler)
MANY_IMPL_MEMBER_NOT_IMPLEMENTED.registerActions(implementMethodsHandler)
ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED.registerActions(implementMethodsHandler)
MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED.registerActions(implementMethodsHandler)
VAL_WITH_SETTER.registerFactory(ChangeVariableMutabilityFix.VAL_WITH_SETTER_FACTORY)
VAL_REASSIGNMENT.registerFactory(ChangeVariableMutabilityFix.VAL_REASSIGNMENT_FACTORY)
idea/testData/quickfix/abstract/manyImpl.kt
Vendored
+20
View File
@@ -0,0 +1,20 @@
// "Make 'A' abstract" "false"
// ERROR: <html>Class 'X' must override <b>public</b> <b>open</b> <b>fun</b> foo(): kotlin.Unit <i>defined in</i> X<br />because it inherits many implementations of it</html>
// ACTION: Create Test
// ACTION: Make internal
// ACTION: Make private
// ACTION: Move 'X' to separate file
interface D {
fun foo()
}
interface E {
fun foo() {}
}
object Impl : D, E {
override fun foo() {}
}
<caret>class X : D by Impl, E by Impl {}
idea/testData/quickfix/abstract/notImplementedMember.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
// "Make 'A' abstract" "true"
interface I {
fun foo()
}
<caret>class A : I {
}
idea/testData/quickfix/abstract/notImplementedMember.kt.after
Vendored
+7
View File
@@ -0,0 +1,7 @@
// "Make 'A' abstract" "true"
interface I {
fun foo()
}
abstract class A : I {
}
idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
// "Make 'B' abstract" "true"
abstract class A {
abstract fun foo()
}
<caret>class B : A() {
}
idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt.after
Vendored
+7
View File
@@ -0,0 +1,7 @@
// "Make 'B' abstract" "true"
abstract class A {
abstract fun foo()
}
abstract class B : A() {
}
idea/testData/quickfix/override/implementMember.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
// "Implement members" "true"
interface I {
fun foo()
}
<caret>class A : I
idea/testData/quickfix/override/implementMember.kt.after
Vendored
+10
View File
@@ -0,0 +1,10 @@
// "Implement members" "true"
interface I {
fun foo()
}
class A : I {
override fun foo() {
<caret><selection>throw UnsupportedOperationException()</selection>
}
}
idea/testData/quickfix/override/implementMemberFromAbstractClass.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
// "Implement members" "true"
abstract class A {
abstract fun foo()
}
<caret>class B : A() {
}
idea/testData/quickfix/override/implementMemberFromAbstractClass.kt.after
Vendored
+10
View File
@@ -0,0 +1,10 @@
// "Implement members" "true"
abstract class A {
abstract fun foo()
}
class B : A() {
override fun foo() {
throw UnsupportedOperationException()
}
}
idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+30
View File
@@ -139,6 +139,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/abstract"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
}
@TestMetadata("manyImpl.kt")
public void testManyImpl() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/manyImpl.kt");
doTest(fileName);
}
@TestMetadata("mustBeInitializedOrBeAbstract.kt")
public void testMustBeInitializedOrBeAbstract() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt");
@@ -163,6 +169,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
doTest(fileName);
}
@TestMetadata("notImplementedMember.kt")
public void testNotImplementedMember() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/notImplementedMember.kt");
doTest(fileName);
}
@TestMetadata("notImplementedMemberFromAbstractClass.kt")
public void testNotImplementedMemberFromAbstractClass() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt");
doTest(fileName);
}
@TestMetadata("redundantAbstract.kt")
public void testRedundantAbstract() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/redundantAbstract.kt");
@@ -4761,6 +4779,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
doTest(fileName);
}
@TestMetadata("implementMember.kt")
public void testImplementMember() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/implementMember.kt");
doTest(fileName);
}
@TestMetadata("implementMemberFromAbstractClass.kt")
public void testImplementMemberFromAbstractClass() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/implementMemberFromAbstractClass.kt");
doTest(fileName);
}
@TestMetadata("overriddingMultipleFinalMethods.kt")
public void testOverriddingMultipleFinalMethods() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/overriddingMultipleFinalMethods.kt");