Skip to content

Commit 1fdff1e

Browse files
committed
refactor: extract script segment
1 parent 35807bc commit 1fdff1e

1 file changed

Lines changed: 10 additions & 18 deletions

File tree

functions/fish_prompt.fish

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,16 @@ if contains newline $_tide_left_items # two line prompt initialization
3434
set -l bot_right_frame "$prompt_and_frame_color─╯" &&
3535
set column_offset (math $column_offset-2)
3636

37+
set -l pass_cached_variables "
38+
set -lx _tide_color_separator_same_color \$_tide_color_separator_same_color
39+
set -lx _tide_location_color \$_tide_location_color
40+
set -lx _tide_private_mode \$_tide_private_mode
41+
set -lx _tide_pad \$_tide_pad;"
42+
3743
if test "$tide_prompt_transient_enabled" = true
3844
eval "
3945
function fish_prompt
40-
set -lx _tide_color_separator_same_color \$_tide_color_separator_same_color
41-
set -lx _tide_location_color \$_tide_location_color
42-
set -lx _tide_private_mode \$_tide_private_mode
43-
set -lx _tide_pad \$_tide_pad
46+
$pass_cached_variables
4447
_tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint
4548
jobs -q && jobs -p | count | read -lx _tide_jobs
4649
$fish_path -c \"set _tide_pipestatus \$_tide_pipestatus
@@ -69,12 +72,7 @@ end"
6972
else
7073
eval "
7174
function fish_prompt
72-
73-
set -lx _tide_color_separator_same_color \$_tide_color_separator_same_color
74-
set -lx _tide_location_color \$_tide_location_color
75-
set -lx _tide_private_mode \$_tide_private_mode
76-
set -lx _tide_pad \$_tide_pad
77-
75+
$pass_cached_variables
7876
_tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint
7977
jobs -q && jobs -p | count | read -lx _tide_jobs
8078
$fish_path -c \"set _tide_pipestatus \$_tide_pipestatus
@@ -106,10 +104,7 @@ else # one line prompt initialization
106104
if test "$tide_prompt_transient_enabled" = true
107105
eval "
108106
function fish_prompt
109-
set -lx _tide_color_separator_same_color \$_tide_color_separator_same_color
110-
set -lx _tide_location_color \$_tide_location_color
111-
set -lx _tide_private_mode \$_tide_private_mode
112-
set -lx _tide_pad \$_tide_pad
107+
$pass_cached_variables
113108
set -lx _tide_status \$status
114109
_tide_pipestatus=\$pipestatus if not set -e _tide_repaint
115110
jobs -q && jobs -p | count | read -lx _tide_jobs
@@ -138,10 +133,7 @@ end"
138133
else
139134
eval "
140135
function fish_prompt
141-
set -lx _tide_color_separator_same_color \$_tide_color_separator_same_color
142-
set -lx _tide_location_color \$_tide_location_color
143-
set -lx _tide_private_mode \$_tide_private_mode
144-
set -lx _tide_pad \$_tide_pad
136+
$pass_cached_variables
145137
_tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint
146138
jobs -q && jobs -p | count | read -lx _tide_jobs
147139
$fish_path -c \"set _tide_pipestatus \$_tide_pipestatus

0 commit comments

Comments
 (0)