From d2d5bac8ec3cf1c08193292fc25ca98907e03c20 Mon Sep 17 00:00:00 2001 From: "peter.gromov" Date: Thu, 16 Dec 2010 17:49:44 +0300 Subject: [PATCH] IDEA-61391 [Maven] When using autocomplete in a pom, IntelliJ allways comments that "IntellijIdeaRulezzz" ... --- .../src/com/intellij/psi/impl/PsiDocumentManagerImpl.java | 2 +- .../src/com/intellij/psi/impl/source/xml/XmlAttributeImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java index 1e6c8a78cfe3..52e40566c43a 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java +++ b/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; diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeImpl.java index cf0b4aa643bd..de87ff3be28a 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeImpl.java +++ b/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() {