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

cleanup

Browse Source
This commit is contained in:
Dennis Ushakov
2019-03-25 17:01:36 +03:00
parent c8cb190513
commit 9ccb2c2629
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/xml/impl/XmlBraceMatcher.java
+3 -9
View File
@@ -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();