From 32d11c35a4814384b621c831aacfb617e18c25a3 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Tue, 13 Sep 2016 20:01:29 +0300
Subject: [PATCH] KT-12297 related: make not open quick-fix for
 REDUNDANT_OPEN_IN_INTERFACE

---
 .../org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt | 2 +-
 .../testData/quickfix/modifiers/redundantOpenInInterface.kt | 5 +++++
 .../quickfix/modifiers/redundantOpenInInterface.kt.after    | 5 +++++
 .../kotlin/idea/quickfix/QuickFixTestGenerated.java         | 6 ++++++
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 idea/testData/quickfix/modifiers/redundantOpenInInterface.kt
 create mode 100644 idea/testData/quickfix/modifiers/redundantOpenInInterface.kt.after

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
index 363725ac68a..3a270fc00ac 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
@@ -104,7 +104,7 @@ class QuickFixRegistrar : QuickFixContributor {
 
         val removeRedundantModifierFactory = RemoveModifierFix.createRemoveModifierFactory(true)
         REDUNDANT_MODIFIER.registerFactory(removeRedundantModifierFactory)
-        REDUNDANT_OPEN_IN_INTERFACE.registerFactory(removeRedundantModifierFactory)
+        REDUNDANT_OPEN_IN_INTERFACE.registerFactory(RemoveModifierFix.createRemoveModifierFromListOwnerFactory(OPEN_KEYWORD))
 
         REDUNDANT_PROJECTION.registerFactory(RemoveModifierFix.createRemoveProjectionFactory(true))
         INCOMPATIBLE_MODIFIERS.registerFactory(RemoveModifierFix.createRemoveModifierFactory(false))
diff --git a/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt b/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt
new file mode 100644
index 00000000000..f4e61dba4f8
--- /dev/null
+++ b/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt
@@ -0,0 +1,5 @@
+// "Make 'foo' not open" "true"
+
+interface My {
+    <caret>open fun foo()
+}
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt.after b/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt.after
new file mode 100644
index 00000000000..f3f6a9867b9
--- /dev/null
+++ b/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt.after
@@ -0,0 +1,5 @@
+// "Make 'foo' not open" "true"
+
+interface My {
+    fun foo()
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index b2f40dcf9aa..46f9933c878 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -6114,6 +6114,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             doTest(fileName);
         }
 
+        @TestMetadata("redundantOpenInInterface.kt")
+        public void testRedundantOpenInInterface() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/redundantOpenInInterface.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("removeAbstractModifier.kt")
         public void testRemoveAbstractModifier() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeAbstractModifier.kt");