From 9ccb2c2629212976b6b1158ef4629bdf296cbda4 Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Mon, 25 Mar 2019 15:29:48 +0300 Subject: [PATCH] cleanup --- .../src/com/intellij/xml/impl/XmlBraceMatcher.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/xml/impl/src/com/intellij/xml/impl/XmlBraceMatcher.java b/xml/impl/src/com/intellij/xml/impl/XmlBraceMatcher.java index dd91b8a9d2da..a5bb0aabeb7a 100644 --- a/xml/impl/src/com/intellij/xml/impl/XmlBraceMatcher.java +++ b/xml/impl/src/com/intellij/xml/impl/XmlBraceMatcher.java @@ -156,14 +156,13 @@ public class XmlBraceMatcher implements XmlAwareBraceMatcher { pair.isStructural()) return true; } } - return isXmlStructuralBrace(iterator, text, fileType, tokenType); + return isXmlStructuralBrace(tokenType); } - protected boolean isXmlStructuralBrace(HighlighterIterator iterator, CharSequence text, FileType fileType, IElementType tokenType) { + protected boolean isXmlStructuralBrace(IElementType tokenType) { return tokenType == XmlTokenType.XML_START_TAG_START || tokenType == XmlTokenType.XML_TAG_END || - tokenType == XmlTokenType.XML_EMPTY_ELEMENT_END || - tokenType == XmlTokenType.XML_TAG_END && isFileTypeWithSingleHtmlTags(fileType) && isEndOfSingleHtmlTag(text, iterator); + tokenType == XmlTokenType.XML_EMPTY_ELEMENT_END; } @Override @@ -210,11 +209,6 @@ public class XmlBraceMatcher implements XmlAwareBraceMatcher { return tokenType == XmlTokenType.XML_END_TAG_START; } - private boolean isEndOfSingleHtmlTag(CharSequence text,HighlighterIterator iterator) { - String tagName = getTagName(text,iterator); - return tagName != null && HtmlUtil.isSingleHtmlTag(tagName); - } - @Override public String getTagName(CharSequence fileText, HighlighterIterator iterator) { final IElementType tokenType = iterator.getTokenType();