Skip to content

Fix for missing notebook selector hook #260

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

Merged
karthiknadig merged 1 commit into from
Aug 4, 2023
Merged

Fix for missing notebook selector hook #260

Show file tree
Hide file tree
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
22 changes: 22 additions & 0 deletions packages/python/lsprotocol/_hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,21 @@ def _watch_kind_hook(
return object_
return converter.structure(object_, lsp_types.WatchKind)

def _notebook_sync_option_selector_hook(
object_: Any, _: type
) -> Union[
lsp_types.NotebookDocumentSyncOptionsNotebookSelectorType1,
lsp_types.NotebookDocumentSyncOptionsNotebookSelectorType2,
]:
if "notebook" in object_:
return converter.structure(
object_, lsp_types.NotebookDocumentSyncOptionsNotebookSelectorType1
)
else:
return converter.structure(
object_, lsp_types.NotebookDocumentSyncOptionsNotebookSelectorType2
)

structure_hooks = [
(
Optional[
Expand Down Expand Up @@ -904,6 +919,13 @@ def _watch_kind_hook(
Optional[Union[lsp_types.WatchKind, int]],
_watch_kind_hook,
),
(
Union[
lsp_types.NotebookDocumentSyncOptionsNotebookSelectorType1,
lsp_types.NotebookDocumentSyncOptionsNotebookSelectorType2,
],
_notebook_sync_option_selector_hook,
),
]
for type_, hook in structure_hooks:
converter.register_structure_hook(type_, hook)
Expand Down
12 changes: 12 additions & 0 deletions tests/python/test_cattrs_special_cases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,3 +262,15 @@ def test_notebook_change_event():
converter.unstructure(obj, lsp.DidOpenNotebookDocumentParams),
hamcrest.is_(data),
)


def test_notebook_sync_options():
data = {"notebookSelector": [{"cells": [{"language": "python"}]}]}

converter = cv.get_converter()
obj = converter.structure(data, lsp.NotebookDocumentSyncOptions)
hamcrest.assert_that(obj, hamcrest.instance_of(lsp.NotebookDocumentSyncOptions))
hamcrest.assert_that(
converter.unstructure(obj, lsp.NotebookDocumentSyncOptions),
hamcrest.is_(data),
)