Attachment #52310 for bug #161204

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




	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.b") + "m.".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
	
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.b") + "m.".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.b") + "m.".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int relevance2 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.") + "m.".length();
	int end1 = start1;
	int start2 = str.lastIndexOf("MissingType");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
	
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.b") + "m.".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
	
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.b") + "m.".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.b") + "m.".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.b") + "m.".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingMemberType");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
	
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m().b") + "m().".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m(0).b") + "m(0).".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m().b") + "m().".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.b") + "m.".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.e") + "m.".length();
	int end1 = start1 + "e".length();
	int start2 = str.lastIndexOf("MissingType");

		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
	
		int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
		int start1 = str.lastIndexOf("m.b") + "m.".length();
		int end1 = start1 + "b".length();
		int start2 = str.lastIndexOf("MissingMemberType");

		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
	
		int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
		int start1 = str.lastIndexOf("m.b") + "m.".length();
		int end1 = start1 + "b".length();
		int start2 = str.lastIndexOf("MissingMemberMemberType");

	}
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=44984
public void test0023() throws JavaModelException {
	this.oldOptions = JavaCore.getOptions();
	
	try {

		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
	
		int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
		int start1 = str.lastIndexOf("m.b") + "m.".length();
		int end1 = start1 + "b".length();
		int start2 = str.lastIndexOf("MissingMemberType");

		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
	
		int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
		int start1 = str.lastIndexOf("m.b") + "m.".length();
		int end1 = start1 + "b".length();
		int start2 = str.lastIndexOf("MissingMemberMemberType");




	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.b") + "m.".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.b") + "m.".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType2");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.b") + "m.".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType2");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.b") + "m.".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType<");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.b") + "m.".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType1");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m(0, 0).b") + "m(0, 0).".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.b") + "m.".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.b") + "m.".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType");

	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.b") + "m.".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType");

			"",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=161204
public void test0012() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[3];
	this.workingCopies[0] = getWorkingCopy(
		"/Completion/src/test/Test.java",
		"package test;"+
		"public class Test {\n" + 
		"  void foo() {\n" + 
 		"    MissingType m = null;\n" + 
 		"    m.b\n" + 
		"  }\n" + 
		"}\n");
	
	this.workingCopies[1] = getWorkingCopy(
		"/Completion/src/missing1/MissingType.java",
		"package missing1;"+
		"public class MissingType<T> {\n" + 
		"  public void bar() {};\n" + 
		"}\n");
	
	this.workingCopies[2] = getWorkingCopy(
		"/Completion/src/missing2/MissingType.java",
		"package missing2;"+
		"public class MissingType {\n" + 
		"  public void bar() {};\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);

	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;
	int relevance2 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
	int start1 = str.lastIndexOf("m.b") + "m.".length();
	int end1 = start1 + "b".length();
	int start2 = str.lastIndexOf("MissingType");
	int end2 = start2 + "MissingType".length();
	assertResults(
			"bar[METHOD_REF]{bar(), Lmissing1.MissingType;, ()V, bar, null, ["+start1+", "+end1+"], " + (relevance1) + "}\n" +
			"   MissingType<T>[TYPE_REF]{missing1.MissingType, missing1, Lmissing1.MissingType<TT;>;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n" +
			"bar[METHOD_REF]{bar(), Lmissing2.MissingType;, ()V, bar, null, ["+start1+", "+end1+"], " + (relevance2) + "}\n" +
			"   MissingType[TYPE_REF]{missing2.MissingType, missing2, Lmissing2.MissingType;, null, null, ["+start2+", "+end2+"], " + (relevance2) + "}",
			requestor.getResults());
}
}

Lines 143-149 Link Here

(-)src/org/eclipse/jdt/core/tests/model/CompletionWithMissingTypesTests2.java (-2 / +2 lines)
143	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();	143	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
144	cu.codeComplete(cursorLocation, requestor);	144	cu.codeComplete(cursorLocation, requestor);
145		145
146	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;	146	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
147	int start1 = str.lastIndexOf("x.fo") + "x.".length();	147	int start1 = str.lastIndexOf("x.fo") + "x.".length();
148	int end1 = start1 + "fo".length();	148	int end1 = start1 + "fo".length();
149	int start2 = str.lastIndexOf("XX");	149	int start2 = str.lastIndexOf("XX");
Lines 237-243 Link Here
237	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();	237	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
238	cu.codeComplete(cursorLocation, requestor);	238	cu.codeComplete(cursorLocation, requestor);
239		239
240	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;	240	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
241	int start1 = str.lastIndexOf("x.fo") + "x.".length();	241	int start1 = str.lastIndexOf("x.fo") + "x.".length();
242	int end1 = start1 + "fo".length();	242	int end1 = start1 + "fo".length();
243	int start2 = str.lastIndexOf("XX");	243	int start2 = str.lastIndexOf("XX");

Lines 40-43 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/RelevanceConstants.java (+1 lines)
40	int R_INLINE_TAG = 31;	40	int R_INLINE_TAG = 31;
41	int R_VALUE_TAG = 31;	41	int R_VALUE_TAG = 31;
42	int R_NON_INHERITED = 2;	42	int R_NON_INHERITED = 2;
		43	int R_NO_PROBLEMS = 1;
43	}	44	}




import org.eclipse.jdt.internal.compiler.problem.AbortCompilation;
import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;
import org.eclipse.jdt.internal.compiler.problem.ProblemReporter;
import org.eclipse.jdt.internal.compiler.problem.ProblemSeverities;
import org.eclipse.jdt.internal.compiler.util.SuffixConstants;
import org.eclipse.jdt.internal.compiler.util.HashtableOfObject;
import org.eclipse.jdt.internal.compiler.util.ObjectVector;

	public class CompletionProblemFactory extends DefaultProblemFactory {
		private int lastErrorStart;
		
		private boolean checkProblems = false;
		public boolean hasForbiddenProblems = false;
		public boolean hasAllowedProblems = false;
		
		public CompletionProblemFactory(Locale loc) {
			super(loc);
		}

				CompletionEngine.this.problem = pb;
				this.lastErrorStart = start;
			}
			if (this.checkProblems && !this.hasForbiddenProblems) {
				switch (id) {
					case IProblem.UsingDeprecatedType:
						this.hasForbiddenProblems =
							CompletionEngine.this.options.checkDeprecation;
						break;
					case IProblem.NotVisibleType:
						this.hasForbiddenProblems =
							CompletionEngine.this.options.checkVisibility;
						break;
					case IProblem.ForbiddenReference:
						this.hasForbiddenProblems =
							CompletionEngine.this.options.checkForbiddenReference;
						break;
					case IProblem.DiscouragedReference:
						this.hasForbiddenProblems =
							CompletionEngine.this.options.checkDiscouragedReference;
						break;
					default:
						if ((severity & ProblemSeverities.Optional) != 0) {
							this.hasAllowedProblems = true;
						} else {
							this.hasForbiddenProblems = true;
						}
						
						break;
				}
			}
			
			return pb;
		}
		
		public void startCheckingProblems() {
			this.checkProblems = true;
			this.hasForbiddenProblems = false;
			this.hasAllowedProblems = false;
		}
		
		public void stopCheckingProblems() {
			this.checkProblems = false;
		}
	}

	private class AcceptedType {

				SourceTypeBinding enclosingType = scope.enclosingSourceType();
				if (!enclosingType.isAnnotationType()) {
					if (!this.requestor.isIgnored(CompletionProposal.METHOD_DECLARATION)) {
						findMethods(this.completionToken,null,null,enclosingType,scope,new ObjectVector(),false,false,true,null,null,false,false,true,null, null, null, false);
					}
					if (!this.requestor.isIgnored(CompletionProposal.POTENTIAL_METHOD_DECLARATION)) {
						proposeNewMethod(this.completionToken, enclosingType);

				SourceTypeBinding enclosingType = scope.enclosingSourceType();
				if (!enclosingType.isAnnotationType()) {
					if (!this.requestor.isIgnored(CompletionProposal.METHOD_DECLARATION)) {
						findMethods(this.completionToken,null,null,scope.enclosingSourceType(),scope,new ObjectVector(),false,false,true,null,null,false,false,true,null, null, null, false);
					}
					if (!this.requestor.isIgnored(CompletionProposal.POTENTIAL_METHOD_DECLARATION)) {
						proposeNewMethod(this.completionToken, scope.enclosingSourceType());

				setSourceRange((int) (completionPosition >>> 32), (int) completionPosition);
				TypeBinding receiverType = ((VariableBinding) qualifiedBinding).type;
				if (receiverType != null) {
					findFieldsAndMethods(this.completionToken, receiverType.capture(scope, ref.sourceEnd), scope, ref, scope,false,false, null, null, null, false);
				} else if (this.assistNodeInJavadoc == 0 &&
						(this.requestor.isAllowingRequiredProposals(CompletionProposal.FIELD_REF, CompletionProposal.TYPE_REF) ||
								this.requestor.isAllowingRequiredProposals(CompletionProposal.METHOD_REF, CompletionProposal.TYPE_REF))) {

						false,
						null,
						null,
						null,
						false);
				}

				if (!isInsideAnnotationAttribute && !this.requestor.isIgnored(CompletionProposal.METHOD_REF)) {

						false,
						null,
						null,
						null,
						false);
				}

			} else if (qualifiedBinding instanceof PackageBinding) {

					access.receiver instanceof SuperReference,
					null,
					null,
					null,
					false);
			}

		} else if (astNode instanceof CompletionOnMessageSend) {

					false,
					null,
					null,
					null,
					false);
			}
		} else if (astNode instanceof CompletionOnExplicitConstructorCall) {
			if (!this.requestor.isIgnored(CompletionProposal.METHOD_REF)) {

								false,
								null,
								null,
								null,
								false);
					}
				}
			}

							true,
							null,
							null,
							null,
							false);
					}

					if (!this.requestor.isIgnored(CompletionProposal.METHOD_REF)

							true,
							null,
							null,
							null,
							false);
						if (fieldRef.receiverType instanceof ReferenceBinding) {
							ReferenceBinding refBinding = (ReferenceBinding)fieldRef.receiverType;
							if (this.completionToken == null

						true,
						null,
						null,
						null,
						false);
				}
			} else if (astNode instanceof CompletionOnJavadocAllocationExpression) {
//				setSourceRange(astNode.sourceStart, astNode.sourceEnd, false);

		boolean canBePrefixed,
		Binding[] missingElements,
		int[] missingElementsStarts,
		int[] missingElementsEnds,
		boolean missingElementsHaveProblems) {

		ObjectVector newFieldsFound = new ObjectVector();
		// Inherited fields which are hidden by subclasses are filtered out

			if (onlyStaticFields && this.insideQualifiedReference) {
				relevance += computeRelevanceForInheritance(receiverType, field.declaringClass);
			}
			if (missingElements != null) {
				relevance += computeRelevanceForMissingElements(missingElementsHaveProblems);
			}
			
			this.noProposal = false;
			// Standard proposal

		boolean canBePrefixed,
		Binding[] missingElements,
		int[] missingElementsStarts,
		int[] missingElementsEnds,
		boolean missingElementsHaveProblems) {

		boolean notInJavadoc = this.assistNodeInJavadoc == 0;
		if (fieldName == null && notInJavadoc)

					canBePrefixed,
					missingElements,
					missingElementsStarts,
					missingElementsEnds,
					missingElementsHaveProblems);
			}
			currentType = currentType.superclass();
		} while (notInJavadoc && currentType != null);

						canBePrefixed,
						missingElements,
						missingElementsStarts,
						missingElementsEnds,
						missingElementsHaveProblems);
				}

				ReferenceBinding[] itsInterfaces = anInterface.superInterfaces();

		boolean superCall,
		Binding[] missingElements,
		int[] missingElementsStarts,
		int[] missingElementsEnds,
		boolean missingElementsHaveProblems) {

		if (token == null)
			return;

				relevance += computeRelevanceForCaseMatching(token,lengthField);
				relevance += computeRelevanceForExpectingType(TypeBinding.INT);
				relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE); // no access restriction for length field
				if (missingElements != null) {
					relevance += computeRelevanceForMissingElements(missingElementsHaveProblems);
				}
				this.noProposal = false;
				if(!isIgnored(CompletionProposal.FIELD_REF, missingElements != null)) {
					CompletionProposal proposal = this.createProposal(CompletionProposal.FIELD_REF, this.actualCompletionPosition);

				relevance += computeRelevanceForStatic(false, false);
				relevance += computeRelevanceForQualification(false);
				relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE); // no access restriction for clone() method
				if (missingElements != null) {
					relevance += computeRelevanceForMissingElements(missingElementsHaveProblems);
				}
				char[] completion;
				if (this.source != null
					&& this.source.length > this.endPosition

				false,
				missingElements,
				missingElementsStarts,
				missingElementsEnds,
				missingElementsHaveProblems);
		}

		if(proposeMethod) {

				false,
				missingElements,
				missingElementsStarts,
				missingElementsEnds,
				missingElementsHaveProblems);
		}
	}
	

						TypeBinding guessedType,
						Binding[] missingElements,
						int[] missingElementsStarts,
						int[] missingElementsEnds,
						boolean hasProblems) {
					findFieldsAndMethods(
						CompletionEngine.this.completionToken,
						guessedType,

						false,
						missingElements,
						missingElementsStarts,
						missingElementsEnds,
						hasProblems);
					
				}
			};

		boolean canBePrefixed,
		Binding[] missingElements,
		int[] missingElementssStarts,
		int[] missingElementsEnds,
		boolean missingElementsHaveProblems) {

		if (selector == null)
			return;

							canBePrefixed,
							missingElements,
							missingElementssStarts,
							missingElementsEnds,
							missingElementsHaveProblems);
					}
				}


						true,
						null,
						null,
						null,
						false);
					staticsOnly |= enclosingType.isStatic();
					break;


		boolean canBePrefixed,
		Binding[] missingElements,
		int[] missingElementsStarts,
		int[] missingElementsEnds,
		boolean missingElementsHaveProblems) {

		ObjectVector newMethodsFound =  new ObjectVector();
		// Inherited methods which are hidden by subclasses are filtered out

			if (onlyStaticMethods && this.insideQualifiedReference) {
				relevance += computeRelevanceForInheritance(receiverType, method.declaringClass);
			}
			if (missingElements != null) {
				relevance += computeRelevanceForMissingElements(missingElementsHaveProblems);
			}
			
			this.noProposal = false;
			// Standard proposal

		}
		return 0;
	}
	private int computeRelevanceForMissingElements(boolean hasProblems) {
		if (!hasProblems) {
			return R_NO_PROBLEMS;
		}
		return 0;
	}
	private int computeRelevanceForQualification(boolean prefixRequired) {
		if(!prefixRequired && !this.insideQualifiedReference) {
			return R_UNQUALIFIED;

		boolean canBePrefixed,
		Binding[] missingElements,
		int[] missingElementsStarts,
		int[] missingElementsEnds,
		boolean missingElementsHaveProblems) {

		boolean notInJavadoc = this.assistNodeInJavadoc == 0;
		if (selector == null && notInJavadoc) {

						canBePrefixed,
						missingElements,
						missingElementsStarts,
						missingElementsEnds,
						missingElementsHaveProblems);
				} else {
					findInterfacesMethods(
						selector,

						canBePrefixed,
						missingElements,
						missingElementsStarts,
						missingElementsEnds,
						missingElementsHaveProblems);
				}
				
				currentType = scope.getJavaLangObject();

						canBePrefixed,
						missingElements,
						missingElementsStarts,
						missingElementsEnds,
						missingElementsHaveProblems);
					
					currentType = receiverType.superclass();
				}

						canBePrefixed,
						missingElements,
						missingElementsStarts,
						missingElementsEnds,
						missingElementsHaveProblems);
				}
			}
			

					canBePrefixed,
					missingElements,
					missingElementsStarts,
					missingElementsEnds,
					missingElementsHaveProblems);
			} else {
				hasPotentialDefaultAbstractMethods = false;
			}

									true,
									null,
									null,
									null,
									false);
							}
							if(proposeMethod && !insideAnnotationAttribute) {
								findMethods(

									true,
									null,
									null,
									null,
									false);
							}
						}
						staticsOnly |= enclosingType.isStatic();

										false,
										null,
										null,
										null,
										false);
								}
								if(proposeMethod && !insideAnnotationAttribute) {
									findMethods(

										false,
										null,
										null,
										null,
										false);
								}
							}
						} else {

												false,
												null,
												null,
												null,
												false);
								}
							} else if ((binding.kind() & Binding.METHOD) != 0) {
								if(proposeMethod && !insideAnnotationAttribute) {




				TypeBinding guessedType,
				Binding[] missingElements,
				int[] missingElementsStarts,
				int[] missingElementsEnds,
				boolean hasProblems);
		
	}
	

			
			nextSubstitution(substituedTypeNodes, subtitutions, substitutionsIndexes);
			
			
			this.problemFactory.startCheckingProblems();
			TypeBinding guessedType = null;
			switch (scope.kind) {
				case Scope.METHOD_SCOPE :
				case Scope.BLOCK_SCOPE :
					resolutionCleaner.cleanUp(convertedType, (BlockScope)scope);
					convertedType.traverse(resolutionCleaner, (BlockScope)scope);
					guessedType = convertedType.resolveType((BlockScope)scope);
					break;
				case Scope.CLASS_SCOPE :
					resolutionCleaner.cleanUp(convertedType, (ClassScope)scope);
					convertedType.traverse(resolutionCleaner, (ClassScope)scope);
					guessedType = convertedType.resolveType((ClassScope)scope);
					break;
			}
			this.problemFactory.stopCheckingProblems();
			if (!this.problemFactory.hasForbiddenProblems) {
				if (guessedType != null) {
					Binding[] missingElements = new Binding[length];
					int[] missingElementsStarts = new int[length];

								guessedType.capture(scope, typeRef.sourceEnd),
								missingElements,
								missingElementsStarts,
								missingElementsEnds,
								this.problemFactory.hasAllowedProblems);
					}
				}
			}

Return to bug 161204

Lines 64-70 Link Here

(-)src/org/eclipse/jdt/core/tests/model/CompletionWithMissingTypesTests_1_5.java (-9 / +56 lines)
64	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();	64	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
65	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);	65	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
66		66
67	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;	67	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
68	int start1 = str.lastIndexOf("m.b") + "m.".length();	68	int start1 = str.lastIndexOf("m.b") + "m.".length();
69	int end1 = start1 + "b".length();	69	int end1 = start1 + "b".length();
70	int start2 = str.lastIndexOf("MissingType");	70	int start2 = str.lastIndexOf("MissingType");
Lines 108-114 Link Here
108	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();	108	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
109	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);	109	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
110		110
111	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;	111	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
112	int start1 = str.lastIndexOf("m.b") + "m.".length();	112	int start1 = str.lastIndexOf("m.b") + "m.".length();
113	int end1 = start1 + "b".length();	113	int end1 = start1 + "b".length();
114	int start2 = str.lastIndexOf("MissingType2");	114	int start2 = str.lastIndexOf("MissingType2");
Lines 159-165 Link Here
159	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();	159	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
160	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);	160	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
161		161
162	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;	162	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
163	int start1 = str.lastIndexOf("m.b") + "m.".length();	163	int start1 = str.lastIndexOf("m.b") + "m.".length();
164	int end1 = start1 + "b".length();	164	int end1 = start1 + "b".length();
165	int start2 = str.lastIndexOf("MissingType2");	165	int start2 = str.lastIndexOf("MissingType2");
Lines 206-212 Link Here
206	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();	206	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
207	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);	207	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
208		208
209	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;	209	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
210	int start1 = str.lastIndexOf("m.b") + "m.".length();	210	int start1 = str.lastIndexOf("m.b") + "m.".length();
211	int end1 = start1 + "b".length();	211	int end1 = start1 + "b".length();
212	int start2 = str.lastIndexOf("MissingType<");	212	int start2 = str.lastIndexOf("MissingType<");
Lines 269-275 Link Here
269	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();	269	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
270	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);	270	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
271		271
272	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;	272	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
273	int start1 = str.lastIndexOf("m.b") + "m.".length();	273	int start1 = str.lastIndexOf("m.b") + "m.".length();
274	int end1 = start1 + "b".length();	274	int end1 = start1 + "b".length();
275	int start2 = str.lastIndexOf("MissingType1");	275	int start2 = str.lastIndexOf("MissingType1");
Lines 324-330 Link Here
324	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();	324	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
325	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);	325	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
326		326
327	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;	327	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
328	int start1 = str.lastIndexOf("m(0, 0).b") + "m(0, 0).".length();	328	int start1 = str.lastIndexOf("m(0, 0).b") + "m(0, 0).".length();
329	int end1 = start1 + "b".length();	329	int end1 = start1 + "b".length();
330	int start2 = str.lastIndexOf("MissingType");	330	int start2 = str.lastIndexOf("MissingType");
Lines 367-373 Link Here
367	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();	367	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
368	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);	368	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
369		369
370	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;	370	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
371	int start1 = str.lastIndexOf("m.b") + "m.".length();	371	int start1 = str.lastIndexOf("m.b") + "m.".length();
372	int end1 = start1 + "b".length();	372	int end1 = start1 + "b".length();
373	int start2 = str.lastIndexOf("MissingType");	373	int start2 = str.lastIndexOf("MissingType");
Lines 406-412 Link Here
406	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();	406	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
407	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);	407	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
408		408
409	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;	409	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
410	int start1 = str.lastIndexOf("m.b") + "m.".length();	410	int start1 = str.lastIndexOf("m.b") + "m.".length();
411	int end1 = start1 + "b".length();	411	int end1 = start1 + "b".length();
412	int start2 = str.lastIndexOf("MissingType");	412	int start2 = str.lastIndexOf("MissingType");
Lines 476-482 Link Here
476	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();	476	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
477	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);	477	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
478		478
479	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;	479	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
480	int start1 = str.lastIndexOf("m.b") + "m.".length();	480	int start1 = str.lastIndexOf("m.b") + "m.".length();
481	int end1 = start1 + "b".length();	481	int end1 = start1 + "b".length();
482	int start2 = str.lastIndexOf("MissingType");	482	int start2 = str.lastIndexOf("MissingType");
Lines 519-522 Link Here
519	"",	519	"",
520	requestor.getResults());	520	requestor.getResults());
521	}	521	}
		522	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=161204
		523	public void test0012() throws JavaModelException {
		524	this.workingCopies = new ICompilationUnit[3];
		525	this.workingCopies[0] = getWorkingCopy(
		526	"/Completion/src/test/Test.java",
		527	"package test;"+
		528	"public class Test {\n" +
		529	" void foo() {\n" +
		530	" MissingType m = null;\n" +
		531	" m.b\n" +
		532	" }\n" +
		533	"}\n");
		534
		535	this.workingCopies[1] = getWorkingCopy(
		536	"/Completion/src/missing1/MissingType.java",
		537	"package missing1;"+
		538	"public class MissingType<T> {\n" +
		539	" public void bar() {};\n" +
		540	"}\n");
		541
		542	this.workingCopies[2] = getWorkingCopy(
		543	"/Completion/src/missing2/MissingType.java",
		544	"package missing2;"+
		545	"public class MissingType {\n" +
		546	" public void bar() {};\n" +
		547	"}\n");
		548
		549	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
		550	requestor.allowAllRequiredProposals();
		551	String str = this.workingCopies[0].getSource();
		552	String completeBehind = "m.b";
		553	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
		554	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
		555
		556	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;
		557	int relevance2 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
		558	int start1 = str.lastIndexOf("m.b") + "m.".length();
		559	int end1 = start1 + "b".length();
		560	int start2 = str.lastIndexOf("MissingType");
		561	int end2 = start2 + "MissingType".length();
		562	assertResults(
		563	"bar[METHOD_REF]{bar(), Lmissing1.MissingType;, ()V, bar, null, ["+start1+", "+end1+"], " + (relevance1) + "}\n" +
		564	" MissingType<T>[TYPE_REF]{missing1.MissingType, missing1, Lmissing1.MissingType<TT;>;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n" +
		565	"bar[METHOD_REF]{bar(), Lmissing2.MissingType;, ()V, bar, null, ["+start1+", "+end1+"], " + (relevance2) + "}\n" +
		566	" MissingType[TYPE_REF]{missing2.MissingType, missing2, Lmissing2.MissingType;, null, null, ["+start2+", "+end2+"], " + (relevance2) + "}",
		567	requestor.getResults());
		568	}
522	}	569	}

Lines 35-41 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/MissingTypesGuesser.java (-8 / +8 lines)
35	TypeBinding guessedType,	35	TypeBinding guessedType,
36	Binding[] missingElements,	36	Binding[] missingElements,
37	int[] missingElementsStarts,	37	int[] missingElementsStarts,
38	int[] missingElementsEnds);	38	int[] missingElementsEnds,
		39	boolean hasProblems);
39		40
40	}	41	}
41		42
Lines 521-544 Link Here
521		522
522	nextSubstitution(substituedTypeNodes, subtitutions, substitutionsIndexes);	523	nextSubstitution(substituedTypeNodes, subtitutions, substitutionsIndexes);
523		524
524	this.problemFactory.hasProblems = false;	525
525	this.problemFactory.checkProblems = true;	526	this.problemFactory.startCheckingProblems();
526	TypeBinding guessedType = null;	527	TypeBinding guessedType = null;
527	switch (scope.kind) {	528	switch (scope.kind) {
528	case Scope.METHOD_SCOPE :	529	case Scope.METHOD_SCOPE :
529	case Scope.BLOCK_SCOPE :	530	case Scope.BLOCK_SCOPE :
530	resolutionCleaner.cleanUp(convertedType, (BlockScope)scope);	531	resolutionCleaner.cleanUp(convertedType, (BlockScope)scope);
531	convertedType.traverse(resolutionCleaner, (BlockScope)scope);
532	guessedType = convertedType.resolveType((BlockScope)scope);	532	guessedType = convertedType.resolveType((BlockScope)scope);
533	break;	533	break;
534	case Scope.CLASS_SCOPE :	534	case Scope.CLASS_SCOPE :
535	resolutionCleaner.cleanUp(convertedType, (ClassScope)scope);	535	resolutionCleaner.cleanUp(convertedType, (ClassScope)scope);
536	convertedType.traverse(resolutionCleaner, (ClassScope)scope);
537	guessedType = convertedType.resolveType((ClassScope)scope);	536	guessedType = convertedType.resolveType((ClassScope)scope);
538	break;	537	break;
539	}	538	}
540	this.problemFactory.checkProblems = false;	539	this.problemFactory.stopCheckingProblems();
541	if (!this.problemFactory.hasProblems) {	540	if (!this.problemFactory.hasForbiddenProblems) {
542	if (guessedType != null) {	541	if (guessedType != null) {
543	Binding[] missingElements = new Binding[length];	542	Binding[] missingElements = new Binding[length];
544	int[] missingElementsStarts = new int[length];	543	int[] missingElementsStarts = new int[length];
Lines 554-560 Link Here
554	guessedType.capture(scope, typeRef.sourceEnd),	553	guessedType.capture(scope, typeRef.sourceEnd),
555	missingElements,	554	missingElements,
556	missingElementsStarts,	555	missingElementsStarts,
557	missingElementsEnds);	556	missingElementsEnds,
		557	this.problemFactory.hasAllowedProblems);
558	}	558	}
559	}	559	}
560	}	560	}