0dbee95 · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

Fix language config reload logic (#5381)

0dbee95Ethan Kiang4 years ago

helix-term/src/application.rs+8−2

compare with master

unifiedsplit

@@ -403,6 +403,7 @@ impl Application {

403 .map_err(|err| anyhow::anyhow!("Failed to load language config: {}", err))?;

404

405 self.syn_loader = std::sync::Arc::new(syntax::Loader::new(syntax_config));

406+ self.editor.syn_loader = self.syn_loader.clone();

406 for document in self.editor.documents.values_mut() {

407 for document in self.editor.documents.values_mut() {

407 document.detect_language(self.syn_loader.clone());

408 document.detect_language(self.syn_loader.clone());

408 }

409 }

@@ -438,8 +439,13 @@ impl Application {

438 Ok(())

439 Ok(())

439 };

440 };

440

441

441− if let Err(err) = refresh_config() {

442+ match refresh_config() {

443+ Ok(_) => {

444+ self.editor.set_status("Config refreshed");

445+ }

446+ Err(err) => {

442− self.editor.set_error(err.to_string());

447+ self.editor.set_error(err.to_string());

448+ }

443 }

449 }

444 }

450 }

445

451

helix-term/src/commands/typed.rs+1−1

@@ -1797,7 +1797,7 @@ fn run_shell_command(

1797 let shell = &cx.editor.config().shell;

1798 let (output, success) = shell_impl(shell, &args.join(" "), None)?;

1799 if success {

1800− cx.editor.set_status("Command succeed");

1800+ cx.editor.set_status("Command succeeded");

1801 } else {

1802 cx.editor.set_error("Command failed");

1803 }