From b485bf75131ca9008a55187fdfc1a09fc1927316 Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Fri, 21 Apr 2017 14:19:48 +0200 Subject: [PATCH] use default doctype if non XmlDocument present (WEB-26324, WEB-26258) --- xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java b/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java index 3eff253641f3..1bbc060a0c0b 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java @@ -427,6 +427,10 @@ public class HtmlUtil { public static boolean isHtml5Context(XmlElement context) { XmlDocument doc = PsiTreeUtil.getParentOfType(context, XmlDocument.class); + if (doc == null && context != null) { + return Html5SchemaProvider.getHtml5SchemaLocation() + .equals(ExternalResourceManagerEx.getInstanceEx().getDefaultHtmlDoctype(context.getProject())); + } return isHtml5Document(doc); }