Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bypass lsp4e filtering to avoid bug in lsp4e

Browse Source
This commit is contained in:
Kris De Volder
2018-06-13 15:23:58 -07:00
parent 1187e93973
commit e0b63ef3d9
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java
View File

@@ -29,9 +29,11 @@ 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.SimpleLanguageServer;
import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService;
import org.springframework.ide.vscode.commons.languageserver.util.SortKeys;
import org.springframework.ide.vscode.commons.languageserver.util.LspClient.Client;
import org.springframework.ide.vscode.commons.util.BadLocationException;
import org.springframework.ide.vscode.commons.util.Renderable;
import org.springframework.ide.vscode.commons.util.StringUtil;
@@ -160,6 +162,10 @@ public class VscodeCompletionEngineAdapter implements VscodeCompletionEngine {
}
}
list.setItems(items);
if (LspClient.currentClient()==Client.ECLIPSE) {
list.setIsIncomplete(true); //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
}
return list;
})
.subscribeOn(Schedulers.elastic()); //!!! without this the mono will just be computed on the same thread that calls it.

2
vscode-extensions/vscode-spring-boot/build.sh
View File

@@ -28,5 +28,5 @@ cd $workdir
npm install
rm -fr *.vsix
npm run vsce-package
rm -fr ${home}/.vscode/extensions/Pivotal.vscode-spring-boot-*
rm -fr ${home}/.vscode/extensions/*vscode-spring-boot-*
code --install-extension *.vsix