Fix language config reload logic (helix-editor#5381)

seewishnew · Jan 6, 2023 · 567e03a · 567e03a
1 parent 4821764
commit 567e03a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
@@ -403,6 +403,7 @@ impl Application {
             .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 @@ impl Application {
             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());
+            }
         }
     }
 

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
@@ -2176,7 +2176,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");
     }