mypy spaghetti

PurpleMyst · Apr 29, 2024 · 83f6236 · 83f6236
1 parent 349edc1
commit 83f6236
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/sansio_lsp_client/client.py b/sansio_lsp_client/client.py
@@ -47,6 +47,7 @@
     CompletionItem,
     Request,
     JSONDict,
+    JSONList,
     TextDocumentItem,
     TextDocumentIdentifier,
     VersionedTextDocumentIdentifier,
@@ -209,8 +210,8 @@ def _send_notification(
 
     def _send_response(
         self,
-        id: int,
-        result: t.Optional[JSONDict] = None,
+        id: int | str,
+        result: t.Optional[t.Union[JSONDict, JSONList]] = None,
         error: t.Optional[JSONDict] = None,
     ) -> None:
         self._send_buf += _make_response(id=id, result=result, error=error)

diff --git a/sansio_lsp_client/io_handler.py b/sansio_lsp_client/io_handler.py
@@ -4,7 +4,7 @@
 
 from pydantic import parse_obj_as
 
-from .structs import Request, Response, JSONDict
+from .structs import Request, Response, JSONDict, JSONList
 
 
 def _make_headers(content_length: int, encoding: str = "utf-8") -> bytes:
@@ -46,8 +46,8 @@ def _make_request(
 
 
 def _make_response(
-    id: int,
-    result: t.Optional[JSONDict] = None,
+    id: int | str,  # TODO: does this make sense?
+    result: t.Optional[t.Union[JSONDict, JSONList]] = None,
     error: t.Optional[JSONDict] = None,
     *,
     encoding: str = "utf-8",

diff --git a/sansio_lsp_client/structs.py b/sansio_lsp_client/structs.py
@@ -10,6 +10,7 @@
 #                     t.List['JSONValue'], t.Dict[str, 'JSONValue']]
 # JSONDict = t.Dict[str, JSONValue]
 JSONDict = t.Dict[str, t.Any]
+JSONList = t.List[t.Any]
 
 Id = t.Union[int, str]