From 8d8c0c3dbef66c33952e9ba3e8687d22d6a98705 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Wed, 21 Dec 2011 11:53:14 +0400 Subject: [PATCH] preserve custom prefix for tag name completion --- .../codeInsight/completion/XmlCompletionContributor.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java index bcde765f388d..d293ff34118e 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java @@ -150,10 +150,11 @@ public class XmlCompletionContributor extends CompletionContributor { final String namespace = tag.getNamespace(); final String prefix = result.getPrefixMatcher().getPrefix(); final int pos = prefix.indexOf(':'); - final String namespacePrefix = pos > 0 ? prefix.substring(0, pos) : null; final PsiReference reference = tag.getReference(); - if (reference != null && !namespace.isEmpty() && !tag.getNamespacePrefix().isEmpty()) { + String namespacePrefix = tag.getNamespacePrefix(); + + if (reference != null && !namespace.isEmpty() && !namespacePrefix.isEmpty()) { // fallback to simple completion final Set set = new HashSet(); new XmlCompletionData().completeReference(reference, set, element, parameters.getOriginalFile(), parameters.getOffset()); @@ -170,7 +171,7 @@ public class XmlCompletionContributor extends CompletionContributor { for (Pair pair : names) { final String name = pair.getFirst(); final String ns = pair.getSecond(); - final LookupElement item = createLookupElement(name, ns, ns, namespacePrefix); + final LookupElement item = createLookupElement(name, ns, ns, namespacePrefix.isEmpty() ? null : namespacePrefix); newResult.addElement(item); } }