MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 06:05:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-359853 mark all new syntax nodes @JvmField

Browse Source 
GitOrigin-RevId: 765fd957acda3b93ab738118b9330c45d0e07d4e
This commit is contained in:
Max Medvedev
2025-04-01 00:38:45 +00:00
committed by intellij-monorepo-bot
parent 97c893b8fb
commit 871203961a
11 changed files with 316 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-indexing-impl/src/com/intellij/psi/impl/java/JavaBinaryPlusExpressionIndex.java
+1 -1
View File
@@ -45,7 +45,7 @@ public final class JavaBinaryPlusExpressionIndex extends FileBasedIndexExtension
IntList result = new IntArrayList();
for (int i = 0; i < tokens.getTokenCount(); i++) {
if (hasType(tokens, i, JavaSyntaxTokenType.INSTANCE.getPLUS()) &&
if (hasType(tokens, i, JavaSyntaxTokenType.PLUS) &&
(hasType(tokens, forwardWhile(tokens, i + 1, JavaParserUtil.WS_COMMENTS), SyntaxElementTypes.INSTANCE.getALL_LITERALS()) !=
hasType(tokens, backWhile(tokens, i - 1, JavaParserUtil.WS_COMMENTS), SyntaxElementTypes.INSTANCE.getALL_LITERALS()))) {
result.add(tokens.getTokenStart(i));
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaNullMethodArgumentIndex.java
+10 -10
View File
@@ -43,7 +43,7 @@ public final class JavaNullMethodArgumentIndex extends ScalarIndexExtension<Java
TokenList tokens = JavaParserUtil.obtainTokens(inputData.getPsiFile());
for (int i = 0; i < tokens.getTokenCount(); i++) {
if (hasType(tokens, i, JavaSyntaxTokenType.INSTANCE.getNULL_KEYWORD())) {
if (hasType(tokens, i, JavaSyntaxTokenType.NULL_KEYWORD)) {
MethodCallData data = findCallData(tokens, i);
if (data != null) {
result.put(data, null);
@@ -55,37 +55,37 @@ public final class JavaNullMethodArgumentIndex extends ScalarIndexExtension<Java
}
private static @Nullable MethodCallData findCallData(TokenList tokens, int nullIndex) {
if (!hasType(tokens, forwardWhile(tokens, nullIndex + 1, JavaParserUtil.WS_COMMENTS), JavaSyntaxTokenType.INSTANCE.getRPARENTH(), JavaSyntaxTokenType.INSTANCE.getCOMMA())) return null;
if (!hasType(tokens, forwardWhile(tokens, nullIndex + 1, JavaParserUtil.WS_COMMENTS), JavaSyntaxTokenType.RPARENTH, JavaSyntaxTokenType.COMMA)) return null;
int i = backWhile(tokens, nullIndex - 1, JavaParserUtil.WS_COMMENTS);
if (!hasType(tokens, i, JavaSyntaxTokenType.INSTANCE.getLPARENTH(), JavaSyntaxTokenType.INSTANCE.getCOMMA())) return null;
if (!hasType(tokens, i, JavaSyntaxTokenType.LPARENTH, JavaSyntaxTokenType.COMMA)) return null;
int commaCount = 0;
while (true) {
if (hasType(tokens, i, null, JavaSyntaxTokenType.INSTANCE.getSEMICOLON(), JavaSyntaxTokenType.INSTANCE.getEQ(), JavaSyntaxTokenType.INSTANCE.getRBRACE())) {
if (hasType(tokens, i, null, JavaSyntaxTokenType.SEMICOLON, JavaSyntaxTokenType.EQ, JavaSyntaxTokenType.RBRACE)) {
return null;
}
SyntaxElementType type = tokens.getTokenType(i);
if (type == JavaSyntaxTokenType.INSTANCE.getCOMMA()) {
if (type == JavaSyntaxTokenType.COMMA) {
commaCount++;
}
else if (type == JavaSyntaxTokenType.INSTANCE.getLPARENTH()) {
else if (type == JavaSyntaxTokenType.LPARENTH) {
String name = findMethodName(tokens, i);
return name == null ? null : new MethodCallData(name, commaCount);
}
i = backWithBraceMatching(tokens, i, JavaSyntaxTokenType.INSTANCE.getLPARENTH(), JavaSyntaxTokenType.INSTANCE.getRPARENTH());
i = backWithBraceMatching(tokens, i, JavaSyntaxTokenType.LPARENTH, JavaSyntaxTokenType.RPARENTH);
}
}
private static @Nullable String findMethodName(TokenList tokens, int lparenth) {
int i = backWhile(tokens, lparenth - 1, JavaParserUtil.WS_COMMENTS);
if (hasType(tokens, i, JavaSyntaxTokenType.INSTANCE.getGT())) {
i = backWhile(tokens, backWithBraceMatching(tokens, i, JavaSyntaxTokenType.INSTANCE.getLT(), JavaSyntaxTokenType.INSTANCE.getGT()), JavaParserUtil.WS_COMMENTS);
if (hasType(tokens, i, JavaSyntaxTokenType.GT)) {
i = backWhile(tokens, backWithBraceMatching(tokens, i, JavaSyntaxTokenType.LT, JavaSyntaxTokenType.GT), JavaParserUtil.WS_COMMENTS);
}
return tokens.getTokenType(i) == JavaSyntaxTokenType.INSTANCE.getIDENTIFIER() ? tokens.getTokenText(i).toString() : null;
return tokens.getTokenType(i) == JavaSyntaxTokenType.IDENTIFIER ? tokens.getTokenText(i).toString() : null;
}
@Override