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

IDEA-385449 [java-inspections] Follow-up cleanup

Browse Source 
GitOrigin-RevId: 30861d30b340099ca9a268e81c374b77cb95eba9
This commit is contained in:
Tagir Valeev
2026-02-04 18:23:47 +00:00
committed by intellij-monorepo-bot
parent 41188c46cc
commit ace33e3656
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/siyeh/ig/psiutils/ExpressionUtils.java
+4 -9
View File
@@ -111,6 +111,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
@@ -213,7 +214,7 @@ public final class ExpressionUtils {
@Contract("null -> false")
public static boolean isEvaluatedAtCompileTime(@Nullable PsiExpression expression) {
return isEvaluatedAtCompileTime(expression, ContainerUtil.newHashSet());
return isEvaluatedAtCompileTime(expression, new HashSet<>());
}
private static boolean isEvaluatedAtCompileTime(@Nullable PsiExpression expression,
@@ -240,7 +241,7 @@ public final class ExpressionUtils {
}
final PsiElement element = referenceExpression.resolve();
if (element instanceof PsiVariable variable) {
if (visited.contains(variable)) {
if (!visited.add(variable)) {
// cyclic reference detected; not a compile-time evaluatable expression
return false;
}
@@ -250,13 +251,7 @@ public final class ExpressionUtils {
if (!variable.hasModifierProperty(PsiModifier.FINAL)) {
return false;
}
visited.add(variable);
try {
return isEvaluatedAtCompileTime(PsiFieldImpl.getDetachedInitializer(variable), visited);
}
finally {
visited.remove(variable);
}
return isEvaluatedAtCompileTime(PsiFieldImpl.getDetachedInitializer(variable), visited);
}
}
if (expression instanceof PsiParenthesizedExpression parenthesizedExpression) {