From 0bce06dc0fb6b5707faf7d5bcf8ff4a68f23baf3 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 22 Sep 2017 18:21:37 +0300 Subject: [PATCH] Synchronize cleanupTool = true with CleanupLocalInspectionTool So #KT-20366 Fixed --- idea/src/META-INF/plugin.xml | 8 ++++++++ .../inspections/ConflictingExtensionPropertyInspection.kt | 2 +- .../idea/inspections/NullChecksToSafeCallInspection.kt | 2 +- .../kotlin/idea/inspections/RedundantGetterInspection.kt | 2 +- .../kotlin/idea/inspections/RedundantSetterInspection.kt | 2 +- .../idea/inspections/RedundantUnitReturnTypeInspection.kt | 3 ++- .../idea/inspections/SuspiciousEqualsCombination.kt | 3 +-- 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index e1e06bfed0a..1d1d11b8309 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -1740,6 +1740,7 @@ groupPath="Kotlin" groupName="Redundant constructs" enabledByDefault="true" + cleanupTool="true" level="WEAK WARNING" language="kotlin" /> @@ -2120,6 +2121,7 @@ groupPath="Kotlin" groupName="Redundant constructs" enabledByDefault="true" + cleanupTool="true" level="WEAK WARNING" language="kotlin" /> @@ -2129,6 +2131,7 @@ groupPath="Kotlin" groupName="Redundant constructs" enabledByDefault="true" + cleanupTool="true" level="INFO" language="kotlin" /> @@ -2202,6 +2205,7 @@ groupPath="Kotlin" groupName="Redundant constructs" enabledByDefault="true" + cleanupTool="true" level="WEAK WARNING" language="kotlin" /> @@ -2211,6 +2215,7 @@ groupPath="Kotlin" groupName="Redundant constructs" enabledByDefault="true" + cleanupTool="true" level="WEAK WARNING" language="kotlin" /> @@ -2346,6 +2351,7 @@ groupPath="Kotlin" groupName="Style issues" enabledByDefault="true" + cleanupTool="true" level="INFO" language="kotlin" /> @@ -2472,6 +2478,7 @@ groupPath="Kotlin" groupName="Redundant constructs" enabledByDefault="true" + cleanupTool="true" level="WEAK WARNING" language="kotlin" /> @@ -2571,6 +2578,7 @@ groupPath="Kotlin" groupName="Redundant constructs" enabledByDefault="true" + cleanupTool="true" level="WEAK WARNING" language="kotlin" /> diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt index c98dcb7fa04..8dbe2357433 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt @@ -58,7 +58,7 @@ import org.jetbrains.kotlin.resolve.scopes.collectSyntheticExtensionProperties import org.jetbrains.kotlin.synthetic.SyntheticJavaPropertyDescriptor import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull -class ConflictingExtensionPropertyInspection : AbstractKotlinInspection(), CleanupLocalInspectionTool { +class ConflictingExtensionPropertyInspection : AbstractKotlinInspection() { override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean, session: LocalInspectionToolSession): PsiElementVisitor { val file = session.file as? KtFile ?: return PsiElementVisitor.EMPTY_VISITOR val resolutionFacade = file.getResolutionFacade() diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/NullChecksToSafeCallInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/NullChecksToSafeCallInspection.kt index 5aa894e519b..bcac51efc65 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/NullChecksToSafeCallInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/NullChecksToSafeCallInspection.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.types.TypeUtils -class NullChecksToSafeCallInspection : AbstractKotlinInspection(), CleanupLocalInspectionTool { +class NullChecksToSafeCallInspection : AbstractKotlinInspection() { override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean, session: LocalInspectionToolSession) = object : KtVisitorVoid() { override fun visitBinaryExpression(expression: KtBinaryExpression) { diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantGetterInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantGetterInspection.kt index 7c0aa2eab9e..43766544da4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantGetterInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantGetterInspection.kt @@ -21,7 +21,7 @@ import com.intellij.openapi.project.Project import com.intellij.psi.PsiElementVisitor import org.jetbrains.kotlin.psi.* -class RedundantGetterInspection : AbstractKotlinInspection() { +class RedundantGetterInspection : AbstractKotlinInspection(), CleanupLocalInspectionTool { override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean, session: LocalInspectionToolSession): PsiElementVisitor { return object : KtVisitorVoid() { override fun visitPropertyAccessor(accessor: KtPropertyAccessor) { diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSetterInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSetterInspection.kt index 567154cabdd..9a69b87bcba 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSetterInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSetterInspection.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* -class RedundantSetterInspection : AbstractKotlinInspection() { +class RedundantSetterInspection : AbstractKotlinInspection(), CleanupLocalInspectionTool { override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean, session: LocalInspectionToolSession): PsiElementVisitor { return object : KtVisitorVoid() { override fun visitPropertyAccessor(accessor: KtPropertyAccessor) { diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantUnitReturnTypeInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantUnitReturnTypeInspection.kt index 88c3ebedaea..b69a475ecd5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantUnitReturnTypeInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantUnitReturnTypeInspection.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.idea.inspections +import com.intellij.codeInspection.CleanupLocalInspectionTool import com.intellij.codeInspection.IntentionWrapper import com.intellij.codeInspection.ProblemHighlightType import com.intellij.codeInspection.ProblemsHolder @@ -31,7 +32,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.types.typeUtil.isNothing import org.jetbrains.kotlin.types.typeUtil.isUnit -class RedundantUnitReturnTypeInspection : AbstractKotlinInspection() { +class RedundantUnitReturnTypeInspection : AbstractKotlinInspection(), CleanupLocalInspectionTool { override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor { return object : KtVisitorVoid() { override fun visitNamedFunction(function: KtNamedFunction) { diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/SuspiciousEqualsCombination.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/SuspiciousEqualsCombination.kt index af38c0a9b3b..8abedda09ac 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/SuspiciousEqualsCombination.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/SuspiciousEqualsCombination.kt @@ -16,14 +16,13 @@ package org.jetbrains.kotlin.idea.inspections -import com.intellij.codeInspection.CleanupLocalInspectionTool import com.intellij.codeInspection.LocalInspectionToolSession import com.intellij.codeInspection.ProblemHighlightType import com.intellij.codeInspection.ProblemsHolder import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* -class SuspiciousEqualsCombination : AbstractKotlinInspection(), CleanupLocalInspectionTool { +class SuspiciousEqualsCombination : AbstractKotlinInspection() { override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean, session: LocalInspectionToolSession) = object : KtVisitorVoid() { override fun visitBinaryExpression(expression: KtBinaryExpression) {