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

don't infer contract/nullity for magic constant inspection

Browse Source
This commit is contained in:
peter
2016-09-01 10:00:38 +02:00
parent c7d2bae818
commit dbf3491ae6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicConstantInspection.java
+3 -3
View File
@@ -415,9 +415,9 @@ public class MagicConstantInspection extends BaseJavaLocalInspectionTool {
@NotNull
private static PsiAnnotation[] getAllAnnotations(@NotNull PsiModifierListOwner element) {
return CachedValuesManager.getCachedValue(element,
() -> CachedValueProvider.Result.create(AnnotationUtil.getAllAnnotations(element, true, null),
PsiModificationTracker.MODIFICATION_COUNT));
return CachedValuesManager.getCachedValue(element, () ->
CachedValueProvider.Result.create(AnnotationUtil.getAllAnnotations(element, true, null, false),
PsiModificationTracker.MODIFICATION_COUNT));
}
private static AllowedValues parseBeanInfo(@NotNull PsiModifierListOwner owner, @NotNull PsiManager manager) {
java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java
+3 -3
View File
@@ -468,7 +468,7 @@ public class AnnotationUtil {
if (owner instanceof PsiClass) {
for (PsiClass superClass : ((PsiClass)owner).getSupers()) {
if (visited == null) visited = new THashSet<PsiModifierListOwner>();
if (visited.add(superClass)) annotations = ArrayUtil.mergeArrays(annotations, getAllAnnotations(superClass, true, visited));
if (visited.add(superClass)) annotations = ArrayUtil.mergeArrays(annotations, getAllAnnotations(superClass, true, visited, withInferred));
}
}
else if (owner instanceof PsiMethod) {
@@ -484,7 +484,7 @@ public class AnnotationUtil {
if (visited == null) visited = new THashSet<PsiModifierListOwner>();
if (!visited.add(superMethod)) continue;
if (!resolveHelper.isAccessible(superMethod, owner, null)) continue;
annotations = ArrayUtil.mergeArrays(annotations, getAllAnnotations(superMethod, true, visited));
annotations = ArrayUtil.mergeArrays(annotations, getAllAnnotations(superMethod, true, visited, withInferred));
}
}
}
@@ -508,7 +508,7 @@ public class AnnotationUtil {
if (!resolveHelper.isAccessible(superMethod, owner, null)) continue;
PsiParameter[] superParameters = superMethod.getParameterList().getParameters();
if (index < superParameters.length) {
annotations = ArrayUtil.mergeArrays(annotations, getAllAnnotations(superParameters[index], true, visited));
annotations = ArrayUtil.mergeArrays(annotations, getAllAnnotations(superParameters[index], true, visited, withInferred));
}
}
}