Various cleanups for Records 2.0 (#3972)

* Incorporate several self-review comments from #3925

Author: srikanth-sankaran

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ClassFile.java

@@ -5043,7 +5043,7 @@ private int generateMethodParameters(final MethodBinding binding) {
 		}
 
 		boolean needSynthetics = isCanonicalConstructor ? false : // WYSIWYG
-										isConstructor && !isCanonicalConstructor && declaringClass.isNestedType();
+										isConstructor && declaringClass.isNestedType();
 		if (needSynthetics) {
 			// Take into account the synthetic argument names
 			// This tracks JLS8, paragraph 8.8.9

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/AbstractMethodDeclaration.java

@@ -185,10 +185,15 @@ public void bindArguments() {
 				this.binding.parameters[i] = argument.bind(this.scope, this.binding.parameters[i], used);
 				param_i_Annotations = argument.annotations != null ? argument.binding.getAnnotations() : null;
 			} else {
-				this.scope.addLocalVariable(new LocalVariableBinding(methodArgument.name, methodArgument.type.resolvedType, methodArgument.modifiers, true)); // LVB is not annotated - FIXME
+				final LocalVariableBinding implicitArgument = new LocalVariableBinding(methodArgument.name, methodArgument.type.resolvedType, methodArgument.modifiers, true);
+				this.scope.addLocalVariable(implicitArgument);
 				List<AnnotationBinding> relevantAnnotationBindings = new ArrayList<>();
 				ASTNode.getRelevantAnnotations(methodArgument.annotations, TagBits.AnnotationForParameter, relevantAnnotationBindings);
 				param_i_Annotations = relevantAnnotationBindings.toArray(new AnnotationBinding[0]);
+				if (param_i_Annotations != null && param_i_Annotations.length > 0) {
+					implicitArgument.setAnnotations(param_i_Annotations, this.scope, true);
+					implicitArgument.extendedTagBits |= ExtendedTagBits.AllAnnotationsResolved;
+				}
 			}
 
 			if (param_i_Annotations != null && param_i_Annotations.length > 0) {

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/Argument.java

@@ -79,14 +79,8 @@ public TypeBinding createBinding(MethodScope scope, TypeBinding typeBinding) {
 		}
 		if ((this.binding.extendedTagBits & ExtendedTagBits.AnnotationResolved) == 0) {
 			Annotation[] annots = this.annotations;
-			long sourceLevel = scope.compilerOptions().sourceLevel;
-			if (sourceLevel >= ClassFileConstants.JDK14 && annots == null) {
-				annots = ASTNode.copyRecordComponentAnnotations(scope,
-							this.binding, annots);
-			}
 			if (annots != null)
 				resolveAnnotations(scope, annots, this.binding, true);
-
 			Annotation.isTypeUseCompatible(this.type, scope, annots);
 			scope.validateNullAnnotation(this.binding.tagBits, this.type, annots);
 		}

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/Javadoc.java

@@ -235,7 +235,7 @@ public void resolve(ClassScope scope) {
 		// @param tags
 		int paramTagsSize = this.paramReferences == null ? 0 : this.paramReferences.length;
 		for (int i = 0; i < paramTagsSize; i++) {
-			if(scope.referenceContext.nRecordComponents > 0) {
+			if(scope.referenceContext.recordComponents.length > 0) {
 				break;
 			}
 			JavadocSingleNameReference param = this.paramReferences[i];

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java

@@ -103,7 +103,6 @@ public class TypeDeclaration extends Statement implements ProblemSeverities, Ref
 
 	// 16 Records support
 	public RecordComponent[] recordComponents = NO_RECORD_COMPONENTS;
-	public int nRecordComponents;
 	public static Set<String> disallowedComponentNames;
 
 	// 17 Sealed Type support
@@ -1172,7 +1171,7 @@ public StringBuilder printHeader(int indent, StringBuilder output) {
 	output.append(this.name);
 	if (this.isRecord()) {
 		output.append('(');
-		for (int i = 0; i < this.nRecordComponents; i++) {
+		for (int i = 0, length = this.recordComponents.length; i < length; i++) {
 			if (i > 0) output.append(", "); //$NON-NLS-1$
 			output.append(this.recordComponents[i].type.getTypeName()[0]);
 			output.append(' ');

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java

@@ -723,9 +723,7 @@ public SyntheticMethodBinding addSyntheticCanonicalConstructor() {
 	SyntheticMethodBinding canonicalConstructor = new SyntheticMethodBinding(this, this.components);
 	SyntheticMethodBinding[] accessors = new SyntheticMethodBinding[2];
 	this.synthetics[SourceTypeBinding.METHOD_EMUL].put(TypeConstants.INIT, accessors);
-	accessors[0] = canonicalConstructor;
-	resolveTypesFor(canonicalConstructor);
-	return canonicalConstructor;
+	return accessors[0] = canonicalConstructor;
 }
 /* Add a new synthetic component accessor for the record class */
 public SyntheticMethodBinding addSyntheticRecordComponentAccessor(RecordComponentBinding rcb) {

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/SyntheticMethodBinding.java

@@ -463,7 +463,6 @@ public SyntheticMethodBinding(SourceTypeBinding declaringClass, RecordComponentB
 		this.extendedTagBits |= ExtendedTagBits.IsCanonicalConstructor;
 		this.parameters = rcb.length == 0 ? Binding.NO_PARAMETERS : new TypeBinding[rcb.length];
 		this.parameterNames = rcb.length == 0 ? Binding.NO_PARAMETER_NAMES : new char[rcb.length][];
-		this.modifiers |= ExtraCompilerModifiers.AccUnresolved;
 		AnnotationBinding[][] paramAnnotations = null;
 		for (int i = 0, length = rcb.length; i < length; i++) {
 			this.parameters[i] = rcb[i].type;

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/Parser.java

@@ -46,8 +46,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
 import java.util.stream.Stream;
 import org.eclipse.jdt.core.compiler.CharOperation;
 import org.eclipse.jdt.core.compiler.InvalidInputException;
@@ -169,7 +167,6 @@ protected enum SwitchRuleKind {
 	protected static final int HALT = 0;     // halt and throw up hands.
 	protected static final int RESTART = 1;  // stacks adjusted, alternate goal from check point.
 	protected static final int RESUME = 2;   // stacks untouched, just continue from where left off.
-	private static final short TYPE_CLASS = 1;
 
 	public Scanner scanner;
 	public TerminalToken currentToken = TokenNameNotAToken;
@@ -10283,7 +10280,6 @@ protected void consumeRecordComponentHeaderRightParen() {
 				0,
 				length);
 		typeDecl.recordComponents = recComps;
-		typeDecl.nRecordComponents = recComps.length;
 	} else {
 		typeDecl.recordComponents = ASTNode.NO_RECORD_COMPONENTS;
 	}
@@ -12186,16 +12182,12 @@ public void parse(MethodDeclaration md, CompilationUnitDeclaration unit) {
 	}
 }
 public ASTNode[] parseClassBodyDeclarations(char[] source, int offset, int length, CompilationUnitDeclaration unit) {
-	/* automaton initialization */
-	initialize();
-	goForClassBodyDeclarations();
-	return parseBodyDeclarations(source, offset, length, unit, TYPE_CLASS);
-}
-
-private ASTNode[] parseBodyDeclarations(char[] source, int offset, int length, CompilationUnitDeclaration unit, short classRecordType) {
 	boolean oldDiet = this.diet;
 	int oldInt = this.dietInt;
 	boolean oldTolerateDefaultClassMethods = this.tolerateDefaultClassMethods;
+	/* automaton initialization */
+	initialize();
+	goForClassBodyDeclarations();
 	/* scanner initialization */
 	this.scanner.setSource(source);
 	this.scanner.resetTo(offset, offset + length - 1);
@@ -12235,24 +12227,19 @@ private ASTNode[] parseBodyDeclarations(char[] source, int offset, int length, C
 		if (!this.options.performMethodsFullRecovery && !this.options.performStatementsRecovery) {
 			return null;
 		}
-		// collect all body declaration inside the compilation unit except the default constructor and implicit  methods and fields for records
+		// collect all body declaration inside the compilation unit except the default constructor
 		final List bodyDeclarations = new ArrayList();
-		unit.ignoreFurtherInvestigation = false;
-		Predicate<MethodDeclaration> methodPred = classRecordType == TYPE_CLASS ?
-				mD -> !mD.isDefaultConstructor() : mD -> true;
-		Consumer<FieldDeclaration> fieldAction = classRecordType == TYPE_CLASS ?
-				fD -> bodyDeclarations.add(fD) : fD -> { bodyDeclarations.add(fD);} ;
 		ASTVisitor visitor = new ASTVisitor() {
 			@Override
 			public boolean visit(MethodDeclaration methodDeclaration, ClassScope scope) {
-				if (methodPred.test(methodDeclaration)) {
+				if (!methodDeclaration.isDefaultConstructor()) {
 					bodyDeclarations.add(methodDeclaration);
 				}
 				return false;
 			}
 			@Override
 			public boolean visit(FieldDeclaration fieldDeclaration, MethodScope scope) {
-				fieldAction.accept(fieldDeclaration);
+				bodyDeclarations.add(fieldDeclaration);
 				return false;
 			}
 			@Override
@@ -12261,6 +12248,7 @@ public boolean visit(TypeDeclaration memberTypeDeclaration, ClassScope scope) {
 				return false;
 			}
 		};
+		unit.ignoreFurtherInvestigation = false;
 		unit.traverse(visitor, unit.scope);
 		unit.ignoreFurtherInvestigation = true;
 		result = (ASTNode[]) bodyDeclarations.toArray(new ASTNode[bodyDeclarations.size()]);

org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnJavadocTag.java

@@ -144,7 +144,7 @@ public void filterPossibleTags(Scope scope) {
 							switch (scope.kind) {
 								case Scope.CLASS_SCOPE:
 									TypeDeclaration typeDecl = ((ClassScope)scope).referenceContext;
-									boolean isRecordWithComponent = typeDecl.isRecord() && typeDecl.nRecordComponents >0 ;
+									boolean isRecordWithComponent = typeDecl.isRecord() && typeDecl.recordComponents.length > 0;
 									if (((ClassScope)scope).referenceContext.binding.isGenericType() || isRecordWithComponent) {
 										filteredTags[size++] = possibleTag;
 									}

org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/parser/SourceTypeConverter.java

@@ -516,7 +516,7 @@ private TypeDeclaration convert(SourceType typeHandle, CompilationResult compila
 			// Hence, use the one that does
 			type.modifiers |= ExtraCompilerModifiers.AccRecord;
 			IField[] recordComponents = typeHandle.getRecordComponents();
-			type.recordComponents = new RecordComponent[type.nRecordComponents = recordComponents.length];
+			type.recordComponents = new RecordComponent[recordComponents.length];
 			for(int i = 0; i < recordComponents.length; i++) {
 				type.recordComponents[i] = convertRecordComponents((SourceField)recordComponents[i], type, compilationResult);
 			}
@@ -602,21 +602,10 @@ private TypeDeclaration convert(SourceType typeHandle, CompilationResult compila
 			initializers = typeInfo.getInitializers();
 			initializerCount = initializers.length;
 		}
-		SourceField[] sourceFields = null;
+		IField[] sourceFields = null;
 		int sourceFieldCount = 0;
 		if ((this.flags & FIELD) != 0) {
-			SourceField[] allFields = typeInfo.getFieldHandles();
-			if (type.isRecord()) {
-				int staticFieldCount = 0;
-				for (int i = 0, length = allFields.length; i < length; i++) {
-					SourceFieldElementInfo elementInfo = (SourceFieldElementInfo) allFields[i].getElementInfo();
-					if ((elementInfo.getModifiers() & ClassFileConstants.AccStatic) != 0)
-						allFields[staticFieldCount++] = allFields[i];
-				}
-				System.arraycopy(allFields, 0, sourceFields = new SourceField[staticFieldCount], 0, staticFieldCount);
-			} else {
-				sourceFields = allFields;
-			}
+			sourceFields = typeHandle.getFields();
 			sourceFieldCount = sourceFields.length;
 		}
 		int length = initializerCount + sourceFieldCount;
@@ -627,7 +616,7 @@ private TypeDeclaration convert(SourceType typeHandle, CompilationResult compila
 			}
 			int index = 0;
 			for (int i = initializerCount; i < length; i++) {
-				type.fields[i] = convert(sourceFields[index++], type, compilationResult);
+				type.fields[i] = convert((SourceField) sourceFields[index++], type, compilationResult);
 			}
 		}