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

more on IDEA-62177 java injector handles literal expressions in concatenation incorrectly

Browse Source
This commit is contained in:
Gregory Shrago
2010-12-06 21:59:51 +03:00
parent a537670874
commit ca2dd631cf
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/ContextComputationProcessor.java
+7 -8
View File
@@ -65,7 +65,6 @@ public class ContextComputationProcessor {
}
public void collectOperands(final PsiElement expression, final List<Object> result, final Ref<Boolean> unparsable) {
final PsiElement firstChild;
if (expression instanceof PsiParenthesizedExpression) {
collectOperands(((PsiParenthesizedExpression)expression).getExpression(), result, unparsable);
}
@@ -93,17 +92,17 @@ public class ContextComputationProcessor {
else if (PsiUtilEx.isStringOrCharacterLiteral(expression)) {
result.add(expression);
}
else {
else if (expression instanceof PsiExpression) {
final SmartList<PsiExpression> uncomputables = new SmartList<PsiExpression>();
final Object o = expression instanceof PsiExpression? myEvaluationHelper.computeExpression((PsiExpression)expression, uncomputables) : null;
final Object o = myEvaluationHelper.computeExpression((PsiExpression)expression, uncomputables);
addStringFragment(String.valueOf(o), result);
if (uncomputables.size() > 0) {
unparsable.set(Boolean.TRUE);
}
if (o == null) {
result.add(expression);
} else {
addStringFragment(String.valueOf(o), result);
}
}
else {
unparsable.set(Boolean.TRUE);
result.add(expression);
}
}