Attachment #169843 for bug #305694

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

Lines 83-88 Link Here

(-)src/org/eclipse/wst/jsdt/internal/codeassist/CompletionEngine.java (-63 / +103 lines)
83	import org.eclipse.wst.jsdt.internal.compiler.ast.ConstructorDeclaration;	83	import org.eclipse.wst.jsdt.internal.compiler.ast.ConstructorDeclaration;
84	import org.eclipse.wst.jsdt.internal.compiler.ast.Expression;	84	import org.eclipse.wst.jsdt.internal.compiler.ast.Expression;
85	import org.eclipse.wst.jsdt.internal.compiler.ast.FieldDeclaration;	85	import org.eclipse.wst.jsdt.internal.compiler.ast.FieldDeclaration;
		86	import org.eclipse.wst.jsdt.internal.compiler.ast.FieldReference;
86	import org.eclipse.wst.jsdt.internal.compiler.ast.ImportReference;	87	import org.eclipse.wst.jsdt.internal.compiler.ast.ImportReference;
87	import org.eclipse.wst.jsdt.internal.compiler.ast.Initializer;	88	import org.eclipse.wst.jsdt.internal.compiler.ast.Initializer;
88	import org.eclipse.wst.jsdt.internal.compiler.ast.InstanceOfExpression;	89	import org.eclipse.wst.jsdt.internal.compiler.ast.InstanceOfExpression;
Lines 623-629 Link Here
623	flatEnclosingTypeNames = CharOperation.concatWith(acceptedType.enclosingTypeNames, '.');	624	flatEnclosingTypeNames = CharOperation.concatWith(acceptedType.enclosingTypeNames, '.');
624	typeName = CharOperation.concat(flatEnclosingTypeNames, simpleTypeName, '.');	625	typeName = CharOperation.concat(flatEnclosingTypeNames, simpleTypeName, '.');
625	}	626	}
626	char[] fullyQualifiedName = CharOperation.concat(packageName, typeName, '.');	627
		628	// only need to combine package and type name if the name is not already qualified
		629	// in most cases, if not all, it will already be in qualified state
		630	char[] fullyQualifiedName = typeName;
		631	if(CharOperation.indexOf('.', typeName) < 0) {
		632	fullyQualifiedName = CharOperation.concat(packageName, typeName, '.');
		633	}
627		634
628	if (this.knownTypes.containsKey(fullyQualifiedName)) continue next;	635	if (this.knownTypes.containsKey(fullyQualifiedName)) continue next;
629		636
Lines 1150-1156 Link Here
1150	relevance += computeRelevanceForQualification(isQualified);	1157	relevance += computeRelevanceForQualification(isQualified);
1151	relevance += computeRelevanceForClass();	1158	relevance += computeRelevanceForClass();
1152	relevance += computeRelevanceForException(simpleTypeName);	1159	relevance += computeRelevanceForException(simpleTypeName);
1153		1160
		1161	// put proposals that have '_' at the start of their final segment down the list
		1162	char[] lastSegment = CharOperation.lastSegment(completionName, '.');
		1163	if(CharOperation.indexOf('_', lastSegment) == 0) {
		1164	relevance--;
		1165	}
1154	this.noProposal = false;	1166	this.noProposal = false;
1155	if(!this.requestor.isIgnored(CompletionProposal.TYPE_REF)) {	1167	if(!this.requestor.isIgnored(CompletionProposal.TYPE_REF)) {
1156	createTypeProposal(packageName, typeName, modifiers, accessibility, completionName, relevance);	1168	createTypeProposal(packageName, typeName, modifiers, accessibility, completionName, relevance);
Lines 1641-1707 Link Here
1641	long completionPosition = access.nameSourcePosition;	1653	long completionPosition = access.nameSourcePosition;
1642	setSourceRange((int) (completionPosition >>> 32), (int) completionPosition);	1654	setSourceRange((int) (completionPosition >>> 32), (int) completionPosition);
1643		1655
1644	this.completionToken = access.token;
1645		1656
1646	if (qualifiedBinding.problemId() == ProblemReasons.NotFound) {	1657
1647	// complete method members with missing return type	1658	// this.assistNodeIsClass = true;
1648	// class X {	1659	// this.assistNodeIsConstructor = true;
1649	// Missing f() {return null;}	1660
1650	// void foo() {	1661	// can be the start of a qualified type name
1651	// f().\|	1662	if (qualifiedBinding == null) {
1652	// }	1663
1653	// }	1664	this.completionToken = computeToken(access);
1654	if (this.assistNodeInJavadoc == 0 &&	1665	setSourceRange((int) (completionPosition >>> 32) - (this.completionToken.length - access.token.length), (int) completionPosition);
1655	(this.requestor.isAllowingRequiredProposals(CompletionProposal.FIELD_REF, CompletionProposal.TYPE_REF) \|\|	1666
1656	this.requestor.isAllowingRequiredProposals(CompletionProposal.METHOD_REF, CompletionProposal.TYPE_REF))) {	1667	ObjectVector typesFound = new ObjectVector();
1657	ProblemMethodBinding problemMethodBinding = (ProblemMethodBinding) qualifiedBinding;	1668	findTypesAndPackages(this.completionToken, scope, typesFound);
1658	findFieldsAndMethodsFromMissingReturnType(
1659	problemMethodBinding.selector,
1660	problemMethodBinding.parameters,
1661	scope,
1662	access,
1663	insideTypeAnnotation);
1664	}
1665	} else {	1669	} else {
1666	if (!access.isInsideAnnotation) {	1670	this.completionToken = access.token;
1667	if (!this.requestor.isIgnored(CompletionProposal.KEYWORD)) {	1671	if (qualifiedBinding.problemId() == ProblemReasons.NotFound) {
1668	findKeywords(this.completionToken, new char[][]{Keywords.NEW}, false, false);	1672	// complete method members with missing return type
		1673	// class X {
		1674	// Missing f() {return null;}
		1675	// void foo() {
		1676	// f().\|
		1677	// }
		1678	// }
		1679	if (this.assistNodeInJavadoc == 0 &&
		1680	(this.requestor.isAllowingRequiredProposals(CompletionProposal.FIELD_REF, CompletionProposal.TYPE_REF) \|\|
		1681	this.requestor.isAllowingRequiredProposals(CompletionProposal.METHOD_REF, CompletionProposal.TYPE_REF))) {
		1682	ProblemMethodBinding problemMethodBinding = (ProblemMethodBinding) qualifiedBinding;
		1683	findFieldsAndMethodsFromMissingReturnType(
		1684	problemMethodBinding.selector,
		1685	problemMethodBinding.parameters,
		1686	scope,
		1687	access,
		1688	insideTypeAnnotation);
1669	}	1689	}
1670		1690	} else {
1671	findFieldsAndMethods(	1691	if (!access.isInsideAnnotation) {
1672	this.completionToken,	1692	if (!this.requestor.isIgnored(CompletionProposal.KEYWORD)) {
1673	((TypeBinding) qualifiedBinding),	1693	findKeywords(this.completionToken, new char[][]{Keywords.NEW}, false, false);
1674	scope,	1694	}
1675	access,	1695
1676	scope,	1696	findFieldsAndMethods(
1677	access.isStatic,	1697	this.completionToken,
1678	false,	1698	((TypeBinding) qualifiedBinding),
1679	access.receiver instanceof SuperReference,	1699	scope,
1680	null,	1700	access,
1681	null,	1701	scope,
1682	null,	1702	access.isStatic,
1683	false);	1703	false,
1684	if (qualifiedBinding instanceof FunctionTypeBinding) {	1704	access.receiver instanceof SuperReference,
1685	FunctionTypeBinding functionTypeBinding = (FunctionTypeBinding) qualifiedBinding;	1705	null,
1686	if (functionTypeBinding.functionBinding!=null && functionTypeBinding.functionBinding.isConstructor())	1706	null,
1687	{	1707	null,
1688	ReferenceBinding declaringClass = (ReferenceBinding)functionTypeBinding.functionBinding.returnType;	1708	false);
1689	findFieldsAndMethods(	1709	if (qualifiedBinding instanceof FunctionTypeBinding) {
1690	this.completionToken,	1710	FunctionTypeBinding functionTypeBinding = (FunctionTypeBinding) qualifiedBinding;
1691	declaringClass,	1711	if (functionTypeBinding.functionBinding!=null && functionTypeBinding.functionBinding.isConstructor())
1692	scope,	1712	{
1693	access,	1713	ReferenceBinding declaringClass = (ReferenceBinding)functionTypeBinding.functionBinding.returnType;
1694	scope,	1714	findFieldsAndMethods(
1695	true,	1715	this.completionToken,
1696	false,	1716	declaringClass,
1697	access.receiver instanceof SuperReference,	1717	scope,
1698	null,	1718	access,
1699	null,	1719	scope,
1700	null,	1720	true,
1701	false);	1721	false,
		1722	access.receiver instanceof SuperReference,
		1723	null,
		1724	null,
		1725	null,
		1726	false);
		1727
		1728	}
1702		1729
1703	}	1730	}
1704
1705	}	1731	}
1706	}	1732	}
1707	}	1733	}
Lines 5879-5885 Link Here
5879	// char[] pkg = CharOperation.subarray(sourceType.sourceName, 0, index);	5905	// char[] pkg = CharOperation.subarray(sourceType.sourceName, 0, index);
5880	char[] simpleName = CharOperation.subarray(sourceType.sourceName, index+1, sourceType.sourceName.length);	5906	char[] simpleName = CharOperation.subarray(sourceType.sourceName, index+1, sourceType.sourceName.length);
5881		5907
5882	if (!CharOperation.prefixEquals(token, simpleName, false)	5908	if (!CharOperation.prefixEquals(token, simpleName, false) && !CharOperation.prefixEquals(token, sourceType.sourceName, false)
5883	&& !(this.options.camelCaseMatch && CharOperation.camelCaseMatch(token, simpleName))) continue ;	5909	&& !(this.options.camelCaseMatch && CharOperation.camelCaseMatch(token, simpleName))) continue ;
5884		5910
5885	} else if (!CharOperation.prefixEquals(token, sourceType.sourceName, false)	5911	} else if (!CharOperation.prefixEquals(token, sourceType.sourceName, false)
Lines 7357-7366 Link Here
7357	}	7383	}
7358		7384
7359	public static char[] createNonGenericTypeSignature(char[] qualifiedPackageName, char[] qualifiedTypeName) {	7385	public static char[] createNonGenericTypeSignature(char[] qualifiedPackageName, char[] qualifiedTypeName) {
7360	return Signature.createCharArrayTypeSignature(	7386	return Signature.createCharArrayTypeSignature(CharOperation.replaceOnCopy(qualifiedTypeName, '.', '$'), true);
7361	CharOperation.concat(
7362	qualifiedPackageName,
7363	CharOperation.replaceOnCopy(qualifiedTypeName, '.', '$'), '.'), true);
7364	}	7387	}
7365	public static char[] createTypeSignature(char[] qualifiedPackageName, char[] qualifiedTypeName) {	7388	public static char[] createTypeSignature(char[] qualifiedPackageName, char[] qualifiedTypeName) {
7366	char[] name = new char[qualifiedTypeName.length];	7389	char[] name = new char[qualifiedTypeName.length];
Lines 7720-7724 Link Here
7720		7743
7721	return result;	7744	return result;
7722	}	7745	}
		7746
		7747	private char[] computeToken(FieldReference field) {
		7748	char[] currentToken = field.token;
		7749	boolean addDot = false;
		7750	if(currentToken != null && currentToken.length == 0)
		7751	addDot = true;
		7752	if(field.receiver != null) {
		7753	if(field.receiver instanceof SingleNameReference) {
		7754	currentToken = CharOperation.concat(((SingleNameReference)field.receiver).token, currentToken, '.');
		7755	} else if(field.receiver instanceof FieldReference) {
		7756	currentToken = CharOperation.concat(computeToken((FieldReference) field.receiver), currentToken, '.');
		7757	}
		7758	}
		7759	if(addDot)
		7760	currentToken = CharOperation.append(currentToken, '.');
		7761	return currentToken;
		7762	}
7723		7763
7724	}	7764	}

Lines 1-5 Link Here

(-)src/org/eclipse/wst/jsdt/internal/codeassist/complete/CompletionOnMemberAccess.java (-1 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 32-37 Link Here
32	* which should be replaced by the completion.	32	* which should be replaced by the completion.
33	*/	33	*/
34		34
		35	import org.eclipse.wst.jsdt.internal.compiler.ast.ASTNode;
35	import org.eclipse.wst.jsdt.internal.compiler.ast.Expression;	36	import org.eclipse.wst.jsdt.internal.compiler.ast.Expression;
36	import org.eclipse.wst.jsdt.internal.compiler.ast.FieldReference;	37	import org.eclipse.wst.jsdt.internal.compiler.ast.FieldReference;
37	import org.eclipse.wst.jsdt.internal.compiler.ast.MessageSend;	38	import org.eclipse.wst.jsdt.internal.compiler.ast.MessageSend;
Lines 100-103 Link Here
100	throw new CompletionNodeFound(this, this.receiverType, scope);	101	throw new CompletionNodeFound(this, this.receiverType, scope);
101	// array types are passed along to find the length field	102	// array types are passed along to find the length field
102	}	103	}
		104
		105	public TypeBinding resolveForAllocation(BlockScope scope, ASTNode location) {
		106	throw new CompletionNodeFound(this, scope);
		107	}
103	}	108	}




/*******************************************************************************
 * Copyright (c) 2000, 2010 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

			} else {
				excludePath = null;
			}
			
			//int lastDotIndex = CharOperation.lastIndexOf('.', prefix);
			// just use the simple name field to hold the full type name
			char[] qualification, simpleName;
			qualification = null;
			if (camelCaseMatch) {
				simpleName = prefix;
					simpleName = prefix;
				} else {
					simpleName = CharOperation.toLowerCase(prefix);
				}
			} else {
				simpleName = CharOperation.toLowerCase(prefix);
				if (camelCaseMatch) {
					simpleName = CharOperation.subarray(prefix,
							lastDotIndex + 1, prefix.length);
				} else {
					simpleName = CharOperation.toLowerCase(CharOperation
							.subarray(prefix, lastDotIndex + 1, prefix.length));
				}
			}
			
//			if (lastDotIndex < 0 || true) {
//				qualification = null;
//				if (camelCaseMatch) {
//					simpleName = prefix;
//				} else {
//					simpleName = CharOperation.toLowerCase(prefix);
//				}
//			} else {
//				qualification = CharOperation.subarray(prefix, 0, lastDotIndex);
//				if (camelCaseMatch) {
//					simpleName = CharOperation.subarray(prefix,
//							lastDotIndex + 1, prefix.length);
//				} else {
//					simpleName = CharOperation.toLowerCase(CharOperation
//							.subarray(prefix, lastDotIndex + 1, prefix.length));
//				}
//			}

			IProgressMonitor progressMonitor = new IProgressMonitor() {
				boolean isCanceled = false;

Lines 1-5 Link Here

(-)src/org/eclipse/wst/jsdt/internal/core/index/DiskIndex.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 52-58 Link Here
52	private int bufferIndex, bufferEnd; // used when reading from the file into the streamBuffer	52	private int bufferIndex, bufferEnd; // used when reading from the file into the streamBuffer
53	private int streamEnd; // used when writing data from the streamBuffer to the file	53	private int streamEnd; // used when writing data from the streamBuffer to the file
54		54
55	public static final String SIGNATURE= "INDEX VERSION 1.121"; //$NON-NLS-1$	55	public static final String SIGNATURE= "INDEX VERSION 1.122"; //$NON-NLS-1$
56	private static final char[] SIGNATURE_CHARS = SIGNATURE.toCharArray();	56	private static final char[] SIGNATURE_CHARS = SIGNATURE.toCharArray();
57	public static boolean DEBUG = false;	57	public static boolean DEBUG = false;
58		58

Lines 1-5 Link Here

(-)src/org/eclipse/wst/jsdt/internal/core/search/indexing/AbstractIndexer.java (-1 / +5 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 100-105 Link Here
100	packageName == null ? CharOperation.NO_CHAR : packageName);	100	packageName == null ? CharOperation.NO_CHAR : packageName);
101		101
102	addIndexEntry(TYPE_DECL, indexKey);	102	addIndexEntry(TYPE_DECL, indexKey);
		103
		104	// add a second key that includes the package name
		105	indexKey = TypeDeclarationPattern.createIndexKey(modifiers, CharOperation.concat(packageName, name, '.'), packageName, enclosingTypeNames, secondary);
		106	addIndexEntry(TYPE_DECL, indexKey);
103	}	107	}
104	public void addTypeReference(char[] typeName) {	108	public void addTypeReference(char[] typeName) {
105	if (typeName!=null)	109	if (typeName!=null)




/*******************************************************************************
 * Copyright (c) 2000, 2010 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

		if (simpleName!=null &&  (index=CharOperation.lastIndexOf('.',simpleName)) >0)
		{
			pkg=CharOperation.subarray(simpleName, 0, index);
//			simpleName=CharOperation.subarray(simpleName, index+1, simpleName.length);
		}

	this.pkg = isCaseSensitive() ? pkg : CharOperation.toLowerCase(pkg);

		return false;

	// check package - exact match only
	//if (this.pkg != null && !CharOperation.equals(this.pkg, pattern.pkg, isCaseSensitive()))
		//return false;

	// check enclosingTypeNames - exact match only
	if (this.enclosingTypeNames != null) {




/*******************************************************************************
 * Copyright (c) 2000, 2010 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

  */
public class LazyJavaTypeCompletionProposal extends LazyJavaCompletionProposal {
	/** Triggers for types. Do not modify. */
	protected static final char[] TYPE_TRIGGERS= new char[] { '\t', '[', '(', ' ' };
	/** Triggers for types in javadoc. Do not modify. */
	protected static final char[] JDOC_TYPE_TRIGGERS= new char[] { '#', '}', ' ', '.' };


		 if (fProposal.getKind() == CompletionProposal.TYPE_REF &&  fInvocationContext.getCoreContext().isInJsdocText())
			 return getSimpleTypeName();
		
		String qualifiedTypeName= replacement;
// 		if (qualifiedTypeName.indexOf('.') == -1)
// 			// default package - no imports needed 
// 			return qualifiedTypeName;

 		/*
		 * If the user types in the qualification, don't force import rewriting on him - insert the

	 */
	protected String computeSortString() {
		// try fast sort string to avoid display string creation
		return getQualifiedTypeName();
	}
	
	/*

Return to bug 305694

Lines 1-5 Link Here

(-)src/org/eclipse/wst/jsdt/internal/core/SearchableEnvironment.java (-17 / +26 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 432-456 Link Here
432	} else {	432	} else {
433	excludePath = null;	433	excludePath = null;
434	}	434	}
435	int lastDotIndex = CharOperation.lastIndexOf('.', prefix);	435
		436	//int lastDotIndex = CharOperation.lastIndexOf('.', prefix);
		437	// just use the simple name field to hold the full type name
436	char[] qualification, simpleName;	438	char[] qualification, simpleName;
437	if (lastDotIndex < 0) {	439	qualification = null;
438	qualification = null;	440	if (camelCaseMatch) {
439	if (camelCaseMatch) {	441	simpleName = prefix;
440	simpleName = prefix;
441	} else {
442	simpleName = CharOperation.toLowerCase(prefix);
443	}
444	} else {	442	} else {
445	qualification = CharOperation.subarray(prefix, 0, lastDotIndex);	443	simpleName = CharOperation.toLowerCase(prefix);
446	if (camelCaseMatch) {
447	simpleName = CharOperation.subarray(prefix,
448	lastDotIndex + 1, prefix.length);
449	} else {
450	simpleName = CharOperation.toLowerCase(CharOperation
451	.subarray(prefix, lastDotIndex + 1, prefix.length));
452	}
453	}	444	}
		445
		446	// if (lastDotIndex < 0 \|\| true) {
		447	// qualification = null;
		448	// if (camelCaseMatch) {
		449	// simpleName = prefix;
		450	// } else {
		451	// simpleName = CharOperation.toLowerCase(prefix);
		452	// }
		453	// } else {
		454	// qualification = CharOperation.subarray(prefix, 0, lastDotIndex);
		455	// if (camelCaseMatch) {
		456	// simpleName = CharOperation.subarray(prefix,
		457	// lastDotIndex + 1, prefix.length);
		458	// } else {
		459	// simpleName = CharOperation.toLowerCase(CharOperation
		460	// .subarray(prefix, lastDotIndex + 1, prefix.length));
		461	// }
		462	// }
454		463
455	IProgressMonitor progressMonitor = new IProgressMonitor() {	464	IProgressMonitor progressMonitor = new IProgressMonitor() {
456	boolean isCanceled = false;	465	boolean isCanceled = false;

Lines 1-5 Link Here

(-)src/org/eclipse/wst/jsdt/internal/ui/text/java/LazyJavaTypeCompletionProposal.java (-7 / +7 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 39-45 Link Here
39	*/	39	*/
40	public class LazyJavaTypeCompletionProposal extends LazyJavaCompletionProposal {	40	public class LazyJavaTypeCompletionProposal extends LazyJavaCompletionProposal {
41	/** Triggers for types. Do not modify. */	41	/** Triggers for types. Do not modify. */
42	protected static final char[] TYPE_TRIGGERS= new char[] { '.', '\t', '[', '(', ' ' };	42	protected static final char[] TYPE_TRIGGERS= new char[] { '\t', '[', '(', ' ' };
43	/** Triggers for types in javadoc. Do not modify. */	43	/** Triggers for types in javadoc. Do not modify. */
44	protected static final char[] JDOC_TYPE_TRIGGERS= new char[] { '#', '}', ' ', '.' };	44	protected static final char[] JDOC_TYPE_TRIGGERS= new char[] { '#', '}', ' ', '.' };
45		45
Lines 84-93 Link Here
84	if (fProposal.getKind() == CompletionProposal.TYPE_REF && fInvocationContext.getCoreContext().isInJsdocText())	84	if (fProposal.getKind() == CompletionProposal.TYPE_REF && fInvocationContext.getCoreContext().isInJsdocText())
85	return getSimpleTypeName();	85	return getSimpleTypeName();
86		86
87	String qualifiedTypeName= getQualifiedTypeName();	87	String qualifiedTypeName= replacement;
88	if (qualifiedTypeName.indexOf('.') == -1)	88	// if (qualifiedTypeName.indexOf('.') == -1)
89	// default package - no imports needed	89	// // default package - no imports needed
90	return qualifiedTypeName;	90	// return qualifiedTypeName;
91		91
92	/*	92	/*
93	* If the user types in the qualification, don't force import rewriting on him - insert the	93	* If the user types in the qualification, don't force import rewriting on him - insert the
Lines 339-345 Link Here
339	*/	339	*/
340	protected String computeSortString() {	340	protected String computeSortString() {
341	// try fast sort string to avoid display string creation	341	// try fast sort string to avoid display string creation
342	return getSimpleTypeName() + Character.MIN_VALUE + getQualifiedTypeName();	342	return getQualifiedTypeName();
343	}	343	}
344		344
345	/*	345	/*