From 96929211287e066bb7f7899ee4d30a977e6a9048 Mon Sep 17 00:00:00 2001 From: Jack Zhou Date: Thu, 7 Feb 2013 01:11:52 -0500 Subject: [PATCH] Added quickfix for INCOMPATIBLE_MODIFIERS. --- idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java | 1 + .../quickfix/modifiers/afterRemoveIncompatibleModifier.kt | 4 ++++ .../quickfix/modifiers/beforeRemoveIncompatibleModifier.kt | 4 ++++ .../jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java | 5 +++++ 4 files changed, 14 insertions(+) create mode 100644 idea/testData/quickfix/modifiers/afterRemoveIncompatibleModifier.kt create mode 100644 idea/testData/quickfix/modifiers/beforeRemoveIncompatibleModifier.kt diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java index 4398d27b7fc..94793e3fb57 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java @@ -103,6 +103,7 @@ public class QuickFixes { factories.put(OPEN_MODIFIER_IN_TRAIT, RemoveModifierFix.createRemoveModifierFromListOwnerFactory(OPEN_KEYWORD, true)); factories.put(TRAIT_CAN_NOT_BE_FINAL, removeFinalModifierFactory); factories.put(REDUNDANT_PROJECTION, RemoveModifierFix.createRemoveProjectionFactory()); + factories.put(INCOMPATIBLE_MODIFIERS, RemoveModifierFix.createRemoveModifierFactory(false)); JetIntentionActionFactory removeOpenModifierFactory = RemoveModifierFix.createRemoveModifierFromListOwnerFactory(OPEN_KEYWORD); factories.put(NON_FINAL_MEMBER_IN_FINAL_CLASS, AddModifierFix.createFactory(OPEN_KEYWORD, JetClass.class)); diff --git a/idea/testData/quickfix/modifiers/afterRemoveIncompatibleModifier.kt b/idea/testData/quickfix/modifiers/afterRemoveIncompatibleModifier.kt new file mode 100644 index 00000000000..3c58a6569a0 --- /dev/null +++ b/idea/testData/quickfix/modifiers/afterRemoveIncompatibleModifier.kt @@ -0,0 +1,4 @@ +// "Remove 'public' modifier" "true" +class Foo { + private fun bar() { } +} \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/beforeRemoveIncompatibleModifier.kt b/idea/testData/quickfix/modifiers/beforeRemoveIncompatibleModifier.kt new file mode 100644 index 00000000000..335c5cc6566 --- /dev/null +++ b/idea/testData/quickfix/modifiers/beforeRemoveIncompatibleModifier.kt @@ -0,0 +1,4 @@ +// "Remove 'public' modifier" "true" +class Foo { + public private fun bar() { } +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java index 152de3aa922..2b83444ab86 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java @@ -418,6 +418,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { doTest("idea/testData/quickfix/modifiers/beforeOpenMemberInFinalClass2.kt"); } + @TestMetadata("beforeRemoveIncompatibleModifier.kt") + public void testRemoveIncompatibleModifier() throws Exception { + doTest("idea/testData/quickfix/modifiers/beforeRemoveIncompatibleModifier.kt"); + } + @TestMetadata("beforeRemoveRedundantModifier1.kt") public void testRemoveRedundantModifier1() throws Exception { doTest("idea/testData/quickfix/modifiers/beforeRemoveRedundantModifier1.kt");