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

fix tests

Browse Source
This commit is contained in:
Eugene Kudelevsky
2012-04-16 16:09:22 +04:00
parent cce157ae1c
commit 4814792aec
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java
+5 -6
View File
@@ -52,7 +52,10 @@ import com.intellij.util.IncorrectOperationException;
import com.intellij.util.PlatformIcons;
import com.intellij.util.containers.BidirectionalMap;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.xml.*;
import com.intellij.xml.XmlAttributeDescriptor;
import com.intellij.xml.XmlElementDescriptor;
import com.intellij.xml.XmlExtension;
import com.intellij.xml.XmlNSDescriptor;
import com.intellij.xml.impl.dtd.XmlNSDescriptorImpl;
import com.intellij.xml.impl.schema.AnyXmlElementDescriptor;
import com.intellij.xml.util.XmlTagUtil;
@@ -861,11 +864,7 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag {
private String getNsLocation(String ns) {
if (XmlUtil.XHTML_URI.equals(ns)) {
String defaultHtmlDoctype = ExternalResourceManagerEx.getInstanceEx().getDefaultHtmlDoctype(getProject());
if (Html5SchemaProvider.HTML5_SCHEMA_LOCATION.equals(defaultHtmlDoctype)) {
defaultHtmlDoctype = Html5SchemaProvider.XHTML5_SCHEMA_LOCATION;
}
return defaultHtmlDoctype;
return XmlUtil.getDefaultXhtmlNamespace(getProject());
}
return ns;
}
xml/impl/src/com/intellij/xml/util/XmlUtil.java
+8
View File
@@ -602,6 +602,14 @@ public class XmlUtil {
compositeElement.addChildren(children[2].getNode(), null, null);
}
public static String getDefaultXhtmlNamespace(Project project) {
String defaultHtmlDoctype = ExternalResourceManagerEx.getInstanceEx().getDefaultHtmlDoctype(project);
if (Html5SchemaProvider.HTML5_SCHEMA_LOCATION.equals(defaultHtmlDoctype)) {
defaultHtmlDoctype = Html5SchemaProvider.XHTML5_SCHEMA_LOCATION;
}
return defaultHtmlDoctype;
}
//
//public static void expandTag(@NotNull XmlTag tag) {
// final LeafElement emptyTagEnd = (LeafElement)XmlChildRole.EMPTY_TAG_END_FINDER.findChild(tag.getNode());