mirror of
https://github.com/fish-shell/fish-shell.git
synced 2026-04-25 20:41:15 -03:00
6d8bb292ec
Webconfig persists themes to ~/.config/fish/conf.d/fish_frozen_theme.fish (the name is due to historical reasons). That file's color variables have no "--theme=foo" annotations, which means that fish_config can't distinguish them from other "user-set" values. We can change this in future, but that doesn't affect the following fix. A "fish_config theme choose foo" command is supposed to overwrite all variables that are defined in "foo.theme". If the theme is color-theme-aware *and* this command runs before $fish_terminal_color_theme is initialized, we delay loading of the theme until that initialization happens. But the --on-variable invocation won't have the override bit set, thus it will not touch variables that don't have "--theme=*" value. Fix this by clearing immediately the variables mentioned in the theme. Fixes #12278 While at it, tweak the error message for this command because it's not an internal error: fish -c 'echo yes | fish_config theme save tomorrow'
251 lines
8.8 KiB
Fish
251 lines
8.8 KiB
Fish
# RUN: %fish %s
|
|
# REQUIRES: command -v diff
|
|
|
|
set -g fish (status fish-path)
|
|
|
|
fish_config prompt list | string match -r '^(?:acidhub|disco|nim)$'
|
|
# CHECK: acidhub
|
|
# CHECK: disco
|
|
# CHECK: nim
|
|
|
|
diff \
|
|
(fish_config prompt list | psub -s config-prompt-list) \
|
|
(fish_config prompt | psub -s config-prompt)
|
|
|
|
fish_config prompt show non-existent-prompt
|
|
|
|
fish_config prompt show default
|
|
# CHECK: {{\x1b\[4m}}default{{\x1b\[m}}
|
|
# CHECK: {{.*}}@{{.*}}>{{.*}}
|
|
|
|
type fish_mode_prompt
|
|
# CHECK: fish_mode_prompt is a function with definition
|
|
# CHECK: # Defined in {{.*}}functions/fish_mode_prompt.fish @ line 2
|
|
# CHECK: function fish_mode_prompt --description 'Displays the current mode'
|
|
# CHECK: # {{.*}}
|
|
# CHECK: fish_default_mode_prompt
|
|
# CHECK: end
|
|
|
|
function set-all-the-prompts
|
|
function fish_prompt
|
|
echo left-prompt
|
|
end
|
|
function fish_right_prompt
|
|
echo right-prompt
|
|
end
|
|
function fish_mode_prompt
|
|
echo mode-prompt
|
|
end
|
|
end
|
|
|
|
set-all-the-prompts
|
|
echo yes | fish_config prompt save >/dev/null
|
|
grep '\S' $__fish_config_dir/functions/{fish_prompt,fish_right_prompt,fish_mode_prompt}.fish
|
|
# CHECK: {{.*}}/functions/fish_prompt.fish:function fish_prompt
|
|
# CHECK: {{.*}}/functions/fish_prompt.fish: echo left-prompt
|
|
# CHECK: {{.*}}/functions/fish_prompt.fish:end
|
|
# CHECK: {{.*}}/functions/fish_right_prompt.fish:function fish_right_prompt
|
|
# CHECK: {{.*}}/functions/fish_right_prompt.fish: echo right-prompt
|
|
# CHECK: {{.*}}/functions/fish_right_prompt.fish:end
|
|
# CHECK: {{.*}}/functions/fish_mode_prompt.fish:function fish_mode_prompt
|
|
# CHECK: {{.*}}/functions/fish_mode_prompt.fish: echo mode-prompt
|
|
# CHECK: {{.*}}/functions/fish_mode_prompt.fish:end
|
|
|
|
echo yes | fish_config prompt save nim >/dev/null
|
|
grep -q nim@Hattori $__fish_config_dir/functions/fish_prompt.fish ||
|
|
echo 'failed to save prompt?'
|
|
not path is $__fish_config_dir/functions/fish_right_prompt.fish
|
|
or echo "fish_right_prompt.fish ought to be deleted"
|
|
cat $__fish_config_dir/functions/fish_mode_prompt.fish
|
|
# CHECK: function fish_mode_prompt
|
|
# CHECK: end
|
|
|
|
fish_config prompt choose nim
|
|
type fish_prompt fish_right_prompt fish_mode_prompt |
|
|
grep -EA1 '^function.*|.*\[nim@Hattori:~\].*'
|
|
# CHECK: function fish_prompt
|
|
# CHECK: # This prompt shows:
|
|
# CHECK: --
|
|
# CHECK: # ┬─[nim@Hattori:~]─[11:39:00]
|
|
# CHECK: # ╰─>$ echo here
|
|
# CHECK: --
|
|
# CHECKERR: type: Could not find 'fish_right_prompt'
|
|
# CHECK: function fish_mode_prompt
|
|
# CHECK:
|
|
|
|
fish_config prompt choose disco
|
|
type fish_prompt fish_right_prompt fish_mode_prompt |
|
|
grep -EA1 '^function.*|.*cksum$'
|
|
# CHECK: function fish_prompt
|
|
# CHECK: set -l last_status $status
|
|
# CHECK: --
|
|
# CHECK: if command -sq cksum
|
|
# CHECK: # randomized cwd color
|
|
# CHECK: --
|
|
# CHECK: function fish_right_prompt
|
|
# CHECK: set -g __fish_git_prompt_showdirtystate 1
|
|
# CHECK: --
|
|
# CHECK: function fish_mode_prompt {{.*}}
|
|
# CHECK: # {{.*}}
|
|
|
|
fish_config prompt choose default
|
|
type fish_prompt fish_right_prompt fish_mode_prompt |
|
|
grep '^function' -A1
|
|
# CHECK: function fish_prompt --description 'Write out the prompt'
|
|
# CHECK: set -l last_pipestatus $pipestatus
|
|
# CHECKERR: type: Could not find 'fish_right_prompt'
|
|
# CHECK: --
|
|
# CHECK: function fish_mode_prompt {{.*}}
|
|
# CHECK: # {{.*}}
|
|
|
|
type fish_mode_prompt
|
|
# CHECK: fish_mode_prompt is a function with definition
|
|
# CHECK: # Defined {{in .*/functions/fish_mode_prompt.fish @ line 2|via `source`}}
|
|
# CHECK: function fish_mode_prompt --description 'Displays the current mode'
|
|
# CHECK: # {{.*}}
|
|
# CHECK: fish_default_mode_prompt
|
|
# CHECK: end
|
|
|
|
fish_config theme choose non-existent-theme1
|
|
# CHECKERR: No such theme: non-existent-theme1
|
|
# CHECKERR: Searched {{/\S* (/\S*|and `status list-files themes`)}}
|
|
|
|
# This still demos the current theme.
|
|
fish_config theme show non-existent-theme2
|
|
# CHECK: {{\x1b\[m}}{{\x1b\[4m}}Current{{\x1b\[m}}
|
|
# CHECK: {{\x1b\[m/bright/vixens\x1b\[m \x1b\[36mjump\x1b\[m.*}}
|
|
# CHECK: {{.*}}
|
|
# CHECK: {{.*}}
|
|
|
|
diff \
|
|
(fish_config theme list | psub -s config-theme-list) \
|
|
(fish_config theme | psub -s config-theme)
|
|
|
|
fish_config theme list | string match -r \
|
|
'^(?:ayu|base16-default|coolbeans|default|none|'\
|
|
'tomorrow-night-bright|tomorrow)$'
|
|
# CHECK: ayu
|
|
# CHECK: base16-default
|
|
# CHECK: coolbeans
|
|
# CHECK: default
|
|
# CHECK: none
|
|
# CHECK: tomorrow-night-bright
|
|
# CHECK: tomorrow
|
|
|
|
fish_config theme show default-rgb
|
|
# CHECK: {{\x1b\[m}}{{\x1b\[4m}}Current{{\x1b\[m}}
|
|
# CHECK: {{\x1b\[m/bright/vixens\x1b\[m \x1b\[36mjump\x1b\[m.*}}
|
|
# CHECK: {{\x1b\[m}}{{\x1b\[m}}echo{{\x1b\[m}} {{\x1b\[91m}}'{{\x1b\[33m}}Errors are the portal to discovery
|
|
# CHECK: {{\x1b\[m}}{{\x1b\[m}}Th{{\x1b\[m}}{{\x1b\[90m}}is an autosuggestion
|
|
|
|
# CHECK: {{\x1b\[m\x1b\[4mdefault-rgb \(light color theme\)\x1b\[m}}
|
|
# CHECK: {{\x1b\[38;2;0;0;238m/bright/vixens\x1b\[m \x1b\[38;2;0;160;160mjump\x1b.*}}
|
|
# CHECK: {{.*}}
|
|
# CHECK: {{.*}}
|
|
# CHECK: {{\x1b\[m\x1b\[4mdefault-rgb \(dark color theme\)\x1b\[m}}
|
|
# CHECK: {{\x1b\[38;2;92;92;255m.*}}
|
|
# CHECK: {{.*}}
|
|
# CHECK: {{.*}}
|
|
# CHECK: {{\x1b\[m\x1b\[4mdefault-rgb \(unknown color theme\)\x1b\[m}}
|
|
# CHECK: {{\x1b\[m/bright/vixens\x1b\[m \x1b\[36mjump\x1b\[m.*}}
|
|
# CHECK: {{.*}}
|
|
# CHECK: {{.*}}
|
|
|
|
fish_config theme show ayu | string match -r '^.*ayu.*'
|
|
# CHECK: {{\x1b\[m}}{{\x1b\[4m}}ayu (light color theme){{\x1b\[m}}
|
|
# CHECK: {{\x1b\[m}}{{\x1b\[4m}}ayu (dark color theme){{\x1b\[m}}
|
|
|
|
mkdir $__fish_config_dir/themes
|
|
touch $__fish_config_dir/themes/custom-from-userconf.theme
|
|
fish_config theme show | grep -E 'default-rgb|base16-default|custom-from-userconf'
|
|
# CHECK: {{.*}}default-rgb (light color theme){{\x1b\[m}}
|
|
# CHECK: {{.*}}default-rgb (dark color theme){{\x1b\[m}}
|
|
# CHECK: {{.*}}default-rgb (unknown color theme){{\x1b\[m}}
|
|
# CHECK: {{.*}}custom-from-userconf (unknown color theme){{\x1b\[m}}
|
|
# CHECK: {{.*}}base16-default (light color theme){{\x1b\[m}}
|
|
# CHECK: {{.*}}base16-default (dark color theme){{\x1b\[m}}
|
|
|
|
# Override the default theme with different colors.
|
|
status get-file themes/none.theme >$__fish_config_dir/themes/default.theme
|
|
fish_config theme show default ayu | grep -E 'default|ayu.*dark' -A1
|
|
# CHECK: {{\x1b\[m}}{{\x1b\[4m}}default (unknown color theme){{\x1b\[m}}
|
|
# CHECK: /bright/vixens{{.*}}
|
|
# CHECK: --
|
|
# CHECK: {{\x1b\[m}}{{\x1b\[4m}}ayu (dark color theme){{\x1b\[m}}
|
|
# CHECK: {{.*}}/bright/vixens{{.*}}
|
|
|
|
function print-sample-colors
|
|
echo "normal=$fish_color_normal"
|
|
echo "autosuggestion=$fish_color_autosuggestion"
|
|
end
|
|
echo >$__fish_config_dir/themes/custom-from-userconf.theme \
|
|
"fish_color_normal yellow"
|
|
|
|
{
|
|
print-sample-colors
|
|
# CHECK: normal=normal --theme=default
|
|
# CHECK: autosuggestion=brblack --theme=default
|
|
|
|
fish_config theme choose custom-from-userconf --color-theme=unknown
|
|
print-sample-colors
|
|
# CHECK: normal=yellow --theme=custom-from-userconf
|
|
# CHECK: autosuggestion=
|
|
set -S fish_color_normal
|
|
# CHECK: $fish_color_normal: set in global scope, unexported, with 2 elements
|
|
# CHECK: $fish_color_normal[1]: |yellow|
|
|
# CHECK: $fish_color_normal[2]: |--theme=custom-from-userconf|
|
|
|
|
echo yes | fish_config theme save
|
|
set -S fish_color_normal
|
|
# CHECK: $fish_color_normal: set in universal scope, unexported, with 2 elements
|
|
# CHECK: $fish_color_normal[1]: |yellow|
|
|
# CHECK: $fish_color_normal[2]: |--theme=custom-from-userconf|
|
|
|
|
fish_config theme choose default --color-theme=unknown
|
|
print-sample-colors
|
|
# CHECK: normal=normal --theme=default
|
|
# CHECK: autosuggestion=brblack --theme=default
|
|
|
|
set -S fish_color_normal
|
|
# CHECK: $fish_color_normal: set in global scope, unexported, with 2 elements
|
|
# CHECK: $fish_color_normal[1]: |normal|
|
|
# CHECK: $fish_color_normal[2]: |--theme=default|
|
|
# CHECK: $fish_color_normal: set in universal scope, unexported, with 2 elements
|
|
# CHECK: $fish_color_normal[1]: |yellow|
|
|
# CHECK: $fish_color_normal[2]: |--theme=custom-from-userconf|
|
|
|
|
echo yes | fish_config theme save default
|
|
set -S fish_color_normal
|
|
# CHECK: $fish_color_normal: set in universal scope, unexported, with 1 elements
|
|
# CHECK: $fish_color_normal[1]: |normal|
|
|
}
|
|
|
|
{
|
|
echo >$__fish_config_dir/conf.d/fish_frozen_theme.fish "\
|
|
set --global fish_color_command 0a0a0a
|
|
set --global fish_color_option 0b0b0b"
|
|
echo >$__fish_config_dir/themes/from-cli.theme "\
|
|
[light]
|
|
fish_color_command black
|
|
fish_color_param 0c0c0c
|
|
[dark]
|
|
fish_color_command white
|
|
fish_color_param c0c0c0"
|
|
$fish -c '
|
|
fish_config theme choose from-cli
|
|
echo $fish_color_command
|
|
# CHECK: --theme=from-cli
|
|
echo $fish_color_option
|
|
# CHECK: 0b0b0b
|
|
echo $fish_color_param
|
|
# CHECK: --theme=from-cli
|
|
echo yes | fish_config theme save from-cli
|
|
# CHECKERR: fish_config theme save: error: $fish_terminal_color_theme not yet initialized
|
|
and echo assertion failure
|
|
'
|
|
rm -f $__fish_config_dir/conf.d/fish_frozen_theme.fish
|
|
}
|
|
|
|
fish_config theme dump badarg
|
|
# CHECKERR: Too many arguments
|