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

Code refactor

Browse Source
This commit is contained in:
daa84 2017-07-13 18:12:20 +03:00
parent ba20088bc6
commit 4d3e9689be
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/shell.rs
View File

@ -554,14 +554,7 @@ fn gtk_draw(state_arc: &Arc<UiMutex<State>>, ctx: &cairo::Context) -> Inhibit {
Inhibit(false) Inhibit(false)
} }
fn init_nvim_async(state_arc: Arc<UiMutex<State>>, fn show_nvim_start_error(err: nvim::NvimInitError, state_arc: Arc<UiMutex<State>>) {
options: ShellOptions,
cols: usize,
rows: usize) {
// execute nvim
let mut nvim = match nvim::start(state_arc.clone(), options.nvim_bin_path.as_ref()) {
Ok(nvim) => nvim,
Err(err) => {
let source = err.source(); let source = err.source();
let cmd = err.cmd().unwrap().to_owned(); let cmd = err.cmd().unwrap().to_owned();
@ -573,6 +566,30 @@ fn init_nvim_async(state_arc: Arc<UiMutex<State>>,
Continue(false) Continue(false)
}); });
}
fn show_nvim_init_error(err: nvim::NvimInitError, state_arc: Arc<UiMutex<State>>) {
let source = err.source();
glib::idle_add(move || {
let state = state_arc.borrow();
state.nvim.borrow_mut().set_error();
state.error_area.show_nvim_init_error(&source);
state.show_error_area();
Continue(false)
});
}
fn init_nvim_async(state_arc: Arc<UiMutex<State>>,
options: ShellOptions,
cols: usize,
rows: usize) {
// execute nvim
let mut nvim = match nvim::start(state_arc.clone(), options.nvim_bin_path.as_ref()) {
Ok(nvim) => nvim,
Err(err) => {
show_nvim_start_error(err, state_arc);
return; return;
} }
}; };
@ -594,17 +611,7 @@ fn init_nvim_async(state_arc: Arc<UiMutex<State>>,
options.open_path.as_ref(), options.open_path.as_ref(),
cols as u64, cols as u64,
rows as u64) { rows as u64) {
let source = err.source(); show_nvim_init_error(err, state_arc.clone());
let state_ref = state_arc.clone();
glib::idle_add(move || {
let state = state_ref.borrow();
state.nvim.borrow_mut().set_error();
state.error_area.show_nvim_init_error(&source);
state.show_error_area();
Continue(false)
});
} else { } else {
let state = state_arc.borrow_mut(); let state = state_arc.borrow_mut();
state.nvim.borrow_mut().set_initialized(nvim); state.nvim.borrow_mut().set_initialized(nvim);