diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/models/JavaServerConfiguration.java b/lsp/java/src/main/java/com/itsaky/lsp/java/models/JavaServerConfiguration.java index 60b8607ce..1a7fc27fb 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/models/JavaServerConfiguration.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/models/JavaServerConfiguration.java @@ -17,6 +17,8 @@ package com.itsaky.lsp.java.models; +import androidx.annotation.NonNull; + import java.nio.file.Path; import java.util.Collections; import java.util.Objects; @@ -59,6 +61,7 @@ public class JavaServerConfiguration { return Objects.equals(getClassPaths(), that.getClassPaths()); } + @NonNull @Override public String toString() { return "JavaServerConfiguration{" + "classPaths=" + classPaths + '}'; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/completion/ScopeCompletionProvider.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/completion/ScopeCompletionProvider.kt index 3bcc584d2..125b85c22 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/completion/ScopeCompletionProvider.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/completion/ScopeCompletionProvider.kt @@ -146,7 +146,7 @@ class ScopeCompletionProvider( // Override is not possible return method(task, listOf(method), !endsWithParen, partialName, matchRatio) } - + // Print the method details and the annotations // Print the method details and the annotations val indent = EditHelper.indent(FileStore.contents(completingFile), cursor.toInt()) @@ -154,9 +154,10 @@ class ScopeCompletionProvider( try { builder = buildMethod(method, types, type) } catch (error: Throwable) { - log.error("Cannot override method:", method.simpleName) + log.error("Cannot override method:", method.simpleName, error.message) return method(task, listOf(method), !endsWithParen, partialName, matchRatio) } + val imports = mutableSetOf() val methodSpec = builder.build() var insertText = print(methodSpec, imports, false) @@ -173,7 +174,7 @@ class ScopeCompletionProvider( if (item.additionalTextEdits == null) { item.additionalTextEdits = mutableListOf() } - + imports.removeIf { "java.lang." == it || fileImports.contains(it) || filePackage == it } if (imports.isNotEmpty()) { for (className in imports) {