Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KT-4854: Inspection to detect redundant type arguments #460

Merged
merged 1 commit into from
May 5, 2014
Merged

KT-4854: Inspection to detect redundant type arguments #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions idea/resources/inspectionDescriptions/RemoveExplicitTypeArgs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<html>
<body>
This inspection reports any function call wiith type arguments that can be safely removed and inferred
</body>
</html>
8 changes: 7 additions & 1 deletion idea/src/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,6 @@
<className>org.jetbrains.jet.plugin.intentions.SimplifyBooleanWithConstantsIntention</className>
<category>Kotlin</category>
</intentionAction>


<intentionAction>
<className>org.jetbrains.jet.plugin.intentions.SwapBinaryExpression</className>
Expand Down Expand Up @@ -718,6 +717,13 @@
level="WARNING"
/>

<localInspection implementationClass="org.jetbrains.jet.plugin.inspections.RemoveExplicitTypeArgsInspection"
displayName="Type arguments are unnecessary"
groupName="Kotlin"
enabledByDefault="true"
level="WARNING"
/>

<project.converterProvider implementation="org.jetbrains.jet.plugin.converters.JetRunConfigurationSettingsFormatConverterProvider"/>

</extensions>
Expand Down
22 changes: 22 additions & 0 deletions idea/src/org/jetbrains/jet/plugin/inspections/RemoveExplicitTypeArgsInspection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.RemoveExplicitTypeArguments
import org.jetbrains.jet.lang.psi.JetCallExpression

public class RemoveExplicitTypeArgsInspection : IntentionBasedInspection<JetCallExpression>(RemoveExplicitTypeArguments())
101 changes: 101 additions & 0 deletions idea/testData/intentions/removeExplicitTypeArguments/inspectionData/expected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<problems>
<problem>
<file>variableStringFartherScope.kt</file>
<line>5</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/variableStringFartherScope.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Type arguments are unnecessary</problem_class>
<description>Remove explicit type arguments</description>
</problem>

<problem>
<file>fourLiterals.kt</file>
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/fourLiterals.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Type arguments are unnecessary</problem_class>
<description>Remove explicit type arguments</description>
</problem>

<problem>
<file>literalStringWithClass.kt</file>
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/literalStringWithClass.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Type arguments are unnecessary</problem_class>
<description>Remove explicit type arguments</description>
</problem>

<problem>
<file>lambdaType.kt</file>
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/lambdaType.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Type arguments are unnecessary</problem_class>
<description>Remove explicit type arguments</description>
</problem>

<problem>
<file>literalAny.kt</file>
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/literalAny.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Type arguments are unnecessary</problem_class>
<description>Remove explicit type arguments</description>
</problem>

<problem>
<file>literalString.kt</file>
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/literalString.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Type arguments are unnecessary</problem_class>
<description>Remove explicit type arguments</description>
</problem>

<problem>
<file>variablesAndLiterals.kt</file>
<line>5</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/variablesAndLiterals.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Type arguments are unnecessary</problem_class>
<description>Remove explicit type arguments</description>
</problem>

<problem>
<file>literalsWhenTypeArgHasTypeArg.kt</file>
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/literalsWhenTypeArgHasTypeArg.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Type arguments are unnecessary</problem_class>
<description>Remove explicit type arguments</description>
</problem>

<problem>
<file>variableString.kt</file>
<line>4</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/variableString.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Type arguments are unnecessary</problem_class>
<description>Remove explicit type arguments</description>
</problem>

<problem>
<file>variableString2.kt</file>
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/variableString2.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Type arguments are unnecessary</problem_class>
<description>Remove explicit type arguments</description>
</problem>

<problem>
<file>twoLiteralValues.kt</file>
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/twoLiteralValues.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Type arguments are unnecessary</problem_class>
<description>Remove explicit type arguments</description>
</problem>

</problems>
1 change: 1 addition & 0 deletions idea/testData/intentions/removeExplicitTypeArguments/inspectionData/inspections.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// INSPECTION_CLASS: org.jetbrains.jet.plugin.inspections.RemoveExplicitTypeArgsInspection
5 changes: 5 additions & 0 deletions idea/tests/org/jetbrains/jet/plugin/codeInsight/JetInspectionTestGenerated.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,9 @@ public void testBranched_ifThenToSafeAccess_inspectionData_Inspections_test() th
doTest("idea/testData/intentions/branched/ifThenToSafeAccess/inspectionData/inspections.test");
}

@TestMetadata("removeExplicitTypeArguments/inspectionData/inspections.test")
public void testRemoveExplicitTypeArguments_inspectionData_Inspections_test() throws Exception {
doTest("idea/testData/intentions/removeExplicitTypeArguments/inspectionData/inspections.test");
}

}
9 changes: 8 additions & 1 deletion idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*
* 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.
Expand Down Expand Up @@ -3719,6 +3720,7 @@ public void testSimpleInsertTypeFun() throws Exception {
}

@TestMetadata("idea/testData/intentions/removeExplicitTypeArguments")
@InnerTestClasses({})
public static class RemoveExplicitTypeArguments extends AbstractCodeTransformationTest {
public void testAllFilesPresentInRemoveExplicitTypeArguments() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/intentions/removeExplicitTypeArguments"), Pattern.compile("^(.+)\\.kt$"), true);
Expand Down Expand Up @@ -3799,6 +3801,11 @@ public void testVariablesAndLiterals() throws Exception {
doTestRemoveExplicitTypeArguments("idea/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt");
}

public static Test innerSuite() {
TestSuite suite = new TestSuite("RemoveExplicitTypeArguments");
suite.addTestSuite(RemoveExplicitTypeArguments.class);
return suite;
}
}

@TestMetadata("idea/testData/intentions/convertAssertToIf")
Expand Down Expand Up @@ -4171,7 +4178,7 @@ public static Test suite() {
suite.addTestSuite(ReplaceWithTraditionalAssignment.class);
suite.addTestSuite(SimplifyBooleanWithConstants.class);
suite.addTestSuite(InsertExplicitTypeArguments.class);
suite.addTestSuite(RemoveExplicitTypeArguments.class);
suite.addTest(RemoveExplicitTypeArguments.innerSuite());
suite.addTestSuite(ConvertAssertToIf.class);
suite.addTestSuite(ConvertIfToAssert.class);
suite.addTestSuite(MakeTypeExplicitInLambda.class);
Expand Down