Renamed intention

This commit is contained in:
Valentin Kipyatkov
2015-04-29 19:39:38 +03:00
parent 435e9fed3f
commit 475a361b32
23 changed files with 18 additions and 18 deletions
+2 -2
View File
@@ -776,7 +776,7 @@
</intentionAction> </intentionAction>
<intentionAction> <intentionAction>
<className>org.jetbrains.kotlin.idea.intentions.ReplaceWithOperatorAssignIntention</className> <className>org.jetbrains.kotlin.idea.intentions.ReplaceWithOperatorAssignmentIntention</className>
<category>Kotlin</category> <category>Kotlin</category>
</intentionAction> </intentionAction>
@@ -912,7 +912,7 @@
level="WEAK WARNING" level="WEAK WARNING"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ReplaceWithOperatorAssignInspection" <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ReplaceWithOperatorAssignmentInspection"
displayName="Replace with operator-assignment" displayName="Replace with operator-assignment"
groupName="Kotlin" groupName="Kotlin"
enabledByDefault="true" enabledByDefault="true"
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.idea.util.psi.patternMatching.matches import org.jetbrains.kotlin.idea.util.psi.patternMatching.matches
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
public class ReplaceWithOperatorAssignIntention : JetSelfTargetingOffsetIndependentIntention<JetBinaryExpression>(javaClass(), "Replace with operator-assignment") { public class ReplaceWithOperatorAssignmentIntention : JetSelfTargetingOffsetIndependentIntention<JetBinaryExpression>(javaClass(), "Replace with operator-assignment") {
override fun isApplicableTo(element: JetBinaryExpression): Boolean { override fun isApplicableTo(element: JetBinaryExpression): Boolean {
if (element.getOperationToken() != JetTokens.EQ) return false if (element.getOperationToken() != JetTokens.EQ) return false
@@ -38,5 +38,5 @@ public class RemoveExplicitTypeArgsInspection : IntentionBasedInspection<JetType
public class SimplifyBinaryNegationInspection : IntentionBasedInspection<JetPrefixExpression>(SimplifyNegatedBinaryExpressionIntention()) public class SimplifyBinaryNegationInspection : IntentionBasedInspection<JetPrefixExpression>(SimplifyNegatedBinaryExpressionIntention())
public class ReplaceWithOperatorAssignInspection : IntentionBasedInspection<JetBinaryExpression>(ReplaceWithOperatorAssignIntention()) public class ReplaceWithOperatorAssignmentInspection : IntentionBasedInspection<JetBinaryExpression>(ReplaceWithOperatorAssignmentIntention())
@@ -1 +0,0 @@
org.jetbrains.kotlin.idea.intentions.ReplaceWithOperatorAssignIntention
@@ -0,0 +1 @@
org.jetbrains.kotlin.idea.intentions.ReplaceWithOperatorAssignmentIntention
@@ -5355,65 +5355,65 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
} }
} }
@TestMetadata("idea/testData/intentions/replaceWithOperatorAssign") @TestMetadata("idea/testData/intentions/replaceWithOperatorAssignment")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class ReplaceWithOperatorAssign extends AbstractIntentionTest { public static class ReplaceWithOperatorAssignment extends AbstractIntentionTest {
public void testAllFilesPresentInReplaceWithOperatorAssign() throws Exception { public void testAllFilesPresentInReplaceWithOperatorAssignment() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithOperatorAssign"), Pattern.compile("^(.+)\\.kt$"), true); JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithOperatorAssignment"), Pattern.compile("^(.+)\\.kt$"), true);
} }
@TestMetadata("illegalMultipleOperators.kt") @TestMetadata("illegalMultipleOperators.kt")
public void testIllegalMultipleOperators() throws Exception { public void testIllegalMultipleOperators() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/illegalMultipleOperators.kt"); String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/illegalMultipleOperators.kt");
doTest(fileName); doTest(fileName);
} }
@TestMetadata("illegalMultipleOperatorsMiddle.kt") @TestMetadata("illegalMultipleOperatorsMiddle.kt")
public void testIllegalMultipleOperatorsMiddle() throws Exception { public void testIllegalMultipleOperatorsMiddle() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/illegalMultipleOperatorsMiddle.kt"); String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/illegalMultipleOperatorsMiddle.kt");
doTest(fileName); doTest(fileName);
} }
@TestMetadata("invalidSubtraction.kt") @TestMetadata("invalidSubtraction.kt")
public void testInvalidSubtraction() throws Exception { public void testInvalidSubtraction() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/invalidSubtraction.kt"); String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/invalidSubtraction.kt");
doTest(fileName); doTest(fileName);
} }
@TestMetadata("multipleOperators.kt") @TestMetadata("multipleOperators.kt")
public void testMultipleOperators() throws Exception { public void testMultipleOperators() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/multipleOperators.kt"); String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/multipleOperators.kt");
doTest(fileName); doTest(fileName);
} }
@TestMetadata("multipleOperatorsRightSideRepeat.kt") @TestMetadata("multipleOperatorsRightSideRepeat.kt")
public void testMultipleOperatorsRightSideRepeat() throws Exception { public void testMultipleOperatorsRightSideRepeat() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/multipleOperatorsRightSideRepeat.kt"); String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt");
doTest(fileName); doTest(fileName);
} }
@TestMetadata("nonRepeatingAssignment.kt") @TestMetadata("nonRepeatingAssignment.kt")
public void testNonRepeatingAssignment() throws Exception { public void testNonRepeatingAssignment() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/nonRepeatingAssignment.kt"); String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/nonRepeatingAssignment.kt");
doTest(fileName); doTest(fileName);
} }
@TestMetadata("rightSideRepeat.kt") @TestMetadata("rightSideRepeat.kt")
public void testRightSideRepeat() throws Exception { public void testRightSideRepeat() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/rightSideRepeat.kt"); String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/rightSideRepeat.kt");
doTest(fileName); doTest(fileName);
} }
@TestMetadata("simpleAssign.kt") @TestMetadata("simpleAssign.kt")
public void testSimpleAssign() throws Exception { public void testSimpleAssign() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/simpleAssign.kt"); String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/simpleAssign.kt");
doTest(fileName); doTest(fileName);
} }
@TestMetadata("validSubtraction.kt") @TestMetadata("validSubtraction.kt")
public void testValidSubtraction() throws Exception { public void testValidSubtraction() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/validSubtraction.kt"); String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/validSubtraction.kt");
doTest(fileName); doTest(fileName);
} }
} }