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

[java-rd] IDEA-322563 refactoring for java rem-dev

Browse Source 
- rename basic token sets to BASIC_

GitOrigin-RevId: 1f6191a6fddbee5676fefeff2e40d718b15dee53
This commit is contained in:
Mikhail Pyltsin
2023-09-22 18:09:14 +02:00
committed by intellij-monorepo-bot
parent bb5b036281
commit e2bf8301c0
24 changed files with 121 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,8 +17,8 @@ import com.intellij.psi.tree.TokenSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import static com.intellij.psi.impl.source.BasicElementTypes.JAVA_COMMENT_OR_WHITESPACE_BIT_SET;
import static com.intellij.psi.impl.source.BasicElementTypes.TEXT_LITERALS;
import static com.intellij.psi.impl.source.BasicElementTypes.BASIC_JAVA_COMMENT_OR_WHITESPACE_BIT_SET;
import static com.intellij.psi.impl.source.BasicElementTypes.BASIC_TEXT_LITERALS;
import static com.intellij.psi.impl.source.BasicJavaElementType.BASIC_LITERAL_EXPRESSION;
import static com.intellij.psi.impl.source.BasicJavaElementType.REFERENCE_EXPRESSION_SET;
@@ -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),
JAVA_COMMENT_OR_WHITESPACE_BIT_SET, TEXT_LITERALS,
BASIC_JAVA_COMMENT_OR_WHITESPACE_BIT_SET, BASIC_TEXT_LITERALS,
BasicJavaTokenSet.create(JavaTokenType.SEMICOLON, JavaTokenType.COMMA, JavaTokenType.RPARENTH, JavaTokenType.RBRACKET,
JavaTokenType.RBRACE));
public JavaQuoteHandler() {
super(BasicJavaTokenSet.orSet(TEXT_LITERALS, BasicJavaTokenSet.create(JavaDocTokenType.DOC_TAG_VALUE_QUOTE)).toTokenSet());
super(BasicJavaTokenSet.orSet(BASIC_TEXT_LITERALS, BasicJavaTokenSet.create(JavaDocTokenType.DOC_TAG_VALUE_QUOTE)).toTokenSet());
}
@Override

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

@@ -33,7 +33,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
import static com.intellij.psi.impl.source.BasicElementTypes.JAVA_COMMENT_BIT_SET;
import static com.intellij.psi.impl.source.BasicElementTypes.BASIC_JAVA_COMMENT_BIT_SET;
import static com.intellij.psi.impl.source.BasicJavaElementType.*;
public abstract class AbstractBasicJavaSmartEnterProcessor extends SmartEnterProcessor {
@@ -300,7 +300,7 @@ public abstract class AbstractBasicJavaSmartEnterProcessor extends SmartEnterPro
return each.getPsi();
}
if (BasicJavaAstTreeUtil.is(each, BASIC_CODE_BLOCK) ||
BasicJavaAstTreeUtil.is(each, JAVA_COMMENT_BIT_SET)) {
BasicJavaAstTreeUtil.is(each, BASIC_JAVA_COMMENT_BIT_SET)) {
return null;
}
if (BasicJavaAstTreeUtil.is(each, STATEMENT_SET)) {

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

@@ -17,7 +17,7 @@ import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import static com.intellij.psi.impl.source.BasicElementTypes.JAVA_COMMENT_OR_WHITESPACE_BIT_SET;
import static com.intellij.psi.impl.source.BasicElementTypes.BASIC_JAVA_COMMENT_OR_WHITESPACE_BIT_SET;
import static com.intellij.psi.impl.source.BasicJavaElementType.*;
public abstract class AbstractBasicSemicolonFixer implements Fixer {
@@ -93,7 +93,7 @@ public abstract class AbstractBasicSemicolonFixer implements Fixer {
int tailLength = 0;
ASTNode leaf = TreeUtil.findLastLeaf(astNode);
while (leaf != null && JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(leaf.getElementType())) {
while (leaf != null && BASIC_JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(leaf.getElementType())) {
tailLength += leaf.getTextLength();
leaf = TreeUtil.prevLeaf(leaf);
}

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.JAVA_PLAIN_COMMENT_BIT_SET, BasicJavaTokenSet.create(DOC_COMMENT)
BasicElementTypes.BASIC_JAVA_PLAIN_COMMENT_BIT_SET, BasicJavaTokenSet.create(DOC_COMMENT)
);
@Override

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

@@ -13,7 +13,7 @@ import com.intellij.psi.util.PsiUtilCore;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import static com.intellij.psi.impl.source.BasicElementTypes.JAVA_PLAIN_COMMENT_BIT_SET;
import static com.intellij.psi.impl.source.BasicElementTypes.BASIC_JAVA_PLAIN_COMMENT_BIT_SET;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.DOC_COMMENT;
import static com.intellij.psi.impl.source.BasicJavaElementType.*;
@@ -43,7 +43,7 @@ public class IfConditionFixer implements Fixer {
innerComment = lastChild.getText();
}
else if (BasicJavaAstTreeUtil.is(lastChild, DOC_COMMENT) ||
BasicJavaAstTreeUtil.is(lastChild, JAVA_PLAIN_COMMENT_BIT_SET)
BasicJavaAstTreeUtil.is(lastChild, BASIC_JAVA_PLAIN_COMMENT_BIT_SET)
) {
lastComment = lastChild.getText();
}

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

@@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.function.Predicate;
import static com.intellij.psi.impl.source.BasicElementTypes.JAVA_COMMENT_BIT_SET;
import static com.intellij.psi.impl.source.BasicElementTypes.BASIC_JAVA_COMMENT_BIT_SET;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.*;
import static com.intellij.psi.impl.source.BasicJavaElementType.*;
@@ -30,7 +30,7 @@ public abstract class AbstractBasicBackBasicSelectioner extends ExtendWordSelect
ASTNode node = BasicJavaAstTreeUtil.toNode(e);
return
!BasicJavaAstTreeUtil.is(node, TokenType.WHITE_SPACE) &&
!BasicJavaAstTreeUtil.is(node, JAVA_COMMENT_BIT_SET) &&
!BasicJavaAstTreeUtil.is(node, BASIC_JAVA_COMMENT_BIT_SET) &&
!BasicJavaAstTreeUtil.is(node, BASIC_CODE_BLOCK) &&
!BasicJavaAstTreeUtil.is(node, BASIC_ARRAY_INITIALIZER_EXPRESSION) &&
!BasicJavaAstTreeUtil.is(node, BASIC_PARAMETER_LIST) &&

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

@@ -17,7 +17,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import static com.intellij.psi.impl.source.BasicElementTypes.JAVA_COMMENT_BIT_SET;
import static com.intellij.psi.impl.source.BasicElementTypes.BASIC_JAVA_COMMENT_BIT_SET;
public class AntLikePropertySelectionHandler extends ExtendWordSelectionHandlerBase {
@Override
@@ -49,7 +49,7 @@ public class AntLikePropertySelectionHandler extends ExtendWordSelectionHandlerB
return false;
}
if (BasicJavaAstTreeUtil.getParentOfType(BasicJavaAstTreeUtil.toNode(e), JAVA_COMMENT_BIT_SET) == null) {
if (BasicJavaAstTreeUtil.getParentOfType(BasicJavaAstTreeUtil.toNode(e), BASIC_JAVA_COMMENT_BIT_SET) == null) {
return true;
}
return PsiTreeUtil.getParentOfType(e, PsiComment.class) == null;

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

@@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
import static com.intellij.psi.impl.source.BasicElementTypes.STRING_LITERALS;
import static com.intellij.psi.impl.source.BasicElementTypes.BASIC_STRING_LITERALS;
import static com.intellij.psi.impl.source.BasicJavaElementType.BASIC_LITERAL_EXPRESSION;
public class LiteralSelectioner extends AbstractBasicBackBasicSelectioner {
@@ -27,7 +27,7 @@ public class LiteralSelectioner extends AbstractBasicBackBasicSelectioner {
}
private static boolean isStringLiteral(PsiElement element) {
return BasicJavaAstTreeUtil.is(BasicJavaAstTreeUtil.toNode(element), STRING_LITERALS)
return BasicJavaAstTreeUtil.is(BasicJavaAstTreeUtil.toNode(element), BASIC_STRING_LITERALS)
&& element.getText().startsWith("\"")
&& element.getText().endsWith("\"");
}

8
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java
View File

@@ -14,8 +14,8 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import static com.intellij.psi.impl.source.BasicElementTypes.JAVA_COMMENT_BIT_SET;
import static com.intellij.psi.impl.source.BasicElementTypes.JAVA_COMMENT_OR_WHITESPACE_BIT_SET;
import static com.intellij.psi.impl.source.BasicElementTypes.BASIC_JAVA_COMMENT_BIT_SET;
import static com.intellij.psi.impl.source.BasicElementTypes.BASIC_JAVA_COMMENT_OR_WHITESPACE_BIT_SET;
import static com.intellij.psi.impl.source.BasicJavaDocElementType.DOC_COMMENT;
import static com.intellij.psi.impl.source.BasicJavaElementType.*;
@@ -57,8 +57,8 @@ public class MethodOrClassSelectioner extends AbstractBasicBackBasicSelectioner
firstChild = children.get(i++);
}
if (BasicJavaAstTreeUtil.is(firstChild, JAVA_COMMENT_BIT_SET)) {
while (BasicJavaAstTreeUtil.is(children.get(i), JAVA_COMMENT_OR_WHITESPACE_BIT_SET)) {
if (BasicJavaAstTreeUtil.is(firstChild, BASIC_JAVA_COMMENT_BIT_SET)) {
while (BasicJavaAstTreeUtil.is(children.get(i), BASIC_JAVA_COMMENT_OR_WHITESPACE_BIT_SET)) {
i++;
}
ASTNode last = BasicJavaAstTreeUtil.isWhiteSpace(children.get(i - 1)) ? children.get(i - 2) : children.get(i - 1);

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

@@ -41,7 +41,7 @@ public class JavaBraceMatcher implements PairedBraceMatcher {
}
private static boolean isPairedBracesAllowedBeforeTypeInJava(final IElementType tokenType) {
return JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(tokenType)
return BASIC_JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(tokenType)
|| tokenType == JavaTokenType.SEMICOLON
|| tokenType == JavaTokenType.COMMA
|| tokenType == JavaTokenType.RPARENTH
@@ -65,15 +65,15 @@ public class JavaBraceMatcher implements PairedBraceMatcher {
TextRange range = DeclarationRangeUtil.getDeclarationRange(parentNode.getPsi());
return range.getStartOffset();
}
else if (BasicJavaAstTreeUtil.is(parentNode, JAVA_STATEMENT_BIT_SET)) {
else if (BasicJavaAstTreeUtil.is(parentNode, BASIC_JAVA_STATEMENT_BIT_SET)) {
if (BasicJavaAstTreeUtil.is(parentNode, BASIC_BLOCK_STATEMENT) &&
BasicJavaAstTreeUtil.is(parentNode.getTreeParent(), JAVA_STATEMENT_BIT_SET)) {
BasicJavaAstTreeUtil.is(parentNode.getTreeParent(), BASIC_JAVA_STATEMENT_BIT_SET)) {
parentNode = parentNode.getTreeParent();
}
return parentNode.getTextRange().getStartOffset();
}
}
else if (BasicJavaAstTreeUtil.is(parentNode, CLASS_KEYWORD_BIT_SET)) {
else if (BasicJavaAstTreeUtil.is(parentNode, BASIC_CLASS_KEYWORD_BIT_SET)) {
TextRange range = DeclarationRangeUtil.getDeclarationRange(parent);
return range.getStartOffset();
}

2
java/java-frontback-impl/src/com/intellij/codeInsight/highlighting/JavaPairedBraceMatcher.java
View File

@@ -14,7 +14,7 @@ public class JavaPairedBraceMatcher extends PairedBraceAndAnglesMatcher {
private static class Holder {
private static final BasicJavaTokenSet TYPE_TOKENS =
BasicJavaTokenSet.orSet(BaseJavaJspElementType.WHITE_SPACE_BIT_SET,
BasicElementTypes.JAVA_COMMENT_BIT_SET,
BasicElementTypes.BASIC_JAVA_COMMENT_BIT_SET,
BasicJavaTokenSet.create(JavaTokenType.IDENTIFIER, JavaTokenType.COMMA,
JavaTokenType.AT,//anno
JavaTokenType.RBRACKET, JavaTokenType.LBRACKET, //arrays

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, KEYWORD_BIT_SET.toTokenSet(), JavaHighlightingColors.KEYWORD);
fillMap(ourMap1, LITERAL_BIT_SET.toTokenSet(), JavaHighlightingColors.KEYWORD);
fillMap(ourMap1, OPERATION_BIT_SET.toTokenSet(), JavaHighlightingColors.OPERATION_SIGN);
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);
for (IElementType type : JavaDocTokenType.ALL_JAVADOC_TOKENS.getTypes()) {
ourMap1.put(type, JavaHighlightingColors.DOC_COMMENT);

2
java/java-frontback-impl/src/com/intellij/lexer/JavaStringLiteralLexer.java
View File

@@ -25,7 +25,7 @@ class JavaStringLiteralLexer extends StringLiteralLexer {
IElementType tokenType = super.getTokenType();
if (tokenType == StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN) {
char c = myBuffer.charAt(myStart + 1);
if (c == '{' && BasicElementTypes.STRING_TEMPLATE_FRAGMENTS.contains(myOriginalLiteralToken)) {
if (c == '{' && BasicElementTypes.BASIC_STRING_TEMPLATE_FRAGMENTS.contains(myOriginalLiteralToken)) {
// don't highlight \{ in template fragment as bad escape
return myOriginalLiteralToken;
}