Skip to content
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

Fix plugin overwrite on_workspace_configuration #2132

Merged
merged 1 commit into from
Dec 9, 2022
Merged

Fix plugin overwrite on_workspace_configuration #2132

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
13 changes: 8 additions & 5 deletions plugin/core/sessions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,14 +866,16 @@ def on_settings_changed(self, settings: DottedDict) -> None:
"""
pass

def on_workspace_configuration(self, params: Dict, configuration: Any) -> None:
def on_workspace_configuration(self, params: Dict, configuration: Any) -> Any:
"""
Override to augment configuration returned for the workspace/configuration request.

:param params: A ConfigurationItem for which configuration is requested.
:param configuration: The resolved configuration for given params.
:param configuration: The pre-resolved configuration for given params using the settings object or None.

:returns The resolved configuration for given params.
"""
pass
return configuration

def on_pre_server_command(self, command: Mapping[str, Any], done_callback: Callable[[], None]) -> bool:
"""
Expand Down Expand Up @@ -1644,8 +1646,9 @@ def m_workspace_configuration(self, params: Dict[str, Any], request_id: Any) ->
for requested_item in requested_items:
configuration = self.config.settings.copy(requested_item.get('section') or None)
if self._plugin:
self._plugin.on_workspace_configuration(requested_item, configuration)
items.append(configuration)
items.append(self._plugin.on_workspace_configuration(requested_item, configuration))
else:
items.append(configuration)
self.send_response(Response(request_id, sublime.expand_variables(items, self._template_variables())))

def m_workspace_applyEdit(self, params: Any, request_id: Any) -> None:
Expand Down