From b55062a4d74f44aee867f37d41810ced8249d74e Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 26 Oct 2017 19:05:52 +0200
Subject: [PATCH] [javafx] do not check for type annotations (IDEA-181206)

---
 .../src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java | 4 ++--
 .../codeInsight/inspections/JavaFxImplicitUsageProvider.java | 2 +-
 .../plugins/javaFX/fxml/refs/JavaFxScopeEnlarger.java        | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
index 07a644e11aad..2beeb9323c3b 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
@@ -364,7 +364,7 @@ public class JavaFxPsiUtil {
 
   public static boolean isVisibleInFxml(@NotNull PsiMember psiMember) {
     return psiMember.hasModifierProperty(PsiModifier.PUBLIC) ||
-           AnnotationUtil.isAnnotated(psiMember, JavaFxCommonNames.JAVAFX_FXML_ANNOTATION, false);
+           AnnotationUtil.isAnnotated(psiMember, JavaFxCommonNames.JAVAFX_FXML_ANNOTATION, 0);
   }
 
   @Nullable
@@ -501,7 +501,7 @@ public class JavaFxPsiUtil {
         }
         boolean annotated = true;
         for (PsiParameter parameter : parameters) {
-          if (!AnnotationUtil.isAnnotated(parameter, JavaFxCommonNames.JAVAFX_BEANS_NAMED_ARG, false)) {
+          if (!AnnotationUtil.isAnnotated(parameter, JavaFxCommonNames.JAVAFX_BEANS_NAMED_ARG, 0)) {
             annotated = false;
             break;
           }
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxImplicitUsageProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxImplicitUsageProvider.java
index 4d609878422a..9477085c44e8 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxImplicitUsageProvider.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxImplicitUsageProvider.java
@@ -131,6 +131,6 @@ public class JavaFxImplicitUsageProvider implements ImplicitUsageProvider {
 
   private static boolean isImplicitFxmlAccess(PsiModifierListOwner member) {
     return !member.hasModifierProperty(PsiModifier.PUBLIC) &&
-           AnnotationUtil.isAnnotated(member, JavaFxCommonNames.JAVAFX_FXML_ANNOTATION, false);
+           AnnotationUtil.isAnnotated(member, JavaFxCommonNames.JAVAFX_FXML_ANNOTATION, 0);
   }
 }
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxScopeEnlarger.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxScopeEnlarger.java
index a234eba3eefa..20d6dcdce27c 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxScopeEnlarger.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxScopeEnlarger.java
@@ -23,7 +23,6 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.search.UseScopeEnlarger;
 import com.intellij.psi.util.InheritanceUtil;
-import com.intellij.psi.util.PropertyUtil;
 import com.intellij.psi.util.PropertyUtilBase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -66,7 +65,7 @@ public class JavaFxScopeEnlarger extends UseScopeEnlarger {
 
   private static boolean needToEnlargeFieldScope(PsiField field) {
     return !field.hasModifierProperty(PsiModifier.PUBLIC) &&
-           AnnotationUtil.isAnnotated(field, JavaFxCommonNames.JAVAFX_FXML_ANNOTATION, false);
+           AnnotationUtil.isAnnotated(field, JavaFxCommonNames.JAVAFX_FXML_ANNOTATION, 0);
   }
 
   private static boolean needToEnlargeMethodScope(PsiMethod method) {
@@ -74,7 +73,7 @@ public class JavaFxScopeEnlarger extends UseScopeEnlarger {
     return isStatic && method.getParameterList().getParametersCount() == 2 &&
            InheritanceUtil.isInheritor(method.getParameterList().getParameters()[0].getType(), JavaFxCommonNames.JAVAFX_SCENE_NODE) ||
            !isStatic && !method.hasModifierProperty(PsiModifier.PUBLIC) &&
-           AnnotationUtil.isAnnotated(method, JavaFxCommonNames.JAVAFX_FXML_ANNOTATION, false);
+           AnnotationUtil.isAnnotated(method, JavaFxCommonNames.JAVAFX_FXML_ANNOTATION, 0);
   }
 
   public static class GlobalFxmlSearchScope extends DelegatingGlobalSearchScope {