diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/ContextComputationProcessor.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/ContextComputationProcessor.java index b37a8e7e361e..b44d61877ca7 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/ContextComputationProcessor.java +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/ContextComputationProcessor.java @@ -95,7 +95,8 @@ public class ContextComputationProcessor { else if (expression instanceof PsiExpression) { final SmartList uncomputables = new SmartList(); final Object o = myEvaluationHelper.computeExpression((PsiExpression)expression, uncomputables); - addStringFragment(String.valueOf(o), result); + // in many languages 'null' is a reserved word + addStringFragment(o == null? "missingValue" : String.valueOf(o), result); if (uncomputables.size() > 0) { unparsable.set(Boolean.TRUE); }