From 32dba0afa265fdc7a12656b2864858b064884aa2 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Mon, 23 Mar 2020 20:59:24 +0700 Subject: [PATCH] Move implementation of `runForWholeFile` field to xml --- idea/resources/META-INF/plugin-common.xml | 2 ++ idea/resources/META-INF/plugin-common.xml.191 | 2 ++ idea/resources/META-INF/plugin-common.xml.192 | 2 ++ .../kotlin/idea/inspections/KotlinUnusedImportInspection.kt | 2 -- .../org/jetbrains/kotlin/idea/inspections/ReformatInspection.kt | 2 -- .../jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt | 2 -- .../idea/inspections/kdoc/KDocMissingDocumentationInspection.kt | 2 -- .../kotlin/idea/inspections/InspectionDescriptionTest.kt | 2 ++ 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/idea/resources/META-INF/plugin-common.xml b/idea/resources/META-INF/plugin-common.xml index e1bf2b4c4b4..04d38556dd2 100644 --- a/idea/resources/META-INF/plugin-common.xml +++ b/idea/resources/META-INF/plugin-common.xml @@ -1751,6 +1751,7 @@ enabledByDefault="false" level="WEAK WARNING" language="kotlin" + runForWholeFile="true" /> ? { if (file !is KtFile) return null val data = analyzeImports(file) ?: return null diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/ReformatInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/ReformatInspection.kt index b93efc783c3..e7c534739aa 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/ReformatInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/ReformatInspection.kt @@ -38,8 +38,6 @@ class ReformatInspection : LocalInspectionTool() { @XmlAttribute var processChangedFilesOnly: Boolean = false - override fun runForWholeFile(): Boolean = true - override fun checkFile(file: PsiFile, manager: InspectionManager, isOnTheFly: Boolean): Array? { return checkFile(file, isOnTheFly)?.toTypedArray() } diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt index 886dc01bc7e..a1ac7ec101e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt @@ -198,8 +198,6 @@ class UnusedSymbolInspection : AbstractKotlinInspection() { } } - override fun runForWholeFile() = true - override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean, session: LocalInspectionToolSession): PsiElementVisitor { return namedDeclarationVisitor(fun(declaration) { ProgressManager.checkCanceled() diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/kdoc/KDocMissingDocumentationInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/kdoc/KDocMissingDocumentationInspection.kt index 184b7414a57..5a79d165694 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/kdoc/KDocMissingDocumentationInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/kdoc/KDocMissingDocumentationInspection.kt @@ -52,8 +52,6 @@ class KDocMissingDocumentationInspection : AbstractKotlinInspection() { } - override fun runForWholeFile(): Boolean = true - class AddDocumentationFix : LocalQuickFix { override fun getName(): String = KotlinBundle.message("add.documentation.fix.text") diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/InspectionDescriptionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/inspections/InspectionDescriptionTest.kt index c5357ac2eea..27f4b2a6db9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/inspections/InspectionDescriptionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/InspectionDescriptionTest.kt @@ -110,8 +110,10 @@ class InspectionDescriptionTest : LightPlatformTestCase() { checkValue(failMessages, toolName, "suppressId", ep.id, ep.getShortName(), tool.id) checkValue(failMessages, toolName, "alternateId", ep.alternativeId, null, tool.alternativeID) checkValue(failMessages, toolName, "shortName", ep.getShortName(), null, tool.shortName) + checkValue(failMessages, toolName, "runForWholeFile", null, "false", tool.runForWholeFile().toString()) } } + UsefulTestCase.assertEmpty(StringUtil.join(failMessages, "\n"), failMessages) }