From 10d695a002694678ffb0953cb525d85251f4dded Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Tue, 29 May 2012 18:01:37 +0200
Subject: [PATCH] IDEA-85760 completion menu shouldn't offer null where it
 makes no sense

---
 .../intellij/codeInsight/completion/JavaCompletionData.java  | 3 ++-
 .../testData/codeInsight/completion/normal/IncNull.java      | 5 +++++
 .../codeInsight/completion/NormalCompletionTest.groovy       | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 java/java-tests/testData/codeInsight/completion/normal/IncNull.java

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java
index bb12266e5564..40ee3e7c8b89 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java
@@ -148,7 +148,8 @@ public class JavaCompletionData extends JavaAwareCompletionData{
       not(
         or(psiElement(PsiTypeCastExpression.class),
            psiElement(PsiSwitchLabelStatement.class),
-           psiElement(PsiExpressionStatement.class)
+           psiElement(PsiExpressionStatement.class),
+           psiElement(PsiPrefixExpression.class)
         )
       )
     )),
diff --git a/java/java-tests/testData/codeInsight/completion/normal/IncNull.java b/java/java-tests/testData/codeInsight/completion/normal/IncNull.java
new file mode 100644
index 000000000000..64ee7547491e
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/normal/IncNull.java
@@ -0,0 +1,5 @@
+class Foo {
+    {
+        ++nu<caret>
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
index bde8a4883d74..a36ed6e1c861 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
@@ -539,6 +539,7 @@ public class ListUtils {
   }
 
   public void testNoThisInComment() throws Throwable { doAntiTest() }
+  public void testIncNull() throws Throwable { doAntiTest() }
 
   public void testLastExpressionInFor() throws Throwable { doTest(); }