jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-04 08:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring: MoveAssignmentToInitializer --> JoinDeclarationAndAssignment

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-11-17 14:32:52 +03:00
parent d4995c07f7
commit c44ecded42
22 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
idea/resources/intentionDescriptions/MoveAssignmentToInitializerIntention/after.kt.template → idea/resources/intentionDescriptions/JoinDeclarationAndAssignmentIntention/after.kt.template
View File

0
idea/resources/intentionDescriptions/MoveAssignmentToInitializerIntention/before.kt.template → idea/resources/intentionDescriptions/JoinDeclarationAndAssignmentIntention/before.kt.template
View File

5
idea/resources/intentionDescriptions/JoinDeclarationAndAssignmentIntention/description.html Normal file
View File

@@ -0,0 +1,5 @@
<html>
<body>
This intention joins the declaration of a property / variable and the first assignment into the property / variable
</body>
</html>

5
idea/resources/intentionDescriptions/MoveAssignmentToInitializerIntention/description.html
View File

@@ -1,5 +0,0 @@
<html>
<body>
This intention moves an assignment to a property into the initializer of that property.
</body>
</html>

2
idea/src/META-INF/plugin.xml
View File

@@ -1254,7 +1254,7 @@
</intentionAction>
<intentionAction>
<className>org.jetbrains.kotlin.idea.intentions.MoveAssignmentToInitializerIntention</className>
<className>org.jetbrains.kotlin.idea.intentions.JoinDeclarationAndAssignmentIntention</className>
<category>Kotlin</category>
</intentionAction>

4
idea/src/org/jetbrains/kotlin/idea/intentions/MoveAssignmentToInitializerIntention.kt → idea/src/org/jetbrains/kotlin/idea/intentions/JoinDeclarationAndAssignmentIntention.kt
View File

@@ -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>(KtBinaryExpression::class.java, "Move assignment to initializer") {
class JoinDeclarationAndAssignmentIntention :
SelfTargetingIntention<KtBinaryExpression>(KtBinaryExpression::class.java, "Join declaration and assignment") {
override fun isApplicableTo(element: KtBinaryExpression, caretOffset: Int): Boolean {
if (element.operationToken != KtTokens.EQ) {

1
idea/testData/intentions/joinDeclarationAndAssignment/.intention vendored Normal file
View File

@@ -0,0 +1 @@
org.jetbrains.kotlin.idea.intentions.JoinDeclarationAndAssignmentIntention

0
idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType.kt → idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType.kt vendored
View File

0
idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType.kt.after → idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType.kt.after vendored
View File

0
idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType2.kt → idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType2.kt vendored
View File

0
idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType2.kt.after → idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType2.kt.after vendored
View File

0
idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType3.kt → idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType3.kt vendored
View File

0
idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType3.kt.after → idea/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType3.kt.after vendored
View File

0
idea/testData/intentions/moveAssignmentToInitializer/comment.kt → idea/testData/intentions/joinDeclarationAndAssignment/comment.kt vendored
View File

0
idea/testData/intentions/moveAssignmentToInitializer/comment.kt.after → idea/testData/intentions/joinDeclarationAndAssignment/comment.kt.after vendored
View File

0
idea/testData/intentions/moveAssignmentToInitializer/deleteInitBlock.kt → idea/testData/intentions/joinDeclarationAndAssignment/deleteInitBlock.kt vendored
View File

0
idea/testData/intentions/moveAssignmentToInitializer/deleteInitBlock.kt.after → idea/testData/intentions/joinDeclarationAndAssignment/deleteInitBlock.kt.after vendored
View File

0
idea/testData/intentions/moveAssignmentToInitializer/simple.kt → idea/testData/intentions/joinDeclarationAndAssignment/simple.kt vendored
View File

0
idea/testData/intentions/moveAssignmentToInitializer/simple.kt.after → idea/testData/intentions/joinDeclarationAndAssignment/simple.kt.after vendored
View File

0
idea/testData/intentions/moveAssignmentToInitializer/usedLocal.kt → idea/testData/intentions/joinDeclarationAndAssignment/usedLocal.kt vendored
View File

1
idea/testData/intentions/moveAssignmentToInitializer/.intention vendored
View File

@@ -1 +0,0 @@
org.jetbrains.kotlin.idea.intentions.MoveAssignmentToInitializerIntention

102
idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
View File

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