diff options
Diffstat (limited to 'helix-view/src/editor.rs')
| -rw-r--r-- | helix-view/src/editor.rs | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs index f21244a9..89759439 100644 --- a/helix-view/src/editor.rs +++ b/helix-view/src/editor.rs @@ -1,6 +1,6 @@ use crate::{ clipboard::{get_clipboard_provider, ClipboardProvider}, - document::{Mode, SCRATCH_BUFFER_NAME}, + document::Mode, graphics::{CursorKind, Rect}, info::Info, input::KeyEvent, @@ -28,7 +28,7 @@ use tokio::{ time::{sleep, Duration, Instant, Sleep}, }; -use anyhow::{bail, Error}; +use anyhow::Error; pub use helix_core::diagnostic::Severity; pub use helix_core::register::Registers; @@ -711,6 +711,14 @@ pub enum Action { VerticalSplit, } +/// Error thrown on failed document closed +pub enum CloseError { + /// Document doesn't exist + DoesNotExist, + /// Buffer is modified + BufferModified(String), +} + impl Editor { pub fn new( mut area: Rect, @@ -1070,19 +1078,14 @@ impl Editor { self._refresh(); } - pub fn close_document(&mut self, doc_id: DocumentId, force: bool) -> anyhow::Result<()> { + pub fn close_document(&mut self, doc_id: DocumentId, force: bool) -> Result<(), CloseError> { let doc = match self.documents.get(&doc_id) { Some(doc) => doc, - None => bail!("document does not exist"), + None => return Err(CloseError::DoesNotExist), }; if !force && doc.is_modified() { - bail!( - "buffer {:?} is modified", - doc.relative_path() - .map(|path| path.to_string_lossy().to_string()) - .unwrap_or_else(|| SCRATCH_BUFFER_NAME.into()) - ); + return Err(CloseError::BufferModified(doc.display_name().into_owned())); } if let Some(language_server) = doc.language_server() { |