refactor: remove initialization options

Author: observerw

src/lsp_client/client/abc.py

@@ -5,7 +5,7 @@
 from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager, suppress
 from pathlib import Path
-from typing import Any, Literal, Self, override
+from typing import Literal, Self, override
 
 import anyio
 import asyncer
@@ -60,6 +60,7 @@ class Client(
 
     sync_file: bool = True
     request_timeout: float = 5.0
+    initialization_options: dict = field(factory=dict)
 
     _server: Server = field(init=False)
     _workspace: Workspace = field(init=False)
@@ -118,16 +119,6 @@ def get_language_id(self) -> lsp_type.LanguageKind:
     def create_default_servers(self) -> DefaultServers:
         """Create default servers for this client."""
 
-    @abstractmethod
-    def create_initialization_options(self) -> dict[str, Any]:
-        """
-        Create initialization options for the `initialize` request.
-
-        Override this to provide server-specific initialization options.
-        """
-
-        return {}
-
     @abstractmethod
     def check_server_compatibility(self, info: lsp_type.ServerInfo | None) -> None:
         """Check if the available server capabilities are compatible with the client."""
@@ -297,7 +288,7 @@ async def __asynccontextmanager__(self) -> AsyncGenerator[Self]:
                     # set both `root_path` and `root_uri` for compatibility
                     root_path=root_path,
                     root_uri=root_uri,
-                    initialization_options=self.create_initialization_options(),
+                    initialization_options=self.initialization_options,
                     trace=lsp_type.TraceValue.Verbose,
                     workspace_folders=self._workspace.to_folders(),
                 )

src/lsp_client/clients/deno/client.py

@@ -4,10 +4,10 @@
 from functools import partial
 from pathlib import Path
 from subprocess import CalledProcessError
-from typing import Any, override
+from typing import override
 
 import anyio
-from attrs import Factory, define
+from attrs import define
 from loguru import logger
 
 from lsp_client.capability.notification import (
@@ -137,28 +137,6 @@ class DenoClient(
     - VSCode Extension: https://marketplace.visualstudio.com/items?itemName=denoland.vscode-deno
     """
 
-    enable: bool = True
-    unstable: bool = False
-    lint: bool = True
-
-    config: str | None = None
-    import_map: str | None = None
-
-    code_lens_implementations: bool = True
-    code_lens_references: bool = True
-    code_lens_references_all_functions: bool = True
-    code_lens_test: bool = True
-
-    suggest_complete_function_calls: bool = True
-    suggest_names: bool = True
-    suggest_paths: bool = True
-    suggest_auto_imports: bool = True
-    suggest_imports_auto_discover: bool = True
-    suggest_imports_hosts: list[str] = Factory(list)
-
-    testing_enable: bool = False
-    testing_args: list[str] = Factory(list)
-
     @classmethod
     def check_project_root(cls, path: Path) -> bool:
         return any((path / f).exists() for f in ("deno.json", "deno.jsonc"))
@@ -174,44 +152,6 @@ def create_default_servers(self) -> DefaultServers:
             container=DenoContainerServer(),
         )
 
-    @override
-    def create_initialization_options(self) -> dict[str, Any]:
-        options: dict[str, Any] = {
-            "enable": self.enable,
-            "unstable": self.unstable,
-            "lint": self.lint,
-            "codeLens": {
-                "implementations": self.code_lens_implementations,
-                "references": self.code_lens_references,
-                "referencesAllFunctions": self.code_lens_references_all_functions,
-                "test": self.code_lens_test,
-            },
-            "suggest": {
-                "completeFunctionCalls": self.suggest_complete_function_calls,
-                "names": self.suggest_names,
-                "paths": self.suggest_paths,
-                "autoImports": self.suggest_auto_imports,
-                "imports": {
-                    "autoDiscover": self.suggest_imports_auto_discover,
-                    "hosts": list(self.suggest_imports_hosts),
-                },
-            },
-        }
-
-        if self.config:
-            options["config"] = self.config
-
-        if self.import_map:
-            options["importMap"] = self.import_map
-
-        if self.testing_enable:
-            options["testing"] = {
-                "enable": self.testing_enable,
-                "args": list(self.testing_args),
-            }
-
-        return options
-
     @override
     def check_server_compatibility(self, info: lsp_type.ServerInfo | None) -> None:
         return

src/lsp_client/clients/gopls.py

@@ -3,15 +3,13 @@
 import shutil
 from functools import partial
 from subprocess import CalledProcessError
-from typing import Any, Literal, override
+from typing import override
 
 import anyio
-from attrs import define, field
+from attrs import define
 from loguru import logger
 
-from lsp_client.capability.notification import (
-    WithNotifyDidChangeConfiguration,
-)
+from lsp_client.capability.notification import WithNotifyDidChangeConfiguration
 from lsp_client.capability.request import (
     WithRequestCallHierarchy,
     WithRequestCompletion,
@@ -107,103 +105,13 @@ class GoplsClient(
     - VSCode Extension: https://marketplace.visualstudio.com/items?itemName=golang.go
     """
 
-    all_experiments: bool = False
-    analyses: dict[str, bool | str] = field(factory=dict)
-    allow_modfile_mods: bool = False
-    allow_multi_line_string_literals: bool = False
-    allow_implicit_variable_assignments: bool = False
-    build_directory: str | None = None
-    codelenses: dict[str, bool] = field(factory=dict)
-    complete_completions: bool = False
-    complete_unimported: bool = False
-    completion_budget: str | None = None
-    diagnostics_delay: str | None = None
-    documentation_options: dict[str, bool] = field(factory=dict)
-    experimental_postfix_completions: bool = True
-    experimental_prefixed_format: bool = True
-    experimental_template_support: bool = False
-    experimental_workspace_module: bool = False
-    gofumpt: bool = False
-    hover_kind: Literal[
-        "FullDocumentation", "NoDocumentation", "SingleLine", "Structured"
-    ] = "FullDocumentation"
-    link_in_hover: bool = True
-    link_target: str = "pkg.go.dev"
-    matcher: Literal["Fuzzy", "CaseInsensitive", "CaseSensitive"] = "Fuzzy"
-    semantic_tokens: bool = True
-    staticcheck: bool = False
-    use_placeholders: bool = False
-    verbose_output: bool = False
-
     @override
     def create_default_servers(self) -> DefaultServers:
         return DefaultServers(
             local=GoplsLocalServer(),
             container=GoplsContainerServer(),
         )
 
-    @override
-    def create_initialization_options(self) -> dict[str, Any]:
-        options: dict[str, Any] = {}
-
-        if self.all_experiments:
-            options["allExperiments"] = self.all_experiments
-
-        if self.analyses:
-            options["analyses"] = self.analyses
-
-        if self.allow_modfile_mods:
-            options["allowModfileMods"] = self.allow_modfile_mods
-
-        if self.allow_multi_line_string_literals:
-            options["allowMultiLineStringLiterals"] = (
-                self.allow_multi_line_string_literals
-            )
-
-        if self.allow_implicit_variable_assignments:
-            options["allowImplicitVariableAssignments"] = (
-                self.allow_implicit_variable_assignments
-            )
-
-        if self.build_directory:
-            options["buildDirectory"] = self.build_directory
-
-        if self.codelenses:
-            options["codelenses"] = self.codelenses
-
-        if self.complete_completions:
-            options["completeCompletions"] = self.complete_completions
-
-        if self.complete_unimported:
-            options["completeUnimported"] = self.complete_unimported
-
-        if self.completion_budget:
-            options["completionBudget"] = self.completion_budget
-
-        if self.diagnostics_delay:
-            options["diagnosticsDelay"] = self.diagnostics_delay
-
-        if self.documentation_options:
-            options["documentationOptions"] = self.documentation_options
-
-        options["experimentalPostfixCompletions"] = (
-            self.experimental_postfix_completions
-        )
-        options["experimentalPrefixedFormat"] = self.experimental_prefixed_format
-        options["experimentalTemplateSupport"] = self.experimental_template_support
-        options["experimentalWorkspaceModule"] = self.experimental_workspace_module
-        options["gofumpt"] = self.gofumpt
-        options["hoverKind"] = self.hover_kind
-        options["linkInHover"] = self.link_in_hover
-        options["linkTarget"] = self.link_target
-        options["matcher"] = self.matcher
-        options["semanticTokens"] = self.semantic_tokens
-        options["staticcheck"] = self.staticcheck
-        options["usePlaceholders"] = self.use_placeholders
-        options["verboseOutput"] = self.verbose_output
-
-        return options
-
     @override
     def check_server_compatibility(self, info: lsp_type.ServerInfo | None) -> None:
         return

src/lsp_client/clients/pyrefly.py

@@ -3,7 +3,7 @@
 import shutil
 from functools import partial
 from subprocess import CalledProcessError
-from typing import Any, Literal, override
+from typing import override
 
 import anyio
 from attrs import define
@@ -112,28 +112,13 @@ class PyreflyClient(
     - VSCode Extension: https://github.com/facebook/pyrefly/tree/main/lsp
     """
 
-    trace_server: Literal["off", "verbose"] = "off"
-    """LSP trace output verbosity"""
-
-    diagnostic_mode: Literal["Workspace", "OpenFilesOnly"] = "Workspace"
-    """How diagnostics are reported"""
-
     @override
     def create_default_servers(self) -> DefaultServers:
         return DefaultServers(
             local=PyreflyLocalServer(),
             container=PyreflyContainerServer(),
         )
 
-    @override
-    def create_initialization_options(self) -> dict[str, Any]:
-        options: dict[str, Any] = {}
-
-        options["trace"] = {"server": self.trace_server}
-        options["diagnostic_mode"] = self.diagnostic_mode
-
-        return options
-
     @override
     def check_server_compatibility(self, info: lsp_type.ServerInfo | None) -> None:
         return

src/lsp_client/clients/pyright.py

@@ -3,7 +3,7 @@
 import shutil
 from functools import partial
 from subprocess import CalledProcessError
-from typing import Any, Literal, override
+from typing import override
 
 import anyio
 from attrs import define
@@ -105,23 +105,13 @@ class PyrightClient(
     - VSCode Extension: https://github.com/microsoft/pyright/tree/main/packages/vscode-pyright
     """
 
-    diagnostic_mode: Literal["openFilesOnly", "workspace"] = "workspace"
-    disable_pull_diagnostics: bool = False
-
     @override
     def create_default_servers(self) -> DefaultServers:
         return DefaultServers(
             local=PyrightLocalServer(),
             container=PyrightContainerServer(),
         )
 
-    @override
-    def create_initialization_options(self) -> dict[str, Any]:
-        return {
-            "diagnosticMode": self.diagnostic_mode,
-            "disablePullDiagnostics": self.disable_pull_diagnostics,
-        }
-
     @override
     def check_server_compatibility(self, info: lsp_type.ServerInfo | None) -> None:
         return

src/lsp_client/clients/rust_analyzer.py

@@ -3,10 +3,10 @@
 import shutil
 from functools import partial
 from subprocess import CalledProcessError
-from typing import Any, Literal, override
+from typing import override
 
 import anyio
-from attrs import Factory, define
+from attrs import define
 from loguru import logger
 
 from lsp_client.capability.notification import (
@@ -110,46 +110,13 @@ class RustAnalyzerClient(
     - VSCode Extension: https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer
     """
 
-    proc_macro_enable: bool = True
-    cargo_build_scripts_enable: bool = True
-
-    check_command: Literal["check", "clippy"] = "check"
-    check_all_targets: bool = True
-    check_extra_args: list[str] = Factory(list)
-    check_extra_env: dict[str, str] = Factory(dict)
-
-    diagnostics_enable: bool = True
-
-    cargo_features: list[str] = Factory(list)
-    cargo_extra_args: list[str] = Factory(list)
-    cargo_extra_env: dict[str, str] = Factory(dict)
-
     @override
     def create_default_servers(self) -> DefaultServers:
         return DefaultServers(
             local=RustAnalyzerLocalServer(),
             container=RustAnalyzerContainerServer(),
         )
 
-    @override
-    def create_initialization_options(self) -> dict[str, Any]:
-        return {
-            "procMacro": {"enable": self.proc_macro_enable},
-            "cargo": {
-                "buildScripts": {"enable": self.cargo_build_scripts_enable},
-                "features": list(self.cargo_features),
-                "extraArgs": list(self.cargo_extra_args),
-                "extraEnv": dict(self.cargo_extra_env),
-            },
-            "check": {
-                "command": self.check_command,
-                "allTargets": self.check_all_targets,
-                "extraArgs": list(self.check_extra_args),
-                "extraEnv": dict(self.check_extra_env),
-            },
-            "diagnostics": {"enable": self.diagnostics_enable},
-        }
-
     @override
     def check_server_compatibility(self, info: lsp_type.ServerInfo | None) -> None:
         return