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

IDEA-38432 CSS: non-curved braces without pair brace are resolved as matching to curved braces

Browse Source
This commit is contained in:
Alexey Pegov
2010-01-23 14:03:50 +03:00
parent 239c0eb85d
commit 8c91a618e4
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceMatchingUtil.java
+14
View File
@@ -66,6 +66,7 @@ public class BraceMatchingUtil {
String brace1TagName;
boolean isStrict;
boolean isCaseSensitive;
boolean isStructural;
private BraceMatcher myMatcher;
MatchBraceContext(CharSequence _fileText, FileType _fileType, HighlighterIterator _iterator, boolean _forward) {
@@ -80,6 +81,7 @@ public class BraceMatchingUtil {
brace1TagName = myMatcher == null ? null : getTagName(myMatcher,fileText, iterator);
isStrict = myMatcher != null && isStrictTagMatching(myMatcher,fileType, group);
isStructural = !isStrict && myMatcher != null && myMatcher.isStructuralBrace(iterator, fileText, fileType);
isCaseSensitive = myMatcher != null && areTagsCaseSensitive(myMatcher,fileType, group);
}
@@ -115,6 +117,12 @@ public class BraceMatchingUtil {
}
String tagName = myMatcher == null ? null : getTagName(myMatcher,fileText, iterator);
if (!isStrict && !Comparing.equal(brace1TagName, tagName, isCaseSensitive)) continue;
if (isStructural && (forward ? isRBraceToken(iterator, fileText, fileType) && !isPairBraces(brace1Token, tokenType, fileType)
: isLBraceToken(iterator, fileText, fileType) && !isPairBraces(brace1Token, tokenType, fileType))) {
if (!ourBraceStack.isEmpty() && myMatcher != null && !ourBraceStack.contains(myMatcher.getOppositeBraceTokenType(tokenType))) continue;
}
if (forward ? isLBraceToken(iterator, fileText, fileType) : isRBraceToken(iterator, fileText, fileType)){
ourBraceStack.push(tokenType);
if (isStrict){
@@ -128,6 +136,12 @@ public class BraceMatchingUtil {
topTagName = ourTagNameStack.pop();
}
if (!isStrict && myMatcher != null && ourBraceStack.contains(myMatcher.getOppositeBraceTokenType(tokenType))) {
while(!isPairBraces(topTokenType, tokenType, fileType)) {
topTokenType = ourBraceStack.pop();
}
}
if (!isPairBraces(topTokenType, tokenType, fileType)
|| isStrict && !Comparing.equal(topTagName, tagName, isCaseSensitive)
){