Skip to content

Commit 71c8e0c

Browse files
authored
Merge pull request #1069 from krassowski/fix-websocket-and-spurious-notebook-json
Fix websocket handler and remove spurious config for old notebook server
2 parents b3562f9 + e8e5461 commit 71c8e0c

File tree

4 files changed

+17
-10
lines changed

4 files changed

+17
-10
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
## Changelog
22

3+
### `jupyter-lsp 2.2.4`
4+
5+
- bug fixes:
6+
- fix websocket handler incorrectly inheriting from `APIHandler` rather than `JupyterHandler` (#1069)
7+
- remove unused notebook config entry point (#1069)
8+
- support latest version of `typescript-language-server` (#1064)
9+
310
### `@jupyter-lsp/jupyterlab-lsp 5.1.0`
411

512
Requires JupyterLab `>=4.1.0,<5.0.0a0`
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
""" single source of truth for jupyter_lsp version
22
"""
33

4-
__version__ = "2.2.3"
4+
__version__ = "2.2.4"

python_packages/jupyter_lsp/jupyter_lsp/etc/jupyter-lsp-notebook.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

python_packages/jupyter_lsp/jupyter_lsp/handlers.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from typing import Optional, Text
55

66
from jupyter_core.utils import ensure_async
7-
from jupyter_server.base.handlers import APIHandler
7+
from jupyter_server.base.handlers import APIHandler, JupyterHandler
88
from jupyter_server.utils import url_path_join as ujoin
99
from tornado import web
1010
from tornado.websocket import WebSocketHandler
@@ -37,8 +37,15 @@ def initialize(self, manager: LanguageServerManager):
3737
self.manager = manager
3838

3939

40+
class BaseJupyterHandler(JupyterHandler):
41+
manager = None # type: LanguageServerManager
42+
43+
def initialize(self, manager: LanguageServerManager):
44+
self.manager = manager
45+
46+
4047
class LanguageServerWebSocketHandler( # type: ignore
41-
WebSocketMixin, WebSocketHandler, BaseHandler
48+
WebSocketMixin, WebSocketHandler, BaseJupyterHandler
4249
):
4350
"""Setup tornado websocket to route to language server sessions.
4451

0 commit comments

Comments
 (0)