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

IDEA-63436 (recurring expression parsing fixed)

Browse Source
This commit is contained in:
Roman Shevchenko
2011-01-20 20:12:50 +01:00
parent 67145e7bb5
commit 72f5ded520
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
+8 -6
View File
@@ -222,7 +222,7 @@ public class ExpressionParser {
final PsiBuilder.Marker right = parseExpression(builder, toParse);
if (right == null) {
error(builder, toParse == ExprType.TYPE ?
JavaErrorMessages.message("expected.type") : JavaErrorMessages.message("expected.expression"));
JavaErrorMessages.message("expected.type") : JavaErrorMessages.message("expected.expression"));
expression.done(toCreate);
return expression;
}
@@ -319,6 +319,7 @@ public class ExpressionParser {
final IElementType tokenType = builder.getTokenType();
if (tokenType == JavaTokenType.DOT) {
final PsiBuilder.Marker dotPos = builder.mark();
final int dotOffset = builder.getCurrentOffset();
builder.advanceLexer();
final IElementType dotTokenType = builder.getTokenType();
@@ -348,25 +349,26 @@ public class ExpressionParser {
}
else if ((dotTokenType == JavaTokenType.THIS_KEYWORD || dotTokenType == JavaTokenType.SUPER_KEYWORD) &&
exprType(expr) == JavaElementType.REFERENCE_EXPRESSION) {
if (breakPoint == BreakPoint.P2) {
if (breakPoint == BreakPoint.P2 && builder.getCurrentOffset() == breakOffset) {
dotPos.rollbackTo();
startMarker.drop();
return expr;
}
final PsiBuilder.Marker copy = startMarker.precede();
final int offset = builder.getCurrentOffset();
startMarker.rollbackTo();
final PsiBuilder.Marker ref = ReferenceParser.parseJavaCodeReference(builder, false, true, false, false, false);
if (ref == null || builder.getTokenType() != JavaTokenType.DOT) {
if (ref == null || builder.getTokenType() != JavaTokenType.DOT || builder.getCurrentOffset() != dotOffset) {
copy.rollbackTo();
return parsePrimary(builder, BreakPoint.P2, -1);
return parsePrimary(builder, BreakPoint.P2, offset);
}
builder.advanceLexer();
if (builder.getTokenType() != dotTokenType) {
copy.rollbackTo();
return parsePrimary(builder, BreakPoint.P2, -1);
return parsePrimary(builder, BreakPoint.P2, offset);
}
builder.advanceLexer();
@@ -689,7 +691,7 @@ public class ExpressionParser {
else {
if (builder.getTokenType() != JavaTokenType.LBRACKET) {
error(builder, refOrType == null ?
JavaErrorMessages.message("expected.lbracket") : JavaErrorMessages.message("expected.lparen.or.lbracket"));
JavaErrorMessages.message("expected.lbracket") : JavaErrorMessages.message("expected.lparen.or.lbracket"));
newExpr.done(JavaElementType.NEW_EXPRESSION);
return newExpr;
}
java/java-tests/testData/psi/parser-partial/expressions/ChainedThisObjectAccess.txt
+16
View File
@@ -0,0 +1,16 @@
PsiJavaFile:ChainedThisObjectAccess.java
PsiReferenceExpression:A.this.B
PsiThisExpression:A.this
PsiJavaCodeReferenceElement:A
PsiIdentifier:A('A')
PsiReferenceParameterList
<empty list>
PsiJavaToken:DOT('.')
PsiKeyword:this('this')
PsiJavaToken:DOT('.')
PsiReferenceParameterList
<empty list>
PsiIdentifier:B('B')
PsiErrorElement:Unparsed tokens
PsiJavaToken:DOT('.')
PsiKeyword:this('this')
java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java
+1
View File
@@ -113,6 +113,7 @@ public class ExpressionParserTest extends JavaParsingTestCase {
public void testSuperMethodCallTypeParameterList() { doParserTest("super()"); }
public void testPrimitiveClassObjectAccess() { doParserTest("int.class"); }
public void testChainedClassObjectAccess() { doParserTest("A.class.B.class"); }
public void testChainedThisObjectAccess() { doParserTest("A.this.B.this"); }
private void doParserTest(final String text) {
doParserTest(text, new TestParser() {