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

apply equalToParent dom namespace check heuristic only to non-qualified tags

Browse Source
This commit is contained in:
peter
2011-07-12 13:20:37 +02:00
parent 05eb3a7a1c
commit d6b7a7b8d4
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/dom-impl/src/com/intellij/util/xml/impl/DomImplUtil.java
+2 -1
View File
@@ -180,7 +180,8 @@ public class DomImplUtil {
public static boolean isNameSuitable(final EvaluatedXmlName evaluatedXmlName, final String localName, final String qName, final String namespace,
final XmlFile file) {
final String localName1 = evaluatedXmlName.getXmlName().getLocalName();
return (localName1.equals(localName) || localName1.equals(qName)) && evaluatedXmlName.isNamespaceAllowed(namespace, file);
return (localName1.equals(localName) || localName1.equals(qName)) && evaluatedXmlName.isNamespaceAllowed(namespace, file,
!localName1.equals(qName));
}
@NotNull
xml/dom-openapi/src/com/intellij/util/xml/DummyEvaluatedXmlName.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class DummyEvaluatedXmlName implements EvaluatedXmlName {
return EvaluatedXmlNameImpl.createEvaluatedXmlName(name, namespaceKey, false);
}
public boolean isNamespaceAllowed(final String namespace, final XmlFile file) {
public boolean isNamespaceAllowed(final String namespace, final XmlFile file, boolean qualified) {
return namespace.equals(myNamespace);
}
xml/dom-openapi/src/com/intellij/util/xml/EvaluatedXmlName.java
+1 -1
View File
@@ -29,7 +29,7 @@ public interface EvaluatedXmlName {
EvaluatedXmlName evaluateChildName(@NotNull XmlName name);
boolean isNamespaceAllowed(String namespace, final XmlFile file);
boolean isNamespaceAllowed(String namespace, final XmlFile file, boolean qualified);
@NotNull @NonNls
String getNamespace(@NotNull XmlElement parentElement, final XmlFile file);
xml/dom-openapi/src/com/intellij/util/xml/EvaluatedXmlNameImpl.java
+5 -2
View File
@@ -128,8 +128,11 @@ public class EvaluatedXmlNameImpl implements EvaluatedXmlName {
}
public final boolean isNamespaceAllowed(String namespace, final XmlFile file) {
return myNamespaceKey == null || myEqualToParent || isNamespaceAllowed(namespace, getNamespaceList(file));
public final boolean isNamespaceAllowed(String namespace, final XmlFile file, boolean qualified) {
if (myEqualToParent && qualified) {
System.out.println();
}
return myNamespaceKey == null || myEqualToParent && !qualified || isNamespaceAllowed(namespace, getNamespaceList(file));
}
@NotNull @NonNls