From 6ef4d7837aabb4bd4cff779fd5f5d03676259808 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Fri, 8 Feb 2019 14:39:51 +0100 Subject: [PATCH] fix failing tests due to wrongly created hover hint for profiles even if there are no profiles --- .../vscode/boot/java/livehover/ActiveProfilesProvider.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/java/livehover/ActiveProfilesProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ActiveProfilesProvider.java index ceb211e7b..0980d5005 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ActiveProfilesProvider.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ActiveProfilesProvider.java @@ -53,7 +53,7 @@ public class ActiveProfilesProvider implements HoverProvider { int offset, TextDocument doc, IJavaProject project, SpringBootApp[] runningApps ) { - if (runningApps.length>0) { + if (runningApps.length > 0) { StringBuilder markdown = new StringBuilder(); markdown.append("**Active Profiles**\n\n"); boolean hasInterestingApp = false; @@ -94,9 +94,12 @@ public class ActiveProfilesProvider implements HoverProvider { public Collection getLiveHintCodeLenses(IJavaProject project, Annotation annotation, TextDocument doc, SpringBootApp[] runningApps) { if (runningApps.length > 0) { Builder codeLenses = ImmutableList.builder(); - nameRange(doc, annotation).map(CodeLens::new).ifPresent(codeLenses::add); Set allActiveProfiles = getAllActiveProfiles(runningApps); + if (allActiveProfiles != null && allActiveProfiles.size() > 0) { + nameRange(doc, annotation).map(CodeLens::new).ifPresent(codeLenses::add); + } + annotation.accept(new ASTVisitor() { @Override public boolean visit(StringLiteral node) {