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

[java] IDEA-365317 delete usages of BasicElementTypes

Browse Source 
GitOrigin-RevId: 4663096a3986e2be04efff60c37ce97d1c550752
This commit is contained in:
Mikhail Pyltsin
2025-11-20 12:44:51 +00:00
committed by intellij-monorepo-bot
parent bf22495377
commit c8404d66b0
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/LiteralSelectioner.java
+7 -5
View File
@@ -10,19 +10,21 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.BasicLiteralUtil;
import com.intellij.psi.JavaTokenType;
import com.intellij.psi.PsiElement;
import com.intellij.psi.impl.source.BasicElementTypes;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import static com.intellij.psi.impl.source.tree.ElementType.STRING_LITERALS;
import static com.intellij.psi.impl.source.tree.ElementType.STRING_TEMPLATE_FRAGMENTS;
public final class LiteralSelectioner extends BasicSelectioner {
@Override
public boolean canSelect(@NotNull PsiElement e) {
IElementType type = e.getNode().getElementType();
return BasicElementTypes.BASIC_STRING_LITERALS.contains(type) ||
BasicElementTypes.BASIC_STRING_TEMPLATE_FRAGMENTS.contains(type);
return STRING_LITERALS.contains(type) ||
STRING_TEMPLATE_FRAGMENTS.contains(type);
}
@Override
@@ -47,8 +49,8 @@ public final class LiteralSelectioner extends BasicSelectioner {
}
else if (tokenType == JavaTokenType.STRING_TEMPLATE_END || tokenType == JavaTokenType.STRING_LITERAL) {
int end = text.charAt(range.getEndOffset() - 1) == '"'
? range.getEndOffset() - 1
: range.getEndOffset();
? range.getEndOffset() - 1
: range.getEndOffset();
return new TextRange(range.getStartOffset() + 1, end);
}
else if (tokenType == JavaTokenType.TEXT_BLOCK_TEMPLATE_BEGIN || tokenType == JavaTokenType.TEXT_BLOCK_TEMPLATE_END ||
java/java-frontback-impl/src/com/intellij/ide/highlighter/AbstractBasicJavaFileHighlighter.java
+5 -5
View File
@@ -16,7 +16,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.HashMap;
import java.util.Map;
import static com.intellij.psi.impl.source.BasicElementTypes.*;
import static com.intellij.psi.impl.source.tree.ElementType.*;
//suppress to be clear, what type is used
@SuppressWarnings("UnnecessarilyQualifiedStaticUsage")
@@ -31,9 +31,9 @@ public abstract class AbstractBasicJavaFileHighlighter extends SyntaxHighlighter
ourMap1 = new HashMap<>();
ourMap2 = new HashMap<>();
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);
fillMap(ourMap1, KEYWORD_BIT_SET, JavaHighlightingColors.KEYWORD);
fillMap(ourMap1, LITERAL_BIT_SET, JavaHighlightingColors.KEYWORD);
fillMap(ourMap1, OPERATION_BIT_SET, JavaHighlightingColors.OPERATION_SIGN);
for (IElementType type : JavaDocTokenType.ALL_JAVADOC_TOKENS.getTypes()) {
ourMap1.put(type, JavaHighlightingColors.DOC_COMMENT);
@@ -71,7 +71,7 @@ public abstract class AbstractBasicJavaFileHighlighter extends SyntaxHighlighter
ourMap1.put(JavaTokenType.SEMICOLON, JavaHighlightingColors.JAVA_SEMICOLON);
ourMap1.put(JavaTokenType.C_STYLE_COMMENT, JavaHighlightingColors.JAVA_BLOCK_COMMENT);
ourMap1.put(BASIC_DOC_COMMENT, JavaHighlightingColors.DOC_COMMENT);
ourMap1.put(DOC_COMMENT, JavaHighlightingColors.DOC_COMMENT);
ourMap1.put(JavaTokenType.END_OF_LINE_COMMENT, JavaHighlightingColors.LINE_COMMENT);
ourMap1.put(TokenType.BAD_CHARACTER, HighlighterColors.BAD_CHARACTER);
java/java-frontback-impl/src/com/intellij/lexer/JavaStringLiteralLexer.java
+3 -2
View File
@@ -3,10 +3,11 @@ package com.intellij.lexer;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.StringEscapesTokenTypes;
import com.intellij.psi.impl.source.BasicElementTypes;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull;
import static com.intellij.psi.impl.source.tree.ElementType.STRING_TEMPLATE_FRAGMENTS;
class JavaStringLiteralLexer extends StringLiteralLexer {
JavaStringLiteralLexer(char quoteChar, IElementType originalLiteralToken) {
@@ -25,7 +26,7 @@ class JavaStringLiteralLexer extends StringLiteralLexer {
IElementType tokenType = super.getTokenType();
if (tokenType == StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN && myBuffer.length() > myStart + 1) {
char c = myBuffer.charAt(myStart + 1);
if (c == '{' && BasicElementTypes.BASIC_STRING_TEMPLATE_FRAGMENTS.contains(myOriginalLiteralToken)) {
if (c == '{' && STRING_TEMPLATE_FRAGMENTS.contains(myOriginalLiteralToken)) {
// don't highlight \{ in template fragment as bad escape
return myOriginalLiteralToken;
}