From eadad13efabb6a838a366b27002e09e1d2580750 Mon Sep 17 00:00:00 2001
From: Jan Hrastnik
Date: Tue, 16 Mar 2021 13:55:12 +0100
Subject: preparing for gd merge

---
 helix-view/src/editor.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'helix-view')

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 38182126..99c0398f 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -34,6 +34,14 @@ impl Editor {
 
     pub fn open(&mut self, path: PathBuf, executor: &smol::Executor) -> Result<(), Error> {
         // TODO: try to find an open view/buffer first
+        let existing_view_option = self
+            .tree
+            .views()
+            .find(|v| path.to_str().unwrap() == v.0.doc.path().unwrap().to_str().unwrap());
+        if let Some(existing_view) = existing_view_option {
+            self.tree.focus = existing_view.0.id;
+            return Ok(());
+        }
 
         let mut doc = Document::load(path, self.theme.scopes())?;
 
@@ -62,15 +70,7 @@ impl Editor {
         }
 
         let view = View::new(doc)?;
-        let existing_view_option = self
-            .tree
-            .views()
-            .find(|v| view.doc.path().unwrap().to_str() == v.0.doc.path().unwrap().to_str());
-        if let Some(existing_view) = existing_view_option {
-            self.tree.focus = existing_view.0.id;
-        } else {
-            self.tree.insert(view);
-        }
+        self.tree.insert(view);
         Ok(())
     }
 
-- 
cgit v1.2.3-70-g09d2