Attachment #67013 for bug #6930

Lines 43-46 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/RelevanceConstants.java (+1 lines)
43	int R_NO_PROBLEMS = 1;	43	int R_NO_PROBLEMS = 1;
44	int R_RESOLVED = 1;	44	int R_RESOLVED = 1;
45	int R_TARGET = 5;	45	int R_TARGET = 5;
		46	int R_CONSTRUCTOR = 5;
46	}	47	}

Lines 438-444 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java (-44 / +325 lines)
438	acceptedTypes.add(new AcceptedType(packageName, simpleTypeName, enclosingTypeNames, modifiers, accessibility));	438	acceptedTypes.add(new AcceptedType(packageName, simpleTypeName, enclosingTypeNames, modifiers, accessibility));
439	}	439	}
440		440
441	private void acceptTypes(Scope scope) {	441	private void acceptTypes(boolean proposeConstructor, InvocationSite invocationSite, Scope scope) {
442	if(this.acceptedTypes == null) return;	442	if(this.acceptedTypes == null) return;
443		443
444	int length = this.acceptedTypes.size();	444	int length = this.acceptedTypes.size();
Lines 515-520 Link Here
515	typeName,	515	typeName,
516	fullyQualifiedName,	516	fullyQualifiedName,
517	!CharOperation.equals(fullyQualifiedName, importName[1]),	517	!CharOperation.equals(fullyQualifiedName, importName[1]),
		518	proposeConstructor,
		519	invocationSite,
518	scope);	520	scope);
519	continue next;	521	continue next;
520	}	522	}
Lines 530-535 Link Here
530	typeName,	532	typeName,
531	fullyQualifiedName,	533	fullyQualifiedName,
532	false,	534	false,
		535	proposeConstructor,
		536	invocationSite,
533	scope);	537	scope);
534	continue next;	538	continue next;
535	} else {	539	} else {
Lines 615-620 Link Here
615	typeName,	619	typeName,
616	fullyQualifiedName,	620	fullyQualifiedName,
617	true,	621	true,
		622	proposeConstructor,
		623	invocationSite,
618	scope);	624	scope);
619	}	625	}
620	}	626	}
Lines 634-639 Link Here
634	value.qualifiedTypeName,	640	value.qualifiedTypeName,
635	value.fullyQualifiedName,	641	value.fullyQualifiedName,
636	value.mustBeQualified,	642	value.mustBeQualified,
		643	proposeConstructor,
		644	invocationSite,
637	scope);	645	scope);
638	}	646	}
639	}	647	}
Lines 697-703 Link Here
697	return true;	705	return true;
698	}	706	}
699		707
700	private void proposeType(char[] packageName, char[] simpleTypeName, int modifiers, int accessibility, char[] typeName, char[] fullyQualifiedName, boolean isQualified, Scope scope) {	708	private void proposeType(
		709	char[] packageName,
		710	char[] simpleTypeName,
		711	int modifiers,
		712	int accessibility,
		713	char[] typeName,
		714	char[] fullyQualifiedName,
		715	boolean isQualified,
		716	boolean proposeConstructor,
		717	InvocationSite invocationSite,
		718	Scope scope) {
701	char[] completionName = fullyQualifiedName;	719	char[] completionName = fullyQualifiedName;
702	if(isQualified) {	720	if(isQualified) {
703	if (packageName == null \|\| packageName.length == 0)	721	if (packageName == null \|\| packageName.length == 0)
Lines 707-713 Link Here
707	completionName = simpleTypeName;	725	completionName = simpleTypeName;
708	}	726	}
709		727
710	TypeBinding guessedType = null;	728	TypeBinding guessedAnnotationType = null;
711	if ((modifiers & ClassFileConstants.AccAnnotation) != 0 &&	729	if ((modifiers & ClassFileConstants.AccAnnotation) != 0 &&
712	this.assistNodeIsAnnotation &&	730	this.assistNodeIsAnnotation &&
713	(this.targetedElement & TagBits.AnnotationTargetMASK) != 0) {	731	(this.targetedElement & TagBits.AnnotationTargetMASK) != 0) {
Lines 723-738 Link Here
723	switch (scope.kind) {	741	switch (scope.kind) {
724	case Scope.METHOD_SCOPE :	742	case Scope.METHOD_SCOPE :
725	case Scope.BLOCK_SCOPE :	743	case Scope.BLOCK_SCOPE :
726	guessedType = ref.resolveType((BlockScope)scope);	744	guessedAnnotationType = ref.resolveType((BlockScope)scope);
727	break;	745	break;
728	case Scope.CLASS_SCOPE :	746	case Scope.CLASS_SCOPE :
729	guessedType = ref.resolveType((ClassScope)scope);	747	guessedAnnotationType = ref.resolveType((ClassScope)scope);
730	break;	748	break;
731	}	749	}
732		750
733	if (!guessedType.isValidBinding()) return;	751	if (!guessedAnnotationType.isValidBinding()) return;
734		752
735	if (!hasPossibleAnnotationTarget(guessedType, scope)) return;	753	if (!hasPossibleAnnotationTarget(guessedAnnotationType, scope)) return;
736	}	754	}
737		755
738	int relevance = computeBaseRelevance();	756	int relevance = computeBaseRelevance();
Lines 748-754 Link Here
748	case ClassFileConstants.AccAnnotation:	766	case ClassFileConstants.AccAnnotation:
749	case ClassFileConstants.AccAnnotation \| ClassFileConstants.AccInterface:	767	case ClassFileConstants.AccAnnotation \| ClassFileConstants.AccInterface:
750	relevance += computeRelevanceForAnnotation();	768	relevance += computeRelevanceForAnnotation();
751	if (guessedType != null) relevance += computeRelevanceForAnnotationTarget(guessedType);	769	if (guessedAnnotationType != null) relevance += computeRelevanceForAnnotationTarget(guessedAnnotationType);
752	relevance += computeRelevanceForInterface();	770	relevance += computeRelevanceForInterface();
753	break;	771	break;
754	case ClassFileConstants.AccEnum:	772	case ClassFileConstants.AccEnum:
Lines 767-772 Link Here
767	if(!this.requestor.isIgnored(CompletionProposal.TYPE_REF)) {	785	if(!this.requestor.isIgnored(CompletionProposal.TYPE_REF)) {
768	createTypeProposal(packageName, typeName, modifiers, accessibility, completionName, relevance);	786	createTypeProposal(packageName, typeName, modifiers, accessibility, completionName, relevance);
769	}	787	}
		788
		789	if (proposeConstructor && CharOperation.equals(this.completionToken, simpleTypeName)) {
		790	char[][] compoundName = CharOperation.splitOn('.', fullyQualifiedName);
		791	TypeReference convertedType;
		792	if (compoundName.length == 1) {
		793	convertedType = new SingleTypeReference(compoundName[0], 0);
		794	} else {
		795	convertedType = new QualifiedTypeReference(compoundName, new long[compoundName.length]);
		796	}
		797
		798	this.problemFactory.startCheckingProblems();
		799	TypeBinding guessedType = null;
		800	switch (scope.kind) {
		801	case Scope.METHOD_SCOPE :
		802	case Scope.BLOCK_SCOPE :
		803	guessedType = convertedType.resolveType((BlockScope)scope);
		804	break;
		805	case Scope.CLASS_SCOPE :
		806	guessedType = convertedType.resolveType((ClassScope)scope);
		807	break;
		808	}
		809	this.problemFactory.stopCheckingProblems();
		810	if (!this.problemFactory.hasForbiddenProblems &&
		811	guessedType != null &&
		812	guessedType instanceof ReferenceBinding &&
		813	!guessedType.isTypeVariable()) {
		814
		815	TypeBinding erasure = guessedType.erasure();
		816
		817	findConstructors(
		818	(ReferenceBinding)erasure,
		819	null,
		820	scope,
		821	invocationSite,
		822	false,
		823	true,
		824	isQualified);
		825	}
		826	}
770	}	827	}
771		828
772	/**	829	/**
Lines 900-906 Link Here
900	this.completionToken = type.token;	957	this.completionToken = type.token;
901	setSourceRange(type.sourceStart, type.sourceEnd);	958	setSourceRange(type.sourceStart, type.sourceEnd);
902		959
903	findTypesAndPackages(this.completionToken, scope, new ObjectVector());	960	findTypesAndPackages(this.completionToken, scope, null, new ObjectVector());
904	if (!this.requestor.isIgnored(CompletionProposal.KEYWORD)) {	961	if (!this.requestor.isIgnored(CompletionProposal.KEYWORD)) {
905	findKeywordsForMember(this.completionToken, field.modifiers);	962	findKeywordsForMember(this.completionToken, field.modifiers);
906	}	963	}
Lines 922-928 Link Here
922	SingleTypeReference type = (CompletionOnSingleTypeReference) method.returnType;	979	SingleTypeReference type = (CompletionOnSingleTypeReference) method.returnType;
923	this.completionToken = type.token;	980	this.completionToken = type.token;
924	setSourceRange(type.sourceStart, type.sourceEnd);	981	setSourceRange(type.sourceStart, type.sourceEnd);
925	findTypesAndPackages(this.completionToken, scope.parent, new ObjectVector());	982	findTypesAndPackages(this.completionToken, scope.parent, null, new ObjectVector());
926	if (!this.requestor.isIgnored(CompletionProposal.KEYWORD)) {	983	if (!this.requestor.isIgnored(CompletionProposal.KEYWORD)) {
927	findKeywordsForMember(this.completionToken, method.modifiers);	984	findKeywordsForMember(this.completionToken, method.modifiers);
928	}	985	}
Lines 951-957 Link Here
951	this.findEnumConstant(this.completionToken, (SwitchStatement) astNodeParent);	1008	this.findEnumConstant(this.completionToken, (SwitchStatement) astNodeParent);
952	}	1009	}
953	} else if (this.expectedTypesPtr > -1 && this.expectedTypes[0].isAnnotationType()) {	1010	} else if (this.expectedTypesPtr > -1 && this.expectedTypes[0].isAnnotationType()) {
954	findTypesAndPackages(this.completionToken, scope, new ObjectVector());	1011	findTypesAndPackages(this.completionToken, scope, null, new ObjectVector());
955	} else {	1012	} else {
956	if (scope instanceof BlockScope && !this.requestor.isIgnored(CompletionProposal.LOCAL_VARIABLE_REF)) {	1013	if (scope instanceof BlockScope && !this.requestor.isIgnored(CompletionProposal.LOCAL_VARIABLE_REF)) {
957	char[][] alreadyDefinedName = computeAlreadyDefinedName((BlockScope)scope, singleNameReference);	1014	char[][] alreadyDefinedName = computeAlreadyDefinedName((BlockScope)scope, singleNameReference);
Lines 970-976 Link Here
970	insideTypeAnnotation,	1027	insideTypeAnnotation,
971	singleNameReference.isInsideAnnotationAttribute);	1028	singleNameReference.isInsideAnnotationAttribute);
972	// can be the start of a qualified type name	1029	// can be the start of a qualified type name
973	findTypesAndPackages(this.completionToken, scope, new ObjectVector());	1030	findTypesAndPackages(this.completionToken, scope, null, new ObjectVector());
974	if (!this.requestor.isIgnored(CompletionProposal.KEYWORD)) {	1031	if (!this.requestor.isIgnored(CompletionProposal.KEYWORD)) {
975	if (this.completionToken != null && this.completionToken.length != 0) {	1032	if (this.completionToken != null && this.completionToken.length != 0) {
976	findKeywords(this.completionToken, singleNameReference.possibleKeywords, false, false);	1033	findKeywords(this.completionToken, singleNameReference.possibleKeywords, false, false);
Lines 1019-1025 Link Here
1019	(BlockScope)scope,	1076	(BlockScope)scope,
1020	typesFound);	1077	typesFound);
1021	}	1078	}
1022	findTypesAndPackages(this.completionToken, scope, typesFound);	1079	findTypesAndPackages(
		1080	this.completionToken,
		1081	scope,
		1082	this.assistNodeIsConstructor ? FakeInvocationSite : null,
		1083	typesFound);
1023	}	1084	}
1024	} else if (!this.requestor.isIgnored(CompletionProposal.TYPE_REF)) {	1085	} else if (!this.requestor.isIgnored(CompletionProposal.TYPE_REF)) {
1025	findMemberTypes(	1086	findMemberTypes(
Lines 1032-1037 Link Here
1032	false,	1093	false,
1033	false,	1094	false,
1034	!this.assistNodeIsConstructor,	1095	!this.assistNodeIsConstructor,
		1096	false,
		1097	null,
1035	null,	1098	null,
1036	new ObjectVector());	1099	new ObjectVector());
1037	}	1100	}
Lines 1322-1327 Link Here
1322	argTypes,	1385	argTypes,
1323	scope,	1386	scope,
1324	constructorCall,	1387	constructorCall,
		1388	false,
		1389	false,
1325	false);	1390	false);
1326	}	1391	}
1327	} else if (astNode instanceof CompletionOnQualifiedAllocationExpression) {	1392	} else if (astNode instanceof CompletionOnQualifiedAllocationExpression) {
Lines 1340-1345 Link Here
1340	argTypes,	1405	argTypes,
1341	scope,	1406	scope,
1342	allocExpression,	1407	allocExpression,
		1408	false,
		1409	false,
1343	false);	1410	false);
1344	}	1411	}
1345	if (!this.requestor.isIgnored(CompletionProposal.ANONYMOUS_CLASS_DECLARATION)	1412	if (!this.requestor.isIgnored(CompletionProposal.ANONYMOUS_CLASS_DECLARATION)
Lines 1479-1485 Link Here
1479	this.completionToken = type.token;	1546	this.completionToken = type.token;
1480	setSourceRange(type.sourceStart, type.sourceEnd);	1547	setSourceRange(type.sourceStart, type.sourceEnd);
1481		1548
1482	findTypesAndPackages(this.completionToken, scope, new ObjectVector());	1549	findTypesAndPackages(this.completionToken, scope, null, new ObjectVector());
1483	} else if (annot.type instanceof CompletionOnQualifiedTypeReference) {	1550	} else if (annot.type instanceof CompletionOnQualifiedTypeReference) {
1484	this.insideQualifiedReference = true;	1551	this.insideQualifiedReference = true;
1485		1552
Lines 1518-1524 Link Here
1518	}	1585	}
1519	if (this.assistNodeCanBeSingleMemberAnnotation) {	1586	if (this.assistNodeCanBeSingleMemberAnnotation) {
1520	if (this.expectedTypesPtr > -1 && this.expectedTypes[0].isAnnotationType()) {	1587	if (this.expectedTypesPtr > -1 && this.expectedTypes[0].isAnnotationType()) {
1521	findTypesAndPackages(this.completionToken, scope, new ObjectVector());	1588	findTypesAndPackages(this.completionToken, scope, null, new ObjectVector());
1522	} else {	1589	} else {
1523	if (scope instanceof BlockScope && !this.requestor.isIgnored(CompletionProposal.LOCAL_VARIABLE_REF)) {	1590	if (scope instanceof BlockScope && !this.requestor.isIgnored(CompletionProposal.LOCAL_VARIABLE_REF)) {
1524	char[][] alreadyDefinedName = computeAlreadyDefinedName((BlockScope)scope, FakeInvocationSite);	1591	char[][] alreadyDefinedName = computeAlreadyDefinedName((BlockScope)scope, FakeInvocationSite);
Lines 1537-1543 Link Here
1537	insideTypeAnnotation,	1604	insideTypeAnnotation,
1538	true);	1605	true);
1539	// can be the start of a qualified type name	1606	// can be the start of a qualified type name
1540	findTypesAndPackages(this.completionToken, scope, new ObjectVector());	1607	findTypesAndPackages(this.completionToken, scope, null, new ObjectVector());
1541	}	1608	}
1542	}	1609	}
1543	}	1610	}
Lines 1598-1604 Link Here
1598	this.completionToken = typeRef.token;	1665	this.completionToken = typeRef.token;
1599	this.javadocTagPosition = typeRef.tagSourceStart;	1666	this.javadocTagPosition = typeRef.tagSourceStart;
1600	setSourceRange(typeRef.sourceStart, typeRef.sourceEnd);	1667	setSourceRange(typeRef.sourceStart, typeRef.sourceEnd);
1601	findTypesAndPackages(this.completionToken, scope, new ObjectVector());	1668	findTypesAndPackages(this.completionToken, scope, null, new ObjectVector());
1602		1669
1603	} else if (astNode instanceof CompletionOnJavadocQualifiedTypeReference) {	1670	} else if (astNode instanceof CompletionOnJavadocQualifiedTypeReference) {
1604		1671
Lines 1692-1698 Link Here
1692	if (this.completionToken == null	1759	if (this.completionToken == null
1693	\|\| CharOperation.prefixEquals(this.completionToken, refBinding.sourceName)	1760	\|\| CharOperation.prefixEquals(this.completionToken, refBinding.sourceName)
1694	\|\| (this.options.camelCaseMatch && CharOperation.camelCaseMatch(this.completionToken, refBinding.sourceName))) {	1761	\|\| (this.options.camelCaseMatch && CharOperation.camelCaseMatch(this.completionToken, refBinding.sourceName))) {
1695	findConstructors(refBinding, null, scope, fieldRef, false);	1762	findConstructors(refBinding, null, scope, fieldRef, false, false, false);
1696	}	1763	}
1697	}	1764	}
1698	}	1765	}
Lines 1758-1764 Link Here
1758		1825
1759	ReferenceBinding ref = (ReferenceBinding) qualifiedBinding;	1826	ReferenceBinding ref = (ReferenceBinding) qualifiedBinding;
1760	if (!this.requestor.isIgnored(CompletionProposal.METHOD_REF) && ref.isClass()) {	1827	if (!this.requestor.isIgnored(CompletionProposal.METHOD_REF) && ref.isClass()) {
1761	findConstructors(ref, argTypes, scope, allocExpression, false);	1828	findConstructors(ref, argTypes, scope, allocExpression, false, false, false);
1762	}	1829	}
1763	} else if (astNode instanceof CompletionOnJavadocParamNameReference) {	1830	} else if (astNode instanceof CompletionOnJavadocParamNameReference) {
1764	if (!this.requestor.isIgnored(CompletionProposal.JAVADOC_PARAM_REF)) {	1831	if (!this.requestor.isIgnored(CompletionProposal.JAVADOC_PARAM_REF)) {
Lines 2289-2295 Link Here
2289	argTypes,	2356	argTypes,
2290	scope,	2357	scope,
2291	invocationSite,	2358	invocationSite,
2292	true);	2359	true,
		2360	false,
		2361	false);
2293	}	2362	}
2294	}	2363	}
2295		2364
Lines 2691-2697 Link Here
2691	TypeBinding[] argTypes,	2760	TypeBinding[] argTypes,
2692	Scope scope,	2761	Scope scope,
2693	InvocationSite invocationSite,	2762	InvocationSite invocationSite,
2694	boolean forAnonymousType) {	2763	boolean forAnonymousType,
		2764	boolean forExactConstructors,
		2765	boolean isQualified) {
		2766
		2767	if (forExactConstructors) {
		2768	if (currentType.isEnum() \|\| currentType.isInterface() \|\| currentType.isAnnotationType()) return;
		2769
		2770	if (isQualified && isIgnored(CompletionProposal.METHOD_REF, CompletionProposal.TYPE_IMPORT)) return;
		2771	}
		2772
		2773	boolean hasConstructors = false;
2695		2774
2696	// No visibility checks can be performed without the scope & invocationSite	2775	// No visibility checks can be performed without the scope & invocationSite
2697	MethodBinding[] methods = currentType.availableMethods();	2776	MethodBinding[] methods = currentType.availableMethods();
Lines 2702-2708 Link Here
2702	if (constructor.isConstructor()) {	2781	if (constructor.isConstructor()) {
2703		2782
2704	if (constructor.isSynthetic()) continue next;	2783	if (constructor.isSynthetic()) continue next;
2705		2784
		2785	hasConstructors = true;
		2786
2706	if (this.options.checkDeprecation &&	2787	if (this.options.checkDeprecation &&
2707	constructor.isViewedAsDeprecated() &&	2788	constructor.isViewedAsDeprecated() &&
2708	!scope.isDefinedInSameUnit(constructor.declaringClass))	2789	!scope.isDefinedInSameUnit(constructor.declaringClass))
Lines 2767-2772 Link Here
2767	this.printDebug(proposal);	2848	this.printDebug(proposal);
2768	}	2849	}
2769	}	2850	}
		2851	} else if (forExactConstructors) {
		2852	char[] signature = getSignature(constructor);
		2853	char[] originalSignature = null;
		2854	MethodBinding original = constructor.original();
		2855	if(original != constructor) {
		2856	originalSignature = getSignature(original);
		2857	}
		2858
		2859	proposeExactConstructor(
		2860	currentType,
		2861	signature,
		2862	originalSignature,
		2863	constructor.modifiers,
		2864	parameterPackageNames,
		2865	parameterTypeNames,
		2866	parameterNames,
		2867	isQualified);
2770	} else {	2868	} else {
2771	int relevance = computeBaseRelevance();	2869	int relevance = computeBaseRelevance();
2772	relevance += computeRelevanceForResolution();	2870	relevance += computeRelevanceForResolution();
Lines 2888-2893 Link Here
2888	}	2986	}
2889	}	2987	}
2890	}	2988	}
		2989
		2990	if (forExactConstructors && !hasConstructors) {
		2991	char[] signature =
		2992	createMethodSignature(
		2993	CharOperation.NO_CHAR_CHAR,
		2994	CharOperation.NO_CHAR_CHAR,
		2995	null,
		2996	VOID);
		2997
		2998	proposeExactConstructor(
		2999	currentType,
		3000	signature,
		3001	null,
		3002	Flags.AccPublic,
		3003	CharOperation.NO_CHAR_CHAR,
		3004	CharOperation.NO_CHAR_CHAR,
		3005	null,
		3006	isQualified);
		3007	}
2891	}	3008	}
2892		3009
2893	private char[][] findEnclosingTypeNames(Scope scope){	3010	private char[][] findEnclosingTypeNames(Scope scope){
Lines 3857-3863 Link Here
3857	this.options.camelCaseMatch,	3974	this.options.camelCaseMatch,
3858	IJavaSearchConstants.TYPE,	3975	IJavaSearchConstants.TYPE,
3859	this);	3976	this);
3860	acceptTypes(null);	3977	acceptTypes(false, null, null);
3861	}	3978	}
3862	}	3979	}
3863		3980
Lines 4295-4301 Link Here
4295	boolean staticFieldsAndMethodOnly,	4412	boolean staticFieldsAndMethodOnly,
4296	boolean fromStaticImport,	4413	boolean fromStaticImport,
4297	boolean checkQualification,	4414	boolean checkQualification,
4298	Scope scope) {	4415	boolean proposeConstrutor,
		4416	Scope scope,
		4417	InvocationSite invocationSite) {
4299		4418
4300	// Inherited member types which are hidden by subclasses are filtered out	4419	// Inherited member types which are hidden by subclasses are filtered out
4301	// No visibility checks can be performed without the scope & invocationSite	4420	// No visibility checks can be performed without the scope & invocationSite
Lines 4412-4417 Link Here
4412		4531
4413	this.noProposal = false;	4532	this.noProposal = false;
4414	createTypeProposal(memberType, memberType.qualifiedSourceName(), IAccessRule.K_ACCESSIBLE, completionName, relevance);	4533	createTypeProposal(memberType, memberType.qualifiedSourceName(), IAccessRule.K_ACCESSIBLE, completionName, relevance);
		4534	if (proposeConstrutor && CharOperation.equals(typeName, memberType.sourceName)) {
		4535	findConstructors(
		4536	memberType,
		4537	null,
		4538	scope,
		4539	invocationSite,
		4540	false,
		4541	true,
		4542	isQualified);
		4543	}
4415	}	4544	}
4416	}	4545	}
4417		4546
Lines 4433-4438 Link Here
4433	false,	4562	false,
4434	false,	4563	false,
4435	false,	4564	false,
		4565	false,
		4566	null,
4436	null,	4567	null,
4437	typesFound);	4568	typesFound);
4438	}	4569	}
Lines 4446-4451 Link Here
4446	boolean fromStaticImport,	4577	boolean fromStaticImport,
4447	boolean checkQualification,	4578	boolean checkQualification,
4448	boolean proposeAllMemberTypes,	4579	boolean proposeAllMemberTypes,
		4580	boolean proposeConstrutor,
		4581	InvocationSite invocationSite,
4449	SourceTypeBinding typeToIgnore,	4582	SourceTypeBinding typeToIgnore,
4450	ObjectVector typesFound) {	4583	ObjectVector typesFound) {
4451		4584
Lines 4470-4476 Link Here
4470	staticFieldsAndMethodOnly,	4603	staticFieldsAndMethodOnly,
4471	fromStaticImport,	4604	fromStaticImport,
4472	checkQualification,	4605	checkQualification,
4473	scope);	4606	proposeConstrutor,
		4607	scope,
		4608	invocationSite);
4474	return;	4609	return;
4475	}	4610	}
4476		4611
Lines 4506-4512 Link Here
4506	staticFieldsAndMethodOnly,	4641	staticFieldsAndMethodOnly,
4507	fromStaticImport,	4642	fromStaticImport,
4508	checkQualification,	4643	checkQualification,
4509	scope);	4644	proposeConstrutor,
		4645	scope,
		4646	invocationSite);
4510		4647
4511	currentType = currentType.superclass();	4648	currentType = currentType.superclass();
4512	} while (currentType != null);	4649	} while (currentType != null);
Lines 4541-4547 Link Here
4541	staticFieldsAndMethodOnly,	4678	staticFieldsAndMethodOnly,
4542	fromStaticImport,	4679	fromStaticImport,
4543	checkQualification,	4680	checkQualification,
4544	scope);	4681	proposeConstrutor,
		4682	scope,
		4683	invocationSite);
4545		4684
4546	ReferenceBinding[] itsInterfaces = anInterface.superInterfaces();	4685	ReferenceBinding[] itsInterfaces = anInterface.superInterfaces();
4547	if (itsInterfaces != Binding.NO_SUPERINTERFACES) {	4686	if (itsInterfaces != Binding.NO_SUPERINTERFACES) {
Lines 4624-4630 Link Here
4624	staticFieldsAndMethodOnly,	4763	staticFieldsAndMethodOnly,
4625	fromStaticImport,	4764	fromStaticImport,
4626	true,	4765	true,
4627	scope);	4766	false,
		4767	scope,
		4768	null);
4628		4769
4629	ReferenceBinding[] memberTypes = receiverType.memberTypes();	4770	ReferenceBinding[] memberTypes = receiverType.memberTypes();
4630	next : for (int i = 0; i < memberTypes.length; i++) {	4771	next : for (int i = 0; i < memberTypes.length; i++) {
Lines 6290-6295 Link Here
6290	SourceTypeBinding currentType,	6431	SourceTypeBinding currentType,
6291	Scope scope,	6432	Scope scope,
6292	boolean proposeAllMemberTypes,	6433	boolean proposeAllMemberTypes,
		6434	boolean proposeConstrutor,
		6435	InvocationSite invocationSite,
6293	ObjectVector typesFound) {	6436	ObjectVector typesFound) {
6294	if (typeName == null)	6437	if (typeName == null)
6295	return;	6438	return;
Lines 6351-6356 Link Here
6351	if(!this.requestor.isIgnored(CompletionProposal.TYPE_REF)) {	6494	if(!this.requestor.isIgnored(CompletionProposal.TYPE_REF)) {
6352	createTypeProposal(localType, localType.sourceName, IAccessRule.K_ACCESSIBLE, localType.sourceName, relevance);	6495	createTypeProposal(localType, localType.sourceName, IAccessRule.K_ACCESSIBLE, localType.sourceName, relevance);
6353	}	6496	}
		6497
		6498	if (proposeConstrutor && CharOperation.equals(typeName, localType.sourceName)) {
		6499	findConstructors(
		6500	localType,
		6501	null,
		6502	scope,
		6503	invocationSite,
		6504	false,
		6505	true,
		6506	false);
		6507	}
6354	}	6508	}
6355	}	6509	}
6356	}	6510	}
Lines 6358-6364 Link Here
6358		6512
6359	case Scope.CLASS_SCOPE :	6513	case Scope.CLASS_SCOPE :
6360	SourceTypeBinding enclosingSourceType = scope.enclosingSourceType();	6514	SourceTypeBinding enclosingSourceType = scope.enclosingSourceType();
6361	findMemberTypes(typeName, enclosingSourceType, scope, currentType, false, false, false, false, proposeAllMemberTypes, nextTypeToIgnore, typesFound);	6515	findMemberTypes(
		6516	typeName,
		6517	enclosingSourceType,
		6518	scope,
		6519	currentType,
		6520	false,
		6521	false,
		6522	false,
		6523	false,
		6524	proposeAllMemberTypes,
		6525	proposeConstrutor,
		6526	invocationSite,
		6527	nextTypeToIgnore,
		6528	typesFound);
6362	nextTypeToIgnore = enclosingSourceType;	6529	nextTypeToIgnore = enclosingSourceType;
6363	if (typeLength == 0)	6530	if (typeLength == 0)
6364	return; // do not search outside the class scope if no prefix was provided	6531	return; // do not search outside the class scope if no prefix was provided
Lines 6477-6483 Link Here
6477	scope = scope.parent;	6644	scope = scope.parent;
6478	}	6645	}
6479	}	6646	}
6480	private void findTypesAndPackages(char[] token, Scope scope, ObjectVector typesFound) {	6647	private void findTypesAndPackages(char[] token, Scope scope, InvocationSite invocationSite, ObjectVector typesFound) {
6481		6648
6482	if (token == null)	6649	if (token == null)
6483	return;	6650	return;
Lines 6497-6504 Link Here
6497		6664
6498	boolean proposeAllMemberTypes = !this.assistNodeIsConstructor;	6665	boolean proposeAllMemberTypes = !this.assistNodeIsConstructor;
6499		6666
6500	if (!skip && proposeType && scope.enclosingSourceType() != null) {	6667	boolean proposeConstructor =//false;
6501	findNestedTypes(token, scope.enclosingSourceType(), scope, proposeAllMemberTypes, typesFound);	6668	assistNodeIsConstructor &&
		6669	!this.requestor.isIgnored(CompletionProposal.METHOD_REF);
		6670
		6671	if (!skip && (proposeType \|\| proposeConstructor) && scope.enclosingSourceType() != null) {
		6672	findNestedTypes(
		6673	token,
		6674	scope.enclosingSourceType(),
		6675	scope,
		6676	proposeAllMemberTypes,
		6677	proposeConstructor,
		6678	invocationSite,
		6679	typesFound);
6502	if(!assistNodeIsConstructor && !assistNodeIsAnnotation) {	6680	if(!assistNodeIsConstructor && !assistNodeIsAnnotation) {
6503	// don't propose type parameters if the completion is a constructor ('new \|')	6681	// don't propose type parameters if the completion is a constructor ('new \|')
6504	findTypeParameters(token, scope);	6682	findTypeParameters(token, scope);
Lines 6507-6513 Link Here
6507		6685
6508	boolean isEmptyPrefix = token.length == 0;	6686	boolean isEmptyPrefix = token.length == 0;
6509		6687
6510	if (!skip && proposeType && this.unitScope != null) {	6688	if (!skip && (proposeType \|\| proposeConstructor) && this.unitScope != null) {
6511	ReferenceBinding outerInvocationType = scope.enclosingSourceType();	6689	ReferenceBinding outerInvocationType = scope.enclosingSourceType();
6512	if(outerInvocationType != null) {	6690	if(outerInvocationType != null) {
6513	ReferenceBinding temp = outerInvocationType.enclosingType();	6691	ReferenceBinding temp = outerInvocationType.enclosingType();
Lines 6588-6597 Link Here
6588	relevance += computeRelevanceForException(sourceType.sourceName);	6766	relevance += computeRelevanceForException(sourceType.sourceName);
6589	}	6767	}
6590	this.noProposal = false;	6768	this.noProposal = false;
6591	if(proposeType) {	6769	if (proposeType) {
6592	char[] typeName = sourceType.sourceName();	6770	char[] typeName = sourceType.sourceName();
6593	createTypeProposal(sourceType, typeName, IAccessRule.K_ACCESSIBLE, typeName, relevance);	6771	createTypeProposal(sourceType, typeName, IAccessRule.K_ACCESSIBLE, typeName, relevance);
6594	}	6772	}
		6773
		6774	if (proposeConstructor && CharOperation.equals(token, sourceType.sourceName)) {
		6775	findConstructors(
		6776	sourceType,
		6777	null,
		6778	scope,
		6779	invocationSite,
		6780	false,
		6781	true,
		6782	false);
		6783	}
6595	}	6784	}
6596	}	6785	}
6597		6786
Lines 6713-6719 Link Here
6713	findKeywords(token, BASE_TYPE_NAMES, false, false);	6902	findKeywords(token, BASE_TYPE_NAMES, false, false);
6714	}	6903	}
6715	}	6904	}
6716	if(proposeType) {	6905	if(proposeType \|\| proposeConstructor) {
6717	int l = typesFound.size();	6906	int l = typesFound.size();
6718	for (int i = 0; i < l; i++) {	6907	for (int i = 0; i < l; i++) {
6719	ReferenceBinding typeFound = (ReferenceBinding) typesFound.elementAt(i);	6908	ReferenceBinding typeFound = (ReferenceBinding) typesFound.elementAt(i);
Lines 6734-6746 Link Here
6734	} else if(this.assistNodeIsAnnotation) {	6923	} else if(this.assistNodeIsAnnotation) {
6735	searchFor = IJavaSearchConstants.ANNOTATION_TYPE;	6924	searchFor = IJavaSearchConstants.ANNOTATION_TYPE;
6736	}	6925	}
6737	this.nameEnvironment.findTypes(	6926	if (proposeType) {
6738	token,	6927	this.nameEnvironment.findTypes(
6739	proposeAllMemberTypes,	6928	token,
6740	this.options.camelCaseMatch,	6929	proposeAllMemberTypes,
6741	searchFor,	6930	this.options.camelCaseMatch,
6742	this);	6931	searchFor,
6743	acceptTypes(scope);	6932	this);
		6933	} else {
		6934	this.nameEnvironment.findExactTypes(
		6935	token,
		6936	proposeAllMemberTypes,
		6937	searchFor,
		6938	this);
		6939	}
		6940	acceptTypes(proposeConstructor, invocationSite, scope);
6744	}	6941	}
6745	if(!isEmptyPrefix && !this.requestor.isIgnored(CompletionProposal.PACKAGE_REF)) {	6942	if(!isEmptyPrefix && !this.requestor.isIgnored(CompletionProposal.PACKAGE_REF)) {
6746	this.nameEnvironment.findPackages(token, this);	6943	this.nameEnvironment.findPackages(token, this);
Lines 6859-6865 Link Here
6859	this.options.camelCaseMatch,	7056	this.options.camelCaseMatch,
6860	searchFor,	7057	searchFor,
6861	this);	7058	this);
6862	acceptTypes(scope);	7059	acceptTypes(false, null, null);
6863	}	7060	}
6864	if(!this.requestor.isIgnored(CompletionProposal.PACKAGE_REF)) {	7061	if(!this.requestor.isIgnored(CompletionProposal.PACKAGE_REF)) {
6865	this.nameEnvironment.findPackages(qualifiedName, this);	7062	this.nameEnvironment.findPackages(qualifiedName, this);
Lines 6885-6890 Link Here
6885	true,	7082	true,
6886	true,	7083	true,
6887	proposeAllMemberTypes,	7084	proposeAllMemberTypes,
		7085	false,
		7086	null,
6888	null,	7087	null,
6889	typesFound);	7088	typesFound);
6890	}	7089	}
Lines 8357-8363 Link Here
8357		8556
8358	return completion.toString().toCharArray();	8557	return completion.toString().toCharArray();
8359	}	8558	}
8360		8559	private void proposeExactConstructor(
		8560	ReferenceBinding currentType,
		8561	char[] signature,
		8562	char[] originalSignature,
		8563	int modifiers,
		8564	char[][] parameterPackageNames,
		8565	char[][] parameterTypeNames,
		8566	char[][] parameterNames,
		8567	boolean isQualified) {
		8568
		8569	char[] simpleTypename = currentType.sourceName;
		8570
		8571	char[] completion;
		8572	if (this.source != null
		8573	&& this.source.length > this.endPosition
		8574	&& this.source[this.endPosition] == '(') {
		8575	completion = simpleTypename;
		8576	} else {
		8577	completion = CharOperation.concat(simpleTypename, new char[] { '(', ')' });
		8578	}
		8579
		8580	int relevance = computeBaseRelevance();
		8581	relevance += computeRelevanceForResolution();
		8582	relevance += computeRelevanceForInterestingProposal();
		8583	relevance += computeRelevanceForCaseMatching(simpleTypename, simpleTypename);
		8584	relevance += computeRelevanceForExpectingType(currentType);
		8585	relevance += computeRelevanceForQualification(isQualified);
		8586	relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE); // no access restriction for type in the current unit
		8587	relevance += R_CONSTRUCTOR;
		8588
		8589	// Create standard proposal
		8590	this.noProposal = false;
		8591	if(!this.requestor.isIgnored(CompletionProposal.METHOD_REF) && (this.assistNodeInJavadoc & CompletionOnJavadoc.ONLY_INLINE_TAG) == 0) {
		8592	CompletionProposal proposal = this.createProposal(CompletionProposal.METHOD_REF, this.actualCompletionPosition);
		8593	proposal.setDeclarationSignature(getSignature(currentType));
		8594	proposal.setSignature(signature);
		8595	if(originalSignature != null) {
		8596	proposal.setOriginalSignature(originalSignature);
		8597	}
		8598	proposal.setDeclarationPackageName(currentType.qualifiedPackageName());
		8599	proposal.setDeclarationTypeName(currentType.qualifiedSourceName());
		8600	proposal.setParameterPackageNames(parameterPackageNames);
		8601	proposal.setParameterTypeNames(parameterTypeNames);
		8602	proposal.setName(currentType.sourceName());
		8603	proposal.setIsContructor(true);
		8604	proposal.setCompletion(completion);
		8605	proposal.setFlags(modifiers);
		8606	proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
		8607	proposal.setRelevance(relevance);
		8608	if(parameterNames != null) proposal.setParameterNames(parameterNames);
		8609	if (isQualified) {
		8610	char[] typeName = CharOperation.concatWith(currentType.compoundName, '.');
		8611
		8612	CompilationUnitDeclaration cu = this.unitScope.referenceContext;
		8613	int importStart = cu.types[0].declarationSourceStart;
		8614	int importEnd = importStart;
		8615
		8616	char[] typeImportCompletion = createImportCharArray(typeName, false, false);
		8617
		8618	CompletionProposal typeImportProposal = this.createProposal(CompletionProposal.TYPE_IMPORT, this.actualCompletionPosition);
		8619	typeImportProposal.nameLookup = this.nameEnvironment.nameLookup;
		8620	typeImportProposal.completionEngine = this;
		8621	char[] packageName = currentType.qualifiedPackageName();
		8622	typeImportProposal.setDeclarationSignature(packageName);
		8623	typeImportProposal.setSignature(getSignature(currentType));
8624	typeImportProposal.setPackageName(packageName);
8625	typeImportProposal.setTypeName(currentType.qualifiedSourceName());
8626	typeImportProposal.setCompletion(typeImportCompletion);
8627	typeImportProposal.setFlags(currentType.modifiers);
8628	typeImportProposal.setAdditionalFlags(CompletionFlags.Default);
8629	typeImportProposal.setReplaceRange(importStart - this.offset, importEnd - this.offset);
8630	typeImportProposal.setRelevance(relevance);
8631
8632	proposal.setRequiredProposals(new CompletionProposal[]{typeImportProposal});
8633	}
8634
8635	this.requestor.accept(proposal);
8636	if(DEBUG) {
8637	this.printDebug(proposal);
8638	}
8639	}
8640
8641	}
8361	private void proposeNewMethod(char[] token, ReferenceBinding reference) {	8642	private void proposeNewMethod(char[] token, ReferenceBinding reference) {
8362	if(!this.requestor.isIgnored(CompletionProposal.POTENTIAL_METHOD_DECLARATION)) {	8643	if(!this.requestor.isIgnored(CompletionProposal.POTENTIAL_METHOD_DECLARATION)) {
8363	int relevance = computeBaseRelevance();	8644	int relevance = computeBaseRelevance();

Lines 134-140 Link Here

(-)src/org/eclipse/jdt/core/tests/model/CompletionWithMissingTypesTests2.java (-2 / +2 lines)
134	waitUntilIndexesReady();	134	waitUntilIndexesReady();
135		135
136	// do completion	136	// do completion
137	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	137	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
138	requestor.allowAllRequiredProposals();	138	requestor.allowAllRequiredProposals();
139	ICompilationUnit cu= getCompilationUnit("P2", "src", "", "YY.java");	139	ICompilationUnit cu= getCompilationUnit("P2", "src", "", "YY.java");
140		140
Lines 228-234 Link Here
228	waitUntilIndexesReady();	228	waitUntilIndexesReady();
229		229
230	// do completion	230	// do completion
231	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	231	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
232	requestor.allowAllRequiredProposals();	232	requestor.allowAllRequiredProposals();
233	ICompilationUnit cu= getCompilationUnit("P2", "src", "", "YY.java");	233	ICompilationUnit cu= getCompilationUnit("P2", "src", "", "YY.java");
234		234




		"  public void bar() {}\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"  public int bar;\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"  public int bar;\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"  public void bar() {};\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.";

		"  public void bar() {}\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"  public void bar() {}\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"  public Object m;\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.e";

		"  public Object m;\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"  public void bar() {}\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"  }\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"  public void bar() {}\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m().b";

		"  public void bar() {}\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = ".b";

		"  public Object m() {return null;}\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m().e";

		"  public Object m() {return null;}\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m().b";

		"  public Object m(int i) {return null;}\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m().b";

		"  }\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"  }\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"  }\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"  }\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.e";

			"  }\n" + 
			"}\n");
		
		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
		requestor.allowAllRequiredProposals();
		String str = this.workingCopies[0].getSource();
		String completeBehind = "m.b";

			"  }\n" + 
			"}\n");
		
		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
		requestor.allowAllRequiredProposals();
		String str = this.workingCopies[0].getSource();
		String completeBehind = "m.b";

			"  }\n" + 
			"}\n");
		
		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
		requestor.allowAllRequiredProposals();
		String str = this.workingCopies[0].getSource();
		String completeBehind = "m.b";

			"  }\n" + 
			"}\n");
		
		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
		requestor.allowAllRequiredProposals();
		String str = this.workingCopies[0].getSource();
		String completeBehind = "m.b";

			"  }\n" + 
			"}\n");
		
		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
		requestor.allowAllRequiredProposals();
		String str = this.workingCopies[0].getSource();
		String completeBehind = "m.b";

			"  }\n" + 
			"}\n");
		
		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
		requestor.allowAllRequiredProposals();
		String str = this.workingCopies[0].getSource();
		String completeBehind = "m.b";

			"  }\n" + 
			"}\n");
		
		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
		requestor.allowAllRequiredProposals();
		String str = this.workingCopies[0].getSource();
		String completeBehind = "m.b";

			"  }\n" + 
			"}\n");
		
		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
		requestor.allowAllRequiredProposals();
		String str = this.workingCopies[0].getSource();
		String completeBehind = "m.b";

		"  public void bar() {}\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.field.b";

		"  public void bar() {}\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.field.b";

		"  public void bar() {}\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m().field.b";

		"  public void bar() {}\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.method().b";

		"  public void bar() {}\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m().method().b";

		"  public void bar()\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "MissingType#b";




		"  public void bar() {};\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"public class MissingType2 {\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"public class MissingType2 {\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"public class MissingType2 {\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"public class MissingType2 {\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"  public void bar() {}\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = ".b";

		"public class MissingType {\n" + 
		"}\n");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"  }\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"  public void bar() {};\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"  }\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"  }\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";

		"  public void bar() {};\n" + 
		"}\n");

	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	String str = this.workingCopies[0].getSource();
	String completeBehind = "m.b";




	private boolean showUniqueKeys;
	private boolean showPositions;
	private boolean shortContext;
	private boolean showMissingTypes;
	
	public boolean fDebug = false;


		this(showParamNames, showUniqueKeys, false);
	}
	public CompletionTestsRequestor2(boolean showParamNames, boolean showUniqueKeys, boolean showPositions) {
		this(showParamNames, showUniqueKeys, showPositions, true);
	}
	
	public CompletionTestsRequestor2(boolean showParamNames, boolean showUniqueKeys, boolean showPositions, boolean shortContext) {
		this(showParamNames, showUniqueKeys, showPositions, shortContext, false);
	}
	public CompletionTestsRequestor2(boolean showParamNames, boolean showUniqueKeys, boolean showPositions, boolean shortContext, boolean showMissingTypes) {
		this.showParameterNames = showParamNames;
		this.showUniqueKeys = showUniqueKeys;
		this.showPositions = showPositions;
		this.shortContext = shortContext;
		this.allowAllRequiredProposals();
	}
	public void acceptContext(CompletionContext cc) {
		this.context = cc;

		buffer.append(", ");
		buffer.append(proposal.getRelevance());
		buffer.append('}');
		CompletionProposal[] requiredProposals = proposal.getRequiredProposals();
		if (requiredProposals != null) {
			int length = requiredProposals.length;
			System.arraycopy(requiredProposals, 0, requiredProposals = new CompletionProposal[length], 0, length);
			quickSort(requiredProposals, 0, length - 1);
			for (int i = 0; i < length; i++) {
				buffer.append('\n');
				printProposal(requiredProposals[i], tab + 1, buffer);
					printProposal(requiredProposals[i], tab + 1, buffer);
				}
			}
		}
		return buffer;




    		"ABC[TYPE_REF]{p1.ABC, p1, Lp1.ABC;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
    		"ABC[TYPE_REF]{p2.ABC, p2, Lp2.ABC;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
			"A3[TYPE_REF]{A3, , LA3;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
			"A[TYPE_REF]{A, , LA;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
			"A[METHOD_REF<CONSTRUCTOR>]{A(), LA;, ()V, A, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_CONSTRUCTOR + R_NON_RESTRICTED)+"}",
            requestor.getResults());
}


			"Constructor5[METHOD_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor5;, (I)V, Constructor5, (i), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void testCompletionFindConstructor6() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[2];
	this.workingCopies[0] = getWorkingCopy(
		"/Completion/src/test/Test.java",
		"package test;"+
		"public class Test {\n" + 
		"  void foo() {\n" + 
 		"    new TestCons\n" + 
		"  }\n" + 
		"}\n");
	
	this.workingCopies[1] = getWorkingCopy(
		"/Completion/src/test/TestConstructor.java",
		"package test;"+
		"public class TestConstructor {\n" + 
		"  public TestConstructor(int a) {}\n" + 
		"}\n");

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

	assertResults(
			"TestConstructor[TYPE_REF]{TestConstructor, test, Ltest.TestConstructor;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void testCompletionFindConstructor7() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[2];
	this.workingCopies[0] = getWorkingCopy(
		"/Completion/src/test/Test.java",
		"package test;"+
		"public class Test {\n" + 
		"  void foo() {\n" + 
 		"    new TestConstructor\n" + 
		"  }\n" + 
		"}\n");
	
	this.workingCopies[1] = getWorkingCopy(
		"/Completion/src/test/TestConstructor.java",
		"package test;"+
		"public class TestConstructor {\n" + 
		"  public TestConstructor(int a) {}\n" + 
		"}\n");

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

	assertResults(
			"TestConstructor[TYPE_REF]{TestConstructor, test, Ltest.TestConstructor;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n"+
			"TestConstructor[METHOD_REF<CONSTRUCTOR>]{TestConstructor(), Ltest.TestConstructor;, (I)V, TestConstructor, (a), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_CONSTRUCTOR + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void testCompletionFindConstructor8() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[2];
	this.workingCopies[0] = getWorkingCopy(
		"/Completion/src/test/Test.java",
		"package test;"+
		"public class Test {\n" + 
		"  void foo() {\n" + 
 		"    new TestConstructor\n" + 
		"  }\n" + 
		"}\n");
	
	this.workingCopies[1] = getWorkingCopy(
		"/Completion/src/test/TestConstructor.java",
		"package test;"+
		"public class TestConstructor {\n" + 
		"}\n");

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

	assertResults(
			"TestConstructor[TYPE_REF]{TestConstructor, test, Ltest.TestConstructor;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n"+
			"TestConstructor[METHOD_REF<CONSTRUCTOR>]{TestConstructor(), Ltest.TestConstructor;, ()V, TestConstructor, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_CONSTRUCTOR + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void testCompletionFindConstructor9() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[1];
	this.workingCopies[0] = getWorkingCopy(
		"/Completion/src/test/Test.java",
		"package test;"+
		"public class Test {\n" + 
		"  public class TestConstructor {\n" + 
		"  }\n" + 
		"  void foo() {\n" + 
 		"    new TestConstructor\n" + 
		"  }\n" + 
		"}\n");

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

	assertResults(
			"Test.TestConstructor[TYPE_REF]{TestConstructor, test, Ltest.Test$TestConstructor;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n"+
			"TestConstructor[METHOD_REF<CONSTRUCTOR>]{TestConstructor(), Ltest.Test$TestConstructor;, ()V, TestConstructor, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_CONSTRUCTOR + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void testCompletionFindConstructor10() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[1];
	this.workingCopies[0] = getWorkingCopy(
		"/Completion/src/test/Test.java",
		"package test;"+
		"public class Test {\n" + 
		"  void foo() {\n" + 
		"    class TestConstructor {\n" + 
		"    }\n" + 
 		"    new TestConstructor\n" + 
		"  }\n" + 
		"}\n");

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

	assertResults(
			"TestConstructor[TYPE_REF]{TestConstructor, test, LTestConstructor;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n"+
			"TestConstructor[METHOD_REF<CONSTRUCTOR>]{TestConstructor(), LTestConstructor;, ()V, TestConstructor, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_CONSTRUCTOR + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void testCompletionFindConstructor11() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[2];
	this.workingCopies[0] = getWorkingCopy(
		"/Completion/src/test/Test.java",
		"package test;"+
		"public class Test {\n" + 
		"  void foo() {\n" + 
 		"    new TestConstructor2\n" + 
		"  }\n" + 
		"}\n");
	
	this.workingCopies[1] = getWorkingCopy(
		"/Completion/src/test/TestConstructor.java",
		"package test;"+
		"public class TestConstructor {\n" + 
		"  public class TestConstructor2 {\n" + 
		"  }\n" + 
		"}\n");

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

	assertResults(
			"",
			requestor.getResults());
}
public void testCompletionFindConstructor12() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[1];
	this.workingCopies[0] = getWorkingCopy(
		"/Completion/src/test/Test.java",
		"package test;"+
		"public class Test {\n" + 
		"  public class TestConstructor {\n" + 
		"    public class TestConstructor2 {\n" + 
		"    }\n" + 
		"  }\n" + 
		"  void foo() {\n" + 
 		"    new TestConstructor2\n" + 
		"  }\n" + 
		"}\n");

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

	assertResults(
			"",
			requestor.getResults());
}
public void testCompletionFindConstructor13() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[2];
	this.workingCopies[0] = getWorkingCopy(
		"/Completion/src/test/Test.java",
		"package test;"+
		"public class Test {\n" + 
		"  void foo() {\n" + 
 		"    new TestConstructor\n" + 
		"  }\n" + 
		"}\n");
	
	this.workingCopies[1] = getWorkingCopy(
		"/Completion/src/test2/TestConstructor.java",
		"package test2;"+
		"public class TestConstructor {\n" + 
		"}\n");

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

	assertResults(
			"TestConstructor[TYPE_REF]{test2.TestConstructor, test2, Ltest2.TestConstructor;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED) + "}\n"+
			"TestConstructor[METHOD_REF<CONSTRUCTOR>]{TestConstructor(), Ltest2.TestConstructor;, ()V, TestConstructor, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_CONSTRUCTOR + R_NON_RESTRICTED) + "}\n"+
			"   TestConstructor[TYPE_IMPORT]{import test2.TestConstructor;\n, test2, Ltest2.TestConstructor;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_CONSTRUCTOR + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void testCompletionFindConstructor14() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[2];
	this.workingCopies[0] = getWorkingCopy(
		"/Completion/src/test/Test.java",
		"package test;"+
		"public class Test {\n" + 
		"  void foo() {\n" + 
 		"    new TestConstructor\n" + 
		"  }\n" + 
		"}\n");
	
	this.workingCopies[1] = getWorkingCopy(
		"/Completion/src/test2/TestConstructor.java",
		"package test2;"+
		"public interface TestConstructor {\n" + 
		"}\n");

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

	assertResults(
			"TestConstructor[TYPE_REF]{test2.TestConstructor, test2, Ltest2.TestConstructor;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void testCompletionFindConstructor15() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[1];
	this.workingCopies[0] = getWorkingCopy(
		"/Completion/src/test/Test.java",
		"package test;"+
		"public class Test {\n" + 
		"  void foo() {\n" + 
		"    class TestConstructor {\n" + 
		"      public TestConstructor(int i) {}\n" + 
		"    }\n" + 
 		"    new TestConstructor\n" + 
		"  }\n" + 
		"}\n");

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

	assertResults(
			"TestConstructor[TYPE_REF]{TestConstructor, test, LTestConstructor;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n"+
			"TestConstructor[METHOD_REF<CONSTRUCTOR>]{TestConstructor(), LTestConstructor;, (I)V, TestConstructor, (i), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_CONSTRUCTOR + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
/**
 * Complete the exception "Exception" in a catch clause.
 */

    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);

    assertResults(
		"CompletionMemberType.Y[TYPE_REF]{Y, , LCompletionMemberType$Y;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_EXACT_NAME+ R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
		"Y[METHOD_REF<CONSTRUCTOR>]{Y(), LCompletionMemberType$Y;, ()V, Y, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_EXACT_NAME+ R_UNQUALIFIED + R_CONSTRUCTOR + R_NON_RESTRICTED)+"}",
		requestor.getResults());
}
public void testCompletionMemberType2() throws JavaModelException {

			"    public static int foo;\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo;\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ"});
	

			"    public static int foo;\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo(int i){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo;\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public int foo;\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public int foo;\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

			"    public int foo(){return 0;};\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public int foo(){return 0;};\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

			"    public static int foo(){return 0;};\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

				"    public static int foo(){}\n" +
				"}");
		
		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
		requestor.allowAllRequiredProposals();
		requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
		

				"    public static int foo(){}\n" +
				"}");
		
		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
		requestor.allowAllRequiredProposals();
		requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
		




            result.context);

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

			"ZZZ3[TYPE_REF]{p.ZZZ3, p, Lp.ZZZ3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_TARGET + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void test0330() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[2];
	this.workingCopies[0] = getWorkingCopy(
		"/Completion/src/test/Test.java",
		"package test;"+
		"public class Test {\n" + 
		"	public void foo() {\n" +
		"      new TestConstructor\n" +
		"   }" +
		"}\n");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src/test/TestConstructor.java",
			"package test;"+
			"public class TestConstructor<T> {\n" + 
			"}\n");

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

	assertResults(
			"TestConstructor[TYPE_REF]{TestConstructor, test, Ltest.TestConstructor;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n"+
			"TestConstructor[METHOD_REF<CONSTRUCTOR>]{TestConstructor(), Ltest.TestConstructor<TT;>;, ()V, TestConstructor, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_CONSTRUCTOR + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void test0331() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[2];
	this.workingCopies[0] = getWorkingCopy(
		"/Completion/src/test/Test.java",
		"package test;"+
		"public class Test {\n" + 
		"	public void foo() {\n" +
		"      new TestConstructor\n" +
		"   }" +
		"}\n");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src/test/TestConstructor.java",
			"package test;"+
			"public class TestConstructor<T> {\n" + 
			"  public <U> TestConstructor(int a) {\n" + 
			"}\n");

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

	assertResults(
			"TestConstructor[TYPE_REF]{TestConstructor, test, Ltest.TestConstructor;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n"+
			"TestConstructor[METHOD_REF<CONSTRUCTOR>]{TestConstructor(), Ltest.TestConstructor<TT;>;, <U:Ljava.lang.Object;>(I)V, TestConstructor, (a), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_CONSTRUCTOR + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void test0332() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[2];
	this.workingCopies[0] = getWorkingCopy(
		"/Completion/src/test/Test.java",
		"package test;"+
		"public class Test {\n" + 
		"	public void foo() {\n" +
		"      new <String>TestConstructor\n" +
		"   }" +
		"}\n");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src/test/TestConstructor.java",
			"package test;"+
			"public class TestConstructor<T> {\n" + 
			"  public <U> TestConstructor(int a) {}\n" + 
			"}\n");

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

	assertResults(
			"TestConstructor[TYPE_REF]{TestConstructor, test, Ltest.TestConstructor;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n"+
			"TestConstructor[METHOD_REF<CONSTRUCTOR>]{TestConstructor(), Ltest.TestConstructor<TT;>;, <U:Ljava.lang.Object;>(I)V, TestConstructor, (a), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_CONSTRUCTOR + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void test0333() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[2];
	this.workingCopies[0] = getWorkingCopy(
		"/Completion/src/test/Test.java",
		"package test;"+
		"public class Test {\n" + 
		"	public void foo() {\n" +
		"      new TestConstructor\n" +
		"   }" +
		"}\n");
	
	this.workingCopies[1] = getWorkingCopy(
			"/Completion/src/test/TestConstructor.java",
			"package test;"+
			"public enum TestConstructor {\n" + 
			"  TestConstructorConstant(0);\n" + 
			"  TestConstructor(int a) {=\n" + 
			"}\n");

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

	assertResults(
			"TestConstructor[TYPE_REF]{TestConstructor, test, Ltest.TestConstructor;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
public void test0334() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[2];
	this.workingCopies[0] = getWorkingCopy(
		"/Completion/src/test/Test.java",
		"package test;"+
		"public class Test {\n" + 
		"  void foo() {\n" + 
 		"    new TestConstructor\n" + 
		"  }\n" + 
		"}\n");
	
	this.workingCopies[1] = getWorkingCopy(
		"/Completion/src/test2/TestConstructor.java",
		"package test2;"+
		"public @interface TestConstructor {\n" + 
		"}\n");

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

	assertResults(
			"TestConstructor[TYPE_REF]{test2.TestConstructor, test2, Ltest2.TestConstructor;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
			requestor.getResults());
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=153130
public void testEC001() throws JavaModelException {
	this.workingCopies = new ICompilationUnit[1];

			"    public static int foo;\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo;\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ"});
	

			"    public static int foo;\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.q.ZZZ2.foo"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public static int foo(int i){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

			"    public static <T> int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

			"    public static int foo(){}\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

			"    public static int foo;\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public int foo;\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public int foo;\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

			"    public int foo(){return 0;};\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
	

			"    public int foo(){return 0;};\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

			"    public static int foo(){return 0;};\n" +
			"}");
	
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
	requestor.allowAllRequiredProposals();
	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
	

				"    public static int foo(){}\n" +
				"}");
		
		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
		requestor.allowAllRequiredProposals();
		requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
		

				"    public static int foo(){}\n" +
				"}");
		
		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
		requestor.allowAllRequiredProposals();
		requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
		

Return to bug 6930

Lines 59-65 Link Here

(-)src/org/eclipse/jdt/core/tests/model/CompletionWithMissingTypesTests.java (-33 / +33 lines)
59	" public void bar() {}\n" +	59	" public void bar() {}\n" +
60	"}\n");	60	"}\n");
61		61
62	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	62	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
63	requestor.allowAllRequiredProposals();	63	requestor.allowAllRequiredProposals();
64	String str = this.workingCopies[0].getSource();	64	String str = this.workingCopies[0].getSource();
65	String completeBehind = "m.b";	65	String completeBehind = "m.b";
Lines 96-102 Link Here
96	" public int bar;\n" +	96	" public int bar;\n" +
97	"}\n");	97	"}\n");
98		98
99	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	99	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
100	requestor.allowAllRequiredProposals();	100	requestor.allowAllRequiredProposals();
101	String str = this.workingCopies[0].getSource();	101	String str = this.workingCopies[0].getSource();
102	String completeBehind = "m.b";	102	String completeBehind = "m.b";
Lines 139-145 Link Here
139	" public int bar;\n" +	139	" public int bar;\n" +
140	"}\n");	140	"}\n");
141		141
142	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	142	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
143	requestor.allowAllRequiredProposals();	143	requestor.allowAllRequiredProposals();
144	String str = this.workingCopies[0].getSource();	144	String str = this.workingCopies[0].getSource();
145	String completeBehind = "m.b";	145	String completeBehind = "m.b";
Lines 176-182 Link Here
176	" public void bar() {};\n" +	176	" public void bar() {};\n" +
177	"}\n");	177	"}\n");
178		178
179	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	179	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
180	requestor.allowAllRequiredProposals();	180	requestor.allowAllRequiredProposals();
181	String str = this.workingCopies[0].getSource();	181	String str = this.workingCopies[0].getSource();
182	String completeBehind = "m.";	182	String completeBehind = "m.";
Lines 236-242 Link Here
236	" public void bar() {}\n" +	236	" public void bar() {}\n" +
237	"}\n");	237	"}\n");
238		238
239	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	239	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
240	requestor.allowAllRequiredProposals();	240	requestor.allowAllRequiredProposals();
241	String str = this.workingCopies[0].getSource();	241	String str = this.workingCopies[0].getSource();
242	String completeBehind = "m.b";	242	String completeBehind = "m.b";
Lines 275-281 Link Here
275	" public void bar() {}\n" +	275	" public void bar() {}\n" +
276	"}\n");	276	"}\n");
277		277
278	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	278	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
279	requestor.allowAllRequiredProposals();	279	requestor.allowAllRequiredProposals();
280	String str = this.workingCopies[0].getSource();	280	String str = this.workingCopies[0].getSource();
281	String completeBehind = "m.b";	281	String completeBehind = "m.b";
Lines 321-327 Link Here
321	" public Object m;\n" +	321	" public Object m;\n" +
322	"}\n");	322	"}\n");
323		323
324	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	324	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
325	requestor.allowAllRequiredProposals();	325	requestor.allowAllRequiredProposals();
326	String str = this.workingCopies[0].getSource();	326	String str = this.workingCopies[0].getSource();
327	String completeBehind = "m.e";	327	String completeBehind = "m.e";
Lines 364-370 Link Here
364	" public Object m;\n" +	364	" public Object m;\n" +
365	"}\n");	365	"}\n");
366		366
367	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	367	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
368	requestor.allowAllRequiredProposals();	368	requestor.allowAllRequiredProposals();
369	String str = this.workingCopies[0].getSource();	369	String str = this.workingCopies[0].getSource();
370	String completeBehind = "m.b";	370	String completeBehind = "m.b";
Lines 402-408 Link Here
402	" public void bar() {}\n" +	402	" public void bar() {}\n" +
403	"}\n");	403	"}\n");
404		404
405	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	405	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
406	requestor.allowAllRequiredProposals();	406	requestor.allowAllRequiredProposals();
407	String str = this.workingCopies[0].getSource();	407	String str = this.workingCopies[0].getSource();
408	String completeBehind = "m.b";	408	String completeBehind = "m.b";
Lines 443-449 Link Here
443	" }\n" +	443	" }\n" +
444	"}\n");	444	"}\n");
445		445
446	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	446	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
447	requestor.allowAllRequiredProposals();	447	requestor.allowAllRequiredProposals();
448	String str = this.workingCopies[0].getSource();	448	String str = this.workingCopies[0].getSource();
449	String completeBehind = "m.b";	449	String completeBehind = "m.b";
Lines 480-486 Link Here
480	" public void bar() {}\n" +	480	" public void bar() {}\n" +
481	"}\n");	481	"}\n");
482		482
483	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	483	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
484	requestor.allowAllRequiredProposals();	484	requestor.allowAllRequiredProposals();
485	String str = this.workingCopies[0].getSource();	485	String str = this.workingCopies[0].getSource();
486	String completeBehind = "m().b";	486	String completeBehind = "m().b";
Lines 517-523 Link Here
517	" public void bar() {}\n" +	517	" public void bar() {}\n" +
518	"}\n");	518	"}\n");
519		519
520	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	520	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
521	requestor.allowAllRequiredProposals();	521	requestor.allowAllRequiredProposals();
522	String str = this.workingCopies[0].getSource();	522	String str = this.workingCopies[0].getSource();
523	String completeBehind = ".b";	523	String completeBehind = ".b";
Lines 563-569 Link Here
563	" public Object m() {return null;}\n" +	563	" public Object m() {return null;}\n" +
564	"}\n");	564	"}\n");
565		565
566	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	566	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
567	requestor.allowAllRequiredProposals();	567	requestor.allowAllRequiredProposals();
568	String str = this.workingCopies[0].getSource();	568	String str = this.workingCopies[0].getSource();
569	String completeBehind = "m().e";	569	String completeBehind = "m().e";
Lines 606-612 Link Here
606	" public Object m() {return null;}\n" +	606	" public Object m() {return null;}\n" +
607	"}\n");	607	"}\n");
608		608
609	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	609	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
610	requestor.allowAllRequiredProposals();	610	requestor.allowAllRequiredProposals();
611	String str = this.workingCopies[0].getSource();	611	String str = this.workingCopies[0].getSource();
612	String completeBehind = "m().b";	612	String completeBehind = "m().b";
Lines 646-652 Link Here
646	" public Object m(int i) {return null;}\n" +	646	" public Object m(int i) {return null;}\n" +
647	"}\n");	647	"}\n");
648		648
649	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	649	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
650	requestor.allowAllRequiredProposals();	650	requestor.allowAllRequiredProposals();
651	String str = this.workingCopies[0].getSource();	651	String str = this.workingCopies[0].getSource();
652	String completeBehind = "m().b";	652	String completeBehind = "m().b";
Lines 685-691 Link Here
685	" }\n" +	685	" }\n" +
686	"}\n");	686	"}\n");
687		687
688	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	688	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
689	requestor.allowAllRequiredProposals();	689	requestor.allowAllRequiredProposals();
690	String str = this.workingCopies[0].getSource();	690	String str = this.workingCopies[0].getSource();
691	String completeBehind = "m.b";	691	String completeBehind = "m.b";
Lines 724-730 Link Here
724	" }\n" +	724	" }\n" +
725	"}\n");	725	"}\n");
726		726
727	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	727	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
728	requestor.allowAllRequiredProposals();	728	requestor.allowAllRequiredProposals();
729	String str = this.workingCopies[0].getSource();	729	String str = this.workingCopies[0].getSource();
730	String completeBehind = "m.b";	730	String completeBehind = "m.b";
Lines 757-763 Link Here
757	" }\n" +	757	" }\n" +
758	"}\n");	758	"}\n");
759		759
760	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	760	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
761	requestor.allowAllRequiredProposals();	761	requestor.allowAllRequiredProposals();
762	String str = this.workingCopies[0].getSource();	762	String str = this.workingCopies[0].getSource();
763	String completeBehind = "m.b";	763	String completeBehind = "m.b";
Lines 790-796 Link Here
790	" }\n" +	790	" }\n" +
791	"}\n");	791	"}\n");
792		792
793	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	793	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
794	requestor.allowAllRequiredProposals();	794	requestor.allowAllRequiredProposals();
795	String str = this.workingCopies[0].getSource();	795	String str = this.workingCopies[0].getSource();
796	String completeBehind = "m.e";	796	String completeBehind = "m.e";
Lines 837-843 Link Here
837	" }\n" +	837	" }\n" +
838	"}\n");	838	"}\n");
839		839
840	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	840	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
841	requestor.allowAllRequiredProposals();	841	requestor.allowAllRequiredProposals();
842	String str = this.workingCopies[0].getSource();	842	String str = this.workingCopies[0].getSource();
843	String completeBehind = "m.b";	843	String completeBehind = "m.b";
Lines 887-893 Link Here
887	" }\n" +	887	" }\n" +
888	"}\n");	888	"}\n");
889		889
890	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	890	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
891	requestor.allowAllRequiredProposals();	891	requestor.allowAllRequiredProposals();
892	String str = this.workingCopies[0].getSource();	892	String str = this.workingCopies[0].getSource();
893	String completeBehind = "m.b";	893	String completeBehind = "m.b";
Lines 933-939 Link Here
933	" }\n" +	933	" }\n" +
934	"}\n");	934	"}\n");
935		935
936	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	936	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
937	requestor.allowAllRequiredProposals();	937	requestor.allowAllRequiredProposals();
938	String str = this.workingCopies[0].getSource();	938	String str = this.workingCopies[0].getSource();
939	String completeBehind = "m.b";	939	String completeBehind = "m.b";
Lines 985-991 Link Here
985	" }\n" +	985	" }\n" +
986	"}\n");	986	"}\n");
987		987
988	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	988	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
989	requestor.allowAllRequiredProposals();	989	requestor.allowAllRequiredProposals();
990	String str = this.workingCopies[0].getSource();	990	String str = this.workingCopies[0].getSource();
991	String completeBehind = "m.b";	991	String completeBehind = "m.b";
Lines 1028-1034 Link Here
1028	" }\n" +	1028	" }\n" +
1029	"}\n");	1029	"}\n");
1030		1030
1031	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	1031	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
1032	requestor.allowAllRequiredProposals();	1032	requestor.allowAllRequiredProposals();
1033	String str = this.workingCopies[0].getSource();	1033	String str = this.workingCopies[0].getSource();
1034	String completeBehind = "m.b";	1034	String completeBehind = "m.b";
Lines 1077-1083 Link Here
1077	" }\n" +	1077	" }\n" +
1078	"}\n");	1078	"}\n");
1079		1079
1080	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	1080	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
1081	requestor.allowAllRequiredProposals();	1081	requestor.allowAllRequiredProposals();
1082	String str = this.workingCopies[0].getSource();	1082	String str = this.workingCopies[0].getSource();
1083	String completeBehind = "m.b";	1083	String completeBehind = "m.b";
Lines 1122-1128 Link Here
1122	" }\n" +	1122	" }\n" +
1123	"}\n");	1123	"}\n");
1124		1124
1125	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	1125	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
1126	requestor.allowAllRequiredProposals();	1126	requestor.allowAllRequiredProposals();
1127	String str = this.workingCopies[0].getSource();	1127	String str = this.workingCopies[0].getSource();
1128	String completeBehind = "m.b";	1128	String completeBehind = "m.b";
Lines 1173-1179 Link Here
1173	" }\n" +	1173	" }\n" +
1174	"}\n");	1174	"}\n");
1175		1175
1176	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	1176	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
1177	requestor.allowAllRequiredProposals();	1177	requestor.allowAllRequiredProposals();
1178	String str = this.workingCopies[0].getSource();	1178	String str = this.workingCopies[0].getSource();
1179	String completeBehind = "m.b";	1179	String completeBehind = "m.b";
Lines 1215-1221 Link Here
1215	" public void bar() {}\n" +	1215	" public void bar() {}\n" +
1216	"}\n");	1216	"}\n");
1217		1217
1218	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	1218	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
1219	requestor.allowAllRequiredProposals();	1219	requestor.allowAllRequiredProposals();
1220	String str = this.workingCopies[0].getSource();	1220	String str = this.workingCopies[0].getSource();
1221	String completeBehind = "m.field.b";	1221	String completeBehind = "m.field.b";
Lines 1254-1260 Link Here
1254	" public void bar() {}\n" +	1254	" public void bar() {}\n" +
1255	"}\n");	1255	"}\n");
1256		1256
1257	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	1257	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
1258	requestor.allowAllRequiredProposals();	1258	requestor.allowAllRequiredProposals();
1259	String str = this.workingCopies[0].getSource();	1259	String str = this.workingCopies[0].getSource();
1260	String completeBehind = "m.field.b";	1260	String completeBehind = "m.field.b";
Lines 1293-1299 Link Here
1293	" public void bar() {}\n" +	1293	" public void bar() {}\n" +
1294	"}\n");	1294	"}\n");
1295		1295
1296	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	1296	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
1297	requestor.allowAllRequiredProposals();	1297	requestor.allowAllRequiredProposals();
1298	String str = this.workingCopies[0].getSource();	1298	String str = this.workingCopies[0].getSource();
1299	String completeBehind = "m().field.b";	1299	String completeBehind = "m().field.b";
Lines 1332-1338 Link Here
1332	" public void bar() {}\n" +	1332	" public void bar() {}\n" +
1333	"}\n");	1333	"}\n");
1334		1334
1335	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	1335	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
1336	requestor.allowAllRequiredProposals();	1336	requestor.allowAllRequiredProposals();
1337	String str = this.workingCopies[0].getSource();	1337	String str = this.workingCopies[0].getSource();
1338	String completeBehind = "m.method().b";	1338	String completeBehind = "m.method().b";
Lines 1371-1377 Link Here
1371	" public void bar() {}\n" +	1371	" public void bar() {}\n" +
1372	"}\n");	1372	"}\n");
1373		1373
1374	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	1374	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
1375	requestor.allowAllRequiredProposals();	1375	requestor.allowAllRequiredProposals();
1376	String str = this.workingCopies[0].getSource();	1376	String str = this.workingCopies[0].getSource();
1377	String completeBehind = "m().method().b";	1377	String completeBehind = "m().method().b";
Lines 1401-1407 Link Here
1401	" public void bar()\n" +	1401	" public void bar()\n" +
1402	"}\n");	1402	"}\n");
1403		1403
1404	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);	1404	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false);
1405	requestor.allowAllRequiredProposals();	1405	requestor.allowAllRequiredProposals();
1406	String str = this.workingCopies[0].getSource();	1406	String str = this.workingCopies[0].getSource();
1407	String completeBehind = "MissingType#b";	1407	String completeBehind = "MissingType#b";

Lines 32-38 Link Here

(-)src/org/eclipse/jdt/core/tests/model/CompletionTestsRequestor2.java (-16 / +10 lines)
32	private boolean showUniqueKeys;	32	private boolean showUniqueKeys;
33	private boolean showPositions;	33	private boolean showPositions;
34	private boolean shortContext;	34	private boolean shortContext;
35	private boolean showMissingTypes;
36		35
37	public boolean fDebug = false;	36	public boolean fDebug = false;
38		37
Lines 46-63 Link Here
46	this(showParamNames, showUniqueKeys, false);	45	this(showParamNames, showUniqueKeys, false);
47	}	46	}
48	public CompletionTestsRequestor2(boolean showParamNames, boolean showUniqueKeys, boolean showPositions) {	47	public CompletionTestsRequestor2(boolean showParamNames, boolean showUniqueKeys, boolean showPositions) {
49	this(showParamNames, showUniqueKeys, showPositions, true, false);	48	this(showParamNames, showUniqueKeys, showPositions, true);
50	}	49	}
51		50
52	public CompletionTestsRequestor2(boolean showParamNames, boolean showUniqueKeys, boolean showPositions, boolean shortContext) {	51	public CompletionTestsRequestor2(boolean showParamNames, boolean showUniqueKeys, boolean showPositions, boolean shortContext) {
53	this(showParamNames, showUniqueKeys, showPositions, shortContext, false);
54	}
55	public CompletionTestsRequestor2(boolean showParamNames, boolean showUniqueKeys, boolean showPositions, boolean shortContext, boolean showMissingTypes) {
56	this.showParameterNames = showParamNames;	52	this.showParameterNames = showParamNames;
57	this.showUniqueKeys = showUniqueKeys;	53	this.showUniqueKeys = showUniqueKeys;
58	this.showPositions = showPositions;	54	this.showPositions = showPositions;
59	this.shortContext = shortContext;	55	this.shortContext = shortContext;
60	this.showMissingTypes = showMissingTypes;	56	this.allowAllRequiredProposals();
61	}	57	}
62	public void acceptContext(CompletionContext cc) {	58	public void acceptContext(CompletionContext cc) {
63	this.context = cc;	59	this.context = cc;
Lines 341-356 Link Here
341	buffer.append(", ");	337	buffer.append(", ");
342	buffer.append(proposal.getRelevance());	338	buffer.append(proposal.getRelevance());
343	buffer.append('}');	339	buffer.append('}');
344	if(this.showMissingTypes) {	340	CompletionProposal[] requiredProposals = proposal.getRequiredProposals();
345	CompletionProposal[] requiredProposals = proposal.getRequiredProposals();	341	if (requiredProposals != null) {
346	if (requiredProposals != null) {	342	int length = requiredProposals.length;
347	int length = requiredProposals.length;	343	System.arraycopy(requiredProposals, 0, requiredProposals = new CompletionProposal[length], 0, length);
348	System.arraycopy(requiredProposals, 0, requiredProposals = new CompletionProposal[length], 0, length);	344	quickSort(requiredProposals, 0, length - 1);
349	quickSort(requiredProposals, 0, length - 1);	345	for (int i = 0; i < length; i++) {
350	for (int i = 0; i < length; i++) {	346	buffer.append('\n');
351	buffer.append('\n');	347	printProposal(requiredProposals[i], tab + 1, buffer);
352	printProposal(requiredProposals[i], tab + 1, buffer);
353	}
354	}	348	}
355	}	349	}
356	return buffer;	350	return buffer;