From 769ae29a70af38caf2615ade2248b3ffab0804f4 Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Thu, 20 Aug 2015 14:47:10 +0300
Subject: [PATCH] fix sync after completion in injection #WEB-17822 fixed

---
 .../codeInsight/completion/XmlTagInsertHandler.java      | 5 +++--
 .../intellij/codeInsight/completion/XmlSyncTagTest.java  | 9 ++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java
index 2614606227ac..21e55ff2f4e2 100644
--- a/xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java
+++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java
@@ -42,6 +42,7 @@ import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.html.HtmlTag;
+import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlTokenType;
@@ -63,13 +64,13 @@ public class XmlTagInsertHandler implements InsertHandler<LookupElement> {
     Project project = context.getProject();
     Editor editor = context.getEditor();
     // Need to insert " " to prevent creating tags like <tagThis is my text
-    editor.getDocument().putUserData(ENFORCING_TAG, Boolean.TRUE);
+    InjectedLanguageUtil.getTopLevelEditor(editor).getDocument().putUserData(ENFORCING_TAG, Boolean.TRUE);
     final int offset = editor.getCaretModel().getOffset();
     editor.getDocument().insertString(offset, " ");
     PsiDocumentManager.getInstance(project).commitDocument(editor.getDocument());
     PsiElement current = context.getFile().findElementAt(context.getStartOffset());
     editor.getDocument().deleteString(offset, offset + 1);
-    editor.getDocument().putUserData(ENFORCING_TAG, null);
+    InjectedLanguageUtil.getTopLevelEditor(editor).getDocument().putUserData(ENFORCING_TAG, null);
 
     final XmlTag tag = PsiTreeUtil.getContextOfType(current, XmlTag.class, true);
 
diff --git a/xml/tests/src/com/intellij/codeInsight/completion/XmlSyncTagTest.java b/xml/tests/src/com/intellij/codeInsight/completion/XmlSyncTagTest.java
index 5e5b1ec263fe..22f829fb409d 100644
--- a/xml/tests/src/com/intellij/codeInsight/completion/XmlSyncTagTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/completion/XmlSyncTagTest.java
@@ -65,7 +65,14 @@ public abstract class XmlSyncTagTest extends LightPlatformCodeInsightFixtureTest
   }
 
   protected void doTestCompletion(final String text, final String toType, final String result) {
-    myFixture.configureByText(XmlFileType.INSTANCE, text);
+    doTestCompletion(XmlFileType.INSTANCE, text, toType, result);
+  }
+
+  protected void doTestCompletion(final FileType fileType,
+                                  final String text,
+                                  final String toType,
+                                  final String result) {
+    myFixture.configureByText(fileType, text);
     CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() {
       @Override
       public void run() {