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

do not throw exceptions for invalid DOM, just log problems

Browse Source 
(e.g. http://youtrack.jetbrains.com/issue/IDEA-98943)
This commit is contained in:
Dmitry Avdeev
2013-02-04 12:26:27 +04:00
parent 77c2676645
commit 3d027ff2a5
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/dom-openapi/src/com/intellij/util/xml/DomUtil.java
+14 -9
View File
@@ -221,7 +221,6 @@ public class DomUtil {
}
});
return result;
}
ProgressManager.checkCanceled();
@@ -241,21 +240,25 @@ public class DomUtil {
if (attributes) {
for (final XmlAttribute attribute : tag.getAttributes()) {
if (!attribute.isValid()) {
throw new AssertionError("Invalid attr: parent.valid=" + tag.isValid());
LOG.error("Invalid attr: parent.valid=" + tag.isValid());
continue;
}
GenericAttributeValue element = domManager.getDomElement(attribute);
checkHasXml(attribute, element);
ContainerUtil.addIfNotNull(element, result);
if (checkHasXml(attribute, element)) {
ContainerUtil.addIfNotNull(element, result);
}
}
}
if (tags) {
for (final XmlTag subTag : tag.getSubTags()) {
if (!subTag.isValid()) {
throw new AssertionError("Invalid subtag: parent.valid=" + tag.isValid());
LOG.error("Invalid subtag: parent.valid=" + tag.isValid());
continue;
}
DomElement element = domManager.getDomElement(subTag);
checkHasXml(subTag, element);
ContainerUtil.addIfNotNull(element, result);
if (checkHasXml(subTag, element)) {
ContainerUtil.addIfNotNull(element, result);
}
}
}
return result;
@@ -263,10 +266,12 @@ public class DomUtil {
return Collections.emptyList();
}
private static void checkHasXml(XmlElement psi, DomElement dom) {
private static boolean checkHasXml(XmlElement psi, DomElement dom) {
if (dom != null && dom.getXmlElement() == null) {
throw new AssertionError("No xml for dom " + dom + "; attr=" + psi + ", physical=" + psi.isPhysical());
LOG.error("No xml for dom " + dom + "; attr=" + psi + ", physical=" + psi.isPhysical());
return false;
}
return true;
}
public static <T> List<T> getDefinedChildrenOfType(@NotNull final DomElement parent, final Class<T> type, boolean tags, boolean attributes) {