MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Java: cleanup

Browse Source 
GitOrigin-RevId: 45654603d89476e57cc2fb9b157ba805547db9f2
This commit is contained in:
Bas Leijdekkers
2025-03-06 09:21:36 +01:00
committed by intellij-monorepo-bot
parent 227e876b36
commit ae006b8ff4
1 changed files with 32 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
java/java-analysis-impl/src/com/intellij/codeInspection/JavaSuppressionUtil.java
View File

@@ -35,19 +35,14 @@ public final class JavaSuppressionUtil {
}
private static @Nullable String getInspectionIdSuppressedInAnnotationAttribute(@NotNull PsiElement element) {
if (element instanceof PsiLiteralExpression) {
Object value = ((PsiLiteralExpression)element).getValue();
if (value instanceof String) {
return (String)value;
if (element instanceof PsiLiteralExpression literal) {
if (literal.getValue() instanceof String s) {
return s;
}
}
else if (element instanceof PsiReferenceExpression) {
PsiElement psiElement = ((PsiReferenceExpression)element).resolve();
if (psiElement instanceof PsiVariableEx) {
Object val = ((PsiVariableEx)psiElement).computeConstantValue(new HashSet<>());
if (val instanceof String) {
return (String)val;
}
else if (element instanceof PsiReferenceExpression ref) {
if (ref.resolve() instanceof PsiVariableEx var && var.computeConstantValue(new HashSet<>()) instanceof String s) {
return s;
}
}
return null;
@@ -81,12 +76,12 @@ public final class JavaSuppressionUtil {
static <T extends PsiElement> PsiElement getElementMemberSuppressedIn(@NotNull T owner, @NotNull String inspectionToolID) {
PsiElement element = null;
if (owner instanceof PsiJavaDocumentedElement) {
element = getDocCommentToolSuppressedIn((PsiJavaDocumentedElement)owner, inspectionToolID);
if (owner instanceof PsiJavaDocumentedElement documented) {
element = getDocCommentToolSuppressedIn(documented, inspectionToolID);
}
if (element != null) return element;
if (owner instanceof PsiModifierListOwner) {
element = getAnnotationMemberSuppressedIn((PsiModifierListOwner)owner, inspectionToolID);
if (owner instanceof PsiModifierListOwner o) {
element = getAnnotationMemberSuppressedIn(o, inspectionToolID);
if (element != null) return element;
}
PsiJavaDocumentedElement container = PsiTreeUtil.getParentOfType(owner, PsiJavaDocumentedElement.class);
@@ -94,8 +89,8 @@ public final class JavaSuppressionUtil {
element = getDocCommentToolSuppressedIn(container, inspectionToolID);
if (element != null) return element;
if (container instanceof PsiModifierListOwner) {
element = getAnnotationMemberSuppressedIn((PsiModifierListOwner)container, inspectionToolID);
if (container instanceof PsiModifierListOwner o) {
element = getAnnotationMemberSuppressedIn(o, inspectionToolID);
if (element != null) return element;
}
@@ -132,15 +127,14 @@ public final class JavaSuppressionUtil {
PsiDocComment docComment = owner.getDocComment();
if (docComment == null && owner.getParent() instanceof PsiDeclarationStatement) {
PsiElement el = PsiTreeUtil.skipWhitespacesBackward(owner.getParent());
if (el instanceof PsiDocComment) {
docComment = (PsiDocComment)el;
if (el instanceof PsiDocComment c) {
docComment = c;
}
}
if (docComment != null) {
PsiDocTag inspectionTag = docComment.findTagByName(SuppressionUtilCore.SUPPRESS_INSPECTIONS_TAG_NAME);
if (inspectionTag != null) {
PsiElement[] dataElements = inspectionTag.getDataElements();
for (PsiElement dataElement : dataElements) {
for (PsiElement dataElement : inspectionTag.getDataElements()) {
String valueText = dataElement.getText();
if (SuppressionUtil.isInspectionToolIdMentioned(valueText, inspectionToolID)) {
return docComment;
@@ -165,8 +159,8 @@ public final class JavaSuppressionUtil {
return matcher.group(1).trim();
}
}
if (element instanceof PsiJavaDocumentedElement) {
PsiDocComment docComment = ((PsiJavaDocumentedElement)element).getDocComment();
if (element instanceof PsiJavaDocumentedElement documented) {
PsiDocComment docComment = documented.getDocComment();
if (docComment != null) {
PsiDocTag inspectionTag = docComment.findTagByName(SuppressionUtilCore.SUPPRESS_INSPECTIONS_TAG_NAME);
if (inspectionTag != null) {
@@ -178,8 +172,8 @@ public final class JavaSuppressionUtil {
}
}
}
if (element instanceof PsiModifierListOwner) {
Collection<String> suppressedIds = getInspectionIdsSuppressedInAnnotation((PsiModifierListOwner)element);
if (element instanceof PsiModifierListOwner owner) {
Collection<String> suppressedIds = getInspectionIdsSuppressedInAnnotation(owner);
return suppressedIds.isEmpty() ? null : StringUtil.join(suppressedIds, ",");
}
return null;
@@ -194,11 +188,11 @@ public final class JavaSuppressionUtil {
}
PsiElement up = PsiTreeUtil.getNonStrictParentOfType(place, PsiVariable.class, PsiJavaDocumentedElement.class);
if (up instanceof PsiModifierListOwner && ((PsiModifierListOwner)up).getModifierList() == null) {
if (up instanceof PsiModifierListOwner o && o.getModifierList() == null) {
up = PsiTreeUtil.getParentOfType(up, PsiVariable.class, PsiJavaDocumentedElement.class);
}
if (up instanceof PsiVariable) {
PsiElement annotation = getAnnotationMemberSuppressedIn((PsiVariable)up, toolId);
if (up instanceof PsiVariable var) {
PsiElement annotation = getAnnotationMemberSuppressedIn(var, toolId);
if (annotation != null) {
return annotation;
}
@@ -284,38 +278,32 @@ public final class JavaSuppressionUtil {
}
public static @Nullable PsiElement getElementToAnnotate(@NotNull PsiElement element, @NotNull PsiElement container) {
if (container instanceof PsiDeclarationStatement) {
if (container instanceof PsiDeclarationStatement declarationStatement) {
if (canHave15Suppressions(element)) {
PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)container;
PsiElement[] declaredElements = declarationStatement.getDeclaredElements();
for (PsiElement declaredElement : declaredElements) {
if (declaredElement instanceof PsiLocalVariable) {
PsiModifierList modifierList = ((PsiLocalVariable)declaredElement).getModifierList();
if (modifierList != null) {
for (PsiElement declaredElement : declarationStatement.getDeclaredElements()) {
if (declaredElement instanceof PsiLocalVariable var) {
if (var.getModifierList() != null) {
return declaredElement;
}
}
}
}
}
else if (container instanceof PsiForeachStatement) {
else if (container instanceof PsiForeachStatement foreach) {
if (canHave15Suppressions(element)) {
PsiParameter parameter = ((PsiForeachStatement)container).getIterationParameter();
PsiParameter parameter = foreach.getIterationParameter();
PsiModifierList modifierList = element.getParent() == parameter ? parameter.getModifierList() : null;
if (modifierList != null) {
return parameter;
}
}
}
else if (container instanceof PsiTryStatement) {
PsiResourceList resourceList = ((PsiTryStatement)container).getResourceList();
else if (container instanceof PsiTryStatement statement) {
PsiResourceList resourceList = statement.getResourceList();
if (resourceList != null) {
for (PsiResourceListElement listElement : resourceList) {
if (listElement instanceof PsiResourceVariable && listElement == element.getParent()) {
PsiModifierList modifierList = ((PsiResourceVariable)listElement).getModifierList();
if (modifierList != null) {
return listElement;
}
if (listElement == element.getParent() && listElement instanceof PsiResourceVariable var && var.getModifierList() != null) {
return listElement;
}
}
}