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

avoid AST traversal if no boot app is running

Browse Source
This commit is contained in:
Martin Lippert
2018-01-15 12:18:17 +01:00
parent 4be3240447
commit 8381abc9df
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServer.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2016, 2017 Pivotal, Inc.
* Copyright (c) 2016, 2018 Pivotal, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -147,7 +147,7 @@ public class BootJavaLanguageServer extends SimpleLanguageServer {
getClient().highlight(new HighlightParams(params.getDocument().getId(), testHightlighter.apply(doc)));
} else {
liveHoverWatchdog.watchDocument(doc.getUri());
liveHoverWatchdog.update(doc.getUri());
liveHoverWatchdog.update(doc.getUri(), null);
}
});

31
headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringLiveHoverWatchdog.java
View File

@@ -137,15 +137,25 @@ public class SpringLiveHoverWatchdog {
refreshEnablement();
}
public void update(String docURI) {
public void update(String docURI, SpringBootApp[] runningBootApps) {
if (highlightsEnabled) {
try {
SpringBootApp[] runningBootApps = runningAppProvider.getAllRunningSpringApps().toArray(new SpringBootApp[0]);
TextDocument doc = this.server.getTextDocumentService().get(docURI);
if (doc != null) {
Range[] ranges = this.hoverProvider.getLiveHoverHints(doc, runningBootApps);
publishLiveHints(docURI, ranges);
if (runningBootApps == null) {
runningBootApps = runningAppProvider.getAllRunningSpringApps().toArray(new SpringBootApp[0]);
}
if (runningBootApps != null && runningBootApps.length > 0) {
TextDocument doc = this.server.getTextDocumentService().get(docURI);
if (doc != null) {
Range[] ranges = this.hoverProvider.getLiveHoverHints(doc, runningBootApps);
publishLiveHints(docURI, ranges);
}
}
else {
cleanupLiveHints(docURI);
}
} catch (Exception e) {
e.printStackTrace();
}
@@ -154,8 +164,13 @@ public class SpringLiveHoverWatchdog {
protected void update() {
if (this.watchedDocs.size() > 0) {
for (String docURI : watchedDocs) {
update(docURI);
try {
SpringBootApp[] runningBootApps = runningAppProvider.getAllRunningSpringApps().toArray(new SpringBootApp[0]);
for (String docURI : watchedDocs) {
update(docURI, runningBootApps);
}
} catch (Exception e) {
e.printStackTrace();
}
}
}