Merge pull request #681 from TheLeoP/fix_assert

fix: assert state -> if state:
ms-jpq · Feb 5, 2025 · 9e77f1f · 9e77f1f
2 parents 6237214 + d4495f1
commit 9e77f1f
Showing 1 changed file with 36 additions and 32 deletions.
diff --git a/coq/lsp/requests/request.py b/coq/lsp/requests/request.py
@@ -113,24 +113,28 @@ async def _lsp_notify(stack: Stack, rpayload: _Payload) -> None:
     async def cont() -> None:
         with _LOCK:
             state = _STATE.get(payload.name)
-        assert state
 
-        if payload.uid >= state.uid:
+        if not state or payload.uid >= state.uid:
             encoding = (payload.offset_encoding or "").casefold().replace("-", "")
             offset_encoding = _ENCODING_MAP.get(encoding, UTF16)
             client = _Client(
                 name=payload.client,
                 peers={name for name in payload.client_names if name},
                 offset_encoding=offset_encoding,
-                elapsed=timedelta(seconds=monotonic() - state.instance),
+                elapsed=timedelta(
+                    seconds=monotonic() - state.instance if state else monotonic()
+                ),
                 message=payload.reply,
             )
             acc = [
                 *(state.acc if state and payload.uid == state.uid else ()),
                 (client, payload.multipart),
             ]
             session = _Session(
-                uid=payload.uid, instance=state.instance, done=payload.done, acc=acc
+                uid=payload.uid,
+                instance=state.instance if state else monotonic(),
+                done=payload.done,
+                acc=acc,
             )
             with _LOCK:
                 _STATE[payload.name] = session
@@ -166,35 +170,35 @@ async def async_request(
         while True:
             with _LOCK:
                 state = _STATE.get(name)
-            assert state
-
-            if state.uid == uid:
-                while state.acc:
-                    client, multipart = state.acc.pop()
-                    if multipart:
-                        async for part in _lsp_pull(
-                            multipart, name=name, client=client.name, uid=uid
-                        ):
-                            if isinstance(
-                                client.message, MutableMapping
-                            ) and isinstance(client.message.get("items"), Sequence):
-                                message = {**client.message, "items": part}
-                                yield replace(client, message=message)
-                            else:
-                                yield replace(client, message=part)
-                    else:
-                        yield client
-                if state.done:
-                    with _LOCK:
-                        _STATE.pop(name, None)
+
+            if state:
+                if state.uid == uid:
+                    while state.acc:
+                        client, multipart = state.acc.pop()
+                        if multipart:
+                            async for part in _lsp_pull(
+                                multipart, name=name, client=client.name, uid=uid
+                            ):
+                                if isinstance(
+                                    client.message, MutableMapping
+                                ) and isinstance(client.message.get("items"), Sequence):
+                                    message = {**client.message, "items": part}
+                                    yield replace(client, message=message)
+                                else:
+                                    yield replace(client, message=part)
+                        else:
+                            yield client
+                    if state.done:
+                        with _LOCK:
+                            _STATE.pop(name, None)
+                        break
+                elif state.uid > uid:
+                    break
+                else:
+                    log.info(
+                        "%s", f"<><> DELAYED LSP RESP <><> :: {name} {state.uid} {uid}"
+                    )
                     break
-            elif state.uid > uid:
-                break
-            else:
-                log.info(
-                    "%s", f"<><> DELAYED LSP RESP <><> :: {name} {state.uid} {uid}"
-                )
-                break
 
             await activity.wait()