From 83169ad78106ad407559492f617e6efa3107c020 Mon Sep 17 00:00:00 2001
From: shiraji <isogai.shiraji@gmail.com>
Date: Mon, 10 Apr 2017 01:01:04 +0900
Subject: [PATCH] "Add open to callable" intention introduced #KT-16786 Fixed

---
 .../after.kt.template                         |  5 +
 .../before.kt.template                        |  5 +
 .../AddOpenModifierIntention/description.html |  5 +
 idea/src/META-INF/plugin.xml                  |  5 +
 .../intentions/AddOpenModifierIntention.kt    | 51 ++++++++++
 .../intentions/addOpenModifier/.intention     |  1 +
 .../addOpenModifier/abstractClass.kt          |  4 +
 .../addOpenModifier/abstractClass.kt.after    |  4 +
 .../addOpenModifier/abstractFunction.kt       |  5 +
 .../intentions/addOpenModifier/alreadyOpen.kt |  6 ++
 .../destructuringDeclaration.kt               |  7 ++
 .../intentions/addOpenModifier/enumClass.kt   |  5 +
 .../addOpenModifier/enumClass.kt.after        |  5 +
 .../intentions/addOpenModifier/function.kt    |  4 +
 .../addOpenModifier/function.kt.after         |  4 +
 .../intentions/addOpenModifier/interface.kt   |  5 +
 .../addOpenModifier/localFunction.kt          |  9 ++
 .../addOpenModifier/localProperty.kt          |  7 ++
 .../intentions/addOpenModifier/notOpen.kt     |  6 ++
 .../intentions/addOpenModifier/parameter.kt   |  6 ++
 .../intentions/addOpenModifier/private.kt     |  6 ++
 .../intentions/addOpenModifier/property.kt    |  3 +
 .../addOpenModifier/property.kt.after         |  3 +
 .../intentions/addOpenModifier/sealedClass.kt |  4 +
 .../addOpenModifier/sealedClass.kt.after      |  4 +
 .../quickfix/removeUnused/triangle.kt         |  1 +
 .../intentions/IntentionTestGenerated.java    | 93 +++++++++++++++++++
 27 files changed, 263 insertions(+)
 create mode 100644 idea/resources/intentionDescriptions/AddOpenModifierIntention/after.kt.template
 create mode 100644 idea/resources/intentionDescriptions/AddOpenModifierIntention/before.kt.template
 create mode 100644 idea/resources/intentionDescriptions/AddOpenModifierIntention/description.html
 create mode 100644 idea/src/org/jetbrains/kotlin/idea/intentions/AddOpenModifierIntention.kt
 create mode 100644 idea/testData/intentions/addOpenModifier/.intention
 create mode 100644 idea/testData/intentions/addOpenModifier/abstractClass.kt
 create mode 100644 idea/testData/intentions/addOpenModifier/abstractClass.kt.after
 create mode 100644 idea/testData/intentions/addOpenModifier/abstractFunction.kt
 create mode 100644 idea/testData/intentions/addOpenModifier/alreadyOpen.kt
 create mode 100644 idea/testData/intentions/addOpenModifier/destructuringDeclaration.kt
 create mode 100644 idea/testData/intentions/addOpenModifier/enumClass.kt
 create mode 100644 idea/testData/intentions/addOpenModifier/enumClass.kt.after
 create mode 100644 idea/testData/intentions/addOpenModifier/function.kt
 create mode 100644 idea/testData/intentions/addOpenModifier/function.kt.after
 create mode 100644 idea/testData/intentions/addOpenModifier/interface.kt
 create mode 100644 idea/testData/intentions/addOpenModifier/localFunction.kt
 create mode 100644 idea/testData/intentions/addOpenModifier/localProperty.kt
 create mode 100644 idea/testData/intentions/addOpenModifier/notOpen.kt
 create mode 100644 idea/testData/intentions/addOpenModifier/parameter.kt
 create mode 100644 idea/testData/intentions/addOpenModifier/private.kt
 create mode 100644 idea/testData/intentions/addOpenModifier/property.kt
 create mode 100644 idea/testData/intentions/addOpenModifier/property.kt.after
 create mode 100644 idea/testData/intentions/addOpenModifier/sealedClass.kt
 create mode 100644 idea/testData/intentions/addOpenModifier/sealedClass.kt.after

diff --git a/idea/resources/intentionDescriptions/AddOpenModifierIntention/after.kt.template b/idea/resources/intentionDescriptions/AddOpenModifierIntention/after.kt.template
new file mode 100644
index 00000000000..792cf5ae192
--- /dev/null
+++ b/idea/resources/intentionDescriptions/AddOpenModifierIntention/after.kt.template
@@ -0,0 +1,5 @@
+open class Foo {
+    <spot>open</spot> fun foo() {
+
+    }
+}
\ No newline at end of file
diff --git a/idea/resources/intentionDescriptions/AddOpenModifierIntention/before.kt.template b/idea/resources/intentionDescriptions/AddOpenModifierIntention/before.kt.template
new file mode 100644
index 00000000000..82d80c75ea8
--- /dev/null
+++ b/idea/resources/intentionDescriptions/AddOpenModifierIntention/before.kt.template
@@ -0,0 +1,5 @@
+open class Foo {
+    fun foo() {
+    
+    }
+}
\ No newline at end of file
diff --git a/idea/resources/intentionDescriptions/AddOpenModifierIntention/description.html b/idea/resources/intentionDescriptions/AddOpenModifierIntention/description.html
new file mode 100644
index 00000000000..1d2481e459d
--- /dev/null
+++ b/idea/resources/intentionDescriptions/AddOpenModifierIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+This intention adds an open modifier.
+</body>
+</html>
\ No newline at end of file
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 26e26508ba8..ff27082c99a 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -1549,6 +1549,11 @@
       <category>Kotlin</category>
     </intentionAction>
 
+    <intentionAction>
+      <className>org.jetbrains.kotlin.idea.intentions.AddOpenModifierIntention</className>
+      <category>Kotlin</category>
+    </intentionAction>
+
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ObjectLiteralToLambdaInspection"
                      displayName="Object literal can be converted to lambda"
                      groupName="Kotlin"
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/AddOpenModifierIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/AddOpenModifierIntention.kt
new file mode 100644
index 00000000000..f0c1b1621b1
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/AddOpenModifierIntention.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.intentions
+
+import com.intellij.codeInsight.intention.LowPriorityAction
+import com.intellij.openapi.editor.Editor
+import org.jetbrains.kotlin.idea.core.implicitModality
+import org.jetbrains.kotlin.lexer.KtTokens
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
+
+class AddOpenModifierIntention : SelfTargetingIntention<KtCallableDeclaration>(
+        KtCallableDeclaration::class.java, "Make open"
+), LowPriorityAction {
+
+    override fun isApplicableTo(element: KtCallableDeclaration, caretOffset: Int): Boolean {
+        if (element !is KtProperty && element !is KtNamedFunction) {
+            return false
+        }
+        if (element.hasModifier(KtTokens.OPEN_KEYWORD)
+            || element.hasModifier(KtTokens.ABSTRACT_KEYWORD)
+            || element.hasModifier(KtTokens.PRIVATE_KEYWORD)) {
+            return false
+        }
+        val implicitModality = element.implicitModality()
+        if (implicitModality == KtTokens.OPEN_KEYWORD || implicitModality == KtTokens.ABSTRACT_KEYWORD) return false
+        val ktClassOrObject = element.containingClassOrObject ?: return false
+        return ktClassOrObject.hasModifier(KtTokens.ENUM_KEYWORD)
+               || ktClassOrObject.hasModifier(KtTokens.OPEN_KEYWORD)
+               || ktClassOrObject.hasModifier(KtTokens.ABSTRACT_KEYWORD)
+               || ktClassOrObject.hasModifier(KtTokens.SEALED_KEYWORD)
+    }
+
+    override fun applyTo(element: KtCallableDeclaration, editor: Editor?) {
+        element.addModifier(KtTokens.OPEN_KEYWORD)
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/.intention b/idea/testData/intentions/addOpenModifier/.intention
new file mode 100644
index 00000000000..f83a0b94391
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/.intention
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.AddOpenModifierIntention
diff --git a/idea/testData/intentions/addOpenModifier/abstractClass.kt b/idea/testData/intentions/addOpenModifier/abstractClass.kt
new file mode 100644
index 00000000000..896d9299c81
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/abstractClass.kt
@@ -0,0 +1,4 @@
+abstract class Foo {
+    fun<caret> bar() {
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/abstractClass.kt.after b/idea/testData/intentions/addOpenModifier/abstractClass.kt.after
new file mode 100644
index 00000000000..85b23f6dbb2
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/abstractClass.kt.after
@@ -0,0 +1,4 @@
+abstract class Foo {
+    open fun bar() {
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/abstractFunction.kt b/idea/testData/intentions/addOpenModifier/abstractFunction.kt
new file mode 100644
index 00000000000..9334d315d53
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/abstractFunction.kt
@@ -0,0 +1,5 @@
+// IS_APPLICABLE: false
+
+abstract class Foo {
+    abstract fun<caret> bar()
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/alreadyOpen.kt b/idea/testData/intentions/addOpenModifier/alreadyOpen.kt
new file mode 100644
index 00000000000..3444cf6c1c3
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/alreadyOpen.kt
@@ -0,0 +1,6 @@
+// IS_APPLICABLE: false
+
+open class Foo {
+    open fun<caret> bar() {
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/destructuringDeclaration.kt b/idea/testData/intentions/addOpenModifier/destructuringDeclaration.kt
new file mode 100644
index 00000000000..82e42479412
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/destructuringDeclaration.kt
@@ -0,0 +1,7 @@
+// IS_APPLICABLE: false
+
+data class Bar(val foo: Int, val bar: Int)
+
+open class Foo {
+    <caret>var (foo, bar) = Bar(1, 1)
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/enumClass.kt b/idea/testData/intentions/addOpenModifier/enumClass.kt
new file mode 100644
index 00000000000..56a7c80ab6e
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/enumClass.kt
@@ -0,0 +1,5 @@
+enum class E {
+    SINGLE;
+
+    <caret>fun bar() {}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/enumClass.kt.after b/idea/testData/intentions/addOpenModifier/enumClass.kt.after
new file mode 100644
index 00000000000..3e548ab9ccf
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/enumClass.kt.after
@@ -0,0 +1,5 @@
+enum class E {
+    SINGLE;
+
+    open fun bar() {}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/function.kt b/idea/testData/intentions/addOpenModifier/function.kt
new file mode 100644
index 00000000000..a0e000225f5
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/function.kt
@@ -0,0 +1,4 @@
+open class Foo {
+    fun<caret> bar() {
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/function.kt.after b/idea/testData/intentions/addOpenModifier/function.kt.after
new file mode 100644
index 00000000000..6ce57d115af
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/function.kt.after
@@ -0,0 +1,4 @@
+open class Foo {
+    open fun bar() {
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/interface.kt b/idea/testData/intentions/addOpenModifier/interface.kt
new file mode 100644
index 00000000000..907a55dfa49
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/interface.kt
@@ -0,0 +1,5 @@
+// IS_APPLICABLE: false
+
+interface Foo {
+    fun<caret> bar()
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/localFunction.kt b/idea/testData/intentions/addOpenModifier/localFunction.kt
new file mode 100644
index 00000000000..a27e49c03ed
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/localFunction.kt
@@ -0,0 +1,9 @@
+// IS_APPLICABLE: false
+
+open class Foo {
+    fun bar() {
+        fun <caret> foo() {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/localProperty.kt b/idea/testData/intentions/addOpenModifier/localProperty.kt
new file mode 100644
index 00000000000..bc8a6ee0972
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/localProperty.kt
@@ -0,0 +1,7 @@
+// IS_APPLICABLE: false
+
+open class Foo {
+    fun bar() {
+        var<caret> foo = 1
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/notOpen.kt b/idea/testData/intentions/addOpenModifier/notOpen.kt
new file mode 100644
index 00000000000..a8f1805eb93
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/notOpen.kt
@@ -0,0 +1,6 @@
+// IS_APPLICABLE: false
+
+class Foo {
+    fun<caret> bar() {
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/parameter.kt b/idea/testData/intentions/addOpenModifier/parameter.kt
new file mode 100644
index 00000000000..a199d260ea2
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/parameter.kt
@@ -0,0 +1,6 @@
+// IS_APPLICABLE: false
+
+open class Foo {
+    open fun bar(<caret>foo: Int) {
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/private.kt b/idea/testData/intentions/addOpenModifier/private.kt
new file mode 100644
index 00000000000..de6aa348e00
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/private.kt
@@ -0,0 +1,6 @@
+// IS_APPLICABLE: false
+
+open class Foo {
+    private fun<caret> bar() {
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/property.kt b/idea/testData/intentions/addOpenModifier/property.kt
new file mode 100644
index 00000000000..a8dac6322fd
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/property.kt
@@ -0,0 +1,3 @@
+open class Foo {
+    var<caret> bar = 0
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/property.kt.after b/idea/testData/intentions/addOpenModifier/property.kt.after
new file mode 100644
index 00000000000..519bcb0abd5
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/property.kt.after
@@ -0,0 +1,3 @@
+open class Foo {
+    open var bar = 0
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/sealedClass.kt b/idea/testData/intentions/addOpenModifier/sealedClass.kt
new file mode 100644
index 00000000000..91059494c70
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/sealedClass.kt
@@ -0,0 +1,4 @@
+sealed class Foo {
+    fun<caret> bar() {
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addOpenModifier/sealedClass.kt.after b/idea/testData/intentions/addOpenModifier/sealedClass.kt.after
new file mode 100644
index 00000000000..04e2476c6fe
--- /dev/null
+++ b/idea/testData/intentions/addOpenModifier/sealedClass.kt.after
@@ -0,0 +1,4 @@
+sealed class Foo {
+    open fun bar() {
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/quickfix/removeUnused/triangle.kt b/idea/testData/quickfix/removeUnused/triangle.kt
index e8d47943938..a03fcd5b9c9 100644
--- a/idea/testData/quickfix/removeUnused/triangle.kt
+++ b/idea/testData/quickfix/removeUnused/triangle.kt
@@ -4,6 +4,7 @@
 // ACTION: Convert to block body
 // ACTION: Move to companion object
 // ACTION: Specify return type explicitly
+// ACTION: Make open
 
 interface Inter {
     fun something(): String
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index be897dd03d1..6d9b7fe59bd 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -531,6 +531,99 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         }
     }
 
+    @TestMetadata("idea/testData/intentions/addOpenModifier")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class AddOpenModifier extends AbstractIntentionTest {
+        @TestMetadata("abstractClass.kt")
+        public void testAbstractClass() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOpenModifier/abstractClass.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("abstractFunction.kt")
+        public void testAbstractFunction() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOpenModifier/abstractFunction.kt");
+            doTest(fileName);
+        }
+
+        public void testAllFilesPresentInAddOpenModifier() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/addOpenModifier"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true);
+        }
+
+        @TestMetadata("alreadyOpen.kt")
+        public void testAlreadyOpen() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOpenModifier/alreadyOpen.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("destructuringDeclaration.kt")
+        public void testDestructuringDeclaration() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOpenModifier/destructuringDeclaration.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("enumClass.kt")
+        public void testEnumClass() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOpenModifier/enumClass.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("function.kt")
+        public void testFunction() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOpenModifier/function.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("interface.kt")
+        public void testInterface() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOpenModifier/interface.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("localFunction.kt")
+        public void testLocalFunction() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOpenModifier/localFunction.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("localProperty.kt")
+        public void testLocalProperty() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOpenModifier/localProperty.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("notOpen.kt")
+        public void testNotOpen() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOpenModifier/notOpen.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("parameter.kt")
+        public void testParameter() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOpenModifier/parameter.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("private.kt")
+        public void testPrivate() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOpenModifier/private.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("property.kt")
+        public void testProperty() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOpenModifier/property.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("sealedClass.kt")
+        public void testSealedClass() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOpenModifier/sealedClass.kt");
+            doTest(fileName);
+        }
+    }
+
     @TestMetadata("idea/testData/intentions/addOperatorModifier")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)