MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

preserve custom prefix for tag name completion

Browse Source
This commit is contained in:
Dmitry Avdeev
2011-12-21 11:54:59 +04:00
parent 330be871fc
commit 8d8c0c3dbe
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java
+4 -3
View File
@@ -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<LookupElement> set = new HashSet<LookupElement>();
new XmlCompletionData().completeReference(reference, set, element, parameters.getOriginalFile(), parameters.getOffset());
@@ -170,7 +171,7 @@ public class XmlCompletionContributor extends CompletionContributor {
for (Pair<String, String> 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);
}
}