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

Destructure inspection: do not apply on variable declarations or function literals without explicit parameters + name & severity changed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-10-06 14:22:09 +03:00
parent 37debf4436
commit dd7d7a5fc7
3 changed files with 53 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
+2 -2
View File
@@ -1639,11 +1639,11 @@
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.DestructureInspection" <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.DestructureInspection"
displayName="Can be simplified using destructing declaration" displayName="Use destructuring declaration"
groupName="Kotlin" groupName="Kotlin"
enabledByDefault="true" enabledByDefault="true"
cleanupTool="false" cleanupTool="false"
level="WEAK WARNING" level="INFO"
language="kotlin" language="kotlin"
/> />
idea/src/org/jetbrains/kotlin/idea/intentions/DestructureIntention.kt
+7 -2
View File
@@ -39,11 +39,16 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
import java.util.* import java.util.*
class DestructureInspection : IntentionBasedInspection<KtDeclaration>(DestructureIntention::class) class DestructureInspection : IntentionBasedInspection<KtDeclaration>(
DestructureIntention::class,
additionalChecker = { declaration ->
declaration !is KtVariableDeclaration && declaration !is KtFunctionLiteral
}
)
class DestructureIntention : SelfTargetingRangeIntention<KtDeclaration>( class DestructureIntention : SelfTargetingRangeIntention<KtDeclaration>(
KtDeclaration::class.java, KtDeclaration::class.java,
"Simplify using destructuring declaration" "Use destructuring declaration"
) { ) {
override fun applyTo(element: KtDeclaration, editor: Editor?) { override fun applyTo(element: KtDeclaration, editor: Editor?) {
val forLoop = element.parent as? KtForExpression val forLoop = element.parent as? KtForExpression
idea/testData/intentions/iterationOverMap/inspectionData/expected.xml
Vendored
+44 -44
View File
@@ -4,175 +4,175 @@
<line>4</line> <line>4</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="SomeQualifiedExpressionInRange.kt" /> <entry_point TYPE="file" FQNAME="SomeQualifiedExpressionInRange.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>Simple.kt</file> <file>Simple.kt</file>
<line>5</line> <line>5</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="Simple.kt" /> <entry_point TYPE="file" FQNAME="Simple.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>PropertiesNames.kt</file> <file>PropertiesNames.kt</file>
<line>5</line> <line>5</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="PropertiesNames.kt" /> <entry_point TYPE="file" FQNAME="PropertiesNames.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>Getters.kt</file> <file>Getters.kt</file>
<line>5</line> <line>5</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="Getters.kt" /> <entry_point TYPE="file" FQNAME="Getters.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>DataClassParametersOrder.kt</file> <file>DataClassParametersOrder.kt</file>
<line>5</line> <line>5</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="DataClassParametersOrder.kt" /> <entry_point TYPE="file" FQNAME="DataClassParametersOrder.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>DataClass.kt</file> <file>DataClass.kt</file>
<line>5</line> <line>5</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="DataClass.kt" /> <entry_point TYPE="file" FQNAME="DataClass.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>EntriesCallIsMissing.kt</file> <file>EntriesCallIsMissing.kt</file>
<line>6</line> <line>6</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="EntriesCallIsMissing.kt" /> <entry_point TYPE="file" FQNAME="EntriesCallIsMissing.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>DataClassFirstNPropertiesUsed.kt</file> <file>DataClassFirstNPropertiesUsed.kt</file>
<line>5</line> <line>5</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="DataClassFirstNPropertiesUsed.kt" /> <entry_point TYPE="file" FQNAME="DataClassFirstNPropertiesUsed.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>CaretOffset.kt</file> <file>CaretOffset.kt</file>
<line>6</line> <line>6</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="CaretOffset.kt" /> <entry_point TYPE="file" FQNAME="CaretOffset.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>DataClassNoVariablesInside.kt</file> <file>DataClassNoVariablesInside.kt</file>
<line>5</line> <line>5</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/DataClassNoVariablesInside.kt" /> <entry_point TYPE="file" FQNAME="temp:///src/DataClassNoVariablesInside.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>DataClassNoVariablesMultiUsages.kt</file> <file>DataClassNoVariablesMultiUsages.kt</file>
<line>5</line> <line>5</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/DataClassNoVariablesMultiUsages.kt" /> <entry_point TYPE="file" FQNAME="temp:///src/DataClassNoVariablesMultiUsages.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>DataClassPropertyBetweenUsages.kt</file> <file>DataClassPropertyBetweenUsages.kt</file>
<line>5</line> <line>5</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/DataClassPropertyBetweenUsages.kt" /> <entry_point TYPE="file" FQNAME="temp:///src/DataClassPropertyBetweenUsages.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>DataClassSecondVariable.kt</file> <file>DataClassSecondVariable.kt</file>
<line>5</line> <line>5</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/DataClassSecondVariable.kt" /> <entry_point TYPE="file" FQNAME="temp:///src/DataClassSecondVariable.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>DataClassWithExternalUsage.kt</file> <file>DataClassWithExternalUsage.kt</file>
<line>5</line> <line>5</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/DataClassWithExternalUsage.kt" /> <entry_point TYPE="file" FQNAME="temp:///src/DataClassWithExternalUsage.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>DataClassDependentLocal.kt</file> <file>DataClassDependentLocal.kt</file>
<line>6</line> <line>6</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/DataClassDependentLocal.kt" /> <entry_point TYPE="file" FQNAME="temp:///src/DataClassDependentLocal.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>DataClassFirstVariable.kt</file> <file>DataClassFirstVariable.kt</file>
<line>5</line> <line>5</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/DataClassFirstVariable.kt" /> <entry_point TYPE="file" FQNAME="temp:///src/DataClassFirstVariable.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>MapNoProperties.kt</file> <file>MapNoProperties.kt</file>
<line>4</line> <line>4</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/MapNoProperties.kt" /> <entry_point TYPE="file" FQNAME="temp:///src/MapNoProperties.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>ValueOnly.kt</file> <file>ValueOnly.kt</file>
<line>5</line> <line>5</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/ValueOnly.kt" /> <entry_point TYPE="file" FQNAME="temp:///src/ValueOnly.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>KeyOnly.kt</file> <file>KeyOnly.kt</file>
<line>5</line> <line>5</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/KeyOnly.kt" /> <entry_point TYPE="file" FQNAME="temp:///src/KeyOnly.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>DataClassNotAllPropertiesUsed.kt</file> <file>DataClassNotAllPropertiesUsed.kt</file>
<line>5</line> <line>5</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/DataClassNotAllPropertiesUsed.kt" /> <entry_point TYPE="file" FQNAME="temp:///src/DataClassNotAllPropertiesUsed.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>DataClassLast.kt</file> <file>DataClassLast.kt</file>
<line>6</line> <line>6</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/DataClassLast.kt" /> <entry_point TYPE="file" FQNAME="temp:///src/DataClassLast.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
<problem> <problem>
<file>DataClassNameConflict.kt</file> <file>DataClassNameConflict.kt</file>
<line>7</line> <line>7</line>
<module>light_idea_test_case</module> <module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/DataClassNameConflict.kt" /> <entry_point TYPE="file" FQNAME="temp:///src/DataClassNameConflict.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Can be simplified using destructuring declaration</problem_class> <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Simplify using destructuring declaration</description> <description>Use destructuring declaration</description>
</problem> </problem>
</problems> </problems>