From 5cfff115cd43f951a690d8bfaf0eb478a610aac5 Mon Sep 17 00:00:00 2001 From: "nsingh@pivotal.io" Date: Wed, 13 Nov 2019 15:23:08 -0800 Subject: [PATCH] PT 159667257 - Disable sorting order hack --- .../completion/VscodeCompletionEngineAdapter.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java index 65ef89d8f..64123f046 100644 --- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java +++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java @@ -31,8 +31,6 @@ import org.eclipse.lsp4j.TextEdit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits.TextReplace; -import org.springframework.ide.vscode.commons.languageserver.util.LspClient; -import org.springframework.ide.vscode.commons.languageserver.util.LspClient.Client; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; import org.springframework.ide.vscode.commons.languageserver.util.SortKeys; @@ -166,12 +164,13 @@ public class VscodeCompletionEngineAdapter implements VscodeCompletionEngine { } } list.setItems(items); - //This is a hack. It bypasses lsp4e filtering / sorting because it - // it behaves totally bonkers. See: https://bugs.eclipse.org/bugs/show_bug.cgi?id=535823 - // See also https://www.pivotaltracker.com/story/show/159667257 - if (LspClient.currentClient()==Client.ECLIPSE) { - list.setIsIncomplete(true); - } + //This is a hack is no longer needed but keeping it as a reference: + // See: https://bugs.eclipse.org/bugs/show_bug.cgi?id=535823 + // Reason hack is not needed is because of the fix in: https://www.pivotaltracker.com/story/show/159667257 + +// if (LspClient.currentClient()==Client.ECLIPSE) { +// list.setIsIncomplete(true); +// } return list; }) .doOnNext(x -> log.info("Got {} completions", x.getItems().size()))