IDEA-123355 Postfix template expansions .null/.notnull after 'else' fail to provide a valid Java output

allow JavaWithIfExpressionSurrounder just after else keywords

java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundExpressionWithElseIf.java

@@ -0,0 +1,11 @@
+class Test {
+  boolean foo() {
+    return true;
+  }
+  
+  void bar() {
+    if (true) {
+    }
+    else <selection>foo()</selection>
+  }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundExpressionWithElseIfElse.java

@@ -0,0 +1,11 @@
+class Test {
+  boolean foo() {
+    return true;
+  }
+  
+  void bar() {
+    if (true) {
+    }
+    else <selection>foo()</selection>
+  }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundExpressionWithElseIfElse_after.java

@@ -0,0 +1,14 @@
+class Test {
+  boolean foo() {
+    return true;
+  }
+  
+  void bar() {
+    if (true) {
+    }
+    else if (foo()) {
+        <caret>
+    } else {
+    }
+  }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundExpressionWithElseIf_after.java

@@ -0,0 +1,13 @@
+class Test {
+  boolean foo() {
+    return true;
+  }
+  
+  void bar() {
+    if (true) {
+    }
+    else if (foo()) {
+        <caret>
+    }
+  }
+}

java/java-tests/testData/codeInsight/template/postfix/templates/notnull/elseStatement.java

@@ -0,0 +1,8 @@
+public class Foo {
+    void m(Object o) {
+        if (true) {
+          
+        }
+        else o.notnull<caret>
+    }
+}

java/java-tests/testData/codeInsight/template/postfix/templates/notnull/elseStatement_after.java

@@ -0,0 +1,10 @@
+public class Foo {
+    void m(Object o) {
+        if (true) {
+
+        }
+        else if (o != null) {
+            <caret>
+        }
+    }
+}

java/java-tests/testSrc/com/intellij/codeInsight/generation/surroundWith/JavaSurroundWithTest.java

@@ -145,6 +145,16 @@ public class JavaSurroundWithTest extends LightCodeInsightTestCase {
     TemplateManagerImpl.setTemplateTesting(getProject(), getTestRootDisposable());
     doTest(getTestName(false), new JavaWithNotSurrounder());
   }
+  
+  public void testSurroundExpressionWithElseIf() {
+    TemplateManagerImpl.setTemplateTesting(getProject(), getTestRootDisposable());
+    doTest(getTestName(false), new JavaWithIfExpressionSurrounder());
+  }
+  
+  public void testSurroundExpressionWithElseIfElse() {
+    TemplateManagerImpl.setTemplateTesting(getProject(), getTestRootDisposable());
+    doTest(getTestName(false), new JavaWithIfElseExpressionSurrounder());
+  }
 
   private void doTest(@NotNull String fileName, final Surrounder surrounder) {
     configureByFile(BASE_PATH + fileName + ".java");

java/java-tests/testSrc/com/intellij/codeInsight/template/postfix/templates/NotNullPostfixTemplateTest.java

@@ -17,9 +17,6 @@ package com.intellij.codeInsight.template.postfix.templates;
 
 import org.jetbrains.annotations.NotNull;
 
-/**
- * @author ignatov
- */
 public class NotNullPostfixTemplateTest extends PostfixTemplateTestCase {
   @NotNull
   @Override
@@ -29,4 +26,5 @@ public class NotNullPostfixTemplateTest extends PostfixTemplateTestCase {
   public void testPrimitive()         { doTest(); }
   public void testNn()                { doTest(); }
   public void testSecondStatement()   { doTest(); }
+  public void testElseStatement()     { doTest(); }
 }