From 88e8e65b45b30962ecebd1fb8a1b86c73fc41093 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Wed, 22 Aug 2018 10:02:04 +0200 Subject: [PATCH] small refactoring to make API of live hover watchdog a bit cleaner --- .../BootJavaLanguageServerComponents.java | 2 +- .../java/utils/SpringLiveHoverWatchdog.java | 20 ++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java index 47d4e9a29..135ce6020 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java @@ -158,7 +158,7 @@ public class BootJavaLanguageServerComponents implements LanguageServerComponent // } else { try { liveHoverWatchdog.watchDocument(doc.getUri()); - liveHoverWatchdog.update(doc.getUri(), null); + liveHoverWatchdog.update(doc.getUri()); } catch (Throwable t) { log.error("", t); } diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringLiveHoverWatchdog.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringLiveHoverWatchdog.java index 4a12482c8..6caa1c095 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringLiveHoverWatchdog.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringLiveHoverWatchdog.java @@ -143,15 +143,21 @@ public class SpringLiveHoverWatchdog { refreshEnablement(); } - public void update(String docURI, SpringBootApp[] runningBootApps) { + public void update(String docURI) { + try { + IJavaProject project = identifyProject(docURI); + SpringBootApp[] runningBootApps = RunningAppMatcher.getAllMatchingApps(runningAppProvider.getAllRunningSpringApps(), project).toArray(new SpringBootApp[0]); + + update(docURI, runningBootApps); + } + catch (Exception e) { + logger.error("", e); + } + } + + protected void update(String docURI, SpringBootApp[] runningBootApps) { if (highlightsEnabled) { - try { - if (runningBootApps == null) { - IJavaProject project = identifyProject(docURI); - runningBootApps = RunningAppMatcher.getAllMatchingApps(runningAppProvider.getAllRunningSpringApps(), project).toArray(new SpringBootApp[0]); - } - boolean hasCurrentRunningBootApps = runningBootApps != null && runningBootApps.length > 0; if (hasCurrentRunningBootApps) { TextDocument doc = this.server.getTextDocumentService().get(docURI);