ECJ compiler errors

[snjeza]

Fixes #612

Signed-off-by: Snjezana Peco [email protected]

[stephan-herrmann]

Thanks, @snjeza, the change is going in a good direction.

[stephan-herrmann]

For posterity: in search for the best location of the fix I suggested to push it into findMemberType() which @snjeza answered as causing regressions in some tests. I then made the experiment of pulling it out into QualifiedTypeReference.findNextTypeBinding(), like so:

	protected TypeBinding findNextTypeBinding(int tokenIndex, Scope scope, PackageBinding packageBinding) {
		LookupEnvironment env = scope.environment();
		try {
			env.missingClassFileLocation = this;
			if (this.resolvedType == null) {
				this.resolvedType = scope.getType(this.tokens[tokenIndex], packageBinding);
			} else {
// begin change:
				ReferenceBinding enclosingType = (ReferenceBinding) this.resolvedType;
				this.resolvedType = scope.getMemberType(this.tokens[tokenIndex], enclosingType);
				if (!this.resolvedType.isValidBinding()) {
					TypeBinding problemBinding = this.resolvedType;
					if (enclosingType.isHierarchyBeingConnected() && scope.kind == Scope.CLASS_SCOPE) {
						TypeDeclaration referenceContext = ((ClassScope) scope).referenceContext;
						TypeReference superTypeReference = referenceContext.superclass;
						if (superTypeReference != null && superTypeReference.resolvedType instanceof ReferenceBinding) {
							this.resolvedType = scope.findMemberType(this.tokens[tokenIndex], (ReferenceBinding) superTypeReference.resolvedType);
						}
						if ((this.resolvedType == null || !this.resolvedType.isValidBinding())
								&& referenceContext.superInterfaces != null && referenceContext.superInterfaces.length > 0) {
							TypeReference[] interfaces = referenceContext.superInterfaces;
							for (TypeReference reference : interfaces) {
								if (reference != null && reference.resolvedType instanceof ReferenceBinding) {
									this.resolvedType = scope.findMemberType(this.tokens[tokenIndex], (ReferenceBinding) reference.resolvedType);
									if (this.resolvedType != null) {
										break;
									}
								}
							}
						}
						if (this.resolvedType != null && this.resolvedType.isValidBinding()) {
							return this.resolvedType;
						}
					}

					this.resolvedType = new ProblemReferenceBinding(
						CharOperation.subarray(this.tokens, 0, tokenIndex + 1),
						(ReferenceBinding) problemBinding.closestMatch(),
						this.resolvedType.problemId());
// end change
				}
			}
			return this.resolvedType;
		} catch (AbortCompilation e) {
			e.updateContext(this, scope.referenceCompilationUnit().compilationResult);
			throw e;
		} finally {
			env.missingClassFileLocation = null;
		}
	}

On the one hand this would reflect the fact, that indeed a qualified type reference caused the original error. OTOH I cannot prove this to be a better location. That's why I'm just dumping that version here, should the change in getMemberType() cause trouble in a future incident.

[iloveeclipse]

Since we've just merged JAVA20 branch code to master, I 've rebased branch to make sure we don't introduce a regression.

[stephan-herrmann]

OK, so my extended description came a bit late :)
I had attempted to add:

Ensure qualified type references are correctly resolved relative to a type whose hierarchy is currently being conntected

[iloveeclipse]

@stephan-herrmann : any objections to merge now, or you are still on it?