Attachment #58244 for bug #6930

Lines 71-78 Link Here

(-)src/org/eclipse/jdt/core/tests/model/CompletionTestsRequestor2.java (-2 / +6 lines)
71	}	71	}
72		72
73	public void allowAllRequiredProposals() {	73	public void allowAllRequiredProposals() {
74	for (int i = CompletionProposal.ANONYMOUS_CLASS_DECLARATION; i <= CompletionProposal.TYPE_IMPORT; i++) {	74	for (int i = CompletionProposal.ANONYMOUS_CLASS_DECLARATION; i <= CompletionProposal.ALLOCATION_TYPE_REF; i++) {
75	for (int j = CompletionProposal.ANONYMOUS_CLASS_DECLARATION; j <= CompletionProposal.TYPE_IMPORT; j++) {	75	for (int j = CompletionProposal.ANONYMOUS_CLASS_DECLARATION; j <= CompletionProposal.ALLOCATION_TYPE_REF; j++) {
76	this.setAllowsRequiredProposals(i, j, true);	76	this.setAllowsRequiredProposals(i, j, true);
77	}	77	}
78	}	78	}
Lines 298-303 Link Here
298	case CompletionProposal.TYPE_IMPORT :	298	case CompletionProposal.TYPE_IMPORT :
299	buffer.append("TYPE_IMPORT"); //$NON-NLS-1$	299	buffer.append("TYPE_IMPORT"); //$NON-NLS-1$
300	break;	300	break;
		301	case CompletionProposal.ALLOCATION_TYPE_REF :
		302	buffer.append("ALLOCATION_TYPE_REF"); //$NON-NLS-1$
		303	break;
301	default :	304	default :
302	buffer.append("PROPOSAL"); //$NON-NLS-1$	305	buffer.append("PROPOSAL"); //$NON-NLS-1$
303	break;	306	break;
Lines 423-428 Link Here
423	case CompletionProposal.TYPE_REF :	426	case CompletionProposal.TYPE_REF :
424	case CompletionProposal.TYPE_IMPORT :	427	case CompletionProposal.TYPE_IMPORT :
425	case CompletionProposal.JAVADOC_TYPE_REF :	428	case CompletionProposal.JAVADOC_TYPE_REF :
		429	case CompletionProposal.ALLOCATION_TYPE_REF :
426	return new String(Signature.getSignatureSimpleName(proposal.getSignature()));	430	return new String(Signature.getSignatureSimpleName(proposal.getSignature()));
427	case CompletionProposal.FIELD_REF :	431	case CompletionProposal.FIELD_REF :
428	case CompletionProposal.KEYWORD:	432	case CompletionProposal.KEYWORD:

Lines 2678-2684 Link Here

(-)src/org/eclipse/jdt/core/tests/model/CompletionTests.java (-11 / +30 lines)
2678	} else {	2678	} else {
2679	assertResults(	2679	assertResults(
2680	"CompletionEmptyTypeName1[TYPE_REF]{CompletionEmptyTypeName1, , LCompletionEmptyTypeName1;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}\n"+	2680	"CompletionEmptyTypeName1[TYPE_REF]{CompletionEmptyTypeName1, , LCompletionEmptyTypeName1;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}\n"+
2681	"A[TYPE_REF]{A, , LA;, null, null, " +(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",	2681	"CompletionEmptyTypeName1[ALLOCATION_TYPE_REF]{CompletionEmptyTypeName1, , LCompletionEmptyTypeName1;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_ALLOCATION +R_NON_RESTRICTED)+"}\n"+
		2682	"A[TYPE_REF]{A, , LA;, null, null, " +(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
		2683	"A[ALLOCATION_TYPE_REF]{A, , LA;, null, null, " +(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_ALLOCATION + R_NON_RESTRICTED)+"}",
2682	requestor.getResults());	2684	requestor.getResults());
2683	}	2685	}
2684	}	2686	}
Lines 2862-2873 Link Here
2862	requestor.getContext());	2864	requestor.getContext());
2863	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {	2865	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
2864	assertResults(	2866	assertResults(
2865	"AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",	2867	"AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
		2868	"AType[ALLOCATION_TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_ALLOCATION + R_NON_RESTRICTED) + "}",
2866	requestor.getResults());	2869	requestor.getResults());
2867	} else {	2870	} else {
2868	assertResults(	2871	assertResults(
2869	"Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +	2872	"Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
2870	"AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",	2873	"Test[ALLOCATION_TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_ALLOCATION + R_NON_RESTRICTED) + "}\n" +
		2874	"AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
		2875	"AType[ALLOCATION_TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_ALLOCATION + R_NON_RESTRICTED) + "}",
2871	requestor.getResults());	2876	requestor.getResults());
2872	}	2877	}
2873	} finally {	2878	} finally {
Lines 2964-2975 Link Here
2964		2969
2965	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {	2970	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
2966	assertResults(	2971	assertResults(
2967	"AInterface[TYPE_REF]{AInterface, test, Ltest.AInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",	2972	"AInterface[TYPE_REF]{AInterface, test, Ltest.AInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
		2973	"AInterface[ALLOCATION_TYPE_REF]{AInterface, test, Ltest.AInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_ALLOCATION + R_NON_RESTRICTED) + "}",
2968	requestor.getResults());	2974	requestor.getResults());
2969	} else {	2975	} else {
2970	assertResults(	2976	assertResults(
2971	"Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +	2977	"Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
2972	"AInterface[TYPE_REF]{AInterface, test, Ltest.AInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",	2978	"Test[ALLOCATION_TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_ALLOCATION + R_NON_RESTRICTED) + "}\n" +
		2979	"AInterface[TYPE_REF]{AInterface, test, Ltest.AInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
		2980	"AInterface[ALLOCATION_TYPE_REF]{AInterface, test, Ltest.AInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_ALLOCATION + R_NON_RESTRICTED) + "}",
2973	requestor.getResults());	2981	requestor.getResults());
2974	}	2982	}
2975	} finally {	2983	} finally {
Lines 3090-3097 Link Here
3090	assertResults(	3098	assertResults(
3091	"ABC[TYPE_REF]{p1.ABC, p1, Lp1.ABC;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +	3099	"ABC[TYPE_REF]{p1.ABC, p1, Lp1.ABC;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
3092	"ABC[TYPE_REF]{p2.ABC, p2, Lp2.ABC;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +	3100	"ABC[TYPE_REF]{p2.ABC, p2, Lp2.ABC;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
		3101	"ABC[ALLOCATION_TYPE_REF]{p1.ABC, p1, Lp1.ABC;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_ALLOCATION + R_NON_RESTRICTED)+"}\n" +
		3102	"ABC[ALLOCATION_TYPE_REF]{p2.ABC, p2, Lp2.ABC;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_ALLOCATION + R_NON_RESTRICTED)+"}\n" +
3093	"A3[TYPE_REF]{A3, , LA3;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +	3103	"A3[TYPE_REF]{A3, , LA3;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
3094	"A[TYPE_REF]{A, , LA;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",	3104	"A3[ALLOCATION_TYPE_REF]{A3, , LA3;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_ALLOCATION + R_NON_RESTRICTED)+"}\n" +
		3105	"A[TYPE_REF]{A, , LA;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
		3106	"A[ALLOCATION_TYPE_REF]{A, , LA;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_ALLOCATION + R_NON_RESTRICTED)+"}",
3095	requestor.getResults());	3107	requestor.getResults());
3096	}	3108	}
3097		3109
Lines 9581-9587 Link Here
9581	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);	9593	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
9582		9594
9583	assertResults(	9595	assertResults(
9584	"CompletionMemberType.Y[TYPE_REF]{Y, , LCompletionMemberType$Y;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_EXACT_NAME+ R_UNQUALIFIED + R_NON_RESTRICTED)+"}",	9596	"CompletionMemberType.Y[TYPE_REF]{Y, , LCompletionMemberType$Y;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_EXACT_NAME+ R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
		9597	"CompletionMemberType.Y[ALLOCATION_TYPE_REF]{Y, , LCompletionMemberType$Y;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_EXACT_NAME+ R_UNQUALIFIED + R_ALLOCATION + R_NON_RESTRICTED)+"}",
9585	requestor.getResults());	9598	requestor.getResults());
9586	}	9599	}
9587	public void testCompletionMemberType2() throws JavaModelException {	9600	public void testCompletionMemberType2() throws JavaModelException {
Lines 9609-9615 Link Here
9609	} else {	9622	} else {
9610	assertResults(	9623	assertResults(
9611	"CompletionMemberType2[TYPE_REF]{CompletionMemberType2, test, Ltest.CompletionMemberType2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+	9624	"CompletionMemberType2[TYPE_REF]{CompletionMemberType2, test, Ltest.CompletionMemberType2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9612	"CompletionMemberType2.MemberException[TYPE_REF]{MemberException, test, Ltest.CompletionMemberType2$MemberException;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION+ R_NON_RESTRICTED)+"}",	9625	"CompletionMemberType2[ALLOCATION_TYPE_REF]{CompletionMemberType2, test, Ltest.CompletionMemberType2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + +R_ALLOCATION + R_NON_RESTRICTED)+"}\n"+
		9626	"CompletionMemberType2.MemberException[TYPE_REF]{MemberException, test, Ltest.CompletionMemberType2$MemberException;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION+ R_NON_RESTRICTED)+"}\n"+
		9627	"CompletionMemberType2.MemberException[ALLOCATION_TYPE_REF]{MemberException, test, Ltest.CompletionMemberType2$MemberException;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION+ R_ALLOCATION + R_NON_RESTRICTED)+"}",
9613	requestor.getResults());	9628	requestor.getResults());
9614	}	9629	}
9615	}	9630	}
Lines 9632-9638 Link Here
9632	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);	9647	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
9633		9648
9634	assertResults(	9649	assertResults(
9635	"CompletionMemberType3.MemberException[TYPE_REF]{MemberException, test, Ltest.CompletionMemberType3$MemberException;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION+ R_UNQUALIFIED + R_NON_RESTRICTED) +"}",	9650	"CompletionMemberType3.MemberException[TYPE_REF]{MemberException, test, Ltest.CompletionMemberType3$MemberException;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION+ R_UNQUALIFIED + R_NON_RESTRICTED) +"}\n"+
		9651	"CompletionMemberType3.MemberException[ALLOCATION_TYPE_REF]{MemberException, test, Ltest.CompletionMemberType3$MemberException;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION+ R_UNQUALIFIED + R_ALLOCATION + R_NON_RESTRICTED) +"}",
9636	requestor.getResults());	9652	requestor.getResults());
9637	}	9653	}
9638	public void testCompletionMessageSendIsParent1() throws JavaModelException {	9654	public void testCompletionMessageSendIsParent1() throws JavaModelException {
Lines 10404-10415 Link Here
10404		10420
10405	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {	10421	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
10406	assertResults(	10422	assertResults(
10407	"PX[TYPE_REF]{pack2.PX, pack2, Lpack2.PX;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED)+ "}",	10423	"PX[TYPE_REF]{pack2.PX, pack2, Lpack2.PX;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED)+"}\n" +
		10424	"PX[ALLOCATION_TYPE_REF]{pack2.PX, pack2, Lpack2.PX;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE+ R_ALLOCATION + R_NON_RESTRICTED)+ "}",
10408	requestor.getResults());	10425	requestor.getResults());
10409	} else {	10426	} else {
10410	assertResults(	10427	assertResults(
10411	"CompletionQualifiedExpectedType[TYPE_REF]{CompletionQualifiedExpectedType, test, Ltest.CompletionQualifiedExpectedType;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +	10428	"CompletionQualifiedExpectedType[TYPE_REF]{CompletionQualifiedExpectedType, test, Ltest.CompletionQualifiedExpectedType;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
10412	"PX[TYPE_REF]{pack2.PX, pack2, Lpack2.PX;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED)+ "}",	10429	"CompletionQualifiedExpectedType[ALLOCATION_TYPE_REF]{CompletionQualifiedExpectedType, test, Ltest.CompletionQualifiedExpectedType;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_ALLOCATION + R_NON_RESTRICTED)+"}\n" +
		10430	"PX[TYPE_REF]{pack2.PX, pack2, Lpack2.PX;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED)+"}\n" +
		10431	"PX[ALLOCATION_TYPE_REF]{pack2.PX, pack2, Lpack2.PX;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE+ R_ALLOCATION + R_NON_RESTRICTED)+ "}",
10413	requestor.getResults());	10432	requestor.getResults());
10414	}	10433	}
10415	}	10434	}




				result.proposals);
    } else {
    	assertResults(
    			"Test<ZT>[TYPE_REF]{Test, test0232, Ltest0232.Test<TZT;>;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n"+
				"Test<ZT>[ALLOCATION_TYPE_REF]{Test, test0232, Ltest0232.Test<TZT;>;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_ALLOCATION + R_NON_RESTRICTED) + "}",
				result.proposals);
    }
}

            result.context);

	assertResults(
			"Test0233Z<ZT>[TYPE_REF]{Test0233Z, test0233, Ltest0233.Test0233Z<TZT;>;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n"+
			"Test0233Z<ZT>[ALLOCATION_TYPE_REF]{Test0233Z, test0233, Ltest0233.Test0233Z<TZT;>;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_UNQUALIFIED + R_ALLOCATION + R_NON_RESTRICTED) + "}",
			result.proposals);
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=97860

Lines 41-44 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/RelevanceConstants.java (+1 lines)
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	int R_NO_PROBLEMS = 1;
		44	int R_ALLOCATION = 1;
44	}	45	}




		
		boolean proposeType =
			!this.requestor.isIgnored(CompletionProposal.TYPE_REF) ||
			!this.requestor.isIgnored(CompletionProposal.JAVADOC_TYPE_REF) ||
			!this.requestor.isIgnored(CompletionProposal.ALLOCATION_TYPE_REF);
		
		boolean proposeAllMemberTypes = !this.assistNodeIsConstructor;
		

									this.printDebug(proposal);
								}
							}
							if(this.assistNodeIsConstructor && !this.requestor.isIgnored(CompletionProposal.ALLOCATION_TYPE_REF)) {
								CompletionProposal proposal = this.createProposal(CompletionProposal.ALLOCATION_TYPE_REF, this.actualCompletionPosition);
								proposal.setDeclarationSignature(packageName);
								proposal.setSignature(getSignature(refBinding));
								proposal.setPackageName(packageName);
								proposal.setTypeName(typeName);
								proposal.setCompletion(completionName);
								proposal.setFlags(refBinding.modifiers);
								proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
								proposal.setRelevance(relevance+R_ALLOCATION);
								proposal.setAccessibility(accessibility);
								this.requestor.accept(proposal);
								if(DEBUG) {
									this.printDebug(proposal);
								}
							}
						}
					}
				}


		boolean proposeType =
			!this.requestor.isIgnored(CompletionProposal.TYPE_REF) ||
			!this.requestor.isIgnored(CompletionProposal.JAVADOC_TYPE_REF) ||
			!this.requestor.isIgnored(CompletionProposal.ALLOCATION_TYPE_REF);
		
		char[] qualifiedName =
			CharOperation.concatWith(packageBinding.compoundName, token, '.');

									this.printDebug(proposal);
								}
							}
							if(this.assistNodeIsConstructor && !this.requestor.isIgnored(CompletionProposal.ALLOCATION_TYPE_REF)) {
								CompletionProposal proposal = this.createProposal(CompletionProposal.ALLOCATION_TYPE_REF, this.actualCompletionPosition);
								proposal.setDeclarationSignature(typeBinding.qualifiedPackageName());
								proposal.setSignature(getSignature(typeBinding));
								proposal.setPackageName(typeBinding.qualifiedPackageName());
								proposal.setTypeName(typeBinding.qualifiedSourceName());
								proposal.setCompletion(typeBinding.sourceName());
								proposal.setFlags(typeBinding.modifiers);
								proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
								proposal.setRelevance(relevance);
								this.requestor.accept(proposal);
								if(DEBUG) {
									this.printDebug(proposal);
								}
							}
						}
					}
				}

			}
		}
		
		// Create a allocation type reference proposal if necessary
		if(this.assistNodeIsConstructor && !this.requestor.isIgnored(CompletionProposal.ALLOCATION_TYPE_REF)) {
			CompletionProposal proposal = CompletionProposal.create(CompletionProposal.ALLOCATION_TYPE_REF, this.actualCompletionPosition - this.offset);
			proposal.nameLookup = this.nameEnvironment.nameLookup;
			proposal.completionEngine = this;
			proposal.setDeclarationSignature(packageName);
			proposal.setSignature(createNonGenericTypeSignature(packageName, typeName));
			proposal.setPackageName(packageName);
			proposal.setTypeName(typeName);
			proposal.setCompletion(completionName);
			proposal.setFlags(modifiers);
			proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
			proposal.setRelevance(relevance+R_ALLOCATION);
			proposal.setAccessibility(accessibility);
			this.requestor.accept(proposal);	
			if(DEBUG) {
				this.printDebug(proposal);
			}
		}
		
		// Create javadoc text proposal if necessary
		if ((this.assistNodeInJavadoc & CompletionOnJavadoc.TEXT) != 0 && !this.requestor.isIgnored(CompletionProposal.JAVADOC_TYPE_REF)) {
			char[] javadocCompletion= inlineTagCompletion(completionName, JavadocTagConstants.TAG_LINK);

			}
		}
		
		// Create a allocation type reference proposal if necessary
		if(this.assistNodeIsConstructor && !this.requestor.isIgnored(CompletionProposal.ALLOCATION_TYPE_REF)) {
			CompletionProposal proposal = CompletionProposal.create(CompletionProposal.ALLOCATION_TYPE_REF, this.actualCompletionPosition - this.offset);
			proposal.nameLookup = this.nameEnvironment.nameLookup;
			proposal.completionEngine = this;
			proposal.setDeclarationSignature(refBinding.qualifiedPackageName());
			proposal.setSignature(getSignature(refBinding));
			proposal.setPackageName(refBinding.qualifiedPackageName());
			proposal.setTypeName(typeName);
			proposal.setCompletion(completionName);
			proposal.setFlags(refBinding.modifiers);
			proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
			proposal.setRelevance(relevance+R_ALLOCATION);
			this.requestor.accept(proposal);
			if(DEBUG) {
				this.printDebug(proposal);
			}
		}
		
		// Create javadoc text proposal if necessary
		if ((this.assistNodeInJavadoc & CompletionOnJavadoc.TEXT) != 0 && !this.requestor.isIgnored(CompletionProposal.JAVADOC_TYPE_REF)) {
			char[] javadocCompletion= inlineTagCompletion(completionName, JavadocTagConstants.TAG_LINK);

			case CompletionProposal.TYPE_IMPORT :
				buffer.append("TYPE_IMPORT"); //$NON-NLS-1$
				break;
			case CompletionProposal.ALLOCATION_TYPE_REF :
				buffer.append("ALLOCATION_TYPE_REF"); //$NON-NLS-1$
				break;
			default :
				buffer.append("PROPOSAL"); //$NON-NLS-1$
				break;

Lines 155-160 Link Here

(-)eval/org/eclipse/jdt/internal/eval/CodeSnippetToCuMapper.java (+1 lines)
155	public void accept(CompletionProposal proposal) {	155	public void accept(CompletionProposal proposal) {
156	switch(proposal.getKind()) {	156	switch(proposal.getKind()) {
157	case CompletionProposal.TYPE_REF:	157	case CompletionProposal.TYPE_REF:
		158	case CompletionProposal.ALLOCATION_TYPE_REF:
158	int flags = proposal.getFlags();	159	int flags = proposal.getFlags();
159	if((flags & Flags.AccEnum) == 0 &&	160	if((flags & Flags.AccEnum) == 0 &&
160	(flags & Flags.AccInterface) == 0) {	161	(flags & Flags.AccInterface) == 0) {

Lines 725-730 Link Here

(-)model/org/eclipse/jdt/core/CompletionProposal.java (-1 / +6 lines)
725	*/	725	*/
726	public static final int TYPE_IMPORT = 23;	726	public static final int TYPE_IMPORT = 23;
727		727
		728	public static final int ALLOCATION_TYPE_REF = 24;
		729
728	/**	730	/**
729	* First valid completion kind.	731	* First valid completion kind.
730	*	732	*
Lines 737-743 Link Here
737	*	739	*
738	* @since 3.1	740	* @since 3.1
739	*/	741	*/
740	protected static final int LAST_KIND = TYPE_IMPORT;	742	protected static final int LAST_KIND = ALLOCATION_TYPE_REF;
741		743
742	/**	744	/**
743	* Kind of completion request.	745	* Kind of completion request.
Lines 2026-2031 Link Here
2026	case CompletionProposal.TYPE_IMPORT :	2028	case CompletionProposal.TYPE_IMPORT :
2027	buffer.append("TYPE_IMPORT"); //$NON-NLS-1$	2029	buffer.append("TYPE_IMPORT"); //$NON-NLS-1$
2028	break;	2030	break;
		2031	case CompletionProposal.ALLOCATION_TYPE_REF :
		2032	buffer.append("ALLOCATION_TYPE_REF"); //$NON-NLS-1$
		2033	break;
2029	default :	2034	default :
2030	buffer.append("PROPOSAL"); //$NON-NLS-1$	2035	buffer.append("PROPOSAL"); //$NON-NLS-1$
2031	break;	2036	break;

Return to bug 6930

Lines 7595-7601 Link Here

(-)src/org/eclipse/jdt/core/tests/model/CompletionTests_1_5.java (-2 / +4 lines)
7595	result.proposals);	7595	result.proposals);
7596	} else {	7596	} else {
7597	assertResults(	7597	assertResults(
7598	"Test<ZT>[TYPE_REF]{Test, test0232, Ltest0232.Test<TZT;>;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",	7598	"Test<ZT>[TYPE_REF]{Test, test0232, Ltest0232.Test<TZT;>;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n"+
		7599	"Test<ZT>[ALLOCATION_TYPE_REF]{Test, test0232, Ltest0232.Test<TZT;>;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_ALLOCATION + R_NON_RESTRICTED) + "}",
7599	result.proposals);	7600	result.proposals);
7600	}	7601	}
7601	}	7602	}
Lines 7621-7627 Link Here
7621	result.context);	7622	result.context);
7622		7623
7623	assertResults(	7624	assertResults(
7624	"Test0233Z<ZT>[TYPE_REF]{Test0233Z, test0233, Ltest0233.Test0233Z<TZT;>;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_UNQUALIFIED + R_NON_RESTRICTED) + "}",	7625	"Test0233Z<ZT>[TYPE_REF]{Test0233Z, test0233, Ltest0233.Test0233Z<TZT;>;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n"+
		7626	"Test0233Z<ZT>[ALLOCATION_TYPE_REF]{Test0233Z, test0233, Ltest0233.Test0233Z<TZT;>;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_UNQUALIFIED + R_ALLOCATION + R_NON_RESTRICTED) + "}",
7625	result.proposals);	7627	result.proposals);
7626	}	7628	}
7627	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=97860	7629	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=97860

Lines 6322-6328 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java (-2 / +77 lines)
6322		6322
6323	boolean proposeType =	6323	boolean proposeType =
6324	!this.requestor.isIgnored(CompletionProposal.TYPE_REF) \|\|	6324	!this.requestor.isIgnored(CompletionProposal.TYPE_REF) \|\|
6325	!this.requestor.isIgnored(CompletionProposal.JAVADOC_TYPE_REF);	6325	!this.requestor.isIgnored(CompletionProposal.JAVADOC_TYPE_REF) \|\|
		6326	!this.requestor.isIgnored(CompletionProposal.ALLOCATION_TYPE_REF);
6326		6327
6327	boolean proposeAllMemberTypes = !this.assistNodeIsConstructor;	6328	boolean proposeAllMemberTypes = !this.assistNodeIsConstructor;
6328		6329
Lines 6514-6519 Link Here
6514	this.printDebug(proposal);	6515	this.printDebug(proposal);
6515	}	6516	}
6516	}	6517	}
		6518	if(this.assistNodeIsConstructor && !this.requestor.isIgnored(CompletionProposal.ALLOCATION_TYPE_REF)) {
		6519	CompletionProposal proposal = this.createProposal(CompletionProposal.ALLOCATION_TYPE_REF, this.actualCompletionPosition);
		6520	proposal.setDeclarationSignature(packageName);
		6521	proposal.setSignature(getSignature(refBinding));
		6522	proposal.setPackageName(packageName);
		6523	proposal.setTypeName(typeName);
		6524	proposal.setCompletion(completionName);
		6525	proposal.setFlags(refBinding.modifiers);
		6526	proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
		6527	proposal.setRelevance(relevance+R_ALLOCATION);
		6528	proposal.setAccessibility(accessibility);
		6529	this.requestor.accept(proposal);
		6530	if(DEBUG) {
		6531	this.printDebug(proposal);
		6532	}
		6533	}
6517	}	6534	}
6518	}	6535	}
6519	}	6536	}
Lines 6566-6572 Link Here
6566		6583
6567	boolean proposeType =	6584	boolean proposeType =
6568	!this.requestor.isIgnored(CompletionProposal.TYPE_REF) \|\|	6585	!this.requestor.isIgnored(CompletionProposal.TYPE_REF) \|\|
6569	!this.requestor.isIgnored(CompletionProposal.JAVADOC_TYPE_REF);	6586	!this.requestor.isIgnored(CompletionProposal.JAVADOC_TYPE_REF) \|\|
		6587	!this.requestor.isIgnored(CompletionProposal.ALLOCATION_TYPE_REF);
6570		6588
6571	char[] qualifiedName =	6589	char[] qualifiedName =
6572	CharOperation.concatWith(packageBinding.compoundName, token, '.');	6590	CharOperation.concatWith(packageBinding.compoundName, token, '.');
Lines 6754-6759 Link Here
6754	this.printDebug(proposal);	6772	this.printDebug(proposal);
6755	}	6773	}
6756	}	6774	}
		6775	if(this.assistNodeIsConstructor && !this.requestor.isIgnored(CompletionProposal.ALLOCATION_TYPE_REF)) {
		6776	CompletionProposal proposal = this.createProposal(CompletionProposal.ALLOCATION_TYPE_REF, this.actualCompletionPosition);
		6777	proposal.setDeclarationSignature(typeBinding.qualifiedPackageName());
		6778	proposal.setSignature(getSignature(typeBinding));
		6779	proposal.setPackageName(typeBinding.qualifiedPackageName());
		6780	proposal.setTypeName(typeBinding.qualifiedSourceName());
		6781	proposal.setCompletion(typeBinding.sourceName());
		6782	proposal.setFlags(typeBinding.modifiers);
		6783	proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
		6784	proposal.setRelevance(relevance);
		6785	this.requestor.accept(proposal);
		6786	if(DEBUG) {
		6787	this.printDebug(proposal);
		6788	}
		6789	}
6757	}	6790	}
6758	}	6791	}
6759	}	6792	}
Lines 8192-8197 Link Here
8192	}	8225	}
8193	}	8226	}
8194		8227
		8228	// Create a allocation type reference proposal if necessary
		8229	if(this.assistNodeIsConstructor && !this.requestor.isIgnored(CompletionProposal.ALLOCATION_TYPE_REF)) {
		8230	CompletionProposal proposal = CompletionProposal.create(CompletionProposal.ALLOCATION_TYPE_REF, this.actualCompletionPosition - this.offset);
		8231	proposal.nameLookup = this.nameEnvironment.nameLookup;
		8232	proposal.completionEngine = this;
		8233	proposal.setDeclarationSignature(packageName);
		8234	proposal.setSignature(createNonGenericTypeSignature(packageName, typeName));
		8235	proposal.setPackageName(packageName);
		8236	proposal.setTypeName(typeName);
		8237	proposal.setCompletion(completionName);
		8238	proposal.setFlags(modifiers);
		8239	proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
		8240	proposal.setRelevance(relevance+R_ALLOCATION);
		8241	proposal.setAccessibility(accessibility);
		8242	this.requestor.accept(proposal);
		8243	if(DEBUG) {
		8244	this.printDebug(proposal);
		8245	}
		8246	}
		8247
8195	// Create javadoc text proposal if necessary	8248	// Create javadoc text proposal if necessary
8196	if ((this.assistNodeInJavadoc & CompletionOnJavadoc.TEXT) != 0 && !this.requestor.isIgnored(CompletionProposal.JAVADOC_TYPE_REF)) {	8249	if ((this.assistNodeInJavadoc & CompletionOnJavadoc.TEXT) != 0 && !this.requestor.isIgnored(CompletionProposal.JAVADOC_TYPE_REF)) {
8197	char[] javadocCompletion= inlineTagCompletion(completionName, JavadocTagConstants.TAG_LINK);	8250	char[] javadocCompletion= inlineTagCompletion(completionName, JavadocTagConstants.TAG_LINK);
Lines 8239-8244 Link Here
8239	}	8292	}
8240	}	8293	}
8241		8294
		8295	// Create a allocation type reference proposal if necessary
		8296	if(this.assistNodeIsConstructor && !this.requestor.isIgnored(CompletionProposal.ALLOCATION_TYPE_REF)) {
		8297	CompletionProposal proposal = CompletionProposal.create(CompletionProposal.ALLOCATION_TYPE_REF, this.actualCompletionPosition - this.offset);
		8298	proposal.nameLookup = this.nameEnvironment.nameLookup;
		8299	proposal.completionEngine = this;
		8300	proposal.setDeclarationSignature(refBinding.qualifiedPackageName());
		8301	proposal.setSignature(getSignature(refBinding));
		8302	proposal.setPackageName(refBinding.qualifiedPackageName());
		8303	proposal.setTypeName(typeName);
		8304	proposal.setCompletion(completionName);
		8305	proposal.setFlags(refBinding.modifiers);
		8306	proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
		8307	proposal.setRelevance(relevance+R_ALLOCATION);
		8308	this.requestor.accept(proposal);
		8309	if(DEBUG) {
		8310	this.printDebug(proposal);
		8311	}
		8312	}
		8313
8242	// Create javadoc text proposal if necessary	8314	// Create javadoc text proposal if necessary
8243	if ((this.assistNodeInJavadoc & CompletionOnJavadoc.TEXT) != 0 && !this.requestor.isIgnored(CompletionProposal.JAVADOC_TYPE_REF)) {	8315	if ((this.assistNodeInJavadoc & CompletionOnJavadoc.TEXT) != 0 && !this.requestor.isIgnored(CompletionProposal.JAVADOC_TYPE_REF)) {
8244	char[] javadocCompletion= inlineTagCompletion(completionName, JavadocTagConstants.TAG_LINK);	8316	char[] javadocCompletion= inlineTagCompletion(completionName, JavadocTagConstants.TAG_LINK);
Lines 8395-8400 Link Here
8395	case CompletionProposal.TYPE_IMPORT :	8467	case CompletionProposal.TYPE_IMPORT :
8396	buffer.append("TYPE_IMPORT"); //$NON-NLS-1$	8468	buffer.append("TYPE_IMPORT"); //$NON-NLS-1$
8397	break;	8469	break;
		8470	case CompletionProposal.ALLOCATION_TYPE_REF :
		8471	buffer.append("ALLOCATION_TYPE_REF"); //$NON-NLS-1$
		8472	break;
8398	default :	8473	default :
8399	buffer.append("PROPOSAL"); //$NON-NLS-1$	8474	buffer.append("PROPOSAL"); //$NON-NLS-1$
8400	break;	8475	break;