Added quickfix for INCOMPATIBLE_MODIFIERS.

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));

idea/testData/quickfix/modifiers/afterRemoveIncompatibleModifier.kt

@@ -0,0 +1,4 @@
+// "Remove 'public' modifier" "true"
+class Foo {
+    private fun bar() { }
+}

idea/testData/quickfix/modifiers/beforeRemoveIncompatibleModifier.kt

@@ -0,0 +1,4 @@
+// "Remove 'public' modifier" "true"
+class Foo {
+    public<caret> private fun bar() { }
+}

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");