diff --git a/idea/resources/intentionDescriptions/MoveAssignmentToInitializerIntention/after.kt.template b/idea/resources/intentionDescriptions/JoinDeclarationAndAssignmentIntention/after.kt.template
similarity index 100%
rename from idea/resources/intentionDescriptions/MoveAssignmentToInitializerIntention/after.kt.template
rename to idea/resources/intentionDescriptions/JoinDeclarationAndAssignmentIntention/after.kt.template
diff --git a/idea/resources/intentionDescriptions/MoveAssignmentToInitializerIntention/before.kt.template b/idea/resources/intentionDescriptions/JoinDeclarationAndAssignmentIntention/before.kt.template
similarity index 100%
rename from idea/resources/intentionDescriptions/MoveAssignmentToInitializerIntention/before.kt.template
rename to idea/resources/intentionDescriptions/JoinDeclarationAndAssignmentIntention/before.kt.template
diff --git a/idea/resources/intentionDescriptions/JoinDeclarationAndAssignmentIntention/description.html b/idea/resources/intentionDescriptions/JoinDeclarationAndAssignmentIntention/description.html
new file mode 100644
index 00000000000..9c5a549ce1c
--- /dev/null
+++ b/idea/resources/intentionDescriptions/JoinDeclarationAndAssignmentIntention/description.html
@@ -0,0 +1,5 @@
+
+
+This intention joins the declaration of a property / variable and the first assignment into the property / variable
+
+
diff --git a/idea/resources/intentionDescriptions/MoveAssignmentToInitializerIntention/description.html b/idea/resources/intentionDescriptions/MoveAssignmentToInitializerIntention/description.html
deleted file mode 100644
index cc169d2277d..00000000000
--- a/idea/resources/intentionDescriptions/MoveAssignmentToInitializerIntention/description.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-This intention moves an assignment to a property into the initializer of that property.
-
-
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 07ae7dd56f7..4dcd6dd4e83 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -1254,7 +1254,7 @@
- org.jetbrains.kotlin.idea.intentions.MoveAssignmentToInitializerIntention
+ org.jetbrains.kotlin.idea.intentions.JoinDeclarationAndAssignmentIntention
Kotlin
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveAssignmentToInitializerIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/JoinDeclarationAndAssignmentIntention.kt
similarity index 97%
rename from idea/src/org/jetbrains/kotlin/idea/intentions/MoveAssignmentToInitializerIntention.kt
rename to idea/src/org/jetbrains/kotlin/idea/intentions/JoinDeclarationAndAssignmentIntention.kt
index d997c108678..da83e388ee3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveAssignmentToInitializerIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/JoinDeclarationAndAssignmentIntention.kt
@@ -29,8 +29,8 @@ import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.*
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
-class MoveAssignmentToInitializerIntention :
- SelfTargetingIntention(KtBinaryExpression::class.java, "Move assignment to initializer") {
+class JoinDeclarationAndAssignmentIntention :
+ SelfTargetingIntention(KtBinaryExpression::class.java, "Join declaration and assignment") {
override fun isApplicableTo(element: KtBinaryExpression, caretOffset: Int): Boolean {
if (element.operationToken != KtTokens.EQ) {
diff --git a/idea/testData/intentions/joinDeclarationAndAssignment/.intention b/idea/testData/intentions/joinDeclarationAndAssignment/.intention
new file mode 100644
index 00000000000..1b3db8f4633
--- /dev/null
+++ b/idea/testData/intentions/joinDeclarationAndAssignment/.intention
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.JoinDeclarationAndAssignmentIntention
\ No newline at end of file
diff --git a/idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType.kt b/idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType.kt
similarity index 100%
rename from idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType.kt
rename to idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType.kt
diff --git a/idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType.kt.after b/idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType.kt.after
similarity index 100%
rename from idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType.kt.after
rename to idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType.kt.after
diff --git a/idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType2.kt b/idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType2.kt
similarity index 100%
rename from idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType2.kt
rename to idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType2.kt
diff --git a/idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType2.kt.after b/idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType2.kt.after
similarity index 100%
rename from idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType2.kt.after
rename to idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType2.kt.after
diff --git a/idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType3.kt b/idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType3.kt
similarity index 100%
rename from idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType3.kt
rename to idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType3.kt
diff --git a/idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType3.kt.after b/idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType3.kt.after
similarity index 100%
rename from idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType3.kt.after
rename to idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType3.kt.after
diff --git a/idea/testData/intentions/moveAssignmentToInitializer/comment.kt b/idea/testData/intentions/joinDeclarationAndAssignment/comment.kt
similarity index 100%
rename from idea/testData/intentions/moveAssignmentToInitializer/comment.kt
rename to idea/testData/intentions/joinDeclarationAndAssignment/comment.kt
diff --git a/idea/testData/intentions/moveAssignmentToInitializer/comment.kt.after b/idea/testData/intentions/joinDeclarationAndAssignment/comment.kt.after
similarity index 100%
rename from idea/testData/intentions/moveAssignmentToInitializer/comment.kt.after
rename to idea/testData/intentions/joinDeclarationAndAssignment/comment.kt.after
diff --git a/idea/testData/intentions/moveAssignmentToInitializer/deleteInitBlock.kt b/idea/testData/intentions/joinDeclarationAndAssignment/deleteInitBlock.kt
similarity index 100%
rename from idea/testData/intentions/moveAssignmentToInitializer/deleteInitBlock.kt
rename to idea/testData/intentions/joinDeclarationAndAssignment/deleteInitBlock.kt
diff --git a/idea/testData/intentions/moveAssignmentToInitializer/deleteInitBlock.kt.after b/idea/testData/intentions/joinDeclarationAndAssignment/deleteInitBlock.kt.after
similarity index 100%
rename from idea/testData/intentions/moveAssignmentToInitializer/deleteInitBlock.kt.after
rename to idea/testData/intentions/joinDeclarationAndAssignment/deleteInitBlock.kt.after
diff --git a/idea/testData/intentions/moveAssignmentToInitializer/simple.kt b/idea/testData/intentions/joinDeclarationAndAssignment/simple.kt
similarity index 100%
rename from idea/testData/intentions/moveAssignmentToInitializer/simple.kt
rename to idea/testData/intentions/joinDeclarationAndAssignment/simple.kt
diff --git a/idea/testData/intentions/moveAssignmentToInitializer/simple.kt.after b/idea/testData/intentions/joinDeclarationAndAssignment/simple.kt.after
similarity index 100%
rename from idea/testData/intentions/moveAssignmentToInitializer/simple.kt.after
rename to idea/testData/intentions/joinDeclarationAndAssignment/simple.kt.after
diff --git a/idea/testData/intentions/moveAssignmentToInitializer/usedLocal.kt b/idea/testData/intentions/joinDeclarationAndAssignment/usedLocal.kt
similarity index 100%
rename from idea/testData/intentions/moveAssignmentToInitializer/usedLocal.kt
rename to idea/testData/intentions/joinDeclarationAndAssignment/usedLocal.kt
diff --git a/idea/testData/intentions/moveAssignmentToInitializer/.intention b/idea/testData/intentions/moveAssignmentToInitializer/.intention
deleted file mode 100644
index 56aa1921251..00000000000
--- a/idea/testData/intentions/moveAssignmentToInitializer/.intention
+++ /dev/null
@@ -1 +0,0 @@
-org.jetbrains.kotlin.idea.intentions.MoveAssignmentToInitializerIntention
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index a984068cc4d..190d073ce89 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -8038,6 +8038,57 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
}
+ @TestMetadata("idea/testData/intentions/joinDeclarationAndAssignment")
+ @TestDataPath("$PROJECT_ROOT")
+ @RunWith(JUnit3RunnerWithInners.class)
+ public static class JoinDeclarationAndAssignment extends AbstractIntentionTest {
+ public void testAllFilesPresentInJoinDeclarationAndAssignment() throws Exception {
+ KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/joinDeclarationAndAssignment"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true);
+ }
+
+ @TestMetadata("cannotRemoveType.kt")
+ public void testCannotRemoveType() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("cannotRemoveType2.kt")
+ public void testCannotRemoveType2() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType2.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("cannotRemoveType3.kt")
+ public void testCannotRemoveType3() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType3.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("comment.kt")
+ public void testComment() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/joinDeclarationAndAssignment/comment.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("deleteInitBlock.kt")
+ public void testDeleteInitBlock() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/joinDeclarationAndAssignment/deleteInitBlock.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("simple.kt")
+ public void testSimple() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/joinDeclarationAndAssignment/simple.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("usedLocal.kt")
+ public void testUsedLocal() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/joinDeclarationAndAssignment/usedLocal.kt");
+ doTest(fileName);
+ }
+ }
+
@TestMetadata("idea/testData/intentions/loopToCallChain")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -9592,57 +9643,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
}
}
- @TestMetadata("idea/testData/intentions/moveAssignmentToInitializer")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class MoveAssignmentToInitializer extends AbstractIntentionTest {
- public void testAllFilesPresentInMoveAssignmentToInitializer() throws Exception {
- KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/moveAssignmentToInitializer"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true);
- }
-
- @TestMetadata("cannotRemoveType.kt")
- public void testCannotRemoveType() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType.kt");
- doTest(fileName);
- }
-
- @TestMetadata("cannotRemoveType2.kt")
- public void testCannotRemoveType2() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType2.kt");
- doTest(fileName);
- }
-
- @TestMetadata("cannotRemoveType3.kt")
- public void testCannotRemoveType3() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType3.kt");
- doTest(fileName);
- }
-
- @TestMetadata("comment.kt")
- public void testComment() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/comment.kt");
- doTest(fileName);
- }
-
- @TestMetadata("deleteInitBlock.kt")
- public void testDeleteInitBlock() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/deleteInitBlock.kt");
- doTest(fileName);
- }
-
- @TestMetadata("simple.kt")
- public void testSimple() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/simple.kt");
- doTest(fileName);
- }
-
- @TestMetadata("usedLocal.kt")
- public void testUsedLocal() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/usedLocal.kt");
- doTest(fileName);
- }
- }
-
@TestMetadata("idea/testData/intentions/moveLambdaInsideParentheses")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)