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

Redundant Unit inspection: fix false positive for single expression

Browse Source 
So #KT-22097 Fixed
This commit is contained in:
Toshiaki Kameyama
2018-01-19 09:39:26 +03:00
committed by Mikhail Glukhikh
parent 30acc224ec
commit 18de0f75ab
16 changed files with 175 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/RedundantUnitExpressionInspection.kt
+41 -13
View File
@@ -9,30 +9,58 @@ import com.intellij.codeInspection.*
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElementVisitor
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.intentions.loopToCallChain.previousStatement
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
import org.jetbrains.kotlin.psi.psiUtil.lastBlockStatementOrThis
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.types.typeUtil.isUnit
class RedundantUnitExpressionInspection : AbstractKotlinInspection(), CleanupLocalInspectionTool {
override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean, session: LocalInspectionToolSession): PsiElementVisitor {
return referenceExpressionVisitor(fun(expression) {
if (KotlinBuiltIns.FQ_NAMES.unit.shortName() != (expression as? KtNameReferenceExpression)?.getReferencedNameAsName()) {
return
if (expression.isRedundantUnit()) {
holder.registerProblem(
expression,
"Redundant 'Unit'",
ProblemHighlightType.LIKE_UNUSED_SYMBOL,
RemoveRedundantUnitFix()
)
}
val parent = expression.parent
if (parent !is KtReturnExpression && parent !is KtBlockExpression) return
// Do not report just 'Unit' in function literals (return@label Unit is OK even in literals)
if (parent is KtBlockExpression && parent.getParentOfType<KtFunctionLiteral>(strict = true) != null) return
holder.registerProblem(expression,
"Redundant 'Unit'",
ProblemHighlightType.LIKE_UNUSED_SYMBOL,
RemoveRedundantUnitFix())
})
}
}
private fun KtReferenceExpression.isRedundantUnit(): Boolean {
if (!isUnitLiteral()) return false
val parent = this.parent ?: return false
if (parent is KtReturnExpression) return true
if (parent is KtBlockExpression) {
// Do not report just 'Unit' in function literals (return@label Unit is OK even in literals)
if (parent.getParentOfType<KtFunctionLiteral>(strict = true) != null) return false
if (this == parent.lastBlockStatementOrThis()) {
val prev = this.previousStatement() ?: return true
if (prev.isUnitLiteral()) return true
if (prev.getResolvedCall(analyze())?.resultingDescriptor?.returnType?.isUnit() == true) return true
if (prev is KtDeclaration) {
return if (prev is KtFunction)
parent.parent?.parent?.let { it is KtIfExpression || it is KtWhenExpression } != true
else
true
}
return false
}
return true
}
return false
}
private fun KtExpression.isUnitLiteral(): Boolean =
KotlinBuiltIns.FQ_NAMES.unit.shortName() == (this as? KtNameReferenceExpression)?.getReferencedNameAsName()
private class RemoveRedundantUnitFix : LocalQuickFix {
override fun getName() = "Remove redundant 'Unit'"