Merge branch 'master' of git@git.labs.intellij.net:idea/community

platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java

@@ -441,7 +441,7 @@ public class PsiDocumentManagerImpl extends PsiDocumentManager implements Projec
         file.putUserData(BlockSupport.DO_NOT_REPARSE_INCREMENTALLY, data);
       }
 
-      final String oldText = ApplicationManagerEx.getApplicationEx().isInternal() && !ApplicationManagerEx.getApplicationEx().isUnitTestMode() ? file.getText() : null;
+      final String oldText = ApplicationManagerEx.getApplicationEx().isInternal() && !ApplicationManagerEx.getApplicationEx().isUnitTestMode() ? myTreeElementBeingReparsedSoItWontBeCollected.getText() : null;
 
       int startOffset;
       int endOffset;

plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPluginCompletionAndResolutionTest.java

@@ -881,4 +881,25 @@ public class MavenPluginCompletionAndResolutionTest extends MavenDomWithIndicesT
 
     checkHighlighting();
   }
+
+  public void testTellNobodyThatIdeaIsRulezzz() throws Exception {
+    createProjectPom("<groupId>test</groupId>" +
+                     "<artifactId>project</artifactId>" +
+                     "<version>1</version>" +
+
+                     "<build>" +
+                     "  <plugins>" +
+                     "    <plugin>" +
+                     "      <artifactId>maven-compiler-plugin</artifactId>" +
+                     "      <configuration>" +
+                     "        <includes>" +
+                     "          <bar a<caret> />" +
+                     "        </includes>" +
+                     "      </configuration>" +
+                     "    </plugin>" +
+                     "  </plugins>" +
+                     "</build>");
+
+    assertCompletionVariants(myProjectPom);
+  }
 }

xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeImpl.java

@@ -15,6 +15,7 @@
  */
 package com.intellij.psi.impl.source.xml;
 
+import com.intellij.codeInsight.completion.CompletionInitializationContext;
 import com.intellij.codeInsight.completion.XmlAttributeInsertHandler;
 import com.intellij.codeInsight.daemon.QuickFixProvider;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
@@ -480,7 +481,7 @@ public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute {
       for (final XmlAttribute attribute : attributes) {
         if (attribute != XmlAttributeImpl.this && attribute.getName().equals(descriptor.getName())) return false;
       }
-      return true;
+      return !descriptor.getName().contains(CompletionInitializationContext.DUMMY_IDENTIFIER_TRIMMED);
     }
 
     public boolean isSoft() {