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

getCachedVariableValues -> getVariableValues

Browse Source 
GitOrigin-RevId: 0f308e092e42afbd5f83ecd0d9d296ad9ef81e3f
This commit is contained in:
Tagir Valeev
2020-06-09 13:07:07 +03:00
committed by intellij-monorepo-bot
parent c570ed8e65
commit 0d3f06afbc
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaUtil.java
+2 -2
View File
@@ -33,7 +33,7 @@ import static com.intellij.util.ObjectUtils.tryCast;
*/
public class DfaUtil {
public static @NotNull Collection<PsiExpression> getCachedVariableValues(@Nullable PsiVariable variable, @Nullable PsiElement context) {
public static @NotNull Collection<PsiExpression> 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<PsiExpression> variableValues = getCachedVariableValues((PsiVariable)targetElement, qualifierExpression);
Collection<PsiExpression> variableValues = getVariableValues((PsiVariable)targetElement, qualifierExpression);
if (variableValues.isEmpty()) {
return DfaPsiUtil.getVariableAssignmentsInFile((PsiVariable)targetElement, false, qualifierExpression);
}
java/java-impl/src/com/intellij/slicer/SliceUtil.java
+1 -1
View File
@@ -113,7 +113,7 @@ class SliceUtil {
}
if (expression instanceof PsiVariable) {
PsiVariable variable = (PsiVariable)expression;
Collection<PsiExpression> values = DfaUtil.getCachedVariableValues(variable, original);
Collection<PsiExpression> values = DfaUtil.getVariableValues(variable, original);
PsiExpression initializer = variable.getInitializer();
if (values.isEmpty() && initializer != null) {
values = Collections.singletonList(initializer);
plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/SubstitutedExpressionEvaluationHelper.java
+1 -1
View File
@@ -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();