From ff0cf2859fa63fb7c851c79377ba7ff3333d099c Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Sun, 26 May 2019 18:18:02 +0300 Subject: [PATCH] JSX: use case sensitive comparison for emmet and completion (WEB-36536) GitOrigin-RevId: 31a3e7aa92377fdb6b46f4524995fb59b96ddb97 --- xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 9c4513a18cc1..09cc8b180c54 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 @@ -31,6 +31,7 @@ import com.intellij.psi.impl.source.html.HtmlDocumentImpl; import com.intellij.psi.impl.source.parsing.xml.HtmlBuilderDriver; import com.intellij.psi.impl.source.parsing.xml.XmlBuilder; import com.intellij.psi.impl.source.tree.CompositeElement; +import com.intellij.psi.impl.source.xml.XmlTagImpl; import com.intellij.psi.templateLanguages.OuterLanguageElement; import com.intellij.psi.templateLanguages.TemplateLanguageFileViewProvider; import com.intellij.psi.util.PsiTreeUtil; @@ -136,7 +137,7 @@ public class HtmlUtil { public static boolean isSingleHtmlTag(@NotNull XmlTag tag, boolean lowerCase) { final XmlExtension extension = XmlExtension.getExtensionByElement(tag); final String name = tag.getName(); - boolean result = EMPTY_TAGS_MAP.contains(lowerCase ? StringUtil.toLowerCase(name) : name); + boolean result = EMPTY_TAGS_MAP.contains(!lowerCase || (tag instanceof XmlTagImpl && ((XmlTagImpl)tag).isCaseSensitive()) ? name : StringUtil.toLowerCase(name)); return result && (extension == null || !extension.isSingleTagException(tag)); }