From 75e28ceedb246c4916b55b428c50f620e475b3b6 Mon Sep 17 00:00:00 2001 From: daa84 Date: Thu, 9 Mar 2017 16:18:13 +0300 Subject: [PATCH 1/7] Small cleanup --- src/nvim.rs | 8 +++----- src/ui.rs | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/nvim.rs b/src/nvim.rs index 99a4feb..39d97e0 100644 --- a/src/nvim.rs +++ b/src/nvim.rs @@ -67,7 +67,6 @@ macro_rules! try_uint { pub fn initialize(ui: &mut Ui, nvim_bin_path: Option<&String>) -> Result<()> { let session = if let Some(path) = nvim_bin_path { - println!("{}", path); Session::new_child_path(path)? } else { Session::new_child()? @@ -193,14 +192,13 @@ fn safe_call(cb: F) } pub trait ErrorReport { - fn report_err(&self, nvim: &mut NeovimApi, ctx_msg: &str); + fn report_err(&self, nvim: &mut NeovimApi); } impl ErrorReport for result::Result { - fn report_err(&self, _: &mut NeovimApi, ctx_msg: &str) { + fn report_err(&self, _: &mut NeovimApi) { if let &Err(ref msg) = self { - let err_msg = format!("{} {}", ctx_msg, msg); - println!("{}", err_msg); + println!("{}", msg); //nvim.report_error(&err_msg).expect("Error report error :)"); } } diff --git a/src/ui.rs b/src/ui.rs index 8a0fb4d..9114d3f 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -204,7 +204,7 @@ fn edit_paste() { }; let mut nvim = ui.nvim(); - nvim.input(paste_command).report_err(nvim, "Error paste from clipboard"); + nvim.input(paste_command).report_err(nvim); }); } @@ -213,7 +213,7 @@ fn edit_save_all() { let mut ui = ui_cell.borrow_mut(); let mut nvim = ui.nvim(); - nvim.command(":wa").report_err(nvim, "Error save all files"); + nvim.command(":wa").report_err(nvim); }); } From 37cd154f894e4ac9bc097d4e26bfd19d48c2a9ec Mon Sep 17 00:00:00 2001 From: daa84 Date: Thu, 9 Mar 2017 16:51:34 +0300 Subject: [PATCH 2/7] fix scroll bug --- src/ui_model.rs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/ui_model.rs b/src/ui_model.rs index 15bbd50..1df1df2 100644 --- a/src/ui_model.rs +++ b/src/ui_model.rs @@ -75,7 +75,17 @@ pub struct UiModel { impl UiModel { pub fn empty() -> UiModel { - UiModel::new(0, 0) + UiModel { + columns: 0, + rows: 0, + cur_row: 0, + cur_col: 0, + model: vec![], + top: 0, + bot: 0, + left: 0, + right: 0, + } } pub fn new(rows: u64, columns: u64) -> UiModel { @@ -94,9 +104,9 @@ impl UiModel { cur_col: 0, model: model, top: 0, - bot: 0, + bot: (rows - 1) as usize, left: 0, - right: 0, + right: (columns - 1) as usize, } } From d8f58d15fbaffdb9ca1be68ffeded3ecda86d4f3 Mon Sep 17 00:00:00 2001 From: daa84 Date: Thu, 9 Mar 2017 17:36:03 +0300 Subject: [PATCH 3/7] Create .travis.yml --- .travis.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..4255e78 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,13 @@ +language: rust +env: + - GTK=3.22 +rust: + - stable + +addons: + apt: + packages: + - libgtk-3-dev +script: + - cargo test + - cargo build From 4153f3efce19ef9fde32b2035d0acce9c84a4b15 Mon Sep 17 00:00:00 2001 From: daa84 Date: Thu, 9 Mar 2017 17:37:44 +0300 Subject: [PATCH 4/7] Update .travis.yml From ce48604c512bba775cff588fce7e0bc90ea11d80 Mon Sep 17 00:00:00 2001 From: daa84 Date: Thu, 9 Mar 2017 17:47:11 +0300 Subject: [PATCH 5/7] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 4255e78..113de6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ addons: apt: packages: - libgtk-3-dev + - libgio-2-dev script: - cargo test - cargo build From 7126ae52353314c201a29abe0ee18d854cd3b3f6 Mon Sep 17 00:00:00 2001 From: daa84 Date: Thu, 9 Mar 2017 17:51:30 +0300 Subject: [PATCH 6/7] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 113de6c..0ef02b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ addons: apt: packages: - libgtk-3-dev - - libgio-2-dev + - libglib2.0-dev script: - cargo test - cargo build From 8a8b865c49aa9f889a1c208c326f3bbae87cd024 Mon Sep 17 00:00:00 2001 From: daa84 Date: Thu, 9 Mar 2017 17:53:45 +0300 Subject: [PATCH 7/7] Delete .travis.yml --- .travis.yml | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0ef02b7..0000000 --- a/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -language: rust -env: - - GTK=3.22 -rust: - - stable - -addons: - apt: - packages: - - libgtk-3-dev - - libglib2.0-dev -script: - - cargo test - - cargo build