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

Don't suggest destructuring if at least half components not used

Browse Source 
So #KT-16828 Fixed
This commit is contained in:
mglukhikh
2017-03-31 13:10:40 +03:00
committed by Mikhail Glukhikh
parent 318314f1a4
commit feb9dd4d83
8 changed files with 52 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/DestructureIntention.kt
+6 -2
View File
@@ -48,9 +48,13 @@ import java.util.*
class DestructureInspection : IntentionBasedInspection<KtDeclaration>(
DestructureIntention::class,
{ element, _ ->
if (element is KtParameter) true
val usagesToRemove = DestructureIntention.collectUsagesToRemove(element)?.data
if (element is KtParameter) {
usagesToRemove != null &&
(usagesToRemove.any { it.declarationToDrop is KtDestructuringDeclaration } ||
usagesToRemove.filter { it.usagesToReplace.isNotEmpty() }.size > usagesToRemove.size / 2)
}
else {
val usagesToRemove = DestructureIntention.collectUsagesToRemove(element)?.data
usagesToRemove?.any { it.declarationToDrop is KtDestructuringDeclaration } ?: false
}
}
idea/testData/intentions/destructuringInLambda/inspectionData/expected.xml
Vendored
+4 -4
View File
@@ -24,10 +24,10 @@
<description>Use destructuring declaration</description>
</problem>
<problem>
<file>last.kt</file>
<file>twoOfThree.kt</file>
<line>6</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/last.kt" />
<entry_point TYPE="file" FQNAME="temp:///src/twoOfThree.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Use destructuring declaration</description>
</problem>
@@ -64,10 +64,10 @@
<description>Use destructuring declaration</description>
</problem>
<problem>
<file>mapIndexedLast.kt</file>
<file>mapIndexedExceptFirst.kt</file>
<line>5</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/mapIndexedLast.kt" />
<entry_point TYPE="file" FQNAME="temp:///src/mapIndexedExceptFirst.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Use destructuring declaration</description>
</problem>
idea/testData/intentions/destructuringInLambda/mapIndexedExceptFirst.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
// WITH_RUNTIME
data class Package(val name: String, val version: String, val source: String, val id: Int)
val pkgs = listOf<Package>().mapIndexed { i, <caret>p -> "${p.name} ${p.version}" to i + p.id }.toMap()
idea/testData/intentions/destructuringInLambda/mapIndexedExceptFirst.kt.after
Vendored
+5
View File
@@ -0,0 +1,5 @@
// WITH_RUNTIME
data class Package(val name: String, val version: String, val source: String, val id: Int)
val pkgs = listOf<Package>().mapIndexed { i, (name, version, _, id) -> "${name} ${version}" to i + id }.toMap()
idea/testData/intentions/destructuringInLambda/twoOfThree.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
// WITH_RUNTIME
data class My(val first: String, val second: Int, val third: Boolean)
fun foo(list: List<My>) {
list.forEach { my<caret> ->
println(my.second)
println(my.third)
}
}
idea/testData/intentions/destructuringInLambda/twoOfThree.kt.after
Vendored
+10
View File
@@ -0,0 +1,10 @@
// WITH_RUNTIME
data class My(val first: String, val second: Int, val third: Boolean)
fun foo(list: List<My>) {
list.forEach { (_, second, third) ->
println(second)
println(third)
}
}
idea/testData/intentions/iterationOverMap/inspectionData/expected.xml
Vendored
-16
View File
@@ -135,14 +135,6 @@
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Use destructuring declaration</description>
</problem>
<problem>
<file>ValueOnly.kt</file>
<line>5</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/ValueOnly.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Use destructuring declaration</description>
</problem>
<problem>
<file>KeyOnly.kt</file>
<line>5</line>
@@ -159,14 +151,6 @@
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Use destructuring declaration</description>
</problem>
<problem>
<file>DataClassLast.kt</file>
<line>6</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/DataClassLast.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Use destructuring declaration</problem_class>
<description>Use destructuring declaration</description>
</problem>
<problem>
<file>DataClassNameConflict.kt</file>
<line>7</line>
idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+12
View File
@@ -7645,6 +7645,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
doTest(fileName);
}
@TestMetadata("mapIndexedExceptFirst.kt")
public void testMapIndexedExceptFirst() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/destructuringInLambda/mapIndexedExceptFirst.kt");
doTest(fileName);
}
@TestMetadata("mapIndexedLast.kt")
public void testMapIndexedLast() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/destructuringInLambda/mapIndexedLast.kt");
@@ -7687,6 +7693,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
doTest(fileName);
}
@TestMetadata("twoOfThree.kt")
public void testTwoOfThree() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/destructuringInLambda/twoOfThree.kt");
doTest(fileName);
}
@TestMetadata("variables.kt")
public void testVariables() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/destructuringInLambda/variables.kt");