Skip to content

feat: forward user-provided initializationOptions to pasls #1544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zen010101 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: forward user-provided initializationOptions to pasls #1544

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/solidlsp/language_servers/pascal_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,12 @@ def __init__(self, config: LanguageServerConfig, repository_root_path: str, soli
)
self.server_ready = threading.Event()

# Generic pass-through of LSP initializationOptions, mirroring how editor
# LSP clients (Sublime LSP, VSCode) let users forward arbitrary options to
# pasls -- e.g. fpcOptions for third-party unit/include search paths such
# as mORMot. Configured via ls_specific_settings["pascal"]["initializationOptions"].
self._init_options_override: dict = pascal_settings.get("initializationOptions", {}) or {}

# ============== Metadata Directory Management ==============

@classmethod
Expand Down Expand Up @@ -777,8 +783,7 @@ def _setup_runtime_dependencies(cls, solidlsp_settings: SolidLSPSettings) -> str
log.info(f"Using pasls at: {pasls_executable_path}")
return quote_windows_path(pasls_executable_path)

@staticmethod
def _get_initialize_params(repository_absolute_path: str) -> InitializeParams:
def _get_initialize_params(self, repository_absolute_path: str) -> InitializeParams:
"""
Returns the initialize params for the Pascal Language Server.

Expand Down Expand Up @@ -813,6 +818,13 @@ def _get_initialize_params(repository_absolute_path: str) -> InitializeParams:
}
)

# User-provided initializationOptions take precedence and may carry
# arbitrary pasls options (e.g. fpcOptions for extra unit/include search
# paths). This makes Serena forward initializationOptions like other LSP
# clients (Sublime LSP, VSCode) instead of only a hard-coded subset.
if self._init_options_override:
initialization_options.update(self._init_options_override)

initialize_params = {
"locale": "en",
"capabilities": {
Expand Down
Loading