Merge pull request #1007 from Wind010/BetterWindowsSupport

Better Windows support

Author: alexis-opolka

docs/examples/configuration/config-example.yaml

@@ -32,7 +32,10 @@ finder:
 
 shell:
   # Shell used for shell out. Possible values: bash, zsh, dash, ...
-  # For Windows, use `cmd.exe` instead.
+  # For Windows, use `pwsh.exe`, `powershell.exe` or `cmd.exe` instead.  
+  # Default behavior is to check if pwsh.exe exists and use it, otherwise fallback to powershell.exe and then cmd.exe.
   command: bash
-
+  show_command: true # whether to print the command before executing it
+  command_print_color: green # color for the printed command. possible values: https://bit.ly/3gloNNI
+  
   # finder_command: bash # similar, but for fzf's internals

src/commands/core/actor.rs

@@ -253,7 +253,7 @@ pub fn act(
                 cmd.spawn()
                     .map_err(|e| ShellSpawnError::new(&interpolated_snippet[..], e))?
                     .wait()
-                    .context("bash was not running")?;
+                    .context("Shell was not running")?;
             }
         },
     };

src/common/clipboard.rs

@@ -2,38 +2,42 @@ use crate::common::shell::{self, ShellSpawnError, EOF};
 use crate::prelude::*;
 
 pub fn copy(text: String) -> Result<()> {
-    let cmd = r#"
-exst() {
-   type "$1" &>/dev/null
-}
-
-_copy() {
-   if exst pbcopy; then
-      pbcopy
-   elif exst xclip; then
-      xclip -selection clipboard
-   elif exst clip.exe; then
-      clip.exe
-   else
-      exit 55
-   fi
-}"#;
-
-    shell::out()
-        .arg(
-            format!(
-                r#"{cmd} 
-        read -r -d '' x <<'{EOF}'
+   let shell_cmd = CONFIG.shell().to_lowercase();
+   if shell_cmd.contains("powershell") || shell_cmd.contains("cmd.exe") {
+      // Use Windows native clipboard
+      let mut cmd = std::process::Command::new("cmd.exe");
+      cmd.arg("/C").arg("clip.exe");
+      let mut child = cmd.stdin(std::process::Stdio::piped()).spawn()
+         .map_err(|e| ShellSpawnError::new("clip.exe", e))?;
+      if let Some(stdin) = child.stdin.as_mut() {
+         use std::io::Write;
+         stdin.write_all(text.as_bytes())?;
+      }
+      child.wait()?;
+      Ok(())
+   } else {
+      // Use bash/zsh/fish/etc logic
+      let script = format!(
+         r#"exst() {{ type "$1" &>/dev/null; }}
+_copy() {{
+  if exst pbcopy; then pbcopy
+  elif exst xclip; then xclip -selection clipboard
+  elif exst clip.exe; then clip.exe
+  else exit 55; fi
+}}
+read -r -d '' x <<"{EOF}"
 {text}
 {EOF}
-
-echo -n "$x" | _copy"#,
-            )
-            .as_str(),
-        )
-        .spawn()
-        .map_err(|e| ShellSpawnError::new(cmd, e))?
-        .wait()?;
-
-    Ok(())
+echo -n "$x" | _copy
+"#,
+         EOF = EOF,
+         text = text
+      );
+      shell::out()
+         .arg(script.as_str())
+         .spawn()
+         .map_err(|e| ShellSpawnError::new(script.as_str(), e))?
+         .wait()?;
+      Ok(())
+   }
 }

src/config/yaml.rs

@@ -76,7 +76,7 @@ pub struct Search {
 #[serde(default)]
 pub struct Shell {
     pub command: String,
-    pub finder_command: Option<String>,
+    pub finder_command: Option<String>
 }
 
 #[derive(Deserialize, Debug)]
@@ -182,11 +182,39 @@ impl Default for Finder {
     }
 }
 
+#[cfg(target_family = "windows")]
+fn command_exists(cmd: &str) -> bool {
+    std::process::Command::new("where")
+        .arg(cmd)
+        .output()
+        .map(|output| output.status.success())
+        .unwrap_or(false)
+}
+
 impl Default for Shell {
     fn default() -> Self {
-        Self {
-            command: "bash".to_string(),
-            finder_command: None,
+        #[cfg(target_family = "windows")]
+        {
+            // Check for pwsh.exe first, then powershell.exe, then fallback to cmd.exe
+            let command = if command_exists("pwsh.exe") {
+                "pwsh.exe"
+            } else if command_exists("powershell.exe") {
+                "powershell.exe"
+            } else {
+                "cmd.exe"
+            };
+            
+            Self {
+                command: command.to_string(),
+                finder_command: None,
+            }
+        }
+        #[cfg(not(target_family = "windows"))]
+        {
+            Self {
+                command: "bash".to_string(),
+                finder_command: None,
+            }
         }
     }
 }

src/filesystem.rs

@@ -261,17 +261,13 @@ mod tests {
 
     #[test]
     fn splitting_of_dirs_param_may_not_contain_empty_items() {
-        // Trailing colon indicates potential extra path. Split returns an empty item for it. This empty item should be filtered away, which is what this test checks.
-        let given_path_config = "SOME_PATH:ANOTHER_PATH:";
+        // Trailing separator indicates potential extra path. Split returns an empty item for it. This empty item should be filtered away, which is what this test checks.
+        let given_path_config = format!("SOME_PATH{sep}ANOTHER_PATH{sep}", sep = JOIN_SEPARATOR);
 
-        let found_paths = paths_from_path_param(given_path_config);
+        let found_paths: Vec<&str> = paths_from_path_param(&given_path_config).collect();
+        let expected_paths = vec!["SOME_PATH", "ANOTHER_PATH"];
 
-        let mut expected_paths = vec!["SOME_PATH", "ANOTHER_PATH"].into_iter();
-
-        for found in found_paths {
-            let expected = expected_paths.next().unwrap();
-            assert_eq!(found, expected)
-        }
+        assert_eq!(found_paths, expected_paths);
     }
 
     #[test]

src/parser.rs

@@ -106,11 +106,9 @@ fn parse_variable_line(line: &str) -> Result<(&str, &str, Option<FinderOpts>)> {
 }
 
 fn without_prefix(line: &str) -> String {
-    if line.len() > 2 {
-        String::from(line[2..].trim())
-    } else {
-        String::from("")
-    }
+    let trimmed = line.trim_start();
+    let without_prefix: String = trimmed.chars().skip(2).collect();
+    without_prefix.trim().to_string()
 }
 
 #[derive(Clone, Default)]

tests/config.yaml

@@ -16,3 +16,5 @@ finder:
 shell:
   finder_command: bash
   command: env BASH_ENV="${NAVI_HOME}/tests/helpers.sh" bash --norc --noprofile
+  show_command: true
+  command_print_color: green