diff options
| author | Thomas O'Donnell <andytom@users.noreply.github.com> | 2022-06-18 23:23:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-18 23:23:59 +0200 |
| commit | 67619386cdd7537f0ab9af77e701409e97a87917 (patch) | |
| tree | 52284760a3597e753393a5344a10cc6ce1f66c3d /src | |
| parent | 2ffe1737f06db4ce89a21b2b5238f3ad76c94bca (diff) | |
fix(character): Standadise Vim config names (#4081)
Have switched all vi/vim symbols to have the same prefix 'vim'. To
preserve backwards compatibility with existing configs I have added an
alias for the previous config name.
Diffstat (limited to 'src')
| -rw-r--r-- | src/configs/character.rs | 5 | ||||
| -rw-r--r-- | src/modules/character.rs | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/configs/character.rs b/src/configs/character.rs index eb28f9cd1..27950caff 100644 --- a/src/configs/character.rs +++ b/src/configs/character.rs @@ -7,7 +7,8 @@ pub struct CharacterConfig<'a> { pub format: &'a str, pub success_symbol: &'a str, pub error_symbol: &'a str, - pub vicmd_symbol: &'a str, + #[serde(alias = "vicmd_symbol")] + pub vimcmd_symbol: &'a str, pub vimcmd_visual_symbol: &'a str, pub vimcmd_replace_symbol: &'a str, pub vimcmd_replace_one_symbol: &'a str, @@ -20,7 +21,7 @@ impl<'a> Default for CharacterConfig<'a> { format: "$symbol ", success_symbol: "[❯](bold green)", error_symbol: "[❯](bold red)", - vicmd_symbol: "[❮](bold green)", + vimcmd_symbol: "[❮](bold green)", vimcmd_visual_symbol: "[❮](bold yellow)", vimcmd_replace_symbol: "[❮](bold purple)", vimcmd_replace_one_symbol: "[❮](bold purple)", diff --git a/src/modules/character.rs b/src/modules/character.rs index 39c78b159..f4d9a2acd 100644 --- a/src/modules/character.rs +++ b/src/modules/character.rs @@ -45,7 +45,7 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> { }; let symbol = match mode { - ShellEditMode::Normal => config.vicmd_symbol, + ShellEditMode::Normal => config.vimcmd_symbol, ShellEditMode::Visual => config.vimcmd_visual_symbol, ShellEditMode::Replace => config.vimcmd_replace_symbol, ShellEditMode::ReplaceOne => config.vimcmd_replace_one_symbol, |