mirror of
https://github.com/helix-editor/helix.git
synced 2024-09-11 18:58:00 +03:00
Fix language config reload logic (#5381)
This commit is contained in:
parent
a895a4e53a
commit
0dbee9590b
@ -403,6 +403,7 @@ fn refresh_language_config(&mut self) -> Result<(), Error> {
|
||||
.map_err(|err| anyhow::anyhow!("Failed to load language config: {}", err))?;
|
||||
|
||||
self.syn_loader = std::sync::Arc::new(syntax::Loader::new(syntax_config));
|
||||
self.editor.syn_loader = self.syn_loader.clone();
|
||||
for document in self.editor.documents.values_mut() {
|
||||
document.detect_language(self.syn_loader.clone());
|
||||
}
|
||||
@ -438,8 +439,13 @@ fn refresh_config(&mut self) {
|
||||
Ok(())
|
||||
};
|
||||
|
||||
if let Err(err) = refresh_config() {
|
||||
self.editor.set_error(err.to_string());
|
||||
match refresh_config() {
|
||||
Ok(_) => {
|
||||
self.editor.set_status("Config refreshed");
|
||||
}
|
||||
Err(err) => {
|
||||
self.editor.set_error(err.to_string());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1797,7 +1797,7 @@ fn run_shell_command(
|
||||
let shell = &cx.editor.config().shell;
|
||||
let (output, success) = shell_impl(shell, &args.join(" "), None)?;
|
||||
if success {
|
||||
cx.editor.set_status("Command succeed");
|
||||
cx.editor.set_status("Command succeeded");
|
||||
} else {
|
||||
cx.editor.set_error("Command failed");
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user