From 56ce5cb6b2b22ddcf64df0de85d3fff404b5563a Mon Sep 17 00:00:00 2001 From: Mikhail Pyltsin Date: Tue, 18 Nov 2025 13:45:57 +0100 Subject: [PATCH] [java] IDEA-365317 small fixes GitOrigin-RevId: 0bb4eff862270c6540c3542776f926fa56996c08 --- .../com/intellij/lang/java/parser/JavaParser.java | 1 + .../lang/java/parser/PrattExpressionParser.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParser.java index f3da29802109..dfc426d9e24b 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParser.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParser.java @@ -59,6 +59,7 @@ public class JavaParser { return myPatternParser; } + @Deprecated @ApiStatus.ScheduledForRemoval public AbstractBasicJavaElementTypeFactory getJavaElementTypeFactory() { return JavaElementTypeFactory.INSTANCE; diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/PrattExpressionParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/PrattExpressionParser.java index 644d90d33b73..69756950eb94 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/parser/PrattExpressionParser.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/PrattExpressionParser.java @@ -60,8 +60,8 @@ public final class PrattExpressionParser { this.ourInfixParsers = new HashMap<>(); AssignmentParser assignmentParser = new PrattExpressionParser.AssignmentParser(); PolyExprParser polyExprParser = new PrattExpressionParser.PolyExprParser(); - InstanceofParser instanceofParser = new PrattExpressionParser.InstanceofParser(); - ConditionalExprParser conditionalExprParser = new PrattExpressionParser.ConditionalExprParser(); + InstanceofParser instanceofParser = new InstanceofParser(); + ConditionalExprParser conditionalExprParser = new ConditionalExprParser(); for (IElementType type : Arrays.asList(EQ, ASTERISKEQ, DIVEQ, PERCEQ, PLUSEQ, MINUSEQ, @@ -865,7 +865,9 @@ public final class PrattExpressionParser { return start; } - private @Nullable PsiBuilder.Marker parseClassObjectAccess(PsiBuilder builder, PsiBuilder.Marker expr, boolean optionalClassKeyword) { + private static @Nullable PsiBuilder.Marker parseClassObjectAccess(PsiBuilder builder, + PsiBuilder.Marker expr, + boolean optionalClassKeyword) { final PsiBuilder.Marker mark = builder.mark(); builder.advanceLexer(); @@ -883,7 +885,7 @@ public final class PrattExpressionParser { return expr; } - private void emptyExpression(final PsiBuilder builder) { + private static void emptyExpression(final PsiBuilder builder) { emptyElement(builder, EMPTY_EXPRESSION); } @@ -1000,7 +1002,7 @@ public final class PrattExpressionParser { } } - private final class ConditionalExprParser implements PrattExpressionParser.InfixParser { + private static final class ConditionalExprParser implements PrattExpressionParser.InfixParser { @Override public void parse(PrattExpressionParser parser, PsiBuilder builder, @@ -1033,7 +1035,7 @@ public final class PrattExpressionParser { } } - private final class InstanceofParser implements PrattExpressionParser.InfixParser { + private static final class InstanceofParser implements PrattExpressionParser.InfixParser { @Override public void parse(PrattExpressionParser parser,