From bff3bdb12073e4e97c861ff0383345bd4c0a3f5d Mon Sep 17 00:00:00 2001 From: daa Date: Sun, 5 Nov 2017 22:31:38 +0300 Subject: [PATCH] Remove .vim file when disabled --- src/nvim_config.rs | 3 ++- src/plug_manager/manager.rs | 2 +- src/plug_manager/ui.rs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/nvim_config.rs b/src/nvim_config.rs index 592eb3d..b4a1891 100644 --- a/src/nvim_config.rs +++ b/src/nvim_config.rs @@ -1,5 +1,5 @@ use std::path::PathBuf; -use std::fs::OpenOptions; +use std::fs::{remove_file, OpenOptions}; use std::io::Write; use dirs; @@ -27,6 +27,7 @@ impl NvimConfig { Ok(file) => Some(file), } } else { + NvimConfig::config_path().map(remove_file); None } } diff --git a/src/plug_manager/manager.rs b/src/plug_manager/manager.rs index 352fda8..ae499a8 100644 --- a/src/plug_manager/manager.rs +++ b/src/plug_manager/manager.rs @@ -27,7 +27,7 @@ impl Manager { } } - pub fn load_config(&self) -> Option { + pub fn generate_config(&self) -> Option { if self.store.is_enabled() { Some(PlugManagerConfigSource::new(&self.store)) } else { diff --git a/src/plug_manager/ui.rs b/src/plug_manager/ui.rs index ce35bd1..16402af 100644 --- a/src/plug_manager/ui.rs +++ b/src/plug_manager/ui.rs @@ -116,7 +116,7 @@ impl<'a> Ui<'a> { let mut manager = self.manager.borrow_mut(); manager.clear_removed(); manager.save(); - if let Some(config_path) = NvimConfig::new(manager.load_config()).generate_config() { + if let Some(config_path) = NvimConfig::new(manager.generate_config()).generate_config() { if let Some(path) = config_path.to_str() { manager.vim_plug.reload(path); }