hasufell/neovim-gtk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update neovim-lib version

Browse Source
This commit is contained in:
daa84
2017-11-09 16:43:47 +03:00
parent 25cdf3ef8f
commit 74514258eb
4 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/handler.rs
View File

@@ -26,7 +26,7 @@ impl NvimHandler {
self.safe_call(move |ui| {
let mut repaint_mode = RepaintMode::Nothing;
for ev in &params {
for ev in params {
if let Some(ev_args) = ev.as_array() {
if let Some(ev_name) = ev_args[0].as_str() {
for local_args in ev_args.iter().skip(1) {
@@ -34,7 +34,8 @@ impl NvimHandler {
Value::Array(ref ar) => ar.clone(),
_ => vec![],
};
let call_reapint_mode = redraw_handler::call(ui, ev_name, &args)?;
let call_reapint_mode =
redraw_handler::call(ui, ev_name, &args)?;
repaint_mode = repaint_mode.join(call_reapint_mode);
}
} else {
@@ -73,11 +74,12 @@ impl NvimHandler {
fn safe_call<F>(&self, cb: F)
where
F: Fn(&mut shell::State) -> result::Result<(), String> + 'static + Send,
F: FnOnce(&mut shell::State) -> result::Result<(), String> + 'static + Send,
{
let mut cb = Some(cb);
let shell = self.shell.clone();
glib::idle_add(move || {
if let Err(msg) = cb(&mut shell.borrow_mut()) {
if let Err(msg) = cb.take().unwrap()(&mut shell.borrow_mut()) {
println!("Error call function: {}", msg);
}
glib::Continue(false)
@@ -86,8 +88,7 @@ impl NvimHandler {
}
impl Handler for NvimHandler {
fn handle_notify(&mut self, name: &str, args: &Vec<Value>) {
self.nvim_cb(name, args.clone());
fn handle_notify(&mut self, name: &str, args: Vec<Value>) {
self.nvim_cb(name, args);
}
}

2
src/nvim/mod.rs
View File

@@ -139,7 +139,7 @@ pub fn post_start_init(
let mut opts = UiAttachOptions::new();
opts.set_popupmenu_external(false);
opts.set_tabline_external(true);
nvim.ui_attach(cols, rows, opts).map_err(
nvim.ui_attach(cols, rows, &opts).map_err(
NvimInitError::new_post_init,
)?;
nvim.command("runtime! ginit.vim").map_err(