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

Add extra synchronization for starting Boot LS from eclipse client

Browse Source
This commit is contained in:
aboyko
2023-04-12 22:42:17 -04:00
parent 6d14fad0e0
commit 7b4c6beb6d
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/Startup.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2022 VMware, Inc.
* Copyright (c) 2022, 2023 VMware, 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
@@ -12,7 +12,9 @@ package org.springframework.tooling.boot.ls;
import java.io.IOException;
import java.util.List;
import java.util.Set;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.lsp4e.LanguageServersRegistry;
import org.eclipse.lsp4e.LanguageServersRegistry.LanguageServerDefinition;
import org.eclipse.lsp4e.LanguageServiceAccessor;
@@ -31,22 +33,24 @@ public class Startup implements IStartup {
if (BootLanguageServerPlugin.getDefault().getPreferenceStore().getBoolean(Constants.PREF_START_LS_EARLY)) {
new BootProjectTracker(Logger.forEclipsePlugin(() -> BootLanguageServerPlugin.getDefault()),
List.of(springProjects -> {
if (!started && !springProjects.isEmpty()) {
BootLanguageServerPlugin.getDefault().getLog().info("Starting Boot LS...");
LanguageServerDefinition serverDefinition = LanguageServersRegistry.getInstance()
.getDefinition(BOOT_LS_DEFINITION_ID);
List.of(this::handleProjectsFound));
}
}
private synchronized void handleProjectsFound(Set<IJavaProject> springProjects) {
if (!started && !springProjects.isEmpty()) {
BootLanguageServerPlugin.getDefault().getLog().info("Starting Boot LS...");
LanguageServerDefinition serverDefinition = LanguageServersRegistry.getInstance()
.getDefinition(BOOT_LS_DEFINITION_ID);
try {
LanguageServiceAccessor.startLanguageServer(serverDefinition);
BootLanguageServerPlugin.getDefault().getLog().info("Started Boot LS process");
started = true;
} catch (IOException e1) {
BootLanguageServerPlugin.getDefault().getLog().error("Failed to launch Boot Language Server", e1);
}
try {
LanguageServiceAccessor.startLanguageServer(serverDefinition);
BootLanguageServerPlugin.getDefault().getLog().info("Started Boot LS process");
started = true;
} catch (IOException e1) {
BootLanguageServerPlugin.getDefault().getLog().error("Failed to launch Boot Language Server", e1);
}
}
}));
}
}