From 63bd510a78db990366cfbf1d9d829a53b353dfcd Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 3 Feb 2016 13:41:35 +0100
Subject: [PATCH] commit document before starting live template

---
 .../intellij/codeInsight/template/impl/TemplateManagerImpl.java  | 1 +
 1 file changed, 1 insertion(+)

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
index 0a50b8b6434d..df19186202c9 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java
@@ -122,6 +122,7 @@ public class TemplateManagerImpl extends TemplateManager implements Disposable {
 
   private TemplateState initTemplateState(@NotNull Editor editor) {
     clearTemplateState(editor);
+    PsiDocumentManager.getInstance(myProject).commitDocument(editor.getDocument());
     TemplateState state = new TemplateState(myProject, editor);
     Disposer.register(this, state);
     editor.putUserData(TEMPLATE_STATE_KEY, state);