fix - Gradle server will terminate if generatePipepath error (#1557)

microsoft · Aug 5, 2024 · 2d816ba · 2d816ba
1 parent e692c0c
commit 2d816ba
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/extension/src/languageServer/languageServer.ts b/extension/src/languageServer/languageServer.ts
@@ -23,6 +23,10 @@ export async function startLanguageClientAndWaitForConnection(
     rootProjectsStore: RootProjectsStore,
     languageServerPipePath: string
 ): Promise<void> {
+    if (languageServerPipePath === "") {
+        isLanguageServerStarted = false;
+        return;
+    }
     void vscode.window.withProgress({ location: vscode.ProgressLocation.Window }, (progress) => {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         return new Promise<void>(async (resolve) => {

diff --git a/extension/src/server/GradleServer.ts b/extension/src/server/GradleServer.ts
@@ -41,7 +41,7 @@ export class GradleServer {
     private setLanguageServerPipePath(): void {
         this.languageServerPipePath = getRandomPipeName();
         if (this.languageServerPipePath === "") {
-            this.logger.error("Failed to generate language server pipe path, language server will not start");
+            this.logger.error("Gradle language server will not start due to pipe path generation failure");
         }
     }
 
@@ -55,7 +55,7 @@ export class GradleServer {
             if (isPrepared) {
                 startBuildServer = true;
             } else {
-                this.logger.error("Failed to generate build server pipe path, build server will not start");
+                this.logger.error("Gradle build server will not start due to pipe path generation failure");
             }
         }
         this.bspProxy.setBuildServerStarted(startBuildServer);

diff --git a/gradle-language-server/src/main/java/com/microsoft/gradle/GradleLanguageServer.java b/gradle-language-server/src/main/java/com/microsoft/gradle/GradleLanguageServer.java
@@ -16,7 +16,6 @@
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.lsp4j.CompletionOptions;
 import org.eclipse.lsp4j.DocumentFilter;
 import org.eclipse.lsp4j.ExecuteCommandOptions;
@@ -43,9 +42,6 @@ public class GradleLanguageServer implements LanguageServer, LanguageClientAware
 
 	public static void main(String[] args) {
 		GradleLanguageServer server = new GradleLanguageServer();
-		if (StringUtils.isBlank(args[0])) {
-			server.exit();
-		}
 		try {
 			NamedPipeStream pipeStream = new NamedPipeStream(args[0]);
 
@@ -55,7 +51,7 @@ public static void main(String[] args) {
 			server.connect(launcher.getRemoteProxy());
 			launcher.startListening();
 		} catch (IOException e) {
-			server.exit();
+			throw new RuntimeException("Gradle language server start failed", e);
 		}
 
 	}

diff --git a/gradle-server/src/main/java/com/github/badsyntax/gradle/GradleServer.java b/gradle-server/src/main/java/com/github/badsyntax/gradle/GradleServer.java
@@ -1,6 +1,7 @@
 package com.github.badsyntax.gradle;
 
 import com.github.badsyntax.gradle.utils.Utils;
+import com.google.common.base.Strings;
 import com.microsoft.gradle.GradleLanguageServer;
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
@@ -62,8 +63,10 @@ public static void main(String[] args) throws Exception {
 		int taskServerPort = Integer.parseInt(Utils.validateRequiredParam(params, "port"));
 		startTaskServerThread(taskServerPort);
 
-		String languageServerPipePath = Utils.validateRequiredParam(params, "languageServerPipePath");
-		startLanguageServerThread(languageServerPipePath);
+		String languageServerPipePath = params.get("languageServerPipePath");
+		if (!Strings.isNullOrEmpty(languageServerPipePath)) {
+			startLanguageServerThread(languageServerPipePath);
+		}
 
 		boolean startBuildServer = Boolean.parseBoolean(Utils.validateRequiredParam(params, "startBuildServer"));
 		if (startBuildServer) {