Move shell config to editor and use in command

helix-term/src/commands.rs

@@ -4087,17 +4087,10 @@ fn shell_filter(cx: &mut Context) {
 fn shell(cx: &mut Context, prompt: &str, pipe: bool, behavior: ShellBehavior) {
     use std::io::Write;
     use std::process::{Command, Stdio};
-    let shell = Option::<Vec<_>>::None; // this should come from config, but can't currently
-    let shell = match shell {
-        Some(v) if !v.is_empty() => v,
-        _ => {
-            if cfg!(windows) {
-                vec!["cmd".to_owned(), "/C".to_owned()]
-            } else {
-                vec!["sh".to_owned(), "-c".to_owned()]
-            }
-        }
-    };
+    let shell = cx.editor.config.shell.clone();
+    if shell.is_empty() {
+        return;
+    }
     let prompt = Prompt::new(
         prompt.to_owned(),
         Some('|'),

helix-term/src/config.rs

@@ -5,7 +5,6 @@ use crate::keymap::Keymaps;
 #[derive(Debug, Default, Clone, PartialEq, Deserialize)]
 pub struct Config {
     pub theme: Option<String>,
-    pub shell: Option<Vec<String>>,
     #[serde(default)]
     pub lsp: LspConfig,
     #[serde(default)]

helix-view/src/editor.rs

@@ -27,13 +27,20 @@ pub struct Config {
     pub scrolloff: usize,
     /// Mouse support. Defaults to true.
     pub mouse: bool,
+    /// Shell to use for shell commands. Defaults to ["cmd", "/C"] on Windows and ["sh", "-c"] otherwise.
+    pub shell: Vec<String>,
 }
 
 impl Default for Config {
     fn default() -> Self {
         Self {
             scrolloff: 5,
             mouse: true,
+            shell: if cfg!(windows) {
+                vec!["cmd".to_owned(), "/C".to_owned()]
+            } else {
+                vec!["sh".to_owned(), "-c".to_owned()]
+            },
         }
     }
 }