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

NullableNotNullManager#findDefaultTypeUseNullability: fix local variables handling

Browse Source 
We should not use container annotation for top-level local variable type, but may use it for nested ones.

GitOrigin-RevId: 507cfd221f073dffc78ccec3fd9ba6b79b888c76
This commit is contained in:
Tagir Valeev
2020-04-29 09:39:08 +00:00
committed by intellij-monorepo-bot
parent 8490995bc3
commit 653d690ee2
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java
+5 -6
View File
@@ -369,7 +369,11 @@ public abstract class NullableNotNullManager {
* @param context place in PSI tree
* @return default nullability for type-use elements at given place
*/
public @Nullable NullabilityAnnotationInfo findDefaultTypeUseNullability(PsiElement context) {
public @Nullable NullabilityAnnotationInfo findDefaultTypeUseNullability(@Nullable PsiElement context) {
if (context == null) return null;
if (context.getParent() instanceof PsiTypeElement && context.getParent().getParent() instanceof PsiLocalVariable) {
return null;
}
return findNullabilityDefault(context, PsiAnnotation.TargetType.TYPE_USE);
}
@@ -381,11 +385,6 @@ public abstract class NullableNotNullManager {
@NotNull PsiAnnotation.TargetType @NotNull ... placeTargetTypes) {
PsiElement element = place.getParent();
while (element != null) {
if (element instanceof PsiTypeElement && element.getContext() instanceof PsiLocalVariable) {
// Type of local variables is not influenced by container annotations
return null;
}
if (element instanceof PsiModifierListOwner) {
NullabilityAnnotationInfo result = getNullityDefault((PsiModifierListOwner)element, placeTargetTypes, place, false);
if (result != null) {