1 files changed, 8 insertions, 4 deletions
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/SurroundPostfixTemplateBase.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/SurroundPostfixTemplateBase.java
index 52ad0c4cdde8..29ea4d39ac64 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/SurroundPostfixTemplateBase.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/SurroundPostfixTemplateBase.java
@@ -40,11 +40,9 @@ public abstract class SurroundPostfixTemplateBase extends StatementWrapPostfixTe
 
 
   @Override
-  public void expand(@NotNull PsiElement context, @NotNull final Editor editor) {
+  public final void expandForChooseExpression(@NotNull PsiElement context, @NotNull final Editor editor) {
     PsiElement topmostExpression = myPsiInfo.getTopmostExpression(context);
-    PsiElement expression = getWrappedExpression(topmostExpression);
-    assert topmostExpression != null;
-    PsiElement replace = topmostExpression.replace(expression);
+    PsiElement replace = getReplacedExpression(topmostExpression);
     TextRange range = PostfixTemplatesUtils.surround(getSurrounder(), editor, replace);
 
     if (range != null) {
@@ -52,6 +50,12 @@ public abstract class SurroundPostfixTemplateBase extends StatementWrapPostfixTe
     }
   }
 
+  protected PsiElement getReplacedExpression(PsiElement topmostExpression) {
+    PsiElement expression = getWrappedExpression(topmostExpression);
+    assert topmostExpression != null;
+    return topmostExpression.replace(expression);
+  }
+
   public boolean isStatement() {
     return false;
   }