From 9c9493a7acc2428614f51c5c34a7168f8781902f Mon Sep 17 00:00:00 2001
From: Janos Wortmann <jwortmann@outlook.com>
Date: Mon, 25 Mar 2024 22:29:28 +0100
Subject: [PATCH] Ensure didChange is never sent after didClose

This fixes for example the Pyright warning
LSP-pyright: Received change text document command for closed file <URI>
when a file is saved and closed immediately after changes were applied.
---
 plugin/session_buffer.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/plugin/session_buffer.py b/plugin/session_buffer.py
index 71febb56b..56bc403a9 100644
--- a/plugin/session_buffer.py
+++ b/plugin/session_buffer.py
@@ -166,8 +166,9 @@ def _check_did_open(self, view: sublime.View) -> None:
                 self._do_document_link_async(view, version)
             self.session.notify_plugin_on_session_buffer_change(self)
 
-    def _check_did_close(self) -> None:
+    def _check_did_close(self, view: sublime.View) -> None:
         if self.opened and self.should_notify_did_close():
+            self.purge_changes_async(view)
             self.session.send_notification(did_close(uri=self._last_known_uri))
             self.opened = False
 
@@ -202,9 +203,9 @@ def remove_session_view(self, sv: SessionViewProtocol) -> None:
         self._clear_semantic_token_regions(sv.view)
         self.session_views.remove(sv)
         if len(self.session_views) == 0:
-            self._on_before_destroy()
+            self._on_before_destroy(sv.view)
 
-    def _on_before_destroy(self) -> None:
+    def _on_before_destroy(self, view: sublime.View) -> None:
         self.remove_all_inlay_hints()
         if self.has_capability("diagnosticProvider") and self.session.config.diagnostics_mode == "open_files":
             self.session.m_textDocument_publishDiagnostics({'uri': self._last_known_uri, 'diagnostics': []})
@@ -216,7 +217,7 @@ def _on_before_destroy(self) -> None:
         # in unregistering ourselves from the session.
         if not self.session.exiting:
             # Only send textDocument/didClose when we are the only view left (i.e. there are no other clones).
-            self._check_did_close()
+            self._check_did_close(view)
             self.session.unregister_session_buffer_async(self)
 
     def register_capability_async(
@@ -308,7 +309,7 @@ def on_revert_async(self, view: sublime.View) -> None:
 
     on_reload_async = on_revert_async
 
-    def purge_changes_async(self, view: sublime.View) -> None:
+    def purge_changes_async(self, view: sublime.View, suppress_requests: bool = False) -> None:
         if self._pending_changes is None:
             return
         sync_kind = self.text_sync_kind()
@@ -316,7 +317,7 @@ def purge_changes_async(self, view: sublime.View) -> None:
             return
         if sync_kind == TextDocumentSyncKind.Full:
             changes = None
-            version = view.change_count()
+            version = view.change_count() if view.is_valid() else self._pending_changes.version
         else:
             changes = self._pending_changes.changes
             version = self._pending_changes.version
@@ -329,12 +330,14 @@ def purge_changes_async(self, view: sublime.View) -> None:
         finally:
             self._pending_changes = None
         self.session.notify_plugin_on_session_buffer_change(self)
-        sublime.set_timeout_async(lambda: self._on_after_change_async(view, version))
+        sublime.set_timeout_async(lambda: self._on_after_change_async(view, version, suppress_requests))
 
-    def _on_after_change_async(self, view: sublime.View, version: int) -> None:
+    def _on_after_change_async(self, view: sublime.View, version: int, suppress_requests: bool = False) -> None:
         if self._is_saving:
             self._has_changed_during_save = True
             return
+        if suppress_requests or not view.is_valid():
+            return
         self._do_color_boxes_async(view, version)
         self.do_document_diagnostic_async(view, version)
         if self.session.config.diagnostics_mode == "workspace" and \
@@ -357,7 +360,7 @@ def on_pre_save_async(self, view: sublime.View) -> None:
     def on_post_save_async(self, view: sublime.View, new_uri: DocumentUri) -> None:
         self._is_saving = False
         if new_uri != self._last_known_uri:
-            self._check_did_close()
+            self._check_did_close(view)
             self._last_known_uri = new_uri
             self._check_did_open(view)
         else: