MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 04:51:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-rd] IDEA-322563 fix cases when highlighting get null in parents

Browse Source 
- rename basic token sets to BASIC_

GitOrigin-RevId: 88cb12cf1eeff34651093507ba8865778c9089f9
This commit is contained in:
Mikhail Pyltsin
2023-09-22 17:26:50 +02:00
committed by intellij-monorepo-bot
parent e2bf8301c0
commit 6a746407f8
6 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/JavaQuoteHandler.java
View File

@@ -26,12 +26,12 @@ public class JavaQuoteHandler extends SimpleTokenSetQuoteHandler implements Java
private final BasicJavaTokenSet myConcatenableStrings = BasicJavaTokenSet.create(JavaTokenType.STRING_LITERAL);
private final BasicJavaTokenSet myAppropriateElementTypeForLiteral = BasicJavaTokenSet.orSet(
BasicJavaTokenSet.create(JavaDocTokenType.ALL_JAVADOC_TOKENS),
BASIC_JAVA_COMMENT_OR_WHITESPACE_BIT_SET, BASIC_TEXT_LITERALS,
BASIC_JAVA_COMMENT_OR_WHITESPACE_BIT_SET, BasicJavaTokenSet.create(BASIC_TEXT_LITERALS),
BasicJavaTokenSet.create(JavaTokenType.SEMICOLON, JavaTokenType.COMMA, JavaTokenType.RPARENTH, JavaTokenType.RBRACKET,
JavaTokenType.RBRACE));
public JavaQuoteHandler() {
super(BasicJavaTokenSet.orSet(BASIC_TEXT_LITERALS, BasicJavaTokenSet.create(JavaDocTokenType.DOC_TAG_VALUE_QUOTE)).toTokenSet());
super(BasicJavaTokenSet.orSet(BasicJavaTokenSet.create(BASIC_TEXT_LITERALS), BasicJavaTokenSet.create(JavaDocTokenType.DOC_TAG_VALUE_QUOTE)).toTokenSet());
}
@Override

2
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/smartEnter/CommentBreakerEnterProcessor.java
View File

@@ -34,7 +34,7 @@ import static com.intellij.psi.impl.source.BasicJavaDocElementType.DOC_COMMENT;
public class CommentBreakerEnterProcessor implements ASTNodeEnterProcessor {
private final BasicJavaTokenSet myCommentTypes = BasicJavaTokenSet.orSet(
BasicElementTypes.BASIC_JAVA_PLAIN_COMMENT_BIT_SET, BasicJavaTokenSet.create(DOC_COMMENT)
BasicJavaTokenSet.create(BasicElementTypes.BASIC_JAVA_PLAIN_COMMENT_BIT_SET), BasicJavaTokenSet.create(DOC_COMMENT)
);
@Override

6
java/java-frontback-impl/src/com/intellij/ide/highlighter/AbstractBasicJavaFileHighlighter.java
View File

@@ -29,9 +29,9 @@ public abstract class AbstractBasicJavaFileHighlighter extends SyntaxHighlighter
ourMap1 = new HashMap<>();
ourMap2 = new HashMap<>();
fillMap(ourMap1, BASIC_KEYWORD_BIT_SET.toTokenSet(), JavaHighlightingColors.KEYWORD);
fillMap(ourMap1, BASIC_LITERAL_BIT_SET.toTokenSet(), JavaHighlightingColors.KEYWORD);
fillMap(ourMap1, BASIC_OPERATION_BIT_SET.toTokenSet(), JavaHighlightingColors.OPERATION_SIGN);
fillMap(ourMap1, BASIC_KEYWORD_BIT_SET, JavaHighlightingColors.KEYWORD);
fillMap(ourMap1, BASIC_LITERAL_BIT_SET, JavaHighlightingColors.KEYWORD);
fillMap(ourMap1, BASIC_OPERATION_BIT_SET, JavaHighlightingColors.OPERATION_SIGN);
for (IElementType type : JavaDocTokenType.ALL_JAVADOC_TOKENS.getTypes()) {
ourMap1.put(type, JavaHighlightingColors.DOC_COMMENT);