Merge pull request #5 from helix-editor/lsp

LSP: mk1

1 files changed, 28 insertions, 4 deletions

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index c292caed..9fb2ae36 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1,24 +1,48 @@
-use crate::View;
+use crate::theme::Theme;
+use crate::{Document, View};
 
 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,
+    pub theme: Theme, // TODO: share one instance
+}
+
+impl Default for Editor {
+    fn default() -> Self {
+        Self::new()
+    }
 }
 
 impl Editor {
     pub fn new() -> Self {
+        let theme = Theme::default();
+
         Self {
-            view: None,
+            views: Vec::new(),
+            focus: 0,
             should_close: false,
+            theme,
         }
     }
 
     pub fn open(&mut self, path: PathBuf, size: (u16, u16)) -> Result<(), Error> {
-        self.view = Some(View::open(path, size)?);
+        let pos = self.views.len();
+        let doc = Document::load(path, self.theme.scopes())?;
+        self.views.push(View::new(doc, 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)
+    }
 }