Merge pull request #265 from oraios/refactoring/simplify_ls_setup

Refactoring/simplify ls setup

.gitignore

@@ -204,6 +204,7 @@ pylint.html
 # dynamic LS installations
 /src/multilspy/language_servers/*/static
 /src/solidlsp/language_servers/*/static
+/src/solidlsp/language_servers/static
 
 # clojure-lsp temporary files
 .calva/

src/solidlsp/language_servers/clangd_language_server.py

@@ -2,7 +2,6 @@
 Provides C/C++ specific instantiation of the LanguageServer class. Contains various configurations and settings specific to C/C++.
 """
 
-import json
 import logging
 import os
 import pathlib
@@ -12,10 +11,11 @@ import threading
 from solidlsp.ls import SolidLanguageServer
 from solidlsp.ls_config import LanguageServerConfig
 from solidlsp.ls_logger import LanguageServerLogger
-from solidlsp.ls_utils import FileUtils, PlatformUtils
 from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
 from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 
+from .common import RuntimeDependency, RuntimeDependencyCollection
+
 
 class ClangdLanguageServer(SolidLanguageServer):
     """
@@ -28,7 +28,7 @@ class ClangdLanguageServer(SolidLanguageServer):
         """
         Creates a ClangdLanguageServer instance. This class is not meant to be instantiated directly. Use LanguageServer.create() instead.
         """
-        clangd_executable_path = self.setup_runtime_dependencies(logger, config)
+        clangd_executable_path = self._setup_runtime_dependencies(logger, config)
         super().__init__(
             config,
             logger,
@@ -41,42 +41,49 @@ class ClangdLanguageServer(SolidLanguageServer):
         self.initialize_searcher_command_available = threading.Event()
         self.resolve_main_method_available = threading.Event()
 
-    def setup_runtime_dependencies(self, logger: LanguageServerLogger, config: LanguageServerConfig) -> str:
+    @staticmethod
+    def _setup_runtime_dependencies(logger: LanguageServerLogger, config: LanguageServerConfig) -> str:
         """
-        Setup runtime dependencies for ClangdLanguageServer.
+        Setup runtime dependencies for ClangdLanguageServer and return the command to start the server.
         """
-        platform_id = PlatformUtils.get_platform_id()
-
-        with open(os.path.join(os.path.dirname(__file__), "runtime_dependencies.json")) as f:
-            d = json.load(f)
-            del d["_description"]
-
-        assert platform_id.value in [
-            "linux-x64",
-            "win-x64",
-            "osx-arm64",
-        ], (
-            "Unsupported platform: " + platform_id.value
+        deps = RuntimeDependencyCollection(
+            [
+                RuntimeDependency(
+                    id="Clangd",
+                    description="Clangd for Linux (x64)",
+                    url="https://github.com/clangd/clangd/releases/download/19.1.2/clangd-linux-19.1.2.zip",
+                    platform_id="linux-x64",
+                    archive_type="zip",
+                    binary_name="clangd_19.1.2/bin/clangd",
+                ),
+                RuntimeDependency(
+                    id="Clangd",
+                    description="Clangd for Windows (x64)",
+                    url="https://github.com/clangd/clangd/releases/download/19.1.2/clangd-windows-19.1.2.zip",
+                    platform_id="win-x64",
+                    archive_type="zip",
+                    binary_name="clangd_19.1.2/bin/clangd.exe",
+                ),
+                RuntimeDependency(
+                    id="Clangd",
+                    description="Clangd for macOS (Arm64)",
+                    url="https://github.com/clangd/clangd/releases/download/19.1.2/clangd-mac-19.1.2.zip",
+                    platform_id="osx-arm64",
+                    archive_type="zip",
+                    binary_name="clangd_19.1.2/bin/clangd",
+                ),
+            ]
         )
 
-        runtime_dependencies = d["runtimeDependencies"]
-        runtime_dependencies = [dependency for dependency in runtime_dependencies if dependency["platformId"] == platform_id.value]
-        assert len(runtime_dependencies) == 1
-        # Select dependency matching the current platform
-        dependency = next((dep for dep in runtime_dependencies if dep["platformId"] == platform_id.value), None)
-        if dependency is None:
-            raise RuntimeError(f"No runtime dependency found for platform {platform_id.value}")
-
         clangd_ls_dir = os.path.join(os.path.dirname(__file__), "static", "clangd")
-        clangd_executable_path = os.path.join(clangd_ls_dir, "clangd_19.1.2", "bin", dependency["binaryName"])
+        dep = deps.single_for_current_platform()
+        clangd_executable_path = deps.binary_path(clangd_ls_dir)
         if not os.path.exists(clangd_executable_path):
-            clangd_url = dependency["url"]
-            logger.log(f"Clangd executable not found at {clangd_executable_path}. Downloading from {clangd_url}", logging.INFO)
-            os.makedirs(clangd_ls_dir, exist_ok=True)
-            if dependency["archiveType"] == "zip":
-                FileUtils.download_and_extract_archive(logger, clangd_url, clangd_ls_dir, dependency["archiveType"])
-            else:
-                raise RuntimeError(f"Unsupported archive type: {dependency['archiveType']}")
+            logger.log(
+                f"Clangd executable not found at {clangd_executable_path}. Downloading from {dep.url}",
+                logging.INFO,
+            )
+            deps.install(logger, clangd_ls_dir)
         if not os.path.exists(clangd_executable_path):
             raise FileNotFoundError(
                 f"Clangd executable not found at {clangd_executable_path}.\n"
@@ -86,29 +93,34 @@ class ClangdLanguageServer(SolidLanguageServer):
 
         return clangd_executable_path
 
-    def _get_initialize_params(self, repository_absolute_path: str) -> InitializeParams:
+    @staticmethod
+    def _get_initialize_params(repository_absolute_path: str) -> InitializeParams:
         """
         Returns the initialize params for the clangd Language Server.
         """
-        with open(os.path.join(os.path.dirname(__file__), "initialize_params.json")) as f:
-            d = json.load(f)
+        root_uri = pathlib.Path(repository_absolute_path).as_uri()
+        initialize_params = {
+            "locale": "en",
+            "capabilities": {
+                "textDocument": {
+                    "synchronization": {"didSave": True, "dynamicRegistration": True},
+                    "completion": {"dynamicRegistration": True, "completionItem": {"snippetSupport": True}},
+                    "definition": {"dynamicRegistration": True},
+                },
+                "workspace": {"workspaceFolders": True, "didChangeConfiguration": {"dynamicRegistration": True}},
+            },
+            "processId": os.getpid(),
+            "rootPath": repository_absolute_path,
+            "rootUri": root_uri,
+            "workspaceFolders": [
+                {
+                    "uri": root_uri,
+                    "name": "$name",
+                }
+            ],
+        }
 
-        del d["_description"]
-
-        d["processId"] = os.getpid()
-        assert d["rootPath"] == "$rootPath"
-        d["rootPath"] = repository_absolute_path
-
-        assert d["rootUri"] == "$rootUri"
-        d["rootUri"] = pathlib.Path(repository_absolute_path).as_uri()
-
-        assert d["workspaceFolders"][0]["uri"] == "$uri"
-        d["workspaceFolders"][0]["uri"] = pathlib.Path(repository_absolute_path).as_uri()
-
-        assert d["workspaceFolders"][0]["name"] == "$name"
-        d["workspaceFolders"][0]["name"] = os.path.basename(repository_absolute_path)
-
-        return d
+        return initialize_params
 
     def _start_server(self):
         """

src/solidlsp/language_servers/clangd_language_server/initialize_params.json

@@ -1,36 +0,0 @@
-{
-    "_description": "The parameters sent by the client when initializing the language server with the \"initialize\" request. More details at https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#initialize",
-    "processId": "os.getpid()",
-    "locale": "en",
-    "rootPath": "$rootPath",
-    "rootUri": "$rootUri",
-    "capabilities": {
-        "textDocument": {
-            "synchronization": {
-                "didSave": true,
-                "dynamicRegistration": true
-            },
-            "completion": {
-                "dynamicRegistration": true,
-                "completionItem": {
-                    "snippetSupport": true
-                }
-            },
-            "definition": {
-                "dynamicRegistration": true
-            }
-        },
-        "workspace": {
-            "workspaceFolders": true,
-            "didChangeConfiguration": {
-                "dynamicRegistration": true
-            }
-        }
-    },
-    "workspaceFolders": [
-        {
-            "uri": "$uri",
-            "name": "$name"
-        }
-    ]
-}

src/solidlsp/language_servers/clangd_language_server/runtime_dependencies.json

@@ -1,29 +0,0 @@
-{
-    "_description": "Used to download the runtime dependencies for running Clangd.",
-    "runtimeDependencies": [
-        {
-            "id": "Clangd",
-            "description": "Clangd for Linux (x64)",
-            "url": "https://github.com/clangd/clangd/releases/download/19.1.2/clangd-linux-19.1.2.zip",
-            "platformId": "linux-x64",
-            "archiveType": "zip",
-            "binaryName": "clangd"
-        },
-        {
-            "id": "Clangd",
-            "description": "Clangd for Windows (x64)",
-            "url": "https://github.com/clangd/clangd/releases/download/19.1.2/clangd-windows-19.1.2.zip",
-            "platformId": "win-x64",
-            "archiveType": "zip",
-            "binaryName": "clangd.exe"
-        },
-        {
-            "id": "Clangd",
-            "description": "Clangd for macOS (Arm64)",
-            "url": "https://github.com/clangd/clangd/releases/download/19.1.2/clangd-mac-19.1.2.zip",
-            "platformId": "osx-arm64",
-            "archiveType": "zip",
-            "binaryName": "clangd"
-        }
-    ]
-}

src/solidlsp/language_servers/clojure_lsp.py

@@ -13,10 +13,11 @@ import threading
 from solidlsp.ls import SolidLanguageServer
 from solidlsp.ls_config import LanguageServerConfig
 from solidlsp.ls_logger import LanguageServerLogger
-from solidlsp.ls_utils import FileUtils, PlatformUtils
 from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
 from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 
+from .common import RuntimeDependency, RuntimeDependencyCollection
+
 
 def run_command(cmd: list, capture_output: bool = True) -> subprocess.CompletedProcess:
     return subprocess.run(
@@ -44,38 +45,44 @@ class ClojureLSP(SolidLanguageServer):
     """
 
     clojure_lsp_releases = "https://github.com/clojure-lsp/clojure-lsp/releases/latest/download"
-    runtime_dependencies = [
-        {
-            "url": f"{clojure_lsp_releases}/clojure-lsp-native-macos-aarch64.zip",
-            "platformId": "osx-arm64",
-            "archiveType": "zip",
-            "binaryName": "clojure-lsp",
-        },
-        {
-            "url": f"{clojure_lsp_releases}/clojure-lsp-native-linux-aarch64.zip",
-            "platformId": "linux-arm64",
-            "archiveType": "zip",
-            "binaryName": "clojure-lsp",
-        },
-        {
-            "url": f"{clojure_lsp_releases}/clojure-lsp-native-linux-amd64.zip",
-            "platformId": "linux-x64",
-            "archiveType": "zip",
-            "binaryName": "clojure-lsp",
-        },
-        {
-            "url": f"{clojure_lsp_releases}/clojure-lsp-native-windows-amd64.zip",
-            "platformId": "win-x64",
-            "archiveType": "zip",
-            "binaryName": "clojure-lsp.exe",
-        },
-    ]
+    runtime_dependencies = RuntimeDependencyCollection(
+        [
+            RuntimeDependency(
+                id="clojure-lsp",
+                url=f"{clojure_lsp_releases}/clojure-lsp-native-macos-aarch64.zip",
+                platform_id="osx-arm64",
+                archive_type="zip",
+                binary_name="clojure-lsp",
+            ),
+            RuntimeDependency(
+                id="clojure-lsp",
+                url=f"{clojure_lsp_releases}/clojure-lsp-native-linux-aarch64.zip",
+                platform_id="linux-arm64",
+                archive_type="zip",
+                binary_name="clojure-lsp",
+            ),
+            RuntimeDependency(
+                id="clojure-lsp",
+                url=f"{clojure_lsp_releases}/clojure-lsp-native-linux-amd64.zip",
+                platform_id="linux-x64",
+                archive_type="zip",
+                binary_name="clojure-lsp",
+            ),
+            RuntimeDependency(
+                id="clojure-lsp",
+                url=f"{clojure_lsp_releases}/clojure-lsp-native-windows-amd64.zip",
+                platform_id="win-x64",
+                archive_type="zip",
+                binary_name="clojure-lsp.exe",
+            ),
+        ]
+    )
 
     def __init__(self, config: LanguageServerConfig, logger: LanguageServerLogger, repository_root_path: str):
         """
         Creates a ClojureLSP instance. This class is not meant to be instantiated directly. Use LanguageServer.create() instead.
         """
-        clojure_lsp_executable_path = self.setup_runtime_dependencies(logger, config)
+        clojure_lsp_executable_path = self._setup_runtime_dependencies(logger, config)
         super().__init__(
             config,
             logger,
@@ -88,44 +95,40 @@ class ClojureLSP(SolidLanguageServer):
         self.resolve_main_method_available = threading.Event()
         self.service_ready_event = threading.Event()
 
-    def setup_runtime_dependencies(self, logger: LanguageServerLogger, config: LanguageServerConfig) -> str:
-        """Setup runtime dependencies for clojure-lsp."""
+    @staticmethod
+    def _setup_runtime_dependencies(logger: LanguageServerLogger, config: LanguageServerConfig) -> str:
+        """Setup runtime dependencies for clojure-lsp and return the command to start the server."""
         verify_clojure_cli()
-        platform_id = PlatformUtils.get_platform_id()
-
-        runtime_dependencies = [dependency for dependency in self.runtime_dependencies if dependency["platformId"] == platform_id.value]
-        if len(runtime_dependencies) != 1:
-            raise RuntimeError(f"Could not find a suitable clojure-lsp runtime dependency for platform {platform_id.value}.")
-        dependency = runtime_dependencies[0]
+        deps = ClojureLSP.runtime_dependencies
+        dependency = deps.single_for_current_platform()
 
         clojurelsp_ls_dir = os.path.join(os.path.dirname(__file__), "static", "clojure-lsp")
-        clojurelsp_executable_path = os.path.join(clojurelsp_ls_dir, dependency["binaryName"])
+        clojurelsp_executable_path = deps.binary_path(clojurelsp_ls_dir)
         if not os.path.exists(clojurelsp_executable_path):
             os.makedirs(clojurelsp_ls_dir, exist_ok=True)
-            logger.log(f"Downloading and extracting clojure-lsp from {dependency['url']} to {clojurelsp_ls_dir}", logging.INFO)
-            FileUtils.download_and_extract_archive(logger, dependency["url"], clojurelsp_ls_dir, dependency["archiveType"])
+            logger.log(
+                f"Downloading and extracting clojure-lsp from {dependency.url} to {clojurelsp_ls_dir}",
+                logging.INFO,
+            )
+            deps.install(logger, clojurelsp_ls_dir)
         if not os.path.exists(clojurelsp_executable_path):
             raise FileNotFoundError(f"Download failed? Could not find clojure-lsp executable at {clojurelsp_executable_path}")
         os.chmod(clojurelsp_executable_path, stat.S_IEXEC)
         return clojurelsp_executable_path
 
-    def _get_initialize_params(self, repository_absolute_path: str) -> InitializeParams:
+    @staticmethod
+    def _get_initialize_params(repository_absolute_path: str) -> InitializeParams:
         """Returns the init params for clojure-lsp."""
         root_uri = pathlib.Path(repository_absolute_path).as_uri()
         return {  # type: ignore
             "processId": os.getpid(),
             "rootPath": repository_absolute_path,
             "rootUri": root_uri,
-            "clientInfo": {"name": "solidlsp", "version": "0.1.0"},
             "capabilities": {
                 "workspace": {
                     "applyEdit": True,
                     "workspaceEdit": {"documentChanges": True},
-                    "symbol": {
-                        "symbolKind": {
-                            "valueSet": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26]
-                        }
-                    },
+                    "symbol": {"symbolKind": {"valueSet": list(range(1, 27))}},
                     "workspaceFolders": True,
                 },
                 "textDocument": {
@@ -133,13 +136,10 @@ class ClojureLSP(SolidLanguageServer):
                     "publishDiagnostics": {"relatedInformation": True, "tagSupport": {"valueSet": [1, 2]}},
                     "definition": {"linkSupport": True},
                     "references": {},
-                    "completion": {"completionItem": {"snippetSupport": True, "documentationFormat": ["markdown", "plaintext"]}},
                     "hover": {"contentFormat": ["markdown", "plaintext"]},
                     "documentSymbol": {
                         "hierarchicalDocumentSymbolSupport": True,
-                        "symbolKind": {
-                            "valueSet": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26]
-                        },
+                        "symbolKind": {"valueSet": list(range(1, 27))},  #
                     },
                 },
                 "general": {"positionEncodings": ["utf-16"]},

src/solidlsp/language_servers/common.py

@@ -0,0 +1,101 @@
+from __future__ import annotations
+
+import os
+import subprocess
+from collections.abc import Sequence
+from dataclasses import dataclass
+
+from solidlsp.ls_logger import LanguageServerLogger
+from solidlsp.ls_utils import FileUtils, PlatformUtils
+
+
+@dataclass(kw_only=True)
+class RuntimeDependency:
+    """Represents a runtime dependency for a language server."""
+
+    id: str
+    platform_id: str | None = None
+    url: str | None = None
+    archive_type: str | None = None
+    binary_name: str | None = None
+    command: str | None = None
+    package_name: str | None = None
+    package_version: str | None = None
+    extract_path: str | None = None
+    description: str | None = None
+
+
+class RuntimeDependencyCollection:
+    """Utility to handle installation of runtime dependencies."""
+
+    def __init__(self, dependencies: Sequence[RuntimeDependency]):
+        self._dependencies = list(dependencies)
+
+    def for_platform(self, platform_id: str) -> list[RuntimeDependency]:
+        return [d for d in self._dependencies if d.platform_id in (platform_id, "any", "platform-agnostic", None)]
+
+    def for_current_platform(self) -> list[RuntimeDependency]:
+        return self.for_platform(PlatformUtils.get_platform_id().value)
+
+    def single_for_current_platform(self) -> RuntimeDependency:
+        deps = self.for_current_platform()
+        if len(deps) != 1:
+            raise RuntimeError(f"Expected exactly one runtime dependency for {PlatformUtils.get_platform_id().value}, found {len(deps)}")
+        return deps[0]
+
+    def binary_path(self, target_dir: str) -> str:
+        dep = self.single_for_current_platform()
+        if not dep.binary_name:
+            return target_dir
+        return os.path.join(target_dir, dep.binary_name)
+
+    def install(self, logger: LanguageServerLogger, target_dir: str) -> dict[str, str]:
+        """Install all dependencies for the current platform into *target_dir*.
+
+        Returns a mapping from dependency id to the resolved binary path.
+        """
+        os.makedirs(target_dir, exist_ok=True)
+        results: dict[str, str] = {}
+        for dep in self.for_current_platform():
+            if dep.url:
+                self._install_from_url(dep, logger, target_dir)
+            if dep.command:
+                self._run_command(dep.command, target_dir)
+            if dep.binary_name:
+                results[dep.id] = os.path.join(target_dir, dep.binary_name)
+            else:
+                results[dep.id] = target_dir
+        return results
+
+    @staticmethod
+    def _run_command(command: str, cwd: str) -> None:
+        if PlatformUtils.get_platform_id().value.startswith("win"):
+            subprocess.run(
+                command,
+                shell=True,
+                check=True,
+                cwd=cwd,
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+            )
+        else:
+            import pwd
+
+            user = pwd.getpwuid(os.getuid()).pw_name
+            subprocess.run(
+                command,
+                shell=True,
+                check=True,
+                user=user,
+                cwd=cwd,
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+            )
+
+    @staticmethod
+    def _install_from_url(dep: RuntimeDependency, logger: LanguageServerLogger, target_dir: str) -> None:
+        if dep.archive_type == "gz" and dep.binary_name:
+            dest = os.path.join(target_dir, dep.binary_name)
+            FileUtils.download_and_extract_archive(logger, dep.url, dest, dep.archive_type)
+        else:
+            FileUtils.download_and_extract_archive(logger, dep.url, target_dir, dep.archive_type or "zip")

src/solidlsp/language_servers/csharp_language_server.py

@@ -8,11 +8,11 @@ import os
 import platform
 import shutil
 import stat
+import subprocess
 import tarfile
 import threading
 import urllib.request
 import zipfile
-from dataclasses import dataclass
 from pathlib import Path
 from typing import cast
 
@@ -26,21 +26,7 @@ from solidlsp.ls_utils import PathUtils
 from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
 from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 
-
-@dataclass
-class RuntimeDependency:
-    """Represents a runtime dependency for the C# language server."""
-
-    id: str
-    description: str
-    platform_id: str
-    archive_type: str
-    binary_name: str
-    package_name: str | None = None
-    package_version: str | None = None
-    extract_path: str | None = None
-    url: str | None = None
-
+from .common import RuntimeDependency
 
 # Runtime dependencies configuration
 RUNTIME_DEPENDENCIES = [
@@ -194,13 +180,13 @@ class CSharpLanguageServer(SolidLanguageServer):
         Creates a CSharpLanguageServer instance. This class is not meant to be instantiated directly.
         Use LanguageServer.create() instead.
         """
-        dotnet_path, language_server_path, cache_dir = self._ensure_server_installed(logger, config)
+        dotnet_path, language_server_path = self._ensure_server_installed(logger, config)
 
         # Find solution or project file
         solution_or_project = find_solution_or_project_file(repository_root_path)
 
         # Create log directory
-        log_dir = cache_dir / "logs"
+        log_dir = Path(self.ls_resources_dir()) / "logs"
         log_dir.mkdir(parents=True, exist_ok=True)
 
         # Build command using dotnet directly
@@ -228,30 +214,21 @@ class CSharpLanguageServer(SolidLanguageServer):
     def is_ignored_dirname(self, dirname: str) -> bool:
         return super().is_ignored_dirname(dirname) or dirname in ["bin", "obj", "packages", ".vs"]
 
-    def _ensure_server_installed(self, logger: LanguageServerLogger, config: LanguageServerConfig) -> tuple[str, str, Path]:
+    @classmethod
+    def _ensure_server_installed(cls, logger: LanguageServerLogger, config: LanguageServerConfig) -> tuple[str, str]:
         """
         Ensure .NET runtime and Microsoft.CodeAnalysis.LanguageServer are available.
-        Returns a tuple of (dotnet_path, language_server_dll_path, cache_dir).
+        Returns a tuple of (dotnet_path, language_server_dll_path).
         """
-        # Determine platform runtime ID
-        runtime_id = self._get_runtime_id()
+        runtime_id = CSharpLanguageServer._get_runtime_id()
+        lang_server_dep, dotnet_runtime_dep = CSharpLanguageServer._get_runtime_dependencies(runtime_id)
+        dotnet_path = CSharpLanguageServer._ensure_dotnet_runtime(logger, dotnet_runtime_dep)
+        server_dll_path = CSharpLanguageServer._ensure_language_server(logger, lang_server_dep)
 
-        # Set up cache directory
-        cache_dir = Path.home() / ".cache" / "serena" / "language-servers" / "csharp"
-        cache_dir.mkdir(parents=True, exist_ok=True)
+        return dotnet_path, server_dll_path
 
-        # Get runtime dependencies for this platform
-        lang_server_dep, dotnet_runtime_dep = self._get_runtime_dependencies(runtime_id)
-
-        # Ensure .NET runtime is available
-        dotnet_path = self._ensure_dotnet_runtime(logger, cache_dir, dotnet_runtime_dep)
-
-        # Ensure language server is available
-        server_dll_path = self._ensure_language_server(logger, cache_dir, lang_server_dep)
-
-        return dotnet_path, server_dll_path, cache_dir
-
-    def _get_runtime_id(self) -> str:
+    @staticmethod
+    def _get_runtime_id() -> str:
         """Determine the runtime ID based on the platform."""
         system = platform.system().lower()
         machine = platform.machine().lower()
@@ -265,7 +242,8 @@ class CSharpLanguageServer(SolidLanguageServer):
         else:
             raise LanguageServerException(f"Unsupported platform: {system} {machine}")
 
-    def _get_runtime_dependencies(self, runtime_id: str) -> tuple[RuntimeDependency, RuntimeDependency]:
+    @staticmethod
+    def _get_runtime_dependencies(runtime_id: str) -> tuple[RuntimeDependency, RuntimeDependency]:
         """Get the language server and .NET runtime dependencies for the platform."""
         lang_server_dep = None
         dotnet_runtime_dep = None
@@ -283,15 +261,14 @@ class CSharpLanguageServer(SolidLanguageServer):
 
         return lang_server_dep, dotnet_runtime_dep
 
-    def _ensure_dotnet_runtime(self, logger: LanguageServerLogger, cache_dir: Path, runtime_dep: RuntimeDependency) -> str:
+    @staticmethod
+    def _ensure_dotnet_runtime(logger: LanguageServerLogger, runtime_dep: RuntimeDependency) -> str:
         """Ensure .NET runtime is available and return the dotnet executable path."""
-        # Check if dotnet is already available in system
+        # Check if dotnet is already available on the system
         system_dotnet = shutil.which("dotnet")
         if system_dotnet:
             # Check if it's .NET 9
             try:
-                import subprocess
-
                 result = subprocess.run([system_dotnet, "--list-runtimes"], capture_output=True, text=True, check=True)
                 if "Microsoft.NETCore.App 9." in result.stdout:
                     logger.log("Found system .NET 9 runtime", logging.INFO)
@@ -300,14 +277,15 @@ class CSharpLanguageServer(SolidLanguageServer):
                 pass
 
         # Download .NET 9 runtime using config
-        return self._ensure_dotnet_runtime_from_config(logger, cache_dir, runtime_dep)
+        return CSharpLanguageServer._ensure_dotnet_runtime_from_config(logger, runtime_dep)
 
-    def _ensure_language_server(self, logger: LanguageServerLogger, cache_dir: Path, lang_server_dep: RuntimeDependency) -> str:
+    @classmethod
+    def _ensure_language_server(cls, logger: LanguageServerLogger, lang_server_dep: RuntimeDependency) -> str:
         """Ensure language server is available and return the DLL path."""
         package_name = lang_server_dep.package_name
         package_version = lang_server_dep.package_version
 
-        server_dir = cache_dir / f"{package_name}.{package_version}"
+        server_dir = Path(cls.ls_resources_dir()) / f"{package_name}.{package_version}"
         server_dll = server_dir / lang_server_dep.binary_name
 
         if server_dll.exists():
@@ -316,10 +294,10 @@ class CSharpLanguageServer(SolidLanguageServer):
 
         # Download and install the language server
         logger.log(f"Downloading {package_name} version {package_version}...", logging.INFO)
-        package_path = self._download_nuget_package_direct(logger, package_name, package_version, cache_dir)
+        package_path = CSharpLanguageServer._download_nuget_package_direct(logger, package_name, package_version)
 
         # Extract and install
-        self._extract_language_server(lang_server_dep, package_path, server_dir)
+        CSharpLanguageServer._extract_language_server(lang_server_dep, package_path, server_dir)
 
         if not server_dll.exists():
             raise LanguageServerException("Microsoft.CodeAnalysis.LanguageServer.dll not found after extraction")
@@ -331,7 +309,8 @@ class CSharpLanguageServer(SolidLanguageServer):
         logger.log(f"Successfully installed Microsoft.CodeAnalysis.LanguageServer to {server_dll}", logging.INFO)
         return str(server_dll)
 
-    def _extract_language_server(self, lang_server_dep: RuntimeDependency, package_path: Path, server_dir: Path) -> None:
+    @staticmethod
+    def _extract_language_server(lang_server_dep: RuntimeDependency, package_path: Path, server_dir: Path) -> None:
         """Extract language server files from downloaded package."""
         extract_path = lang_server_dep.extract_path or "lib/net9.0"
         source_dir = package_path / extract_path
@@ -353,9 +332,8 @@ class CSharpLanguageServer(SolidLanguageServer):
         server_dir.mkdir(parents=True, exist_ok=True)
         shutil.copytree(source_dir, server_dir, dirs_exist_ok=True)
 
-    def _download_nuget_package_direct(
-        self, logger: LanguageServerLogger, package_name: str, package_version: str, cache_dir: Path
-    ) -> Path:
+    @classmethod
+    def _download_nuget_package_direct(cls, logger: LanguageServerLogger, package_name: str, package_version: str) -> Path:
         """
         Download a NuGet package directly from the Azure NuGet feed.
         Returns the path to the extracted package directory.
@@ -363,7 +341,7 @@ class CSharpLanguageServer(SolidLanguageServer):
         azure_feed_url = "https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json"
 
         # Create temporary directory for package download
-        temp_dir = cache_dir / "temp_downloads"
+        temp_dir = Path(cls.ls_resources_dir()) / "temp_downloads"
         temp_dir.mkdir(parents=True, exist_ok=True)
 
         try:
@@ -411,18 +389,17 @@ class CSharpLanguageServer(SolidLanguageServer):
                 f"Failed to download package {package_name} version {package_version} from Azure NuGet feed: {e}"
             ) from e
 
-    def _ensure_dotnet_runtime_from_config(self, logger: LanguageServerLogger, cache_dir: Path, runtime_dep: RuntimeDependency) -> str:
+    @classmethod
+    def _ensure_dotnet_runtime_from_config(cls, logger: LanguageServerLogger, runtime_dep: RuntimeDependency) -> str:
         """
         Ensure .NET 9 runtime is available using runtime dependency configuration.
         Returns the path to the dotnet executable.
         """
-        # Check if dotnet is already available in system
+        # Check if dotnet is already available on the system
         system_dotnet = shutil.which("dotnet")
         if system_dotnet:
             # Check if it's .NET 9
             try:
-                import subprocess
-
                 result = subprocess.run([system_dotnet, "--list-runtimes"], capture_output=True, text=True, check=True)
                 if "Microsoft.NETCore.App 9." in result.stdout:
                     logger.log("Found system .NET 9 runtime", logging.INFO)
@@ -431,7 +408,7 @@ class CSharpLanguageServer(SolidLanguageServer):
                 pass
 
         # Download .NET 9 runtime using config
-        dotnet_dir = cache_dir / "dotnet-runtime-9.0"
+        dotnet_dir = Path(cls.ls_resources_dir()) / "dotnet-runtime-9.0"
         dotnet_exe = dotnet_dir / runtime_dep.binary_name
 
         if dotnet_exe.exists():
@@ -499,9 +476,7 @@ class CSharpLanguageServer(SolidLanguageServer):
                         "didChangeWatchedFiles": {"dynamicRegistration": True},
                         "symbol": {
                             "dynamicRegistration": True,
-                            "symbolKind": {
-                                "valueSet": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26]
-                            },
+                            "symbolKind": {"valueSet": list(range(1, 27))},
                         },
                         "executeCommand": {"dynamicRegistration": True},
                         "configuration": True,
@@ -510,20 +485,6 @@ class CSharpLanguageServer(SolidLanguageServer):
                     },
                     "textDocument": {
                         "synchronization": {"dynamicRegistration": True, "willSave": True, "willSaveWaitUntil": True, "didSave": True},
-                        "completion": {
-                            "dynamicRegistration": True,
-                            "contextSupport": True,
-                            "completionItem": {
-                                "snippetSupport": True,
-                                "commitCharactersSupport": True,
-                                "documentationFormat": ["markdown", "plaintext"],
-                                "deprecatedSupport": True,
-                                "preselectSupport": True,
-                            },
-                            "completionItemKind": {
-                                "valueSet": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25]
-                            },
-                        },
                         "hover": {"dynamicRegistration": True, "contentFormat": ["markdown", "plaintext"]},
                         "signatureHelp": {
                             "dynamicRegistration": True,
@@ -534,38 +495,11 @@ class CSharpLanguageServer(SolidLanguageServer):
                         },
                         "definition": {"dynamicRegistration": True},
                         "references": {"dynamicRegistration": True},
-                        "documentHighlight": {"dynamicRegistration": True},
                         "documentSymbol": {
                             "dynamicRegistration": True,
-                            "symbolKind": {
-                                "valueSet": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26]
-                            },
+                            "symbolKind": {"valueSet": list(range(1, 27))},
                             "hierarchicalDocumentSymbolSupport": True,
                         },
-                        "codeAction": {
-                            "dynamicRegistration": True,
-                            "codeActionLiteralSupport": {
-                                "codeActionKind": {
-                                    "valueSet": [
-                                        "",
-                                        "quickfix",
-                                        "refactor",
-                                        "refactor.extract",
-                                        "refactor.inline",
-                                        "refactor.rewrite",
-                                        "source",
-                                        "source.organizeImports",
-                                    ]
-                                }
-                            },
-                        },
-                        "codeLens": {"dynamicRegistration": True},
-                        "formatting": {"dynamicRegistration": True},
-                        "rangeFormatting": {"dynamicRegistration": True},
-                        "onTypeFormatting": {"dynamicRegistration": True},
-                        "rename": {"dynamicRegistration": True},
-                        "publishDiagnostics": {"relatedInformation": True},
-                        "foldingRange": {"dynamicRegistration": True, "rangeLimit": 5000, "lineFoldingOnly": True},
                     },
                 },
             },

src/solidlsp/language_servers/dart_language_server.py

@@ -0,0 +1,158 @@
+import logging
+import os
+import pathlib
+import stat
+
+from solidlsp.ls import SolidLanguageServer
+from solidlsp.ls_logger import LanguageServerLogger
+from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
+
+from .common import RuntimeDependency, RuntimeDependencyCollection
+
+
+class DartLanguageServer(SolidLanguageServer):
+    """
+    Provides Dart specific instantiation of the LanguageServer class. Contains various configurations and settings specific to Dart.
+    """
+
+    def __init__(self, config, logger, repository_root_path):
+        """
+        Creates a DartServer instance. This class is not meant to be instantiated directly. Use LanguageServer.create() instead.
+        """
+        executable_path = self._setup_runtime_dependencies(logger)
+        super().__init__(
+            config,
+            logger,
+            repository_root_path,
+            ProcessLaunchInfo(cmd=executable_path, cwd=repository_root_path),
+            "dart",
+        )
+
+    @classmethod
+    def _setup_runtime_dependencies(cls, logger: "LanguageServerLogger") -> str:
+        deps = RuntimeDependencyCollection(
+            [
+                RuntimeDependency(
+                    id="DartLanguageServer",
+                    description="Dart Language Server for Linux (x64)",
+                    url="https://storage.googleapis.com/dart-archive/channels/stable/release/3.7.1/sdk/dartsdk-linux-x64-release.zip",
+                    platform_id="linux-x64",
+                    archive_type="zip",
+                    binary_name="dart-sdk/bin/dart",
+                ),
+                RuntimeDependency(
+                    id="DartLanguageServer",
+                    description="Dart Language Server for Windows (x64)",
+                    url="https://storage.googleapis.com/dart-archive/channels/stable/release/3.7.1/sdk/dartsdk-windows-x64-release.zip",
+                    platform_id="win-x64",
+                    archive_type="zip",
+                    binary_name="dart-sdk/bin/dart.exe",
+                ),
+                RuntimeDependency(
+                    id="DartLanguageServer",
+                    description="Dart Language Server for Windows (arm64)",
+                    url="https://storage.googleapis.com/dart-archive/channels/stable/release/3.7.1/sdk/dartsdk-windows-arm64-release.zip",
+                    platform_id="win-arm64",
+                    archive_type="zip",
+                    binary_name="dart-sdk/bin/dart.exe",
+                ),
+                RuntimeDependency(
+                    id="DartLanguageServer",
+                    description="Dart Language Server for macOS (x64)",
+                    url="https://storage.googleapis.com/dart-archive/channels/stable/release/3.7.1/sdk/dartsdk-macos-x64-release.zip",
+                    platform_id="osx-x64",
+                    archive_type="zip",
+                    binary_name="dart-sdk/bin/dart",
+                ),
+                RuntimeDependency(
+                    id="DartLanguageServer",
+                    description="Dart Language Server for macOS (arm64)",
+                    url="https://storage.googleapis.com/dart-archive/channels/stable/release/3.7.1/sdk/dartsdk-macos-arm64-release.zip",
+                    platform_id="osx-arm64",
+                    archive_type="zip",
+                    binary_name="dart-sdk/bin/dart",
+                ),
+            ]
+        )
+
+        dart_ls_dir = cls.ls_resources_dir()
+        dart_executable_path = deps.binary_path(dart_ls_dir)
+
+        if not os.path.exists(dart_ls_dir):
+            os.makedirs(dart_ls_dir)
+            deps.install(logger, dart_ls_dir)
+
+        assert os.path.exists(dart_executable_path)
+        os.chmod(dart_executable_path, stat.S_IEXEC)
+
+        return f"{dart_executable_path} language-server --client-id multilspy.dart --client-version 1.2"
+
+    @staticmethod
+    def _get_initialize_params(repository_absolute_path: str):
+        """
+        Returns the initialize params for the Dart Language Server.
+        """
+        root_uri = pathlib.Path(repository_absolute_path).as_uri()
+        initialize_params = {
+            "capabilities": {},
+            "initializationOptions": {
+                "onlyAnalyzeProjectsWithOpenFiles": False,
+                "closingLabels": False,
+                "outline": False,
+                "flutterOutline": False,
+                "allowOpenUri": False,
+            },
+            "trace": "verbose",
+            "processId": os.getpid(),
+            "rootPath": repository_absolute_path,
+            "rootUri": pathlib.Path(repository_absolute_path).as_uri(),
+            "workspaceFolders": [
+                {
+                    "uri": root_uri,
+                    "name": os.path.basename(repository_absolute_path),
+                }
+            ],
+        }
+
+        return initialize_params
+
+    def _start_server(self):
+        """
+        Start the language server and yield when the server is ready.
+        """
+
+        def execute_client_command_handler(params):
+            return []
+
+        def do_nothing(params):
+            return
+
+        def check_experimental_status(params):
+            pass
+
+        def window_log_message(msg):
+            self.logger.log(f"LSP: window/logMessage: {msg}", logging.INFO)
+
+        self.server.on_request("client/registerCapability", do_nothing)
+        self.server.on_notification("language/status", do_nothing)
+        self.server.on_notification("window/logMessage", window_log_message)
+        self.server.on_request("workspace/executeClientCommand", execute_client_command_handler)
+        self.server.on_notification("$/progress", do_nothing)
+        self.server.on_notification("textDocument/publishDiagnostics", do_nothing)
+        self.server.on_notification("language/actionableNotification", do_nothing)
+        self.server.on_notification("experimental/serverStatus", check_experimental_status)
+
+        self.logger.log("Starting dart-language-server server process", logging.INFO)
+        self.server.start()
+        initialize_params = self._get_initialize_params(self.repository_root_path)
+        self.logger.log(
+            "Sending initialize request to dart-language-server",
+            logging.DEBUG,
+        )
+        init_response = self.server.send_request("initialize", initialize_params)
+        self.logger.log(
+            f"Received initialize response from dart-language-server: {init_response}",
+            logging.INFO,
+        )
+
+        self.server.notify.initialized({})

src/solidlsp/language_servers/dart_language_server/dart_language_server.py

@@ -1,119 +0,0 @@
-import json
-import logging
-import os
-import pathlib
-import stat
-
-from solidlsp.ls import SolidLanguageServer
-from solidlsp.ls_logger import LanguageServerLogger
-from solidlsp.ls_utils import FileUtils, PlatformUtils
-from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
-
-
-class DartLanguageServer(SolidLanguageServer):
-    """
-    Provides Dart specific instantiation of the LanguageServer class. Contains various configurations and settings specific to Dart.
-    """
-
-    def __init__(self, config, logger, repository_root_path):
-        """
-        Creates a DartServer instance. This class is not meant to be instantiated directly. Use LanguageServer.create() instead.
-        """
-        executable_path = self.setup_runtime_dependencies(logger)
-        super().__init__(
-            config,
-            logger,
-            repository_root_path,
-            ProcessLaunchInfo(cmd=executable_path, cwd=repository_root_path),
-            "dart",
-        )
-
-    def setup_runtime_dependencies(self, logger: "LanguageServerLogger") -> str:
-        platform_id = PlatformUtils.get_platform_id()
-
-        with open(os.path.join(os.path.dirname(__file__), "runtime_dependencies.json")) as f:
-            d = json.load(f)
-            del d["_description"]
-
-        runtime_dependencies = d["runtimeDependencies"]
-        runtime_dependencies = [dependency for dependency in runtime_dependencies if dependency["platformId"] == platform_id.value]
-
-        assert len(runtime_dependencies) == 1
-        dependency = runtime_dependencies[0]
-
-        dart_ls_dir = os.path.join(os.path.dirname(__file__), "static", "dart-language-server")
-        dart_executable_path = os.path.join(dart_ls_dir, dependency["binaryName"])
-
-        if not os.path.exists(dart_ls_dir):
-            os.makedirs(dart_ls_dir)
-            FileUtils.download_and_extract_archive(logger, dependency["url"], dart_ls_dir, dependency["archiveType"])
-
-        assert os.path.exists(dart_executable_path)
-        os.chmod(dart_executable_path, stat.S_IEXEC)
-
-        return f"{dart_executable_path} language-server --client-id multilspy.dart --client-version 1.2"
-
-    def _get_initialize_params(self, repository_absolute_path: str):
-        """
-        Returns the initialize params for the Dart Language Server.
-        """
-        with open(os.path.join(os.path.dirname(__file__), "initialize_params.json")) as f:
-            d = json.load(f)
-
-        del d["_description"]
-
-        d["processId"] = os.getpid()
-        assert d["rootPath"] == "$rootPath"
-        d["rootPath"] = repository_absolute_path
-
-        assert d["rootUri"] == "$rootUri"
-        d["rootUri"] = pathlib.Path(repository_absolute_path).as_uri()
-
-        assert d["workspaceFolders"][0]["uri"] == "$uri"
-        d["workspaceFolders"][0]["uri"] = pathlib.Path(repository_absolute_path).as_uri()
-
-        assert d["workspaceFolders"][0]["name"] == "$name"
-        d["workspaceFolders"][0]["name"] = os.path.basename(repository_absolute_path)
-
-        return d
-
-    def _start_server(self):
-        """
-        Start the language server and yield when the server is ready.
-        """
-
-        def execute_client_command_handler(params):
-            return []
-
-        def do_nothing(params):
-            return
-
-        def check_experimental_status(params):
-            pass
-
-        def window_log_message(msg):
-            self.logger.log(f"LSP: window/logMessage: {msg}", logging.INFO)
-
-        self.server.on_request("client/registerCapability", do_nothing)
-        self.server.on_notification("language/status", do_nothing)
-        self.server.on_notification("window/logMessage", window_log_message)
-        self.server.on_request("workspace/executeClientCommand", execute_client_command_handler)
-        self.server.on_notification("$/progress", do_nothing)
-        self.server.on_notification("textDocument/publishDiagnostics", do_nothing)
-        self.server.on_notification("language/actionableNotification", do_nothing)
-        self.server.on_notification("experimental/serverStatus", check_experimental_status)
-
-        self.logger.log("Starting dart-language-server server process", logging.INFO)
-        self.server.start()
-        initialize_params = self._get_initialize_params(self.repository_root_path)
-        self.logger.log(
-            "Sending initialize request to dart-language-server",
-            logging.DEBUG,
-        )
-        init_response = self.server.send_request("initialize", initialize_params)
-        self.logger.log(
-            f"Received initialize response from dart-language-server: {init_response}",
-            logging.INFO,
-        )
-
-        self.server.notify.initialized({})

src/solidlsp/language_servers/dart_language_server/initialize_params.json

@@ -1,23 +0,0 @@
-{
-    "_description": "This file contains the initialization parameters for the Dart Language Server.",
-    "processId": "$processId",
-    "rootPath": "$rootPath",
-    "rootUri": "$rootUri",
-    "capabilities": {},
-    "initializationOptions": {
-        "onlyAnalyzeProjectsWithOpenFiles": false,
-        "suggestFromUnimportedLibraries": true,
-        "closingLabels": false,
-        "outline": false,
-        "flutterOutline": false,
-        "allowOpenUri": false
-    },
-    "trace": "verbose",
-    "workspaceFolders": [
-        {
-            "uri": "$uri",
-            "name": "$name"
-        }
-    ]
-    
-}

src/solidlsp/language_servers/dart_language_server/runtime_dependencies.json

@@ -1,45 +0,0 @@
-{
-    "_description": "Used to download the runtime dependencies for running Dart Language Server, downloaded from https://dart.dev/get-dart/archive",
-    "runtimeDependencies": [
-        {
-            "id": "DartLanguageServer",
-            "description": "Dart Language Server for Linux (x64)",
-            "url": "https://storage.googleapis.com/dart-archive/channels/stable/release/3.7.1/sdk/dartsdk-linux-x64-release.zip",
-            "platformId": "linux-x64",
-            "archiveType": "zip",
-            "binaryName": "dart-sdk/bin/dart"
-        },
-        {
-            "id": "DartLanguageServer",
-            "description": "Dart Language Server for Windows (x64)",
-            "url": "https://storage.googleapis.com/dart-archive/channels/stable/release/3.7.1/sdk/dartsdk-windows-x64-release.zip",
-            "platformId": "win-x64",
-            "archiveType": "zip",
-            "binaryName": "dart-sdk/bin/dart.exe"
-        },
-        {
-            "id": "DartLanguageServer",
-            "description": "Dart Language Server for Windows (arm64)",
-            "url": "https://storage.googleapis.com/dart-archive/channels/stable/release/3.7.1/sdk/dartsdk-windows-arm64-release.zip",
-            "platformId": "win-arm64",
-            "archiveType": "zip",
-            "binaryName": "dart-sdk/bin/dart.exe"
-        },
-        {
-            "id": "DartLanguageServer",
-            "description": "Dart Language Server for macOS (x64)",
-            "url": "https://storage.googleapis.com/dart-archive/channels/stable/release/3.7.1/sdk/dartsdk-macos-x64-release.zip",
-            "platformId": "osx-x64",
-            "archiveType": "zip",
-            "binaryName": "dart-sdk/bin/dart"
-        },
-        {
-            "id": "DartLanguageServer",
-            "description": "Dart Language Server for macOS (arm64)",
-            "url": "https://storage.googleapis.com/dart-archive/channels/stable/release/3.7.1/sdk/dartsdk-macos-arm64-release.zip",
-            "platformId": "osx-arm64",
-            "archiveType": "zip",
-            "binaryName": "dart-sdk/bin/dart"
-        }
-    ]
-}

src/solidlsp/language_servers/eclipse_jdtls.py

@@ -0,0 +1,718 @@
+"""
+Provides Java specific instantiation of the LanguageServer class. Contains various configurations and settings specific to Java.
+"""
+
+import dataclasses
+import logging
+import os
+import pathlib
+import shutil
+import stat
+import threading
+import uuid
+from pathlib import PurePath
+
+from overrides import override
+
+from solidlsp.ls import SolidLanguageServer
+from solidlsp.ls_config import LanguageServerConfig
+from solidlsp.ls_logger import LanguageServerLogger
+from solidlsp.ls_utils import FileUtils, PlatformUtils
+from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
+from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
+from solidlsp.settings import SolidLSPSettings
+
+
+@dataclasses.dataclass
+class RuntimeDependencyPaths:
+    """
+    Stores the paths to the runtime dependencies of EclipseJDTLS
+    """
+
+    gradle_path: str
+    lombok_jar_path: str
+    jre_path: str
+    jre_home_path: str
+    jdtls_launcher_jar_path: str
+    jdtls_readonly_config_path: str
+    intellicode_jar_path: str
+    intellisense_members_path: str
+
+
+class EclipseJDTLS(SolidLanguageServer):
+    """
+    The EclipseJDTLS class provides a Java specific implementation of the LanguageServer class
+    """
+
+    def __init__(self, config: LanguageServerConfig, logger: LanguageServerLogger, repository_root_path: str):
+        """
+        Creates a new EclipseJDTLS instance initializing the language server settings appropriately.
+        This class is not meant to be instantiated directly. Use LanguageServer.create() instead.
+        """
+        runtime_dependency_paths = self._setupRuntimeDependencies(logger, config)
+        self.runtime_dependency_paths = runtime_dependency_paths
+
+        # ws_dir is the workspace directory for the EclipseJDTLS server
+        ws_dir = str(
+            PurePath(
+                SolidLSPSettings.get_language_server_directory(),
+                "EclipseJDTLS",
+                "workspaces",
+                uuid.uuid4().hex,
+            )
+        )
+
+        # shared_cache_location is the global cache used by Eclipse JDTLS across all workspaces
+        shared_cache_location = str(PurePath(SolidLSPSettings.get_global_cache_directory(), "lsp", "EclipseJDTLS", "sharedIndex"))
+
+        jre_path = self.runtime_dependency_paths.jre_path
+        lombok_jar_path = self.runtime_dependency_paths.lombok_jar_path
+
+        jdtls_launcher_jar = self.runtime_dependency_paths.jdtls_launcher_jar_path
+
+        os.makedirs(ws_dir, exist_ok=True)
+
+        data_dir = str(PurePath(ws_dir, "data_dir"))
+        jdtls_config_path = str(PurePath(ws_dir, "config_path"))
+
+        jdtls_readonly_config_path = self.runtime_dependency_paths.jdtls_readonly_config_path
+
+        if not os.path.exists(jdtls_config_path):
+            shutil.copytree(jdtls_readonly_config_path, jdtls_config_path)
+
+        for static_path in [
+            jre_path,
+            lombok_jar_path,
+            jdtls_launcher_jar,
+            jdtls_config_path,
+            jdtls_readonly_config_path,
+        ]:
+            assert os.path.exists(static_path), static_path
+
+        # TODO: Add "self.runtime_dependency_paths.jre_home_path"/bin to $PATH as well
+        proc_env = {"syntaxserver": "false", "JAVA_HOME": self.runtime_dependency_paths.jre_home_path}
+        proc_cwd = repository_root_path
+        cmd = " ".join(
+            [
+                jre_path,
+                "--add-modules=ALL-SYSTEM",
+                "--add-opens",
+                "java.base/java.util=ALL-UNNAMED",
+                "--add-opens",
+                "java.base/java.lang=ALL-UNNAMED",
+                "--add-opens",
+                "java.base/sun.nio.fs=ALL-UNNAMED",
+                "-Declipse.application=org.eclipse.jdt.ls.core.id1",
+                "-Dosgi.bundles.defaultStartLevel=4",
+                "-Declipse.product=org.eclipse.jdt.ls.core.product",
+                "-Djava.import.generatesMetadataFilesAtProjectRoot=false",
+                "-Dfile.encoding=utf8",
+                "-noverify",
+                "-XX:+UseParallelGC",
+                "-XX:GCTimeRatio=4",
+                "-XX:AdaptiveSizePolicyWeight=90",
+                "-Dsun.zip.disableMemoryMapping=true",
+                "-Djava.lsp.joinOnCompletion=true",
+                "-Xmx3G",
+                "-Xms100m",
+                "-Xlog:disable",
+                "-Dlog.level=ALL",
+                f'"-javaagent:{lombok_jar_path}"',
+                f'"-Djdt.core.sharedIndexLocation={shared_cache_location}"',
+                "-jar",
+                f'"{jdtls_launcher_jar}"',
+                "-configuration",
+                f'"{jdtls_config_path}"',
+                "-data",
+                f'"{data_dir}"',
+            ]
+        )
+
+        self.service_ready_event = threading.Event()
+        self.intellicode_enable_command_available = threading.Event()
+        self.initialize_searcher_command_available = threading.Event()
+
+        super().__init__(config, logger, repository_root_path, ProcessLaunchInfo(cmd, proc_env, proc_cwd), "java")
+
+    @override
+    def is_ignored_dirname(self, dirname: str) -> bool:
+        # Ignore common Java build directories from different build tools:
+        # - Maven: target
+        # - Gradle: build, .gradle
+        # - Eclipse: bin, .settings
+        # - IntelliJ IDEA: out, .idea
+        # - General: classes, dist, lib
+        return super().is_ignored_dirname(dirname) or dirname in [
+            "target",  # Maven
+            "build",  # Gradle
+            "bin",  # Eclipse
+            "out",  # IntelliJ IDEA
+            "classes",  # General
+            "dist",  # General
+            "lib",  # General
+        ]
+
+    @classmethod
+    def _setupRuntimeDependencies(cls, logger: LanguageServerLogger, config: LanguageServerConfig) -> RuntimeDependencyPaths:
+        """
+        Setup runtime dependencies for EclipseJDTLS and return the paths.
+        """
+        platformId = PlatformUtils.get_platform_id()
+
+        runtime_dependencies = {
+            "gradle": {
+                "platform-agnostic": {
+                    "url": "https://services.gradle.org/distributions/gradle-7.3.3-bin.zip",
+                    "archiveType": "zip",
+                    "relative_extraction_path": ".",
+                }
+            },
+            "vscode-java": {
+                "darwin-arm64": {
+                    "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-darwin-arm64-1.42.0-561.vsix",
+                    "archiveType": "zip",
+                    "relative_extraction_path": "vscode-java",
+                },
+                "osx-arm64": {
+                    "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-darwin-arm64-1.42.0-561.vsix",
+                    "archiveType": "zip",
+                    "relative_extraction_path": "vscode-java",
+                    "jre_home_path": "extension/jre/21.0.7-macosx-aarch64",
+                    "jre_path": "extension/jre/21.0.7-macosx-aarch64/bin/java",
+                    "lombok_jar_path": "extension/lombok/lombok-1.18.36.jar",
+                    "jdtls_launcher_jar_path": "extension/server/plugins/org.eclipse.equinox.launcher_1.7.0.v20250424-1814.jar",
+                    "jdtls_readonly_config_path": "extension/server/config_mac_arm",
+                },
+                "osx-x64": {
+                    "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-darwin-x64-1.42.0-561.vsix",
+                    "archiveType": "zip",
+                    "relative_extraction_path": "vscode-java",
+                    "jre_home_path": "extension/jre/21.0.7-macosx-x86_64",
+                    "jre_path": "extension/jre/21.0.7-macosx-x86_64/bin/java",
+                    "lombok_jar_path": "extension/lombok/lombok-1.18.36.jar",
+                    "jdtls_launcher_jar_path": "extension/server/plugins/org.eclipse.equinox.launcher_1.7.0.v20250424-1814.jar",
+                    "jdtls_readonly_config_path": "extension/server/config_mac",
+                },
+                "linux-arm64": {
+                    "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-linux-arm64-1.42.0-561.vsix",
+                    "archiveType": "zip",
+                    "relative_extraction_path": "vscode-java",
+                },
+                "linux-x64": {
+                    "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-linux-x64-1.42.0-561.vsix",
+                    "archiveType": "zip",
+                    "relative_extraction_path": "vscode-java",
+                    "jre_home_path": "extension/jre/21.0.7-linux-x86_64",
+                    "jre_path": "extension/jre/21.0.7-linux-x86_64/bin/java",
+                    "lombok_jar_path": "extension/lombok/lombok-1.18.36.jar",
+                    "jdtls_launcher_jar_path": "extension/server/plugins/org.eclipse.equinox.launcher_1.7.0.v20250424-1814.jar",
+                    "jdtls_readonly_config_path": "extension/server/config_linux",
+                },
+                "win-x64": {
+                    "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-win32-x64-1.42.0-561.vsix",
+                    "archiveType": "zip",
+                    "relative_extraction_path": "vscode-java",
+                    "jre_home_path": "extension/jre/21.0.7-win32-x86_64",
+                    "jre_path": "extension/jre/21.0.7-win32-x86_64/bin/java.exe",
+                    "lombok_jar_path": "extension/lombok/lombok-1.18.36.jar",
+                    "jdtls_launcher_jar_path": "extension/server/plugins/org.eclipse.equinox.launcher_1.7.0.v20250424-1814.jar",
+                    "jdtls_readonly_config_path": "extension/server/config_win",
+                },
+            },
+            "intellicode": {
+                "platform-agnostic": {
+                    "url": "https://VisualStudioExptTeam.gallery.vsassets.io/_apis/public/gallery/publisher/VisualStudioExptTeam/extension/vscodeintellicode/1.2.30/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage",
+                    "alternate_url": "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/VisualStudioExptTeam/vsextensions/vscodeintellicode/1.2.30/vspackage",
+                    "archiveType": "zip",
+                    "relative_extraction_path": "intellicode",
+                    "intellicode_jar_path": "extension/dist/com.microsoft.jdtls.intellicode.core-0.7.0.jar",
+                    "intellisense_members_path": "extension/dist/bundledModels/java_intellisense-members",
+                }
+            },
+        }
+
+        # assert platformId.value in [
+        #     "linux-x64",
+        #     "win-x64",
+        # ], "Only linux-x64 platform is supported for in multilspy at the moment"
+
+        gradle_path = str(
+            PurePath(
+                cls.ls_resources_dir(),
+                "gradle-7.3.3",
+            )
+        )
+
+        if not os.path.exists(gradle_path):
+            FileUtils.download_and_extract_archive(
+                logger,
+                runtime_dependencies["gradle"]["platform-agnostic"]["url"],
+                str(PurePath(gradle_path).parent),
+                runtime_dependencies["gradle"]["platform-agnostic"]["archiveType"],
+            )
+
+        assert os.path.exists(gradle_path)
+
+        dependency = runtime_dependencies["vscode-java"][platformId.value]
+        vscode_java_path = str(PurePath(cls.ls_resources_dir(), dependency["relative_extraction_path"]))
+        os.makedirs(vscode_java_path, exist_ok=True)
+        jre_home_path = str(PurePath(vscode_java_path, dependency["jre_home_path"]))
+        jre_path = str(PurePath(vscode_java_path, dependency["jre_path"]))
+        lombok_jar_path = str(PurePath(vscode_java_path, dependency["lombok_jar_path"]))
+        jdtls_launcher_jar_path = str(PurePath(vscode_java_path, dependency["jdtls_launcher_jar_path"]))
+        jdtls_readonly_config_path = str(PurePath(vscode_java_path, dependency["jdtls_readonly_config_path"]))
+        if not all(
+            [
+                os.path.exists(vscode_java_path),
+                os.path.exists(jre_home_path),
+                os.path.exists(jre_path),
+                os.path.exists(lombok_jar_path),
+                os.path.exists(jdtls_launcher_jar_path),
+                os.path.exists(jdtls_readonly_config_path),
+            ]
+        ):
+            FileUtils.download_and_extract_archive(logger, dependency["url"], vscode_java_path, dependency["archiveType"])
+
+        os.chmod(jre_path, stat.S_IEXEC)
+
+        assert os.path.exists(vscode_java_path)
+        assert os.path.exists(jre_home_path)
+        assert os.path.exists(jre_path)
+        assert os.path.exists(lombok_jar_path)
+        assert os.path.exists(jdtls_launcher_jar_path)
+        assert os.path.exists(jdtls_readonly_config_path)
+
+        dependency = runtime_dependencies["intellicode"]["platform-agnostic"]
+        intellicode_directory_path = str(PurePath(cls.ls_resources_dir(), dependency["relative_extraction_path"]))
+        os.makedirs(intellicode_directory_path, exist_ok=True)
+        intellicode_jar_path = str(PurePath(intellicode_directory_path, dependency["intellicode_jar_path"]))
+        intellisense_members_path = str(PurePath(intellicode_directory_path, dependency["intellisense_members_path"]))
+        if not all(
+            [
+                os.path.exists(intellicode_directory_path),
+                os.path.exists(intellicode_jar_path),
+                os.path.exists(intellisense_members_path),
+            ]
+        ):
+            FileUtils.download_and_extract_archive(logger, dependency["url"], intellicode_directory_path, dependency["archiveType"])
+
+        assert os.path.exists(intellicode_directory_path)
+        assert os.path.exists(intellicode_jar_path)
+        assert os.path.exists(intellisense_members_path)
+
+        return RuntimeDependencyPaths(
+            gradle_path=gradle_path,
+            lombok_jar_path=lombok_jar_path,
+            jre_path=jre_path,
+            jre_home_path=jre_home_path,
+            jdtls_launcher_jar_path=jdtls_launcher_jar_path,
+            jdtls_readonly_config_path=jdtls_readonly_config_path,
+            intellicode_jar_path=intellicode_jar_path,
+            intellisense_members_path=intellisense_members_path,
+        )
+
+    def _get_initialize_params(self, repository_absolute_path: str) -> InitializeParams:
+        """
+        Returns the initialize parameters for the EclipseJDTLS server.
+        """
+        # Look into https://github.com/eclipse/eclipse.jdt.ls/blob/master/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/Preferences.java to understand all the options available
+
+        if not os.path.isabs(repository_absolute_path):
+            repository_absolute_path = os.path.abspath(repository_absolute_path)
+        repo_uri = pathlib.Path(repository_absolute_path).as_uri()
+
+        initialize_params = {
+            "locale": "en",
+            "rootPath": repository_absolute_path,
+            "rootUri": pathlib.Path(repository_absolute_path).as_uri(),
+            "capabilities": {
+                "workspace": {
+                    "applyEdit": True,
+                    "workspaceEdit": {
+                        "documentChanges": True,
+                        "resourceOperations": ["create", "rename", "delete"],
+                        "failureHandling": "textOnlyTransactional",
+                        "normalizesLineEndings": True,
+                        "changeAnnotationSupport": {"groupsOnLabel": True},
+                    },
+                    "didChangeConfiguration": {"dynamicRegistration": True},
+                    "didChangeWatchedFiles": {"dynamicRegistration": True, "relativePatternSupport": True},
+                    "symbol": {
+                        "dynamicRegistration": True,
+                        "symbolKind": {"valueSet": list(range(1, 27))},
+                        "tagSupport": {"valueSet": [1]},
+                        "resolveSupport": {"properties": ["location.range"]},
+                    },
+                    "codeLens": {"refreshSupport": True},
+                    "executeCommand": {"dynamicRegistration": True},
+                    "configuration": True,
+                    "workspaceFolders": True,
+                    "semanticTokens": {"refreshSupport": True},
+                    "fileOperations": {
+                        "dynamicRegistration": True,
+                        "didCreate": True,
+                        "didRename": True,
+                        "didDelete": True,
+                        "willCreate": True,
+                        "willRename": True,
+                        "willDelete": True,
+                    },
+                    "inlineValue": {"refreshSupport": True},
+                    "inlayHint": {"refreshSupport": True},
+                    "diagnostics": {"refreshSupport": True},
+                },
+                "textDocument": {
+                    "publishDiagnostics": {
+                        "relatedInformation": True,
+                        "versionSupport": False,
+                        "tagSupport": {"valueSet": [1, 2]},
+                        "codeDescriptionSupport": True,
+                        "dataSupport": True,
+                    },
+                    "synchronization": {"dynamicRegistration": True, "willSave": True, "willSaveWaitUntil": True, "didSave": True},
+                    # TODO: we have an assert that completion provider is not included in the capabilities at server startup
+                    #   Removing this will cause the assert to fail. Investigate why this is the case, simplify config
+                    "completion": {
+                        "dynamicRegistration": True,
+                        "contextSupport": True,
+                        "completionItem": {
+                            "snippetSupport": False,
+                            "commitCharactersSupport": True,
+                            "documentationFormat": ["markdown", "plaintext"],
+                            "deprecatedSupport": True,
+                            "preselectSupport": True,
+                            "tagSupport": {"valueSet": [1]},
+                            "insertReplaceSupport": False,
+                            "resolveSupport": {"properties": ["documentation", "detail", "additionalTextEdits"]},
+                            "insertTextModeSupport": {"valueSet": [1, 2]},
+                            "labelDetailsSupport": True,
+                        },
+                        "insertTextMode": 2,
+                        "completionItemKind": {
+                            "valueSet": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25]
+                        },
+                        "completionList": {"itemDefaults": ["commitCharacters", "editRange", "insertTextFormat", "insertTextMode"]},
+                    },
+                    "hover": {"dynamicRegistration": True, "contentFormat": ["markdown", "plaintext"]},
+                    "signatureHelp": {
+                        "dynamicRegistration": True,
+                        "signatureInformation": {
+                            "documentationFormat": ["markdown", "plaintext"],
+                            "parameterInformation": {"labelOffsetSupport": True},
+                            "activeParameterSupport": True,
+                        },
+                    },
+                    "definition": {"dynamicRegistration": True, "linkSupport": True},
+                    "references": {"dynamicRegistration": True},
+                    "documentSymbol": {
+                        "dynamicRegistration": True,
+                        "symbolKind": {"valueSet": list(range(1, 27))},
+                        "hierarchicalDocumentSymbolSupport": True,
+                        "tagSupport": {"valueSet": [1]},
+                        "labelSupport": True,
+                    },
+                    "rename": {
+                        "dynamicRegistration": True,
+                        "prepareSupport": True,
+                        "prepareSupportDefaultBehavior": 1,
+                        "honorsChangeAnnotations": True,
+                    },
+                    "documentLink": {"dynamicRegistration": True, "tooltipSupport": True},
+                    "typeDefinition": {"dynamicRegistration": True, "linkSupport": True},
+                    "implementation": {"dynamicRegistration": True, "linkSupport": True},
+                    "colorProvider": {"dynamicRegistration": True},
+                    "declaration": {"dynamicRegistration": True, "linkSupport": True},
+                    "selectionRange": {"dynamicRegistration": True},
+                    "callHierarchy": {"dynamicRegistration": True},
+                    "semanticTokens": {
+                        "dynamicRegistration": True,
+                        "tokenTypes": [
+                            "namespace",
+                            "type",
+                            "class",
+                            "enum",
+                            "interface",
+                            "struct",
+                            "typeParameter",
+                            "parameter",
+                            "variable",
+                            "property",
+                            "enumMember",
+                            "event",
+                            "function",
+                            "method",
+                            "macro",
+                            "keyword",
+                            "modifier",
+                            "comment",
+                            "string",
+                            "number",
+                            "regexp",
+                            "operator",
+                            "decorator",
+                        ],
+                        "tokenModifiers": [
+                            "declaration",
+                            "definition",
+                            "readonly",
+                            "static",
+                            "deprecated",
+                            "abstract",
+                            "async",
+                            "modification",
+                            "documentation",
+                            "defaultLibrary",
+                        ],
+                        "formats": ["relative"],
+                        "requests": {"range": True, "full": {"delta": True}},
+                        "multilineTokenSupport": False,
+                        "overlappingTokenSupport": False,
+                        "serverCancelSupport": True,
+                        "augmentsSyntaxTokens": True,
+                    },
+                    "typeHierarchy": {"dynamicRegistration": True},
+                    "inlineValue": {"dynamicRegistration": True},
+                    "diagnostic": {"dynamicRegistration": True, "relatedDocumentSupport": False},
+                },
+                "general": {
+                    "staleRequestSupport": {
+                        "cancel": True,
+                        "retryOnContentModified": [
+                            "textDocument/semanticTokens/full",
+                            "textDocument/semanticTokens/range",
+                            "textDocument/semanticTokens/full/delta",
+                        ],
+                    },
+                    "regularExpressions": {"engine": "ECMAScript", "version": "ES2020"},
+                    "positionEncodings": ["utf-16"],
+                },
+                "notebookDocument": {"synchronization": {"dynamicRegistration": True, "executionSummarySupport": True}},
+            },
+            "initializationOptions": {
+                "bundles": ["intellicode-core.jar"],
+                "settings": {
+                    "java": {
+                        "home": None,
+                        "jdt": {
+                            "ls": {
+                                "java": {"home": None},
+                                "vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx1G -Xms100m -Xlog:disable",
+                                "lombokSupport": {"enabled": True},
+                                "protobufSupport": {"enabled": True},
+                                "androidSupport": {"enabled": True},
+                            }
+                        },
+                        "errors": {"incompleteClasspath": {"severity": "error"}},
+                        "configuration": {
+                            "checkProjectSettingsExclusions": False,
+                            "updateBuildConfiguration": "interactive",
+                            "maven": {
+                                "userSettings": None,
+                                "globalSettings": None,
+                                "notCoveredPluginExecutionSeverity": "warning",
+                                "defaultMojoExecutionAction": "ignore",
+                            },
+                            "workspaceCacheLimit": 90,
+                            "runtimes": [
+                                {"name": "JavaSE-21", "path": "static/vscode-java/extension/jre/21.0.7-linux-x86_64", "default": True}
+                            ],
+                        },
+                        "trace": {"server": "verbose"},
+                        "import": {
+                            "maven": {
+                                "enabled": True,
+                                "offline": {"enabled": False},
+                                "disableTestClasspathFlag": False,
+                            },
+                            "gradle": {
+                                "enabled": True,
+                                "wrapper": {"enabled": True},
+                                "version": None,
+                                "home": "abs(static/gradle-7.3.3)",
+                                "java": {"home": "abs(static/launch_jres/21.0.7-linux-x86_64)"},
+                                "offline": {"enabled": False},
+                                "arguments": None,
+                                "jvmArguments": None,
+                                "user": {"home": None},
+                                "annotationProcessing": {"enabled": True},
+                            },
+                            "exclusions": [
+                                "**/node_modules/**",
+                                "**/.metadata/**",
+                                "**/archetype-resources/**",
+                                "**/META-INF/maven/**",
+                            ],
+                            "generatesMetadataFilesAtProjectRoot": False,
+                        },
+                        "maven": {"downloadSources": True, "updateSnapshots": True},
+                        "eclipse": {"downloadSources": True},
+                        "signatureHelp": {"enabled": True, "description": {"enabled": True}},
+                        "implementationsCodeLens": {"enabled": True},
+                        "format": {
+                            "enabled": True,
+                            "settings": {"url": None, "profile": None},
+                            "comments": {"enabled": True},
+                            "onType": {"enabled": True},
+                            "insertSpaces": True,
+                            "tabSize": 4,
+                        },
+                        "saveActions": {"organizeImports": False},
+                        "project": {
+                            "referencedLibraries": ["lib/**/*.jar"],
+                            "importOnFirstTimeStartup": "automatic",
+                            "importHint": True,
+                            "resourceFilters": ["node_modules", "\\.git"],
+                            "encoding": "ignore",
+                            "exportJar": {"targetPath": "${workspaceFolder}/${workspaceFolderBasename}.jar"},
+                        },
+                        "contentProvider": {"preferred": None},
+                        "autobuild": {"enabled": True},
+                        "maxConcurrentBuilds": 1,
+                        "selectionRange": {"enabled": True},
+                        "showBuildStatusOnStart": {"enabled": "notification"},
+                        "server": {"launchMode": "Standard"},
+                        "sources": {"organizeImports": {"starThreshold": 99, "staticStarThreshold": 99}},
+                        "imports": {"gradle": {"wrapper": {"checksums": []}}},
+                        "templates": {"fileHeader": [], "typeComment": []},
+                        "references": {"includeAccessors": True, "includeDecompiledSources": True},
+                        "typeHierarchy": {"lazyLoad": False},
+                        "settings": {"url": None},
+                        "symbols": {"includeSourceMethodDeclarations": False},
+                        "inlayHints": {"parameterNames": {"enabled": "literals", "exclusions": []}},
+                        "codeAction": {"sortMembers": {"avoidVolatileChanges": True}},
+                        "compile": {
+                            "nullAnalysis": {
+                                "nonnull": [
+                                    "javax.annotation.Nonnull",
+                                    "org.eclipse.jdt.annotation.NonNull",
+                                    "org.springframework.lang.NonNull",
+                                ],
+                                "nullable": [
+                                    "javax.annotation.Nullable",
+                                    "org.eclipse.jdt.annotation.Nullable",
+                                    "org.springframework.lang.Nullable",
+                                ],
+                                "mode": "automatic",
+                            }
+                        },
+                        "sharedIndexes": {"enabled": "auto", "location": ""},
+                        "silentNotification": False,
+                        "dependency": {
+                            "showMembers": False,
+                            "syncWithFolderExplorer": True,
+                            "autoRefresh": True,
+                            "refreshDelay": 2000,
+                            "packagePresentation": "flat",
+                        },
+                        "help": {"firstView": "auto", "showReleaseNotes": True, "collectErrorLog": False},
+                        "test": {"defaultConfig": "", "config": {}},
+                    }
+                },
+            },
+            "trace": "verbose",
+            "processId": os.getpid(),
+            "workspaceFolders": [
+                {
+                    "uri": repo_uri,
+                    "name": os.path.basename(repository_absolute_path),
+                }
+            ],
+        }
+
+        initialize_params["initializationOptions"]["workspaceFolders"] = [repo_uri]
+        bundles = [self.runtime_dependency_paths.intellicode_jar_path]
+        initialize_params["initializationOptions"]["bundles"] = bundles
+        initialize_params["initializationOptions"]["settings"]["java"]["configuration"]["runtimes"] = [
+            {"name": "JavaSE-21", "path": self.runtime_dependency_paths.jre_home_path, "default": True}
+        ]
+
+        for runtime in initialize_params["initializationOptions"]["settings"]["java"]["configuration"]["runtimes"]:
+            assert "name" in runtime
+            assert "path" in runtime
+            assert os.path.exists(runtime["path"]), f"Runtime required for eclipse_jdtls at path {runtime['path']} does not exist"
+
+        gradle_settings = initialize_params["initializationOptions"]["settings"]["java"]["import"]["gradle"]
+        gradle_settings["home"] = self.runtime_dependency_paths.gradle_path
+        gradle_settings["java"]["home"] = self.runtime_dependency_paths.jre_path
+        return initialize_params
+
+    def _start_server(self):
+        """
+        Starts the Eclipse JDTLS Language Server
+        """
+
+        def register_capability_handler(params):
+            assert "registrations" in params
+            for registration in params["registrations"]:
+                if registration["method"] == "textDocument/completion":
+                    assert registration["registerOptions"]["resolveProvider"] == True
+                    assert registration["registerOptions"]["triggerCharacters"] == [
+                        ".",
+                        "@",
+                        "#",
+                        "*",
+                        " ",
+                    ]
+                    self.completions_available.set()
+                if registration["method"] == "workspace/executeCommand":
+                    if "java.intellicode.enable" in registration["registerOptions"]["commands"]:
+                        self.intellicode_enable_command_available.set()
+            return
+
+        def lang_status_handler(params):
+            # TODO: Should we wait for
+            # server -> client: {'jsonrpc': '2.0', 'method': 'language/status', 'params': {'type': 'ProjectStatus', 'message': 'OK'}}
+            # Before proceeding?
+            if params["type"] == "ServiceReady" and params["message"] == "ServiceReady":
+                self.service_ready_event.set()
+
+        def execute_client_command_handler(params):
+            assert params["command"] == "_java.reloadBundles.command"
+            assert params["arguments"] == []
+            return []
+
+        def window_log_message(msg):
+            self.logger.log(f"LSP: window/logMessage: {msg}", logging.INFO)
+
+        def do_nothing(params):
+            return
+
+        self.server.on_request("client/registerCapability", register_capability_handler)
+        self.server.on_notification("language/status", lang_status_handler)
+        self.server.on_notification("window/logMessage", window_log_message)
+        self.server.on_request("workspace/executeClientCommand", execute_client_command_handler)
+        self.server.on_notification("$/progress", do_nothing)
+        self.server.on_notification("textDocument/publishDiagnostics", do_nothing)
+        self.server.on_notification("language/actionableNotification", do_nothing)
+
+        self.logger.log("Starting EclipseJDTLS server process", logging.INFO)
+        self.server.start()
+        initialize_params = self._get_initialize_params(self.repository_root_path)
+
+        self.logger.log(
+            "Sending initialize request from LSP client to LSP server and awaiting response",
+            logging.INFO,
+        )
+        init_response = self.server.send.initialize(initialize_params)
+        assert init_response["capabilities"]["textDocumentSync"]["change"] == 2
+        assert "completionProvider" not in init_response["capabilities"]
+        assert "executeCommandProvider" not in init_response["capabilities"]
+
+        self.server.notify.initialized({})
+
+        self.server.notify.workspace_did_change_configuration({"settings": initialize_params["initializationOptions"]["settings"]})
+
+        self.intellicode_enable_command_available.wait()
+
+        java_intellisense_members_path = self.runtime_dependency_paths.intellisense_members_path
+        assert os.path.exists(java_intellisense_members_path)
+        intellicode_enable_result = self.server.send.execute_command(
+            {
+                "command": "java.intellicode.enable",
+                "arguments": [True, java_intellisense_members_path],
+            }
+        )
+        assert intellicode_enable_result
+
+        # TODO: Add comments about why we wait here, and how this can be optimized
+        self.service_ready_event.wait()

src/solidlsp/language_servers/eclipse_jdtls/eclipse_jdtls.py

@@ -1,388 +0,0 @@
-"""
-Provides Java specific instantiation of the LanguageServer class. Contains various configurations and settings specific to Java.
-"""
-
-import dataclasses
-import json
-import logging
-import os
-import pathlib
-import shutil
-import stat
-import threading
-import uuid
-from pathlib import PurePath
-
-from overrides import override
-
-from solidlsp.ls import SolidLanguageServer
-from solidlsp.ls_config import LanguageServerConfig
-from solidlsp.ls_logger import LanguageServerLogger
-from solidlsp.ls_utils import FileUtils, PlatformUtils
-from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
-from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
-from solidlsp.settings import SolidLSPSettings
-
-
-@dataclasses.dataclass
-class RuntimeDependencyPaths:
-    """
-    Stores the paths to the runtime dependencies of EclipseJDTLS
-    """
-
-    gradle_path: str
-    lombok_jar_path: str
-    jre_path: str
-    jre_home_path: str
-    jdtls_launcher_jar_path: str
-    jdtls_readonly_config_path: str
-    intellicode_jar_path: str
-    intellisense_members_path: str
-
-
-class EclipseJDTLS(SolidLanguageServer):
-    """
-    The EclipseJDTLS class provides a Java specific implementation of the LanguageServer class
-    """
-
-    def __init__(self, config: LanguageServerConfig, logger: LanguageServerLogger, repository_root_path: str):
-        """
-        Creates a new EclipseJDTLS instance initializing the language server settings appropriately.
-        This class is not meant to be instantiated directly. Use LanguageServer.create() instead.
-        """
-        runtime_dependency_paths = self.setupRuntimeDependencies(logger, config)
-        self.runtime_dependency_paths = runtime_dependency_paths
-
-        # ws_dir is the workspace directory for the EclipseJDTLS server
-        ws_dir = str(
-            PurePath(
-                SolidLSPSettings.get_language_server_directory(),
-                "EclipseJDTLS",
-                "workspaces",
-                uuid.uuid4().hex,
-            )
-        )
-
-        # shared_cache_location is the global cache used by Eclipse JDTLS across all workspaces
-        shared_cache_location = str(PurePath(SolidLSPSettings.get_global_cache_directory(), "lsp", "EclipseJDTLS", "sharedIndex"))
-
-        jre_path = self.runtime_dependency_paths.jre_path
-        lombok_jar_path = self.runtime_dependency_paths.lombok_jar_path
-
-        jdtls_launcher_jar = self.runtime_dependency_paths.jdtls_launcher_jar_path
-
-        os.makedirs(ws_dir, exist_ok=True)
-
-        data_dir = str(PurePath(ws_dir, "data_dir"))
-        jdtls_config_path = str(PurePath(ws_dir, "config_path"))
-
-        jdtls_readonly_config_path = self.runtime_dependency_paths.jdtls_readonly_config_path
-
-        if not os.path.exists(jdtls_config_path):
-            shutil.copytree(jdtls_readonly_config_path, jdtls_config_path)
-
-        for static_path in [
-            jre_path,
-            lombok_jar_path,
-            jdtls_launcher_jar,
-            jdtls_config_path,
-            jdtls_readonly_config_path,
-        ]:
-            assert os.path.exists(static_path), static_path
-
-        # TODO: Add "self.runtime_dependency_paths.jre_home_path"/bin to $PATH as well
-        proc_env = {"syntaxserver": "false", "JAVA_HOME": self.runtime_dependency_paths.jre_home_path}
-        proc_cwd = repository_root_path
-        cmd = " ".join(
-            [
-                jre_path,
-                "--add-modules=ALL-SYSTEM",
-                "--add-opens",
-                "java.base/java.util=ALL-UNNAMED",
-                "--add-opens",
-                "java.base/java.lang=ALL-UNNAMED",
-                "--add-opens",
-                "java.base/sun.nio.fs=ALL-UNNAMED",
-                "-Declipse.application=org.eclipse.jdt.ls.core.id1",
-                "-Dosgi.bundles.defaultStartLevel=4",
-                "-Declipse.product=org.eclipse.jdt.ls.core.product",
-                "-Djava.import.generatesMetadataFilesAtProjectRoot=false",
-                "-Dfile.encoding=utf8",
-                "-noverify",
-                "-XX:+UseParallelGC",
-                "-XX:GCTimeRatio=4",
-                "-XX:AdaptiveSizePolicyWeight=90",
-                "-Dsun.zip.disableMemoryMapping=true",
-                "-Djava.lsp.joinOnCompletion=true",
-                "-Xmx3G",
-                "-Xms100m",
-                "-Xlog:disable",
-                "-Dlog.level=ALL",
-                f'"-javaagent:{lombok_jar_path}"',
-                f'"-Djdt.core.sharedIndexLocation={shared_cache_location}"',
-                "-jar",
-                f'"{jdtls_launcher_jar}"',
-                "-configuration",
-                f'"{jdtls_config_path}"',
-                "-data",
-                f'"{data_dir}"',
-            ]
-        )
-
-        self.service_ready_event = threading.Event()
-        self.intellicode_enable_command_available = threading.Event()
-        self.initialize_searcher_command_available = threading.Event()
-
-        super().__init__(config, logger, repository_root_path, ProcessLaunchInfo(cmd, proc_env, proc_cwd), "java")
-
-    @override
-    def is_ignored_dirname(self, dirname: str) -> bool:
-        # Ignore common Java build directories from different build tools:
-        # - Maven: target
-        # - Gradle: build, .gradle
-        # - Eclipse: bin, .settings
-        # - IntelliJ IDEA: out, .idea
-        # - General: classes, dist, lib
-        return super().is_ignored_dirname(dirname) or dirname in [
-            "target",  # Maven
-            "build",  # Gradle
-            "bin",  # Eclipse
-            "out",  # IntelliJ IDEA
-            "classes",  # General
-            "dist",  # General
-            "lib",  # General
-        ]
-
-    def setupRuntimeDependencies(self, logger: LanguageServerLogger, config: LanguageServerConfig) -> RuntimeDependencyPaths:
-        """
-        Setup runtime dependencies for EclipseJDTLS.
-        """
-        platformId = PlatformUtils.get_platform_id()
-
-        with open(str(PurePath(os.path.dirname(__file__), "runtime_dependencies.json")), encoding="utf-8") as f:
-            runtimeDependencies = json.load(f)
-            del runtimeDependencies["_description"]
-
-        os.makedirs(str(PurePath(os.path.abspath(os.path.dirname(__file__)), "static")), exist_ok=True)
-
-        # assert platformId.value in [
-        #     "linux-x64",
-        #     "win-x64",
-        # ], "Only linux-x64 platform is supported for in multilspy at the moment"
-
-        gradle_path = str(
-            PurePath(
-                os.path.abspath(os.path.dirname(__file__)),
-                "static/gradle-7.3.3",
-            )
-        )
-
-        if not os.path.exists(gradle_path):
-            FileUtils.download_and_extract_archive(
-                logger,
-                runtimeDependencies["gradle"]["platform-agnostic"]["url"],
-                str(PurePath(gradle_path).parent),
-                runtimeDependencies["gradle"]["platform-agnostic"]["archiveType"],
-            )
-
-        assert os.path.exists(gradle_path)
-
-        dependency = runtimeDependencies["vscode-java"][platformId.value]
-        vscode_java_path = str(PurePath(os.path.abspath(os.path.dirname(__file__)), "static", dependency["relative_extraction_path"]))
-        os.makedirs(vscode_java_path, exist_ok=True)
-        jre_home_path = str(PurePath(vscode_java_path, dependency["jre_home_path"]))
-        jre_path = str(PurePath(vscode_java_path, dependency["jre_path"]))
-        lombok_jar_path = str(PurePath(vscode_java_path, dependency["lombok_jar_path"]))
-        jdtls_launcher_jar_path = str(PurePath(vscode_java_path, dependency["jdtls_launcher_jar_path"]))
-        jdtls_readonly_config_path = str(PurePath(vscode_java_path, dependency["jdtls_readonly_config_path"]))
-        if not all(
-            [
-                os.path.exists(vscode_java_path),
-                os.path.exists(jre_home_path),
-                os.path.exists(jre_path),
-                os.path.exists(lombok_jar_path),
-                os.path.exists(jdtls_launcher_jar_path),
-                os.path.exists(jdtls_readonly_config_path),
-            ]
-        ):
-            FileUtils.download_and_extract_archive(logger, dependency["url"], vscode_java_path, dependency["archiveType"])
-
-        os.chmod(jre_path, stat.S_IEXEC)
-
-        assert os.path.exists(vscode_java_path)
-        assert os.path.exists(jre_home_path)
-        assert os.path.exists(jre_path)
-        assert os.path.exists(lombok_jar_path)
-        assert os.path.exists(jdtls_launcher_jar_path)
-        assert os.path.exists(jdtls_readonly_config_path)
-
-        dependency = runtimeDependencies["intellicode"]["platform-agnostic"]
-        intellicode_directory_path = str(
-            PurePath(os.path.abspath(os.path.dirname(__file__)), "static", dependency["relative_extraction_path"])
-        )
-        os.makedirs(intellicode_directory_path, exist_ok=True)
-        intellicode_jar_path = str(PurePath(intellicode_directory_path, dependency["intellicode_jar_path"]))
-        intellisense_members_path = str(PurePath(intellicode_directory_path, dependency["intellisense_members_path"]))
-        if not all(
-            [
-                os.path.exists(intellicode_directory_path),
-                os.path.exists(intellicode_jar_path),
-                os.path.exists(intellisense_members_path),
-            ]
-        ):
-            FileUtils.download_and_extract_archive(logger, dependency["url"], intellicode_directory_path, dependency["archiveType"])
-
-        assert os.path.exists(intellicode_directory_path)
-        assert os.path.exists(intellicode_jar_path)
-        assert os.path.exists(intellisense_members_path)
-
-        return RuntimeDependencyPaths(
-            gradle_path=gradle_path,
-            lombok_jar_path=lombok_jar_path,
-            jre_path=jre_path,
-            jre_home_path=jre_home_path,
-            jdtls_launcher_jar_path=jdtls_launcher_jar_path,
-            jdtls_readonly_config_path=jdtls_readonly_config_path,
-            intellicode_jar_path=intellicode_jar_path,
-            intellisense_members_path=intellisense_members_path,
-        )
-
-    def _get_initialize_params(self, repository_absolute_path: str) -> InitializeParams:
-        """
-        Returns the initialize parameters for the EclipseJDTLS server.
-        """
-        # Look into https://github.com/eclipse/eclipse.jdt.ls/blob/master/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/Preferences.java to understand all the options available
-        with open(str(PurePath(os.path.dirname(__file__), "initialize_params.json")), encoding="utf-8") as f:
-            d: InitializeParams = json.load(f)
-
-        del d["_description"]
-
-        if not os.path.isabs(repository_absolute_path):
-            repository_absolute_path = os.path.abspath(repository_absolute_path)
-
-        assert d["processId"] == "os.getpid()"
-        d["processId"] = os.getpid()
-
-        assert d["rootPath"] == "repository_absolute_path"
-        d["rootPath"] = repository_absolute_path
-
-        assert d["rootUri"] == "pathlib.Path(repository_absolute_path).as_uri()"
-        d["rootUri"] = pathlib.Path(repository_absolute_path).as_uri()
-
-        assert d["initializationOptions"]["workspaceFolders"] == "[pathlib.Path(repository_absolute_path).as_uri()]"
-        d["initializationOptions"]["workspaceFolders"] = [pathlib.Path(repository_absolute_path).as_uri()]
-
-        assert (
-            d["workspaceFolders"]
-            == '[\n            {\n                "uri": pathlib.Path(repository_absolute_path).as_uri(),\n                "name": os.path.basename(repository_absolute_path),\n            }\n        ]'
-        )
-        d["workspaceFolders"] = [
-            {
-                "uri": pathlib.Path(repository_absolute_path).as_uri(),
-                "name": os.path.basename(repository_absolute_path),
-            }
-        ]
-
-        assert d["initializationOptions"]["bundles"] == ["intellicode-core.jar"]
-        bundles = [self.runtime_dependency_paths.intellicode_jar_path]
-        d["initializationOptions"]["bundles"] = bundles
-
-        assert d["initializationOptions"]["settings"]["java"]["configuration"]["runtimes"] == [
-            {"name": "JavaSE-21", "path": "static/vscode-java/extension/jre/21.0.7-linux-x86_64", "default": True}
-        ]
-        d["initializationOptions"]["settings"]["java"]["configuration"]["runtimes"] = [
-            {"name": "JavaSE-21", "path": self.runtime_dependency_paths.jre_home_path, "default": True}
-        ]
-
-        for runtime in d["initializationOptions"]["settings"]["java"]["configuration"]["runtimes"]:
-            assert "name" in runtime
-            assert "path" in runtime
-            assert os.path.exists(runtime["path"]), f"Runtime required for eclipse_jdtls at path {runtime['path']} does not exist"
-
-        assert d["initializationOptions"]["settings"]["java"]["import"]["gradle"]["home"] == "abs(static/gradle-7.3.3)"
-        d["initializationOptions"]["settings"]["java"]["import"]["gradle"]["home"] = self.runtime_dependency_paths.gradle_path
-
-        d["initializationOptions"]["settings"]["java"]["import"]["gradle"]["java"]["home"] = self.runtime_dependency_paths.jre_path
-
-        return d
-
-    def _start_server(self):
-        """
-        Starts the Eclipse JDTLS Language Server
-        """
-
-        def register_capability_handler(params):
-            assert "registrations" in params
-            for registration in params["registrations"]:
-                if registration["method"] == "textDocument/completion":
-                    assert registration["registerOptions"]["resolveProvider"] == True
-                    assert registration["registerOptions"]["triggerCharacters"] == [
-                        ".",
-                        "@",
-                        "#",
-                        "*",
-                        " ",
-                    ]
-                    self.completions_available.set()
-                if registration["method"] == "workspace/executeCommand":
-                    if "java.intellicode.enable" in registration["registerOptions"]["commands"]:
-                        self.intellicode_enable_command_available.set()
-            return
-
-        def lang_status_handler(params):
-            # TODO: Should we wait for
-            # server -> client: {'jsonrpc': '2.0', 'method': 'language/status', 'params': {'type': 'ProjectStatus', 'message': 'OK'}}
-            # Before proceeding?
-            if params["type"] == "ServiceReady" and params["message"] == "ServiceReady":
-                self.service_ready_event.set()
-
-        def execute_client_command_handler(params):
-            assert params["command"] == "_java.reloadBundles.command"
-            assert params["arguments"] == []
-            return []
-
-        def window_log_message(msg):
-            self.logger.log(f"LSP: window/logMessage: {msg}", logging.INFO)
-
-        def do_nothing(params):
-            return
-
-        self.server.on_request("client/registerCapability", register_capability_handler)
-        self.server.on_notification("language/status", lang_status_handler)
-        self.server.on_notification("window/logMessage", window_log_message)
-        self.server.on_request("workspace/executeClientCommand", execute_client_command_handler)
-        self.server.on_notification("$/progress", do_nothing)
-        self.server.on_notification("textDocument/publishDiagnostics", do_nothing)
-        self.server.on_notification("language/actionableNotification", do_nothing)
-
-        self.logger.log("Starting EclipseJDTLS server process", logging.INFO)
-        self.server.start()
-        initialize_params = self._get_initialize_params(self.repository_root_path)
-
-        self.logger.log(
-            "Sending initialize request from LSP client to LSP server and awaiting response",
-            logging.INFO,
-        )
-        init_response = self.server.send.initialize(initialize_params)
-        assert init_response["capabilities"]["textDocumentSync"]["change"] == 2
-        assert "completionProvider" not in init_response["capabilities"]
-        assert "executeCommandProvider" not in init_response["capabilities"]
-
-        self.server.notify.initialized({})
-
-        self.server.notify.workspace_did_change_configuration({"settings": initialize_params["initializationOptions"]["settings"]})
-
-        self.intellicode_enable_command_available.wait()
-
-        java_intellisense_members_path = self.runtime_dependency_paths.intellisense_members_path
-        assert os.path.exists(java_intellisense_members_path)
-        intellicode_enable_result = self.server.send.execute_command(
-            {
-                "command": "java.intellicode.enable",
-                "arguments": [True, java_intellisense_members_path],
-            }
-        )
-        assert intellicode_enable_result
-
-        # TODO: Add comments about why we wait here, and how this can be optimized
-        self.service_ready_event.wait()

src/solidlsp/language_servers/eclipse_jdtls/initialize_params.json

@@ -1,849 +0,0 @@
-{
-    "_description": "The parameters sent by the client when initializing the language server with the \"initialize\" request. More details at https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#initialize",
-    "processId": "os.getpid()",
-    "clientInfo": {
-        "name": "Visual Studio Code - Insiders",
-        "version": "1.77.0-insider"
-    },
-    "locale": "en",
-    "rootPath": "repository_absolute_path",
-    "rootUri": "pathlib.Path(repository_absolute_path).as_uri()",
-    "capabilities": {
-        "workspace": {
-            "applyEdit": true,
-            "workspaceEdit": {
-                "documentChanges": true,
-                "resourceOperations": [
-                    "create",
-                    "rename",
-                    "delete"
-                ],
-                "failureHandling": "textOnlyTransactional",
-                "normalizesLineEndings": true,
-                "changeAnnotationSupport": {
-                    "groupsOnLabel": true
-                }
-            },
-            "didChangeConfiguration": {
-                "dynamicRegistration": true
-            },
-            "didChangeWatchedFiles": {
-                "dynamicRegistration": true,
-                "relativePatternSupport": true
-            },
-            "symbol": {
-                "dynamicRegistration": true,
-                "symbolKind": {
-                    "valueSet": [
-                        1,
-                        2,
-                        3,
-                        4,
-                        5,
-                        6,
-                        7,
-                        8,
-                        9,
-                        10,
-                        11,
-                        12,
-                        13,
-                        14,
-                        15,
-                        16,
-                        17,
-                        18,
-                        19,
-                        20,
-                        21,
-                        22,
-                        23,
-                        24,
-                        25,
-                        26
-                    ]
-                },
-                "tagSupport": {
-                    "valueSet": [
-                        1
-                    ]
-                },
-                "resolveSupport": {
-                    "properties": [
-                        "location.range"
-                    ]
-                }
-            },
-            "codeLens": {
-                "refreshSupport": true
-            },
-            "executeCommand": {
-                "dynamicRegistration": true
-            },
-            "configuration": true,
-            "workspaceFolders": true,
-            "semanticTokens": {
-                "refreshSupport": true
-            },
-            "fileOperations": {
-                "dynamicRegistration": true,
-                "didCreate": true,
-                "didRename": true,
-                "didDelete": true,
-                "willCreate": true,
-                "willRename": true,
-                "willDelete": true
-            },
-            "inlineValue": {
-                "refreshSupport": true
-            },
-            "inlayHint": {
-                "refreshSupport": true
-            },
-            "diagnostics": {
-                "refreshSupport": true
-            }
-        },
-        "textDocument": {
-            "publishDiagnostics": {
-                "relatedInformation": true,
-                "versionSupport": false,
-                "tagSupport": {
-                    "valueSet": [
-                        1,
-                        2
-                    ]
-                },
-                "codeDescriptionSupport": true,
-                "dataSupport": true
-            },
-            "synchronization": {
-                "dynamicRegistration": true,
-                "willSave": true,
-                "willSaveWaitUntil": true,
-                "didSave": true
-            },
-            "completion": {
-                "dynamicRegistration": true,
-                "contextSupport": true,
-                "completionItem": {
-                    "snippetSupport": false,
-                    "commitCharactersSupport": true,
-                    "documentationFormat": [
-                        "markdown",
-                        "plaintext"
-                    ],
-                    "deprecatedSupport": true,
-                    "preselectSupport": true,
-                    "tagSupport": {
-                        "valueSet": [
-                            1
-                        ]
-                    },
-                    "insertReplaceSupport": false,
-                    "resolveSupport": {
-                        "properties": [
-                            "documentation",
-                            "detail",
-                            "additionalTextEdits"
-                        ]
-                    },
-                    "insertTextModeSupport": {
-                        "valueSet": [
-                            1,
-                            2
-                        ]
-                    },
-                    "labelDetailsSupport": true
-                },
-                "insertTextMode": 2,
-                "completionItemKind": {
-                    "valueSet": [
-                        1,
-                        2,
-                        3,
-                        4,
-                        5,
-                        6,
-                        7,
-                        8,
-                        9,
-                        10,
-                        11,
-                        12,
-                        13,
-                        14,
-                        15,
-                        16,
-                        17,
-                        18,
-                        19,
-                        20,
-                        21,
-                        22,
-                        23,
-                        24,
-                        25
-                    ]
-                },
-                "completionList": {
-                    "itemDefaults": [
-                        "commitCharacters",
-                        "editRange",
-                        "insertTextFormat",
-                        "insertTextMode"
-                    ]
-                }
-            },
-            "hover": {
-                "dynamicRegistration": true,
-                "contentFormat": [
-                    "markdown",
-                    "plaintext"
-                ]
-            },
-            "signatureHelp": {
-                "dynamicRegistration": true,
-                "signatureInformation": {
-                    "documentationFormat": [
-                        "markdown",
-                        "plaintext"
-                    ],
-                    "parameterInformation": {
-                        "labelOffsetSupport": true
-                    },
-                    "activeParameterSupport": true
-                },
-                "contextSupport": true
-            },
-            "definition": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "references": {
-                "dynamicRegistration": true
-            },
-            "documentHighlight": {
-                "dynamicRegistration": true
-            },
-            "documentSymbol": {
-                "dynamicRegistration": true,
-                "symbolKind": {
-                    "valueSet": [
-                        1,
-                        2,
-                        3,
-                        4,
-                        5,
-                        6,
-                        7,
-                        8,
-                        9,
-                        10,
-                        11,
-                        12,
-                        13,
-                        14,
-                        15,
-                        16,
-                        17,
-                        18,
-                        19,
-                        20,
-                        21,
-                        22,
-                        23,
-                        24,
-                        25,
-                        26
-                    ]
-                },
-                "hierarchicalDocumentSymbolSupport": true,
-                "tagSupport": {
-                    "valueSet": [
-                        1
-                    ]
-                },
-                "labelSupport": true
-            },
-            "codeAction": {
-                "dynamicRegistration": true,
-                "isPreferredSupport": true,
-                "disabledSupport": true,
-                "dataSupport": true,
-                "resolveSupport": {
-                    "properties": [
-                        "edit"
-                    ]
-                },
-                "codeActionLiteralSupport": {
-                    "codeActionKind": {
-                        "valueSet": [
-                            "",
-                            "quickfix",
-                            "refactor",
-                            "refactor.extract",
-                            "refactor.inline",
-                            "refactor.rewrite",
-                            "source",
-                            "source.organizeImports"
-                        ]
-                    }
-                },
-                "honorsChangeAnnotations": false
-            },
-            "codeLens": {
-                "dynamicRegistration": true
-            },
-            "formatting": {
-                "dynamicRegistration": true
-            },
-            "rangeFormatting": {
-                "dynamicRegistration": true
-            },
-            "onTypeFormatting": {
-                "dynamicRegistration": true
-            },
-            "rename": {
-                "dynamicRegistration": true,
-                "prepareSupport": true,
-                "prepareSupportDefaultBehavior": 1,
-                "honorsChangeAnnotations": true
-            },
-            "documentLink": {
-                "dynamicRegistration": true,
-                "tooltipSupport": true
-            },
-            "typeDefinition": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "implementation": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "colorProvider": {
-                "dynamicRegistration": true
-            },
-            "foldingRange": {
-                "dynamicRegistration": true,
-                "rangeLimit": 5000,
-                "lineFoldingOnly": true,
-                "foldingRangeKind": {
-                    "valueSet": [
-                        "comment",
-                        "imports",
-                        "region"
-                    ]
-                },
-                "foldingRange": {
-                    "collapsedText": false
-                }
-            },
-            "declaration": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "selectionRange": {
-                "dynamicRegistration": true
-            },
-            "callHierarchy": {
-                "dynamicRegistration": true
-            },
-            "semanticTokens": {
-                "dynamicRegistration": true,
-                "tokenTypes": [
-                    "namespace",
-                    "type",
-                    "class",
-                    "enum",
-                    "interface",
-                    "struct",
-                    "typeParameter",
-                    "parameter",
-                    "variable",
-                    "property",
-                    "enumMember",
-                    "event",
-                    "function",
-                    "method",
-                    "macro",
-                    "keyword",
-                    "modifier",
-                    "comment",
-                    "string",
-                    "number",
-                    "regexp",
-                    "operator",
-                    "decorator"
-                ],
-                "tokenModifiers": [
-                    "declaration",
-                    "definition",
-                    "readonly",
-                    "static",
-                    "deprecated",
-                    "abstract",
-                    "async",
-                    "modification",
-                    "documentation",
-                    "defaultLibrary"
-                ],
-                "formats": [
-                    "relative"
-                ],
-                "requests": {
-                    "range": true,
-                    "full": {
-                        "delta": true
-                    }
-                },
-                "multilineTokenSupport": false,
-                "overlappingTokenSupport": false,
-                "serverCancelSupport": true,
-                "augmentsSyntaxTokens": true
-            },
-            "linkedEditingRange": {
-                "dynamicRegistration": true
-            },
-            "typeHierarchy": {
-                "dynamicRegistration": true
-            },
-            "inlineValue": {
-                "dynamicRegistration": true
-            },
-            "inlayHint": {
-                "dynamicRegistration": true,
-                "resolveSupport": {
-                    "properties": [
-                        "tooltip",
-                        "textEdits",
-                        "label.tooltip",
-                        "label.location",
-                        "label.command"
-                    ]
-                }
-            },
-            "diagnostic": {
-                "dynamicRegistration": true,
-                "relatedDocumentSupport": false
-            }
-        },
-        "window": {
-            "showMessage": {
-                "messageActionItem": {
-                    "additionalPropertiesSupport": true
-                }
-            },
-            "showDocument": {
-                "support": true
-            },
-            "workDoneProgress": true
-        },
-        "general": {
-            "staleRequestSupport": {
-                "cancel": true,
-                "retryOnContentModified": [
-                    "textDocument/semanticTokens/full",
-                    "textDocument/semanticTokens/range",
-                    "textDocument/semanticTokens/full/delta"
-                ]
-            },
-            "regularExpressions": {
-                "engine": "ECMAScript",
-                "version": "ES2020"
-            },
-            "markdown": {
-                "parser": "marked",
-                "version": "1.1.0"
-            },
-            "positionEncodings": [
-                "utf-16"
-            ]
-        },
-        "notebookDocument": {
-            "synchronization": {
-                "dynamicRegistration": true,
-                "executionSummarySupport": true
-            }
-        }
-    },
-    "initializationOptions": {
-        "bundles": [
-            "intellicode-core.jar"
-        ],
-        "workspaceFolders": "[pathlib.Path(repository_absolute_path).as_uri()]",
-        "settings": {
-            "java": {
-                "home": null,
-                "jdt": {
-                    "ls": {
-                        "java": {
-                            "home": null
-                        },
-                        "vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx1G -Xms100m -Xlog:disable",
-                        "lombokSupport": {
-                            "enabled": true
-                        },
-                        "protobufSupport": {
-                            "enabled": true
-                        },
-                        "androidSupport": {
-                            "enabled": true
-                        }
-                    }
-                },
-                "errors": {
-                    "incompleteClasspath": {
-                        "severity": "error"
-                    }
-                },
-                "configuration": {
-                    "checkProjectSettingsExclusions": false,
-                    "updateBuildConfiguration": "interactive",
-                    "maven": {
-                        "userSettings": null,
-                        "globalSettings": null,
-                        "notCoveredPluginExecutionSeverity": "warning",
-                        "defaultMojoExecutionAction": "ignore"
-                    },
-                    "workspaceCacheLimit": 90,
-                    "runtimes": [
-                        {
-                            "name": "JavaSE-21",
-                            "path": "static/vscode-java/extension/jre/21.0.7-linux-x86_64",
-                            "default": true
-                        }
-                    ]
-                },
-                "trace": {
-                    "server": "verbose"
-                },
-                "import": {
-                    "maven": {
-                        "enabled": true,
-                        "offline": {
-                            "enabled": false
-                        },
-                        "disableTestClasspathFlag": false
-                    },
-                    "gradle": {
-                        "enabled": true,
-                        "wrapper": {
-                            "enabled": true
-                        },
-                        "version": null,
-                        "home": "abs(static/gradle-7.3.3)",
-                        "java": {
-                            "home": "abs(static/launch_jres/21.0.7-linux-x86_64)"
-                        },
-                        "offline": {
-                            "enabled": false
-                        },
-                        "arguments": null,
-                        "jvmArguments": null,
-                        "user": {
-                            "home": null
-                        },
-                        "annotationProcessing": {
-                            "enabled": true
-                        }
-                    },
-                    "exclusions": [
-                        "**/node_modules/**",
-                        "**/.metadata/**",
-                        "**/archetype-resources/**",
-                        "**/META-INF/maven/**"
-                    ],
-                    "generatesMetadataFilesAtProjectRoot": false
-                },
-                "maven": {
-                    "downloadSources": true,
-                    "updateSnapshots": true
-                },
-                "eclipse": {
-                    "downloadSources": true
-                },
-                "referencesCodeLens": {
-                    "enabled": true
-                },
-                "signatureHelp": {
-                    "enabled": true,
-                    "description": {
-                        "enabled": true
-                    }
-                },
-                "implementationsCodeLens": {
-                    "enabled": true
-                },
-                "format": {
-                    "enabled": true,
-                    "settings": {
-                        "url": null,
-                        "profile": null
-                    },
-                    "comments": {
-                        "enabled": true
-                    },
-                    "onType": {
-                        "enabled": true
-                    },
-                    "insertSpaces": true,
-                    "tabSize": 4
-                },
-                "saveActions": {
-                    "organizeImports": false
-                },
-                "project": {
-                    "referencedLibraries": [
-                        "lib/**/*.jar"
-                    ],
-                    "importOnFirstTimeStartup": "automatic",
-                    "importHint": true,
-                    "resourceFilters": [
-                        "node_modules",
-                        "\\.git"
-                    ],
-                    "encoding": "ignore",
-                    "exportJar": {
-                        "targetPath": "${workspaceFolder}/${workspaceFolderBasename}.jar"
-                    }
-                },
-                "contentProvider": {
-                    "preferred": null
-                },
-                "autobuild": {
-                    "enabled": true
-                },
-                "maxConcurrentBuilds": 1,
-                "recommendations": {
-                    "dependency": {
-                        "analytics": {
-                            "show": true
-                        }
-                    }
-                },
-                "completion": {
-                    "maxResults": 0,
-                    "enabled": true,
-                    "guessMethodArguments": true,
-                    "favoriteStaticMembers": [
-                        "org.junit.Assert.*",
-                        "org.junit.Assume.*",
-                        "org.junit.jupiter.api.Assertions.*",
-                        "org.junit.jupiter.api.Assumptions.*",
-                        "org.junit.jupiter.api.DynamicContainer.*",
-                        "org.junit.jupiter.api.DynamicTest.*",
-                        "org.mockito.Mockito.*",
-                        "org.mockito.ArgumentMatchers.*",
-                        "org.mockito.Answers.*"
-                    ],
-                    "filteredTypes": [
-                        "java.awt.*",
-                        "com.sun.*",
-                        "sun.*",
-                        "jdk.*",
-                        "org.graalvm.*",
-                        "io.micrometer.shaded.*"
-                    ],
-                    "importOrder": [
-                        "#",
-                        "java",
-                        "javax",
-                        "org",
-                        "com",
-                        ""
-                    ],
-                    "postfix": {
-                        "enabled": false
-                    },
-                    "matchCase": "off"
-                },
-                "foldingRange": {
-                    "enabled": true
-                },
-                "progressReports": {
-                    "enabled": false
-                },
-                "codeGeneration": {
-                    "hashCodeEquals": {
-                        "useJava7Objects": false,
-                        "useInstanceof": false
-                    },
-                    "useBlocks": false,
-                    "generateComments": false,
-                    "toString": {
-                        "template": "${object.className} [${member.name()}=${member.value}, ${otherMembers}]",
-                        "codeStyle": "STRING_CONCATENATION",
-                        "skipNullValues": false,
-                        "listArrayContents": true,
-                        "limitElements": 0
-                    },
-                    "insertionLocation": "afterCursor"
-                },
-                "selectionRange": {
-                    "enabled": true
-                },
-                "showBuildStatusOnStart": {
-                    "enabled": "notification"
-                },
-                "server": {
-                    "launchMode": "Standard"
-                },
-                "sources": {
-                    "organizeImports": {
-                        "starThreshold": 99,
-                        "staticStarThreshold": 99
-                    }
-                },
-                "imports": {
-                    "gradle": {
-                        "wrapper": {
-                            "checksums": []
-                        }
-                    }
-                },
-                "templates": {
-                    "fileHeader": [],
-                    "typeComment": []
-                },
-                "references": {
-                    "includeAccessors": true,
-                    "includeDecompiledSources": true
-                },
-                "typeHierarchy": {
-                    "lazyLoad": false
-                },
-                "settings": {
-                    "url": null
-                },
-                "symbols": {
-                    "includeSourceMethodDeclarations": false
-                },
-                "quickfix": {
-                    "showAt": "line"
-                },
-                "inlayHints": {
-                    "parameterNames": {
-                        "enabled": "literals",
-                        "exclusions": []
-                    }
-                },
-                "codeAction": {
-                    "sortMembers": {
-                        "avoidVolatileChanges": true
-                    }
-                },
-                "compile": {
-                    "nullAnalysis": {
-                        "nonnull": [
-                            "javax.annotation.Nonnull",
-                            "org.eclipse.jdt.annotation.NonNull",
-                            "org.springframework.lang.NonNull"
-                        ],
-                        "nullable": [
-                            "javax.annotation.Nullable",
-                            "org.eclipse.jdt.annotation.Nullable",
-                            "org.springframework.lang.Nullable"
-                        ],
-                        "mode": "automatic"
-                    }
-                },
-                "cleanup": {
-                    "actionsOnSave": []
-                },
-                "sharedIndexes": {
-                    "enabled": "auto",
-                    "location": ""
-                },
-                "refactoring": {
-                    "extract": {
-                        "interface": {
-                            "replace": true
-                        }
-                    }
-                },
-                "debug": {
-                    "logLevel": "verbose",
-                    "settings": {
-                        "showHex": false,
-                        "showStaticVariables": false,
-                        "showQualifiedNames": false,
-                        "showLogicalStructure": true,
-                        "showToString": true,
-                        "maxStringLength": 0,
-                        "numericPrecision": 0,
-                        "hotCodeReplace": "manual",
-                        "enableRunDebugCodeLens": true,
-                        "forceBuildBeforeLaunch": true,
-                        "onBuildFailureProceed": false,
-                        "console": "integratedTerminal",
-                        "exceptionBreakpoint": {
-                            "skipClasses": []
-                        },
-                        "stepping": {
-                            "skipClasses": [],
-                            "skipSynthetics": false,
-                            "skipStaticInitializers": false,
-                            "skipConstructors": false
-                        },
-                        "jdwp": {
-                            "limitOfVariablesPerJdwpRequest": 100,
-                            "requestTimeout": 3000,
-                            "async": "auto"
-                        },
-                        "vmArgs": ""
-                    }
-                },
-                "silentNotification": false,
-                "dependency": {
-                    "showMembers": false,
-                    "syncWithFolderExplorer": true,
-                    "autoRefresh": true,
-                    "refreshDelay": 2000,
-                    "packagePresentation": "flat"
-                },
-                "help": {
-                    "firstView": "auto",
-                    "showReleaseNotes": true,
-                    "collectErrorLog": false
-                },
-                "test": {
-                    "defaultConfig": "",
-                    "config": {}
-                }
-            }
-        },
-        "extendedClientCapabilities": {
-            "progressReportProvider": false,
-            "classFileContentsSupport": true,
-            "overrideMethodsPromptSupport": true,
-            "hashCodeEqualsPromptSupport": true,
-            "advancedOrganizeImportsSupport": true,
-            "generateToStringPromptSupport": true,
-            "advancedGenerateAccessorsSupport": true,
-            "generateConstructorsPromptSupport": true,
-            "generateDelegateMethodsPromptSupport": true,
-            "advancedExtractRefactoringSupport": true,
-            "inferSelectionSupport": [
-                "extractMethod",
-                "extractVariable",
-                "extractField"
-            ],
-            "moveRefactoringSupport": true,
-            "clientHoverProvider": true,
-            "clientDocumentSymbolProvider": true,
-            "gradleChecksumWrapperPromptSupport": true,
-            "resolveAdditionalTextEditsSupport": true,
-            "advancedIntroduceParameterRefactoringSupport": true,
-            "actionableRuntimeNotificationSupport": true,
-            "shouldLanguageServerExitOnShutdown": true,
-            "onCompletionItemSelectedCommand": "editor.action.triggerParameterHints",
-            "extractInterfaceSupport": true,
-            "advancedUpgradeGradleSupport": true
-        },
-        "triggerFiles": []
-    },
-    "trace": "verbose",
-    "workspaceFolders": "[\n            {\n                \"uri\": pathlib.Path(repository_absolute_path).as_uri(),\n                \"name\": os.path.basename(repository_absolute_path),\n            }\n        ]"
-}

src/solidlsp/language_servers/eclipse_jdtls/runtime_dependencies.json

@@ -1,72 +0,0 @@
-{
-    "_description": "This file lists the runtime dependencies for the Java Language Server",
-    "gradle": {
-        "platform-agnostic": {
-            "url": "https://services.gradle.org/distributions/gradle-7.3.3-bin.zip",
-            "archiveType": "zip",
-            "relative_extraction_path": "."
-        }
-    },
-    "vscode-java": {
-        "darwin-arm64": {
-            "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-darwin-arm64-1.42.0-561.vsix",
-            "archiveType": "zip",
-            "relative_extraction_path": "vscode-java"
-        },
-        "osx-arm64": {
-            "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-darwin-arm64-1.42.0-561.vsix",
-            "archiveType": "zip",
-            "relative_extraction_path": "vscode-java",
-            "jre_home_path": "extension/jre/21.0.7-macosx-aarch64",
-            "jre_path": "extension/jre/21.0.7-macosx-aarch64/bin/java",
-            "lombok_jar_path": "extension/lombok/lombok-1.18.36.jar",
-            "jdtls_launcher_jar_path": "extension/server/plugins/org.eclipse.equinox.launcher_1.7.0.v20250424-1814.jar",
-            "jdtls_readonly_config_path": "extension/server/config_mac_arm"
-        },
-        "osx-x64": {
-            "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-darwin-x64-1.42.0-561.vsix",
-            "archiveType": "zip",
-            "relative_extraction_path": "vscode-java",
-            "jre_home_path": "extension/jre/21.0.7-macosx-x86_64",
-            "jre_path": "extension/jre/21.0.7-macosx-x86_64/bin/java",
-            "lombok_jar_path": "extension/lombok/lombok-1.18.36.jar",
-            "jdtls_launcher_jar_path": "extension/server/plugins/org.eclipse.equinox.launcher_1.7.0.v20250424-1814.jar",
-            "jdtls_readonly_config_path": "extension/server/config_mac"
-        },
-        "linux-arm64": {
-            "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-linux-arm64-1.42.0-561.vsix",
-            "archiveType": "zip",
-            "relative_extraction_path": "vscode-java"
-        },
-        "linux-x64": {
-            "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-linux-x64-1.42.0-561.vsix",
-            "archiveType": "zip",
-            "relative_extraction_path": "vscode-java",
-            "jre_home_path": "extension/jre/21.0.7-linux-x86_64",
-            "jre_path": "extension/jre/21.0.7-linux-x86_64/bin/java",
-            "lombok_jar_path": "extension/lombok/lombok-1.18.36.jar",
-            "jdtls_launcher_jar_path": "extension/server/plugins/org.eclipse.equinox.launcher_1.7.0.v20250424-1814.jar",
-            "jdtls_readonly_config_path": "extension/server/config_linux"
-        },
-        "win-x64": {
-            "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-win32-x64-1.42.0-561.vsix",
-            "archiveType": "zip",
-            "relative_extraction_path": "vscode-java",
-            "jre_home_path": "extension/jre/21.0.7-win32-x86_64",
-            "jre_path": "extension/jre/21.0.7-win32-x86_64/bin/java.exe",
-            "lombok_jar_path": "extension/lombok/lombok-1.18.36.jar",
-            "jdtls_launcher_jar_path": "extension/server/plugins/org.eclipse.equinox.launcher_1.7.0.v20250424-1814.jar",
-            "jdtls_readonly_config_path": "extension/server/config_win"
-        }
-    },
-    "intellicode": {
-        "platform-agnostic": {
-            "url": "https://VisualStudioExptTeam.gallery.vsassets.io/_apis/public/gallery/publisher/VisualStudioExptTeam/extension/vscodeintellicode/1.2.30/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage",
-            "alternate_url": "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/VisualStudioExptTeam/vsextensions/vscodeintellicode/1.2.30/vspackage",
-            "archiveType": "zip",
-            "relative_extraction_path": "intellicode",
-            "intellicode_jar_path": "extension/dist/com.microsoft.jdtls.intellicode.core-0.7.0.jar",
-            "intellisense_members_path": "extension/dist/bundledModels/java_intellisense-members"
-        }
-    }
-}

src/solidlsp/language_servers/gopls.py

@@ -1,4 +1,3 @@
-import json
 import logging
 import os
 import pathlib
@@ -49,19 +48,19 @@ class Gopls(SolidLanguageServer):
             return None
         return None
 
-    @classmethod
-    def setup_runtime_dependency(cls):
+    @staticmethod
+    def _setup_runtime_dependency():
         """
         Check if required Go runtime dependencies are available.
         Raises RuntimeError with helpful message if dependencies are missing.
         """
-        go_version = cls._get_go_version()
+        go_version = Gopls._get_go_version()
         if not go_version:
             raise RuntimeError(
                 "Go is not installed. Please install Go from https://golang.org/doc/install and make sure it is added to your PATH."
             )
 
-        gopls_version = cls._get_gopls_version()
+        gopls_version = Gopls._get_gopls_version()
         if not gopls_version:
             raise RuntimeError(
                 "Found a Go version but gopls is not installed.\n"
@@ -72,7 +71,7 @@ class Gopls(SolidLanguageServer):
         return True
 
     def __init__(self, config: LanguageServerConfig, logger: LanguageServerLogger, repository_root_path: str):
-        self.setup_runtime_dependency()
+        self._setup_runtime_dependency()
 
         super().__init__(
             config,
@@ -84,29 +83,37 @@ class Gopls(SolidLanguageServer):
         self.server_ready = threading.Event()
         self.request_id = 0
 
-    def _get_initialize_params(self, repository_absolute_path: str) -> InitializeParams:
+    @staticmethod
+    def _get_initialize_params(repository_absolute_path: str) -> InitializeParams:
         """
-        Returns the initialize params for the TypeScript Language Server.
+        Returns the initialize params for the Go Language Server.
         """
-        with open(os.path.join(os.path.dirname(__file__), "initialize_params.json"), encoding="utf-8") as f:
-            d = json.load(f)
-
-        del d["_description"]
-
-        d["processId"] = os.getpid()
-        assert d["rootPath"] == "$rootPath"
-        d["rootPath"] = repository_absolute_path
-
-        assert d["rootUri"] == "$rootUri"
-        d["rootUri"] = pathlib.Path(repository_absolute_path).as_uri()
-
-        assert d["workspaceFolders"][0]["uri"] == "$uri"
-        d["workspaceFolders"][0]["uri"] = pathlib.Path(repository_absolute_path).as_uri()
-
-        assert d["workspaceFolders"][0]["name"] == "$name"
-        d["workspaceFolders"][0]["name"] = os.path.basename(repository_absolute_path)
-
-        return d
+        root_uri = pathlib.Path(repository_absolute_path).as_uri()
+        initialize_params = {
+            "locale": "en",
+            "capabilities": {
+                "textDocument": {
+                    "synchronization": {"didSave": True, "dynamicRegistration": True},
+                    "definition": {"dynamicRegistration": True},
+                    "documentSymbol": {
+                        "dynamicRegistration": True,
+                        "hierarchicalDocumentSymbolSupport": True,
+                        "symbolKind": {"valueSet": list(range(1, 27))},
+                    },
+                },
+                "workspace": {"workspaceFolders": True, "didChangeConfiguration": {"dynamicRegistration": True}},
+            },
+            "processId": os.getpid(),
+            "rootPath": repository_absolute_path,
+            "rootUri": root_uri,
+            "workspaceFolders": [
+                {
+                    "uri": root_uri,
+                    "name": os.path.basename(repository_absolute_path),
+                }
+            ],
+        }
+        return initialize_params
 
     def _start_server(self):
         """Start gopls server process"""

src/solidlsp/language_servers/gopls/initialize_params.json

@@ -1,46 +0,0 @@
-{
-    "_description": "The parameters sent by the client when initializing the language server with the \"initialize\" request. More details at https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#initialize",
-    "processId": "os.getpid()",
-    "locale": "en",
-    "rootPath": "$rootPath",
-    "rootUri": "$rootUri",
-    "capabilities": {
-        "textDocument": {
-            "synchronization": {
-                "didSave": true,
-                "dynamicRegistration": true
-            },
-            "completion": {
-                "dynamicRegistration": true,
-                "completionItem": {
-                    "snippetSupport": true
-                }
-            },
-            "definition": {
-                "dynamicRegistration": true
-            },
-            "documentSymbol": {
-                "dynamicRegistration": true,
-                "hierarchicalDocumentSymbolSupport": true,
-                "symbolKind": {
-                    "valueSet": [
-                        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
-                        14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26
-                    ]
-                }
-            }
-        },
-        "workspace": {
-            "workspaceFolders": true,
-            "didChangeConfiguration": {
-                "dynamicRegistration": true
-            }
-        }
-    },
-    "workspaceFolders": [
-        {
-            "uri": "$uri",
-            "name": "$name"
-        }
-    ]
-}

src/solidlsp/language_servers/intelephense.py

@@ -2,12 +2,10 @@
 Provides PHP specific instantiation of the LanguageServer class using Intelephense.
 """
 
-import json
 import logging
 import os
 import pathlib
 import shutil
-import subprocess
 from time import sleep
 
 from overrides import override
@@ -19,6 +17,8 @@ from solidlsp.ls_utils import PlatformId, PlatformUtils
 from solidlsp.lsp_protocol_handler.lsp_types import DefinitionParams, InitializeParams
 from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 
+from .common import RuntimeDependency, RuntimeDependencyCollection
+
 
 class Intelephense(SolidLanguageServer):
     """
@@ -33,9 +33,10 @@ class Intelephense(SolidLanguageServer):
         # - cache: commonly used for caching
         return super().is_ignored_dirname(dirname) or dirname in ["node_modules", "vendor", "cache"]
 
-    def setup_runtime_dependencies(self, logger: LanguageServerLogger, config: LanguageServerConfig) -> str:
+    @classmethod
+    def _setup_runtime_dependencies(cls, logger: LanguageServerLogger, config: LanguageServerConfig) -> str:
         """
-        Setup runtime dependencies for Intelephense.
+        Setup runtime dependencies for Intelephense and return the command to start the server.
         """
         platform_id = PlatformUtils.get_platform_id()
 
@@ -50,13 +51,6 @@ class Intelephense(SolidLanguageServer):
         ]
         assert platform_id in valid_platforms, f"Platform {platform_id} is not supported for multilspy PHP at the moment"
 
-        with open(os.path.join(os.path.dirname(__file__), "runtime_dependencies.json"), encoding="utf-8") as f:
-            d = json.load(f)
-            del d["_description"]
-
-        runtime_dependencies = d.get("runtimeDependencies", [])
-        intelephense_ls_dir = os.path.join(os.path.dirname(__file__), "static", "php-lsp")
-
         # Verify both node and npm are installed
         is_node_installed = shutil.which("node") is not None
         assert is_node_installed, "node is not installed or isn't in PATH. Please install NodeJS and try again."
@@ -64,69 +58,61 @@ class Intelephense(SolidLanguageServer):
         assert is_npm_installed, "npm is not installed or isn't in PATH. Please install npm and try again."
 
         # Install intelephense if not already installed
-        if not os.path.exists(intelephense_ls_dir):
-            os.makedirs(intelephense_ls_dir, exist_ok=True)
-            for dependency in runtime_dependencies:
-                # Windows doesn't support the 'user' parameter and doesn't have pwd module
-                if PlatformUtils.get_platform_id().value.startswith("win"):
-                    subprocess.run(
-                        dependency["command"],
-                        shell=True,
-                        check=True,
-                        cwd=intelephense_ls_dir,
-                        stdout=subprocess.DEVNULL,
-                        stderr=subprocess.DEVNULL,
-                    )
-                else:
-                    # On Unix-like systems, run as non-root user
-                    import pwd
-
-                    user = pwd.getpwuid(os.getuid()).pw_name
-                    subprocess.run(
-                        dependency["command"],
-                        shell=True,
-                        check=True,
-                        user=user,
-                        cwd=intelephense_ls_dir,
-                        stdout=subprocess.DEVNULL,
-                        stderr=subprocess.DEVNULL,
-                    )
-
+        intelephense_ls_dir = os.path.join(cls.ls_resources_dir(), "php-lsp")
+        os.makedirs(intelephense_ls_dir, exist_ok=True)
         intelephense_executable_path = os.path.join(intelephense_ls_dir, "node_modules", ".bin", "intelephense")
-        assert os.path.exists(intelephense_executable_path), "intelephense executable not found. Please install intelephense and try again."
+        if not os.path.exists(intelephense_executable_path):
+            deps = RuntimeDependencyCollection(
+                [
+                    RuntimeDependency(
+                        id="intelephense",
+                        command="npm install --prefix ./ intelephense@1.14.4",
+                        platform_id="any",
+                    )
+                ]
+            )
+            deps.install(logger, intelephense_ls_dir)
+
+        assert os.path.exists(
+            intelephense_executable_path
+        ), f"intelephense executable not found at {intelephense_executable_path}, something went wrong."
 
         return f"{intelephense_executable_path} --stdio"
 
     def __init__(self, config: LanguageServerConfig, logger: LanguageServerLogger, repository_root_path: str):
         # Setup runtime dependencies before initializing
-        intelephense_cmd = self.setup_runtime_dependencies(logger, config)
+        intelephense_cmd = self._setup_runtime_dependencies(logger, config)
 
         super().__init__(config, logger, repository_root_path, ProcessLaunchInfo(cmd=intelephense_cmd, cwd=repository_root_path), "php")
         self.request_id = 0
 
-    def _get_initialize_params(self, repository_absolute_path: str) -> InitializeParams:
+    @staticmethod
+    def _get_initialize_params(repository_absolute_path: str) -> InitializeParams:
         """
         Returns the initialize params for the TypeScript Language Server.
         """
-        with open(os.path.join(os.path.dirname(__file__), "initialize_params.json"), encoding="utf-8") as f:
-            d = json.load(f)
+        root_uri = pathlib.Path(repository_absolute_path).as_uri()
+        initialize_params = {
+            "locale": "en",
+            "capabilities": {
+                "textDocument": {
+                    "synchronization": {"didSave": True, "dynamicRegistration": True},
+                    "definition": {"dynamicRegistration": True},
+                },
+                "workspace": {"workspaceFolders": True, "didChangeConfiguration": {"dynamicRegistration": True}},
+            },
+            "processId": os.getpid(),
+            "rootPath": repository_absolute_path,
+            "rootUri": root_uri,
+            "workspaceFolders": [
+                {
+                    "uri": root_uri,
+                    "name": os.path.basename(repository_absolute_path),
+                }
+            ],
+        }
 
-        del d["_description"]
-
-        d["processId"] = os.getpid()
-        assert d["rootPath"] == "$rootPath"
-        d["rootPath"] = repository_absolute_path
-
-        assert d["rootUri"] == "$rootUri"
-        d["rootUri"] = pathlib.Path(repository_absolute_path).as_uri()
-
-        assert d["workspaceFolders"][0]["uri"] == "$uri"
-        d["workspaceFolders"][0]["uri"] = pathlib.Path(repository_absolute_path).as_uri()
-
-        assert d["workspaceFolders"][0]["name"] == "$name"
-        d["workspaceFolders"][0]["name"] = os.path.basename(repository_absolute_path)
-
-        return d
+        return initialize_params
 
     def _start_server(self):
         """Start Intelephense server process"""

src/solidlsp/language_servers/intelephense/initialize_params.json

@@ -1,36 +0,0 @@
-{
-    "_description": "The parameters sent by the client when initializing the language server with the \"initialize\" request. More details at https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#initialize",
-    "processId": "os.getpid()",
-    "locale": "en",
-    "rootPath": "$rootPath",
-    "rootUri": "$rootUri",
-    "capabilities": {
-        "textDocument": {
-            "synchronization": {
-                "didSave": true,
-                "dynamicRegistration": true
-            },
-            "completion": {
-                "dynamicRegistration": true,
-                "completionItem": {
-                    "snippetSupport": true
-                }
-            },
-            "definition": {
-                "dynamicRegistration": true
-            }
-        },
-        "workspace": {
-            "workspaceFolders": true,
-            "didChangeConfiguration": {
-                "dynamicRegistration": true
-            }
-        }
-    },
-    "workspaceFolders": [
-        {
-            "uri": "$uri",
-            "name": "$name"
-        }
-    ]
-}

src/solidlsp/language_servers/intelephense/runtime_dependencies.json

@@ -1,10 +0,0 @@
-{
-  "_description": "Used to download the runtime dependencies for running intelephense. Obtained from https://www.npmjs.com/package/intelephense",
-  "runtimeDependencies": [
-    {
-      "id": "intelephense",
-      "description": "Intelephense package for Linux, OSX, and Windows. Both x64 and arm64 are supported.",
-      "command": "npm install --prefix ./ intelephense@1.14.4"
-    }
-  ]
-}

src/solidlsp/language_servers/jedi_language_server/initialize_params.json

@@ -1,905 +0,0 @@
-{
-    "_description": "The parameters sent by the client when initializing the language server with the \"initialize\" request. More details at https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#initialize",
-    "processId": "os.getpid()",
-    "clientInfo": {
-        "name": "Visual Studio Code - Insiders",
-        "version": "1.81.0-insider"
-    },
-    "locale": "en",
-    "rootPath": "$rootPath",
-    "rootUri": "$rootUri",
-    "capabilities": {
-        "workspace": {
-            "applyEdit": true,
-            "workspaceEdit": {
-                "documentChanges": true,
-                "resourceOperations": [
-                    "create",
-                    "rename",
-                    "delete"
-                ],
-                "failureHandling": "textOnlyTransactional",
-                "normalizesLineEndings": true,
-                "changeAnnotationSupport": {
-                    "groupsOnLabel": true
-                }
-            },
-            "configuration": true,
-            "didChangeWatchedFiles": {
-                "dynamicRegistration": true,
-                "relativePatternSupport": true
-            },
-            "symbol": {
-                "dynamicRegistration": true,
-                "symbolKind": {
-                    "valueSet": [
-                        1,
-                        2,
-                        3,
-                        4,
-                        5,
-                        6,
-                        7,
-                        8,
-                        9,
-                        10,
-                        11,
-                        12,
-                        13,
-                        14,
-                        15,
-                        16,
-                        17,
-                        18,
-                        19,
-                        20,
-                        21,
-                        22,
-                        23,
-                        24,
-                        25,
-                        26
-                    ]
-                },
-                "tagSupport": {
-                    "valueSet": [
-                        1
-                    ]
-                },
-                "resolveSupport": {
-                    "properties": [
-                        "location.range"
-                    ]
-                }
-            },
-            "codeLens": {
-                "refreshSupport": true
-            },
-            "executeCommand": {
-                "dynamicRegistration": true
-            },
-            "didChangeConfiguration": {
-                "dynamicRegistration": true
-            },
-            "workspaceFolders": true,
-            "semanticTokens": {
-                "refreshSupport": true
-            },
-            "fileOperations": {
-                "dynamicRegistration": true,
-                "didCreate": true,
-                "didRename": true,
-                "didDelete": true,
-                "willCreate": true,
-                "willRename": true,
-                "willDelete": true
-            },
-            "inlineValue": {
-                "refreshSupport": true
-            },
-            "inlayHint": {
-                "refreshSupport": true
-            },
-            "diagnostics": {
-                "refreshSupport": true
-            }
-        },
-        "textDocument": {
-            "publishDiagnostics": {
-                "relatedInformation": true,
-                "versionSupport": false,
-                "tagSupport": {
-                    "valueSet": [
-                        1,
-                        2
-                    ]
-                },
-                "codeDescriptionSupport": true,
-                "dataSupport": true
-            },
-            "synchronization": {
-                "dynamicRegistration": true,
-                "willSave": true,
-                "willSaveWaitUntil": true,
-                "didSave": true
-            },
-            "completion": {
-                "dynamicRegistration": true,
-                "contextSupport": true,
-                "completionItem": {
-                    "snippetSupport": true,
-                    "commitCharactersSupport": true,
-                    "documentationFormat": [
-                        "markdown",
-                        "plaintext"
-                    ],
-                    "deprecatedSupport": true,
-                    "preselectSupport": true,
-                    "tagSupport": {
-                        "valueSet": [
-                            1
-                        ]
-                    },
-                    "insertReplaceSupport": true,
-                    "resolveSupport": {
-                        "properties": [
-                            "documentation",
-                            "detail",
-                            "additionalTextEdits"
-                        ]
-                    },
-                    "insertTextModeSupport": {
-                        "valueSet": [
-                            1,
-                            2
-                        ]
-                    },
-                    "labelDetailsSupport": true
-                },
-                "insertTextMode": 2,
-                "completionItemKind": {
-                    "valueSet": [
-                        1,
-                        2,
-                        3,
-                        4,
-                        5,
-                        6,
-                        7,
-                        8,
-                        9,
-                        10,
-                        11,
-                        12,
-                        13,
-                        14,
-                        16,
-                        17,
-                        18,
-                        19,
-                        20,
-                        21,
-                        22,
-                        23,
-                        24,
-                        25
-                    ]
-                },
-                "completionList": {
-                    "itemDefaults": [
-                        "commitCharacters",
-                        "editRange",
-                        "insertTextFormat",
-                        "insertTextMode"
-                    ]
-                }
-            },
-            "hover": {
-                "dynamicRegistration": true,
-                "contentFormat": [
-                    "markdown",
-                    "plaintext"
-                ]
-            },
-            "signatureHelp": {
-                "dynamicRegistration": true,
-                "signatureInformation": {
-                    "documentationFormat": [
-                        "markdown",
-                        "plaintext"
-                    ],
-                    "parameterInformation": {
-                        "labelOffsetSupport": true
-                    },
-                    "activeParameterSupport": true
-                },
-                "contextSupport": true
-            },
-            "definition": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "references": {
-                "dynamicRegistration": true
-            },
-            "documentHighlight": {
-                "dynamicRegistration": true
-            },
-            "documentSymbol": {
-                "dynamicRegistration": true,
-                "symbolKind": {
-                    "valueSet": [
-                        1,
-                        2,
-                        3,
-                        4,
-                        5,
-                        6,
-                        7,
-                        8,
-                        9,
-                        10,
-                        11,
-                        12,
-                        13,
-                        14,
-                        15,
-                        16,
-                        17,
-                        18,
-                        19,
-                        20,
-                        21,
-                        22,
-                        23,
-                        24,
-                        25,
-                        26
-                    ]
-                },
-                "hierarchicalDocumentSymbolSupport": true,
-                "tagSupport": {
-                    "valueSet": [
-                        1
-                    ]
-                },
-                "labelSupport": true
-            },
-            "codeAction": {
-                "dynamicRegistration": true,
-                "isPreferredSupport": true,
-                "disabledSupport": true,
-                "dataSupport": true,
-                "resolveSupport": {
-                    "properties": [
-                        "edit"
-                    ]
-                },
-                "codeActionLiteralSupport": {
-                    "codeActionKind": {
-                        "valueSet": [
-                            "",
-                            "quickfix",
-                            "refactor",
-                            "refactor.extract",
-                            "refactor.inline",
-                            "refactor.rewrite",
-                            "source",
-                            "source.organizeImports"
-                        ]
-                    }
-                },
-                "honorsChangeAnnotations": false
-            },
-            "codeLens": {
-                "dynamicRegistration": true
-            },
-            "formatting": {
-                "dynamicRegistration": true
-            },
-            "rangeFormatting": {
-                "dynamicRegistration": true
-            },
-            "onTypeFormatting": {
-                "dynamicRegistration": true
-            },
-            "rename": {
-                "dynamicRegistration": true,
-                "prepareSupport": true,
-                "prepareSupportDefaultBehavior": 1,
-                "honorsChangeAnnotations": true
-            },
-            "documentLink": {
-                "dynamicRegistration": true,
-                "tooltipSupport": true
-            },
-            "typeDefinition": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "implementation": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "colorProvider": {
-                "dynamicRegistration": true
-            },
-            "foldingRange": {
-                "dynamicRegistration": true,
-                "rangeLimit": 5000,
-                "lineFoldingOnly": true,
-                "foldingRangeKind": {
-                    "valueSet": [
-                        "comment",
-                        "imports",
-                        "region"
-                    ]
-                },
-                "foldingRange": {
-                    "collapsedText": false
-                }
-            },
-            "declaration": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "selectionRange": {
-                "dynamicRegistration": true
-            },
-            "callHierarchy": {
-                "dynamicRegistration": true
-            },
-            "semanticTokens": {
-                "dynamicRegistration": true,
-                "tokenTypes": [
-                    "namespace",
-                    "type",
-                    "class",
-                    "enum",
-                    "interface",
-                    "struct",
-                    "typeParameter",
-                    "parameter",
-                    "variable",
-                    "property",
-                    "enumMember",
-                    "event",
-                    "function",
-                    "method",
-                    "macro",
-                    "keyword",
-                    "modifier",
-                    "comment",
-                    "string",
-                    "number",
-                    "regexp",
-                    "operator",
-                    "decorator"
-                ],
-                "tokenModifiers": [
-                    "declaration",
-                    "definition",
-                    "readonly",
-                    "static",
-                    "deprecated",
-                    "abstract",
-                    "async",
-                    "modification",
-                    "documentation",
-                    "defaultLibrary"
-                ],
-                "formats": [
-                    "relative"
-                ],
-                "requests": {
-                    "range": true,
-                    "full": {
-                        "delta": true
-                    }
-                },
-                "multilineTokenSupport": false,
-                "overlappingTokenSupport": false,
-                "serverCancelSupport": true,
-                "augmentsSyntaxTokens": false
-            },
-            "linkedEditingRange": {
-                "dynamicRegistration": true
-            },
-            "typeHierarchy": {
-                "dynamicRegistration": true
-            },
-            "inlineValue": {
-                "dynamicRegistration": true
-            },
-            "inlayHint": {
-                "dynamicRegistration": true,
-                "resolveSupport": {
-                    "properties": [
-                        "tooltip",
-                        "textEdits",
-                        "label.tooltip",
-                        "label.location",
-                        "label.command"
-                    ]
-                }
-            },
-            "diagnostic": {
-                "dynamicRegistration": true,
-                "relatedDocumentSupport": false
-            }
-        },
-        "window": {
-            "showMessage": {
-                "messageActionItem": {
-                    "additionalPropertiesSupport": true
-                }
-            },
-            "showDocument": {
-                "support": true
-            },
-            "workDoneProgress": true
-        },
-        "general": {
-            "staleRequestSupport": {
-                "cancel": true,
-                "retryOnContentModified": [
-                    "textDocument/semanticTokens/full",
-                    "textDocument/semanticTokens/range",
-                    "textDocument/semanticTokens/full/delta"
-                ]
-            },
-            "regularExpressions": {
-                "engine": "ECMAScript",
-                "version": "ES2020"
-            },
-            "markdown": {
-                "parser": "marked",
-                "version": "1.1.0",
-                "allowedTags": [
-                    "ul",
-                    "li",
-                    "p",
-                    "code",
-                    "blockquote",
-                    "ol",
-                    "h1",
-                    "h2",
-                    "h3",
-                    "h4",
-                    "h5",
-                    "h6",
-                    "hr",
-                    "em",
-                    "pre",
-                    "table",
-                    "thead",
-                    "tbody",
-                    "tr",
-                    "th",
-                    "td",
-                    "div",
-                    "del",
-                    "a",
-                    "strong",
-                    "br",
-                    "img",
-                    "span"
-                ]
-            },
-            "positionEncodings": [
-                "utf-16"
-            ]
-        },
-        "notebookDocument": {
-            "synchronization": {
-                "dynamicRegistration": true,
-                "executionSummarySupport": true
-            }
-        },
-        "experimental": {
-            "snippetTextEdit": true,
-            "codeActionGroup": true,
-            "hoverActions": true,
-            "serverStatusNotification": true,
-            "colorDiagnosticOutput": true,
-            "openServerLogs": true,
-            "commands": {
-                "commands": [
-                    "rust-analyzer.runSingle",
-                    "rust-analyzer.debugSingle",
-                    "rust-analyzer.showReferences",
-                    "rust-analyzer.gotoLocation",
-                    "editor.action.triggerParameterHints"
-                ]
-            }
-        }
-    },
-    "initializationOptions": {
-        "cargoRunner": null,
-        "runnables": {
-            "extraEnv": null,
-            "problemMatcher": [
-                "$rustc"
-            ],
-            "command": null,
-            "extraArgs": []
-        },
-        "server": {
-            "path": null,
-            "extraEnv": null
-        },
-        "trace": {
-            "server": "verbose",
-            "extension": true
-        },
-        "debug": {
-            "engine": "auto",
-            "sourceFileMap": {
-                "/rustc/<id>": "${env:USERPROFILE}/.rustup/toolchains/<toolchain-id>/lib/rustlib/src/rust"
-            },
-            "openDebugPane": false,
-            "engineSettings": {}
-        },
-        "restartServerOnConfigChange": false,
-        "typing": {
-            "continueCommentsOnNewline": true,
-            "autoClosingAngleBrackets": {
-                "enable": false
-            }
-        },
-        "diagnostics": {
-            "previewRustcOutput": false,
-            "useRustcErrorCode": false,
-            "disabled": [],
-            "enable": true,
-            "experimental": {
-                "enable": false
-            },
-            "remapPrefix": {},
-            "warningsAsHint": [],
-            "warningsAsInfo": []
-        },
-        "discoverProjectCommand": null,
-        "showUnlinkedFileNotification": true,
-        "showDependenciesExplorer": true,
-        "assist": {
-            "emitMustUse": false,
-            "expressionFillDefault": "todo"
-        },
-        "cachePriming": {
-            "enable": true,
-            "numThreads": 0
-        },
-        "cargo": {
-            "autoreload": true,
-            "buildScripts": {
-                "enable": true,
-                "invocationLocation": "workspace",
-                "invocationStrategy": "per_workspace",
-                "overrideCommand": null,
-                "useRustcWrapper": true
-            },
-            "cfgs": {},
-            "extraArgs": [],
-            "extraEnv": {},
-            "features": [],
-            "noDefaultFeatures": false,
-            "sysroot": "discover",
-            "sysrootSrc": null,
-            "target": null,
-            "unsetTest": [
-                "core"
-            ]
-        },
-        "checkOnSave": true,
-        "check": {
-            "allTargets": true,
-            "command": "check",
-            "extraArgs": [],
-            "extraEnv": {},
-            "features": null,
-            "invocationLocation": "workspace",
-            "invocationStrategy": "per_workspace",
-            "noDefaultFeatures": null,
-            "overrideCommand": null,
-            "targets": null
-        },
-        "completion": {
-            "autoimport": {
-                "enable": true
-            },
-            "autoself": {
-                "enable": true
-            },
-            "callable": {
-                "snippets": "fill_arguments"
-            },
-            "limit": null,
-            "postfix": {
-                "enable": true
-            },
-            "privateEditable": {
-                "enable": false
-            },
-            "snippets": {
-                "custom": {
-                    "Arc::new": {
-                        "postfix": "arc",
-                        "body": "Arc::new(${receiver})",
-                        "requires": "std::sync::Arc",
-                        "description": "Put the expression into an `Arc`",
-                        "scope": "expr"
-                    },
-                    "Rc::new": {
-                        "postfix": "rc",
-                        "body": "Rc::new(${receiver})",
-                        "requires": "std::rc::Rc",
-                        "description": "Put the expression into an `Rc`",
-                        "scope": "expr"
-                    },
-                    "Box::pin": {
-                        "postfix": "pinbox",
-                        "body": "Box::pin(${receiver})",
-                        "requires": "std::boxed::Box",
-                        "description": "Put the expression into a pinned `Box`",
-                        "scope": "expr"
-                    },
-                    "Ok": {
-                        "postfix": "ok",
-                        "body": "Ok(${receiver})",
-                        "description": "Wrap the expression in a `Result::Ok`",
-                        "scope": "expr"
-                    },
-                    "Err": {
-                        "postfix": "err",
-                        "body": "Err(${receiver})",
-                        "description": "Wrap the expression in a `Result::Err`",
-                        "scope": "expr"
-                    },
-                    "Some": {
-                        "postfix": "some",
-                        "body": "Some(${receiver})",
-                        "description": "Wrap the expression in an `Option::Some`",
-                        "scope": "expr"
-                    }
-                }
-            }
-        },
-        "files": {
-            "excludeDirs": [],
-            "watcher": "client"
-        },
-        "highlightRelated": {
-            "breakPoints": {
-                "enable": true
-            },
-            "closureCaptures": {
-                "enable": true
-            },
-            "exitPoints": {
-                "enable": true
-            },
-            "references": {
-                "enable": true
-            },
-            "yieldPoints": {
-                "enable": true
-            }
-        },
-        "hover": {
-            "actions": {
-                "debug": {
-                    "enable": true
-                },
-                "enable": true,
-                "gotoTypeDef": {
-                    "enable": true
-                },
-                "implementations": {
-                    "enable": true
-                },
-                "references": {
-                    "enable": false
-                },
-                "run": {
-                    "enable": true
-                }
-            },
-            "documentation": {
-                "enable": true,
-                "keywords": {
-                    "enable": true
-                }
-            },
-            "links": {
-                "enable": true
-            },
-            "memoryLayout": {
-                "alignment": "hexadecimal",
-                "enable": true,
-                "niches": false,
-                "offset": "hexadecimal",
-                "size": "both"
-            }
-        },
-        "imports": {
-            "granularity": {
-                "enforce": false,
-                "group": "crate"
-            },
-            "group": {
-                "enable": true
-            },
-            "merge": {
-                "glob": true
-            },
-            "prefer": {
-                "no": {
-                    "std": false
-                }
-            },
-            "prefix": "plain"
-        },
-        "inlayHints": {
-            "bindingModeHints": {
-                "enable": false
-            },
-            "chainingHints": {
-                "enable": true
-            },
-            "closingBraceHints": {
-                "enable": true,
-                "minLines": 25
-            },
-            "closureCaptureHints": {
-                "enable": false
-            },
-            "closureReturnTypeHints": {
-                "enable": "never"
-            },
-            "closureStyle": "impl_fn",
-            "discriminantHints": {
-                "enable": "never"
-            },
-            "expressionAdjustmentHints": {
-                "enable": "never",
-                "hideOutsideUnsafe": false,
-                "mode": "prefix"
-            },
-            "lifetimeElisionHints": {
-                "enable": "never",
-                "useParameterNames": false
-            },
-            "maxLength": 25,
-            "parameterHints": {
-                "enable": true
-            },
-            "reborrowHints": {
-                "enable": "never"
-            },
-            "renderColons": true,
-            "typeHints": {
-                "enable": true,
-                "hideClosureInitialization": false,
-                "hideNamedConstructor": false
-            }
-        },
-        "interpret": {
-            "tests": false
-        },
-        "joinLines": {
-            "joinAssignments": true,
-            "joinElseIf": true,
-            "removeTrailingComma": true,
-            "unwrapTrivialBlock": true
-        },
-        "lens": {
-            "debug": {
-                "enable": true
-            },
-            "enable": true,
-            "forceCustomCommands": true,
-            "implementations": {
-                "enable": true
-            },
-            "location": "above_name",
-            "references": {
-                "adt": {
-                    "enable": false
-                },
-                "enumVariant": {
-                    "enable": false
-                },
-                "method": {
-                    "enable": false
-                },
-                "trait": {
-                    "enable": false
-                }
-            },
-            "run": {
-                "enable": true
-            }
-        },
-        "linkedProjects": [],
-        "lru": {
-            "capacity": null,
-            "query": {
-                "capacities": {}
-            }
-        },
-        "notifications": {
-            "cargoTomlNotFound": true
-        },
-        "numThreads": null,
-        "procMacro": {
-            "attributes": {
-                "enable": true
-            },
-            "enable": true,
-            "ignored": {},
-            "server": null
-        },
-        "references": {
-            "excludeImports": false
-        },
-        "rustc": {
-            "source": null
-        },
-        "rustfmt": {
-            "extraArgs": [],
-            "overrideCommand": null,
-            "rangeFormatting": {
-                "enable": false
-            }
-        },
-        "semanticHighlighting": {
-            "doc": {
-                "comment": {
-                    "inject": {
-                        "enable": true
-                    }
-                }
-            },
-            "nonStandardTokens": true,
-            "operator": {
-                "enable": true,
-                "specialization": {
-                    "enable": false
-                }
-            },
-            "punctuation": {
-                "enable": false,
-                "separate": {
-                    "macro": {
-                        "bang": false
-                    }
-                },
-                "specialization": {
-                    "enable": false
-                }
-            },
-            "strings": {
-                "enable": true
-            }
-        },
-        "signatureInfo": {
-            "detail": "full",
-            "documentation": {
-                "enable": true
-            }
-        },
-        "workspace": {
-            "symbols": {
-                "maxSymbols": 0
-            }
-        }
-    },
-    "trace": "verbose",
-    "workspaceFolders": [
-        {
-            "uri": "$uri",
-            "name": "$name"
-        }
-    ]
-}

src/solidlsp/language_servers/jedi_language_server/jedi_server.py

@@ -1,107 +0,0 @@
-"""
-Provides Python specific instantiation of the LanguageServer class. Contains various configurations and settings specific to Python.
-"""
-
-import json
-import logging
-import os
-import pathlib
-
-from overrides import override
-
-from solidlsp.ls import SolidLanguageServer
-from solidlsp.ls_config import LanguageServerConfig
-from solidlsp.ls_logger import LanguageServerLogger
-from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
-from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
-
-
-class JediServer(SolidLanguageServer):
-    """
-    Provides Python specific instantiation of the LanguageServer class. Contains various configurations and settings specific to Python.
-    """
-
-    def __init__(self, config: LanguageServerConfig, logger: LanguageServerLogger, repository_root_path: str):
-        """
-        Creates a JediServer instance. This class is not meant to be instantiated directly. Use LanguageServer.create() instead.
-        """
-        super().__init__(
-            config,
-            logger,
-            repository_root_path,
-            ProcessLaunchInfo(cmd="jedi-language-server", cwd=repository_root_path),
-            "python",
-        )
-
-    @override
-    def is_ignored_dirname(self, dirname: str) -> bool:
-        return super().is_ignored_dirname(dirname) or dirname in ["venv", "__pycache__"]
-
-    def _get_initialize_params(self, repository_absolute_path: str) -> InitializeParams:
-        """
-        Returns the initialize params for the Jedi Language Server.
-        """
-        with open(os.path.join(os.path.dirname(__file__), "initialize_params.json"), encoding="utf-8") as f:
-            d = json.load(f)
-
-        del d["_description"]
-
-        d["processId"] = os.getpid()
-        assert d["rootPath"] == "$rootPath"
-        d["rootPath"] = repository_absolute_path
-
-        assert d["rootUri"] == "$rootUri"
-        d["rootUri"] = pathlib.Path(repository_absolute_path).as_uri()
-
-        assert d["workspaceFolders"][0]["uri"] == "$uri"
-        d["workspaceFolders"][0]["uri"] = pathlib.Path(repository_absolute_path).as_uri()
-
-        assert d["workspaceFolders"][0]["name"] == "$name"
-        d["workspaceFolders"][0]["name"] = os.path.basename(repository_absolute_path)
-
-        return d
-
-    def _start_server(self):
-        """
-        Starts the JEDI Language Server
-        """
-
-        def execute_client_command_handler(params):
-            return []
-
-        def do_nothing(params):
-            return
-
-        def check_experimental_status(params):
-            if params["quiescent"] == True:
-                self.completions_available.set()
-
-        def window_log_message(msg):
-            self.logger.log(f"LSP: window/logMessage: {msg}", logging.INFO)
-
-        self.server.on_request("client/registerCapability", do_nothing)
-        self.server.on_notification("language/status", do_nothing)
-        self.server.on_notification("window/logMessage", window_log_message)
-        self.server.on_request("workspace/executeClientCommand", execute_client_command_handler)
-        self.server.on_notification("$/progress", do_nothing)
-        self.server.on_notification("textDocument/publishDiagnostics", do_nothing)
-        self.server.on_notification("language/actionableNotification", do_nothing)
-        self.server.on_notification("experimental/serverStatus", check_experimental_status)
-
-        self.logger.log("Starting jedi-language-server server process", logging.INFO)
-        self.server.start()
-        initialize_params = self._get_initialize_params(self.repository_root_path)
-
-        self.logger.log(
-            "Sending initialize request from LSP client to LSP server and awaiting response",
-            logging.INFO,
-        )
-        init_response = self.server.send.initialize(initialize_params)
-        assert init_response["capabilities"]["textDocumentSync"]["change"] == 2
-        assert "completionProvider" in init_response["capabilities"]
-        assert init_response["capabilities"]["completionProvider"] == {
-            "triggerCharacters": [".", "'", '"'],
-            "resolveProvider": True,
-        }
-
-        self.server.notify.initialized({})

src/solidlsp/language_servers/jedi_server.py

@@ -0,0 +1,194 @@
+"""
+Provides Python specific instantiation of the LanguageServer class. Contains various configurations and settings specific to Python.
+"""
+
+import logging
+import os
+import pathlib
+
+from overrides import override
+
+from solidlsp.ls import SolidLanguageServer
+from solidlsp.ls_config import LanguageServerConfig
+from solidlsp.ls_logger import LanguageServerLogger
+from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
+from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
+
+
+class JediServer(SolidLanguageServer):
+    """
+    Provides Python specific instantiation of the LanguageServer class. Contains various configurations and settings specific to Python.
+    """
+
+    def __init__(self, config: LanguageServerConfig, logger: LanguageServerLogger, repository_root_path: str):
+        """
+        Creates a JediServer instance. This class is not meant to be instantiated directly. Use LanguageServer.create() instead.
+        """
+        super().__init__(
+            config,
+            logger,
+            repository_root_path,
+            ProcessLaunchInfo(cmd="jedi-language-server", cwd=repository_root_path),
+            "python",
+        )
+
+    @override
+    def is_ignored_dirname(self, dirname: str) -> bool:
+        return super().is_ignored_dirname(dirname) or dirname in ["venv", "__pycache__"]
+
+    @staticmethod
+    def _get_initialize_params(repository_absolute_path: str) -> InitializeParams:
+        """
+        Returns the initialize params for the Jedi Language Server.
+        """
+        root_uri = pathlib.Path(repository_absolute_path).as_uri()
+        initialize_params = {
+            "processId": os.getpid(),
+            "clientInfo": {"name": "Serena", "version": "0.1.0"},
+            "locale": "en",
+            "rootPath": repository_absolute_path,
+            "rootUri": root_uri,
+            # Note: this is not necessarily the minimal set of capabilities...
+            "capabilities": {
+                "workspace": {
+                    "applyEdit": True,
+                    "workspaceEdit": {
+                        "documentChanges": True,
+                        "resourceOperations": ["create", "rename", "delete"],
+                        "failureHandling": "textOnlyTransactional",
+                        "normalizesLineEndings": True,
+                        "changeAnnotationSupport": {"groupsOnLabel": True},
+                    },
+                    "configuration": True,
+                    "didChangeWatchedFiles": {"dynamicRegistration": True, "relativePatternSupport": True},
+                    "symbol": {
+                        "dynamicRegistration": True,
+                        "symbolKind": {"valueSet": list(range(1, 27))},
+                        "tagSupport": {"valueSet": [1]},
+                        "resolveSupport": {"properties": ["location.range"]},
+                    },
+                    "workspaceFolders": True,
+                    "fileOperations": {
+                        "dynamicRegistration": True,
+                        "didCreate": True,
+                        "didRename": True,
+                        "didDelete": True,
+                        "willCreate": True,
+                        "willRename": True,
+                        "willDelete": True,
+                    },
+                    "inlineValue": {"refreshSupport": True},
+                    "inlayHint": {"refreshSupport": True},
+                    "diagnostics": {"refreshSupport": True},
+                },
+                "textDocument": {
+                    "publishDiagnostics": {
+                        "relatedInformation": True,
+                        "versionSupport": False,
+                        "tagSupport": {"valueSet": [1, 2]},
+                        "codeDescriptionSupport": True,
+                        "dataSupport": True,
+                    },
+                    "synchronization": {"dynamicRegistration": True, "willSave": True, "willSaveWaitUntil": True, "didSave": True},
+                    "hover": {"dynamicRegistration": True, "contentFormat": ["markdown", "plaintext"]},
+                    "signatureHelp": {
+                        "dynamicRegistration": True,
+                        "signatureInformation": {
+                            "documentationFormat": ["markdown", "plaintext"],
+                            "parameterInformation": {"labelOffsetSupport": True},
+                            "activeParameterSupport": True,
+                        },
+                        "contextSupport": True,
+                    },
+                    "definition": {"dynamicRegistration": True, "linkSupport": True},
+                    "references": {"dynamicRegistration": True},
+                    "documentHighlight": {"dynamicRegistration": True},
+                    "documentSymbol": {
+                        "dynamicRegistration": True,
+                        "symbolKind": {"valueSet": list(range(1, 27))},
+                        "hierarchicalDocumentSymbolSupport": True,
+                        "tagSupport": {"valueSet": [1]},
+                        "labelSupport": True,
+                    },
+                    "documentLink": {"dynamicRegistration": True, "tooltipSupport": True},
+                    "typeDefinition": {"dynamicRegistration": True, "linkSupport": True},
+                    "implementation": {"dynamicRegistration": True, "linkSupport": True},
+                    "declaration": {"dynamicRegistration": True, "linkSupport": True},
+                    "selectionRange": {"dynamicRegistration": True},
+                    "callHierarchy": {"dynamicRegistration": True},
+                    "linkedEditingRange": {"dynamicRegistration": True},
+                    "typeHierarchy": {"dynamicRegistration": True},
+                    "inlineValue": {"dynamicRegistration": True},
+                    "inlayHint": {
+                        "dynamicRegistration": True,
+                        "resolveSupport": {"properties": ["tooltip", "textEdits", "label.tooltip", "label.location", "label.command"]},
+                    },
+                    "diagnostic": {"dynamicRegistration": True, "relatedDocumentSupport": False},
+                },
+                "notebookDocument": {"synchronization": {"dynamicRegistration": True, "executionSummarySupport": True}},
+                "experimental": {
+                    "serverStatusNotification": True,
+                    "openServerLogs": True,
+                },
+            },
+            # See https://github.com/pappasam/jedi-language-server?tab=readme-ov-file
+            # We use the default options except for maxSymbols, where 0 means no limit
+            "initializationOptions": {
+                "workspace": {
+                    "symbols": {"ignoreFolders": [".nox", ".tox", ".venv", "__pycache__", "venv"], "maxSymbols": 0},
+                },
+            },
+            "trace": "verbose",
+            "workspaceFolders": [
+                {
+                    "uri": root_uri,
+                    "name": os.path.basename(repository_absolute_path),
+                }
+            ],
+        }
+        return initialize_params
+
+    def _start_server(self):
+        """
+        Starts the JEDI Language Server
+        """
+
+        def execute_client_command_handler(params):
+            return []
+
+        def do_nothing(params):
+            return
+
+        def check_experimental_status(params):
+            if params["quiescent"] == True:
+                self.completions_available.set()
+
+        def window_log_message(msg):
+            self.logger.log(f"LSP: window/logMessage: {msg}", logging.INFO)
+
+        self.server.on_request("client/registerCapability", do_nothing)
+        self.server.on_notification("language/status", do_nothing)
+        self.server.on_notification("window/logMessage", window_log_message)
+        self.server.on_request("workspace/executeClientCommand", execute_client_command_handler)
+        self.server.on_notification("$/progress", do_nothing)
+        self.server.on_notification("textDocument/publishDiagnostics", do_nothing)
+        self.server.on_notification("language/actionableNotification", do_nothing)
+        self.server.on_notification("experimental/serverStatus", check_experimental_status)
+
+        self.logger.log("Starting jedi-language-server server process", logging.INFO)
+        self.server.start()
+        initialize_params = self._get_initialize_params(self.repository_root_path)
+
+        self.logger.log(
+            "Sending initialize request from LSP client to LSP server and awaiting response",
+            logging.INFO,
+        )
+        init_response = self.server.send.initialize(initialize_params)
+        assert init_response["capabilities"]["textDocumentSync"]["change"] == 2
+        assert "completionProvider" in init_response["capabilities"]
+        assert init_response["capabilities"]["completionProvider"] == {
+            "triggerCharacters": [".", "'", '"'],
+            "resolveProvider": True,
+        }
+
+        self.server.notify.initialized({})

src/solidlsp/language_servers/kotlin_language_server.py

@@ -0,0 +1,463 @@
+"""
+Provides Kotlin specific instantiation of the LanguageServer class. Contains various configurations and settings specific to Kotlin.
+"""
+
+import dataclasses
+import logging
+import os
+import pathlib
+import stat
+
+from solidlsp.ls import SolidLanguageServer
+from solidlsp.ls_config import LanguageServerConfig
+from solidlsp.ls_logger import LanguageServerLogger
+from solidlsp.ls_utils import FileUtils, PlatformUtils
+from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
+from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
+
+
+@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(SolidLanguageServer):
+    """
+    Provides Kotlin specific instantiation of the LanguageServer class. Contains various configurations and settings specific to Kotlin.
+    """
+
+    def __init__(self, config: LanguageServerConfig, logger: LanguageServerLogger, repository_root_path: str):
+        """
+        Creates a Kotlin Language Server instance. This class is not meant to be instantiated directly. Use LanguageServer.create() instead.
+        """
+        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=cmd, env=proc_env, cwd=repository_root_path),
+            "kotlin",
+        )
+
+    @classmethod
+    def _setup_runtime_dependencies(cls, logger: LanguageServerLogger, config: LanguageServerConfig) -> KotlinRuntimeDependencyPaths:
+        """
+        Setup runtime dependencies for Kotlin Language Server and return the paths.
+        """
+        platform_id = PlatformUtils.get_platform_id()
+
+        # 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"
+
+        # Runtime dependency information
+        runtime_dependencies = {
+            "runtimeDependency": {
+                "id": "KotlinLsp",
+                "description": "Kotlin Language Server",
+                "url": "https://github.com/fwcd/kotlin-language-server/releases/download/1.3.13/server.zip",
+                "archiveType": "zip",
+            },
+            "java": {
+                "win-x64": {
+                    "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-win32-x64-1.42.0-561.vsix",
+                    "archiveType": "zip",
+                    "java_home_path": "extension/jre/21.0.7-win32-x86_64",
+                    "java_path": "extension/jre/21.0.7-win32-x86_64/bin/java.exe",
+                },
+                "linux-x64": {
+                    "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-linux-x64-1.42.0-561.vsix",
+                    "archiveType": "zip",
+                    "java_home_path": "extension/jre/21.0.7-linux-x86_64",
+                    "java_path": "extension/jre/21.0.7-linux-x86_64/bin/java",
+                },
+                "linux-arm64": {
+                    "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-linux-arm64-1.42.0-561.vsix",
+                    "archiveType": "zip",
+                    "java_home_path": "extension/jre/21.0.7-linux-aarch64",
+                    "java_path": "extension/jre/21.0.7-linux-aarch64/bin/java",
+                },
+                "osx-x64": {
+                    "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-darwin-x64-1.42.0-561.vsix",
+                    "archiveType": "zip",
+                    "java_home_path": "extension/jre/21.0.7-macosx-x86_64",
+                    "java_path": "extension/jre/21.0.7-macosx-x86_64/bin/java",
+                },
+                "osx-arm64": {
+                    "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-darwin-arm64-1.42.0-561.vsix",
+                    "archiveType": "zip",
+                    "java_home_path": "extension/jre/21.0.7-macosx-aarch64",
+                    "java_path": "extension/jre/21.0.7-macosx-aarch64/bin/java",
+                },
+            },
+        }
+
+        kotlin_dependency = runtime_dependencies["runtimeDependency"]
+        java_dependency = runtime_dependencies["java"][platform_id.value]
+
+        # Setup paths for dependencies
+        static_dir = os.path.join(cls.ls_resources_dir(), "kotlin_language_server")
+        os.makedirs(static_dir, exist_ok=True)
+
+        # Setup Java paths
+        java_dir = os.path.join(static_dir, "java")
+        os.makedirs(java_dir, exist_ok=True)
+
+        java_home_path = os.path.join(java_dir, java_dependency["java_home_path"])
+        java_path = os.path.join(java_dir, java_dependency["java_path"])
+
+        # Download and extract Java if not exists
+        if not os.path.exists(java_path):
+            logger.log(f"Downloading Java for {platform_id.value}...", logging.INFO)
+            FileUtils.download_and_extract_archive(logger, java_dependency["url"], java_dir, java_dependency["archiveType"])
+            # 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}"
+
+        # Setup Kotlin Language Server paths
+        kotlin_ls_dir = os.path.join(static_dir, "server")
+
+        # Get platform-specific executable script path
+        if platform_id.value.startswith("win-"):
+            kotlin_script = os.path.join(kotlin_ls_dir, "bin", "kotlin-language-server.bat")
+        else:
+            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
+        )
+
+    @staticmethod
+    def _get_initialize_params(repository_absolute_path: str) -> InitializeParams:
+        """
+        Returns the initialize params for the Kotlin Language Server.
+        """
+        if not os.path.isabs(repository_absolute_path):
+            repository_absolute_path = os.path.abspath(repository_absolute_path)
+
+        root_uri = pathlib.Path(repository_absolute_path).as_uri()
+        initialize_params = {
+            "clientInfo": {"name": "Multilspy Kotlin Client", "version": "1.0.0"},
+            "locale": "en",
+            "rootPath": repository_absolute_path,
+            "rootUri": root_uri,
+            "capabilities": {
+                "workspace": {
+                    "applyEdit": True,
+                    "workspaceEdit": {
+                        "documentChanges": True,
+                        "resourceOperations": ["create", "rename", "delete"],
+                        "failureHandling": "textOnlyTransactional",
+                        "normalizesLineEndings": True,
+                        "changeAnnotationSupport": {"groupsOnLabel": True},
+                    },
+                    "didChangeConfiguration": {"dynamicRegistration": True},
+                    "didChangeWatchedFiles": {"dynamicRegistration": True, "relativePatternSupport": True},
+                    "symbol": {
+                        "dynamicRegistration": True,
+                        "symbolKind": {"valueSet": list(range(1, 27))},
+                        "tagSupport": {"valueSet": [1]},
+                        "resolveSupport": {"properties": ["location.range"]},
+                    },
+                    "codeLens": {"refreshSupport": True},
+                    "executeCommand": {"dynamicRegistration": True},
+                    "configuration": True,
+                    "workspaceFolders": True,
+                    "semanticTokens": {"refreshSupport": True},
+                    "fileOperations": {
+                        "dynamicRegistration": True,
+                        "didCreate": True,
+                        "didRename": True,
+                        "didDelete": True,
+                        "willCreate": True,
+                        "willRename": True,
+                        "willDelete": True,
+                    },
+                    "inlineValue": {"refreshSupport": True},
+                    "inlayHint": {"refreshSupport": True},
+                    "diagnostics": {"refreshSupport": True},
+                },
+                "textDocument": {
+                    "publishDiagnostics": {
+                        "relatedInformation": True,
+                        "versionSupport": False,
+                        "tagSupport": {"valueSet": [1, 2]},
+                        "codeDescriptionSupport": True,
+                        "dataSupport": True,
+                    },
+                    "synchronization": {"dynamicRegistration": True, "willSave": True, "willSaveWaitUntil": True, "didSave": True},
+                    "completion": {
+                        "dynamicRegistration": True,
+                        "contextSupport": True,
+                        "completionItem": {
+                            "snippetSupport": False,
+                            "commitCharactersSupport": True,
+                            "documentationFormat": ["markdown", "plaintext"],
+                            "deprecatedSupport": True,
+                            "preselectSupport": True,
+                            "tagSupport": {"valueSet": [1]},
+                            "insertReplaceSupport": False,
+                            "resolveSupport": {"properties": ["documentation", "detail", "additionalTextEdits"]},
+                            "insertTextModeSupport": {"valueSet": [1, 2]},
+                            "labelDetailsSupport": True,
+                        },
+                        "insertTextMode": 2,
+                        "completionItemKind": {
+                            "valueSet": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25]
+                        },
+                        "completionList": {"itemDefaults": ["commitCharacters", "editRange", "insertTextFormat", "insertTextMode"]},
+                    },
+                    "hover": {"dynamicRegistration": True, "contentFormat": ["markdown", "plaintext"]},
+                    "signatureHelp": {
+                        "dynamicRegistration": True,
+                        "signatureInformation": {
+                            "documentationFormat": ["markdown", "plaintext"],
+                            "parameterInformation": {"labelOffsetSupport": True},
+                            "activeParameterSupport": True,
+                        },
+                        "contextSupport": True,
+                    },
+                    "definition": {"dynamicRegistration": True, "linkSupport": True},
+                    "references": {"dynamicRegistration": True},
+                    "documentHighlight": {"dynamicRegistration": True},
+                    "documentSymbol": {
+                        "dynamicRegistration": True,
+                        "symbolKind": {"valueSet": list(range(1, 27))},
+                        "hierarchicalDocumentSymbolSupport": True,
+                        "tagSupport": {"valueSet": [1]},
+                        "labelSupport": True,
+                    },
+                    "codeAction": {
+                        "dynamicRegistration": True,
+                        "isPreferredSupport": True,
+                        "disabledSupport": True,
+                        "dataSupport": True,
+                        "resolveSupport": {"properties": ["edit"]},
+                        "codeActionLiteralSupport": {
+                            "codeActionKind": {
+                                "valueSet": [
+                                    "",
+                                    "quickfix",
+                                    "refactor",
+                                    "refactor.extract",
+                                    "refactor.inline",
+                                    "refactor.rewrite",
+                                    "source",
+                                    "source.organizeImports",
+                                ]
+                            }
+                        },
+                        "honorsChangeAnnotations": False,
+                    },
+                    "codeLens": {"dynamicRegistration": True},
+                    "formatting": {"dynamicRegistration": True},
+                    "rangeFormatting": {"dynamicRegistration": True},
+                    "onTypeFormatting": {"dynamicRegistration": True},
+                    "rename": {
+                        "dynamicRegistration": True,
+                        "prepareSupport": True,
+                        "prepareSupportDefaultBehavior": 1,
+                        "honorsChangeAnnotations": True,
+                    },
+                    "documentLink": {"dynamicRegistration": True, "tooltipSupport": True},
+                    "typeDefinition": {"dynamicRegistration": True, "linkSupport": True},
+                    "implementation": {"dynamicRegistration": True, "linkSupport": True},
+                    "colorProvider": {"dynamicRegistration": True},
+                    "foldingRange": {
+                        "dynamicRegistration": True,
+                        "rangeLimit": 5000,
+                        "lineFoldingOnly": True,
+                        "foldingRangeKind": {"valueSet": ["comment", "imports", "region"]},
+                        "foldingRange": {"collapsedText": False},
+                    },
+                    "declaration": {"dynamicRegistration": True, "linkSupport": True},
+                    "selectionRange": {"dynamicRegistration": True},
+                    "callHierarchy": {"dynamicRegistration": True},
+                    "semanticTokens": {
+                        "dynamicRegistration": True,
+                        "tokenTypes": [
+                            "namespace",
+                            "type",
+                            "class",
+                            "enum",
+                            "interface",
+                            "struct",
+                            "typeParameter",
+                            "parameter",
+                            "variable",
+                            "property",
+                            "enumMember",
+                            "event",
+                            "function",
+                            "method",
+                            "macro",
+                            "keyword",
+                            "modifier",
+                            "comment",
+                            "string",
+                            "number",
+                            "regexp",
+                            "operator",
+                            "decorator",
+                        ],
+                        "tokenModifiers": [
+                            "declaration",
+                            "definition",
+                            "readonly",
+                            "static",
+                            "deprecated",
+                            "abstract",
+                            "async",
+                            "modification",
+                            "documentation",
+                            "defaultLibrary",
+                        ],
+                        "formats": ["relative"],
+                        "requests": {"range": True, "full": {"delta": True}},
+                        "multilineTokenSupport": False,
+                        "overlappingTokenSupport": False,
+                        "serverCancelSupport": True,
+                        "augmentsSyntaxTokens": True,
+                    },
+                    "linkedEditingRange": {"dynamicRegistration": True},
+                    "typeHierarchy": {"dynamicRegistration": True},
+                    "inlineValue": {"dynamicRegistration": True},
+                    "inlayHint": {
+                        "dynamicRegistration": True,
+                        "resolveSupport": {"properties": ["tooltip", "textEdits", "label.tooltip", "label.location", "label.command"]},
+                    },
+                    "diagnostic": {"dynamicRegistration": True, "relatedDocumentSupport": False},
+                },
+                "window": {
+                    "showMessage": {"messageActionItem": {"additionalPropertiesSupport": True}},
+                    "showDocument": {"support": True},
+                    "workDoneProgress": True,
+                },
+                "general": {
+                    "staleRequestSupport": {
+                        "cancel": True,
+                        "retryOnContentModified": [
+                            "textDocument/semanticTokens/full",
+                            "textDocument/semanticTokens/range",
+                            "textDocument/semanticTokens/full/delta",
+                        ],
+                    },
+                    "regularExpressions": {"engine": "ECMAScript", "version": "ES2020"},
+                    "markdown": {"parser": "marked", "version": "1.1.0"},
+                    "positionEncodings": ["utf-16"],
+                },
+                "notebookDocument": {"synchronization": {"dynamicRegistration": True, "executionSummarySupport": True}},
+            },
+            "initializationOptions": {
+                "workspaceFolders": [root_uri],
+                "storagePath": None,
+                "codegen": {"enabled": False},
+                "compiler": {"jvm": {"target": "default"}},
+                "completion": {"snippets": {"enabled": True}},
+                "diagnostics": {"enabled": True, "level": 4, "debounceTime": 250},
+                "scripts": {"enabled": True, "buildScriptsEnabled": True},
+                "indexing": {"enabled": True},
+                "externalSources": {"useKlsScheme": False, "autoConvertToKotlin": False},
+                "inlayHints": {"typeHints": False, "parameterHints": False, "chainedHints": False},
+                "formatting": {
+                    "formatter": "ktfmt",
+                    "ktfmt": {
+                        "style": "google",
+                        "indent": 4,
+                        "maxWidth": 100,
+                        "continuationIndent": 8,
+                        "removeUnusedImports": True,
+                    },
+                },
+            },
+            "trace": "verbose",
+            "processId": os.getpid(),
+            "workspaceFolders": [
+                {
+                    "uri": root_uri,
+                    "name": os.path.basename(repository_absolute_path),
+                }
+            ],
+        }
+        return initialize_params
+
+    def _start_server(self):
+        """
+        Starts the Kotlin Language Server
+        """
+
+        def execute_client_command_handler(params):
+            return []
+
+        def do_nothing(params):
+            return
+
+        def window_log_message(msg):
+            self.logger.log(f"LSP: window/logMessage: {msg}", logging.INFO)
+
+        self.server.on_request("client/registerCapability", do_nothing)
+        self.server.on_notification("language/status", do_nothing)
+        self.server.on_notification("window/logMessage", window_log_message)
+        self.server.on_request("workspace/executeClientCommand", execute_client_command_handler)
+        self.server.on_notification("$/progress", do_nothing)
+        self.server.on_notification("textDocument/publishDiagnostics", do_nothing)
+        self.server.on_notification("language/actionableNotification", do_nothing)
+
+        self.logger.log("Starting Kotlin server process", logging.INFO)
+        self.server.start()
+        initialize_params = self._get_initialize_params(self.repository_root_path)
+
+        self.logger.log(
+            "Sending initialize request from LSP client to LSP server and awaiting response",
+            logging.INFO,
+        )
+        init_response = self.server.send.initialize(initialize_params)
+
+        capabilities = init_response["capabilities"]
+        assert "textDocumentSync" in capabilities, "Server must support textDocumentSync"
+        assert "hoverProvider" in capabilities, "Server must support hover"
+        assert "completionProvider" in capabilities, "Server must support code completion"
+        assert "signatureHelpProvider" in capabilities, "Server must support signature help"
+        assert "definitionProvider" in capabilities, "Server must support go to definition"
+        assert "referencesProvider" in capabilities, "Server must support find references"
+        assert "documentSymbolProvider" in capabilities, "Server must support document symbols"
+        assert "workspaceSymbolProvider" in capabilities, "Server must support workspace symbols"
+        assert "semanticTokensProvider" in capabilities, "Server must support semantic tokens"
+
+        self.server.notify.initialized({})
+        self.completions_available.set()

src/solidlsp/language_servers/kotlin_language_server/initialize_params.json

@@ -1,521 +0,0 @@
-{
-    "_description": "The parameters sent by the client when initializing the language server with the \"initialize\" request. More details at https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#initialize",
-    "processId": "os.getpid()",
-    "clientInfo": {
-        "name": "Multilspy Kotlin Client",
-        "version": "1.0.0"
-    },
-    "locale": "en",
-    "rootPath": "repository_absolute_path",
-    "rootUri": "pathlib.Path(repository_absolute_path).as_uri()",
-    "capabilities": {
-        "workspace": {
-            "applyEdit": true,
-            "workspaceEdit": {
-                "documentChanges": true,
-                "resourceOperations": [
-                    "create",
-                    "rename",
-                    "delete"
-                ],
-                "failureHandling": "textOnlyTransactional",
-                "normalizesLineEndings": true,
-                "changeAnnotationSupport": {
-                    "groupsOnLabel": true
-                }
-            },
-            "didChangeConfiguration": {
-                "dynamicRegistration": true
-            },
-            "didChangeWatchedFiles": {
-                "dynamicRegistration": true,
-                "relativePatternSupport": true
-            },
-            "symbol": {
-                "dynamicRegistration": true,
-                "symbolKind": {
-                    "valueSet": [
-                        1,
-                        2,
-                        3,
-                        4,
-                        5,
-                        6,
-                        7,
-                        8,
-                        9,
-                        10,
-                        11,
-                        12,
-                        13,
-                        14,
-                        15,
-                        16,
-                        17,
-                        18,
-                        19,
-                        20,
-                        21,
-                        22,
-                        23,
-                        24,
-                        25,
-                        26
-                    ]
-                },
-                "tagSupport": {
-                    "valueSet": [
-                        1
-                    ]
-                },
-                "resolveSupport": {
-                    "properties": [
-                        "location.range"
-                    ]
-                }
-            },
-            "codeLens": {
-                "refreshSupport": true
-            },
-            "executeCommand": {
-                "dynamicRegistration": true
-            },
-            "configuration": true,
-            "workspaceFolders": true,
-            "semanticTokens": {
-                "refreshSupport": true
-            },
-            "fileOperations": {
-                "dynamicRegistration": true,
-                "didCreate": true,
-                "didRename": true,
-                "didDelete": true,
-                "willCreate": true,
-                "willRename": true,
-                "willDelete": true
-            },
-            "inlineValue": {
-                "refreshSupport": true
-            },
-            "inlayHint": {
-                "refreshSupport": true
-            },
-            "diagnostics": {
-                "refreshSupport": true
-            }
-        },
-        "textDocument": {
-            "publishDiagnostics": {
-                "relatedInformation": true,
-                "versionSupport": false,
-                "tagSupport": {
-                    "valueSet": [
-                        1,
-                        2
-                    ]
-                },
-                "codeDescriptionSupport": true,
-                "dataSupport": true
-            },
-            "synchronization": {
-                "dynamicRegistration": true,
-                "willSave": true,
-                "willSaveWaitUntil": true,
-                "didSave": true
-            },
-            "completion": {
-                "dynamicRegistration": true,
-                "contextSupport": true,
-                "completionItem": {
-                    "snippetSupport": false,
-                    "commitCharactersSupport": true,
-                    "documentationFormat": [
-                        "markdown",
-                        "plaintext"
-                    ],
-                    "deprecatedSupport": true,
-                    "preselectSupport": true,
-                    "tagSupport": {
-                        "valueSet": [
-                            1
-                        ]
-                    },
-                    "insertReplaceSupport": false,
-                    "resolveSupport": {
-                        "properties": [
-                            "documentation",
-                            "detail",
-                            "additionalTextEdits"
-                        ]
-                    },
-                    "insertTextModeSupport": {
-                        "valueSet": [
-                            1,
-                            2
-                        ]
-                    },
-                    "labelDetailsSupport": true
-                },
-                "insertTextMode": 2,
-                "completionItemKind": {
-                    "valueSet": [
-                        1,
-                        2,
-                        3,
-                        4,
-                        5,
-                        6,
-                        7,
-                        8,
-                        9,
-                        10,
-                        11,
-                        12,
-                        13,
-                        14,
-                        15,
-                        16,
-                        17,
-                        18,
-                        19,
-                        20,
-                        21,
-                        22,
-                        23,
-                        24,
-                        25
-                    ]
-                },
-                "completionList": {
-                    "itemDefaults": [
-                        "commitCharacters",
-                        "editRange",
-                        "insertTextFormat",
-                        "insertTextMode"
-                    ]
-                }
-            },
-            "hover": {
-                "dynamicRegistration": true,
-                "contentFormat": [
-                    "markdown",
-                    "plaintext"
-                ]
-            },
-            "signatureHelp": {
-                "dynamicRegistration": true,
-                "signatureInformation": {
-                    "documentationFormat": [
-                        "markdown",
-                        "plaintext"
-                    ],
-                    "parameterInformation": {
-                        "labelOffsetSupport": true
-                    },
-                    "activeParameterSupport": true
-                },
-                "contextSupport": true
-            },
-            "definition": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "references": {
-                "dynamicRegistration": true
-            },
-            "documentHighlight": {
-                "dynamicRegistration": true
-            },
-            "documentSymbol": {
-                "dynamicRegistration": true,
-                "symbolKind": {
-                    "valueSet": [
-                        1,
-                        2,
-                        3,
-                        4,
-                        5,
-                        6,
-                        7,
-                        8,
-                        9,
-                        10,
-                        11,
-                        12,
-                        13,
-                        14,
-                        15,
-                        16,
-                        17,
-                        18,
-                        19,
-                        20,
-                        21,
-                        22,
-                        23,
-                        24,
-                        25,
-                        26
-                    ]
-                },
-                "hierarchicalDocumentSymbolSupport": true,
-                "tagSupport": {
-                    "valueSet": [
-                        1
-                    ]
-                },
-                "labelSupport": true
-            },
-            "codeAction": {
-                "dynamicRegistration": true,
-                "isPreferredSupport": true,
-                "disabledSupport": true,
-                "dataSupport": true,
-                "resolveSupport": {
-                    "properties": [
-                        "edit"
-                    ]
-                },
-                "codeActionLiteralSupport": {
-                    "codeActionKind": {
-                        "valueSet": [
-                            "",
-                            "quickfix",
-                            "refactor",
-                            "refactor.extract",
-                            "refactor.inline",
-                            "refactor.rewrite",
-                            "source",
-                            "source.organizeImports"
-                        ]
-                    }
-                },
-                "honorsChangeAnnotations": false
-            },
-            "codeLens": {
-                "dynamicRegistration": true
-            },
-            "formatting": {
-                "dynamicRegistration": true
-            },
-            "rangeFormatting": {
-                "dynamicRegistration": true
-            },
-            "onTypeFormatting": {
-                "dynamicRegistration": true
-            },
-            "rename": {
-                "dynamicRegistration": true,
-                "prepareSupport": true,
-                "prepareSupportDefaultBehavior": 1,
-                "honorsChangeAnnotations": true
-            },
-            "documentLink": {
-                "dynamicRegistration": true,
-                "tooltipSupport": true
-            },
-            "typeDefinition": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "implementation": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "colorProvider": {
-                "dynamicRegistration": true
-            },
-            "foldingRange": {
-                "dynamicRegistration": true,
-                "rangeLimit": 5000,
-                "lineFoldingOnly": true,
-                "foldingRangeKind": {
-                    "valueSet": [
-                        "comment",
-                        "imports",
-                        "region"
-                    ]
-                },
-                "foldingRange": {
-                    "collapsedText": false
-                }
-            },
-            "declaration": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "selectionRange": {
-                "dynamicRegistration": true
-            },
-            "callHierarchy": {
-                "dynamicRegistration": true
-            },
-            "semanticTokens": {
-                "dynamicRegistration": true,
-                "tokenTypes": [
-                    "namespace",
-                    "type",
-                    "class",
-                    "enum",
-                    "interface",
-                    "struct",
-                    "typeParameter",
-                    "parameter",
-                    "variable",
-                    "property",
-                    "enumMember",
-                    "event",
-                    "function",
-                    "method",
-                    "macro",
-                    "keyword",
-                    "modifier",
-                    "comment",
-                    "string",
-                    "number",
-                    "regexp",
-                    "operator",
-                    "decorator"
-                ],
-                "tokenModifiers": [
-                    "declaration",
-                    "definition",
-                    "readonly",
-                    "static",
-                    "deprecated",
-                    "abstract",
-                    "async",
-                    "modification",
-                    "documentation",
-                    "defaultLibrary"
-                ],
-                "formats": [
-                    "relative"
-                ],
-                "requests": {
-                    "range": true,
-                    "full": {
-                        "delta": true
-                    }
-                },
-                "multilineTokenSupport": false,
-                "overlappingTokenSupport": false,
-                "serverCancelSupport": true,
-                "augmentsSyntaxTokens": true
-            },
-            "linkedEditingRange": {
-                "dynamicRegistration": true
-            },
-            "typeHierarchy": {
-                "dynamicRegistration": true
-            },
-            "inlineValue": {
-                "dynamicRegistration": true
-            },
-            "inlayHint": {
-                "dynamicRegistration": true,
-                "resolveSupport": {
-                    "properties": [
-                        "tooltip",
-                        "textEdits",
-                        "label.tooltip",
-                        "label.location",
-                        "label.command"
-                    ]
-                }
-            },
-            "diagnostic": {
-                "dynamicRegistration": true,
-                "relatedDocumentSupport": false
-            }
-        },
-        "window": {
-            "showMessage": {
-                "messageActionItem": {
-                    "additionalPropertiesSupport": true
-                }
-            },
-            "showDocument": {
-                "support": true
-            },
-            "workDoneProgress": true
-        },
-        "general": {
-            "staleRequestSupport": {
-                "cancel": true,
-                "retryOnContentModified": [
-                    "textDocument/semanticTokens/full",
-                    "textDocument/semanticTokens/range",
-                    "textDocument/semanticTokens/full/delta"
-                ]
-            },
-            "regularExpressions": {
-                "engine": "ECMAScript",
-                "version": "ES2020"
-            },
-            "markdown": {
-                "parser": "marked",
-                "version": "1.1.0"
-            },
-            "positionEncodings": [
-                "utf-16"
-            ]
-        },
-        "notebookDocument": {
-            "synchronization": {
-                "dynamicRegistration": true,
-                "executionSummarySupport": true
-            }
-        }
-    },
-    "initializationOptions": {
-        "workspaceFolders": "[pathlib.Path(repository_absolute_path).as_uri()]",
-        "storagePath": null,
-        "codegen": {
-            "enabled": false
-        },
-        "compiler": {
-            "jvm": {
-                "target": "default"
-            }
-        },
-        "completion": {
-            "snippets": {
-                "enabled": true
-            }
-        },
-        "diagnostics": {
-            "enabled": true,
-            "level": 4,
-            "debounceTime": 250
-        },
-        "scripts": {
-            "enabled": true,
-            "buildScriptsEnabled": true
-        },
-        "indexing": {
-            "enabled": true
-        },
-        "externalSources": {
-            "useKlsScheme": false,
-            "autoConvertToKotlin": false
-        },
-        "inlayHints": {
-            "typeHints": false,
-            "parameterHints": false,
-            "chainedHints": false
-        },
-        "formatting": {
-            "formatter": "ktfmt",
-            "ktfmt": {
-                "style": "google",
-                "indent": 4,
-                "maxWidth": 100,
-                "continuationIndent": 8,
-                "removeUnusedImports": true
-            }
-        }
-    },
-    "trace": "verbose",
-    "workspaceFolders": "[\n            {\n                \"uri\": pathlib.Path(repository_absolute_path).as_uri(),\n                \"name\": os.path.basename(repository_absolute_path),\n            }\n        ]"
-}

src/solidlsp/language_servers/kotlin_language_server/kotlin_language_server.py

@@ -1,209 +0,0 @@
-"""
-Provides Kotlin specific instantiation of the LanguageServer class. Contains various configurations and settings specific to Kotlin.
-"""
-
-import dataclasses
-import json
-import logging
-import os
-import pathlib
-import stat
-
-from solidlsp.ls import SolidLanguageServer
-from solidlsp.ls_config import LanguageServerConfig
-from solidlsp.ls_logger import LanguageServerLogger
-from solidlsp.ls_utils import FileUtils, PlatformUtils
-from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
-from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
-
-
-@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(SolidLanguageServer):
-    """
-    Provides Kotlin specific instantiation of the LanguageServer class. Contains various configurations and settings specific to Kotlin.
-    """
-
-    def __init__(self, config: LanguageServerConfig, logger: LanguageServerLogger, repository_root_path: str):
-        """
-        Creates a Kotlin Language Server instance. This class is not meant to be instantiated directly. Use LanguageServer.create() instead.
-        """
-        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=cmd, env=proc_env, cwd=repository_root_path),
-            "kotlin",
-        )
-
-    def setup_runtime_dependencies(self, logger: LanguageServerLogger, config: LanguageServerConfig) -> KotlinRuntimeDependencyPaths:
-        """
-        Setup runtime dependencies for Kotlin Language Server.
-        """
-        platform_id = PlatformUtils.get_platform_id()
-
-        # 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"
-
-        # Load dependency information
-        with open(os.path.join(os.path.dirname(__file__), "runtime_dependencies.json"), encoding="utf-8") as f:
-            d = json.load(f)
-            del d["_description"]
-
-        kotlin_dependency = d["runtimeDependency"]
-        java_dependency = d["java"][platform_id.value]
-
-        # Setup paths for dependencies
-        static_dir = os.path.join(os.path.dirname(__file__), "static")
-        os.makedirs(static_dir, exist_ok=True)
-
-        # Setup Java paths
-        java_dir = os.path.join(static_dir, "java")
-        os.makedirs(java_dir, exist_ok=True)
-
-        java_home_path = os.path.join(java_dir, java_dependency["java_home_path"])
-        java_path = os.path.join(java_dir, java_dependency["java_path"])
-
-        # Download and extract Java if not exists
-        if not os.path.exists(java_path):
-            logger.log(f"Downloading Java for {platform_id.value}...", logging.INFO)
-            FileUtils.download_and_extract_archive(logger, java_dependency["url"], java_dir, java_dependency["archiveType"])
-            # 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}"
-
-        # Setup Kotlin Language Server paths
-        kotlin_ls_dir = os.path.join(static_dir, "server")
-
-        # Get platform-specific executable script path
-        if platform_id.value.startswith("win-"):
-            kotlin_script = os.path.join(kotlin_ls_dir, "bin", "kotlin-language-server.bat")
-        else:
-            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:
-        """
-        Returns the initialize params for the Kotlin Language Server.
-        """
-        with open(str(pathlib.PurePath(os.path.dirname(__file__), "initialize_params.json")), encoding="utf-8") as f:
-            d: InitializeParams = json.load(f)
-
-        del d["_description"]
-
-        if not os.path.isabs(repository_absolute_path):
-            repository_absolute_path = os.path.abspath(repository_absolute_path)
-
-        assert d["processId"] == "os.getpid()"
-        d["processId"] = os.getpid()
-
-        assert d["rootPath"] == "repository_absolute_path"
-        d["rootPath"] = repository_absolute_path
-
-        assert d["rootUri"] == "pathlib.Path(repository_absolute_path).as_uri()"
-        d["rootUri"] = pathlib.Path(repository_absolute_path).as_uri()
-
-        assert d["initializationOptions"]["workspaceFolders"] == "[pathlib.Path(repository_absolute_path).as_uri()]"
-        d["initializationOptions"]["workspaceFolders"] = [pathlib.Path(repository_absolute_path).as_uri()]
-
-        assert (
-            d["workspaceFolders"]
-            == '[\n            {\n                "uri": pathlib.Path(repository_absolute_path).as_uri(),\n                "name": os.path.basename(repository_absolute_path),\n            }\n        ]'
-        )
-        d["workspaceFolders"] = [
-            {
-                "uri": pathlib.Path(repository_absolute_path).as_uri(),
-                "name": os.path.basename(repository_absolute_path),
-            }
-        ]
-
-        return d
-
-    def _start_server(self):
-        """
-        Starts the Kotlin Language Server
-        """
-
-        def execute_client_command_handler(params):
-            return []
-
-        def do_nothing(params):
-            return
-
-        def window_log_message(msg):
-            self.logger.log(f"LSP: window/logMessage: {msg}", logging.INFO)
-
-        self.server.on_request("client/registerCapability", do_nothing)
-        self.server.on_notification("language/status", do_nothing)
-        self.server.on_notification("window/logMessage", window_log_message)
-        self.server.on_request("workspace/executeClientCommand", execute_client_command_handler)
-        self.server.on_notification("$/progress", do_nothing)
-        self.server.on_notification("textDocument/publishDiagnostics", do_nothing)
-        self.server.on_notification("language/actionableNotification", do_nothing)
-
-        self.logger.log("Starting Kotlin server process", logging.INFO)
-        self.server.start()
-        initialize_params = self._get_initialize_params(self.repository_root_path)
-
-        self.logger.log(
-            "Sending initialize request from LSP client to LSP server and awaiting response",
-            logging.INFO,
-        )
-        init_response = self.server.send.initialize(initialize_params)
-
-        capabilities = init_response["capabilities"]
-        assert "textDocumentSync" in capabilities, "Server must support textDocumentSync"
-        assert "hoverProvider" in capabilities, "Server must support hover"
-        assert "completionProvider" in capabilities, "Server must support code completion"
-        assert "signatureHelpProvider" in capabilities, "Server must support signature help"
-        assert "definitionProvider" in capabilities, "Server must support go to definition"
-        assert "referencesProvider" in capabilities, "Server must support find references"
-        assert "documentSymbolProvider" in capabilities, "Server must support document symbols"
-        assert "workspaceSymbolProvider" in capabilities, "Server must support workspace symbols"
-        assert "semanticTokensProvider" in capabilities, "Server must support semantic tokens"
-
-        self.server.notify.initialized({})
-        self.completions_available.set()

src/solidlsp/language_servers/kotlin_language_server/runtime_dependencies.json

@@ -1,41 +0,0 @@
-{
-    "_description": "Used to download the runtime dependencies for Kotlin Language Server from https://github.com/fwcd/kotlin-language-server",
-    "runtimeDependency": {
-        "id": "KotlinLsp",
-        "description": "Kotlin Language Server",
-        "url": "https://github.com/fwcd/kotlin-language-server/releases/download/1.3.13/server.zip",
-        "archiveType": "zip"
-    },
-    "java": {
-        "win-x64": {
-            "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-win32-x64-1.42.0-561.vsix",
-            "archiveType": "zip",
-            "java_home_path": "extension/jre/21.0.7-win32-x86_64",
-            "java_path": "extension/jre/21.0.7-win32-x86_64/bin/java.exe"
-        },
-        "linux-x64": {
-            "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-linux-x64-1.42.0-561.vsix",
-            "archiveType": "zip",
-            "java_home_path": "extension/jre/21.0.7-linux-x86_64", 
-            "java_path": "extension/jre/21.0.7-linux-x86_64/bin/java"
-        },
-        "linux-arm64": {
-            "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-linux-arm64-1.42.0-561.vsix",
-            "archiveType": "zip",
-            "java_home_path": "extension/jre/21.0.7-linux-aarch64",
-            "java_path": "extension/jre/21.0.7-linux-aarch64/bin/java"
-        },
-        "osx-x64": {
-            "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-darwin-x64-1.42.0-561.vsix",
-            "archiveType": "zip",
-            "java_home_path": "extension/jre/21.0.7-macosx-x86_64",
-            "java_path": "extension/jre/21.0.7-macosx-x86_64/bin/java"
-        },
-        "osx-arm64": {
-            "url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.42.0/java-darwin-arm64-1.42.0-561.vsix",
-            "archiveType": "zip",
-            "java_home_path": "extension/jre/21.0.7-macosx-aarch64",
-            "java_path": "extension/jre/21.0.7-macosx-aarch64/bin/java"
-        }
-    }
-}

src/solidlsp/language_servers/omnisharp.py

@@ -63,7 +63,7 @@ class OmniSharp(SolidLanguageServer):
         """
         Creates an OmniSharp instance. This class is not meant to be instantiated directly. Use LanguageServer.create() instead.
         """
-        omnisharp_executable_path, dll_path = self.setupRuntimeDependencies(logger, config)
+        omnisharp_executable_path, dll_path = self._setup_runtime_dependencies(logger, config)
 
         slnfilename = find_least_depth_sln_file(repository_root_path)
         if slnfilename is None:
@@ -112,11 +112,12 @@ class OmniSharp(SolidLanguageServer):
     def is_ignored_dirname(self, dirname: str) -> bool:
         return super().is_ignored_dirname(dirname) or dirname in ["bin", "obj"]
 
-    def _get_initialize_params(self, repository_absolute_path: str) -> InitializeParams:
+    @staticmethod
+    def _get_initialize_params(repository_absolute_path: str) -> InitializeParams:
         """
         Returns the initialize params for the Omnisharp Language Server.
         """
-        with open(os.path.join(os.path.dirname(__file__), "initialize_params.json"), encoding="utf-8") as f:
+        with open(os.path.join(os.path.dirname(__file__), "omnisharp", "initialize_params.json"), encoding="utf-8") as f:
             d = json.load(f)
 
         del d["_description"]
@@ -136,30 +137,32 @@ class OmniSharp(SolidLanguageServer):
 
         return d
 
-    def setupRuntimeDependencies(self, logger: LanguageServerLogger, config: LanguageServerConfig) -> tuple[str, str]:
+    @classmethod
+    def _setup_runtime_dependencies(cls, logger: LanguageServerLogger, config: LanguageServerConfig) -> tuple[str, str]:
         """
         Setup runtime dependencies for OmniSharp.
         """
         platform_id = PlatformUtils.get_platform_id()
         dotnet_version = PlatformUtils.get_dotnet_version()
 
-        with open(os.path.join(os.path.dirname(__file__), "runtime_dependencies.json"), encoding="utf-8") as f:
+        with open(os.path.join(os.path.dirname(__file__), "omnisharp", "runtime_dependencies.json"), encoding="utf-8") as f:
             d = json.load(f)
             del d["_description"]
 
         assert platform_id in [
             PlatformId.LINUX_x64,
             PlatformId.WIN_x64,
-        ], "Only linux-x64 and win-x64 platform is supported for in multilspy at the moment"
+        ], f"Only linux-x64 and win-x64 platform is supported at the moment but got {platform_id=}"
         assert dotnet_version in [
             DotnetVersion.V6,
             DotnetVersion.V7,
             DotnetVersion.V8,
-        ], "Only dotnet version 6 and 7 are supported in multilspy at the moment"
+            DotnetVersion.V9,
+        ], f"Only dotnet version 6-9 are supported at the moment but got {dotnet_version=}"
 
         # TODO: Do away with this assumption
         # Currently, runtime binaries are not available for .Net 7 and .Net 8. Hence, we assume .Net 6 runtime binaries to be compatible with .Net 7, .Net 8
-        if dotnet_version in [DotnetVersion.V7, DotnetVersion.V8]:
+        if dotnet_version in [DotnetVersion.V7, DotnetVersion.V8, DotnetVersion.V9]:
             dotnet_version = DotnetVersion.V6
 
         runtime_dependencies = d["runtimeDependencies"]
@@ -178,7 +181,7 @@ class OmniSharp(SolidLanguageServer):
         assert "OmniSharp" in runtime_dependencies
         assert "RazorOmnisharp" in runtime_dependencies
 
-        omnisharp_ls_dir = os.path.join(os.path.dirname(__file__), "static", "OmniSharp")
+        omnisharp_ls_dir = os.path.join(cls.ls_resources_dir(), "OmniSharp")
         if not os.path.exists(omnisharp_ls_dir):
             os.makedirs(omnisharp_ls_dir)
             FileUtils.download_and_extract_archive(logger, runtime_dependencies["OmniSharp"]["url"], omnisharp_ls_dir, "zip")
@@ -186,7 +189,7 @@ class OmniSharp(SolidLanguageServer):
         assert os.path.exists(omnisharp_executable_path)
         os.chmod(omnisharp_executable_path, stat.S_IEXEC)
 
-        razor_omnisharp_ls_dir = os.path.join(os.path.dirname(__file__), "static", "RazorOmnisharp")
+        razor_omnisharp_ls_dir = os.path.join(cls.ls_resources_dir(), "RazorOmnisharp")
         if not os.path.exists(razor_omnisharp_ls_dir):
             os.makedirs(razor_omnisharp_ls_dir)
             FileUtils.download_and_extract_archive(logger, runtime_dependencies["RazorOmnisharp"]["url"], razor_omnisharp_ls_dir, "zip")
@@ -363,7 +366,7 @@ class OmniSharp(SolidLanguageServer):
         )
         init_response = self.server.send.initialize(initialize_params)
         self.server.notify.initialized({})
-        with open(os.path.join(os.path.dirname(__file__), "workspace_did_change_configuration.json"), encoding="utf-8") as f:
+        with open(os.path.join(os.path.dirname(__file__), "omnisharp", "workspace_did_change_configuration.json"), encoding="utf-8") as f:
             self.server.notify.workspace_did_change_configuration({"settings": json.load(f)})
         assert "capabilities" in init_response
         if "definitionProvider" in init_response["capabilities"] and init_response["capabilities"]["definitionProvider"]:

src/solidlsp/language_servers/pyright_server.py

@@ -46,7 +46,8 @@ class PyrightServer(SolidLanguageServer):
     def is_ignored_dirname(self, dirname: str) -> bool:
         return super().is_ignored_dirname(dirname) or dirname in ["venv", "__pycache__"]
 
-    def _get_initialize_params(self, repository_absolute_path: str) -> InitializeParams:
+    @staticmethod
+    def _get_initialize_params(repository_absolute_path: str) -> InitializeParams:
         """
         Returns the initialize params for the Pyright Language Server.
         """
@@ -68,34 +69,17 @@ class PyrightServer(SolidLanguageServer):
             },
             "capabilities": {
                 "workspace": {
-                    "applyEdit": True,
                     "workspaceEdit": {"documentChanges": True},
                     "didChangeConfiguration": {"dynamicRegistration": True},
                     "didChangeWatchedFiles": {"dynamicRegistration": True},
                     "symbol": {
                         "dynamicRegistration": True,
-                        "symbolKind": {
-                            "valueSet": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26]
-                        },
+                        "symbolKind": {"valueSet": list(range(1, 27))},
                     },
                     "executeCommand": {"dynamicRegistration": True},
                 },
                 "textDocument": {
                     "synchronization": {"dynamicRegistration": True, "willSave": True, "willSaveWaitUntil": True, "didSave": True},
-                    "completion": {
-                        "dynamicRegistration": True,
-                        "contextSupport": True,
-                        "completionItem": {
-                            "snippetSupport": True,
-                            "commitCharactersSupport": True,
-                            "documentationFormat": ["markdown", "plaintext"],
-                            "deprecatedSupport": True,
-                            "preselectSupport": True,
-                        },
-                        "completionItemKind": {
-                            "valueSet": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25]
-                        },
-                    },
                     "hover": {"dynamicRegistration": True, "contentFormat": ["markdown", "plaintext"]},
                     "signatureHelp": {
                         "dynamicRegistration": True,
@@ -106,36 +90,11 @@ class PyrightServer(SolidLanguageServer):
                     },
                     "definition": {"dynamicRegistration": True},
                     "references": {"dynamicRegistration": True},
-                    "documentHighlight": {"dynamicRegistration": True},
                     "documentSymbol": {
                         "dynamicRegistration": True,
-                        "symbolKind": {
-                            "valueSet": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26]
-                        },
+                        "symbolKind": {"valueSet": list(range(1, 27))},
                         "hierarchicalDocumentSymbolSupport": True,
                     },
-                    "codeAction": {
-                        "dynamicRegistration": True,
-                        "codeActionLiteralSupport": {
-                            "codeActionKind": {
-                                "valueSet": [
-                                    "",
-                                    "quickfix",
-                                    "refactor",
-                                    "refactor.extract",
-                                    "refactor.inline",
-                                    "refactor.rewrite",
-                                    "source",
-                                    "source.organizeImports",
-                                ]
-                            }
-                        },
-                    },
-                    "codeLens": {"dynamicRegistration": True},
-                    "formatting": {"dynamicRegistration": True},
-                    "rangeFormatting": {"dynamicRegistration": True},
-                    "onTypeFormatting": {"dynamicRegistration": True},
-                    "rename": {"dynamicRegistration": True},
                     "publishDiagnostics": {"relatedInformation": True},
                 },
             },

src/solidlsp/language_servers/rust_analyzer.py

@@ -0,0 +1,632 @@
+"""
+Provides Rust specific instantiation of the LanguageServer class. Contains various configurations and settings specific to Rust.
+"""
+
+import logging
+import os
+import pathlib
+import stat
+import threading
+
+from overrides import override
+
+from solidlsp.ls import SolidLanguageServer
+from solidlsp.ls_config import LanguageServerConfig
+from solidlsp.ls_logger import LanguageServerLogger
+from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
+from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
+
+from .common import RuntimeDependency, RuntimeDependencyCollection
+
+
+class RustAnalyzer(SolidLanguageServer):
+    """
+    Provides Rust specific instantiation of the LanguageServer class. Contains various configurations and settings specific to Rust.
+    """
+
+    def __init__(self, config: LanguageServerConfig, logger: LanguageServerLogger, repository_root_path: str):
+        """
+        Creates a RustAnalyzer instance. This class is not meant to be instantiated directly. Use LanguageServer.create() instead.
+        """
+        rustanalyzer_executable_path = self._setup_runtime_dependencies(logger, config)
+        super().__init__(
+            config,
+            logger,
+            repository_root_path,
+            ProcessLaunchInfo(cmd=rustanalyzer_executable_path, cwd=repository_root_path),
+            "rust",
+        )
+        self.server_ready = threading.Event()
+        self.service_ready_event = threading.Event()
+        self.initialize_searcher_command_available = threading.Event()
+        self.resolve_main_method_available = threading.Event()
+
+    @override
+    def is_ignored_dirname(self, dirname: str) -> bool:
+        return super().is_ignored_dirname(dirname) or dirname in ["target"]
+
+    @classmethod
+    def _setup_runtime_dependencies(cls, logger: LanguageServerLogger, config: LanguageServerConfig) -> str:
+        """
+        Setup runtime dependencies for rust_analyzer and return the command to start the server.
+        """
+        deps = RuntimeDependencyCollection(
+            [
+                RuntimeDependency(
+                    id="RustAnalyzer",
+                    description="RustAnalyzer for macOS (arm64)",
+                    url="https://github.com/rust-lang/rust-analyzer/releases/download/2023-10-09/rust-analyzer-aarch64-apple-darwin.gz",
+                    platform_id="osx-arm64",
+                    archive_type="gz",
+                    binary_name="rust_analyzer",
+                ),
+                RuntimeDependency(
+                    id="RustAnalyzer",
+                    description="RustAnalyzer for Linux (x64)",
+                    url="https://github.com/rust-lang/rust-analyzer/releases/download/2023-10-09/rust-analyzer-x86_64-unknown-linux-gnu.gz",
+                    platform_id="linux-x64",
+                    archive_type="gz",
+                    binary_name="rust_analyzer",
+                ),
+                RuntimeDependency(
+                    id="RustAnalyzer",
+                    description="RustAnalyzer for Windows (x64)",
+                    url="https://github.com/rust-lang/rust-analyzer/releases/download/2023-10-09/rust-analyzer-x86_64-pc-windows-msvc.zip",
+                    platform_id="win-x64",
+                    archive_type="zip",
+                    binary_name="rust-analyzer.exe",
+                ),
+            ]
+        )
+
+        # assert platform_id.value in [
+        #     "linux-x64",
+        #     "win-x64",
+        # ], "Only linux-x64 and win-x64 platform is supported for in multilspy at the moment"
+
+        rustanalyzer_ls_dir = os.path.join(cls.ls_resources_dir(), "RustAnalyzer")
+        rustanalyzer_executable_path = deps.binary_path(rustanalyzer_ls_dir)
+        if not os.path.exists(rustanalyzer_ls_dir):
+            os.makedirs(rustanalyzer_ls_dir)
+            deps.install(logger, rustanalyzer_ls_dir)
+        assert os.path.exists(rustanalyzer_executable_path)
+        os.chmod(rustanalyzer_executable_path, stat.S_IEXEC)
+
+        return rustanalyzer_executable_path
+
+    @staticmethod
+    def _get_initialize_params(repository_absolute_path: str) -> InitializeParams:
+        """
+        Returns the initialize params for the Rust Analyzer Language Server.
+        """
+        root_uri = pathlib.Path(repository_absolute_path).as_uri()
+        initialize_params = {
+            "clientInfo": {"name": "Visual Studio Code - Insiders", "version": "1.82.0-insider"},
+            "locale": "en",
+            "capabilities": {
+                "workspace": {
+                    "applyEdit": True,
+                    "workspaceEdit": {
+                        "documentChanges": True,
+                        "resourceOperations": ["create", "rename", "delete"],
+                        "failureHandling": "textOnlyTransactional",
+                        "normalizesLineEndings": True,
+                        "changeAnnotationSupport": {"groupsOnLabel": True},
+                    },
+                    "configuration": True,
+                    "didChangeWatchedFiles": {"dynamicRegistration": True, "relativePatternSupport": True},
+                    "symbol": {
+                        "dynamicRegistration": True,
+                        "symbolKind": {"valueSet": list(range(1, 27))},
+                        "tagSupport": {"valueSet": [1]},
+                        "resolveSupport": {"properties": ["location.range"]},
+                    },
+                    "codeLens": {"refreshSupport": True},
+                    "executeCommand": {"dynamicRegistration": True},
+                    "didChangeConfiguration": {"dynamicRegistration": True},
+                    "workspaceFolders": True,
+                    "semanticTokens": {"refreshSupport": True},
+                    "fileOperations": {
+                        "dynamicRegistration": True,
+                        "didCreate": True,
+                        "didRename": True,
+                        "didDelete": True,
+                        "willCreate": True,
+                        "willRename": True,
+                        "willDelete": True,
+                    },
+                    "inlineValue": {"refreshSupport": True},
+                    "inlayHint": {"refreshSupport": True},
+                    "diagnostics": {"refreshSupport": True},
+                },
+                "textDocument": {
+                    "publishDiagnostics": {
+                        "relatedInformation": True,
+                        "versionSupport": False,
+                        "tagSupport": {"valueSet": [1, 2]},
+                        "codeDescriptionSupport": True,
+                        "dataSupport": True,
+                    },
+                    "synchronization": {"dynamicRegistration": True, "willSave": True, "willSaveWaitUntil": True, "didSave": True},
+                    "completion": {
+                        "dynamicRegistration": True,
+                        "contextSupport": True,
+                        "completionItem": {
+                            "snippetSupport": True,
+                            "commitCharactersSupport": True,
+                            "documentationFormat": ["markdown", "plaintext"],
+                            "deprecatedSupport": True,
+                            "preselectSupport": True,
+                            "tagSupport": {"valueSet": [1]},
+                            "insertReplaceSupport": True,
+                            "resolveSupport": {"properties": ["documentation", "detail", "additionalTextEdits"]},
+                            "insertTextModeSupport": {"valueSet": [1, 2]},
+                            "labelDetailsSupport": True,
+                        },
+                        "insertTextMode": 2,
+                        "completionItemKind": {
+                            "valueSet": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25]
+                        },
+                        "completionList": {"itemDefaults": ["commitCharacters", "editRange", "insertTextFormat", "insertTextMode"]},
+                    },
+                    "hover": {"dynamicRegistration": True, "contentFormat": ["markdown", "plaintext"]},
+                    "signatureHelp": {
+                        "dynamicRegistration": True,
+                        "signatureInformation": {
+                            "documentationFormat": ["markdown", "plaintext"],
+                            "parameterInformation": {"labelOffsetSupport": True},
+                            "activeParameterSupport": True,
+                        },
+                        "contextSupport": True,
+                    },
+                    "definition": {"dynamicRegistration": True, "linkSupport": True},
+                    "references": {"dynamicRegistration": True},
+                    "documentHighlight": {"dynamicRegistration": True},
+                    "documentSymbol": {
+                        "dynamicRegistration": True,
+                        "symbolKind": {"valueSet": list(range(1, 27))},
+                        "hierarchicalDocumentSymbolSupport": True,
+                        "tagSupport": {"valueSet": [1]},
+                        "labelSupport": True,
+                    },
+                    "codeAction": {
+                        "dynamicRegistration": True,
+                        "isPreferredSupport": True,
+                        "disabledSupport": True,
+                        "dataSupport": True,
+                        "resolveSupport": {"properties": ["edit"]},
+                        "codeActionLiteralSupport": {
+                            "codeActionKind": {
+                                "valueSet": [
+                                    "",
+                                    "quickfix",
+                                    "refactor",
+                                    "refactor.extract",
+                                    "refactor.inline",
+                                    "refactor.rewrite",
+                                    "source",
+                                    "source.organizeImports",
+                                ]
+                            }
+                        },
+                        "honorsChangeAnnotations": False,
+                    },
+                    "codeLens": {"dynamicRegistration": True},
+                    "formatting": {"dynamicRegistration": True},
+                    "rangeFormatting": {"dynamicRegistration": True},
+                    "onTypeFormatting": {"dynamicRegistration": True},
+                    "rename": {
+                        "dynamicRegistration": True,
+                        "prepareSupport": True,
+                        "prepareSupportDefaultBehavior": 1,
+                        "honorsChangeAnnotations": True,
+                    },
+                    "documentLink": {"dynamicRegistration": True, "tooltipSupport": True},
+                    "typeDefinition": {"dynamicRegistration": True, "linkSupport": True},
+                    "implementation": {"dynamicRegistration": True, "linkSupport": True},
+                    "colorProvider": {"dynamicRegistration": True},
+                    "foldingRange": {
+                        "dynamicRegistration": True,
+                        "rangeLimit": 5000,
+                        "lineFoldingOnly": True,
+                        "foldingRangeKind": {"valueSet": ["comment", "imports", "region"]},
+                        "foldingRange": {"collapsedText": False},
+                    },
+                    "declaration": {"dynamicRegistration": True, "linkSupport": True},
+                    "selectionRange": {"dynamicRegistration": True},
+                    "callHierarchy": {"dynamicRegistration": True},
+                    "semanticTokens": {
+                        "dynamicRegistration": True,
+                        "tokenTypes": [
+                            "namespace",
+                            "type",
+                            "class",
+                            "enum",
+                            "interface",
+                            "struct",
+                            "typeParameter",
+                            "parameter",
+                            "variable",
+                            "property",
+                            "enumMember",
+                            "event",
+                            "function",
+                            "method",
+                            "macro",
+                            "keyword",
+                            "modifier",
+                            "comment",
+                            "string",
+                            "number",
+                            "regexp",
+                            "operator",
+                            "decorator",
+                        ],
+                        "tokenModifiers": [
+                            "declaration",
+                            "definition",
+                            "readonly",
+                            "static",
+                            "deprecated",
+                            "abstract",
+                            "async",
+                            "modification",
+                            "documentation",
+                            "defaultLibrary",
+                        ],
+                        "formats": ["relative"],
+                        "requests": {"range": True, "full": {"delta": True}},
+                        "multilineTokenSupport": False,
+                        "overlappingTokenSupport": False,
+                        "serverCancelSupport": True,
+                        "augmentsSyntaxTokens": False,
+                    },
+                    "linkedEditingRange": {"dynamicRegistration": True},
+                    "typeHierarchy": {"dynamicRegistration": True},
+                    "inlineValue": {"dynamicRegistration": True},
+                    "inlayHint": {
+                        "dynamicRegistration": True,
+                        "resolveSupport": {"properties": ["tooltip", "textEdits", "label.tooltip", "label.location", "label.command"]},
+                    },
+                    "diagnostic": {"dynamicRegistration": True, "relatedDocumentSupport": False},
+                },
+                "window": {
+                    "showMessage": {"messageActionItem": {"additionalPropertiesSupport": True}},
+                    "showDocument": {"support": True},
+                    "workDoneProgress": True,
+                },
+                "general": {
+                    "staleRequestSupport": {
+                        "cancel": True,
+                        "retryOnContentModified": [
+                            "textDocument/semanticTokens/full",
+                            "textDocument/semanticTokens/range",
+                            "textDocument/semanticTokens/full/delta",
+                        ],
+                    },
+                    "regularExpressions": {"engine": "ECMAScript", "version": "ES2020"},
+                    "markdown": {
+                        "parser": "marked",
+                        "version": "1.1.0",
+                        "allowedTags": [
+                            "ul",
+                            "li",
+                            "p",
+                            "code",
+                            "blockquote",
+                            "ol",
+                            "h1",
+                            "h2",
+                            "h3",
+                            "h4",
+                            "h5",
+                            "h6",
+                            "hr",
+                            "em",
+                            "pre",
+                            "table",
+                            "thead",
+                            "tbody",
+                            "tr",
+                            "th",
+                            "td",
+                            "div",
+                            "del",
+                            "a",
+                            "strong",
+                            "br",
+                            "img",
+                            "span",
+                        ],
+                    },
+                    "positionEncodings": ["utf-16"],
+                },
+                "notebookDocument": {"synchronization": {"dynamicRegistration": True, "executionSummarySupport": True}},
+                "experimental": {
+                    "snippetTextEdit": True,
+                    "codeActionGroup": True,
+                    "hoverActions": True,
+                    "serverStatusNotification": True,
+                    "colorDiagnosticOutput": True,
+                    "openServerLogs": True,
+                    "localDocs": True,
+                    "commands": {
+                        "commands": [
+                            "rust-analyzer.runSingle",
+                            "rust-analyzer.debugSingle",
+                            "rust-analyzer.showReferences",
+                            "rust-analyzer.gotoLocation",
+                            "editor.action.triggerParameterHints",
+                        ]
+                    },
+                },
+            },
+            "initializationOptions": {
+                "cargoRunner": None,
+                "runnables": {"extraEnv": None, "problemMatcher": ["$rustc"], "command": None, "extraArgs": []},
+                "statusBar": {"clickAction": "openLogs"},
+                "server": {"path": None, "extraEnv": None},
+                "trace": {"server": "verbose", "extension": False},
+                "debug": {
+                    "engine": "auto",
+                    "sourceFileMap": {"/rustc/<id>": "${env:USERPROFILE}/.rustup/toolchains/<toolchain-id>/lib/rustlib/src/rust"},
+                    "openDebugPane": False,
+                    "engineSettings": {},
+                },
+                "restartServerOnConfigChange": False,
+                "typing": {"continueCommentsOnNewline": True, "autoClosingAngleBrackets": {"enable": False}},
+                "diagnostics": {
+                    "previewRustcOutput": False,
+                    "useRustcErrorCode": False,
+                    "disabled": [],
+                    "enable": True,
+                    "experimental": {"enable": False},
+                    "remapPrefix": {},
+                    "warningsAsHint": [],
+                    "warningsAsInfo": [],
+                },
+                "discoverProjectRunner": None,
+                "showUnlinkedFileNotification": True,
+                "showDependenciesExplorer": True,
+                "assist": {"emitMustUse": False, "expressionFillDefault": "todo"},
+                "cachePriming": {"enable": True, "numThreads": 0},
+                "cargo": {
+                    "autoreload": True,
+                    "buildScripts": {
+                        "enable": True,
+                        "invocationLocation": "workspace",
+                        "invocationStrategy": "per_workspace",
+                        "overrideCommand": None,
+                        "useRustcWrapper": True,
+                    },
+                    "cfgs": {},
+                    "extraArgs": [],
+                    "extraEnv": {},
+                    "features": [],
+                    "noDefaultFeatures": False,
+                    "sysroot": "discover",
+                    "sysrootSrc": None,
+                    "target": None,
+                    "unsetTest": ["core"],
+                },
+                "checkOnSave": True,
+                "check": {
+                    "allTargets": True,
+                    "command": "check",
+                    "extraArgs": [],
+                    "extraEnv": {},
+                    "features": None,
+                    "ignore": [],
+                    "invocationLocation": "workspace",
+                    "invocationStrategy": "per_workspace",
+                    "noDefaultFeatures": None,
+                    "overrideCommand": None,
+                    "targets": None,
+                },
+                "completion": {
+                    "autoimport": {"enable": True},
+                    "autoself": {"enable": True},
+                    "callable": {"snippets": "fill_arguments"},
+                    "fullFunctionSignatures": {"enable": False},
+                    "limit": None,
+                    "postfix": {"enable": True},
+                    "privateEditable": {"enable": False},
+                    "snippets": {
+                        "custom": {
+                            "Arc::new": {
+                                "postfix": "arc",
+                                "body": "Arc::new(${receiver})",
+                                "requires": "std::sync::Arc",
+                                "description": "Put the expression into an `Arc`",
+                                "scope": "expr",
+                            },
+                            "Rc::new": {
+                                "postfix": "rc",
+                                "body": "Rc::new(${receiver})",
+                                "requires": "std::rc::Rc",
+                                "description": "Put the expression into an `Rc`",
+                                "scope": "expr",
+                            },
+                            "Box::pin": {
+                                "postfix": "pinbox",
+                                "body": "Box::pin(${receiver})",
+                                "requires": "std::boxed::Box",
+                                "description": "Put the expression into a pinned `Box`",
+                                "scope": "expr",
+                            },
+                            "Ok": {
+                                "postfix": "ok",
+                                "body": "Ok(${receiver})",
+                                "description": "Wrap the expression in a `Result::Ok`",
+                                "scope": "expr",
+                            },
+                            "Err": {
+                                "postfix": "err",
+                                "body": "Err(${receiver})",
+                                "description": "Wrap the expression in a `Result::Err`",
+                                "scope": "expr",
+                            },
+                            "Some": {
+                                "postfix": "some",
+                                "body": "Some(${receiver})",
+                                "description": "Wrap the expression in an `Option::Some`",
+                                "scope": "expr",
+                            },
+                        }
+                    },
+                },
+                "files": {"excludeDirs": [], "watcher": "client"},
+                "highlightRelated": {
+                    "breakPoints": {"enable": True},
+                    "closureCaptures": {"enable": True},
+                    "exitPoints": {"enable": True},
+                    "references": {"enable": True},
+                    "yieldPoints": {"enable": True},
+                },
+                "hover": {
+                    "actions": {
+                        "debug": {"enable": True},
+                        "enable": True,
+                        "gotoTypeDef": {"enable": True},
+                        "implementations": {"enable": True},
+                        "references": {"enable": False},
+                        "run": {"enable": True},
+                    },
+                    "documentation": {"enable": True, "keywords": {"enable": True}},
+                    "links": {"enable": True},
+                    "memoryLayout": {"alignment": "hexadecimal", "enable": True, "niches": False, "offset": "hexadecimal", "size": "both"},
+                },
+                "imports": {
+                    "granularity": {"enforce": False, "group": "crate"},
+                    "group": {"enable": True},
+                    "merge": {"glob": True},
+                    "preferNoStd": False,
+                    "preferPrelude": False,
+                    "prefix": "plain",
+                },
+                "inlayHints": {
+                    "bindingModeHints": {"enable": False},
+                    "chainingHints": {"enable": True},
+                    "closingBraceHints": {"enable": True, "minLines": 25},
+                    "closureCaptureHints": {"enable": False},
+                    "closureReturnTypeHints": {"enable": "never"},
+                    "closureStyle": "impl_fn",
+                    "discriminantHints": {"enable": "never"},
+                    "expressionAdjustmentHints": {"enable": "never", "hideOutsideUnsafe": False, "mode": "prefix"},
+                    "lifetimeElisionHints": {"enable": "never", "useParameterNames": False},
+                    "maxLength": 25,
+                    "parameterHints": {"enable": True},
+                    "reborrowHints": {"enable": "never"},
+                    "renderColons": True,
+                    "typeHints": {"enable": True, "hideClosureInitialization": False, "hideNamedConstructor": False},
+                },
+                "interpret": {"tests": False},
+                "joinLines": {"joinAssignments": True, "joinElseIf": True, "removeTrailingComma": True, "unwrapTrivialBlock": True},
+                "lens": {
+                    "debug": {"enable": True},
+                    "enable": True,
+                    "forceCustomCommands": True,
+                    "implementations": {"enable": True},
+                    "location": "above_name",
+                    "references": {
+                        "adt": {"enable": False},
+                        "enumVariant": {"enable": False},
+                        "method": {"enable": False},
+                        "trait": {"enable": False},
+                    },
+                    "run": {"enable": True},
+                },
+                "linkedProjects": [],
+                "lru": {"capacity": None, "query": {"capacities": {}}},
+                "notifications": {"cargoTomlNotFound": True},
+                "numThreads": None,
+                "procMacro": {"attributes": {"enable": True}, "enable": True, "ignored": {}, "server": None},
+                "references": {"excludeImports": False},
+                "rust": {"analyzerTargetDir": None},
+                "rustc": {"source": None},
+                "rustfmt": {"extraArgs": [], "overrideCommand": None, "rangeFormatting": {"enable": False}},
+                "semanticHighlighting": {
+                    "doc": {"comment": {"inject": {"enable": True}}},
+                    "nonStandardTokens": True,
+                    "operator": {"enable": True, "specialization": {"enable": False}},
+                    "punctuation": {"enable": False, "separate": {"macro": {"bang": False}}, "specialization": {"enable": False}},
+                    "strings": {"enable": True},
+                },
+                "signatureInfo": {"detail": "full", "documentation": {"enable": True}},
+                "workspace": {"symbol": {"search": {"kind": "only_types", "limit": 128, "scope": "workspace"}}},
+            },
+            "trace": "verbose",
+            "processId": os.getpid(),
+            "rootPath": repository_absolute_path,
+            "rootUri": root_uri,
+            "workspaceFolders": [
+                {
+                    "uri": root_uri,
+                    "name": os.path.basename(repository_absolute_path),
+                }
+            ],
+        }
+        return initialize_params
+
+    def _start_server(self):
+        """
+        Starts the Rust Analyzer Language Server
+        """
+
+        def register_capability_handler(params):
+            assert "registrations" in params
+            for registration in params["registrations"]:
+                if registration["method"] == "workspace/executeCommand":
+                    self.initialize_searcher_command_available.set()
+                    self.resolve_main_method_available.set()
+            return
+
+        def lang_status_handler(params):
+            # TODO: Should we wait for
+            # server -> client: {'jsonrpc': '2.0', 'method': 'language/status', 'params': {'type': 'ProjectStatus', 'message': 'OK'}}
+            # Before proceeding?
+            if params["type"] == "ServiceReady" and params["message"] == "ServiceReady":
+                self.service_ready_event.set()
+
+        def execute_client_command_handler(params):
+            return []
+
+        def do_nothing(params):
+            return
+
+        def check_experimental_status(params):
+            if params["quiescent"] == True:
+                self.server_ready.set()
+
+        def window_log_message(msg):
+            self.logger.log(f"LSP: window/logMessage: {msg}", logging.INFO)
+
+        self.server.on_request("client/registerCapability", register_capability_handler)
+        self.server.on_notification("language/status", lang_status_handler)
+        self.server.on_notification("window/logMessage", window_log_message)
+        self.server.on_request("workspace/executeClientCommand", execute_client_command_handler)
+        self.server.on_notification("$/progress", do_nothing)
+        self.server.on_notification("textDocument/publishDiagnostics", do_nothing)
+        self.server.on_notification("language/actionableNotification", do_nothing)
+        self.server.on_notification("experimental/serverStatus", check_experimental_status)
+
+        self.logger.log("Starting RustAnalyzer server process", logging.INFO)
+        self.server.start()
+        initialize_params = self._get_initialize_params(self.repository_root_path)
+
+        self.logger.log(
+            "Sending initialize request from LSP client to LSP server and awaiting response",
+            logging.INFO,
+        )
+        init_response = self.server.send.initialize(initialize_params)
+        assert init_response["capabilities"]["textDocumentSync"]["change"] == 2
+        assert "completionProvider" in init_response["capabilities"]
+        assert init_response["capabilities"]["completionProvider"] == {
+            "resolveProvider": True,
+            "triggerCharacters": [":", ".", "'", "("],
+            "completionItem": {"labelDetailsSupport": True},
+        }
+        self.server.notify.initialized({})
+        self.completions_available.set()
+
+        self.server_ready.wait()

src/solidlsp/language_servers/rust_analyzer/initialize_params.json

@@ -1,917 +0,0 @@
-{
-    "_description": "The parameters sent by the client when initializing the language server with the \"initialize\" request. More details at https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#initialize",
-    "processId": "os.getpid()",
-    "clientInfo": {
-        "name": "Visual Studio Code - Insiders",
-        "version": "1.82.0-insider"
-    },
-    "locale": "en",
-    "rootPath": "$rootPath",
-    "rootUri": "$rootUri",
-    "capabilities": {
-        "workspace": {
-            "applyEdit": true,
-            "workspaceEdit": {
-                "documentChanges": true,
-                "resourceOperations": [
-                    "create",
-                    "rename",
-                    "delete"
-                ],
-                "failureHandling": "textOnlyTransactional",
-                "normalizesLineEndings": true,
-                "changeAnnotationSupport": {
-                    "groupsOnLabel": true
-                }
-            },
-            "configuration": true,
-            "didChangeWatchedFiles": {
-                "dynamicRegistration": true,
-                "relativePatternSupport": true
-            },
-            "symbol": {
-                "dynamicRegistration": true,
-                "symbolKind": {
-                    "valueSet": [
-                        1,
-                        2,
-                        3,
-                        4,
-                        5,
-                        6,
-                        7,
-                        8,
-                        9,
-                        10,
-                        11,
-                        12,
-                        13,
-                        14,
-                        15,
-                        16,
-                        17,
-                        18,
-                        19,
-                        20,
-                        21,
-                        22,
-                        23,
-                        24,
-                        25,
-                        26
-                    ]
-                },
-                "tagSupport": {
-                    "valueSet": [
-                        1
-                    ]
-                },
-                "resolveSupport": {
-                    "properties": [
-                        "location.range"
-                    ]
-                }
-            },
-            "codeLens": {
-                "refreshSupport": true
-            },
-            "executeCommand": {
-                "dynamicRegistration": true
-            },
-            "didChangeConfiguration": {
-                "dynamicRegistration": true
-            },
-            "workspaceFolders": true,
-            "semanticTokens": {
-                "refreshSupport": true
-            },
-            "fileOperations": {
-                "dynamicRegistration": true,
-                "didCreate": true,
-                "didRename": true,
-                "didDelete": true,
-                "willCreate": true,
-                "willRename": true,
-                "willDelete": true
-            },
-            "inlineValue": {
-                "refreshSupport": true
-            },
-            "inlayHint": {
-                "refreshSupport": true
-            },
-            "diagnostics": {
-                "refreshSupport": true
-            }
-        },
-        "textDocument": {
-            "publishDiagnostics": {
-                "relatedInformation": true,
-                "versionSupport": false,
-                "tagSupport": {
-                    "valueSet": [
-                        1,
-                        2
-                    ]
-                },
-                "codeDescriptionSupport": true,
-                "dataSupport": true
-            },
-            "synchronization": {
-                "dynamicRegistration": true,
-                "willSave": true,
-                "willSaveWaitUntil": true,
-                "didSave": true
-            },
-            "completion": {
-                "dynamicRegistration": true,
-                "contextSupport": true,
-                "completionItem": {
-                    "snippetSupport": true,
-                    "commitCharactersSupport": true,
-                    "documentationFormat": [
-                        "markdown",
-                        "plaintext"
-                    ],
-                    "deprecatedSupport": true,
-                    "preselectSupport": true,
-                    "tagSupport": {
-                        "valueSet": [
-                            1
-                        ]
-                    },
-                    "insertReplaceSupport": true,
-                    "resolveSupport": {
-                        "properties": [
-                            "documentation",
-                            "detail",
-                            "additionalTextEdits"
-                        ]
-                    },
-                    "insertTextModeSupport": {
-                        "valueSet": [
-                            1,
-                            2
-                        ]
-                    },
-                    "labelDetailsSupport": true
-                },
-                "insertTextMode": 2,
-                "completionItemKind": {
-                    "valueSet": [
-                        1,
-                        2,
-                        3,
-                        4,
-                        5,
-                        6,
-                        7,
-                        8,
-                        9,
-                        10,
-                        11,
-                        12,
-                        13,
-                        14,
-                        16,
-                        17,
-                        18,
-                        19,
-                        20,
-                        21,
-                        22,
-                        23,
-                        24,
-                        25
-                    ]
-                },
-                "completionList": {
-                    "itemDefaults": [
-                        "commitCharacters",
-                        "editRange",
-                        "insertTextFormat",
-                        "insertTextMode"
-                    ]
-                }
-            },
-            "hover": {
-                "dynamicRegistration": true,
-                "contentFormat": [
-                    "markdown",
-                    "plaintext"
-                ]
-            },
-            "signatureHelp": {
-                "dynamicRegistration": true,
-                "signatureInformation": {
-                    "documentationFormat": [
-                        "markdown",
-                        "plaintext"
-                    ],
-                    "parameterInformation": {
-                        "labelOffsetSupport": true
-                    },
-                    "activeParameterSupport": true
-                },
-                "contextSupport": true
-            },
-            "definition": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "references": {
-                "dynamicRegistration": true
-            },
-            "documentHighlight": {
-                "dynamicRegistration": true
-            },
-            "documentSymbol": {
-                "dynamicRegistration": true,
-                "symbolKind": {
-                    "valueSet": [
-                        1,
-                        2,
-                        3,
-                        4,
-                        5,
-                        6,
-                        7,
-                        8,
-                        9,
-                        10,
-                        11,
-                        12,
-                        13,
-                        14,
-                        15,
-                        16,
-                        17,
-                        18,
-                        19,
-                        20,
-                        21,
-                        22,
-                        23,
-                        24,
-                        25,
-                        26
-                    ]
-                },
-                "hierarchicalDocumentSymbolSupport": true,
-                "tagSupport": {
-                    "valueSet": [
-                        1
-                    ]
-                },
-                "labelSupport": true
-            },
-            "codeAction": {
-                "dynamicRegistration": true,
-                "isPreferredSupport": true,
-                "disabledSupport": true,
-                "dataSupport": true,
-                "resolveSupport": {
-                    "properties": [
-                        "edit"
-                    ]
-                },
-                "codeActionLiteralSupport": {
-                    "codeActionKind": {
-                        "valueSet": [
-                            "",
-                            "quickfix",
-                            "refactor",
-                            "refactor.extract",
-                            "refactor.inline",
-                            "refactor.rewrite",
-                            "source",
-                            "source.organizeImports"
-                        ]
-                    }
-                },
-                "honorsChangeAnnotations": false
-            },
-            "codeLens": {
-                "dynamicRegistration": true
-            },
-            "formatting": {
-                "dynamicRegistration": true
-            },
-            "rangeFormatting": {
-                "dynamicRegistration": true
-            },
-            "onTypeFormatting": {
-                "dynamicRegistration": true
-            },
-            "rename": {
-                "dynamicRegistration": true,
-                "prepareSupport": true,
-                "prepareSupportDefaultBehavior": 1,
-                "honorsChangeAnnotations": true
-            },
-            "documentLink": {
-                "dynamicRegistration": true,
-                "tooltipSupport": true
-            },
-            "typeDefinition": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "implementation": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "colorProvider": {
-                "dynamicRegistration": true
-            },
-            "foldingRange": {
-                "dynamicRegistration": true,
-                "rangeLimit": 5000,
-                "lineFoldingOnly": true,
-                "foldingRangeKind": {
-                    "valueSet": [
-                        "comment",
-                        "imports",
-                        "region"
-                    ]
-                },
-                "foldingRange": {
-                    "collapsedText": false
-                }
-            },
-            "declaration": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "selectionRange": {
-                "dynamicRegistration": true
-            },
-            "callHierarchy": {
-                "dynamicRegistration": true
-            },
-            "semanticTokens": {
-                "dynamicRegistration": true,
-                "tokenTypes": [
-                    "namespace",
-                    "type",
-                    "class",
-                    "enum",
-                    "interface",
-                    "struct",
-                    "typeParameter",
-                    "parameter",
-                    "variable",
-                    "property",
-                    "enumMember",
-                    "event",
-                    "function",
-                    "method",
-                    "macro",
-                    "keyword",
-                    "modifier",
-                    "comment",
-                    "string",
-                    "number",
-                    "regexp",
-                    "operator",
-                    "decorator"
-                ],
-                "tokenModifiers": [
-                    "declaration",
-                    "definition",
-                    "readonly",
-                    "static",
-                    "deprecated",
-                    "abstract",
-                    "async",
-                    "modification",
-                    "documentation",
-                    "defaultLibrary"
-                ],
-                "formats": [
-                    "relative"
-                ],
-                "requests": {
-                    "range": true,
-                    "full": {
-                        "delta": true
-                    }
-                },
-                "multilineTokenSupport": false,
-                "overlappingTokenSupport": false,
-                "serverCancelSupport": true,
-                "augmentsSyntaxTokens": false
-            },
-            "linkedEditingRange": {
-                "dynamicRegistration": true
-            },
-            "typeHierarchy": {
-                "dynamicRegistration": true
-            },
-            "inlineValue": {
-                "dynamicRegistration": true
-            },
-            "inlayHint": {
-                "dynamicRegistration": true,
-                "resolveSupport": {
-                    "properties": [
-                        "tooltip",
-                        "textEdits",
-                        "label.tooltip",
-                        "label.location",
-                        "label.command"
-                    ]
-                }
-            },
-            "diagnostic": {
-                "dynamicRegistration": true,
-                "relatedDocumentSupport": false
-            }
-        },
-        "window": {
-            "showMessage": {
-                "messageActionItem": {
-                    "additionalPropertiesSupport": true
-                }
-            },
-            "showDocument": {
-                "support": true
-            },
-            "workDoneProgress": true
-        },
-        "general": {
-            "staleRequestSupport": {
-                "cancel": true,
-                "retryOnContentModified": [
-                    "textDocument/semanticTokens/full",
-                    "textDocument/semanticTokens/range",
-                    "textDocument/semanticTokens/full/delta"
-                ]
-            },
-            "regularExpressions": {
-                "engine": "ECMAScript",
-                "version": "ES2020"
-            },
-            "markdown": {
-                "parser": "marked",
-                "version": "1.1.0",
-                "allowedTags": [
-                    "ul",
-                    "li",
-                    "p",
-                    "code",
-                    "blockquote",
-                    "ol",
-                    "h1",
-                    "h2",
-                    "h3",
-                    "h4",
-                    "h5",
-                    "h6",
-                    "hr",
-                    "em",
-                    "pre",
-                    "table",
-                    "thead",
-                    "tbody",
-                    "tr",
-                    "th",
-                    "td",
-                    "div",
-                    "del",
-                    "a",
-                    "strong",
-                    "br",
-                    "img",
-                    "span"
-                ]
-            },
-            "positionEncodings": [
-                "utf-16"
-            ]
-        },
-        "notebookDocument": {
-            "synchronization": {
-                "dynamicRegistration": true,
-                "executionSummarySupport": true
-            }
-        },
-        "experimental": {
-            "snippetTextEdit": true,
-            "codeActionGroup": true,
-            "hoverActions": true,
-            "serverStatusNotification": true,
-            "colorDiagnosticOutput": true,
-            "openServerLogs": true,
-            "localDocs": true,
-            "commands": {
-                "commands": [
-                    "rust-analyzer.runSingle",
-                    "rust-analyzer.debugSingle",
-                    "rust-analyzer.showReferences",
-                    "rust-analyzer.gotoLocation",
-                    "editor.action.triggerParameterHints"
-                ]
-            }
-        }
-    },
-    "initializationOptions": {
-        "cargoRunner": null,
-        "runnables": {
-            "extraEnv": null,
-            "problemMatcher": [
-                "$rustc"
-            ],
-            "command": null,
-            "extraArgs": []
-        },
-        "statusBar": {
-            "clickAction": "openLogs"
-        },
-        "server": {
-            "path": null,
-            "extraEnv": null
-        },
-        "trace": {
-            "server": "verbose",
-            "extension": false
-        },
-        "debug": {
-            "engine": "auto",
-            "sourceFileMap": {
-                "/rustc/<id>": "${env:USERPROFILE}/.rustup/toolchains/<toolchain-id>/lib/rustlib/src/rust"
-            },
-            "openDebugPane": false,
-            "engineSettings": {}
-        },
-        "restartServerOnConfigChange": false,
-        "typing": {
-            "continueCommentsOnNewline": true,
-            "autoClosingAngleBrackets": {
-                "enable": false
-            }
-        },
-        "diagnostics": {
-            "previewRustcOutput": false,
-            "useRustcErrorCode": false,
-            "disabled": [],
-            "enable": true,
-            "experimental": {
-                "enable": false
-            },
-            "remapPrefix": {},
-            "warningsAsHint": [],
-            "warningsAsInfo": []
-        },
-        "discoverProjectRunner": null,
-        "showUnlinkedFileNotification": true,
-        "showDependenciesExplorer": true,
-        "assist": {
-            "emitMustUse": false,
-            "expressionFillDefault": "todo"
-        },
-        "cachePriming": {
-            "enable": true,
-            "numThreads": 0
-        },
-        "cargo": {
-            "autoreload": true,
-            "buildScripts": {
-                "enable": true,
-                "invocationLocation": "workspace",
-                "invocationStrategy": "per_workspace",
-                "overrideCommand": null,
-                "useRustcWrapper": true
-            },
-            "cfgs": {},
-            "extraArgs": [],
-            "extraEnv": {},
-            "features": [],
-            "noDefaultFeatures": false,
-            "sysroot": "discover",
-            "sysrootSrc": null,
-            "target": null,
-            "unsetTest": [
-                "core"
-            ]
-        },
-        "checkOnSave": true,
-        "check": {
-            "allTargets": true,
-            "command": "check",
-            "extraArgs": [],
-            "extraEnv": {},
-            "features": null,
-            "ignore": [],
-            "invocationLocation": "workspace",
-            "invocationStrategy": "per_workspace",
-            "noDefaultFeatures": null,
-            "overrideCommand": null,
-            "targets": null
-        },
-        "completion": {
-            "autoimport": {
-                "enable": true
-            },
-            "autoself": {
-                "enable": true
-            },
-            "callable": {
-                "snippets": "fill_arguments"
-            },
-            "fullFunctionSignatures": {
-                "enable": false
-            },
-            "limit": null,
-            "postfix": {
-                "enable": true
-            },
-            "privateEditable": {
-                "enable": false
-            },
-            "snippets": {
-                "custom": {
-                    "Arc::new": {
-                        "postfix": "arc",
-                        "body": "Arc::new(${receiver})",
-                        "requires": "std::sync::Arc",
-                        "description": "Put the expression into an `Arc`",
-                        "scope": "expr"
-                    },
-                    "Rc::new": {
-                        "postfix": "rc",
-                        "body": "Rc::new(${receiver})",
-                        "requires": "std::rc::Rc",
-                        "description": "Put the expression into an `Rc`",
-                        "scope": "expr"
-                    },
-                    "Box::pin": {
-                        "postfix": "pinbox",
-                        "body": "Box::pin(${receiver})",
-                        "requires": "std::boxed::Box",
-                        "description": "Put the expression into a pinned `Box`",
-                        "scope": "expr"
-                    },
-                    "Ok": {
-                        "postfix": "ok",
-                        "body": "Ok(${receiver})",
-                        "description": "Wrap the expression in a `Result::Ok`",
-                        "scope": "expr"
-                    },
-                    "Err": {
-                        "postfix": "err",
-                        "body": "Err(${receiver})",
-                        "description": "Wrap the expression in a `Result::Err`",
-                        "scope": "expr"
-                    },
-                    "Some": {
-                        "postfix": "some",
-                        "body": "Some(${receiver})",
-                        "description": "Wrap the expression in an `Option::Some`",
-                        "scope": "expr"
-                    }
-                }
-            }
-        },
-        "files": {
-            "excludeDirs": [],
-            "watcher": "client"
-        },
-        "highlightRelated": {
-            "breakPoints": {
-                "enable": true
-            },
-            "closureCaptures": {
-                "enable": true
-            },
-            "exitPoints": {
-                "enable": true
-            },
-            "references": {
-                "enable": true
-            },
-            "yieldPoints": {
-                "enable": true
-            }
-        },
-        "hover": {
-            "actions": {
-                "debug": {
-                    "enable": true
-                },
-                "enable": true,
-                "gotoTypeDef": {
-                    "enable": true
-                },
-                "implementations": {
-                    "enable": true
-                },
-                "references": {
-                    "enable": false
-                },
-                "run": {
-                    "enable": true
-                }
-            },
-            "documentation": {
-                "enable": true,
-                "keywords": {
-                    "enable": true
-                }
-            },
-            "links": {
-                "enable": true
-            },
-            "memoryLayout": {
-                "alignment": "hexadecimal",
-                "enable": true,
-                "niches": false,
-                "offset": "hexadecimal",
-                "size": "both"
-            }
-        },
-        "imports": {
-            "granularity": {
-                "enforce": false,
-                "group": "crate"
-            },
-            "group": {
-                "enable": true
-            },
-            "merge": {
-                "glob": true
-            },
-            "preferNoStd": false,
-            "preferPrelude": false,
-            "prefix": "plain"
-        },
-        "inlayHints": {
-            "bindingModeHints": {
-                "enable": false
-            },
-            "chainingHints": {
-                "enable": true
-            },
-            "closingBraceHints": {
-                "enable": true,
-                "minLines": 25
-            },
-            "closureCaptureHints": {
-                "enable": false
-            },
-            "closureReturnTypeHints": {
-                "enable": "never"
-            },
-            "closureStyle": "impl_fn",
-            "discriminantHints": {
-                "enable": "never"
-            },
-            "expressionAdjustmentHints": {
-                "enable": "never",
-                "hideOutsideUnsafe": false,
-                "mode": "prefix"
-            },
-            "lifetimeElisionHints": {
-                "enable": "never",
-                "useParameterNames": false
-            },
-            "maxLength": 25,
-            "parameterHints": {
-                "enable": true
-            },
-            "reborrowHints": {
-                "enable": "never"
-            },
-            "renderColons": true,
-            "typeHints": {
-                "enable": true,
-                "hideClosureInitialization": false,
-                "hideNamedConstructor": false
-            }
-        },
-        "interpret": {
-            "tests": false
-        },
-        "joinLines": {
-            "joinAssignments": true,
-            "joinElseIf": true,
-            "removeTrailingComma": true,
-            "unwrapTrivialBlock": true
-        },
-        "lens": {
-            "debug": {
-                "enable": true
-            },
-            "enable": true,
-            "forceCustomCommands": true,
-            "implementations": {
-                "enable": true
-            },
-            "location": "above_name",
-            "references": {
-                "adt": {
-                    "enable": false
-                },
-                "enumVariant": {
-                    "enable": false
-                },
-                "method": {
-                    "enable": false
-                },
-                "trait": {
-                    "enable": false
-                }
-            },
-            "run": {
-                "enable": true
-            }
-        },
-        "linkedProjects": [],
-        "lru": {
-            "capacity": null,
-            "query": {
-                "capacities": {}
-            }
-        },
-        "notifications": {
-            "cargoTomlNotFound": true
-        },
-        "numThreads": null,
-        "procMacro": {
-            "attributes": {
-                "enable": true
-            },
-            "enable": true,
-            "ignored": {},
-            "server": null
-        },
-        "references": {
-            "excludeImports": false
-        },
-        "rust": {
-            "analyzerTargetDir": null
-        },
-        "rustc": {
-            "source": null
-        },
-        "rustfmt": {
-            "extraArgs": [],
-            "overrideCommand": null,
-            "rangeFormatting": {
-                "enable": false
-            }
-        },
-        "semanticHighlighting": {
-            "doc": {
-                "comment": {
-                    "inject": {
-                        "enable": true
-                    }
-                }
-            },
-            "nonStandardTokens": true,
-            "operator": {
-                "enable": true,
-                "specialization": {
-                    "enable": false
-                }
-            },
-            "punctuation": {
-                "enable": false,
-                "separate": {
-                    "macro": {
-                        "bang": false
-                    }
-                },
-                "specialization": {
-                    "enable": false
-                }
-            },
-            "strings": {
-                "enable": true
-            }
-        },
-        "signatureInfo": {
-            "detail": "full",
-            "documentation": {
-                "enable": true
-            }
-        },
-        "workspace": {
-            "symbol": {
-                "search": {
-                    "kind": "only_types",
-                    "limit": 128,
-                    "scope": "workspace"
-                }
-            }
-        }
-    },
-    "trace": "verbose",
-    "workspaceFolders": [
-        {
-            "uri": "$uri",
-            "name": "$name"
-        }
-    ]
-}

src/solidlsp/language_servers/rust_analyzer/runtime_dependencies.json

@@ -1,29 +0,0 @@
-{
-    "_description": "Used to download the runtime dependencies for running RustAnalyzer. Obtained from https://github.com/rust-lang/rust-analyzer/releases",
-    "runtimeDependencies": [
-                {
-            "id": "RustAnalyzer",
-            "description": "RustAnalyzer for Linux (x64)",
-            "url": "https://github.com/rust-lang/rust-analyzer/releases/download/2023-10-09/rust-analyzer-aarch64-apple-darwin.gz",
-            "platformId": "osx-arm64",
-            "archiveType": "gz",
-            "binaryName": "rust_analyzer"
-        },
-        {
-            "id": "RustAnalyzer",
-            "description": "RustAnalyzer for Linux (x64)",
-            "url": "https://github.com/rust-lang/rust-analyzer/releases/download/2023-10-09/rust-analyzer-x86_64-unknown-linux-gnu.gz",
-            "platformId": "linux-x64",
-            "archiveType": "gz",
-            "binaryName": "rust_analyzer"
-        },
-        {
-            "id": "RustAnalyzer",
-            "description": "RustAnalyzer for Windows (x64)",
-            "url": "https://github.com/rust-lang/rust-analyzer/releases/download/2023-10-09/rust-analyzer-x86_64-pc-windows-msvc.zip",
-            "platformId": "win-x64",
-            "archiveType": "zip",
-            "binaryName": "rust-analyzer.exe"
-        }
-    ]
-}

src/solidlsp/language_servers/rust_analyzer/rust_analyzer.py

@@ -1,166 +0,0 @@
-"""
-Provides Rust specific instantiation of the LanguageServer class. Contains various configurations and settings specific to Rust.
-"""
-
-import json
-import logging
-import os
-import pathlib
-import stat
-import threading
-
-from overrides import override
-
-from solidlsp.ls import SolidLanguageServer
-from solidlsp.ls_config import LanguageServerConfig
-from solidlsp.ls_logger import LanguageServerLogger
-from solidlsp.ls_utils import FileUtils, PlatformUtils
-from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
-from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
-
-
-class RustAnalyzer(SolidLanguageServer):
-    """
-    Provides Rust specific instantiation of the LanguageServer class. Contains various configurations and settings specific to Rust.
-    """
-
-    def __init__(self, config: LanguageServerConfig, logger: LanguageServerLogger, repository_root_path: str):
-        """
-        Creates a RustAnalyzer instance. This class is not meant to be instantiated directly. Use LanguageServer.create() instead.
-        """
-        rustanalyzer_executable_path = self.setup_runtime_dependencies(logger, config)
-        super().__init__(
-            config,
-            logger,
-            repository_root_path,
-            ProcessLaunchInfo(cmd=rustanalyzer_executable_path, cwd=repository_root_path),
-            "rust",
-        )
-        self.server_ready = threading.Event()
-        self.service_ready_event = threading.Event()
-        self.initialize_searcher_command_available = threading.Event()
-        self.resolve_main_method_available = threading.Event()
-
-    @override
-    def is_ignored_dirname(self, dirname: str) -> bool:
-        return super().is_ignored_dirname(dirname) or dirname in ["target"]
-
-    def setup_runtime_dependencies(self, logger: LanguageServerLogger, config: LanguageServerConfig) -> str:
-        """
-        Setup runtime dependencies for rust_analyzer.
-        """
-        platform_id = PlatformUtils.get_platform_id()
-
-        with open(os.path.join(os.path.dirname(__file__), "runtime_dependencies.json"), encoding="utf-8") as f:
-            d = json.load(f)
-            del d["_description"]
-
-        # assert platform_id.value in [
-        #     "linux-x64",
-        #     "win-x64",
-        # ], "Only linux-x64 and win-x64 platform is supported for in multilspy at the moment"
-
-        runtime_dependencies = d["runtimeDependencies"]
-        runtime_dependencies = [dependency for dependency in runtime_dependencies if dependency["platformId"] == platform_id.value]
-        assert len(runtime_dependencies) == 1
-        dependency = runtime_dependencies[0]
-
-        rustanalyzer_ls_dir = os.path.join(os.path.dirname(__file__), "static", "RustAnalyzer")
-        rustanalyzer_executable_path = os.path.join(rustanalyzer_ls_dir, dependency["binaryName"])
-        if not os.path.exists(rustanalyzer_ls_dir):
-            os.makedirs(rustanalyzer_ls_dir)
-            if dependency["archiveType"] == "gz":
-                FileUtils.download_and_extract_archive(logger, dependency["url"], rustanalyzer_executable_path, dependency["archiveType"])
-            else:
-                FileUtils.download_and_extract_archive(logger, dependency["url"], rustanalyzer_ls_dir, dependency["archiveType"])
-        assert os.path.exists(rustanalyzer_executable_path)
-        os.chmod(rustanalyzer_executable_path, stat.S_IEXEC)
-
-        return rustanalyzer_executable_path
-
-    def _get_initialize_params(self, repository_absolute_path: str) -> InitializeParams:
-        """
-        Returns the initialize params for the Rust Analyzer Language Server.
-        """
-        with open(os.path.join(os.path.dirname(__file__), "initialize_params.json"), encoding="utf-8") as f:
-            d = json.load(f)
-
-        del d["_description"]
-
-        d["processId"] = os.getpid()
-        assert d["rootPath"] == "$rootPath"
-        d["rootPath"] = repository_absolute_path
-
-        assert d["rootUri"] == "$rootUri"
-        d["rootUri"] = pathlib.Path(repository_absolute_path).as_uri()
-
-        assert d["workspaceFolders"][0]["uri"] == "$uri"
-        d["workspaceFolders"][0]["uri"] = pathlib.Path(repository_absolute_path).as_uri()
-
-        assert d["workspaceFolders"][0]["name"] == "$name"
-        d["workspaceFolders"][0]["name"] = os.path.basename(repository_absolute_path)
-
-        return d
-
-    def _start_server(self):
-        """
-        Starts the Rust Analyzer Language Server
-        """
-
-        def register_capability_handler(params):
-            assert "registrations" in params
-            for registration in params["registrations"]:
-                if registration["method"] == "workspace/executeCommand":
-                    self.initialize_searcher_command_available.set()
-                    self.resolve_main_method_available.set()
-            return
-
-        def lang_status_handler(params):
-            # TODO: Should we wait for
-            # server -> client: {'jsonrpc': '2.0', 'method': 'language/status', 'params': {'type': 'ProjectStatus', 'message': 'OK'}}
-            # Before proceeding?
-            if params["type"] == "ServiceReady" and params["message"] == "ServiceReady":
-                self.service_ready_event.set()
-
-        def execute_client_command_handler(params):
-            return []
-
-        def do_nothing(params):
-            return
-
-        def check_experimental_status(params):
-            if params["quiescent"] == True:
-                self.server_ready.set()
-
-        def window_log_message(msg):
-            self.logger.log(f"LSP: window/logMessage: {msg}", logging.INFO)
-
-        self.server.on_request("client/registerCapability", register_capability_handler)
-        self.server.on_notification("language/status", lang_status_handler)
-        self.server.on_notification("window/logMessage", window_log_message)
-        self.server.on_request("workspace/executeClientCommand", execute_client_command_handler)
-        self.server.on_notification("$/progress", do_nothing)
-        self.server.on_notification("textDocument/publishDiagnostics", do_nothing)
-        self.server.on_notification("language/actionableNotification", do_nothing)
-        self.server.on_notification("experimental/serverStatus", check_experimental_status)
-
-        self.logger.log("Starting RustAnalyzer server process", logging.INFO)
-        self.server.start()
-        initialize_params = self._get_initialize_params(self.repository_root_path)
-
-        self.logger.log(
-            "Sending initialize request from LSP client to LSP server and awaiting response",
-            logging.INFO,
-        )
-        init_response = self.server.send.initialize(initialize_params)
-        assert init_response["capabilities"]["textDocumentSync"]["change"] == 2
-        assert "completionProvider" in init_response["capabilities"]
-        assert init_response["capabilities"]["completionProvider"] == {
-            "resolveProvider": True,
-            "triggerCharacters": [":", ".", "'", "("],
-            "completionItem": {"labelDetailsSupport": True},
-        }
-        self.server.notify.initialized({})
-        self.completions_available.set()
-
-        self.server_ready.wait()

src/solidlsp/language_servers/solargraph.py

@@ -31,7 +31,7 @@ class Solargraph(SolidLanguageServer):
         Creates a Solargraph instance. This class is not meant to be instantiated directly.
         Use LanguageServer.create() instead.
         """
-        solargraph_executable_path = self.setup_runtime_dependencies(logger, config, repository_root_path)
+        solargraph_executable_path = self._setup_runtime_dependencies(logger, config, repository_root_path)
         super().__init__(
             config,
             logger,
@@ -48,15 +48,21 @@ class Solargraph(SolidLanguageServer):
     def is_ignored_dirname(self, dirname: str) -> bool:
         return super().is_ignored_dirname(dirname) or dirname in ["vendor"]
 
-    def setup_runtime_dependencies(self, logger: LanguageServerLogger, config: LanguageServerConfig, repository_root_path: str) -> str:
+    @staticmethod
+    def _setup_runtime_dependencies(logger: LanguageServerLogger, config: LanguageServerConfig, repository_root_path: str) -> str:
         """
-        Setup runtime dependencies for Solargraph.
+        Setup runtime dependencies for Solargraph and return the command to start the server.
         """
-        with open(os.path.join(os.path.dirname(__file__), "runtime_dependencies.json"), encoding="utf-8") as f:
-            d = json.load(f)
-            del d["_description"]
+        runtime_dependencies = [
+            {
+                "url": "https://rubygems.org/downloads/solargraph-0.51.1.gem",
+                "installCommand": "gem install solargraph -v 0.51.1",
+                "binaryName": "solargraph",
+                "archiveType": "gem",
+            }
+        ]
 
-        dependency = d["runtimeDependencies"][0]
+        dependency = runtime_dependencies[0]
 
         # Check if Ruby is installed
         try:
@@ -93,29 +99,26 @@ class Solargraph(SolidLanguageServer):
         except subprocess.CalledProcessError as e:
             raise RuntimeError(f"Failed to check or install Solargraph. {e.stderr}") from e
 
-    def _get_initialize_params(self, repository_absolute_path: str) -> InitializeParams:
+    @staticmethod
+    def _get_initialize_params(repository_absolute_path: str) -> InitializeParams:
         """
         Returns the initialize params for the Solargraph Language Server.
         """
-        with open(os.path.join(os.path.dirname(__file__), "initialize_params.json"), encoding="utf-8") as f:
-            d = json.load(f)
-
-        del d["_description"]
-
-        d["processId"] = os.getpid()
-        assert d["rootPath"] == "$rootPath"
-        d["rootPath"] = repository_absolute_path
-
-        assert d["rootUri"] == "$rootUri"
-        d["rootUri"] = pathlib.Path(repository_absolute_path).as_uri()
-
-        assert d["workspaceFolders"][0]["uri"] == "$uri"
-        d["workspaceFolders"][0]["uri"] = pathlib.Path(repository_absolute_path).as_uri()
-
-        assert d["workspaceFolders"][0]["name"] == "$name"
-        d["workspaceFolders"][0]["name"] = os.path.basename(repository_absolute_path)
-
-        return d
+        root_uri = pathlib.Path(repository_absolute_path).as_uri()
+        initialize_params = {
+            "capabilities": {},
+            "trace": "verbose",
+            "processId": os.getpid(),
+            "rootPath": repository_absolute_path,
+            "rootUri": pathlib.Path(repository_absolute_path).as_uri(),
+            "workspaceFolders": [
+                {
+                    "uri": root_uri,
+                    "name": os.path.basename(repository_absolute_path),
+                }
+            ],
+        }
+        return initialize_params
 
     def _start_server(self):
         """

src/solidlsp/language_servers/solargraph/initialize_params.json

@@ -1,15 +0,0 @@
-{
-    "_description": "This file contains the initialization parameters for the Solargraph Language Server.",
-    "processId": "$processId",
-    "rootPath": "$rootPath",
-    "rootUri": "$rootUri",
-    "capabilities": {
-    },
-    "trace": "verbose",
-    "workspaceFolders": [
-        {
-            "uri": "$uri",
-            "name": "$name"
-        }
-    ]
-}

src/solidlsp/language_servers/solargraph/runtime_dependencies.json

@@ -1,11 +0,0 @@
-{
-  "_description": "This file contains URLs and other metadata required for downloading and installing the Solargraph language server.",
-  "runtimeDependencies": [
-    {
-      "url": "https://rubygems.org/downloads/solargraph-0.51.1.gem",
-      "installCommand": "gem install solargraph -v 0.51.1",
-      "binaryName": "solargraph",
-      "archiveType": "gem"
-    }
-  ]
-}

src/solidlsp/language_servers/terraform_ls.py

@@ -0,0 +1,203 @@
+import logging
+import os
+import shutil
+import stat
+import threading
+
+from overrides import override
+
+from solidlsp.ls import SolidLanguageServer
+from solidlsp.ls_config import LanguageServerConfig
+from solidlsp.ls_logger import LanguageServerLogger
+from solidlsp.ls_utils import PathUtils, PlatformUtils
+from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
+from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
+
+from .common import RuntimeDependency, RuntimeDependencyCollection
+
+
+class TerraformLS(SolidLanguageServer):
+    """
+    Provides Terraform specific instantiation of the LanguageServer class using terraform-ls.
+    """
+
+    @override
+    def is_ignored_dirname(self, dirname: str) -> bool:
+        return super().is_ignored_dirname(dirname) or dirname in [".terraform", "terraform.tfstate.d"]
+
+    @staticmethod
+    def _ensure_tf_command_available(logger: LanguageServerLogger):
+        logger.log("Starting terraform version detection...", logging.DEBUG)
+
+        # 1. Try to find terraform using shutil.which
+        terraform_cmd = shutil.which("terraform")
+        if terraform_cmd is not None:
+            logger.log(f"Found terraform via shutil.which: {terraform_cmd}", logging.DEBUG)
+            return
+
+        # TODO: is this needed?
+        # 2. Fallback to TERRAFORM_CLI_PATH (set by hashicorp/setup-terraform action)
+        if not terraform_cmd:
+            terraform_cli_path = os.environ.get("TERRAFORM_CLI_PATH")
+            if terraform_cli_path:
+                logger.log(f"Trying TERRAFORM_CLI_PATH: {terraform_cli_path}", logging.DEBUG)
+                # TODO: use binary name from runtime dependencies if we keep this code
+                if os.name == "nt":
+                    terraform_binary = os.path.join(terraform_cli_path, "terraform.exe")
+                else:
+                    terraform_binary = os.path.join(terraform_cli_path, "terraform")
+                if os.path.exists(terraform_binary):
+                    terraform_cmd = terraform_binary
+                    logger.log(f"Found terraform via TERRAFORM_CLI_PATH: {terraform_cmd}", logging.DEBUG)
+                    return
+
+        raise RuntimeError(
+            "Terraform executable not found, please ensure Terraform is installed."
+            "See https://developer.hashicorp.com/terraform/tutorials/aws-get-started/install-cli for instructions."
+        )
+
+    @classmethod
+    def _setup_runtime_dependencies(cls, logger: LanguageServerLogger) -> str:
+        """
+        Setup runtime dependencies for terraform-ls.
+        Downloads and installs terraform-ls if not already present.
+        """
+        cls._ensure_tf_command_available(logger)
+        platform_id = PlatformUtils.get_platform_id()
+        deps = RuntimeDependencyCollection(
+            [
+                RuntimeDependency(
+                    id="TerraformLS",
+                    description="terraform-ls for macOS (ARM64)",
+                    url="https://releases.hashicorp.com/terraform-ls/0.36.5/terraform-ls_0.36.5_darwin_arm64.zip",
+                    platform_id="osx-arm64",
+                    archive_type="zip",
+                    binary_name="terraform-ls",
+                ),
+                RuntimeDependency(
+                    id="TerraformLS",
+                    description="terraform-ls for macOS (x64)",
+                    url="https://releases.hashicorp.com/terraform-ls/0.36.5/terraform-ls_0.36.5_darwin_amd64.zip",
+                    platform_id="osx-x64",
+                    archive_type="zip",
+                    binary_name="terraform-ls",
+                ),
+                RuntimeDependency(
+                    id="TerraformLS",
+                    description="terraform-ls for Linux (x64)",
+                    url="https://releases.hashicorp.com/terraform-ls/0.36.5/terraform-ls_0.36.5_linux_amd64.zip",
+                    platform_id="linux-x64",
+                    archive_type="zip",
+                    binary_name="terraform-ls",
+                ),
+                RuntimeDependency(
+                    id="TerraformLS",
+                    description="terraform-ls for Windows (x64)",
+                    url="https://releases.hashicorp.com/terraform-ls/0.36.5/terraform-ls_0.36.5_windows_amd64.zip",
+                    platform_id="win-x64",
+                    archive_type="zip",
+                    binary_name="terraform-ls.exe",
+                ),
+            ]
+        )
+        dependency = deps.single_for_current_platform()
+
+        terraform_ls_executable_path = deps.binary_path(cls.ls_resources_dir())
+        if not os.path.exists(terraform_ls_executable_path):
+            logger.log(f"Downloading terraform-ls from {dependency.url}", logging.INFO)
+            deps.install(logger, cls.ls_resources_dir())
+
+        assert os.path.exists(terraform_ls_executable_path), f"terraform-ls executable not found at {terraform_ls_executable_path}"
+
+        # Make the executable file executable on Unix-like systems
+        if platform_id.value != "win-x64":
+            os.chmod(terraform_ls_executable_path, stat.S_IEXEC | stat.S_IREAD)
+
+        return terraform_ls_executable_path
+
+    def __init__(self, config: LanguageServerConfig, logger: LanguageServerLogger, repository_root_path: str):
+        """
+        Creates a TerraformLS instance. This class is not meant to be instantiated directly. Use LanguageServer.create() instead.
+        """
+        terraform_ls_executable_path = self._setup_runtime_dependencies(logger)
+
+        super().__init__(
+            config,
+            logger,
+            repository_root_path,
+            ProcessLaunchInfo(cmd=f"{terraform_ls_executable_path} serve", cwd=repository_root_path),
+            "terraform",
+        )
+        self.server_ready = threading.Event()
+        self.request_id = 0
+
+    @staticmethod
+    def _get_initialize_params(repository_absolute_path: str) -> InitializeParams:
+        """
+        Returns the initialize params for the Terraform Language Server.
+        """
+        root_uri = PathUtils.path_to_uri(repository_absolute_path)
+        return {
+            "processId": os.getpid(),
+            "locale": "en",
+            "rootPath": repository_absolute_path,
+            "rootUri": root_uri,
+            "capabilities": {
+                "textDocument": {
+                    "synchronization": {"didSave": True, "dynamicRegistration": True},
+                    "completion": {"dynamicRegistration": True, "completionItem": {"snippetSupport": True}},
+                    "definition": {"dynamicRegistration": True},
+                    "documentSymbol": {
+                        "dynamicRegistration": True,
+                        "hierarchicalDocumentSymbolSupport": True,
+                        "symbolKind": {"valueSet": list(range(1, 27))},
+                    },
+                },
+                "workspace": {"workspaceFolders": True, "didChangeConfiguration": {"dynamicRegistration": True}},
+            },
+            "workspaceFolders": [
+                {
+                    "name": os.path.basename(repository_absolute_path),
+                    "uri": root_uri,
+                }
+            ],
+        }
+
+    def _start_server(self):
+        """Start terraform-ls server process"""
+
+        def register_capability_handler(params):
+            return
+
+        def window_log_message(msg):
+            self.logger.log(f"LSP: window/logMessage: {msg}", logging.INFO)
+
+        def do_nothing(params):
+            return
+
+        self.server.on_request("client/registerCapability", register_capability_handler)
+        self.server.on_notification("window/logMessage", window_log_message)
+        self.server.on_notification("$/progress", do_nothing)
+        self.server.on_notification("textDocument/publishDiagnostics", do_nothing)
+
+        self.logger.log("Starting terraform-ls server process", logging.INFO)
+        self.server.start()
+        initialize_params = self._get_initialize_params(self.repository_root_path)
+
+        self.logger.log(
+            "Sending initialize request from LSP client to LSP server and awaiting response",
+            logging.INFO,
+        )
+        init_response = self.server.send.initialize(initialize_params)
+
+        # Verify server capabilities
+        assert "textDocumentSync" in init_response["capabilities"]
+        assert "completionProvider" in init_response["capabilities"]
+        assert "definitionProvider" in init_response["capabilities"]
+
+        self.server.notify.initialized({})
+        self.completions_available.set()
+
+        # terraform-ls server is typically ready immediately after initialization
+        self.server_ready.set()
+        self.server_ready.wait()

src/solidlsp/language_servers/typescript_language_server.py

@@ -2,12 +2,10 @@
 Provides TypeScript specific instantiation of the LanguageServer class. Contains various configurations and settings specific to TypeScript.
 """
 
-import json
 import logging
 import os
 import pathlib
 import shutil
-import subprocess
 import threading
 from time import sleep
 
@@ -20,6 +18,8 @@ from solidlsp.ls_utils import PlatformId, PlatformUtils
 from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
 from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 
+from .common import RuntimeDependency, RuntimeDependencyCollection
+
 # Platform-specific imports
 if os.name != "nt":  # Unix-like systems
     import pwd
@@ -33,7 +33,7 @@ else:
 
 # Conditionally import pwd module (Unix-only)
 if not PlatformUtils.get_platform_id().value.startswith("win"):
-    import pwd
+    pass
 
 
 class TypeScriptLanguageServer(SolidLanguageServer):
@@ -45,7 +45,7 @@ class TypeScriptLanguageServer(SolidLanguageServer):
         """
         Creates a TypeScriptLanguageServer instance. This class is not meant to be instantiated directly. Use LanguageServer.create() instead.
         """
-        ts_lsp_executable_path = self.setup_runtime_dependencies(logger, config)
+        ts_lsp_executable_path = self._setup_runtime_dependencies(logger, config)
         super().__init__(
             config,
             logger,
@@ -65,9 +65,10 @@ class TypeScriptLanguageServer(SolidLanguageServer):
             "coverage",
         ]
 
-    def setup_runtime_dependencies(self, logger: LanguageServerLogger, config: LanguageServerConfig) -> str:
+    @classmethod
+    def _setup_runtime_dependencies(cls, logger: LanguageServerLogger, config: LanguageServerConfig) -> str:
         """
-        Setup runtime dependencies for TypeScript Language Server.
+        Setup runtime dependencies for TypeScript Language Server and return the command to start the server.
         """
         platform_id = PlatformUtils.get_platform_id()
 
@@ -82,12 +83,23 @@ class TypeScriptLanguageServer(SolidLanguageServer):
         ]
         assert platform_id in valid_platforms, f"Platform {platform_id} is not supported for multilspy javascript/typescript at the moment"
 
-        with open(os.path.join(os.path.dirname(__file__), "runtime_dependencies.json")) as f:
-            d = json.load(f)
-            del d["_description"]
-
-        runtime_dependencies = d.get("runtimeDependencies", [])
-        tsserver_ls_dir = os.path.join(os.path.dirname(__file__), "static", "ts-lsp")
+        deps = RuntimeDependencyCollection(
+            [
+                RuntimeDependency(
+                    id="typescript",
+                    description="typescript package",
+                    command="npm install --prefix ./ typescript@5.5.4",
+                    platform_id="any",
+                ),
+                RuntimeDependency(
+                    id="typescript-language-server",
+                    description="typescript-language-server package",
+                    command="npm install --prefix ./ typescript-language-server@4.3.3",
+                    platform_id="any",
+                ),
+            ]
+        )
+        tsserver_ls_dir = os.path.join(cls.ls_resources_dir(), "ts-lsp")
         tsserver_executable_path = os.path.join(tsserver_ls_dir, "typescript-language-server")
 
         # Verify both node and npm are installed
@@ -99,29 +111,7 @@ class TypeScriptLanguageServer(SolidLanguageServer):
         # Install typescript and typescript-language-server if not already installed
         if not os.path.exists(tsserver_ls_dir):
             os.makedirs(tsserver_ls_dir, exist_ok=True)
-            for dependency in runtime_dependencies:
-                # Windows doesn't support the 'user' parameter and doesn't have pwd module
-                if PlatformUtils.get_platform_id().value.startswith("win"):
-                    subprocess.run(
-                        dependency["command"],
-                        shell=True,
-                        check=True,
-                        cwd=tsserver_ls_dir,
-                        stdout=subprocess.DEVNULL,
-                        stderr=subprocess.DEVNULL,
-                    )
-                else:
-                    # On Unix-like systems, run as non-root user
-                    user = pwd.getpwuid(os.getuid()).pw_name
-                    subprocess.run(
-                        dependency["command"],
-                        shell=True,
-                        check=True,
-                        user=user,
-                        cwd=tsserver_ls_dir,
-                        stdout=subprocess.DEVNULL,
-                        stderr=subprocess.DEVNULL,
-                    )
+            deps.install(logger, tsserver_ls_dir)
 
         tsserver_executable_path = os.path.join(tsserver_ls_dir, "node_modules", ".bin", "typescript-language-server")
 
@@ -130,29 +120,46 @@ class TypeScriptLanguageServer(SolidLanguageServer):
         ), "typescript-language-server executable not found. Please install typescript-language-server and try again."
         return f"{tsserver_executable_path} --stdio"
 
-    def _get_initialize_params(self, repository_absolute_path: str) -> InitializeParams:
+    @staticmethod
+    def _get_initialize_params(repository_absolute_path: str) -> InitializeParams:
         """
         Returns the initialize params for the TypeScript Language Server.
         """
-        with open(os.path.join(os.path.dirname(__file__), "initialize_params.json")) as f:
-            d = json.load(f)
-
-        del d["_description"]
-
-        d["processId"] = os.getpid()
-        assert d["rootPath"] == "$rootPath"
-        d["rootPath"] = repository_absolute_path
-
-        assert d["rootUri"] == "$rootUri"
-        d["rootUri"] = pathlib.Path(repository_absolute_path).as_uri()
-
-        assert d["workspaceFolders"][0]["uri"] == "$uri"
-        d["workspaceFolders"][0]["uri"] = pathlib.Path(repository_absolute_path).as_uri()
-
-        assert d["workspaceFolders"][0]["name"] == "$name"
-        d["workspaceFolders"][0]["name"] = os.path.basename(repository_absolute_path)
-
-        return d
+        root_uri = pathlib.Path(repository_absolute_path).as_uri()
+        initialize_params = {
+            "locale": "en",
+            "capabilities": {
+                "textDocument": {
+                    "synchronization": {"didSave": True, "dynamicRegistration": True},
+                    "completion": {"dynamicRegistration": True, "completionItem": {"snippetSupport": True}},
+                    "definition": {"dynamicRegistration": True},
+                    "references": {"dynamicRegistration": True},
+                    "documentSymbol": {
+                        "dynamicRegistration": True,
+                        "hierarchicalDocumentSymbolSupport": True,
+                        "symbolKind": {"valueSet": list(range(1, 27))},
+                    },
+                    "hover": {"dynamicRegistration": True, "contentFormat": ["markdown", "plaintext"]},
+                    "signatureHelp": {"dynamicRegistration": True},
+                    "codeAction": {"dynamicRegistration": True},
+                },
+                "workspace": {
+                    "workspaceFolders": True,
+                    "didChangeConfiguration": {"dynamicRegistration": True},
+                    "symbol": {"dynamicRegistration": True},
+                },
+            },
+            "processId": os.getpid(),
+            "rootPath": repository_absolute_path,
+            "rootUri": root_uri,
+            "workspaceFolders": [
+                {
+                    "uri": root_uri,
+                    "name": os.path.basename(repository_absolute_path),
+                }
+            ],
+        }
+        return initialize_params
 
     def _start_server(self):
         """

src/solidlsp/language_servers/typescript_language_server/initialize_params.json

@@ -1,906 +0,0 @@
-{
-    "_description": "The parameters sent by the client when initializing the language server with the \"initialize\" request. More details at https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#initialize",
-    "processId": "os.getpid()",
-    "clientInfo": {
-        "name": "Visual Studio Code - Insiders",
-        "version": "1.82.0-insider"
-    },
-    "locale": "en",
-    "rootPath": "$rootPath",
-    "rootUri": "$rootUri",
-    "capabilities": {
-        "workspace": {
-            "applyEdit": true,
-            "workspaceEdit": {
-                "documentChanges": true,
-                "resourceOperations": [
-                    "create",
-                    "rename",
-                    "delete"
-                ],
-                "failureHandling": "textOnlyTransactional",
-                "normalizesLineEndings": true,
-                "changeAnnotationSupport": {
-                    "groupsOnLabel": true
-                }
-            },
-            "configuration": true,
-            "didChangeWatchedFiles": {
-                "dynamicRegistration": true,
-                "relativePatternSupport": true
-            },
-            "symbol": {
-                "dynamicRegistration": true,
-                "symbolKind": {
-                    "valueSet": [
-                        1,
-                        2,
-                        3,
-                        4,
-                        5,
-                        6,
-                        7,
-                        8,
-                        9,
-                        10,
-                        11,
-                        12,
-                        13,
-                        14,
-                        15,
-                        16,
-                        17,
-                        18,
-                        19,
-                        20,
-                        21,
-                        22,
-                        23,
-                        24,
-                        25,
-                        26
-                    ]
-                },
-                "tagSupport": {
-                    "valueSet": [
-                        1
-                    ]
-                },
-                "resolveSupport": {
-                    "properties": [
-                        "location.range"
-                    ]
-                }
-            },
-            "codeLens": {
-                "refreshSupport": true
-            },
-            "executeCommand": {
-                "dynamicRegistration": true
-            },
-            "didChangeConfiguration": {
-                "dynamicRegistration": true
-            },
-            "workspaceFolders": true,
-            "semanticTokens": {
-                "refreshSupport": true
-            },
-            "fileOperations": {
-                "dynamicRegistration": true,
-                "didCreate": true,
-                "didRename": true,
-                "didDelete": true,
-                "willCreate": true,
-                "willRename": true,
-                "willDelete": true
-            },
-            "inlineValue": {
-                "refreshSupport": true
-            },
-            "inlayHint": {
-                "refreshSupport": true
-            },
-            "diagnostics": {
-                "refreshSupport": true
-            }
-        },
-        "textDocument": {
-            "publishDiagnostics": {
-                "relatedInformation": true,
-                "versionSupport": false,
-                "tagSupport": {
-                    "valueSet": [
-                        1,
-                        2
-                    ]
-                },
-                "codeDescriptionSupport": true,
-                "dataSupport": true
-            },
-            "synchronization": {
-                "dynamicRegistration": true,
-                "willSave": true,
-                "willSaveWaitUntil": true,
-                "didSave": true
-            },
-            "completion": {
-                "dynamicRegistration": true,
-                "contextSupport": true,
-                "completionItem": {
-                    "snippetSupport": true,
-                    "commitCharactersSupport": true,
-                    "documentationFormat": [
-                        "markdown",
-                        "plaintext"
-                    ],
-                    "deprecatedSupport": true,
-                    "preselectSupport": true,
-                    "tagSupport": {
-                        "valueSet": [
-                            1
-                        ]
-                    },
-                    "insertReplaceSupport": true,
-                    "resolveSupport": {
-                        "properties": [
-                            "documentation",
-                            "detail",
-                            "additionalTextEdits"
-                        ]
-                    },
-                    "insertTextModeSupport": {
-                        "valueSet": [
-                            1,
-                            2
-                        ]
-                    },
-                    "labelDetailsSupport": true
-                },
-                "insertTextMode": 2,
-                "completionItemKind": {
-                    "valueSet": [
-                        1,
-                        2,
-                        3,
-                        4,
-                        5,
-                        6,
-                        7,
-                        8,
-                        9,
-                        10,
-                        11,
-                        12,
-                        13,
-                        14,
-                        16,
-                        17,
-                        18,
-                        19,
-                        20,
-                        21,
-                        22,
-                        23,
-                        24,
-                        25
-                    ]
-                },
-                "completionList": {
-                    "itemDefaults": [
-                        "commitCharacters",
-                        "editRange",
-                        "insertTextFormat",
-                        "insertTextMode"
-                    ]
-                }
-            },
-            "hover": {
-                "dynamicRegistration": true,
-                "contentFormat": [
-                    "markdown",
-                    "plaintext"
-                ]
-            },
-            "signatureHelp": {
-                "dynamicRegistration": true,
-                "signatureInformation": {
-                    "documentationFormat": [
-                        "markdown",
-                        "plaintext"
-                    ],
-                    "parameterInformation": {
-                        "labelOffsetSupport": true
-                    },
-                    "activeParameterSupport": true
-                },
-                "contextSupport": true
-            },
-            "definition": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "references": {
-                "dynamicRegistration": true
-            },
-            "documentHighlight": {
-                "dynamicRegistration": true
-            },
-            "documentSymbol": {
-                "dynamicRegistration": true,
-                "symbolKind": {
-                    "valueSet": [
-                        1,
-                        2,
-                        3,
-                        4,
-                        5,
-                        6,
-                        7,
-                        8,
-                        9,
-                        10,
-                        11,
-                        12,
-                        13,
-                        14,
-                        15,
-                        16,
-                        17,
-                        18,
-                        19,
-                        20,
-                        21,
-                        22,
-                        23,
-                        24,
-                        25,
-                        26
-                    ]
-                },
-                "hierarchicalDocumentSymbolSupport": true,
-                "tagSupport": {
-                    "valueSet": [
-                        1
-                    ]
-                },
-                "labelSupport": true
-            },
-            "codeAction": {
-                "dynamicRegistration": true,
-                "isPreferredSupport": true,
-                "disabledSupport": true,
-                "dataSupport": true,
-                "resolveSupport": {
-                    "properties": [
-                        "edit"
-                    ]
-                },
-                "codeActionLiteralSupport": {
-                    "codeActionKind": {
-                        "valueSet": [
-                            "",
-                            "quickfix",
-                            "refactor",
-                            "refactor.extract",
-                            "refactor.inline",
-                            "refactor.rewrite",
-                            "source",
-                            "source.organizeImports"
-                        ]
-                    }
-                },
-                "honorsChangeAnnotations": false
-            },
-            "codeLens": {
-                "dynamicRegistration": true
-            },
-            "formatting": {
-                "dynamicRegistration": true
-            },
-            "rangeFormatting": {
-                "dynamicRegistration": true
-            },
-            "onTypeFormatting": {
-                "dynamicRegistration": true
-            },
-            "rename": {
-                "dynamicRegistration": true,
-                "prepareSupport": true,
-                "prepareSupportDefaultBehavior": 1,
-                "honorsChangeAnnotations": true
-            },
-            "documentLink": {
-                "dynamicRegistration": true,
-                "tooltipSupport": true
-            },
-            "typeDefinition": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "implementation": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "colorProvider": {
-                "dynamicRegistration": true
-            },
-            "foldingRange": {
-                "dynamicRegistration": true,
-                "rangeLimit": 5000,
-                "lineFoldingOnly": true,
-                "foldingRangeKind": {
-                    "valueSet": [
-                        "comment",
-                        "imports",
-                        "region"
-                    ]
-                },
-                "foldingRange": {
-                    "collapsedText": false
-                }
-            },
-            "declaration": {
-                "dynamicRegistration": true,
-                "linkSupport": true
-            },
-            "selectionRange": {
-                "dynamicRegistration": true
-            },
-            "callHierarchy": {
-                "dynamicRegistration": true
-            },
-            "semanticTokens": {
-                "dynamicRegistration": true,
-                "tokenTypes": [
-                    "namespace",
-                    "type",
-                    "class",
-                    "enum",
-                    "interface",
-                    "struct",
-                    "typeParameter",
-                    "parameter",
-                    "variable",
-                    "property",
-                    "enumMember",
-                    "event",
-                    "function",
-                    "method",
-                    "macro",
-                    "keyword",
-                    "modifier",
-                    "comment",
-                    "string",
-                    "number",
-                    "regexp",
-                    "operator",
-                    "decorator"
-                ],
-                "tokenModifiers": [
-                    "declaration",
-                    "definition",
-                    "readonly",
-                    "static",
-                    "deprecated",
-                    "abstract",
-                    "async",
-                    "modification",
-                    "documentation",
-                    "defaultLibrary"
-                ],
-                "formats": [
-                    "relative"
-                ],
-                "requests": {
-                    "range": true,
-                    "full": {
-                        "delta": true
-                    }
-                },
-                "multilineTokenSupport": false,
-                "overlappingTokenSupport": false,
-                "serverCancelSupport": true,
-                "augmentsSyntaxTokens": false
-            },
-            "linkedEditingRange": {
-                "dynamicRegistration": true
-            },
-            "typeHierarchy": {
-                "dynamicRegistration": true
-            },
-            "inlineValue": {
-                "dynamicRegistration": true
-            },
-            "inlayHint": {
-                "dynamicRegistration": true,
-                "resolveSupport": {
-                    "properties": [
-                        "tooltip",
-                        "textEdits",
-                        "label.tooltip",
-                        "label.location",
-                        "label.command"
-                    ]
-                }
-            },
-            "diagnostic": {
-                "dynamicRegistration": true,
-                "relatedDocumentSupport": false
-            }
-        },
-        "general": {
-            "staleRequestSupport": {
-                "cancel": true,
-                "retryOnContentModified": [
-                    "textDocument/semanticTokens/full",
-                    "textDocument/semanticTokens/range",
-                    "textDocument/semanticTokens/full/delta"
-                ]
-            },
-            "regularExpressions": {
-                "engine": "ECMAScript",
-                "version": "ES2020"
-            },
-            "markdown": {
-                "parser": "marked",
-                "version": "1.1.0",
-                "allowedTags": [
-                    "ul",
-                    "li",
-                    "p",
-                    "code",
-                    "blockquote",
-                    "ol",
-                    "h1",
-                    "h2",
-                    "h3",
-                    "h4",
-                    "h5",
-                    "h6",
-                    "hr",
-                    "em",
-                    "pre",
-                    "table",
-                    "thead",
-                    "tbody",
-                    "tr",
-                    "th",
-                    "td",
-                    "div",
-                    "del",
-                    "a",
-                    "strong",
-                    "br",
-                    "img",
-                    "span"
-                ]
-            },
-            "positionEncodings": [
-                "utf-16"
-            ]
-        },
-        "notebookDocument": {
-            "synchronization": {
-                "dynamicRegistration": true,
-                "executionSummarySupport": true
-            }
-        },
-        "experimental": {
-            "snippetTextEdit": true,
-            "codeActionGroup": true,
-            "hoverActions": true,
-            "serverStatusNotification": true,
-            "colorDiagnosticOutput": true,
-            "openServerLogs": true,
-            "localDocs": true,
-            "commands": {
-                "commands": [
-                    "rust-analyzer.runSingle",
-                    "rust-analyzer.debugSingle",
-                    "rust-analyzer.showReferences",
-                    "rust-analyzer.gotoLocation",
-                    "editor.action.triggerParameterHints"
-                ]
-            }
-        }
-    },
-    "initializationOptions": {
-        "cargoRunner": null,
-        "runnables": {
-            "extraEnv": null,
-            "problemMatcher": [
-                "$rustc"
-            ],
-            "command": null,
-            "extraArgs": []
-        },
-        "statusBar": {
-            "clickAction": "openLogs"
-        },
-        "server": {
-            "path": null,
-            "extraEnv": null
-        },
-        "trace": {
-            "server": "verbose",
-            "extension": false
-        },
-        "debug": {
-            "engine": "auto",
-            "sourceFileMap": {
-                "/rustc/<id>": "${env:USERPROFILE}/.rustup/toolchains/<toolchain-id>/lib/rustlib/src/rust"
-            },
-            "openDebugPane": false,
-            "engineSettings": {}
-        },
-        "restartServerOnConfigChange": false,
-        "typing": {
-            "continueCommentsOnNewline": true,
-            "autoClosingAngleBrackets": {
-                "enable": false
-            }
-        },
-        "diagnostics": {
-            "previewRustcOutput": false,
-            "useRustcErrorCode": false,
-            "disabled": [],
-            "enable": true,
-            "experimental": {
-                "enable": false
-            },
-            "remapPrefix": {},
-            "warningsAsHint": [],
-            "warningsAsInfo": []
-        },
-        "discoverProjectRunner": null,
-        "showUnlinkedFileNotification": true,
-        "showDependenciesExplorer": true,
-        "assist": {
-            "emitMustUse": false,
-            "expressionFillDefault": "todo"
-        },
-        "cachePriming": {
-            "enable": true,
-            "numThreads": 0
-        },
-        "cargo": {
-            "autoreload": true,
-            "buildScripts": {
-                "enable": true,
-                "invocationLocation": "workspace",
-                "invocationStrategy": "per_workspace",
-                "overrideCommand": null,
-                "useRustcWrapper": true
-            },
-            "cfgs": {},
-            "extraArgs": [],
-            "extraEnv": {},
-            "features": [],
-            "noDefaultFeatures": false,
-            "sysroot": "discover",
-            "sysrootSrc": null,
-            "target": null,
-            "unsetTest": [
-                "core"
-            ]
-        },
-        "checkOnSave": true,
-        "check": {
-            "allTargets": true,
-            "command": "check",
-            "extraArgs": [],
-            "extraEnv": {},
-            "features": null,
-            "ignore": [],
-            "invocationLocation": "workspace",
-            "invocationStrategy": "per_workspace",
-            "noDefaultFeatures": null,
-            "overrideCommand": null,
-            "targets": null
-        },
-        "completion": {
-            "autoimport": {
-                "enable": true
-            },
-            "autoself": {
-                "enable": true
-            },
-            "callable": {
-                "snippets": "fill_arguments"
-            },
-            "fullFunctionSignatures": {
-                "enable": false
-            },
-            "limit": null,
-            "postfix": {
-                "enable": true
-            },
-            "privateEditable": {
-                "enable": false
-            },
-            "snippets": {
-                "custom": {
-                    "Arc::new": {
-                        "postfix": "arc",
-                        "body": "Arc::new(${receiver})",
-                        "requires": "std::sync::Arc",
-                        "description": "Put the expression into an `Arc`",
-                        "scope": "expr"
-                    },
-                    "Rc::new": {
-                        "postfix": "rc",
-                        "body": "Rc::new(${receiver})",
-                        "requires": "std::rc::Rc",
-                        "description": "Put the expression into an `Rc`",
-                        "scope": "expr"
-                    },
-                    "Box::pin": {
-                        "postfix": "pinbox",
-                        "body": "Box::pin(${receiver})",
-                        "requires": "std::boxed::Box",
-                        "description": "Put the expression into a pinned `Box`",
-                        "scope": "expr"
-                    },
-                    "Ok": {
-                        "postfix": "ok",
-                        "body": "Ok(${receiver})",
-                        "description": "Wrap the expression in a `Result::Ok`",
-                        "scope": "expr"
-                    },
-                    "Err": {
-                        "postfix": "err",
-                        "body": "Err(${receiver})",
-                        "description": "Wrap the expression in a `Result::Err`",
-                        "scope": "expr"
-                    },
-                    "Some": {
-                        "postfix": "some",
-                        "body": "Some(${receiver})",
-                        "description": "Wrap the expression in an `Option::Some`",
-                        "scope": "expr"
-                    }
-                }
-            }
-        },
-        "files": {
-            "excludeDirs": [],
-            "watcher": "client"
-        },
-        "highlightRelated": {
-            "breakPoints": {
-                "enable": true
-            },
-            "closureCaptures": {
-                "enable": true
-            },
-            "exitPoints": {
-                "enable": true
-            },
-            "references": {
-                "enable": true
-            },
-            "yieldPoints": {
-                "enable": true
-            }
-        },
-        "hover": {
-            "actions": {
-                "debug": {
-                    "enable": true
-                },
-                "enable": true,
-                "gotoTypeDef": {
-                    "enable": true
-                },
-                "implementations": {
-                    "enable": true
-                },
-                "references": {
-                    "enable": false
-                },
-                "run": {
-                    "enable": true
-                }
-            },
-            "documentation": {
-                "enable": true,
-                "keywords": {
-                    "enable": true
-                }
-            },
-            "links": {
-                "enable": true
-            },
-            "memoryLayout": {
-                "alignment": "hexadecimal",
-                "enable": true,
-                "niches": false,
-                "offset": "hexadecimal",
-                "size": "both"
-            }
-        },
-        "imports": {
-            "granularity": {
-                "enforce": false,
-                "group": "crate"
-            },
-            "group": {
-                "enable": true
-            },
-            "merge": {
-                "glob": true
-            },
-            "preferNoStd": false,
-            "preferPrelude": false,
-            "prefix": "plain"
-        },
-        "inlayHints": {
-            "bindingModeHints": {
-                "enable": false
-            },
-            "chainingHints": {
-                "enable": true
-            },
-            "closingBraceHints": {
-                "enable": true,
-                "minLines": 25
-            },
-            "closureCaptureHints": {
-                "enable": false
-            },
-            "closureReturnTypeHints": {
-                "enable": "never"
-            },
-            "closureStyle": "impl_fn",
-            "discriminantHints": {
-                "enable": "never"
-            },
-            "expressionAdjustmentHints": {
-                "enable": "never",
-                "hideOutsideUnsafe": false,
-                "mode": "prefix"
-            },
-            "lifetimeElisionHints": {
-                "enable": "never",
-                "useParameterNames": false
-            },
-            "maxLength": 25,
-            "parameterHints": {
-                "enable": true
-            },
-            "reborrowHints": {
-                "enable": "never"
-            },
-            "renderColons": true,
-            "typeHints": {
-                "enable": true,
-                "hideClosureInitialization": false,
-                "hideNamedConstructor": false
-            }
-        },
-        "interpret": {
-            "tests": false
-        },
-        "joinLines": {
-            "joinAssignments": true,
-            "joinElseIf": true,
-            "removeTrailingComma": true,
-            "unwrapTrivialBlock": true
-        },
-        "lens": {
-            "debug": {
-                "enable": true
-            },
-            "enable": true,
-            "forceCustomCommands": true,
-            "implementations": {
-                "enable": true
-            },
-            "location": "above_name",
-            "references": {
-                "adt": {
-                    "enable": false
-                },
-                "enumVariant": {
-                    "enable": false
-                },
-                "method": {
-                    "enable": false
-                },
-                "trait": {
-                    "enable": false
-                }
-            },
-            "run": {
-                "enable": true
-            }
-        },
-        "linkedProjects": [],
-        "lru": {
-            "capacity": null,
-            "query": {
-                "capacities": {}
-            }
-        },
-        "notifications": {
-            "cargoTomlNotFound": true
-        },
-        "numThreads": null,
-        "procMacro": {
-            "attributes": {
-                "enable": true
-            },
-            "enable": true,
-            "ignored": {},
-            "server": null
-        },
-        "references": {
-            "excludeImports": false
-        },
-        "rust": {
-            "analyzerTargetDir": null
-        },
-        "rustc": {
-            "source": null
-        },
-        "rustfmt": {
-            "extraArgs": [],
-            "overrideCommand": null,
-            "rangeFormatting": {
-                "enable": false
-            }
-        },
-        "semanticHighlighting": {
-            "doc": {
-                "comment": {
-                    "inject": {
-                        "enable": true
-                    }
-                }
-            },
-            "nonStandardTokens": true,
-            "operator": {
-                "enable": true,
-                "specialization": {
-                    "enable": false
-                }
-            },
-            "punctuation": {
-                "enable": false,
-                "separate": {
-                    "macro": {
-                        "bang": false
-                    }
-                },
-                "specialization": {
-                    "enable": false
-                }
-            },
-            "strings": {
-                "enable": true
-            }
-        },
-        "signatureInfo": {
-            "detail": "full",
-            "documentation": {
-                "enable": true
-            }
-        },
-        "workspace": {
-            "symbol": {
-                "search": {
-                    "kind": "only_types",
-                    "limit": 128,
-                    "scope": "workspace"
-                }
-            }
-        }
-    },
-    "trace": "verbose",
-    "workspaceFolders": [
-        {
-            "uri": "$uri",
-            "name": "$name"
-        }
-    ]
-}

src/solidlsp/language_servers/typescript_language_server/runtime_dependencies.json

@@ -1,16 +0,0 @@
-{
-  "_description": "Used to download the runtime dependencies for running typescript-language-server. Obtained from https://github.com/typescript-language-server/typescript-language-server/releases",
-  "runtimeDependencies": [
-    {
-      "id": "typescript",
-      "description": "typescript package for Linux, OSX, and Windows. Both x64 and arm64 are supported.",
-      "command": "npm install --prefix ./ typescript@5.5.4"
-    },
-    {
-      "id": "typescript-language-server",
-      "description": "typescript-language-server package for Linux, OSX, and Windows. Both x64 and arm64 are supported.",
-      "command": "npm install --prefix ./ typescript-language-server@4.3.3"
-    }
-  ]
-}
-

src/solidlsp/ls.py

@@ -89,6 +89,17 @@ class SolidLanguageServer(ABC):
         """
         return dirname.startswith(".")
 
+    @classmethod
+    def ls_resources_dir(cls, mkdir: bool = True) -> str:
+        """
+        Returns the directory where the language server resources are downloaded.
+        This is used to store language server binaries, configuration files, etc.
+        """
+        result = os.path.join(os.path.dirname(__file__), "language_servers", "static", cls.__name__)
+        if mkdir:
+            os.makedirs(result, exist_ok=True)
+        return result
+
     @classmethod
     def create(
         cls, config: LanguageServerConfig, logger: LanguageServerLogger, repository_root_path: str, timeout: float | None = None
@@ -108,28 +119,32 @@ class SolidLanguageServer(ABC):
         ls: SolidLanguageServer
 
         if config.code_language == Language.PYTHON:
-            from solidlsp.language_servers.pyright_language_server.pyright_server import (
+            # We can also use jedi
+            # from solidlsp.language_servers.jedi_server import JediServer
+            #
+            # ls = JediServer(config, logger, repository_root_path)
+            from solidlsp.language_servers.pyright_server import (
                 PyrightServer,
             )
 
             ls = PyrightServer(config, logger, repository_root_path)
 
         elif config.code_language == Language.JAVA:
-            from solidlsp.language_servers.eclipse_jdtls.eclipse_jdtls import (
+            from solidlsp.language_servers.eclipse_jdtls import (
                 EclipseJDTLS,
             )
 
             ls = EclipseJDTLS(config, logger, repository_root_path)
 
         elif config.code_language == Language.KOTLIN:
-            from solidlsp.language_servers.kotlin_language_server.kotlin_language_server import (
+            from solidlsp.language_servers.kotlin_language_server import (
                 KotlinLanguageServer,
             )
 
             ls = KotlinLanguageServer(config, logger, repository_root_path)
 
         elif config.code_language == Language.RUST:
-            from solidlsp.language_servers.rust_analyzer.rust_analyzer import (
+            from solidlsp.language_servers.rust_analyzer import (
                 RustAnalyzer,
             )
 
@@ -141,44 +156,44 @@ class SolidLanguageServer(ABC):
             # from solidlsp.language_servers.omnisharp.omnisharp import OmniSharp
             # ls = OmniSharp(config, logger, repository_root_path)
 
-            from solidlsp.language_servers.csharp_language_server.csharp_language_server import CSharpLanguageServer
+            from solidlsp.language_servers.csharp_language_server import CSharpLanguageServer
 
             ls = CSharpLanguageServer(config, logger, repository_root_path)
 
         elif config.code_language == Language.TYPESCRIPT:
-            from solidlsp.language_servers.typescript_language_server.typescript_language_server import (
+            from solidlsp.language_servers.typescript_language_server import (
                 TypeScriptLanguageServer,
             )
 
             ls = TypeScriptLanguageServer(config, logger, repository_root_path)
 
         elif config.code_language == Language.GO:
-            from solidlsp.language_servers.gopls.gopls import Gopls
+            from solidlsp.language_servers.gopls import Gopls
 
             ls = Gopls(config, logger, repository_root_path)
 
         elif config.code_language == Language.RUBY:
-            from solidlsp.language_servers.solargraph.solargraph import Solargraph
+            from solidlsp.language_servers.solargraph import Solargraph
 
             ls = Solargraph(config, logger, repository_root_path)
 
         elif config.code_language == Language.DART:
-            from solidlsp.language_servers.dart_language_server.dart_language_server import DartLanguageServer
+            from solidlsp.language_servers.dart_language_server import DartLanguageServer
 
             ls = DartLanguageServer(config, logger, repository_root_path)
 
         elif config.code_language == Language.CPP:
-            from solidlsp.language_servers.clangd_language_server.clangd_language_server import ClangdLanguageServer
+            from solidlsp.language_servers.clangd_language_server import ClangdLanguageServer
 
             ls = ClangdLanguageServer(config, logger, repository_root_path)
 
         elif config.code_language == Language.PHP:
-            from solidlsp.language_servers.intelephense.intelephense import Intelephense
+            from solidlsp.language_servers.intelephense import Intelephense
 
             ls = Intelephense(config, logger, repository_root_path)
 
         elif config.code_language == Language.CLOJURE:
-            from solidlsp.language_servers.clojure_lsp.clojure_lsp import ClojureLSP
+            from solidlsp.language_servers.clojure_lsp import ClojureLSP
 
             ls = ClojureLSP(config, logger, repository_root_path)
 
@@ -188,7 +203,7 @@ class SolidLanguageServer(ABC):
             ls = ElixirTools(config, logger, repository_root_path)
 
         elif config.code_language == Language.TERRAFORM:
-            from solidlsp.language_servers.terraform_ls.terraform_ls import TerraformLS
+            from solidlsp.language_servers.terraform_ls import TerraformLS
 
             ls = TerraformLS(config, logger, repository_root_path)
 
@@ -674,6 +689,14 @@ class SolidLanguageServer(ABC):
             assert LSPConstants.RANGE in item
 
             abs_path = PathUtils.uri_to_path(item[LSPConstants.URI])
+            if not Path(abs_path).is_relative_to(self.repository_root_path):
+                self.logger.log(
+                    "Found a reference in a path outside the repository, probably the LS is parsing things in installed packages or in the standardlib! "
+                    f"Path: {abs_path}. This is a bug but we currently simply skip these references.",
+                    logging.WARNING,
+                )
+                continue
+
             rel_path = Path(abs_path).relative_to(self.repository_root_path)
             if self.is_ignored_path(str(rel_path)):
                 self.logger.log(f"Ignoring reference in {rel_path} since it should be ignored", logging.DEBUG)

src/solidlsp/ls_utils.py

@@ -206,10 +206,10 @@ class FileUtils:
             os.makedirs(os.path.dirname(tmp_file_name), exist_ok=True)
             FileUtils.download_file(logger, url, tmp_file_name)
             if archive_type in ["zip", "tar", "gztar", "bztar", "xztar"]:
-                assert os.path.isdir(target_path)
+                os.makedirs(target_path, exist_ok=True)
                 shutil.unpack_archive(tmp_file_name, target_path, archive_type)
             elif archive_type == "zip.gz":
-                assert os.path.isdir(target_path)
+                os.makedirs(target_path, exist_ok=True)
                 tmp_file_name_ungzipped = tmp_file_name + ".zip"
                 tmp_files.append(tmp_file_name_ungzipped)
                 with gzip.open(tmp_file_name, "rb") as f_in, open(tmp_file_name_ungzipped, "wb") as f_out:
@@ -257,6 +257,7 @@ class DotnetVersion(str, Enum):
     V6 = "6"
     V7 = "7"
     V8 = "8"
+    V9 = "9"
     VMONO = "mono"
 
 
@@ -345,15 +346,14 @@ class PlatformUtils:
 
             # Check for supported versions in order of preference (latest first)
             for version_cmd_output in available_version_cmd_output:
+                if version_cmd_output.startswith("9"):
+                    return DotnetVersion.V9
                 if version_cmd_output.startswith("8"):
                     return DotnetVersion.V8
-            for version_cmd_output in available_version_cmd_output:
                 if version_cmd_output.startswith("7"):
                     return DotnetVersion.V7
-            for version_cmd_output in available_version_cmd_output:
                 if version_cmd_output.startswith("6"):
                     return DotnetVersion.V6
-            for version_cmd_output in available_version_cmd_output:
                 if version_cmd_output.startswith("4"):
                     return DotnetVersion.V4
 

test/resources/repos/csharp/test_repo/serena.sln

@@ -1,38 +1,38 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.5.2.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0C88DD14-F956-CE84-757C-A364CCF449FC}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resources", "resources", "{EF7103B4-4C75-1E6D-A485-A154A88D107A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repos", "repos", "{E2326EEF-E677-6A44-0935-7677816F09E7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "csharp", "csharp", "{C21E6CE7-177A-86D9-040F-A317F18B6DBF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject", "test\resources\repos\csharp\test_repo\TestProject.csproj", "{A4D04E18-760A-73F9-3303-0542F6298C84}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A4D04E18-760A-73F9-3303-0542F6298C84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4D04E18-760A-73F9-3303-0542F6298C84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4D04E18-760A-73F9-3303-0542F6298C84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4D04E18-760A-73F9-3303-0542F6298C84}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{EF7103B4-4C75-1E6D-A485-A154A88D107A} = {0C88DD14-F956-CE84-757C-A364CCF449FC}
-		{E2326EEF-E677-6A44-0935-7677816F09E7} = {EF7103B4-4C75-1E6D-A485-A154A88D107A}
-		{C21E6CE7-177A-86D9-040F-A317F18B6DBF} = {E2326EEF-E677-6A44-0935-7677816F09E7}
-		{A4D04E18-760A-73F9-3303-0542F6298C84} = {C21E6CE7-177A-86D9-040F-A317F18B6DBF}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {BDCA748E-D888-4BAF-BF24-DAC683113BFC}
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.2.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0C88DD14-F956-CE84-757C-A364CCF449FC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resources", "resources", "{EF7103B4-4C75-1E6D-A485-A154A88D107A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repos", "repos", "{E2326EEF-E677-6A44-0935-7677816F09E7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "csharp", "csharp", "{C21E6CE7-177A-86D9-040F-A317F18B6DBF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject", "test\resources\repos\csharp\test_repo\TestProject.csproj", "{A4D04E18-760A-73F9-3303-0542F6298C84}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A4D04E18-760A-73F9-3303-0542F6298C84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4D04E18-760A-73F9-3303-0542F6298C84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4D04E18-760A-73F9-3303-0542F6298C84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4D04E18-760A-73F9-3303-0542F6298C84}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{EF7103B4-4C75-1E6D-A485-A154A88D107A} = {0C88DD14-F956-CE84-757C-A364CCF449FC}
+		{E2326EEF-E677-6A44-0935-7677816F09E7} = {EF7103B4-4C75-1E6D-A485-A154A88D107A}
+		{C21E6CE7-177A-86D9-040F-A317F18B6DBF} = {E2326EEF-E677-6A44-0935-7677816F09E7}
+		{A4D04E18-760A-73F9-3303-0542F6298C84} = {C21E6CE7-177A-86D9-040F-A317F18B6DBF}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {BDCA748E-D888-4BAF-BF24-DAC683113BFC}
+	EndGlobalSection
+EndGlobal

test/solidlsp/clojure/__init__.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from solidlsp.language_servers.clojure_lsp.clojure_lsp import verify_clojure_cli
+from solidlsp.language_servers.clojure_lsp import verify_clojure_cli
 
 
 def _test_clojure_cli() -> bool:

test/solidlsp/csharp/test_csharp_basic.py

@@ -6,7 +6,7 @@ from unittest.mock import Mock, patch
 import pytest
 
 from solidlsp import SolidLanguageServer
-from solidlsp.language_servers.csharp_language_server.csharp_language_server import (
+from solidlsp.language_servers.csharp_language_server import (
     CSharpLanguageServer,
     breadth_first_file_scan,
     find_solution_or_project_file,
@@ -57,7 +57,7 @@ class TestCSharpLanguageServer:
                 break
         assert add_symbol is not None, "Could not find 'Add' method symbol in Program.cs"
         sel_start = add_symbol["selectionRange"]["start"]
-        refs = language_server.request_references(file_path, sel_start["line"], sel_start["character"])
+        refs = language_server.request_references(file_path, sel_start["line"], sel_start["character"] + 1)
         assert any(
             "Program.cs" in ref.get("relativePath", "") for ref in refs
         ), "Program.cs should reference Add method (tried all positions in selectionRange)"
@@ -196,55 +196,52 @@ class TestCSharpSolutionProjectOpening:
             # Should still prefer .sln file even though it's deeper
             assert result == str(solution_file)
 
-    @patch("solidlsp.language_servers.csharp_language_server.csharp_language_server.CSharpLanguageServer._ensure_server_installed")
-    @patch("solidlsp.language_servers.csharp_language_server.csharp_language_server.CSharpLanguageServer._start_server")
+    @patch("solidlsp.language_servers.csharp_language_server.CSharpLanguageServer._ensure_server_installed")
+    @patch("solidlsp.language_servers.csharp_language_server.CSharpLanguageServer._start_server")
     def test_csharp_language_server_logs_solution_discovery(self, mock_start_server, mock_ensure_server_installed):
         """Test that CSharpLanguageServer logs solution/project discovery during initialization."""
-        with tempfile.TemporaryDirectory() as cache_dir:
-            # Mock the server installation
-            mock_ensure_server_installed.return_value = ("/usr/bin/dotnet", "/path/to/server.dll", Path(cache_dir))
+        mock_ensure_server_installed.return_value = ("/usr/bin/dotnet", "/path/to/server.dll")
 
-            # Create test directory with solution file
-            with tempfile.TemporaryDirectory() as temp_dir:
-                temp_path = Path(temp_dir)
-                solution_file = temp_path / "TestSolution.sln"
-                solution_file.touch()
+        # Create test directory with solution file
+        with tempfile.TemporaryDirectory() as temp_dir:
+            temp_path = Path(temp_dir)
+            solution_file = temp_path / "TestSolution.sln"
+            solution_file.touch()
 
-                # Mock logger to capture log messages
-                mock_logger = Mock()
-                mock_config = Mock(spec=LanguageServerConfig)
-                mock_config.ignored_paths = []
+            # Mock logger to capture log messages
+            mock_logger = Mock()
+            mock_config = Mock(spec=LanguageServerConfig)
+            mock_config.ignored_paths = []
 
-                # Create CSharpLanguageServer instance
-                CSharpLanguageServer(mock_config, mock_logger, str(temp_path))
+            # Create CSharpLanguageServer instance
+            CSharpLanguageServer(mock_config, mock_logger, str(temp_path))
 
-                # Verify that logger was called with solution file discovery
-                mock_logger.log.assert_any_call(f"Found solution/project file: {solution_file}", 20)  # logging.INFO
+            # Verify that logger was called with solution file discovery
+            mock_logger.log.assert_any_call(f"Found solution/project file: {solution_file}", 20)  # logging.INFO
 
-    @patch("solidlsp.language_servers.csharp_language_server.csharp_language_server.CSharpLanguageServer._ensure_server_installed")
-    @patch("solidlsp.language_servers.csharp_language_server.csharp_language_server.CSharpLanguageServer._start_server")
+    @patch("solidlsp.language_servers.csharp_language_server.CSharpLanguageServer._ensure_server_installed")
+    @patch("solidlsp.language_servers.csharp_language_server.CSharpLanguageServer._start_server")
     def test_csharp_language_server_logs_no_solution_warning(self, mock_start_server, mock_ensure_server_installed):
         """Test that CSharpLanguageServer logs warning when no solution/project files are found."""
-        with tempfile.TemporaryDirectory() as cache_dir:
-            # Mock the server installation
-            mock_ensure_server_installed.return_value = ("/usr/bin/dotnet", "/path/to/server.dll", Path(cache_dir))
+        # Mock the server installation
+        mock_ensure_server_installed.return_value = ("/usr/bin/dotnet", "/path/to/server.dll")
 
-            # Create empty test directory
-            with tempfile.TemporaryDirectory() as temp_dir:
-                temp_path = Path(temp_dir)
+        # Create empty test directory
+        with tempfile.TemporaryDirectory() as temp_dir:
+            temp_path = Path(temp_dir)
 
-                # Mock logger to capture log messages
-                mock_logger = Mock()
-                mock_config = Mock(spec=LanguageServerConfig)
-                mock_config.ignored_paths = []
+            # Mock logger to capture log messages
+            mock_logger = Mock()
+            mock_config = Mock(spec=LanguageServerConfig)
+            mock_config.ignored_paths = []
 
-                # Create CSharpLanguageServer instance
-                CSharpLanguageServer(mock_config, mock_logger, str(temp_path))
+            # Create CSharpLanguageServer instance
+            CSharpLanguageServer(mock_config, mock_logger, str(temp_path))
 
-                # Verify that logger was called with warning about no solution/project files
-                mock_logger.log.assert_any_call(
-                    "No .sln or .csproj file found, language server will attempt auto-discovery", 30  # logging.WARNING
-                )
+            # Verify that logger was called with warning about no solution/project files
+            mock_logger.log.assert_any_call(
+                "No .sln or .csproj file found, language server will attempt auto-discovery", 30  # logging.WARNING
+            )
 
     def test_solution_and_project_opening_with_real_test_repo(self):
         """Test solution and project opening with the actual C# test repository."""