From fdf7af6410ef542d3b41a4e13b49aa4d30fc4e71 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Thu, 11 Apr 2019 16:06:53 +0200 Subject: [PATCH] avoid pre-sorting, since the proposals will be sorted by score anyway, and added enum for completion kind handling --- .../vscode/boot/xml/TypeCompletionProposalProvider.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/TypeCompletionProposalProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/TypeCompletionProposalProvider.java index 462fc441f..1a3817182 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/TypeCompletionProposalProvider.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/TypeCompletionProposalProvider.java @@ -62,7 +62,7 @@ public class TypeCompletionProposalProvider implements XMLCompletionProvider { return types .filter(result -> result.getT1() != null && result.getT1().getElementName() != null && result.getT1().getElementName().length() > 0) .map(t -> createProposal(t, doc, offset, tokenOffset, tokenEnd)) - .collectSortedList((p1, p2) -> ((Integer)p1.getLabel().length()).compareTo((Integer)(p2.getLabel().length()))).block(); + .collectList().block(); }; return null; @@ -85,8 +85,11 @@ public class TypeCompletionProposalProvider implements XMLCompletionProvider { else if (type.isInterface()) { kind = CompletionItemKind.Interface; } + else if (type.isEnum()) { + kind = CompletionItemKind.Enum; + } else { - kind = CompletionItemKind.Value; + kind = CompletionItemKind.Property; } DocumentEdits edits = new DocumentEdits(doc);