Distinguish between pwsh and powershell

Signed-off-by: Gilbert Sanchez <me@gilbertsanchez.com>
- Update the config-schema
- Apply suggestions from code review
- Revert string formatter tests
- Rename to use pwsh
- Fix config-schema after rename.
- Fix tests after rename

.github/config-schema.json

@@ -5286,6 +5286,12 @@
           "default": "psh",
           "type": "string"
         },
+        "pwsh_indicator": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
         "ion_indicator": {
           "default": "ion",
           "type": "string"

docs/config/README.md

@@ -3814,6 +3814,7 @@ To enable it, set `disabled` to `false` in your configuration file.
 | `fish_indicator`       | `'fsh'`                   | A format string used to represent fish.                      |
 | `zsh_indicator`        | `'zsh'`                   | A format string used to represent zsh.                       |
 | `powershell_indicator` | `'psh'`                   | A format string used to represent powershell.                |
+| `pwsh_indicator`       | `'psh'`                   | A format string used to represent pwsh.                      |
 | `ion_indicator`        | `'ion'`                   | A format string used to represent ion.                       |
 | `elvish_indicator`     | `'esh'`                   | A format string used to represent elvish.                    |
 | `tcsh_indicator`       | `'tsh'`                   | A format string used to represent tcsh.                      |

src/configs/shell.rs

@@ -13,6 +13,8 @@ pub struct ShellConfig<'a> {
     pub fish_indicator: &'a str,
     pub zsh_indicator: &'a str,
     pub powershell_indicator: &'a str,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub pwsh_indicator: Option<&'a str>,
     pub ion_indicator: &'a str,
     pub elvish_indicator: &'a str,
     pub tcsh_indicator: &'a str,
@@ -32,6 +34,7 @@ impl<'a> Default for ShellConfig<'a> {
             fish_indicator: "fsh",
             zsh_indicator: "zsh",
             powershell_indicator: "psh",
+            pwsh_indicator: None,
             ion_indicator: "ion",
             elvish_indicator: "esh",
             tcsh_indicator: "tsh",

src/context.rs

@@ -368,7 +368,8 @@ impl<'a> Context<'a> {
             "bash" => Shell::Bash,
             "fish" => Shell::Fish,
             "ion" => Shell::Ion,
-            "powershell" | "pwsh" => Shell::PowerShell,
+            "pwsh" => Shell::Pwsh,
+            "powershell" => Shell::PowerShell,
             "zsh" => Shell::Zsh,
             "elvish" => Shell::Elvish,
             "tcsh" => Shell::Tcsh,
@@ -794,6 +795,7 @@ pub enum Shell {
     Bash,
     Fish,
     Ion,
+    Pwsh,
     PowerShell,
     Zsh,
     Elvish,

src/modules/shell.rs

@@ -20,6 +20,7 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
                     Shell::Bash => Some(config.bash_indicator),
                     Shell::Fish => Some(config.fish_indicator),
                     Shell::Zsh => Some(config.zsh_indicator),
+                    Shell::Pwsh => config.pwsh_indicator.or(Some(config.powershell_indicator)),
                     Shell::PowerShell => Some(config.powershell_indicator),
                     Shell::Ion => Some(config.ion_indicator),
                     Shell::Elvish => Some(config.elvish_indicator),
@@ -40,6 +41,7 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
                 "fish_indicator" => Some(Ok(config.fish_indicator)),
                 "zsh_indicator" => Some(Ok(config.zsh_indicator)),
                 "powershell_indicator" => Some(Ok(config.powershell_indicator)),
+                "pwsh_indicator" => config.pwsh_indicator.map(Ok),
                 "ion_indicator" => Some(Ok(config.ion_indicator)),
                 "elvish_indicator" => Some(Ok(config.elvish_indicator)),
                 "tcsh_indicator" => Some(Ok(config.tcsh_indicator)),
@@ -200,6 +202,35 @@ mod tests {
         assert_eq!(expected, actual);
     }
 
+    #[test]
+    fn test_pwsh_default_format() {
+        let expected = Some(format!("{} ", Color::White.bold().paint("psh")));
+        let actual = ModuleRenderer::new("shell")
+            .shell(Shell::Pwsh)
+            .config(toml::toml! {
+                [shell]
+                disabled = false
+            })
+            .collect();
+
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn test_pwsh_custom_format() {
+        let expected = Some(format!("{} ", Color::Cyan.bold().paint("pwsh")));
+        let actual = ModuleRenderer::new("shell")
+            .shell(Shell::Pwsh)
+            .config(toml::toml! {
+                [shell]
+                pwsh_indicator = "[pwsh](bold cyan)"
+                disabled = false
+            })
+            .collect();
+
+        assert_eq!(expected, actual);
+    }
+
     #[test]
     fn test_ion_default_format() {
         let expected = Some(format!("{} ", Color::White.bold().paint("ion")));