From 7b11e9ac6941188c6f6148961fdd97e34988490e Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne
Date: Tue, 23 Aug 2022 17:21:26 -0400
Subject: fix erroneous write sender close

This was not distinguishing the error types when trying a receive on an empty
receiver, which was erroneously causing the sender to be closed when trying to
flush the writes when there were none
---
 helix-view/src/document.rs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'helix-view/src/document.rs')

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index fe081442..86a1d6d2 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -13,6 +13,7 @@ use std::future::Future;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::sync::Arc;
+use tokio::sync::mpsc::error::TryRecvError;
 use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
 
 use tokio::sync::Mutex;
@@ -662,7 +663,16 @@ impl Document {
         let save_req = if block {
             rx.recv().await
         } else {
-            rx.try_recv().ok()
+            let msg = rx.try_recv();
+
+            if let Err(err) = msg {
+                match err {
+                    TryRecvError::Empty => return None,
+                    TryRecvError::Disconnected => None,
+                }
+            } else {
+                msg.ok()
+            }
         };
 
         let save = match save_req {
-- 
cgit v1.2.3-70-g09d2