diff --git a/functions/_tide_item_jobs.fish b/functions/_tide_item_jobs.fish index 96cf902..29762fb 100644 --- a/functions/_tide_item_jobs.fish +++ b/functions/_tide_item_jobs.fish @@ -1,3 +1,7 @@ function _tide_item_jobs - set -q _tide_jobs && _tide_print_item jobs $tide_jobs_icon + if test $_tide_jobs -gt $tide_jobs_threshold + _tide_print_item jobs $tide_jobs_icon' ' $_tide_jobs + else if test $_tide_jobs -gt 0 + _tide_print_item jobs $tide_jobs_icon + end end diff --git a/functions/fish_prompt.fish b/functions/fish_prompt.fish index 59f5a96..ed650de 100644 --- a/functions/fish_prompt.fish +++ b/functions/fish_prompt.fish @@ -38,7 +38,7 @@ if contains newline $_tide_left_items # two line prompt initialization eval " function fish_prompt _tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint - jobs -q && set -lx _tide_jobs + set -lx _tide_jobs (count (jobs)) $fish_path -c \"set _tide_pipestatus \$_tide_pipestatus set _tide_parent_dirs \$_tide_parent_dirs PATH=\$(string escape \"\$PATH\") CMD_DURATION=\$CMD_DURATION fish_bind_mode=\$fish_bind_mode set $prompt_var (_tide_2_line_prompt)\" & @@ -66,7 +66,7 @@ end" eval " function fish_prompt _tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint - jobs -q && set -lx _tide_jobs + set -lx _tide_jobs (count (jobs)) $fish_path -c \"set _tide_pipestatus \$_tide_pipestatus set _tide_parent_dirs \$_tide_parent_dirs PATH=\$(string escape \"\$PATH\") CMD_DURATION=\$CMD_DURATION fish_bind_mode=\$fish_bind_mode set $prompt_var (_tide_2_line_prompt)\" & @@ -98,7 +98,7 @@ else # one line prompt initialization function fish_prompt set -lx _tide_status \$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint - jobs -q && set -lx _tide_jobs + set -lx _tide_jobs (count (jobs)) $fish_path -c \"set _tide_pipestatus \$_tide_pipestatus set _tide_parent_dirs \$_tide_parent_dirs PATH=\$(string escape \"\$PATH\") CMD_DURATION=\$CMD_DURATION fish_bind_mode=\$fish_bind_mode set $prompt_var (_tide_1_line_prompt)\" & @@ -125,7 +125,7 @@ end" eval " function fish_prompt _tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint - jobs -q && set -lx _tide_jobs + set -lx _tide_jobs (count (jobs)) $fish_path -c \"set _tide_pipestatus \$_tide_pipestatus set _tide_parent_dirs \$_tide_parent_dirs PATH=\$(string escape \"\$PATH\") CMD_DURATION=\$CMD_DURATION fish_bind_mode=\$fish_bind_mode set $prompt_var (_tide_1_line_prompt)\" & diff --git a/functions/tide/configure/configs/classic.fish b/functions/tide/configure/configs/classic.fish index e760015..d2bb8dc 100644 --- a/functions/tide/configure/configs/classic.fish +++ b/functions/tide/configure/configs/classic.fish @@ -46,6 +46,7 @@ tide_java_bg_color 444444 tide_java_color ED8B00 tide_jobs_bg_color 444444 tide_jobs_color $_tide_color_dark_green +tide_jobs_threshold 1 tide_kubectl_bg_color 444444 tide_kubectl_color 326CE5 tide_left_prompt_frame_enabled true diff --git a/functions/tide/configure/configs/lean.fish b/functions/tide/configure/configs/lean.fish index 9ef082f..c41a297 100644 --- a/functions/tide/configure/configs/lean.fish +++ b/functions/tide/configure/configs/lean.fish @@ -46,6 +46,7 @@ tide_java_bg_color normal tide_java_color ED8B00 tide_jobs_bg_color normal tide_jobs_color $_tide_color_dark_green +tide_jobs_threshold 1 tide_kubectl_bg_color normal tide_kubectl_color 326CE5 tide_left_prompt_frame_enabled false diff --git a/functions/tide/configure/configs/rainbow.fish b/functions/tide/configure/configs/rainbow.fish index 521477f..6932192 100644 --- a/functions/tide/configure/configs/rainbow.fish +++ b/functions/tide/configure/configs/rainbow.fish @@ -46,6 +46,7 @@ tide_java_bg_color ED8B00 tide_java_color 000000 tide_jobs_bg_color 444444 tide_jobs_color 4E9A06 +tide_jobs_threshold 1 tide_kubectl_bg_color 326CE5 tide_kubectl_color 000000 tide_left_prompt_frame_enabled true diff --git a/tests/_tide_item_jobs.test.fish b/tests/_tide_item_jobs.test.fish index ea7b504..89cd53d 100644 --- a/tests/_tide_item_jobs.test.fish +++ b/tests/_tide_item_jobs.test.fish @@ -1,9 +1,13 @@ # RUN: %fish %s _tide_parent_dirs -set -e _tide_jobs +set _tide_jobs 0 _tide_decolor (_tide_item_jobs) # CHECK: set -lx tide_jobs_icon  -set -lx _tide_jobs +set -lx tide_jobs_threshold 1 +set _tide_jobs 1 _tide_decolor (_tide_item_jobs) # CHECK:  + +set _tide_jobs 2 +_tide_decolor (_tide_item_jobs) # CHECK:  2