[WIP] adjust the method of calculating the signature

Signed-off-by: David Thompson <davthomp@redhat.com>

Author: datho7561

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/codeassist/DOMCompletionEngine.java

@@ -4578,7 +4578,7 @@ private List<CompletionProposal> toConstructorProposals(ITypeBinding typeBinding
 			// We should consider making those completion items here instead
 		} else {
 			if (!this.requestor.isIgnored(CompletionProposal.ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION) && isExactName) {
-				List<IMethodBinding> constructors = Stream.of(typeBinding.getDeclaredMethods()).filter(IMethodBinding::isConstructor).toList();
+				List<IMethodBinding> constructors = Stream.of(typeBinding.getErasure().getDeclaredMethods()).filter(IMethodBinding::isConstructor).toList();
 				if (constructors.isEmpty()) {
 					IMethodBinding constructorBinding = ((ClassInstanceCreation)this.toComplete).resolveConstructorBinding();
 					if (constructorBinding != null) {
@@ -4590,7 +4590,7 @@ private List<CompletionProposal> toConstructorProposals(ITypeBinding typeBinding
 				}
 			}
 			try {
-				List<IMethodBinding> constructors = Stream.of(typeBinding.getErasure().getDeclaredMethods()).filter(IMethodBinding::isConstructor).toList();
+				List<IMethodBinding> constructors = Stream.of(typeBinding.getDeclaredMethods()).filter(IMethodBinding::isConstructor).toList();
 				if (!constructors.isEmpty()) {
 					for (IMethodBinding constructor: constructors) {
 						if (
@@ -4806,14 +4806,13 @@ private CompletionProposal toConstructorProposal(IMethodBinding method, boolean
 		res.setSignature(signature);
 		res.setOriginalSignature(signature);
 
-		if (declaringClass.getTypeArguments().length == 0
-				&& declaringClass.getErasure().getTypeParameters().length > 0) {
+		if (declaringClass.getTypeArguments().length > 0
+				&& declaringClass.getTypeParameters().length == 0) {
 			// we need to massage the signature; the signature doesn't include the type
 			// parameters in this case for whatever reason
-			res.setDeclarationSignature(Signature.getTypeErasure(SignatureUtils.getSignature(declaringClass))
-					.replace(";", "<>;").toCharArray());
-		} else if (declaringClass.getErasure().getTypeParameters().length > 0) {
-			res.setDeclarationSignature(SignatureUtils.getSignatureChar(declaringClass.getErasure()));
+			String massagedSignature = SignatureUtils.getSignature(declaringClass);
+			massagedSignature = massagedSignature.substring(0, massagedSignature.lastIndexOf('<')) + "<>;";
+			res.setDeclarationSignature(massagedSignature.toCharArray());
 		} else {
 			res.setDeclarationSignature(SignatureUtils.getSignature(declaringClass).toCharArray());
 		}