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: parse parentheses with a call with lambda argument correctly (IDEA-200212)

Browse Source 
GitOrigin-RevId: 98fcbb3b793ebfcfa636ac7d27ef21158c64eee7
This commit is contained in:
Bas Leijdekkers
2024-08-03 15:48:09 +02:00
committed by intellij-monorepo-bot
parent 32fde2980c
commit d335ac32c4
6 changed files with 404 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/java-frontback-psi-impl/src/com/intellij/lang/java/parser/BasicOldExpressionParser.java
View File

@@ -916,14 +916,12 @@ public class BasicOldExpressionParser {
PsiBuilder.Marker marker = builder.mark();
builder.advanceLexer();
BasicReferenceParser.TypeInfo typeInfo = myParser.getReferenceParser().parseTypeInfo(
builder, BasicReferenceParser.EAT_LAST_DOT | BasicReferenceParser.ELLIPSIS | BasicReferenceParser.WILDCARD);
builder, BasicReferenceParser.ELLIPSIS | BasicReferenceParser.WILDCARD);
if (typeInfo != null) {
IElementType t = builder.getTokenType();
if (t == JavaTokenType.IDENTIFIER ||
t == JavaTokenType.THIS_KEYWORD ||
t == JavaTokenType.RPARENTH && builder.lookAhead(1) == JavaTokenType.ARROW) {
lambda = true;
}
lambda = t == JavaTokenType.IDENTIFIER ||
t == JavaTokenType.THIS_KEYWORD ||
t == JavaTokenType.RPARENTH && builder.lookAhead(1) == JavaTokenType.ARROW;
}
marker.rollbackTo();

10
java/java-frontback-psi-impl/src/com/intellij/lang/java/parser/BasicPrattExpressionParser.java
View File

@@ -821,14 +821,12 @@ public class BasicPrattExpressionParser {
PsiBuilder.Marker marker = builder.mark();
builder.advanceLexer();
BasicReferenceParser.TypeInfo typeInfo = myParser.getReferenceParser().parseTypeInfo(
builder, BasicReferenceParser.EAT_LAST_DOT | BasicReferenceParser.ELLIPSIS | BasicReferenceParser.WILDCARD);
builder, BasicReferenceParser.ELLIPSIS | BasicReferenceParser.WILDCARD);
if (typeInfo != null) {
IElementType t = builder.getTokenType();
if (t == JavaTokenType.IDENTIFIER ||
t == JavaTokenType.THIS_KEYWORD ||
t == JavaTokenType.RPARENTH && builder.lookAhead(1) == JavaTokenType.ARROW) {
lambda = true;
}
lambda = t == JavaTokenType.IDENTIFIER ||
t == JavaTokenType.THIS_KEYWORD ||
t == JavaTokenType.RPARENTH && builder.lookAhead(1) == JavaTokenType.ARROW;
}
marker.rollbackTo();