parser: Fix mysteriously broken pyls_jsonrpc usage

Author: i80and

parser/snooty/language_server.py

@@ -2,9 +2,9 @@
 import os
 import sys
 import threading
-import jsonrpc.dispatchers
-import jsonrpc.endpoint
-import jsonrpc.streams
+import pyls_jsonrpc.dispatchers
+import pyls_jsonrpc.endpoint
+import pyls_jsonrpc.streams
 from dataclasses import dataclass
 from functools import wraps
 from pathlib import Path, PurePath
@@ -179,17 +179,17 @@ def create_lsp_diagnostics(self) -> object:
         } for diagnostic in self.diagnostics]
 
 
-class LanguageServer(jsonrpc.dispatchers.MethodDispatcher):
+class LanguageServer(pyls_jsonrpc.dispatchers.MethodDispatcher):
     def __init__(self, rx: BinaryIO, tx: BinaryIO) -> None:
         self.project: Optional[Project] = None
         self.root_uri = ''
         self.workspace: Dict[str, WorkspaceEntry] = {}
         self.path_to_uri: Dict[PurePath, Uri] = {}
         self.diagnostics: Dict[PurePath, List[types.Diagnostic]] = {}
 
-        self._jsonrpc_stream_reader = jsonrpc.streams.JsonRpcStreamReader(rx)
-        self._jsonrpc_stream_writer = jsonrpc.streams.JsonRpcStreamWriter(tx)
-        self._endpoint = jsonrpc.endpoint.Endpoint(self, self._jsonrpc_stream_writer.write)
+        self._jsonrpc_stream_reader = pyls_jsonrpc.streams.JsonRpcStreamReader(rx)
+        self._jsonrpc_stream_writer = pyls_jsonrpc.streams.JsonRpcStreamWriter(tx)
+        self._endpoint = pyls_jsonrpc.endpoint.Endpoint(self, self._jsonrpc_stream_writer.write)
         self._shutdown = False
 
     def start(self) -> None:
@@ -293,4 +293,5 @@ def m_exit(self, **_kwargs: object) -> None:
 def start() -> None:
     stdin, stdout = sys.stdin.buffer, sys.stdout.buffer
     server = LanguageServer(stdin, stdout)
+    logger.info('Started')
     server.start()

parser/snooty/main.py

@@ -8,7 +8,7 @@
 from pathlib import Path, PurePath
 from typing import List
 
-# from . import language_server
+from . import language_server
 from .parser import Project, RST_EXTENSIONS
 from .types import Page, Diagnostic
 
@@ -106,9 +106,9 @@ def usage(exit_code: int) -> None:
 def main() -> None:
     logging.basicConfig(level=logging.INFO)
 
-    # if len(sys.argv) == 2 and sys.argv[1] == 'language-server':
-    #     language_server.start()
-    #     return
+    if len(sys.argv) == 2 and sys.argv[1] == 'language-server':
+        language_server.start()
+        return
 
     if len(sys.argv) not in (3, 4) or sys.argv[1] not in ('watch', 'build'):
         usage(1)