diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaUtil.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaUtil.java index 74de19d8199a..67387d5c2429 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaUtil.java @@ -33,7 +33,7 @@ import static com.intellij.util.ObjectUtils.tryCast; */ public class DfaUtil { - public static @NotNull Collection getCachedVariableValues(@Nullable PsiVariable variable, @Nullable PsiElement context) { + public static @NotNull Collection getVariableValues(@Nullable PsiVariable variable, @Nullable PsiElement context) { if (variable == null || context == null) return Collections.emptyList(); final PsiCodeBlock codeBlock = tryCast(DfaPsiUtil.getEnclosingCodeBlock(variable, context), PsiCodeBlock.class); @@ -114,7 +114,7 @@ public class DfaUtil { if (!(targetElement instanceof PsiVariable)) { return Collections.emptyList(); } - Collection variableValues = getCachedVariableValues((PsiVariable)targetElement, qualifierExpression); + Collection variableValues = getVariableValues((PsiVariable)targetElement, qualifierExpression); if (variableValues.isEmpty()) { return DfaPsiUtil.getVariableAssignmentsInFile((PsiVariable)targetElement, false, qualifierExpression); } diff --git a/java/java-impl/src/com/intellij/slicer/SliceUtil.java b/java/java-impl/src/com/intellij/slicer/SliceUtil.java index eb7da4148e3a..9d7c5852af9e 100644 --- a/java/java-impl/src/com/intellij/slicer/SliceUtil.java +++ b/java/java-impl/src/com/intellij/slicer/SliceUtil.java @@ -113,7 +113,7 @@ class SliceUtil { } if (expression instanceof PsiVariable) { PsiVariable variable = (PsiVariable)expression; - Collection values = DfaUtil.getCachedVariableValues(variable, original); + Collection values = DfaUtil.getVariableValues(variable, original); PsiExpression initializer = variable.getInitializer(); if (values.isEmpty() && initializer != null) { values = Collections.singletonList(initializer); diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/SubstitutedExpressionEvaluationHelper.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/SubstitutedExpressionEvaluationHelper.java index 3e5d3bfde8ae..1c09a0e15a37 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/SubstitutedExpressionEvaluationHelper.java +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/SubstitutedExpressionEvaluationHelper.java @@ -88,7 +88,7 @@ public class SubstitutedExpressionEvaluationHelper { values = DfaPsiUtil.getVariableAssignmentsInFile(psiVariable, true, o); } else if (dfaOption == Configuration.DfaOption.DFA) { - values = DfaUtil.getCachedVariableValues(psiVariable, o); + values = DfaUtil.getVariableValues(psiVariable, o); } else if (dfaOption == Configuration.DfaOption.RESOLVE) { PsiExpression initializer = psiVariable.getInitializer();