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

[javafx] do not check for type annotations (IDEA-181206)

Browse Source
This commit is contained in:
Roman Shevchenko
2017-10-26 19:06:11 +02:00
parent 86d3f01f7f
commit b55062a4d7
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
+2 -2
View File
@@ -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;
}
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxImplicitUsageProvider.java
+1 -1
View File
@@ -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);
}
}
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxScopeEnlarger.java
+2 -3
View File
@@ -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 {