end template in tests as normal; if template was canceled - don't per…

…form onSuccess method setup (IDEA-157973)
solimant · Jul 8, 2016 · b88d3c2 · b88d3c2
1 parent 185b889
commit b88d3c2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/...java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java b/...java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java
@@ -259,6 +259,7 @@ public static void doCreate(PsiClass targetClass,
       startTemplate(newEditor, template, project, new TemplateEditingAdapter() {
         @Override
         public void templateFinished(Template template, boolean brokenOff) {
+          if (brokenOff) return;
           WriteCommandAction.runWriteCommandAction(project, () -> {
             PsiDocumentManager.getInstance(project).commitDocument(newEditor.getDocument());
             final int offset = newEditor.getCaretModel().getOffset();

diff --git a/...a-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateMethodFromUsageTest.groovy b/...a-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateMethodFromUsageTest.groovy
@@ -127,7 +127,7 @@ class Usage {
       PsiDocumentManager.getInstance(getFile().project).commitDocument(document)
     }
 
-    state.gotoEnd()
+    state.gotoEnd(false)
   }
 
   public void "test prefer outer class when static is not applicable for inner"() {
@@ -153,7 +153,7 @@ class A {
       PsiDocumentManager.getInstance(getFile().project).commitDocument(document)
     }
 
-    state.gotoEnd()
+    state.gotoEnd(false)
 
     checkResultByText """
 class A {

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java
@@ -191,7 +191,7 @@ private void startTemplate(final Editor editor,
     }
 
     if (shouldSkipInTests()) {
-      if (!templateState.isFinished()) templateState.gotoEnd();
+      if (!templateState.isFinished()) templateState.gotoEnd(false);
     }
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -191,7 +191,7 @@ private void startTemplate(final Editor editor, @@
         }
         if (shouldSkipInTests()) {
-          if (!templateState.isFinished()) templateState.gotoEnd();
+          if (!templateState.isFinished()) templateState.gotoEnd(false);
         }
       }
@@ Expand Down @@