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

For each parameter not used: cleanup

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-12-06 17:18:11 +03:00
parent 9aa1d1495b
commit e06c995516
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/ForEachParameterNotUsedInspection.kt
+6 -7
View File
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameOrNull import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameOrNull
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
class ForEachParameterNotUsedInspection : AbstractKotlinInspection() { class ForEachParameterNotUsedInspection : AbstractKotlinInspection() {
companion object { companion object {
@@ -32,16 +31,16 @@ class ForEachParameterNotUsedInspection : AbstractKotlinInspection() {
} }
override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor { override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
return callExpressionVisitor { return callExpressionVisitor(fun(it: KtCallExpression) {
val calleeExpression = it.calleeExpression as? KtNameReferenceExpression val calleeExpression = it.calleeExpression as? KtNameReferenceExpression
if (calleeExpression?.getReferencedName() != FOREACH_NAME) return@callExpressionVisitor if (calleeExpression?.getReferencedName() != FOREACH_NAME) return
val lambda = it.lambdaArguments.singleOrNull()?.getLambdaExpression() val lambda = it.lambdaArguments.singleOrNull()?.getLambdaExpression()
if (lambda == null || lambda.functionLiteral.arrow != null) return@callExpressionVisitor if (lambda == null || lambda.functionLiteral.arrow != null) return
val context = it.analyze() val context = it.analyze()
when (it.getResolvedCall(context)?.resultingDescriptor?.fqNameOrNull()) { when (it.getResolvedCall(context)?.resultingDescriptor?.fqNameOrNull()) {
COLLECTIONS_FOREACH_FQNAME, SEQUENCES_FOREACH_FQNAME -> { COLLECTIONS_FOREACH_FQNAME, SEQUENCES_FOREACH_FQNAME -> {
val descriptor = context[BindingContext.FUNCTION, lambda.functionLiteral] ?: return@callExpressionVisitor val descriptor = context[BindingContext.FUNCTION, lambda.functionLiteral] ?: return
val iterableParameter = descriptor.valueParameters.singleOrNull() ?: return@callExpressionVisitor val iterableParameter = descriptor.valueParameters.singleOrNull() ?: return
if (iterableParameter !is WithDestructuringDeclaration && if (iterableParameter !is WithDestructuringDeclaration &&
!lambda.bodyExpression.usesDescriptor(iterableParameter, context) !lambda.bodyExpression.usesDescriptor(iterableParameter, context)
@@ -55,7 +54,7 @@ class ForEachParameterNotUsedInspection : AbstractKotlinInspection() {
} }
} }
} }
} })
} }
private class IntroduceAnonymousParameterFix : LocalQuickFix { private class IntroduceAnonymousParameterFix : LocalQuickFix {