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

Use doc coming with doc close rather than look it up in the cache

Browse Source
This commit is contained in:
BoykoAlex
2021-05-13 15:24:05 -04:00
parent 0581e553af
commit e4bffe7976
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessLiveHoverUpdater.java
View File

@@ -12,6 +12,7 @@ package org.springframework.ide.vscode.boot.java.livehover.v2;
import java.util.Arrays;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executor;
@@ -63,12 +64,12 @@ public class SpringProcessLiveHoverUpdater {
server.getTextDocumentService().onDidChangeContent(params -> {
TextDocument doc = params.getDocument();
if (BootJavaLanguageServerComponents.LANGUAGES.contains(doc.getLanguageId())) {
watchDocument(doc.getUri());
watchDocument(doc);
}
});
server.getTextDocumentService().onDidClose(doc -> {
unwatchDocument(doc.getUri());
unwatchDocument(doc);
});
liveDataProvider.addLiveDataChangeListener(event -> {
@@ -79,31 +80,34 @@ public class SpringProcessLiveHoverUpdater {
}
public void cleanup() {
watchedDocs.keySet().forEach(uri -> cleanupLiveHints(uri));
watchedDocs.keySet().stream()
.map(uri -> this.server.getTextDocumentService().getLatestSnapshot(uri))
.filter(Objects::nonNull)
.forEach(doc -> cleanupLiveHints(doc));
}
public void watchDocument(String docURI) {
this.watchedDocs.putIfAbsent(docURI, new AtomicReference<IJavaProject>());
public void watchDocument(TextDocument doc) {
this.watchedDocs.putIfAbsent(doc.getUri(), new AtomicReference<IJavaProject>());
CompletableFuture.runAsync(() -> {
try {
updateDoc(docURI);
updateDoc(doc);
} catch (Throwable t) {
log.error("", t);
}
}, updateExecutor);
}
public void unwatchDocument(String docURI) {
this.watchedDocs.remove(docURI);
cleanupLiveHints(docURI);
public void unwatchDocument(TextDocument doc) {
this.watchedDocs.remove(doc.getUri());
cleanupLiveHints(doc);
}
// runs async
private void updateDoc(String docURI) {
private void updateDoc(TextDocument doc) {
try {
IJavaProject project = getCachedProject(docURI);
update(docURI, project);
IJavaProject project = getCachedProject(doc.getUri());
update(doc, project);
}
catch (Exception e) {
log.error("", e);
@@ -116,7 +120,8 @@ public class SpringProcessLiveHoverUpdater {
try {
for (String docURI : watchedDocs.keySet()) {
IJavaProject project = getCachedProject(docURI);
update(docURI, project);
TextDocument doc = this.server.getTextDocumentService().getLatestSnapshot(docURI);
update(doc, project);
}
} catch (Exception e) {
log.error("", e);
@@ -125,13 +130,12 @@ public class SpringProcessLiveHoverUpdater {
}
// runs async
private void update(String docURI, IJavaProject project) {
private void update(TextDocument doc, IJavaProject project) {
if (highlightsEnabled) {
try {
TextDocument doc = this.server.getTextDocumentService().getLatestSnapshot(docURI);
if (doc != null) {
CodeLens[] infos = this.hoverProvider.getLiveHoverHints(doc, project);
publishLiveHints(docURI, infos);
publishLiveHints(doc, infos);
}
} catch (Exception e) {
log.error("", e);
@@ -167,18 +171,17 @@ public class SpringProcessLiveHoverUpdater {
}
// runs sync or async
private void publishLiveHints(String docURI, CodeLens[] codeLenses) {
TextDocument doc = server.getTextDocumentService().getLatestSnapshot(docURI);
private void publishLiveHints(TextDocument doc, CodeLens[] codeLenses) {
if (doc != null) {
int version = doc.getVersion();
VersionedTextDocumentIdentifier id = new VersionedTextDocumentIdentifier(docURI, version);
VersionedTextDocumentIdentifier id = new VersionedTextDocumentIdentifier(doc.getUri(), version);
server.getClient().highlight(new HighlightParams(id, Arrays.asList(codeLenses)));
}
}
// runs sync or async
private void cleanupLiveHints(String docURI) {
publishLiveHints(docURI, new CodeLens[0]);
private void cleanupLiveHints(TextDocument doc) {
publishLiveHints(doc, new CodeLens[0]);
}
}