a couple fixes for XmlTagImpl.getNamespaceByPrefix:

don't go for expensive ns descriptors if that won't affect the result anyway prevent only really endless recursion

a couple fixes for XmlTagImpl.getNamespaceByPrefix:
don't go for expensive ns descriptors if that won't affect the result anyway prevent only really endless recursion
fc7f0b60 · peter · 75705c97 · fc7f0b60
Commit fc7f0b60 authored 6 years ago by peter
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 1 deletion
+3 -1
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java
@@ -795,8 +795,10 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag, HintedReferenc
      // When there is no namespace declarations then qualified names should be just used in dtds
      // this implies that we may have "" namespace prefix ! (see last paragraph in Namespaces in Xml, Section 5)

-      String result = ourGuard.doPreventingRecursion("getNsByPrefix", true, () -> {
+      String result = ourGuard.doPreventingRecursion(Trinity.create("getNsByPrefix", this, prefix), true, () -> {
        final String nsFromEmptyPrefix = getNamespaceByPrefix("");
+        if (nsFromEmptyPrefix.isEmpty()) return nsFromEmptyPrefix;
+
        final XmlNSDescriptor nsDescriptor = getNSDescriptor(nsFromEmptyPrefix, false);
        final XmlElementDescriptor descriptor = nsDescriptor != null ? nsDescriptor.getElementDescriptor(this) : null;
        final String nameFromRealDescriptor =