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

alllow project finder to be null - for test case setups

Browse Source
This commit is contained in:
Martin Lippert
2021-02-10 12:10:21 +01:00
parent 8238c1dc90
commit a80361231a
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/CompilationUnitCache.java
View File

@@ -91,18 +91,19 @@ public final class CompilationUnitCache implements DocumentContentProvider {
// IMPORTANT ===> these notifications arrive within the lsp message loop, so reactions to them have to be fast
// and not be blocked by waiting for anything
if (documentService != null) {
documentService.onDidChangeContent(doc -> invalidateCuForJavaFile(doc.getDocument().getId().getUri()));
documentService.onDidClose(doc -> invalidateCuForJavaFile(doc.getId().getUri()));
if (this.documentService != null) {
this.documentService.onDidChangeContent(doc -> invalidateCuForJavaFile(doc.getDocument().getId().getUri()));
this.documentService.onDidClose(doc -> invalidateCuForJavaFile(doc.getId().getUri()));
}
for (IJavaProject project : projectFinder.all()) {
logger.info("CU Cache: initial lookup env creation for project <{}>", project.getElementName());
loadLookupEnvTuple(project);
if (this.projectFinder != null) {
for (IJavaProject project : this.projectFinder.all()) {
logger.info("CU Cache: initial lookup env creation for project <{}>", project.getElementName());
loadLookupEnvTuple(project);
}
}
projectListener = new ProjectObserver.Listener() {
this.projectListener = new ProjectObserver.Listener() {
@Override
public void deleted(IJavaProject project) {
@@ -149,14 +150,14 @@ public final class CompilationUnitCache implements DocumentContentProvider {
};
if (this.projectObserver != null) {
this.projectObserver.addListener(projectListener);
this.projectObserver.addListener(this.projectListener);
}
}
public void dispose() {
if (projectObserver != null) {
projectObserver.removeListener(projectListener);
if (this.projectObserver != null) {
this.projectObserver.removeListener(this.projectListener);
}
}
@@ -170,7 +171,8 @@ public final class CompilationUnitCache implements DocumentContentProvider {
*/
@Deprecated
public <T> T withCompilationUnit(TextDocument document, Function<CompilationUnit, T> requestor) {
IJavaProject project = projectFinder.find(document.getId()).orElse(null);
IJavaProject project = this.projectFinder != null ? projectFinder.find(document.getId()).orElse(null) : null;
URI uri = URI.create(document.getUri());
return withCompilationUnit(project, uri, requestor);
}