nixd: remove NixTU after 'didClose'

nix-community · Apr 19, 2024 · f97cd39 · f97cd39
1 parent 2e51fe0
commit f97cd39
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/nixd/include/nixd/Controller/Controller.h b/nixd/include/nixd/Controller/Controller.h
@@ -140,7 +140,7 @@ class Controller : public lspserver::LSPServer {
   void actOnDocumentAdd(lspserver::PathRef File,
                         std::optional<int64_t> Version);
 
-  void removeDocument(lspserver::PathRef File) { Store.removeDraft(File); }
+  void removeDocument(lspserver::PathRef File);
 
   void onInitialize(const lspserver::InitializeParams &Params,
                     lspserver::Callback<llvm::json::Value> Reply);

diff --git a/nixd/lib/Controller/Support.cpp b/nixd/lib/Controller/Support.cpp
@@ -27,7 +27,13 @@ std::string getShmName(std::string_view File) {
 
 } // namespace
 
-namespace nixd {
+void Controller::removeDocument(lspserver::PathRef File) {
+  Store.removeDraft(File);
+  {
+    std::lock_guard _(TUsLock);
+    TUs.erase(File);
+  }
+}
 
 void Controller::actOnDocumentAdd(PathRef File,
                                   std::optional<int64_t> Version) {
@@ -167,5 +173,3 @@ Controller::Controller(std::unique_ptr<lspserver::InboundPort> In,
   EndWorkDoneProgress =
       mkOutNotifiction<ProgressParams<WorkDoneProgressEnd>>("$/progress");
 }
-
-} // namespace nixd