Set JAVA_HOME for LS and DA

Fixes #97
fwcd · Apr 26, 2022 · 591771f · 591771f
1 parent 59f09d0
commit 591771f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/debugSetup.ts b/src/debugSetup.ts
@@ -31,21 +31,24 @@ export async function registerDebugAdapter({ context, status, config, javaInstal
         child_process.exec(`chmod +x ${startScriptPath}`);
     }
 
-    vscode.debug.registerDebugAdapterDescriptorFactory("kotlin", new KotlinDebugAdapterDescriptorFactory(startScriptPath));
+    vscode.debug.registerDebugAdapterDescriptorFactory("kotlin", new KotlinDebugAdapterDescriptorFactory(startScriptPath, {
+        JAVA_HOME: javaInstallation.javaHome
+    }));
 }
 
 /**
  * A factory that creates descriptors which point
  * to the Kotlin debug adapter start script.
  */
 export class KotlinDebugAdapterDescriptorFactory implements vscode.DebugAdapterDescriptorFactory {
-    private startScriptPath: string;
-
-    public constructor(startScriptPath: string) {
-        this.startScriptPath = startScriptPath;
-    }
+    public constructor(
+        private startScriptPath: string,
+        private env?: any
+    ) {}
 
     async createDebugAdapterDescriptor(session: vscode.DebugSession, executable: vscode.DebugAdapterExecutable | undefined): Promise<vscode.DebugAdapterDescriptor> {
-        return new vscode.DebugAdapterExecutable(this.startScriptPath);
+        return new vscode.DebugAdapterExecutable(this.startScriptPath, null, {
+            env: this.env
+        });
     }
 }
diff --git a/src/languageSetup.ts b/src/languageSetup.ts
@@ -38,7 +38,9 @@ export async function activateLanguageServer({ context, status, config, javaInst
 
     const transportLayer = config.get("languageServer.transport");
     let tcpPort: number = null;
-    let env: any = undefined;
+    let env: any = {
+        JAVA_HOME: javaInstallation.javaHome
+    };
 
     if (transportLayer == "tcp") {
         tcpPort = config.get("languageServer.port");
@@ -50,9 +52,7 @@ export async function activateLanguageServer({ context, status, config, javaInst
         if (config.get("languageServer.debugAttach.enabled")) {
             const autoSuspend = config.get("languageServer.debugAttach.autoSuspend");
             const attachPort = config.get("languageServer.debugAttach.port");
-            env = {
-                KOTLIN_LANGUAGE_SERVER_OPTS: `-Xdebug -agentlib:jdwp=transport=dt_socket,address=${attachPort},server=y,quiet=y,suspend=${autoSuspend ? "y" : "n"}`
-            };
+            env['KOTLIN_LANGUAGE_SERVER_OPTS'] = `-Xdebug -agentlib:jdwp=transport=dt_socket,address=${attachPort},server=y,quiet=y,suspend=${autoSuspend ? "y" : "n"}`;
         }
     } else {
         LOG.info(`Unknown transport layer: ${transportLayer}`);