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 993e69446115..bc1a79ac7395 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
@@ -90,6 +90,10 @@ public class SubstitutedExpressionEvaluationHelper {
                 Collection<PsiExpression> realValues = DfaUtil.getCachedVariableValues(psiVariable, o);
                 values = realValues == null ? DfaPsiUtil.getVariableAssignmentsInFile(psiVariable, true, o) : realValues;
               }
+              else if (dfaOption == Configuration.DfaOption.RESOLVE) {
+                PsiExpression initializer = psiVariable.getInitializer();
+                values = ContainerUtil.createMaybeSingletonList(initializer);
+              }
               else {
                 values = Collections.emptyList();
               }