From c0a8b814870335986b595af25a10330bfe077793 Mon Sep 17 00:00:00 2001 From: Blaž Hrastnik Date: Fri, 7 May 2021 14:52:47 +0900 Subject: Only send the document close event if we're closing the underlying buffer --- helix-view/src/editor.rs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'helix-view') diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs index 435b2b7e..43311484 100644 --- a/helix-view/src/editor.rs +++ b/helix-view/src/editor.rs @@ -162,26 +162,26 @@ impl Editor { Ok(id) } - pub fn close(&mut self, id: ViewId) { + pub fn close(&mut self, id: ViewId, close_buffer: bool) { let view = self.tree.get(self.tree.focus); - // get around borrowck issues - let language_servers = &mut self.language_servers; - - let doc = &self.documents[view.doc]; + // remove selection + self.documents[view.doc].selections.remove(&id); - let language_server = doc - .language - .as_ref() - .and_then(|language| language_servers.get(language)); + if close_buffer { + // get around borrowck issues + let language_servers = &mut self.language_servers; + let doc = &self.documents[view.doc]; - if let Some(language_server) = language_server { - tokio::spawn(language_server.text_document_did_close(doc.identifier())); + let language_server = doc + .language + .as_ref() + .and_then(|language| language_servers.get(language)); + if let Some(language_server) = language_server { + tokio::spawn(language_server.text_document_did_close(doc.identifier())); + } + self.documents.remove(view.doc); } - // remove selection - self.documents[view.doc].selections.remove(&id); - - // self.documents.remove(view.doc); self.tree.remove(id); self._refresh(); } -- cgit v1.2.3-70-g09d2