IDEA-113936 Dependency autocompletion causes confusing behaviour when editing POMs

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenPomXmlCompletionTagListenerContributor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenPomXmlCompletionTagListenerContributor.java
index 142e47a93552b704b4700aaca082e9b9dc56230d..c0880648f470ab98f5c2bcf4c5d9836536ee5a3d 100644 (file)
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenPomXmlCompletionTagListenerContributor.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenPomXmlCompletionTagListenerContributor.java
@@ -1,9 +1,11 @@
 package org.jetbrains.idea.maven.dom.model.completion;
 
 import com.google.common.collect.ImmutableSet;
+import com.intellij.codeInsight.actions.ReformatCodeProcessor;
 import com.intellij.codeInsight.completion.*;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementDecorator;
+import com.intellij.openapi.editor.CaretModel;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -26,16 +28,6 @@ public class MavenPomXmlCompletionTagListenerContributor extends CompletionContr
 
   private final Set<String> myHandledTags = ImmutableSet.of("dependency");
 
-  //private final MultiMap<String, TagInsertListener> myListenersMap;
-  //{
-  //  MultiMap<String, TagInsertListener> listenersMap = new MultiMap<String, TagInsertListener>();
-  //  for (TagInsertListener listener : new TagInsertListener[]{}) {
-  //
-  //  }
-  //
-  //  myListenersMap = listenersMap;
-  //}
-
   @Override
   public void fillCompletionVariants(CompletionParameters parameters, final CompletionResultSet result) {
     PsiFile psiFile = parameters.getOriginalFile();
@@ -64,17 +56,20 @@ public class MavenPomXmlCompletionTagListenerContributor extends CompletionContr
                     && "maven-4.0.0.xsd".equals(((XmlTag)object).getContainingFile().getName())) {
                   context.commitDocument();
 
-                  PsiElement psiElement = context.getFile().findElementAt(context.getEditor().getCaretModel().getOffset());
+                  CaretModel caretModel = context.getEditor().getCaretModel();
+
+                  PsiElement psiElement = context.getFile().findElementAt(caretModel.getOffset());
                   XmlTag xmlTag = PsiTreeUtil.getParentOfType(psiElement, XmlTag.class);
                   if (xmlTag != null) {
                     DomElement domElement = DomManager.getDomManager(context.getProject()).getDomElement(xmlTag);
                     if (domElement instanceof MavenDomDependency) {
-                      context.setLaterRunnable(new Runnable() {
-                        @Override
-                        public void run() {
-                          new CodeCompletionHandlerBase(CompletionType.BASIC).invokeCompletion(context.getProject(), context.getEditor());
-                        }
-                      });
+                      String s = "\n<groupId></groupId>\n<artifactId></artifactId>\n";
+                      context.getDocument().insertString(caretModel.getOffset(), s);
+                      caretModel.moveToOffset(caretModel.getOffset() + s.length() - "</artifactId>\n".length());
+
+                      context.commitDocument();
+
+                      new ReformatCodeProcessor(context.getProject(), context.getFile(), xmlTag.getTextRange(), true).run();
                     }
                   }
                 }