azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added ifThenToElvisInspection

Browse Source 
Conflicts:
	idea/src/META-INF/plugin.xml
This commit is contained in:
Zack Grannan
2014-03-30 21:20:13 -07:00
parent cfc16b410e
commit 328607a3ab
7 changed files with 136 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/inspectionDescriptions/IfThenToElvis.html
+5
View File
@@ -0,0 +1,5 @@
<html>
<body>
This inspection reports any if-then expressions that can be folded into elvis (?:) expressions
</body>
</html>
idea/src/META-INF/plugin.xml
+14 -6
View File
@@ -638,12 +638,6 @@
<category>Kotlin</category> <category>Kotlin</category>
</intentionAction> </intentionAction>
<localInspection implementationClass="org.jetbrains.jet.plugin.inspections.ExplicitGetInspection"
displayName="Explicit 'get'"
groupName="Kotlin"
enabledByDefault="true"
level="WARNING"
/>
<intentionAction> <intentionAction>
<className>org.jetbrains.jet.plugin.intentions.SwapBinaryExpression</className> <className>org.jetbrains.jet.plugin.intentions.SwapBinaryExpression</className>
@@ -665,6 +659,20 @@
<category>Kotlin</category> <category>Kotlin</category>
</intentionAction> </intentionAction>
<localInspection implementationClass="org.jetbrains.jet.plugin.inspections.ExplicitGetInspection"
displayName="Explicit 'get'"
groupName="Kotlin"
enabledByDefault="true"
level="WARNING"
/>
<localInspection implementationClass="org.jetbrains.jet.plugin.inspections.IfThenToElvisInspection"
displayName="If-Then foldable to '?:'"
groupName="Kotlin"
enabledByDefault="true"
level="WARNING"
/>
<project.converterProvider implementation="org.jetbrains.jet.plugin.converters.JetRunConfigurationSettingsFormatConverterProvider"/> <project.converterProvider implementation="org.jetbrains.jet.plugin.converters.JetRunConfigurationSettingsFormatConverterProvider"/>
</extensions> </extensions>
idea/src/org/jetbrains/jet/plugin/inspections/IfThenToElvisInspection.kt
+22
View File
@@ -0,0 +1,22 @@
/*
* Copyright 2010-2014 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.jet.plugin.inspections
import org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.IfThenToElvisIntention
import org.jetbrains.jet.lang.psi.JetIfExpression
public class IfThenToElvisInspection : IntentionBasedInspection<JetIfExpression>(IfThenToElvisIntention())
idea/testData/intentions/branched/ifThenToElvis/inspectionData/expected.xml
+82
View File
@@ -0,0 +1,82 @@
<problems>
<problem>
<file>willNotInlineClassProperty.kt</file>
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/willNotInlineClassProperty.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>rhsNotEqualsNull.kt</file>
<line>9</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/rhsNotEqualsNull.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>rhsEqualsNull.kt</file>
<line>8</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/rhsEqualsNull.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>lhsNotEqualsNull.kt</file>
<line>8</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/lhsNotEqualsNull.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>lhsEqualsNull.kt</file>
<line>8</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/lhsEqualsNull.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>ifAsExpression.kt</file>
<line>8</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/ifAsExpression.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>ifAndElseNotInBlocks.kt</file>
<line>8</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/ifAndElseNotInBlocks.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>ifAndElseBothInBlocks.kt</file>
<line>8</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/ifAndElseBothInBlocks.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>doesNotinlineValueOutsideOfScope.kt</file>
<line>8</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/doesNotinlineValueOutsideOfScope.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>doesNotinlineValueIfUsedMoreThanOnce.kt</file>
<line>11</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/doesNotinlineValueIfUsedMoreThanOnce.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
</problems>
idea/testData/intentions/branched/ifThenToElvis/inspectionData/inspections.test
+1
View File
@@ -0,0 +1 @@
// INSPECTION_CLASS: org.jetbrains.jet.plugin.inspections.IfThenToElvisInspection
idea/tests/org/jetbrains/jet/plugin/codeInsight/JetInspectionTestGenerated.java
+5
View File
@@ -41,4 +41,9 @@ public class JetInspectionTestGenerated extends AbstractJetInspectionTest {
doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/inspectionData/inspections.test"); doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/inspectionData/inspections.test");
} }
@TestMetadata("branched/ifThenToElvis/inspectionData/inspections.test")
public void testBranched_ifThenToElvis_inspectionData_Inspections_test() throws Exception {
doTest("idea/testData/intentions/branched/ifThenToElvis/inspectionData/inspections.test");
}
} }
idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java
+7 -1
View File
@@ -96,6 +96,7 @@ public class CodeTransformationTestGenerated extends AbstractCodeTransformationT
} }
@TestMetadata("idea/testData/intentions/branched/ifThenToElvis") @TestMetadata("idea/testData/intentions/branched/ifThenToElvis")
@InnerTestClasses({})
public static class IfThenToElvis extends AbstractCodeTransformationTest { public static class IfThenToElvis extends AbstractCodeTransformationTest {
public void testAllFilesPresentInIfThenToElvis() throws Exception { public void testAllFilesPresentInIfThenToElvis() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/intentions/branched/ifThenToElvis"), Pattern.compile("^(.+)\\.kt$"), true); JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/intentions/branched/ifThenToElvis"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -236,6 +237,11 @@ public class CodeTransformationTestGenerated extends AbstractCodeTransformationT
doTestIfThenToElvis("idea/testData/intentions/branched/ifThenToElvis/willNotInlineClassProperty.kt"); doTestIfThenToElvis("idea/testData/intentions/branched/ifThenToElvis/willNotInlineClassProperty.kt");
} }
public static Test innerSuite() {
TestSuite suite = new TestSuite("IfThenToElvis");
suite.addTestSuite(IfThenToElvis.class);
return suite;
}
} }
@TestMetadata("idea/testData/intentions/branched/safeAccessToIfThen") @TestMetadata("idea/testData/intentions/branched/safeAccessToIfThen")
@@ -3418,7 +3424,7 @@ public class CodeTransformationTestGenerated extends AbstractCodeTransformationT
public static Test suite() { public static Test suite() {
TestSuite suite = new TestSuite("CodeTransformationTestGenerated"); TestSuite suite = new TestSuite("CodeTransformationTestGenerated");
suite.addTestSuite(ElvisToIfThen.class); suite.addTestSuite(ElvisToIfThen.class);
suite.addTestSuite(IfThenToElvis.class); suite.addTest(IfThenToElvis.innerSuite());
suite.addTestSuite(SafeAccessToIfThen.class); suite.addTestSuite(SafeAccessToIfThen.class);
suite.addTestSuite(IfThenToSafeAccess.class); suite.addTestSuite(IfThenToSafeAccess.class);
suite.addTestSuite(IfToAssignment.class); suite.addTestSuite(IfToAssignment.class);