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

i18n: allow NonNls on Object, Serializable etc (IDEA-247438)

Browse Source 
GitOrigin-RevId: 2504fd617e0a0caa31979dbc7f70e8ff0e91352d
This commit is contained in:
Anna Kozlova
2020-08-06 06:03:09 +00:00
committed by intellij-monorepo-bot
parent 533a006d5f
commit 827335a9c1
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/externalAnnotation/NonNlsAnnotationProvider.java
+8 -8
View File
@@ -3,10 +3,7 @@ package com.intellij.codeInsight.externalAnnotation;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiModifierListOwner;
import com.intellij.psi.PsiType;
import com.intellij.psi.PsiVariable;
import com.intellij.psi.*;
import com.siyeh.ig.psiutils.TypeUtils;
import org.jetbrains.annotations.NotNull;
@@ -19,12 +16,15 @@ public class NonNlsAnnotationProvider implements AnnotationProvider {
@Override
public boolean isAvailable(PsiModifierListOwner owner) {
return owner instanceof PsiMethod && isString(((PsiMethod)owner).getReturnType()) ||
owner instanceof PsiVariable && isString(((PsiVariable)owner).getType());
return owner instanceof PsiMethod && isAssignableFromString(((PsiMethod)owner).getReturnType(), owner) ||
owner instanceof PsiVariable && isAssignableFromString(((PsiVariable)owner).getType(), owner);
}
private static boolean isString(PsiType type) {
return type != null && TypeUtils.isJavaLangString(type.getDeepComponentType());
private static boolean isAssignableFromString(PsiType type, PsiElement context) {
if (type == null) {
return false;
}
return type.getDeepComponentType().isAssignableFrom(TypeUtils.getStringType(context));
}
@Override