From f2c79e245bdcc70be3c51fdca35917a929615152 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Fri, 7 May 2021 14:36:06 +0900
Subject: Allow switching views back to scratch buffers.

---
 helix-term/src/commands.rs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'helix-term')

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index eab9397c..5c1021e1 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -930,17 +930,14 @@ pub fn buffer_picker(cx: &mut Context) {
                         path.into()
                     }
                 }
-                None => "[NEW]".into(),
+                None => "[scratch buffer]".into(),
             }
         },
-        |editor: &mut Editor, (_, path): &(DocumentId, Option<PathBuf>), _action| match path {
-            Some(path) => {
-                use helix_view::editor::Action;
-                editor
-                    .open(path.into(), Action::Replace)
-                    .expect("editor.open failed");
-            }
-            None => (),
+        |editor: &mut Editor, (id, _path): &(DocumentId, Option<PathBuf>), _action| {
+            use helix_view::editor::Action;
+            editor
+                .switch(*id, Action::Replace)
+                .expect("editor.open failed");
         },
     );
     cx.push_layer(Box::new(picker));
-- 
cgit v1.2.3-70-g09d2