Merge pull request #74 from christopher-l/feature/open-multiple-files

Open multiple files in one instance

src/main.rs

@@ -63,7 +63,6 @@ use gio::prelude::*;
 
 use ui::Ui;
 
-use misc::escape_filename;
 use shell::ShellOptions;
 
 const BIN_PATH_ARG: &str = "--nvim-bin-path";
@@ -104,23 +103,23 @@ fn main() {
 }
 
 fn open(app: &gtk::Application, files: &[gio::File], _: &str) {
-    for f in files {
+    let files_list: Vec<String> = files
-        let mut ui = Ui::new(ShellOptions::new(
+        .into_iter()
-            nvim_bin_path(std::env::args()),
+        .filter_map(|f| f.get_path()?.to_str().map(str::to_owned))
-            f.get_path().and_then(|p| {
+        .collect();
-                p.to_str().map(|path| escape_filename(path).to_string())
+    let mut ui = Ui::new(ShellOptions::new(
-            }),
+        nvim_bin_path(std::env::args()),
-            nvim_timeout(std::env::args()),
+        files_list,
-        ));
+        nvim_timeout(std::env::args()),
+    ));
 
-        ui.init(app, !nvim_disable_win_state(std::env::args()));
+    ui.init(app, !nvim_disable_win_state(std::env::args()));
-    }
 }
 
 fn activate(app: &gtk::Application) {
     let mut ui = Ui::new(ShellOptions::new(
         nvim_bin_path(std::env::args()),
-        None,
+        Vec::new(),
         nvim_timeout(std::env::args()),
     ));
 

src/nvim/mod.rs

@@ -20,8 +20,9 @@ use std::result;
 use std::sync::Arc;
 use std::time::Duration;
 
-use neovim_lib::{Neovim, NeovimApi, Session, UiAttachOptions};
+use neovim_lib::{Neovim, NeovimApi, NeovimApiAsync, Session, UiAttachOptions};
 
+use misc::escape_filename;
 use ui::UiMutex;
 use shell;
 use nvim_config::NvimConfig;
@@ -138,7 +139,7 @@ pub fn start(
 
 pub fn post_start_init(
     nvim: NeovimClientAsync,
-    open_path: Option<&String>,
+    open_paths: Vec<String>,
     cols: u64,
     rows: u64,
 ) -> result::Result<(), NvimInitError> {
@@ -154,11 +155,18 @@ pub fn post_start_init(
         .command("runtime! ginit.vim")
         .map_err(NvimInitError::new_post_init)?;
 
-    if let Some(path) = open_path {
+    if !open_paths.is_empty() {
+        let command = open_paths
+            .iter()
+            .fold(":ar".to_owned(), |command, filename| {
+                let filename = escape_filename(filename);
+                command + " " + &filename
+            });
         nvim.borrow()
             .unwrap()
-            .command(&format!("e {}", path))
+            .command_async(&command)
-            .map_err(NvimInitError::new_post_init)?;
+            .cb(|r| r.report_err())
+            .call();
     }
 
     Ok(())

src/shell.rs

@@ -382,19 +382,19 @@ impl UiState {
 #[derive(Clone)]
 pub struct ShellOptions {
     nvim_bin_path: Option<String>,
-    open_path: Option<String>,
+    open_paths: Vec<String>,
     timeout: Option<Duration>,
 }
 
 impl ShellOptions {
     pub fn new(
         nvim_bin_path: Option<String>,
-        open_path: Option<String>,
+        open_paths: Vec<String>,
         timeout: Option<Duration>,
     ) -> Self {
         ShellOptions {
             nvim_bin_path,
-            open_path,
+            open_paths,
             timeout,
         }
     }
@@ -580,12 +580,13 @@ impl Shell {
             .drawing_area
             .connect_drag_data_received(move |_, _, _, _, s, _, _| {
                 let uris = s.get_uris();
-                let command = uris.iter()
+                let command = uris.iter().filter_map(|uri| decode_uri(uri)).fold(
-                    .filter_map(|uri| decode_uri(uri))
+                    ":ar".to_owned(),
-                    .fold(":ar".to_owned(), |command, filename| {
+                    |command, filename| {
                         let filename = escape_filename(&filename);
                         command + " " + &filename
-                    });
+                    },
+                );
                 let state = ref_state.borrow_mut();
                 let mut nvim = state.nvim().unwrap();
                 nvim.command_async(&command).cb(|r| r.report_err()).call()
@@ -884,9 +885,7 @@ fn init_nvim_async(
     });
 
     // attach ui
-    if let Err(err) =
+    if let Err(err) = nvim::post_start_init(nvim, options.open_paths, cols as u64, rows as u64) {
-        nvim::post_start_init(nvim, options.open_path.as_ref(), cols as u64, rows as u64)
-    {
         show_nvim_init_error(&err, state_arc.clone());
     } else {
         set_nvim_initialized(state_arc);