From 8df0ee7569cba0f3d2ad2fe458b5e81d3059687f Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Tue, 4 Jun 2019 21:11:04 +0200 Subject: [PATCH] simplify annotation present check GitOrigin-RevId: f7b56843330b6b769c859d4f53b8551a7999783f --- .../TestDataFilesReferencesContributor.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/plugins/devkit/devkit-core/src/references/TestDataFilesReferencesContributor.java b/plugins/devkit/devkit-core/src/references/TestDataFilesReferencesContributor.java index 00210379e9c0..23a9c183bab8 100644 --- a/plugins/devkit/devkit-core/src/references/TestDataFilesReferencesContributor.java +++ b/plugins/devkit/devkit-core/src/references/TestDataFilesReferencesContributor.java @@ -38,7 +38,7 @@ public class TestDataFilesReferencesContributor extends PsiReferenceContributor if (call == null) return PsiReference.EMPTY_ARRAY; PsiParameter targetParameter = UastUtils.getParameterForArgument(call, expression); - if (!checkTestDataFileAnnotationPresent(targetParameter)) { + if (targetParameter == null || !targetParameter.hasAnnotation(TEST_DATA_FILE_ANNOTATION_QUALIFIED_NAME)) { return PsiReference.EMPTY_ARRAY; } @@ -61,19 +61,6 @@ public class TestDataFilesReferencesContributor extends PsiReferenceContributor ); } - private static boolean checkTestDataFileAnnotationPresent(@Nullable PsiParameter targetParameter) { - if (targetParameter == null) { - return false; - } - PsiAnnotation[] annotations = targetParameter.getAnnotations(); - for (PsiAnnotation annotation : annotations) { - if (TEST_DATA_FILE_ANNOTATION_QUALIFIED_NAME.equals(annotation.getQualifiedName())) { - return true; - } - } - return false; - } - @Nullable private static String getTestDataDirectory(@NotNull UExpression expression, @NotNull UCallExpression methodCallExpression) {