Attachment #52381 for bug #157996

View | Details | Raw Unified | Return to bug 157996
Collapse All | Expand All

Lines 83-89 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/LookupEnvironment.java (-1 lines)
83	this.uniqueWildcardBindings = new SimpleLookupTable(3);	83	this.uniqueWildcardBindings = new SimpleLookupTable(3);
84	this.uniqueParameterizedGenericMethodBindings = new SimpleLookupTable(3);	84	this.uniqueParameterizedGenericMethodBindings = new SimpleLookupTable(3);
85	this.accessRestrictions = new HashMap(3);	85	this.accessRestrictions = new HashMap(3);
86
87	this.classFilePool = ClassFilePool.newInstance();	86	this.classFilePool = ClassFilePool.newInstance();
88	}	87	}
89		88




						if (visibleMemberType == null)
							visibleMemberType = memberType;
						else
							return new ProblemReferenceBinding(typeName, visibleMemberType, ProblemReasons.Ambiguous);
				} else {
					notVisible = memberType;
				}

					if (visibleMemberType == null) {
						visibleMemberType = memberType;
					} else {
						ambiguous = new ProblemReferenceBinding(typeName, visibleMemberType, ProblemReasons.Ambiguous);
						break done;
					}
				} else {

			if (!binding.isValidBinding())
				return new ProblemReferenceBinding(
					CharOperation.subarray(compoundName, 0, currentIndex),
					binding instanceof ReferenceBinding ? ((ReferenceBinding)binding).closestMatch() : null,
					binding.problemId());
			if (!(binding instanceof PackageBinding))
				return packageBinding;

		if (!binding.isValidBinding())
			return new ProblemReferenceBinding(
				CharOperation.arrayConcat(packageBinding.compoundName, name),
				binding instanceof ReferenceBinding ? ((ReferenceBinding)binding).closestMatch() : null,
				binding.problemId());

		ReferenceBinding typeBinding = (ReferenceBinding) binding;

				if (!binding.isValidBinding())
					return new ProblemReferenceBinding(
						CharOperation.subarray(compoundName, 0, currentIndex),
						binding instanceof ReferenceBinding ? ((ReferenceBinding)binding).closestMatch() : null,
						binding.problemId());
				if (!(binding instanceof PackageBinding))
					break;

					ProblemReferenceBinding problemBinding = (ProblemReferenceBinding) typeBinding;
					return new ProblemReferenceBinding(
						CharOperation.subarray(compoundName, 0, currentIndex),
						problemBinding.closestMatch(),
						typeBinding.problemId());
				}
				return new ProblemReferenceBinding(
					CharOperation.subarray(compoundName, 0, currentIndex),
					((ReferenceBinding)binding).closestMatch(),
					typeBinding.problemId());
			}
		}

								if (importReference != null) importReference.used = true;
								if (foundInImport) {
									// Answer error binding -- import on demand conflict; name found in two import on demand packages.
									temp = new ProblemReferenceBinding(name, type, ProblemReasons.Ambiguous);
									if (typeOrPackageCache != null)
										typeOrPackageCache.put(name, temp);
									return temp;

				if (!binding.isValidBinding())
					return new ProblemReferenceBinding(
						CharOperation.subarray(compoundName, 0, currentIndex),
						binding instanceof ReferenceBinding ? ((ReferenceBinding)binding).closestMatch() : null,
						binding.problemId());
				if (!(binding instanceof PackageBinding))
					break;

			if (!typeBinding.isValidBinding())
				return new ProblemReferenceBinding(
					CharOperation.subarray(compoundName, 0, currentIndex),
					((ReferenceBinding)binding).closestMatch(),
					typeBinding.problemId());
			
			if (typeBinding.isGenericType()) {




				if (!binding.isValidBinding())
					return new ProblemReferenceBinding(
						CharOperation.subarray(compoundName, 0, currentIndex),
						((ReferenceBinding)binding).closestMatch(),
						binding.problemId());
				if (!((ReferenceBinding) binding).canBeSeenBy(this))
					return new ProblemReferenceBinding(

	// know binding is now a ReferenceBinding
	binding = environment().convertToRawType((ReferenceBinding) binding);
	while (currentIndex < length) {
		ReferenceBinding referenceBinding = (ReferenceBinding) binding;
		char[] nextName = compoundName[currentIndex++];
		invocationSite.setFieldIndex(currentIndex);
		invocationSite.setActualReceiverType(referenceBinding);
		if ((mask & Binding.FIELD) != 0 && (binding = findField(referenceBinding, nextName, invocationSite, true /*resolve*/)) != null) {
			if (!binding.isValidBinding()) {
				return new ProblemFieldBinding(
					((ProblemFieldBinding)binding).closestMatch,

			}
			break; // binding is now a field
		}
		if ((binding = findMemberType(nextName, referenceBinding)) == null) {
			if ((mask & Binding.FIELD) != 0) {
				return new ProblemBinding(
					CharOperation.subarray(compoundName, 0, currentIndex),
					referenceBinding,
					ProblemReasons.NotFound);
			} 
			return new ProblemReferenceBinding(
				CharOperation.subarray(compoundName, 0, currentIndex),
				referenceBinding,
				ProblemReasons.NotFound);
		}
		// binding is a ReferenceBinding
		if (!binding.isValidBinding())
			return new ProblemReferenceBinding(
				CharOperation.subarray(compoundName, 0, currentIndex),
				((ReferenceBinding)binding).closestMatch(),
				binding.problemId());
	}
	if ((mask & Binding.FIELD) != 0 && (binding instanceof FieldBinding)) {

				if (!binding.isValidBinding())
					return new ProblemReferenceBinding(
						CharOperation.subarray(compoundName, 0, currentIndex),
						((ReferenceBinding)binding).closestMatch(),
						binding.problemId());
				if (!((ReferenceBinding) binding).canBeSeenBy(this))
					return new ProblemReferenceBinding(

						ProblemReasons.NonStaticReferenceInStaticContext);
				break foundField; // binding is now a field
			}
			if ((binding = findMemberType(nextName, typeBinding)) == null) {
				return new ProblemBinding(
					CharOperation.subarray(compoundName, 0, currentIndex),
					typeBinding,
					ProblemReasons.NotFound);
			}
			if (!binding.isValidBinding()) {
				return new ProblemReferenceBinding(
					CharOperation.subarray(compoundName, 0, currentIndex),
					((ReferenceBinding)binding).closestMatch(),
					binding.problemId());
			}
		}
		return binding;
	}

Lines 311-316 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/ReferenceBinding.java (+9 lines)
311	// isDefault()	311	// isDefault()
312	return invocationType.fPackage == this.fPackage;	312	return invocationType.fPackage == this.fPackage;
313	}	313	}
		314
		315	/**
		316	* In case of problems, returns the closest match found. It may not be perfect match, but the
		317	* result of a best effort to improve fault-tolerance.
		318	*/
		319	public ReferenceBinding closestMatch() {
		320	return this; // by default, the closest match is the binding itself
		321	}
		322
314	public char[] computeGenericTypeSignature(TypeVariableBinding[] typeVariables) {	323	public char[] computeGenericTypeSignature(TypeVariableBinding[] typeVariables) {
315		324
316	boolean isMemberOfGeneric = isMemberType() && (enclosingType().modifiers & ExtraCompilerModifiers.AccGenericSignature) != 0;	325	boolean isMemberOfGeneric = isMemberType() && (enclosingType().modifiers & ExtraCompilerModifiers.AccGenericSignature) != 0;




package org.eclipse.jdt.internal.compiler.lookup;

public class ProblemReferenceBinding extends ReferenceBinding {
	private ReferenceBinding closestMatch;
	private int problemReason;
	
// NOTE: must only answer the subset of the name related to the problem

public ProblemReferenceBinding(char[] name, ReferenceBinding closestMatch, int problemReason) {
	this(new char[][] {name}, closestMatch, problemReason);
}

/**
 * @see org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding#closestMatch()
 */
public ReferenceBinding closestMatch() {
	return this.closestMatch;
}

/* API
* Answer the problem id associated with the receiver.
* NoError if the receiver is a valid binding.




			long[] positions = importRef.sourcePositions;
			int last = positions.length - 1;
			if (binding instanceof ProblemReferenceBinding)
				binding = ((ProblemReferenceBinding) binding).closestMatch();
			if (binding instanceof ReferenceBinding) {
				PackageBinding pkgBinding = ((ReferenceBinding) binding).fPackage;
				if (pkgBinding != null)

		if (typeBinding instanceof ArrayBinding)
			typeBinding = ((ArrayBinding) typeBinding).leafComponentType;
		if (typeBinding instanceof ProblemReferenceBinding)
			typeBinding = ((ProblemReferenceBinding) typeBinding).closestMatch();
		if (typeBinding instanceof ReferenceBinding) {
			PackageBinding pkgBinding = ((ReferenceBinding) typeBinding).fPackage;
			if (pkgBinding != null)

		if (binding instanceof ArrayBinding)
			binding = ((ArrayBinding) binding).leafComponentType;
		if (binding instanceof ProblemReferenceBinding)
			binding = ((ProblemReferenceBinding) binding).closestMatch();
		if (binding == null) return INACCURATE_MATCH;

		if (binding instanceof ReferenceBinding) {




		}
		if (typeBinding instanceof ProblemReferenceBinding) {
			ProblemReferenceBinding pbBinding = (ProblemReferenceBinding) typeBinding;
			typeBinding = pbBinding.closestMatch();
			lastIndex = pbBinding.compoundName.length - 1;
		}
		// try to match all enclosing types for which the token matches as well.

	}
	if (typeBinding instanceof ProblemReferenceBinding) {
		ProblemReferenceBinding pbBinding = (ProblemReferenceBinding) typeBinding;
		typeBinding = pbBinding.closestMatch();
		lastIndex = pbBinding.compoundName.length - 1;
	}


		typeBinding = ((ArrayBinding) typeBinding).leafComponentType;
	if (typeBinding instanceof ProblemReferenceBinding) {
		ProblemReferenceBinding pbBinding = (ProblemReferenceBinding) typeBinding;
		typeBinding = pbBinding.closestMatch();
		lastIndex = pbBinding.compoundName.length - 1;
	}


		typeBinding = ((ArrayBinding) typeBinding).leafComponentType;
	if (typeBinding == null || typeBinding instanceof BaseTypeBinding) return;
	if (typeBinding instanceof ProblemReferenceBinding) {
		ReferenceBinding original = ((ProblemReferenceBinding) typeBinding).closestMatch();
		if (original == null) return; // original may not be set (bug 71279)
		typeBinding = original;
	}

	if (typeBinding instanceof ArrayBinding)
		typeBinding = ((ArrayBinding) typeBinding).leafComponentType;
	if (typeBinding instanceof ProblemReferenceBinding)
		typeBinding = ((ProblemReferenceBinding) typeBinding).closestMatch();

	if (((InternalSearchPattern) this.pattern).focus instanceof IType && typeBinding instanceof ReferenceBinding) {
		IPackageFragment pkg = ((IType) ((InternalSearchPattern) this.pattern).focus).getPackageFragment();


	if (nameRef instanceof SingleNameReference) {
		if (binding instanceof ProblemReferenceBinding)
			binding = ((ProblemReferenceBinding) binding).closestMatch();
		if (binding instanceof ReferenceBinding)
			return resolveLevelForType((ReferenceBinding) binding);
		return binding == null || binding instanceof ProblemBinding ? INACCURATE_MATCH : IMPOSSIBLE_MATCH;

	if (typeBinding instanceof ArrayBinding)
		typeBinding = ((ArrayBinding) typeBinding).leafComponentType;
	if (typeBinding instanceof ProblemReferenceBinding)
		typeBinding = ((ProblemReferenceBinding) typeBinding).closestMatch();

	if (typeRef instanceof SingleTypeReference) {
		return resolveLevelForType(typeBinding);

Lines 448-454 Link Here

(-)eval/org/eclipse/jdt/internal/eval/CodeSnippetScope.java (-2 / +2 lines)
448	if (!binding.isValidBinding())	448	if (!binding.isValidBinding())
449	return new ProblemReferenceBinding(	449	return new ProblemReferenceBinding(
450	CharOperation.subarray(compoundName, 0, currentIndex),	450	CharOperation.subarray(compoundName, 0, currentIndex),
451	null, // TODO should improve	451	((ReferenceBinding)binding).closestMatch(),
452	binding.problemId());	452	binding.problemId());
453	if (!this.canBeSeenByForCodeSnippet((ReferenceBinding) binding, receiverType))	453	if (!this.canBeSeenByForCodeSnippet((ReferenceBinding) binding, receiverType))
454	return new ProblemReferenceBinding(CharOperation.subarray(compoundName, 0, currentIndex), (ReferenceBinding) binding, ProblemReasons.NotVisible);	454	return new ProblemReferenceBinding(CharOperation.subarray(compoundName, 0, currentIndex), (ReferenceBinding) binding, ProblemReasons.NotVisible);
Lines 481-487 Link Here
481	if (!binding.isValidBinding())	481	if (!binding.isValidBinding())
482	return new ProblemReferenceBinding(	482	return new ProblemReferenceBinding(
483	CharOperation.subarray(compoundName, 0, currentIndex),	483	CharOperation.subarray(compoundName, 0, currentIndex),
484	null, // TODO should improve	484	((ReferenceBinding)binding).closestMatch(),
485	binding.problemId());	485	binding.problemId());
486	}	486	}
487		487

Lines 43-49 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedTypeReference.java (-1 / +1 lines)
43	ProblemReferenceBinding problemBinding = (ProblemReferenceBinding) this.resolvedType;	43	ProblemReferenceBinding problemBinding = (ProblemReferenceBinding) this.resolvedType;
44	this.resolvedType = new ProblemReferenceBinding(	44	this.resolvedType = new ProblemReferenceBinding(
45	org.eclipse.jdt.core.compiler.CharOperation.subarray(this.tokens, 0, tokenIndex + 1),	45	org.eclipse.jdt.core.compiler.CharOperation.subarray(this.tokens, 0, tokenIndex + 1),
46	problemBinding.closestMatch,	46	problemBinding.closestMatch(),
47	this.resolvedType.problemId());	47	this.resolvedType.problemId());
48	}	48	}
49	}	49	}

Lines 65-71 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/ast/JavadocSingleTypeReference.java (-1 / +1 lines)
65	this.packageBinding = (PackageBinding) binding;	65	this.packageBinding = (PackageBinding) binding;
66	} else {	66	} else {
67	if (this.resolvedType.problemId() == ProblemReasons.NonStaticReferenceInStaticContext) {	67	if (this.resolvedType.problemId() == ProblemReasons.NonStaticReferenceInStaticContext) {
68	ReferenceBinding closestMatch = ((ProblemReferenceBinding)this.resolvedType).closestMatch;	68	ReferenceBinding closestMatch = ((ProblemReferenceBinding)this.resolvedType).closestMatch();
69	if (closestMatch != null && closestMatch.isTypeVariable()) {	69	if (closestMatch != null && closestMatch.isTypeVariable()) {
70	this.resolvedType = closestMatch; // ignore problem as we want report specific javadoc one instead	70	this.resolvedType = closestMatch; // ignore problem as we want report specific javadoc one instead
71	return resolvedType;	71	return resolvedType;

Lines 275-281 Link Here

(-)dom/org/eclipse/jdt/core/dom/DefaultBindingResolver.java (-1 / +1 lines)
275	case ProblemReasons.NonStaticReferenceInStaticContext :	275	case ProblemReasons.NonStaticReferenceInStaticContext :
276	if (referenceBinding instanceof ProblemReferenceBinding) {	276	if (referenceBinding instanceof ProblemReferenceBinding) {
277	ProblemReferenceBinding problemReferenceBinding = (ProblemReferenceBinding) referenceBinding;	277	ProblemReferenceBinding problemReferenceBinding = (ProblemReferenceBinding) referenceBinding;
278	Binding binding2 = problemReferenceBinding.closestMatch;	278	Binding binding2 = problemReferenceBinding.closestMatch();
279	if (binding2 != null && binding2 instanceof org.eclipse.jdt.internal.compiler.lookup.TypeBinding) {	279	if (binding2 != null && binding2 instanceof org.eclipse.jdt.internal.compiler.lookup.TypeBinding) {
280	TypeBinding binding = (TypeBinding) this.bindingTables.compilerBindingsToASTBindings.get(binding2);	280	TypeBinding binding = (TypeBinding) this.bindingTables.compilerBindingsToASTBindings.get(binding2);
281	if (binding != null) {	281	if (binding != null) {

Lines 295-301 Link Here

(-)model/org/eclipse/jdt/internal/core/hierarchy/HierarchyResolver.java (-2 / +2 lines)
295	TypeReference superclassRef = typeDeclaration == null ? null : typeDeclaration.superclass;	295	TypeReference superclassRef = typeDeclaration == null ? null : typeDeclaration.superclass;
296	TypeBinding superclass = superclassRef == null ? null : superclassRef.resolvedType;	296	TypeBinding superclass = superclassRef == null ? null : superclassRef.resolvedType;
297	if (superclass instanceof ProblemReferenceBinding) {	297	if (superclass instanceof ProblemReferenceBinding) {
298	superclass = ((ProblemReferenceBinding) superclass).closestMatch;	298	superclass = ((ProblemReferenceBinding) superclass).closestMatch();
299	}	299	}
300	if (superclass != null)	300	if (superclass != null)
301	((SourceTypeBinding) typeBinding).superclass = (ReferenceBinding) superclass;	301	((SourceTypeBinding) typeBinding).superclass = (ReferenceBinding) superclass;
Lines 309-315 Link Here
309	for (int i = 0; i < length; i++) {	309	for (int i = 0; i < length; i++) {
310	ReferenceBinding superInterface = (ReferenceBinding) superInterfaces[i].resolvedType;	310	ReferenceBinding superInterface = (ReferenceBinding) superInterfaces[i].resolvedType;
311	if (superInterface instanceof ProblemReferenceBinding)	311	if (superInterface instanceof ProblemReferenceBinding)
312	superInterface = ((ProblemReferenceBinding) superInterface).closestMatch;	312	superInterface = superInterface.closestMatch();
313	if (superInterface != null)	313	if (superInterface != null)
314	interfaceBindings[index++] = superInterface;	314	interfaceBindings[index++] = superInterface;
315	}	315	}

Lines 821-829 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/SelectionEngine.java (-2 / +1 lines)
821	this.acceptedAnswer = true;	821	this.acceptedAnswer = true;
822	} else if (binding instanceof ReferenceBinding) {	822	} else if (binding instanceof ReferenceBinding) {
823	ReferenceBinding typeBinding = (ReferenceBinding) binding;	823	ReferenceBinding typeBinding = (ReferenceBinding) binding;
824
825	if(typeBinding instanceof ProblemReferenceBinding) {	824	if(typeBinding instanceof ProblemReferenceBinding) {
826	typeBinding = ((ProblemReferenceBinding) typeBinding).closestMatch;	825	typeBinding = typeBinding.closestMatch();
827	}	826	}
828	if (typeBinding == null) return;	827	if (typeBinding == null) return;
829	if (isLocal(typeBinding) && this.requestor instanceof SelectionRequestor) {	828	if (isLocal(typeBinding) && this.requestor instanceof SelectionRequestor) {

Return to bug 157996

Lines 992-998 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java (-10 / +10 lines)
992	if (visibleMemberType == null)	992	if (visibleMemberType == null)
993	visibleMemberType = memberType;	993	visibleMemberType = memberType;
994	else	994	else
995	return new ProblemReferenceBinding(typeName, null, ProblemReasons.Ambiguous);	995	return new ProblemReferenceBinding(typeName, visibleMemberType, ProblemReasons.Ambiguous);
996	} else {	996	} else {
997	notVisible = memberType;	997	notVisible = memberType;
998	}	998	}
Lines 1009-1015 Link Here
1009	if (visibleMemberType == null) {	1009	if (visibleMemberType == null) {
1010	visibleMemberType = memberType;	1010	visibleMemberType = memberType;
1011	} else {	1011	} else {
1012	ambiguous = new ProblemReferenceBinding(typeName, null, ProblemReasons.Ambiguous);	1012	ambiguous = new ProblemReferenceBinding(typeName, visibleMemberType, ProblemReasons.Ambiguous);
1013	break done;	1013	break done;
1014	}	1014	}
1015	} else {	1015	} else {
Lines 2036-2042 Link Here
2036	if (!binding.isValidBinding())	2036	if (!binding.isValidBinding())
2037	return new ProblemReferenceBinding(	2037	return new ProblemReferenceBinding(
2038	CharOperation.subarray(compoundName, 0, currentIndex),	2038	CharOperation.subarray(compoundName, 0, currentIndex),
2039	null, // TODO should improve	2039	binding instanceof ReferenceBinding ? ((ReferenceBinding)binding).closestMatch() : null,
2040	binding.problemId());	2040	binding.problemId());
2041	if (!(binding instanceof PackageBinding))	2041	if (!(binding instanceof PackageBinding))
2042	return packageBinding;	2042	return packageBinding;
Lines 2075-2081 Link Here
2075	if (!binding.isValidBinding())	2075	if (!binding.isValidBinding())
2076	return new ProblemReferenceBinding(	2076	return new ProblemReferenceBinding(
2077	CharOperation.arrayConcat(packageBinding.compoundName, name),	2077	CharOperation.arrayConcat(packageBinding.compoundName, name),
2078	null, // TODO should improve	2078	binding instanceof ReferenceBinding ? ((ReferenceBinding)binding).closestMatch() : null,
2079	binding.problemId());	2079	binding.problemId());
2080		2080
2081	ReferenceBinding typeBinding = (ReferenceBinding) binding;	2081	ReferenceBinding typeBinding = (ReferenceBinding) binding;
Lines 2122-2128 Link Here
2122	if (!binding.isValidBinding())	2122	if (!binding.isValidBinding())
2123	return new ProblemReferenceBinding(	2123	return new ProblemReferenceBinding(
2124	CharOperation.subarray(compoundName, 0, currentIndex),	2124	CharOperation.subarray(compoundName, 0, currentIndex),
2125	null, // TODO should improve	2125	binding instanceof ReferenceBinding ? ((ReferenceBinding)binding).closestMatch() : null,
2126	binding.problemId());	2126	binding.problemId());
2127	if (!(binding instanceof PackageBinding))	2127	if (!(binding instanceof PackageBinding))
2128	break;	2128	break;
Lines 2153-2164 Link Here
2153	ProblemReferenceBinding problemBinding = (ProblemReferenceBinding) typeBinding;	2153	ProblemReferenceBinding problemBinding = (ProblemReferenceBinding) typeBinding;
2154	return new ProblemReferenceBinding(	2154	return new ProblemReferenceBinding(
2155	CharOperation.subarray(compoundName, 0, currentIndex),	2155	CharOperation.subarray(compoundName, 0, currentIndex),
2156	problemBinding.closestMatch,	2156	problemBinding.closestMatch(),
2157	typeBinding.problemId());	2157	typeBinding.problemId());
2158	}	2158	}
2159	return new ProblemReferenceBinding(	2159	return new ProblemReferenceBinding(
2160	CharOperation.subarray(compoundName, 0, currentIndex),	2160	CharOperation.subarray(compoundName, 0, currentIndex),
2161	null, // TODO should improve	2161	((ReferenceBinding)binding).closestMatch(),
2162	typeBinding.problemId());	2162	typeBinding.problemId());
2163	}	2163	}
2164	}	2164	}
Lines 2346-2352 Link Here
2346	if (importReference != null) importReference.used = true;	2346	if (importReference != null) importReference.used = true;
2347	if (foundInImport) {	2347	if (foundInImport) {
2348	// Answer error binding -- import on demand conflict; name found in two import on demand packages.	2348	// Answer error binding -- import on demand conflict; name found in two import on demand packages.
2349	temp = new ProblemReferenceBinding(name, null, ProblemReasons.Ambiguous);	2349	temp = new ProblemReferenceBinding(name, type, ProblemReasons.Ambiguous);
2350	if (typeOrPackageCache != null)	2350	if (typeOrPackageCache != null)
2351	typeOrPackageCache.put(name, temp);	2351	typeOrPackageCache.put(name, temp);
2352	return temp;	2352	return temp;
Lines 2414-2420 Link Here
2414	if (!binding.isValidBinding())	2414	if (!binding.isValidBinding())
2415	return new ProblemReferenceBinding(	2415	return new ProblemReferenceBinding(
2416	CharOperation.subarray(compoundName, 0, currentIndex),	2416	CharOperation.subarray(compoundName, 0, currentIndex),
2417	null, // TODO should improve	2417	binding instanceof ReferenceBinding ? ((ReferenceBinding)binding).closestMatch() : null,
2418	binding.problemId());	2418	binding.problemId());
2419	if (!(binding instanceof PackageBinding))	2419	if (!(binding instanceof PackageBinding))
2420	break;	2420	break;
Lines 2440-2446 Link Here
2440	if (!typeBinding.isValidBinding())	2440	if (!typeBinding.isValidBinding())
2441	return new ProblemReferenceBinding(	2441	return new ProblemReferenceBinding(
2442	CharOperation.subarray(compoundName, 0, currentIndex),	2442	CharOperation.subarray(compoundName, 0, currentIndex),
2443	null, // TODO should improve	2443	((ReferenceBinding)binding).closestMatch(),
2444	typeBinding.problemId());	2444	typeBinding.problemId());
2445		2445
2446	if (typeBinding.isGenericType()) {	2446	if (typeBinding.isGenericType()) {

Lines 11-17 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemReferenceBinding.java (-1 / +9 lines)
11	package org.eclipse.jdt.internal.compiler.lookup;	11	package org.eclipse.jdt.internal.compiler.lookup;
12		12
13	public class ProblemReferenceBinding extends ReferenceBinding {	13	public class ProblemReferenceBinding extends ReferenceBinding {
14	public ReferenceBinding closestMatch;	14	private ReferenceBinding closestMatch;
15	private int problemReason;	15	private int problemReason;
16		16
17	// NOTE: must only answer the subset of the name related to the problem	17	// NOTE: must only answer the subset of the name related to the problem
Lines 24-29 Link Here
24	public ProblemReferenceBinding(char[] name, ReferenceBinding closestMatch, int problemReason) {	24	public ProblemReferenceBinding(char[] name, ReferenceBinding closestMatch, int problemReason) {
25	this(new char[][] {name}, closestMatch, problemReason);	25	this(new char[][] {name}, closestMatch, problemReason);
26	}	26	}
		27
		28	/**
		29	* @see org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding#closestMatch()
		30	*/
		31	public ReferenceBinding closestMatch() {
		32	return this.closestMatch;
		33	}
		34
27	/* API	35	/* API
28	* Answer the problem id associated with the receiver.	36	* Answer the problem id associated with the receiver.
29	* NoError if the receiver is a valid binding.	37	* NoError if the receiver is a valid binding.

Lines 156-162 Link Here

(-)search/org/eclipse/jdt/internal/core/search/matching/PackageReferenceLocator.java (-3 / +3 lines)
156	long[] positions = importRef.sourcePositions;	156	long[] positions = importRef.sourcePositions;
157	int last = positions.length - 1;	157	int last = positions.length - 1;
158	if (binding instanceof ProblemReferenceBinding)	158	if (binding instanceof ProblemReferenceBinding)
159	binding = ((ProblemReferenceBinding) binding).closestMatch;	159	binding = ((ProblemReferenceBinding) binding).closestMatch();
160	if (binding instanceof ReferenceBinding) {	160	if (binding instanceof ReferenceBinding) {
161	PackageBinding pkgBinding = ((ReferenceBinding) binding).fPackage;	161	PackageBinding pkgBinding = ((ReferenceBinding) binding).fPackage;
162	if (pkgBinding != null)	162	if (pkgBinding != null)
Lines 220-226 Link Here
220	if (typeBinding instanceof ArrayBinding)	220	if (typeBinding instanceof ArrayBinding)
221	typeBinding = ((ArrayBinding) typeBinding).leafComponentType;	221	typeBinding = ((ArrayBinding) typeBinding).leafComponentType;
222	if (typeBinding instanceof ProblemReferenceBinding)	222	if (typeBinding instanceof ProblemReferenceBinding)
223	typeBinding = ((ProblemReferenceBinding) typeBinding).closestMatch;	223	typeBinding = ((ProblemReferenceBinding) typeBinding).closestMatch();
224	if (typeBinding instanceof ReferenceBinding) {	224	if (typeBinding instanceof ReferenceBinding) {
225	PackageBinding pkgBinding = ((ReferenceBinding) typeBinding).fPackage;	225	PackageBinding pkgBinding = ((ReferenceBinding) typeBinding).fPackage;
226	if (pkgBinding != null)	226	if (pkgBinding != null)
Lines 283-289 Link Here
283	if (binding instanceof ArrayBinding)	283	if (binding instanceof ArrayBinding)
284	binding = ((ArrayBinding) binding).leafComponentType;	284	binding = ((ArrayBinding) binding).leafComponentType;
285	if (binding instanceof ProblemReferenceBinding)	285	if (binding instanceof ProblemReferenceBinding)
286	binding = ((ProblemReferenceBinding) binding).closestMatch;	286	binding = ((ProblemReferenceBinding) binding).closestMatch();
287	if (binding == null) return INACCURATE_MATCH;	287	if (binding == null) return INACCURATE_MATCH;
288		288
289	if (binding instanceof ReferenceBinding) {	289	if (binding instanceof ReferenceBinding) {