MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-rd] IDEA-337346 Exception in java thin client for highlighting brackets

Browse Source 
GitOrigin-RevId: 8703602214ecf1acdda745e0afc606700b74ddc1
This commit is contained in:
Mikhail Pyltsin
2023-11-06 19:40:40 +01:00
committed by intellij-monorepo-bot
parent 6025e5e94f
commit 5cb5c4c79c
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/java-frontback-impl/src/com/intellij/codeInsight/highlighting/JavaBraceMatcher.java
View File

@@ -62,7 +62,10 @@ public class JavaBraceMatcher implements PairedBraceMatcher {
parentNode = parentNode.getTreeParent();
if (BasicJavaAstTreeUtil.is(parentNode, BASIC_METHOD) ||
BasicJavaAstTreeUtil.is(parentNode, BASIC_CLASS_INITIALIZER)) {
TextRange range = DeclarationRangeUtil.getDeclarationRange(parentNode.getPsi());
TextRange range = DeclarationRangeUtil.getPossibleDeclarationAtRange(parentNode.getPsi());
if (range == null) {
return parentNode.getTextRange().getStartOffset();
}
return range.getStartOffset();
}
else if (BasicJavaAstTreeUtil.is(parentNode, BASIC_JAVA_STATEMENT_BIT_SET)) {
@@ -74,7 +77,10 @@ public class JavaBraceMatcher implements PairedBraceMatcher {
}
}
else if (BasicJavaAstTreeUtil.is(parentNode, BASIC_CLASS_KEYWORD_BIT_SET)) {
TextRange range = DeclarationRangeUtil.getDeclarationRange(parent);
TextRange range = DeclarationRangeUtil.getPossibleDeclarationAtRange(parent);
if (range == null) {
return parentNode.getTextRange().getStartOffset();
}
return range.getStartOffset();
}
return openingBraceOffset;