diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java index ad0ff397ab1f..7005d42f966c 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java @@ -59,6 +59,7 @@ public class XmlTagInsertHandler implements InsertHandler { public void handleInsert(@NotNull InsertionContext context, @NotNull LookupElement item) { Project project = context.getProject(); Editor editor = context.getEditor(); + int startOffset = context.getStartOffset(); Document document = InjectedLanguageUtil.getTopLevelEditor(editor).getDocument(); Ref currentElementRef = Ref.create(); // Need to insert " " to prevent creating tags like { final int offset = editor.getCaretModel().getOffset(); editor.getDocument().insertString(offset, " "); PsiDocumentManager.getInstance(project).commitDocument(editor.getDocument()); - currentElementRef.set(context.getFile().findElementAt(context.getStartOffset())); + currentElementRef.set(context.getFile().findElementAt(startOffset)); editor.getDocument().deleteString(offset, offset + 1); });