feat: add JDK runtime dependency

Author: IDontHaveBrain

src/multilspy/language_servers/kotlin_language_server/kotlin_language_server.py

@@ -3,6 +3,7 @@
 """
 
 import asyncio
+import dataclasses
 import json
 import logging
 import os
@@ -20,6 +21,16 @@
 from multilspy.multilspy_utils import PlatformUtils
 
 
+@dataclasses.dataclass
+class KotlinRuntimeDependencyPaths:
+    """
+    Stores the paths to the runtime dependencies of Kotlin Language Server
+    """
+    java_path: str
+    java_home_path: str
+    kotlin_executable_path: str
+
+
 class KotlinLanguageServer(LanguageServer):
     """
     Provides Kotlin specific instantiation of the LanguageServer class. Contains various configurations and settings specific to Kotlin.
@@ -29,16 +40,24 @@ def __init__(self, config: MultilspyConfig, logger: MultilspyLogger, repository_
         """
         Creates a Kotlin Language Server instance. This class is not meant to be instantiated directly. Use LanguageServer.create() instead.
         """
-        kotlin_executable_path = self.setup_runtime_dependencies(logger, config)
+        runtime_dependency_paths = self.setup_runtime_dependencies(logger, config)
+        self.runtime_dependency_paths = runtime_dependency_paths
+        
+        # Create command to execute the Kotlin Language Server script
+        cmd = f'"{self.runtime_dependency_paths.kotlin_executable_path}"'
+        
+        # Set environment variables including JAVA_HOME
+        proc_env = {"JAVA_HOME": self.runtime_dependency_paths.java_home_path}
+        
         super().__init__(
             config,
             logger,
             repository_root_path,
-            ProcessLaunchInfo(cmd=kotlin_executable_path, cwd=repository_root_path),
+            ProcessLaunchInfo(cmd=cmd, env=proc_env, cwd=repository_root_path),
             "kotlin",
         )
 
-    def setup_runtime_dependencies(self, logger: MultilspyLogger, config: MultilspyConfig) -> str:
+    def setup_runtime_dependencies(self, logger: MultilspyLogger, config: MultilspyConfig) -> KotlinRuntimeDependencyPaths:
         """
         Setup runtime dependencies for Kotlin Language Server.
         """
@@ -47,39 +66,69 @@ def setup_runtime_dependencies(self, logger: MultilspyLogger, config: MultilspyC
         # Verify platform support
         assert platform_id.value.startswith("win-") or platform_id.value.startswith("linux-") or platform_id.value.startswith("osx-"), "Only Windows, Linux and macOS platforms are supported for Kotlin in multilspy at the moment"
 
-        # Determine the binary name based on platform
-        binary_name = "kotlin-language-server.bat" if platform_id.value.startswith("win-") else "kotlin-language-server"
-
         # Load dependency information
         with open(os.path.join(os.path.dirname(__file__), "runtime_dependencies.json"), "r") as f:
             d = json.load(f)
             del d["_description"]
 
-        dependency = d["runtimeDependency"]
-
-        # Setup paths and download if necessary
-        kotlin_ls_dir = os.path.join(os.path.dirname(__file__), "static")
-        kotlin_bin_path = os.path.join(kotlin_ls_dir, "server", "bin")
-        kotlin_executable_path = os.path.join(kotlin_bin_path, binary_name)
+        kotlin_dependency = d["runtimeDependency"]
+        jdk_dependency = d["jdk"][platform_id.value]
 
-        if not os.path.exists(kotlin_ls_dir):
-            os.makedirs(kotlin_ls_dir)
+        # Setup paths for dependencies
+        static_dir = os.path.join(os.path.dirname(__file__), "static")
+        os.makedirs(static_dir, exist_ok=True)
+        
+        # Setup JDK paths
+        jdk_dir = os.path.join(static_dir, "jdk")
+        os.makedirs(jdk_dir, exist_ok=True)
+        
+        java_home_path = os.path.join(jdk_dir, jdk_dependency["java_home_path"])
+        java_path = os.path.join(jdk_dir, jdk_dependency["java_path"])
+        
+        # Download and extract JDK if not exists
+        if not os.path.exists(java_path):
+            logger.log(f"Downloading JDK for {platform_id.value}...", logging.INFO)
             FileUtils.download_and_extract_archive(
-                logger, dependency["url"], kotlin_ls_dir, dependency["archiveType"]
+                logger, jdk_dependency["url"], jdk_dir, jdk_dependency["archiveType"]
             )
-
-        assert os.path.exists(kotlin_executable_path)
+            # Make Java executable
+            if not platform_id.value.startswith("win-"):
+                os.chmod(java_path, 0o755)
+        
+        assert os.path.exists(java_path), f"Java executable not found at {java_path}"
 
-        # Set proper executable permissions (read+execute for everyone)
-        os.chmod(kotlin_executable_path, 0o755)
+        # Setup Kotlin Language Server paths
+        kotlin_ls_dir = os.path.join(static_dir, "server")
 
-        # Create command that will properly execute the script
+        # Get platform-specific executable script path
         if platform_id.value.startswith("win-"):
-            cmd = f'"{kotlin_executable_path}"'
+            kotlin_script = os.path.join(kotlin_ls_dir, "bin", "kotlin-language-server.bat")
         else:
-            cmd = f'/bin/sh "{kotlin_executable_path}"'
-
-        return cmd
+            kotlin_script = os.path.join(kotlin_ls_dir, "bin", "kotlin-language-server")
+        
+        # Download and extract Kotlin Language Server if script doesn't exist
+        if not os.path.exists(kotlin_script):
+            logger.log("Downloading Kotlin Language Server...", logging.INFO)
+            FileUtils.download_and_extract_archive(
+                logger, kotlin_dependency["url"], static_dir, kotlin_dependency["archiveType"]
+            )
+            
+            # Make script executable on Unix platforms
+            if os.path.exists(kotlin_script) and not platform_id.value.startswith("win-"):
+                os.chmod(kotlin_script, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH)
+        
+        # Use script file
+        if os.path.exists(kotlin_script):
+            kotlin_executable_path = kotlin_script
+            logger.log(f"Using Kotlin Language Server script at {kotlin_script}", logging.INFO)
+        else:
+            raise FileNotFoundError(f"Kotlin Language Server script not found at {kotlin_script}")
+        
+        return KotlinRuntimeDependencyPaths(
+            java_path=java_path,
+            java_home_path=java_home_path,
+            kotlin_executable_path=kotlin_executable_path
+        )
 
     def _get_initialize_params(self, repository_absolute_path: str) -> InitializeParams:
         """

src/multilspy/language_servers/kotlin_language_server/runtime_dependencies.json

@@ -5,5 +5,49 @@
         "description": "Kotlin Language Server",
         "url": "https://github.com/fwcd/kotlin-language-server/releases/download/1.3.13/server.zip",
         "archiveType": "zip"
+    },
+    "jdk": {
+        "win-x64": {
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_windows_hotspot_21.0.6_7.zip",
+            "archiveType": "zip",
+            "jdk_path": "jdk-21.0.6+7",
+            "java_home_path": "jdk-21.0.6+7",
+            "java_path": "jdk-21.0.6+7/bin/java.exe"
+        },
+        "win-arm64": {
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_windows_hotspot_21.0.6_7.zip",
+            "archiveType": "zip",
+            "jdk_path": "jdk-21.0.6+7",
+            "java_home_path": "jdk-21.0.6+7",
+            "java_path": "jdk-21.0.6+7/bin/java.exe"
+        },
+        "linux-x64": {
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_linux_hotspot_21.0.6_7.tar.gz",
+            "archiveType": "gztar",
+            "jdk_path": "jdk-21.0.6+7",
+            "java_home_path": "jdk-21.0.6+7", 
+            "java_path": "jdk-21.0.6+7/bin/java"
+        },
+        "linux-arm64": {
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.6_7.tar.gz",
+            "archiveType": "gztar",
+            "jdk_path": "jdk-21.0.6+7",
+            "java_home_path": "jdk-21.0.6+7",
+            "java_path": "jdk-21.0.6+7/bin/java"
+        },
+        "osx-x64": {
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_mac_hotspot_21.0.6_7.tar.gz",
+            "archiveType": "gztar",
+            "jdk_path": "jdk-21.0.6+7/Contents/Home",
+            "java_home_path": "jdk-21.0.6+7/Contents/Home",
+            "java_path": "jdk-21.0.6+7/Contents/Home/bin/java"
+        },
+        "osx-arm64": {
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.6_7.tar.gz",
+            "archiveType": "gztar",
+            "jdk_path": "jdk-21.0.6+7/Contents/Home",
+            "java_home_path": "jdk-21.0.6+7/Contents/Home",
+            "java_path": "jdk-21.0.6+7/Contents/Home/bin/java"
+        }
     }
 }