From 67b1e76da3aa37988aa00193828905c1baec213e Mon Sep 17 00:00:00 2001 From: Ilan Cosman Date: Tue, 6 Jul 2021 15:45:12 -0700 Subject: [PATCH] Use default name variables for character --- functions/_tide_item_character.fish | 8 ++------ functions/tide/configure/configs/classic.fish | 2 +- functions/tide/configure/configs/classic_16color.fish | 2 +- functions/tide/configure/configs/lean.fish | 2 +- functions/tide/configure/configs/lean_16color.fish | 2 +- functions/tide/configure/configs/rainbow.fish | 2 +- functions/tide/configure/configs/rainbow_16color.fish | 2 +- .../configure/functions/_fake_tide_item_prompt_char.fish | 2 +- 8 files changed, 9 insertions(+), 13 deletions(-) diff --git a/functions/_tide_item_character.fish b/functions/_tide_item_character.fish index 3977139..7110c1c 100644 --- a/functions/_tide_item_character.fish +++ b/functions/_tide_item_character.fish @@ -1,10 +1,6 @@ function _tide_item_character - if test $_tide_last_status = 0 - set -g tide_character_color $tide_character_color_success - else - set -g tide_character_color $tide_character_color_failure - end - + test $_tide_last_status = 0 || set -g tide_character_color $tide_character_color_failure + if test "$fish_key_bindings" = fish_default_key_bindings _tide_print_item character $tide_character_icon else diff --git a/functions/tide/configure/configs/classic.fish b/functions/tide/configure/configs/classic.fish index 9d91c44..2964fea 100644 --- a/functions/tide/configure/configs/classic.fish +++ b/functions/tide/configure/configs/classic.fish @@ -1,6 +1,6 @@ tide_character_bg_color normal tide_character_color_failure FF0000 -tide_character_color_success $_tide_color_green +tide_character_color $_tide_color_green tide_character_icon '❯' tide_character_vi_icon_default '❮' tide_character_vi_icon_replace '▶' diff --git a/functions/tide/configure/configs/classic_16color.fish b/functions/tide/configure/configs/classic_16color.fish index 6f75354..6dd2d1f 100644 --- a/functions/tide/configure/configs/classic_16color.fish +++ b/functions/tide/configure/configs/classic_16color.fish @@ -1,6 +1,6 @@ tide_character_bg_color normal tide_character_color_failure brred -tide_character_color_success brgreen +tide_character_color brgreen tide_chruby_bg_color black tide_chruby_color red tide_cmd_duration_bg_color black diff --git a/functions/tide/configure/configs/lean.fish b/functions/tide/configure/configs/lean.fish index c72fd4c..764b3c4 100644 --- a/functions/tide/configure/configs/lean.fish +++ b/functions/tide/configure/configs/lean.fish @@ -1,6 +1,6 @@ tide_character_bg_color normal tide_character_color_failure FF0000 -tide_character_color_success $_tide_color_green +tide_character_color $_tide_color_green tide_character_icon '❯' tide_character_vi_icon_default '❮' tide_character_vi_icon_replace '▶' diff --git a/functions/tide/configure/configs/lean_16color.fish b/functions/tide/configure/configs/lean_16color.fish index 38c67a8..7fc4e63 100644 --- a/functions/tide/configure/configs/lean_16color.fish +++ b/functions/tide/configure/configs/lean_16color.fish @@ -1,6 +1,6 @@ tide_character_bg_color normal tide_character_color_failure brred -tide_character_color_success brgreen +tide_character_color brgreen tide_chruby_bg_color normal tide_chruby_color red tide_cmd_duration_bg_color normal diff --git a/functions/tide/configure/configs/rainbow.fish b/functions/tide/configure/configs/rainbow.fish index 15145b8..1f4fbf7 100644 --- a/functions/tide/configure/configs/rainbow.fish +++ b/functions/tide/configure/configs/rainbow.fish @@ -1,6 +1,6 @@ tide_character_bg_color normal tide_character_color_failure FF0000 -tide_character_color_success $_tide_color_green +tide_character_color $_tide_color_green tide_character_icon '❯' tide_character_vi_icon_default '❮' tide_character_vi_icon_replace '▶' diff --git a/functions/tide/configure/configs/rainbow_16color.fish b/functions/tide/configure/configs/rainbow_16color.fish index 6a0f087..555b59a 100644 --- a/functions/tide/configure/configs/rainbow_16color.fish +++ b/functions/tide/configure/configs/rainbow_16color.fish @@ -1,6 +1,6 @@ tide_character_bg_color normal tide_character_color_failure brred -tide_character_color_success brgreen +tide_character_color brgreen tide_chruby_bg_color red tide_chruby_color black tide_cmd_duration_bg_color yellow diff --git a/functions/tide/configure/functions/_fake_tide_item_prompt_char.fish b/functions/tide/configure/functions/_fake_tide_item_prompt_char.fish index 40195fd..e405b22 100644 --- a/functions/tide/configure/functions/_fake_tide_item_prompt_char.fish +++ b/functions/tide/configure/functions/_fake_tide_item_prompt_char.fish @@ -1,3 +1,3 @@ function _fake_tide_item_character - fake_tide_character_color=$fake_tide_character_color_success _fake_tide_print_item character '❯ ' + _fake_tide_print_item character '❯ ' end