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

Edits aren't supposed to ever be lazy resolve in LSP. So don't make them lazy.

Browse Source
This commit is contained in:
Kris De Volder
2017-11-24 15:14:41 -08:00
parent bcbda72c58
commit 40abf6b566
1 changed files with 6 additions and 0 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

@@ -168,6 +168,8 @@ public class VscodeCompletionEngineAdapter implements VscodeCompletionEngine {
item.setSortText(sortkeys.next()); item.setSortText(sortkeys.next());
item.setFilterText(completion.getFilterText()); item.setFilterText(completion.getFilterText());
item.setDetail(completion.getDetail()); item.setDetail(completion.getDetail());
resolveEdits(doc, completion, item); //Warning. Its not allowed by LSP spec to resolveEdits
//lazy as we used to do in the past.
if (resolver!=null) { if (resolver!=null) {
item.setData(resolver.resolveLater(completion, doc)); item.setData(resolver.resolveLater(completion, doc));
} else { } else {
@@ -178,6 +180,10 @@ public class VscodeCompletionEngineAdapter implements VscodeCompletionEngine {
private static void resolveItem(TextDocument doc, ICompletionProposal completion, CompletionItem item) throws Exception { private static void resolveItem(TextDocument doc, ICompletionProposal completion, CompletionItem item) throws Exception {
item.setDocumentation(toMarkdown(completion.getDocumentation())); item.setDocumentation(toMarkdown(completion.getDocumentation()));
resolveEdits(doc, completion, item);
}
private static void resolveEdits(TextDocument doc, ICompletionProposal completion, CompletionItem item) {
Optional<TextEdit> mainEdit = adaptEdits(doc, completion.getTextEdit()); Optional<TextEdit> mainEdit = adaptEdits(doc, completion.getTextEdit());
if (mainEdit.isPresent()) { if (mainEdit.isPresent()) {
item.setTextEdit(mainEdit.get()); item.setTextEdit(mainEdit.get());