From 65167126138406a20c7236e73f3bd33ef67d3272 Mon Sep 17 00:00:00 2001 From: krassowski <5832902+krassowski@users.noreply.github.com> Date: Tue, 5 Mar 2024 10:50:01 +0000 Subject: [PATCH 1/3] Fix websocket inheriting from wrong class --- python_packages/jupyter_lsp/jupyter_lsp/handlers.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/python_packages/jupyter_lsp/jupyter_lsp/handlers.py b/python_packages/jupyter_lsp/jupyter_lsp/handlers.py index d047f4a4b..bebcc9904 100644 --- a/python_packages/jupyter_lsp/jupyter_lsp/handlers.py +++ b/python_packages/jupyter_lsp/jupyter_lsp/handlers.py @@ -4,7 +4,7 @@ from typing import Optional, Text from jupyter_core.utils import ensure_async -from jupyter_server.base.handlers import APIHandler +from jupyter_server.base.handlers import APIHandler, JupyterHandler from jupyter_server.utils import url_path_join as ujoin from tornado import web from tornado.websocket import WebSocketHandler @@ -37,8 +37,15 @@ def initialize(self, manager: LanguageServerManager): self.manager = manager +class BaseJupyterHandler(JupyterHandler): + manager = None # type: LanguageServerManager + + def initialize(self, manager: LanguageServerManager): + self.manager = manager + + class LanguageServerWebSocketHandler( # type: ignore - WebSocketMixin, WebSocketHandler, BaseHandler + WebSocketMixin, WebSocketHandler, BaseJupyterHandler ): """Setup tornado websocket to route to language server sessions. From a9eb7e5d6555ff078e98d5db0aaf9f865eae87d1 Mon Sep 17 00:00:00 2001 From: krassowski <5832902+krassowski@users.noreply.github.com> Date: Tue, 5 Mar 2024 10:50:40 +0000 Subject: [PATCH 2/3] Remove no longer used notebook entrypoint file --- .../jupyter_lsp/jupyter_lsp/etc/jupyter-lsp-notebook.json | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 python_packages/jupyter_lsp/jupyter_lsp/etc/jupyter-lsp-notebook.json diff --git a/python_packages/jupyter_lsp/jupyter_lsp/etc/jupyter-lsp-notebook.json b/python_packages/jupyter_lsp/jupyter_lsp/etc/jupyter-lsp-notebook.json deleted file mode 100644 index dc490b685..000000000 --- a/python_packages/jupyter_lsp/jupyter_lsp/etc/jupyter-lsp-notebook.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "NotebookApp": { - "nbserver_extensions": { - "jupyter_lsp": true - } - } -} From e8e5461951cbfbd854d21009260c276c83204507 Mon Sep 17 00:00:00 2001 From: krassowski <5832902+krassowski@users.noreply.github.com> Date: Tue, 5 Mar 2024 10:55:23 +0000 Subject: [PATCH 3/3] Bump version and changelog --- CHANGELOG.md | 7 +++++++ python_packages/jupyter_lsp/jupyter_lsp/_version.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb1fefbdb..3997b13d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ ## Changelog +### `jupyter-lsp 2.2.4` + +- bug fixes: + - fix websocket handler incorrectly inheriting from `APIHandler` rather than `JupyterHandler` (#1069) + - remove unused notebook config entry point (#1069) + - support latest version of `typescript-language-server` (#1064) + ### `@jupyter-lsp/jupyterlab-lsp 5.1.0` Requires JupyterLab `>=4.1.0,<5.0.0a0` diff --git a/python_packages/jupyter_lsp/jupyter_lsp/_version.py b/python_packages/jupyter_lsp/jupyter_lsp/_version.py index e5d2533fe..7bc154912 100644 --- a/python_packages/jupyter_lsp/jupyter_lsp/_version.py +++ b/python_packages/jupyter_lsp/jupyter_lsp/_version.py @@ -1,4 +1,4 @@ """ single source of truth for jupyter_lsp version """ -__version__ = "2.2.3" +__version__ = "2.2.4"