fix random completion errors including #634

eclipse-jdtls · Jul 29, 2024 · ccbbec8 · ccbbec8
1 parent c0d50ff
commit ccbbec8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/DOMCompletionEngine.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/DOMCompletionEngine.java
@@ -438,8 +438,12 @@ private CompletionProposal toProposal(IBinding binding, String completion) {
 
 		if (kind == CompletionProposal.METHOD_REF) {
 			var methodBinding = (IMethodBinding) binding;
-			res.setParameterNames(DOMCompletionEngineMethodDeclHandler.findVariableNames(methodBinding).stream()
-					.map(String::toCharArray).toArray(i -> new char[i][]));
+			var paramNames = DOMCompletionEngineMethodDeclHandler.findVariableNames(methodBinding);
+			if (paramNames.isEmpty()) {
+				res.setParameterNames(null);
+			} else {
+				res.setParameterNames(paramNames.stream().map(String::toCharArray).toArray(i -> new char[i][]));
+			}
 			res.setSignature(Signature.createMethodSignature(
 					Arrays.stream(methodBinding.getParameterTypes()).map(ITypeBinding::getName).map(String::toCharArray)
 							.map(type -> Signature.createTypeSignature(type, true).toCharArray())
@@ -564,6 +568,7 @@ private CompletionProposal toPackageProposal(String packageName, ASTNode complet
 		res.setName(packageName.toCharArray());
 		res.setCompletion(packageName.toCharArray());
 		res.setDeclarationSignature(packageName.toCharArray());
+		res.setSignature(packageName.toCharArray());
 		configureProposal(res, completing);
 		return res;
 	}

diff --git a/...deassist/org/eclipse/jdt/internal/codeassist/DOMCompletionEngineRecoveredNodeScanner.java b/...deassist/org/eclipse/jdt/internal/codeassist/DOMCompletionEngineRecoveredNodeScanner.java
@@ -116,6 +116,10 @@ public boolean visit(SimpleType node) {
             // actual recoverable type, if not treat the type name as a variable name and search for such variable in
             // the context.
             var binding = node.resolveBinding();
+            if(binding == null) {
+                return super.visit(node);
+            }
+
             if (!binding.isRecovered()) {
                 this.foundBinding = binding;
                 return false;