andrey/helix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update auto-pairs and idle-timeout when the config is reloaded (#2736)

Browse Source
This commit is contained in:
Bjorn Ove Hay Andersen 2022-06-15 19:29:58 +02:00 committed by GitHub
parent 11dadab371
commit 794576a5b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
helix-term/src/application.rs
View File

@ -287,6 +287,10 @@ pub fn handle_config_events(&mut self, config_event: ConfigEvent) {
self.config.store(Arc::new(app_config)); self.config.store(Arc::new(app_config));
} }
} }
// Update all the relevant members in the editor after updating
// the configuration.
self.editor.refresh_config();
} }
fn refresh_config(&mut self) { fn refresh_config(&mut self) {
@ -316,6 +320,7 @@ fn refresh_config(&mut self) {
}), }),
); );
} }
self.config.store(Arc::new(config)); self.config.store(Arc::new(config));
} }

8
helix-view/src/editor.rs
View File

@ -535,6 +535,14 @@ pub fn config(&self) -> DynGuard<Config> {
self.config.load() self.config.load()
} }
/// Call if the config has changed to let the editor update all
/// relevant members.
pub fn refresh_config(&mut self) {
let config = self.config();
self.auto_pairs = (&config.auto_pairs).into();
self.reset_idle_timer();
}
pub fn clear_idle_timer(&mut self) { pub fn clear_idle_timer(&mut self) {
// equivalent to internal Instant::far_future() (30 years) // equivalent to internal Instant::far_future() (30 years)
self.idle_timer self.idle_timer