Attachment #59058 for bug #174001

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

Lines 854-860 Link Here

(-)src/org/eclipse/jdt/core/tests/model/CompletionTests.java (-2 lines)
854	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);	854	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
855		855
856	assertResults(	856	assertResults(
857	"Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
858	"Exception[TYPE_REF]{Exception, java.lang, Ljava.lang.Exception;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +	857	"Exception[TYPE_REF]{Exception, java.lang, Ljava.lang.Exception;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
859	"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",	858	"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
860	requestor.getResults());	859	requestor.getResults());
Lines 9692-9698 Link Here
9692	requestor.getResults());	9691	requestor.getResults());
9693	} else {	9692	} else {
9694	assertResults(	9693	assertResults(
9695	"CompletionMemberType2[TYPE_REF]{CompletionMemberType2, test, Ltest.CompletionMemberType2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9696	"CompletionMemberType2.MemberException[TYPE_REF]{MemberException, test, Ltest.CompletionMemberType2$MemberException;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION+ R_NON_RESTRICTED)+"}",	9694	"CompletionMemberType2.MemberException[TYPE_REF]{MemberException, test, Ltest.CompletionMemberType2$MemberException;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION+ R_NON_RESTRICTED)+"}",
9697	requestor.getResults());	9695	requestor.getResults());
9698	}	9696	}

Lines 6343-6348 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java (-1 / +6 lines)
6343	findTypeParameters(token, scope);	6343	findTypeParameters(token, scope);
6344	}	6344	}
6345	}	6345	}
		6346
		6347	boolean isEmptyPrefix = token.length == 0;
6346		6348
6347	if (!skip && proposeType && this.unitScope != null) {	6349	if (!skip && proposeType && this.unitScope != null) {
6348	ReferenceBinding outerInvocationType = scope.enclosingSourceType();	6350	ReferenceBinding outerInvocationType = scope.enclosingSourceType();
Lines 6397-6402 Link Here
6397	if(!sourceType.isInterface() && !sourceType.isAnnotationType()) continue next;	6399	if(!sourceType.isInterface() && !sourceType.isAnnotationType()) continue next;
6398	} else if (this.assistNodeIsAnnotation) {	6400	} else if (this.assistNodeIsAnnotation) {
6399	if(!sourceType.isAnnotationType()) continue next;	6401	if(!sourceType.isAnnotationType()) continue next;
		6402	} else if (isEmptyPrefix && this.assistNodeIsException) {
		6403	if (sourceType.findSuperTypeErasingTo(TypeIds.T_JavaLangThrowable, true) == null) {
		6404	continue next;
		6405	}
6400	}	6406	}
6401		6407
6402	int relevance = computeBaseRelevance();	6408	int relevance = computeBaseRelevance();
Lines 6426-6432 Link Here
6426	this.findTypesFromStaticImports(token, scope, proposeAllMemberTypes, typesFound);	6432	this.findTypesFromStaticImports(token, scope, proposeAllMemberTypes, typesFound);
6427	}	6433	}
6428		6434
6429	boolean isEmptyPrefix = token.length == 0;
6430	if (isEmptyPrefix && !this.assistNodeIsAnnotation) {	6435	if (isEmptyPrefix && !this.assistNodeIsAnnotation) {
6431	if(proposeType && this.expectedTypesPtr > -1) {	6436	if(proposeType && this.expectedTypesPtr > -1) {
6432	next : for (int i = 0; i <= this.expectedTypesPtr; i++) {	6437	next : for (int i = 0; i <= this.expectedTypesPtr; i++) {

Return to bug 174001