MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 11:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

[jvm] IJ-CR-7495 Improve double annotation warning

Browse Source 
GitOrigin-RevId: 2355929a6fde8a87adb2ed82cd5ed621dcf29aba
This commit is contained in:
Bart van Helvert
2021-04-06 17:09:08 +02:00
committed by intellij-monorepo-bot
parent f5a265aa7f
commit 9a078fac63
3 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
jvm/jvm-analysis-impl/src/com/intellij/codeInspection/TestOnlyInspection.kt
View File

@@ -23,6 +23,12 @@ class TestOnlyInspection : AbstractBaseUastLocalInspectionTool() {
processor: TestOnlyApiUsageProcessor,
private val holder: ProblemsHolder
) : ApiUsageUastVisitor(processor) {
override fun visitClass(node: UClass): Boolean {
super.visitClass(node)
checkDoubleAnnotation(node)
return true
}
override fun visitMethod(node: UMethod): Boolean {
super.visitMethod(node)
checkDoubleAnnotation(node)
@@ -36,15 +42,15 @@ class TestOnlyInspection : AbstractBaseUastLocalInspectionTool() {
}
private fun checkDoubleAnnotation(elem: UDeclaration) {
val javaPsi = elem.javaPsi
if (javaPsi !is PsiMember) return
val vft = findVisibleForTestingAnnotation(javaPsi)
if (vft != null && isDirectlyTestOnly(javaPsi)) {
val toHighlight = elem.uastAnchor.sourcePsiElement ?: return
val vft = elem.uAnnotations.find { visibleForTestingAnnotations.contains(it.qualifiedName) } ?: return
if (isDirectlyTestOnly(elem)) {
val vftSourcePsi = vft.sourcePsi ?: return
val vftJavaPsi = vft.javaPsi ?: return
val elemJavaPsi = elem.javaPsi
holder.registerProblem(
toHighlight,
vftSourcePsi,
JvmAnalysisBundle.message("jvm.inspections.testonly.visiblefortesting"),
RemoveAnnotationQuickFix(vft, javaPsi as PsiModifierListOwner)
RemoveAnnotationQuickFix(vftJavaPsi, elemJavaPsi as PsiModifierListOwner)
)
return
}
@@ -70,7 +76,7 @@ class TestOnlyInspection : AbstractBaseUastLocalInspectionTool() {
val sourcePsi = place.sourcePsi ?: return
val uMember = member.toUElement() ?: return
if (uMember !is UDeclaration) return
val vft = findVisibleForTestingAnnotation(member)
val vft = AnnotationUtil.findAnnotation(member, visibleForTestingAnnotations)
if (vft == null && !isAnnotatedAsTestOnly(uMember)) return
if (isInsideTestOnlyMethod(place)) return
if (isInsideTestOnlyField(place)) return
@@ -119,8 +125,7 @@ class TestOnlyInspection : AbstractBaseUastLocalInspectionTool() {
private fun isInsideTestOnlyClass(elem: UElement) = isAnnotatedAsTestOnly(elem.getTopLevelParentOfType(UClass::class.java))
private fun isAnnotatedAsTestOnly(member: UDeclaration?): Boolean {
val javaPsi = member?.javaPsi ?: return false
return javaPsi is PsiModifierListOwner && (isDirectlyTestOnly(javaPsi) || isAnnotatedAsTestOnly(member.getContainingUClass()))
return member != null && (isDirectlyTestOnly(member) || isAnnotatedAsTestOnly(member.getContainingUClass()))
}
private fun isInsideTestClass(elem: UElement): Boolean {
@@ -155,11 +160,7 @@ class TestOnlyInspection : AbstractBaseUastLocalInspectionTool() {
}
}
private fun findVisibleForTestingAnnotation(member: PsiModifierListOwner) =
AnnotationUtil.findAnnotation(member, visibleForTestingAnnotations)
private fun isDirectlyTestOnly(member: PsiModifierListOwner) =
AnnotationUtil.isAnnotated(member, AnnotationUtil.TEST_ONLY, AnnotationUtil.CHECK_EXTERNAL)
private fun isDirectlyTestOnly(member: UDeclaration) = member.findAnnotation(AnnotationUtil.TEST_ONLY) != null
companion object {
private val visibleForTestingAnnotations = listOf(

4
jvm/jvm-analysis-java-tests/testData/codeInspection/testonly/TestOnlyTest.java
View File

@@ -12,8 +12,8 @@ public class TestOnlyTest {
static String someString(String someStr) { return someStr + "Foo"; }
@TestOnly
@VisibleForTesting
static String <warning descr="@VisibleForTesting makes little sense on @TestOnly code">doubleAnn</warning>() { return "Foo"; }
<warning descr="@VisibleForTesting makes little sense on @TestOnly code">@VisibleForTesting</warning>
static String doubleAnn() { return "Foo"; }
static class Bar {
@TestOnly

4
jvm/jvm-analysis-kotlin-tests/testData/codeInspection/testonly/TestOnlyTest.kt
View File

@@ -13,8 +13,8 @@ class TestOnlyTest @TestOnly constructor() {
fun aMethod(x: Int): Int = x
@TestOnly
@VisibleForTesting
fun <warning descr="@VisibleForTesting makes little sense on @TestOnly code">aStringMethod</warning>(): String = "Foo"
<warning descr="@VisibleForTesting makes little sense on @TestOnly code">@VisibleForTesting</warning>
fun aStringMethod(): String = "Foo"
}
fun main() {