Support multiple open views.

helix-term/src/application.rs

@@ -354,7 +354,7 @@ impl Application {
     fn render(&mut self) {
         let viewport = Rect::new(OFFSET, 0, self.terminal.size.0, self.terminal.size.1 - 2); // - 2 for statusline and prompt
 
-        if let Some(view) = &mut self.editor.view {
+        if let Some(view) = self.editor.view_mut() {
             self.terminal.render_view(view, viewport);
             if let Some(prompt) = &self.prompt {
                 if prompt.should_close {
@@ -368,11 +368,8 @@ impl Application {
         self.terminal.draw();
 
         // TODO: drop unwrap
-        self.terminal.render_cursor(
+        self.terminal
-            self.editor.view.as_ref().unwrap(),
+            .render_cursor(self.editor.view().unwrap(), self.prompt.as_ref(), viewport);
-            self.prompt.as_ref(),
-            viewport,
-        );
     }
 
     pub async fn event_loop(&mut self) {
@@ -392,7 +389,7 @@ impl Application {
                     self.terminal.resize(width, height);
 
                     // TODO: simplistic ensure cursor in view for now
-                    if let Some(view) = &mut self.editor.view {
+                    if let Some(view) = self.editor.view_mut() {
                         view.size = self.terminal.size;
                         view.ensure_cursor_in_view()
                     };
@@ -408,7 +405,7 @@ impl Application {
                             .handle_input(event, &mut self.editor);
 
                         self.render();
-                    } else if let Some(view) = &mut self.editor.view {
+                    } else if let Some(view) = self.editor.view_mut() {
                         let keys = vec![event];
                         // TODO: sequences (`gg`)
                         // TODO: handle count other than 1

helix-view/src/editor.rs

@@ -5,20 +5,32 @@ use std::path::PathBuf;
 use anyhow::Error;
 
 pub struct Editor {
-    pub view: Option<View>,
+    pub views: Vec<View>,
+    pub focus: usize,
     pub should_close: bool,
 }
 
 impl Editor {
     pub fn new() -> Self {
         Self {
-            view: None,
+            views: Vec::new(),
+            focus: 0,
             should_close: false,
         }
     }
 
     pub fn open(&mut self, path: PathBuf, size: (u16, u16)) -> Result<(), Error> {
-        self.view = Some(View::open(path, size)?);
+        let pos = self.views.len();
+        self.views.push(View::open(path, size)?);
+        self.focus = pos;
         Ok(())
     }
+
+    pub fn view(&self) -> Option<&View> {
+        self.views.get(self.focus)
+    }
+
+    pub fn view_mut(&mut self) -> Option<&mut View> {
+        self.views.get_mut(self.focus)
+    }
 }