From 725f308993cbe9bfeff50708c740dba18ffb206f Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Wed, 23 May 2018 19:45:35 +0300 Subject: [PATCH] use relaxng schemas for svg and mathml (WEB-31136) --- .../src/org/intellij/plugins/relaxNG/ApplicationLoader.java | 3 +++ .../src/com/intellij/javaee/InternalResourceProvider.java | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/ApplicationLoader.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/ApplicationLoader.java index 57c8a1088fa4..28608c90a6b7 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/ApplicationLoader.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/ApplicationLoader.java @@ -31,6 +31,7 @@ import com.intellij.psi.xml.XmlDocument; import com.intellij.psi.xml.XmlTag; import com.intellij.util.xml.DomElement; import com.intellij.util.xml.DomManager; +import com.intellij.xml.util.HtmlUtil; import org.intellij.plugins.relaxNG.compact.psi.impl.RncDocument; import org.intellij.plugins.relaxNG.inspections.RngDomInspection; import org.intellij.plugins.relaxNG.inspections.UnusedDefineInspection; @@ -100,6 +101,8 @@ public class ApplicationLoader implements ApplicationComponent { @Override public void registerResources(ResourceRegistrar registrar) { registrar.addStdResource(RNG_NAMESPACE, "/resources/relaxng.rng", getClass()); + registrar.addStdResource(HtmlUtil.SVG_NAMESPACE, "/resources/html5-schema/svg11/svg11.rnc", getClass()); + registrar.addStdResource(HtmlUtil.MATH_ML_NAMESPACE, "/resources/html5-schema/mml3/mathml3.rnc", getClass()); registrar.addIgnoredResource("http://relaxng.org/ns/compatibility/annotations/1.0"); } } diff --git a/xml/xml-psi-impl/src/com/intellij/javaee/InternalResourceProvider.java b/xml/xml-psi-impl/src/com/intellij/javaee/InternalResourceProvider.java index 31b1f9f968ac..80ccde3ab965 100644 --- a/xml/xml-psi-impl/src/com/intellij/javaee/InternalResourceProvider.java +++ b/xml/xml-psi-impl/src/com/intellij/javaee/InternalResourceProvider.java @@ -15,7 +15,6 @@ */ package com.intellij.javaee; -import com.intellij.xml.util.HtmlUtil; import com.intellij.xml.util.XmlUtil; /** @@ -63,9 +62,6 @@ public class InternalResourceProvider implements StandardResourceProvider{ impl.addInternalResource("http://www.openmobilealliance.org/tech/DTD/xhtml-mobile12.dtd", "xhtml-mobile/xhtml-mobile12.dtd"); - // svg and mathML - impl.addIgnoredResource(HtmlUtil.MATH_ML_NAMESPACE); - impl.addIgnoredResource(HtmlUtil.SVG_NAMESPACE); impl.addInternalResource("http://www.w3.org/1999/xlink", "xlink.dtd"); } }