From 89cc796ca0624966cbd3389e39a5686083efd349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Thu, 23 Feb 2023 11:08:06 +0100 Subject: [PATCH] [devkit] DevKitUastInspectionBase cleanup CTOR usages GitOrigin-RevId: 91176ac65fe7954653aaa35ff78eda9f675ffeb3 --- .../devkit-core/src/inspections/DevKitUastInspectionBase.java | 4 ++++ .../src/inspections/IncorrectParentDisposableInspection.kt | 4 ++-- .../NonFinalOrNonInternalExtensionClassInspection.kt | 2 +- .../src/inspections/RetrievingLightServiceInspection.kt | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/devkit/devkit-core/src/inspections/DevKitUastInspectionBase.java b/plugins/devkit/devkit-core/src/inspections/DevKitUastInspectionBase.java index 3dddd8a43b3e..e8f74f56f2ad 100644 --- a/plugins/devkit/devkit-core/src/inspections/DevKitUastInspectionBase.java +++ b/plugins/devkit/devkit-core/src/inspections/DevKitUastInspectionBase.java @@ -9,6 +9,7 @@ import com.intellij.psi.PsiElementVisitor; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.uast.UCallExpression; +import org.jetbrains.uast.UClass; import org.jetbrains.uast.UElement; import org.jetbrains.uast.UIdentifier; @@ -17,6 +18,9 @@ public abstract class DevKitUastInspectionBase extends AbstractBaseUastLocalInsp protected DevKitUastInspectionBase() { } + /** + * When *NOT* overriding {@link #buildInternalVisitor} but using {@code checkClass|Method|Field}. + */ @SafeVarargs protected DevKitUastInspectionBase(Class... uElementsTypesHint) { super(uElementsTypesHint); diff --git a/plugins/devkit/devkit-core/src/inspections/IncorrectParentDisposableInspection.kt b/plugins/devkit/devkit-core/src/inspections/IncorrectParentDisposableInspection.kt index 9fa89163d67f..a9c60c0bebdc 100644 --- a/plugins/devkit/devkit-core/src/inspections/IncorrectParentDisposableInspection.kt +++ b/plugins/devkit/devkit-core/src/inspections/IncorrectParentDisposableInspection.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.idea.devkit.inspections import com.intellij.codeInspection.ProblemsHolder @@ -17,7 +17,7 @@ import org.jetbrains.uast.UCallExpression import org.jetbrains.uast.UExpression import org.jetbrains.uast.visitor.AbstractUastNonRecursiveVisitor -class IncorrectParentDisposableInspection : DevKitUastInspectionBase(UCallExpression::class.java) { +class IncorrectParentDisposableInspection : DevKitUastInspectionBase() { override fun isAllowed(holder: ProblemsHolder): Boolean = DevKitInspectionUtil.isAllowedInPluginsOnly(holder.file) diff --git a/plugins/devkit/devkit-core/src/inspections/NonFinalOrNonInternalExtensionClassInspection.kt b/plugins/devkit/devkit-core/src/inspections/NonFinalOrNonInternalExtensionClassInspection.kt index b709a7185540..ec0f02592c17 100644 --- a/plugins/devkit/devkit-core/src/inspections/NonFinalOrNonInternalExtensionClassInspection.kt +++ b/plugins/devkit/devkit-core/src/inspections/NonFinalOrNonInternalExtensionClassInspection.kt @@ -27,7 +27,7 @@ import org.jetbrains.uast.UastVisibility import org.jetbrains.uast.getAnchorPsi import org.jetbrains.uast.visitor.AbstractUastNonRecursiveVisitor -internal class NonFinalOrNonInternalExtensionClassInspection : DevKitUastInspectionBase(UClass::class.java) { +internal class NonFinalOrNonInternalExtensionClassInspection : DevKitUastInspectionBase() { override fun buildInternalVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor = UastHintedVisitorAdapter.create( holder.file.language, object : AbstractUastNonRecursiveVisitor() { override fun visitClass(node: UClass): Boolean { diff --git a/plugins/devkit/devkit-core/src/inspections/RetrievingLightServiceInspection.kt b/plugins/devkit/devkit-core/src/inspections/RetrievingLightServiceInspection.kt index 9f2b5b3fb90b..2447fadbdde4 100644 --- a/plugins/devkit/devkit-core/src/inspections/RetrievingLightServiceInspection.kt +++ b/plugins/devkit/devkit-core/src/inspections/RetrievingLightServiceInspection.kt @@ -20,7 +20,7 @@ import org.jetbrains.uast.generate.UastCodeGenerationPlugin import org.jetbrains.uast.generate.replace import org.jetbrains.uast.visitor.AbstractUastNonRecursiveVisitor -internal class RetrievingLightServiceInspection : DevKitUastInspectionBase(UQualifiedReferenceExpression::class.java) { +internal class RetrievingLightServiceInspection : DevKitUastInspectionBase() { private val COMPONENT_MANAGER_FQN = ComponentManager::class.java.canonicalName private val COMPONENT_MANAGER_GET_SERVICE: CallMatcher = CallMatcher.anyOf( CallMatcher.instanceCall(COMPONENT_MANAGER_FQN, "getService").parameterTypes(CommonClassNames.JAVA_LANG_CLASS),