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

Fix language config reload logic (#5381)

Browse Source
This commit is contained in:
Ethan Kiang 2023-01-03 21:24:48 +08:00 committed by GitHub
parent a895a4e53a
commit 0dbee9590b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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());
}
}
}

2
helix-term/src/commands/typed.rs
View File

@ -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");
}