Remove experimental Fish shell support

Author: rossmacarthur

README.md

@@ -704,12 +704,6 @@ or
 shell = "zsh"
 ```
 
-as well as the experimental
-
-```toml
-shell = "fish"
-```
-
 #### `match`
 
 A list of glob patterns to match against a plugin’s contents. The first pattern
@@ -744,21 +738,6 @@ match = [
 ]
 ```
 
-If the shell is Fish then this defaults to
-
-```toml
-match = [
-    "conf.d/{{ name }}.fish",
-    "conf.d/{!_*,*}.fish",
-    "{completions,functions}/{{ name }}.fish",
-    "{completions,functions}/{!_*,*}.fish",
-    "{completions,functions}/*.fish",
-    "{{ name }}.fish",
-    "{!_*,*}.fish",
-    "*.fish"
-]
-```
-
 #### `apply`
 
 A list of template names to apply to all plugins by default (see

completions/sheldon.bash

@@ -186,7 +186,7 @@ _sheldon() {
             fi
             case "${prev}" in
                 --shell)
-                    COMPREPLY=($(compgen -W "bash fish zsh" -- "${cur}"))
+                    COMPREPLY=($(compgen -W "bash zsh" -- "${cur}"))
                     return 0
                     ;;
                 *)

completions/sheldon.zsh

@@ -40,7 +40,7 @@ _sheldon() {
         case $line[1] in
             (init)
 _arguments "${_arguments_options[@]}" : \
-'--shell=[The type of shell]:SHELL:(bash fish zsh)' \
+'--shell=[The type of shell]:SHELL:(bash zsh)' \
 '-h[Print help]' \
 '--help[Print help]' \
 && ret=0

docs/src/Configuration.md

@@ -311,12 +311,6 @@ or
 shell = "zsh"
 ```
 
-as well as the experimental
-
-```toml
-shell = "fish"
-```
-
 ### `match`
 
 A list of glob patterns to match against a plugin's contents. The first pattern
@@ -351,21 +345,6 @@ match = [
 ]
 ```
 
-If the shell is Fish then this defaults to
-
-```toml
-match = [
-    "conf.d/{{ name }}.fish",
-    "conf.d/{!_*,*}.fish",
-    "{completions,functions}/{{ name }}.fish",
-    "{completions,functions}/{!_*,*}.fish",
-    "{completions,functions}/*.fish",
-    "{{ name }}.fish",
-    "{!_*,*}.fish",
-    "*.fish"
-]
-```
-
 ### `apply`
 
 A list of template names to apply to all plugins by default (see

src/cli/raw.rs

@@ -212,13 +212,12 @@ impl clap::ValueEnum for ColorChoice {
 
 impl clap::ValueEnum for Shell {
     fn value_variants<'a>() -> &'a [Self] {
-        &[Shell::Bash, Shell::Fish, Shell::Zsh]
+        &[Shell::Bash, Shell::Zsh]
     }
 
     fn to_possible_value(&self) -> Option<PossibleValue> {
         Some(match self {
             Shell::Bash => PossibleValue::new("bash"),
-            Shell::Fish => PossibleValue::new("fish"),
             Shell::Zsh => PossibleValue::new("zsh"),
         })
     }

src/cli/testdata/raw_opt_init_help.golden

@@ -3,5 +3,5 @@ Initialize a new config file
 Usage: sheldon init [OPTIONS]
 
 Options:
-      --shell <SHELL>  The type of shell [possible values: bash, fish, zsh]
+      --shell <SHELL>  The type of shell [possible values: bash, zsh]
   -h, --help           Print help

src/config/file.rs

@@ -115,7 +115,6 @@ impl fmt::Display for Shell {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Self::Bash => f.write_str("bash"),
-            Self::Fish => f.write_str("fish"),
             Self::Zsh => f.write_str("zsh"),
         }
     }
@@ -184,7 +183,7 @@ impl Default for Shell {
 
 /// Produced when we fail to parse the shell type.
 #[derive(Debug, Error)]
-#[error("expected one of `bash`, `fish`, or `zsh`, got `{}`", self.0)]
+#[error("expected one of `bash` or `zsh`, got `{}`", self.0)]
 pub struct ParseShellError(String);
 
 impl FromStr for Shell {
@@ -193,7 +192,6 @@ impl FromStr for Shell {
     fn from_str(s: &str) -> result::Result<Self, Self::Err> {
         match &*s.to_lowercase() {
             "bash" => Ok(Self::Bash),
-            "fish" => Ok(Self::Fish),
             "zsh" => Ok(Self::Zsh),
             s => Err(ParseShellError(s.to_string())),
         }
@@ -374,7 +372,7 @@ mod tests {
   |
 1 | s = 'ksh'
   |     ^^^^^
-expected one of `bash`, `fish`, or `zsh`, got `ksh`
+expected one of `bash` or `zsh`, got `ksh`
 "
         );
     }

src/config/mod.rs

@@ -40,7 +40,6 @@ pub struct Config {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum Shell {
     Bash,
-    Fish,
     Zsh,
 }
 

src/lock/mod.rs

@@ -184,18 +184,6 @@ impl Shell {
                 "*.sh"
             ]
         });
-        static DEFAULT_MATCHES_FISH: Lazy<Vec<String>> = Lazy::new(|| {
-            vec_into![
-                "conf.d/{{ name }}.fish",
-                "conf.d/{!_*,*}.fish",
-                "{completions,functions}/{{ name }}.fish",
-                "{completions,functions}/{!_*,*}.fish",
-                "{completions,functions}/*.fish",
-                "{{ name }}.fish",
-                "{!_*,*}.fish",
-                "*.fish"
-            ]
-        });
         static DEFAULT_MATCHES_ZSH: Lazy<Vec<String>> = Lazy::new(|| {
             vec_into![
                 "{{ name }}.plugin.zsh",
@@ -210,7 +198,6 @@ impl Shell {
         });
         match self {
             Self::Bash => &DEFAULT_MATCHES_BASH,
-            Self::Fish => &DEFAULT_MATCHES_FISH,
             Self::Zsh => &DEFAULT_MATCHES_ZSH,
         }
     }
@@ -223,12 +210,6 @@ impl Shell {
                 "source" => "{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\"\n{% endfor %}{{ hooks?.post | nl }}"
             }
         });
-        static DEFAULT_TEMPLATES_FISH: Lazy<IndexMap<String, String>> = Lazy::new(|| {
-            indexmap_into! {
-                "add_path" => "fish_add_path \"{{ dir }}\"",
-                "source" => "{{ hooks?.pre | nl }}{% for file in files %}source \"{{ file }}\"\n{% endfor %}{{ hooks?.post | nl }}"
-            }
-        });
         static DEFAULT_TEMPLATES_ZSH: Lazy<IndexMap<String, String>> = Lazy::new(|| {
             indexmap_into! {
                 "PATH" => "export PATH=\"{{ dir }}:$PATH\"",
@@ -239,7 +220,6 @@ impl Shell {
         });
         match self {
             Self::Bash => &DEFAULT_TEMPLATES_BASH,
-            Self::Fish => &DEFAULT_TEMPLATES_FISH,
             Self::Zsh => &DEFAULT_TEMPLATES_ZSH,
         }
     }