Skip to content

Commit

Permalink
narrow down the heuristics to not convert "real" fields into arguments
Browse files Browse the repository at this point in the history 
and also play well with existing arguments

strengthen test expectation in existing tests
  • Loading branch information
@stephan-herrmann
stephan-herrmann committed Oct 25, 2024
1 parent 342939f commit e14cbe3
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 11 deletions.
7 changes: 7 additions & 0 deletions org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/Parser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6668,6 +6668,13 @@ protected void consumeZeroTypeAnnotations() {
// Name ::= SimpleName
// TypeAnnotationsopt ::= $empty
pushOnTypeAnnotationLengthStack(0); // signal absence of @308 annotations.
if (this.currentElement instanceof RecoveredAnnotation ann
&& ann.parent instanceof RecoveredMethod meth
&& !meth.foundOpeningBrace
&& this.currentToken == TokenNameRPAREN) {
// take note of an incomplete annotation "@Ann(v=)":
meth.incompleteParameterAnnotationSeen = true;
}
}
// BEGIN_AUTOGENERATED_REGION_CONSUME_RULE
// This method is part of an automatic generation : do NOT edit-modify
Expand Down
4 changes: 4 additions & 0 deletions ...core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/RecoveredAnnotation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,10 @@ public void setKind(int kind) {
this.kind = kind;
}

public int sourceStart() {
return this.sourceStart;
}

@Override
public int sourceEnd() {
if (this.annotation == null) {
Expand Down
22 changes: 20 additions & 2 deletions ...jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/RecoveredMethod.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*******************************************************************************/
package org.eclipse.jdt.internal.compiler.parser;

import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.jdt.core.compiler.CharOperation;
Expand Down Expand Up @@ -48,6 +49,8 @@ public class RecoveredMethod extends RecoveredElement implements TerminalTokens
RecoveredAnnotation[] pendingAnnotations;
int pendingAnnotationCount;

public boolean incompleteParameterAnnotationSeen = false;

public RecoveredMethod(AbstractMethodDeclaration methodDeclaration, RecoveredElement parent, int bracketBalance, Parser parser){
super(parent, bracketBalance, parser);
this.methodDeclaration = methodDeclaration;
Expand Down Expand Up @@ -141,18 +144,28 @@ public RecoveredElement add(FieldDeclaration fieldDeclaration, int bracketBalanc
private boolean recoverAsArgument(FieldDeclaration fieldDeclaration) {
if (!this.foundOpeningBrace
&& this.methodDeclaration.declarationSourceEnd == 0
&& this.methodDeclaration.arguments == null) { // misparsed parameter?
&& this.incompleteParameterAnnotationSeen) { // misparsed parameter?
long position = ((long) fieldDeclaration.sourceStart << 32)+fieldDeclaration.sourceEnd;
Argument arg = new Argument(fieldDeclaration.name, position, fieldDeclaration.type, fieldDeclaration.modifiers);
this.methodDeclaration.arguments = new Argument[] { arg };
if (this.methodDeclaration.arguments == null) {
this.methodDeclaration.arguments = new Argument[] { arg };
} else {
int len = this.methodDeclaration.arguments.length;
this.methodDeclaration.arguments = Arrays.copyOf(this.methodDeclaration.arguments, len+1);
this.methodDeclaration.arguments[len] = arg;
}
int annotCount = this.pendingAnnotationCount;
if (this.pendingAnnotations != null) {
int end = 0;
arg.annotations = new Annotation[annotCount];
for (int i = 0; i < this.pendingAnnotationCount; i++) {
arg.annotations[i] = this.pendingAnnotations[i].annotation;
if (i == 0)
arg.declarationSourceStart = arg.annotations[i].sourceStart;
end = arg.sourceEnd;
}
if (end > 0)
this.methodDeclaration.bodyStart = end + 1;
}
return true;
}
Expand Down Expand Up @@ -631,6 +644,11 @@ public RecoveredElement addAnnotationName(int identifierPtr, int identifierLengt
this.pendingAnnotations = new RecoveredAnnotation[5];
this.pendingAnnotationCount = 0;
} else {
if (this.pendingAnnotationCount > 0) {
RecoveredAnnotation lastAnnot = this.pendingAnnotations[this.pendingAnnotationCount-1];
if (lastAnnot.sourceStart() == annotationStart)
return this;
}
if (this.pendingAnnotationCount == this.pendingAnnotations.length) {
System.arraycopy(
this.pendingAnnotations,
Expand Down
40 changes: 31 additions & 9 deletions ...s.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/AnnotationDietRecoveryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ public class AnnotationDietRecoveryTest extends AbstractCompilerTest {
private static final boolean CHECK_ALL_PARSE = true;
public static boolean optimizeStringLiterals = false;

static {
// TESTS_NAMES = new String[] { "test0025" };
}

public AnnotationDietRecoveryTest(String testName){
super(testName);
}
Expand Down Expand Up @@ -1210,7 +1214,7 @@ public void test0024() {
"public class X {\n" +
" public X() {\n" +
" }\n" +
" void foo(int param1) {\n" +
" void foo(int param1, @AnAnnotation(name) int param2) {\n" +
" }\n" +
"}\n";

Expand All @@ -1220,7 +1224,7 @@ public void test0024() {
" public X() {\n" +
" super();\n" +
" }\n" +
" void foo(int param1) {\n" +
" void foo(int param1, @AnAnnotation(name) int param2) {\n" +
" }\n" +
"}\n";

Expand All @@ -1229,7 +1233,13 @@ public void test0024() {
expectedDietUnitToString;

String expectedCompletionDietUnitToString =
expectedDietUnitToString;
"package a;\n" +
"public class X {\n" +
" public X() {\n" +
" }\n" +
" void foo(int param1) {\n" +
" }\n" +
"}\n";

String testName = "<generic type recovery>";
checkParse(
Expand All @@ -1254,7 +1264,7 @@ public void test0025() {
"public class X {\n" +
" public X() {\n" +
" }\n" +
" void foo(int param1) {\n" +
" void foo(int param1, @AnAnnotation(name = $missing$) int param2) {\n" +
" }\n" +
"}\n";

Expand All @@ -1264,15 +1274,21 @@ public void test0025() {
" public X() {\n" +
" super();\n" +
" }\n" +
" void foo(int param1) {\n" +
" void foo(int param1, @AnAnnotation(name = $missing$) int param2) {\n" +
" }\n" +
"}\n";

String expectedFullUnitToString =
expectedDietUnitToString;

String expectedCompletionDietUnitToString =
expectedDietUnitToString;
"package a;\n" +
"public class X {\n" +
" public X() {\n" +
" }\n" +
" void foo(int param1) {\n" +
" }\n" +
"}\n";

String testName = "<generic type recovery>";
checkParse(
Expand All @@ -1297,7 +1313,7 @@ public void test0026() {
"public class X {\n" +
" public X() {\n" +
" }\n" +
" void foo(int param1) {\n" +
" void foo(int param1, @AnAnnotation @AnAnnotation1(name1 = \"a\",name2 = $missing$) int param2) {\n" +
" }\n" +
"}\n";

Expand All @@ -1307,15 +1323,21 @@ public void test0026() {
" public X() {\n" +
" super();\n" +
" }\n" +
" void foo(int param1) {\n" +
" void foo(int param1, @AnAnnotation @AnAnnotation1(name1 = \"a\",name2 = $missing$) int param2) {\n" +
" }\n" +
"}\n";

String expectedFullUnitToString =
expectedDietUnitToString;

String expectedCompletionDietUnitToString =
expectedDietUnitToString;
"package a;\n" +
"public class X {\n" +
" public X() {\n" +
" }\n" +
" void foo(int param1) {\n" +
" }\n" +
"}\n";

String testName = "<generic type recovery>";
checkParse(
Expand Down

0 comments on commit e14cbe3

Please sign in to comment.