Attachment #233551 for bug #405141

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

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

Lines 1064-1073 Link Here

(-)a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests.java (+82 lines)
1064	suite.addTest(new CompletionTests("testBug406468b"));	1064	suite.addTest(new CompletionTests("testBug406468b"));
1065	suite.addTest(new CompletionTests("testBug405250a"));	1065	suite.addTest(new CompletionTests("testBug405250a"));
1066	suite.addTest(new CompletionTests("testBug405250b"));	1066	suite.addTest(new CompletionTests("testBug405250b"));
1067	suite.addTest(new CompletionTests("testBug405250c"));	1067	suite.addTest(new CompletionTests("testBug405250c"));
1068	suite.addTest(new CompletionTests("testBug405250d"));	1068	suite.addTest(new CompletionTests("testBug405250d"));
		1069	suite.addTest(new CompletionTests("testBug405141a"));
		1070	suite.addTest(new CompletionTests("testBug405141b"));
1069	return suite;	1071	return suite;
1070	}	1072	}
1071	public CompletionTests(String name) {	1073	public CompletionTests(String name) {
1072	super(name);	1074	super(name);
1073	}	1075	}
Lines 26576-26581 Link Here
26576	options.put(CompilerOptions.OPTION_Compliance, savedOptionCompliance);	26578	options.put(CompilerOptions.OPTION_Compliance, savedOptionCompliance);
26577	options.put(CompilerOptions.OPTION_Source, savedOptionSource);	26579	options.put(CompilerOptions.OPTION_Source, savedOptionSource);
26578	COMPLETION_PROJECT.setOptions(options);	26580	COMPLETION_PROJECT.setOptions(options);
26579	}	26581	}
26580	}	26582	}
		26583	// Bug 405141 - [1.8][code assist] Improper completion in lambda body for multiply inherited interface
		26584	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=405141
		26585	public void testBug405141a() throws JavaModelException {
		26586	Map options = COMPLETION_PROJECT.getOptions(true);
		26587	Object savedOptionCompliance = options.get(CompilerOptions.OPTION_Compliance);
		26588	Object savedOptionSource = options.get(CompilerOptions.OPTION_Source);
		26589	try {
		26590	options.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_8);
		26591	options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_8);
		26592	COMPLETION_PROJECT.setOptions(options);
		26593	this.workingCopies = new ICompilationUnit[1];
		26594	this.workingCopies[0] = getWorkingCopy(
		26595	"/Completion/src/test/X.java",
		26596	"public interface Foo {\n" +
		26597	" int run1(int s1, int s2);\n" +
		26598	" static int intVal = 0;\n" +
		26599	"}\n" +
		26600	"interface AnotherFoo {\n" +
		26601	" int run1(int s1, int s2);\n" +
		26602	" static int intVal = 0;\n" +
		26603	"}\n" +
		26604	"interface X extends Foo, AnotherFoo{\n" +
		26605	" static Foo f = (intV1, intV2) -> intV;\n" +
		26606	"}\n");
		26607	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
		26608	String str = this.workingCopies[0].getSource();
		26609	String completeBehind = "static Foo f = (intV1, intV2) -> intV";
		26610	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
		26611	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
		26612	assertResults(
		26613	"intVal[FIELD_REF]{AnotherFoo.intVal, Ltest.AnotherFoo;, I, intVal, null, 24}\n" +
		26614	"intV1[LOCAL_VARIABLE_REF]{intV1, null, I, intV1, null, 27}\n" +
		26615	"intV2[LOCAL_VARIABLE_REF]{intV2, null, I, intV2, null, 27}\n" +
		26616	"intVal[FIELD_REF]{Foo.intVal, Ltest.Foo;, I, intVal, null, 27}",
		26617	requestor.getResults());
		26618	} finally {
		26619	// Restore compliance settings.
		26620	options.put(CompilerOptions.OPTION_Compliance, savedOptionCompliance);
		26621	options.put(CompilerOptions.OPTION_Source, savedOptionSource);
		26622	COMPLETION_PROJECT.setOptions(options);
		26623	}
		26624	}
		26625	public void testBug405141b() throws JavaModelException {
		26626	Map options = COMPLETION_PROJECT.getOptions(true);
		26627	Object savedOptionCompliance = options.get(CompilerOptions.OPTION_Compliance);
		26628	Object savedOptionSource = options.get(CompilerOptions.OPTION_Source);
		26629	try {
		26630	options.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_8);
		26631	options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_8);
		26632	COMPLETION_PROJECT.setOptions(options);
		26633	this.workingCopies = new ICompilationUnit[1];
		26634	this.workingCopies[0] = getWorkingCopy(
		26635	"/Completion/src/test/X.java",
		26636	"public interface Foo {\n" +
		26637	" static int intVar = 0;\n" +
		26638	"}\n" +
		26639	"interface AnotherFoo {\n" +
		26640	" static int intVar = 0;\n" +
		26641	"}\n" +
		26642	"interface X extends Foo, AnotherFoo{}\n" +
		26643	"class XClass implements X{\n" +
		26644	" void method () {\n" +
		26645	" int v = intV\n" +
		26646	"}\n");
26647	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
26648	String str = this.workingCopies[0].getSource();
26649	String completeBehind = "int v = intV";
26650	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
26651	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
26652	assertResults(
26653	"intVar[FIELD_REF]{AnotherFoo.intVar, Ltest.AnotherFoo;, I, intVar, null, 54}\n" +
26654	"intVar[FIELD_REF]{Foo.intVar, Ltest.Foo;, I, intVar, null, 57}",
26655	requestor.getResults());
26656	} finally {
26657	// Restore compliance settings.
26658	options.put(CompilerOptions.OPTION_Compliance, savedOptionCompliance);
26659	options.put(CompilerOptions.OPTION_Source, savedOptionSource);
26660	COMPLETION_PROJECT.setOptions(options);
26661	}
26662	}
26581	}	26663	}




					|| !this.requestor.isIgnored(CompletionProposal.JAVADOC_FIELD_REF)) {
				findFields(this.completionToken,
					receiverType,
					scope,
					new ObjectVector(),
					null,
					new ObjectVector(),
					false, /*not only static */
					fieldRef,
					scope,
					false,

	private void findFields(
		char[] fieldName,
		FieldBinding[] fields,
		Scope scope,
		ObjectVector fieldsFound,
		ObjectVector fieldProposals,
		ObjectVector localsFound,
		boolean onlyStaticFields,
		ReferenceBinding receiverType,
		InvocationSite invocationSite,
		Scope invocationScope,

		char[] castedReceiver,
		int receiverStart,
		int receiverEnd) {

		ObjectVector newFieldsFound = new ObjectVector();
		ObjectVector newFieldProposals = new ObjectVector();
		// if the proposal is being asked inside a field's initialization, we'll record its id
		int fieldBeingCompletedId = -1;
		boolean isFieldBeingCompletedStatic = false;
		for (int f = fields.length; --f >=0;) {
			FieldBinding field = fields[f];

					continue next; // non-constants not allowed in case.	
				}
			}

			boolean prefixRequired = false;
			boolean rootNameCompletion = false;

			for (int i = fieldsFound.size; --i >= 0;) {
				Object[] other = (Object[])fieldsFound.elementAt(i);
				FieldBinding otherField = (FieldBinding) other[0];
				ReferenceBinding otherReceiverType = (ReferenceBinding) other[1];

					if (field.declaringClass.isInterface())
						if (otherField.declaringClass.implementsInterface(field.declaringClass, true))
							continue next;
					if(canBePrefixed) {
						prefixRequired = true;
						if (fieldProposals != null) {
							InternalCompletionProposal oldProposal = (InternalCompletionProposal)fieldProposals.elementAt(i);
							if (oldProposal.getKind() == CompletionProposal.FIELD_REF && CharOperation.equals(field.name, oldProposal.getName())) {
								rootNameCompletion = true;
								oldProposal.setCompletion(CharOperation.concat(oldProposal.declarationTypeName, oldProposal.getName(), '.'));
							}
						}
					} else {
						continue next;
					}
				}
			}

										missingElementsEnds[i],
										relevance);
						}
						proposal.setRequiredProposals(subProposals);
					}
					proposal.setCompletion(rootNameCompletion ? CharOperation.concat(field.declaringClass.qualifiedSourceName(), field.name, '.') : completion);
					proposal.setFlags(field.modifiers);
					proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
					proposal.setTokenRange(this.tokenStart - this.offset, this.tokenEnd - this.offset);
					proposal.setRelevance(relevance);
					if (fieldProposals != null) {
						newFieldProposals.add(proposal);
					}
					else {
						this.requestor.accept(proposal);
					}
					if(DEBUG) {
						this.printDebug(proposal);
					}
				}


					proposal.setFlags(field.modifiers);
					int start = (this.assistNodeInJavadoc & CompletionOnJavadoc.REPLACE_TAG) != 0 ? this.javadocTagPosition : this.startPosition;
					proposal.setReplaceRange(start - this.offset, this.endPosition - this.offset);
					proposal.setTokenRange(this.tokenStart - this.offset, this.tokenEnd - this.offset);
					proposal.setRelevance(relevance+R_INLINE_TAG);
					if (fieldProposals != null) {
						newFieldProposals.add(proposal);
					}
					else {
						this.requestor.accept(proposal);
					}
					if(DEBUG) {
						this.printDebug(proposal);
					}
					// Javadoc value completion for static fields
					if (field.isStatic() && !this.requestor.isIgnored(CompletionProposal.JAVADOC_VALUE_REF)) {

						valueProposal.setCompletion(javadocCompletion);
						valueProposal.setFlags(field.modifiers);
						valueProposal.setReplaceRange(start - this.offset, this.endPosition - this.offset);
						valueProposal.setTokenRange(this.tokenStart - this.offset, this.tokenEnd - this.offset);
						valueProposal.setRelevance(relevance+R_VALUE_TAG);
						if (fieldProposals != null) {
							newFieldProposals.add(valueProposal);
						}
						else {
							this.requestor.accept(valueProposal);
						}
						if(DEBUG) {
							this.printDebug(valueProposal);
						}
					}
				}

										missingElementsEnds[i],
										relevance);
						}
						proposal.setRequiredProposals(subProposals);
					}
					proposal.setCompletion(rootNameCompletion ? CharOperation.concat(field.declaringClass.qualifiedSourceName(), field.name, '.') : completion);
					proposal.setFlags(field.modifiers);
					proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
					proposal.setReceiverRange(receiverStart - this.offset, receiverEnd - this.offset);
					proposal.setTokenRange(this.tokenStart - this.offset, this.tokenEnd - this.offset);
					proposal.setRelevance(relevance);
					if (fieldProposals != null) {
						newFieldProposals.add(proposal);
					}
					else {
						this.requestor.accept(proposal);
					}
					if(DEBUG) {
						this.printDebug(proposal);
					}
				}
			}
		}

		fieldsFound.addAll(newFieldsFound);
		if (fieldProposals != null) {
			fieldProposals.addAll(newFieldProposals);
		}
	}
	private void findFields(
		char[] fieldName,
		ReferenceBinding receiverType,
		Scope scope,
		ObjectVector fieldsFound,
		ObjectVector fieldProposals,
		ObjectVector localsFound,
		boolean onlyStaticFields,
		InvocationSite invocationSite,
		Scope invocationScope,
		boolean implicitCall,

				findFields(
					fieldName,
					fields,
					scope,
					fieldsFound,
					null,
					localsFound,
					onlyStaticFields,
					receiverType,
					invocationSite,
					invocationScope,

					findFields(
						fieldName,
						fields,
						scope,
						fieldsFound,
						fieldProposals,
						localsFound,
						onlyStaticFields,
						receiverType,
						invocationSite,
						invocationScope,

						for (int b = 0; b < nextPosition; b++)
							if (next == interfacesToVisit[b]) continue nextInterface;
						interfacesToVisit[nextPosition++] = next;
					}
				}
			}
			if (fieldProposals != null) {
				for (int indx = 0; indx < fieldProposals.size; indx++) {
					this.requestor.accept((InternalCompletionProposal)fieldProposals.elementAt(indx));
				}
				fieldProposals.removeAll();
			}
		}
	}

	protected void findFieldsAndMethods(

			findFields(
				token,
				(ReferenceBinding) receiverType,
				scope,
				fieldsFound,
				null,
				new ObjectVector(),
				false,
				invocationSite,
				invocationScope,
				implicitCall,

								findFields(
									token,
									(ReferenceBinding)binding,
									scope,
									fieldsFound,
									null,
									localsFound,
									true,
									invocationSite,
									invocationScope,
									true,

									findFields(
											token,
											new FieldBinding[]{(FieldBinding)binding},
											scope,
											fieldsFound,
											null,
											localsFound,
											true,
											((FieldBinding)binding).declaringClass,
											invocationSite,
											invocationScope,

			findFields(
				token,
				receiverType,
				scope,
				new ObjectVector(),
				null,
				new ObjectVector(),
				true,
				invocationSite,
				scope,
				false,


		ObjectVector localsFound = new ObjectVector();
		ObjectVector fieldsFound = new ObjectVector();
		ObjectVector methodsFound = new ObjectVector();

		ObjectVector fieldProposals = new ObjectVector();

		Scope currentScope = scope;

		if (!this.requestor.isIgnored(CompletionProposal.LOCAL_VARIABLE_REF)) {
			done1 : while (true) { // done when a COMPILATION_UNIT_SCOPE is found


								findFields(
									token,
									enclosingType,
									classScope,
									fieldsFound,
									fieldProposals,
									localsFound,
									staticsOnly,
									invocationSite,
									invocationScope,
									true,

Return to bug 405141

Lines 2254-2263 Link Here

(-)a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java (-6 / +56 lines)
2254	\|\| !this.requestor.isIgnored(CompletionProposal.JAVADOC_FIELD_REF)) {	2254	\|\| !this.requestor.isIgnored(CompletionProposal.JAVADOC_FIELD_REF)) {
2255	findFields(this.completionToken,	2255	findFields(this.completionToken,
2256	receiverType,	2256	receiverType,
2257	scope,	2257	scope,
2258	new ObjectVector(),	2258	new ObjectVector(),
		2259	null,
2259	new ObjectVector(),	2260	new ObjectVector(),
2260	false, /not only static /	2261	false, /not only static /
2261	fieldRef,	2262	fieldRef,
2262	scope,	2263	scope,
2263	false,	2264	false,
Lines 6139-6148 Link Here
6139	private void findFields(	6140	private void findFields(
6140	char[] fieldName,	6141	char[] fieldName,
6141	FieldBinding[] fields,	6142	FieldBinding[] fields,
6142	Scope scope,	6143	Scope scope,
6143	ObjectVector fieldsFound,	6144	ObjectVector fieldsFound,
		6145	ObjectVector fieldProposals,
6144	ObjectVector localsFound,	6146	ObjectVector localsFound,
6145	boolean onlyStaticFields,	6147	boolean onlyStaticFields,
6146	ReferenceBinding receiverType,	6148	ReferenceBinding receiverType,
6147	InvocationSite invocationSite,	6149	InvocationSite invocationSite,
6148	Scope invocationScope,	6150	Scope invocationScope,
Lines 6155-6164 Link Here
6155	char[] castedReceiver,	6157	char[] castedReceiver,
6156	int receiverStart,	6158	int receiverStart,
6157	int receiverEnd) {	6159	int receiverEnd) {
6158		6160
6159	ObjectVector newFieldsFound = new ObjectVector();	6161	ObjectVector newFieldsFound = new ObjectVector();
		6162	ObjectVector newFieldProposals = new ObjectVector();
6160	// if the proposal is being asked inside a field's initialization, we'll record its id	6163	// if the proposal is being asked inside a field's initialization, we'll record its id
6161	int fieldBeingCompletedId = -1;	6164	int fieldBeingCompletedId = -1;
6162	boolean isFieldBeingCompletedStatic = false;	6165	boolean isFieldBeingCompletedStatic = false;
6163	for (int f = fields.length; --f >=0;) {	6166	for (int f = fields.length; --f >=0;) {
6164	FieldBinding field = fields[f];	6167	FieldBinding field = fields[f];
Lines 6237-6246 Link Here
6237	continue next; // non-constants not allowed in case.	6240	continue next; // non-constants not allowed in case.
6238	}	6241	}
6239	}	6242	}
6240		6243
6241	boolean prefixRequired = false;	6244	boolean prefixRequired = false;
		6245	boolean rootNameCompletion = false;
6242		6246
6243	for (int i = fieldsFound.size; --i >= 0;) {	6247	for (int i = fieldsFound.size; --i >= 0;) {
6244	Object[] other = (Object[])fieldsFound.elementAt(i);	6248	Object[] other = (Object[])fieldsFound.elementAt(i);
6245	FieldBinding otherField = (FieldBinding) other[0];	6249	FieldBinding otherField = (FieldBinding) other[0];
6246	ReferenceBinding otherReceiverType = (ReferenceBinding) other[1];	6250	ReferenceBinding otherReceiverType = (ReferenceBinding) other[1];
Lines 6258-6267 Link Here
6258	if (field.declaringClass.isInterface())	6262	if (field.declaringClass.isInterface())
6259	if (otherField.declaringClass.implementsInterface(field.declaringClass, true))	6263	if (otherField.declaringClass.implementsInterface(field.declaringClass, true))
6260	continue next;	6264	continue next;
6261	if(canBePrefixed) {	6265	if(canBePrefixed) {
6262	prefixRequired = true;	6266	prefixRequired = true;
		6267	if (fieldProposals != null) {
		6268	InternalCompletionProposal oldProposal = (InternalCompletionProposal)fieldProposals.elementAt(i);
		6269	if (oldProposal.getKind() == CompletionProposal.FIELD_REF && CharOperation.equals(field.name, oldProposal.getName())) {
		6270	rootNameCompletion = true;
		6271	oldProposal.setCompletion(CharOperation.concat(oldProposal.declarationTypeName, oldProposal.getName(), '.'));
		6272	}
		6273	}
6263	} else {	6274	} else {
6264	continue next;	6275	continue next;
6265	}	6276	}
6266	}	6277	}
6267	}	6278	}
Lines 6356-6371 Link Here
6356	missingElementsEnds[i],	6367	missingElementsEnds[i],
6357	relevance);	6368	relevance);
6358	}	6369	}
6359	proposal.setRequiredProposals(subProposals);	6370	proposal.setRequiredProposals(subProposals);
6360	}	6371	}
6361	proposal.setCompletion(completion);	6372	proposal.setCompletion(rootNameCompletion ? CharOperation.concat(field.declaringClass.qualifiedSourceName(), field.name, '.') : completion);
6362	proposal.setFlags(field.modifiers);	6373	proposal.setFlags(field.modifiers);
6363	proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);	6374	proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
6364	proposal.setTokenRange(this.tokenStart - this.offset, this.tokenEnd - this.offset);	6375	proposal.setTokenRange(this.tokenStart - this.offset, this.tokenEnd - this.offset);
6365	proposal.setRelevance(relevance);	6376	proposal.setRelevance(relevance);
6366	this.requestor.accept(proposal);	6377	if (fieldProposals != null) {
		6378	newFieldProposals.add(proposal);
		6379	}
		6380	else {
		6381	this.requestor.accept(proposal);
		6382	}
6367	if(DEBUG) {	6383	if(DEBUG) {
6368	this.printDebug(proposal);	6384	this.printDebug(proposal);
6369	}	6385	}
6370	}	6386	}
6371		6387
Lines 6384-6394 Link Here
6384	proposal.setFlags(field.modifiers);	6400	proposal.setFlags(field.modifiers);
6385	int start = (this.assistNodeInJavadoc & CompletionOnJavadoc.REPLACE_TAG) != 0 ? this.javadocTagPosition : this.startPosition;	6401	int start = (this.assistNodeInJavadoc & CompletionOnJavadoc.REPLACE_TAG) != 0 ? this.javadocTagPosition : this.startPosition;
6386	proposal.setReplaceRange(start - this.offset, this.endPosition - this.offset);	6402	proposal.setReplaceRange(start - this.offset, this.endPosition - this.offset);
6387	proposal.setTokenRange(this.tokenStart - this.offset, this.tokenEnd - this.offset);	6403	proposal.setTokenRange(this.tokenStart - this.offset, this.tokenEnd - this.offset);
6388	proposal.setRelevance(relevance+R_INLINE_TAG);	6404	proposal.setRelevance(relevance+R_INLINE_TAG);
6389	this.requestor.accept(proposal);	6405	if (fieldProposals != null) {
		6406	newFieldProposals.add(proposal);
		6407	}
		6408	else {
		6409	this.requestor.accept(proposal);
		6410	}
6390	if(DEBUG) {	6411	if(DEBUG) {
6391	this.printDebug(proposal);	6412	this.printDebug(proposal);
6392	}	6413	}
6393	// Javadoc value completion for static fields	6414	// Javadoc value completion for static fields
6394	if (field.isStatic() && !this.requestor.isIgnored(CompletionProposal.JAVADOC_VALUE_REF)) {	6415	if (field.isStatic() && !this.requestor.isIgnored(CompletionProposal.JAVADOC_VALUE_REF)) {
Lines 6404-6414 Link Here
6404	valueProposal.setCompletion(javadocCompletion);	6425	valueProposal.setCompletion(javadocCompletion);
6405	valueProposal.setFlags(field.modifiers);	6426	valueProposal.setFlags(field.modifiers);
6406	valueProposal.setReplaceRange(start - this.offset, this.endPosition - this.offset);	6427	valueProposal.setReplaceRange(start - this.offset, this.endPosition - this.offset);
6407	valueProposal.setTokenRange(this.tokenStart - this.offset, this.tokenEnd - this.offset);	6428	valueProposal.setTokenRange(this.tokenStart - this.offset, this.tokenEnd - this.offset);
6408	valueProposal.setRelevance(relevance+R_VALUE_TAG);	6429	valueProposal.setRelevance(relevance+R_VALUE_TAG);
6409	this.requestor.accept(valueProposal);	6430	if (fieldProposals != null) {
		6431	newFieldProposals.add(valueProposal);
		6432	}
		6433	else {
		6434	this.requestor.accept(valueProposal);
		6435	}
6410	if(DEBUG) {	6436	if(DEBUG) {
6411	this.printDebug(valueProposal);	6437	this.printDebug(valueProposal);
6412	}	6438	}
6413	}	6439	}
6414	}	6440	}
Lines 6433-6463 Link Here
6433	missingElementsEnds[i],	6459	missingElementsEnds[i],
6434	relevance);	6460	relevance);
6435	}	6461	}
6436	proposal.setRequiredProposals(subProposals);	6462	proposal.setRequiredProposals(subProposals);
6437	}	6463	}
6438	proposal.setCompletion(completion);	6464	proposal.setCompletion(rootNameCompletion ? CharOperation.concat(field.declaringClass.qualifiedSourceName(), field.name, '.') : completion);
6439	proposal.setFlags(field.modifiers);	6465	proposal.setFlags(field.modifiers);
6440	proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);	6466	proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
6441	proposal.setReceiverRange(receiverStart - this.offset, receiverEnd - this.offset);	6467	proposal.setReceiverRange(receiverStart - this.offset, receiverEnd - this.offset);
6442	proposal.setTokenRange(this.tokenStart - this.offset, this.tokenEnd - this.offset);	6468	proposal.setTokenRange(this.tokenStart - this.offset, this.tokenEnd - this.offset);
6443	proposal.setRelevance(relevance);	6469	proposal.setRelevance(relevance);
6444	this.requestor.accept(proposal);	6470	if (fieldProposals != null) {
		6471	newFieldProposals.add(proposal);
		6472	}
		6473	else {
		6474	this.requestor.accept(proposal);
		6475	}
6445	if(DEBUG) {	6476	if(DEBUG) {
6446	this.printDebug(proposal);	6477	this.printDebug(proposal);
6447	}	6478	}
6448	}	6479	}
6449	}	6480	}
6450	}	6481	}
6451		6482
6452	fieldsFound.addAll(newFieldsFound);	6483	fieldsFound.addAll(newFieldsFound);
		6484	if (fieldProposals != null) {
		6485	fieldProposals.addAll(newFieldProposals);
		6486	}
6453	}	6487	}
6454	private void findFields(	6488	private void findFields(
6455	char[] fieldName,	6489	char[] fieldName,
6456	ReferenceBinding receiverType,	6490	ReferenceBinding receiverType,
6457	Scope scope,	6491	Scope scope,
6458	ObjectVector fieldsFound,	6492	ObjectVector fieldsFound,
		6493	ObjectVector fieldProposals,
6459	ObjectVector localsFound,	6494	ObjectVector localsFound,
6460	boolean onlyStaticFields,	6495	boolean onlyStaticFields,
6461	InvocationSite invocationSite,	6496	InvocationSite invocationSite,
6462	Scope invocationScope,	6497	Scope invocationScope,
6463	boolean implicitCall,	6498	boolean implicitCall,
Lines 6501-6510 Link Here
6501	findFields(	6536	findFields(
6502	fieldName,	6537	fieldName,
6503	fields,	6538	fields,
6504	scope,	6539	scope,
6505	fieldsFound,	6540	fieldsFound,
		6541	null,
6506	localsFound,	6542	localsFound,
6507	onlyStaticFields,	6543	onlyStaticFields,
6508	receiverType,	6544	receiverType,
6509	invocationSite,	6545	invocationSite,
6510	invocationScope,	6546	invocationScope,
Lines 6529-6538 Link Here
6529	findFields(	6565	findFields(
6530	fieldName,	6566	fieldName,
6531	fields,	6567	fields,
6532	scope,	6568	scope,
6533	fieldsFound,	6569	fieldsFound,
		6570	fieldProposals,
6534	localsFound,	6571	localsFound,
6535	onlyStaticFields,	6572	onlyStaticFields,
6536	receiverType,	6573	receiverType,
6537	invocationSite,	6574	invocationSite,
6538	invocationScope,	6575	invocationScope,
Lines 6557-6566 Link Here
6557	for (int b = 0; b < nextPosition; b++)	6594	for (int b = 0; b < nextPosition; b++)
6558	if (next == interfacesToVisit[b]) continue nextInterface;	6595	if (next == interfacesToVisit[b]) continue nextInterface;
6559	interfacesToVisit[nextPosition++] = next;	6596	interfacesToVisit[nextPosition++] = next;
6560	}	6597	}
6561	}	6598	}
		6599	}
		6600	if (fieldProposals != null) {
		6601	for (int indx = 0; indx < fieldProposals.size; indx++) {
		6602	this.requestor.accept((InternalCompletionProposal)fieldProposals.elementAt(indx));
		6603	}
		6604	fieldProposals.removeAll();
6562	}	6605	}
6563	}	6606	}
6564	}	6607	}
6565		6608
6566	protected void findFieldsAndMethods(	6609	protected void findFieldsAndMethods(
Lines 6807-6816 Link Here
6807	findFields(	6850	findFields(
6808	token,	6851	token,
6809	(ReferenceBinding) receiverType,	6852	(ReferenceBinding) receiverType,
6810	scope,	6853	scope,
6811	fieldsFound,	6854	fieldsFound,
		6855	null,
6812	new ObjectVector(),	6856	new ObjectVector(),
6813	false,	6857	false,
6814	invocationSite,	6858	invocationSite,
6815	invocationScope,	6859	invocationScope,
6816	implicitCall,	6860	implicitCall,
Lines 7343-7352 Link Here
7343	findFields(	7387	findFields(
7344	token,	7388	token,
7345	(ReferenceBinding)binding,	7389	(ReferenceBinding)binding,
7346	scope,	7390	scope,
7347	fieldsFound,	7391	fieldsFound,
		7392	null,
7348	localsFound,	7393	localsFound,
7349	true,	7394	true,
7350	invocationSite,	7395	invocationSite,
7351	invocationScope,	7396	invocationScope,
7352	true,	7397	true,
Lines 7389-7398 Link Here
7389	findFields(	7434	findFields(
7390	token,	7435	token,
7391	new FieldBinding[]{(FieldBinding)binding},	7436	new FieldBinding[]{(FieldBinding)binding},
7392	scope,	7437	scope,
7393	fieldsFound,	7438	fieldsFound,
		7439	null,
7394	localsFound,	7440	localsFound,
7395	true,	7441	true,
7396	((FieldBinding)binding).declaringClass,	7442	((FieldBinding)binding).declaringClass,
7397	invocationSite,	7443	invocationSite,
7398	invocationScope,	7444	invocationScope,
Lines 9250-9259 Link Here
9250	findFields(	9296	findFields(
9251	token,	9297	token,
9252	receiverType,	9298	receiverType,
9253	scope,	9299	scope,
9254	new ObjectVector(),	9300	new ObjectVector(),
		9301	null,
9255	new ObjectVector(),	9302	new ObjectVector(),
9256	true,	9303	true,
9257	invocationSite,	9304	invocationSite,
9258	scope,	9305	scope,
9259	false,	9306	false,
Lines 11591-11600 Link Here
11591		11638
11592	ObjectVector localsFound = new ObjectVector();	11639	ObjectVector localsFound = new ObjectVector();
11593	ObjectVector fieldsFound = new ObjectVector();	11640	ObjectVector fieldsFound = new ObjectVector();
11594	ObjectVector methodsFound = new ObjectVector();	11641	ObjectVector methodsFound = new ObjectVector();
11595		11642
		11643	ObjectVector fieldProposals = new ObjectVector();
		11644
11596	Scope currentScope = scope;	11645	Scope currentScope = scope;
11597		11646
11598	if (!this.requestor.isIgnored(CompletionProposal.LOCAL_VARIABLE_REF)) {	11647	if (!this.requestor.isIgnored(CompletionProposal.LOCAL_VARIABLE_REF)) {
11599	done1 : while (true) { // done when a COMPILATION_UNIT_SCOPE is found	11648	done1 : while (true) { // done when a COMPILATION_UNIT_SCOPE is found
11600		11649
Lines 11740-11749 Link Here
11740	findFields(	11789	findFields(
11741	token,	11790	token,
11742	enclosingType,	11791	enclosingType,
11743	classScope,	11792	classScope,
11744	fieldsFound,	11793	fieldsFound,
		11794	fieldProposals,
11745	localsFound,	11795	localsFound,
11746	staticsOnly,	11796	staticsOnly,
11747	invocationSite,	11797	invocationSite,
11748	invocationScope,	11798	invocationScope,
11749	true,	11799	true,