From b19c16cee6a003cbff46036e6b31f0a5d4a7b468 Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Mon, 8 May 2023 13:03:12 -0400
Subject: [PATCH] Possible fix to start/stop issue. A bit more logging.

---
 .../org.springframework.tooling.boot.ls/plugin.xml           | 5 +++--
 .../commons/STS4LanguageServerProcessStreamConnector.java    | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
index 98298c712..0759c2127 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
@@ -7,10 +7,11 @@
       <server
             class="org.springframework.tooling.boot.ls.DelegatingStreamConnectionProvider"
             clientImpl="org.springframework.tooling.ls.eclipse.commons.STS4LanguageClientImpl"
-            serverInterface="org.springframework.ide.vscode.commons.protocol.spring.SpringModelLanguageServer"
             id="org.eclipse.languageserver.languages.springboot"
             label="Spring Boot Language Server"
-            lastDocumentDisconnectedTimeout="2147483647">
+            lastDocumentDisconnectedTimeout="2147483647"
+            serverInterface="org.springframework.ide.vscode.commons.protocol.spring.SpringModelLanguageServer"
+            singleton="true">
       </server>
 
       <contentTypeMapping
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java
index 3bdc8873d..8e2226593 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java
@@ -141,6 +141,8 @@ public abstract class STS4LanguageServerProcessStreamConnector extends ProcessSt
 			command.add("--languageserver.hover-timeout=225");
 
 			setCommands(command);
+
+			LanguageServerCommonsActivator.getInstance().getLog().info("Command list starting LS: " + connectorId + "\nSTART:\n" + String.join("\n", command) + "\nEND");
 		}
 		catch (Exception e) {
 			LanguageServerCommonsActivator.logError(e, "Failed to assemble exploded LS JAR launch command");