From cbfb86b406bc1ae6164c54aedf24ae3e47ba6dbe Mon Sep 17 00:00:00 2001
From: Gregory Shrago <Gregory.Shrago@jetbrains.com>
Date: Fri, 15 Apr 2011 18:48:31 +0400
Subject: [PATCH] IDEA-68138 query parameter not recognized in assembled string

---
 .../plugins/intelliLang/util/ContextComputationProcessor.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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<PsiExpression> uncomputables = new SmartList<PsiExpression>();
       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);
       }