From 478a21e77f20cea6a9446fb2b2eb2725fe1894a3 Mon Sep 17 00:00:00 2001 From: Andre Ramnitz Date: Thu, 28 Mar 2024 12:13:24 +0100 Subject: [PATCH] fish: move some abbreviations into aliases --- config/fish/completions/fan2go.fish | 235 +++++++++++++++++++++++++ config/fish/fish_variables | 3 - config/fish/functions/df.fish | 4 + config/fish/functions/eza-aliases.fish | 4 +- config/fish/functions/grep.fish | 4 + config/fish/functions/lsblk.fish | 4 + 6 files changed, 249 insertions(+), 5 deletions(-) create mode 100644 config/fish/completions/fan2go.fish create mode 100644 config/fish/functions/df.fish create mode 100644 config/fish/functions/grep.fish create mode 100644 config/fish/functions/lsblk.fish diff --git a/config/fish/completions/fan2go.fish b/config/fish/completions/fan2go.fish new file mode 100644 index 00000000..3c472925 --- /dev/null +++ b/config/fish/completions/fan2go.fish @@ -0,0 +1,235 @@ +# fish completion for fan2go -*- shell-script -*- + +function __fan2go_debug + set -l file "$BASH_COMP_DEBUG_FILE" + if test -n "$file" + echo "$argv" >> $file + end +end + +function __fan2go_perform_completion + __fan2go_debug "Starting __fan2go_perform_completion" + + # Extract all args except the last one + set -l args (commandline -opc) + # Extract the last arg and escape it in case it is a space + set -l lastArg (string escape -- (commandline -ct)) + + __fan2go_debug "args: $args" + __fan2go_debug "last arg: $lastArg" + + # Disable ActiveHelp which is not supported for fish shell + set -l requestComp "FAN2GO_ACTIVE_HELP=0 $args[1] __complete $args[2..-1] $lastArg" + + __fan2go_debug "Calling $requestComp" + set -l results (eval $requestComp 2> /dev/null) + + # Some programs may output extra empty lines after the directive. + # Let's ignore them or else it will break completion. + # Ref: https://github.com/spf13/cobra/issues/1279 + for line in $results[-1..1] + if test (string trim -- $line) = "" + # Found an empty line, remove it + set results $results[1..-2] + else + # Found non-empty line, we have our proper output + break + end + end + + set -l comps $results[1..-2] + set -l directiveLine $results[-1] + + # For Fish, when completing a flag with an = (e.g., -n=) + # completions must be prefixed with the flag + set -l flagPrefix (string match -r -- '-.*=' "$lastArg") + + __fan2go_debug "Comps: $comps" + __fan2go_debug "DirectiveLine: $directiveLine" + __fan2go_debug "flagPrefix: $flagPrefix" + + for comp in $comps + printf "%s%s\n" "$flagPrefix" "$comp" + end + + printf "%s\n" "$directiveLine" +end + +# this function limits calls to __fan2go_perform_completion, by caching the result behind $__fan2go_perform_completion_once_result +function __fan2go_perform_completion_once + __fan2go_debug "Starting __fan2go_perform_completion_once" + + if test -n "$__fan2go_perform_completion_once_result" + __fan2go_debug "Seems like a valid result already exists, skipping __fan2go_perform_completion" + return 0 + end + + set --global __fan2go_perform_completion_once_result (__fan2go_perform_completion) + if test -z "$__fan2go_perform_completion_once_result" + __fan2go_debug "No completions, probably due to a failure" + return 1 + end + + __fan2go_debug "Performed completions and set __fan2go_perform_completion_once_result" + return 0 +end + +# this function is used to clear the $__fan2go_perform_completion_once_result variable after completions are run +function __fan2go_clear_perform_completion_once_result + __fan2go_debug "" + __fan2go_debug "========= clearing previously set __fan2go_perform_completion_once_result variable ==========" + set --erase __fan2go_perform_completion_once_result + __fan2go_debug "Succesfully erased the variable __fan2go_perform_completion_once_result" +end + +function __fan2go_requires_order_preservation + __fan2go_debug "" + __fan2go_debug "========= checking if order preservation is required ==========" + + __fan2go_perform_completion_once + if test -z "$__fan2go_perform_completion_once_result" + __fan2go_debug "Error determining if order preservation is required" + return 1 + end + + set -l directive (string sub --start 2 $__fan2go_perform_completion_once_result[-1]) + __fan2go_debug "Directive is: $directive" + + set -l shellCompDirectiveKeepOrder 32 + set -l keeporder (math (math --scale 0 $directive / $shellCompDirectiveKeepOrder) % 2) + __fan2go_debug "Keeporder is: $keeporder" + + if test $keeporder -ne 0 + __fan2go_debug "This does require order preservation" + return 0 + end + + __fan2go_debug "This doesn't require order preservation" + return 1 +end + + +# This function does two things: +# - Obtain the completions and store them in the global __fan2go_comp_results +# - Return false if file completion should be performed +function __fan2go_prepare_completions + __fan2go_debug "" + __fan2go_debug "========= starting completion logic ==========" + + # Start fresh + set --erase __fan2go_comp_results + + __fan2go_perform_completion_once + __fan2go_debug "Completion results: $__fan2go_perform_completion_once_result" + + if test -z "$__fan2go_perform_completion_once_result" + __fan2go_debug "No completion, probably due to a failure" + # Might as well do file completion, in case it helps + return 1 + end + + set -l directive (string sub --start 2 $__fan2go_perform_completion_once_result[-1]) + set --global __fan2go_comp_results $__fan2go_perform_completion_once_result[1..-2] + + __fan2go_debug "Completions are: $__fan2go_comp_results" + __fan2go_debug "Directive is: $directive" + + set -l shellCompDirectiveError 1 + set -l shellCompDirectiveNoSpace 2 + set -l shellCompDirectiveNoFileComp 4 + set -l shellCompDirectiveFilterFileExt 8 + set -l shellCompDirectiveFilterDirs 16 + + if test -z "$directive" + set directive 0 + end + + set -l compErr (math (math --scale 0 $directive / $shellCompDirectiveError) % 2) + if test $compErr -eq 1 + __fan2go_debug "Received error directive: aborting." + # Might as well do file completion, in case it helps + return 1 + end + + set -l filefilter (math (math --scale 0 $directive / $shellCompDirectiveFilterFileExt) % 2) + set -l dirfilter (math (math --scale 0 $directive / $shellCompDirectiveFilterDirs) % 2) + if test $filefilter -eq 1; or test $dirfilter -eq 1 + __fan2go_debug "File extension filtering or directory filtering not supported" + # Do full file completion instead + return 1 + end + + set -l nospace (math (math --scale 0 $directive / $shellCompDirectiveNoSpace) % 2) + set -l nofiles (math (math --scale 0 $directive / $shellCompDirectiveNoFileComp) % 2) + + __fan2go_debug "nospace: $nospace, nofiles: $nofiles" + + # If we want to prevent a space, or if file completion is NOT disabled, + # we need to count the number of valid completions. + # To do so, we will filter on prefix as the completions we have received + # may not already be filtered so as to allow fish to match on different + # criteria than the prefix. + if test $nospace -ne 0; or test $nofiles -eq 0 + set -l prefix (commandline -t | string escape --style=regex) + __fan2go_debug "prefix: $prefix" + + set -l completions (string match -r -- "^$prefix.*" $__fan2go_comp_results) + set --global __fan2go_comp_results $completions + __fan2go_debug "Filtered completions are: $__fan2go_comp_results" + + # Important not to quote the variable for count to work + set -l numComps (count $__fan2go_comp_results) + __fan2go_debug "numComps: $numComps" + + if test $numComps -eq 1; and test $nospace -ne 0 + # We must first split on \t to get rid of the descriptions to be + # able to check what the actual completion will be. + # We don't need descriptions anyway since there is only a single + # real completion which the shell will expand immediately. + set -l split (string split --max 1 \t $__fan2go_comp_results[1]) + + # Fish won't add a space if the completion ends with any + # of the following characters: @=/:., + set -l lastChar (string sub -s -1 -- $split) + if not string match -r -q "[@=/:.,]" -- "$lastChar" + # In other cases, to support the "nospace" directive we trick the shell + # by outputting an extra, longer completion. + __fan2go_debug "Adding second completion to perform nospace directive" + set --global __fan2go_comp_results $split[1] $split[1]. + __fan2go_debug "Completions are now: $__fan2go_comp_results" + end + end + + if test $numComps -eq 0; and test $nofiles -eq 0 + # To be consistent with bash and zsh, we only trigger file + # completion when there are no other completions + __fan2go_debug "Requesting file completion" + return 1 + end + end + + return 0 +end + +# Since Fish completions are only loaded once the user triggers them, we trigger them ourselves +# so we can properly delete any completions provided by another script. +# Only do this if the program can be found, or else fish may print some errors; besides, +# the existing completions will only be loaded if the program can be found. +if type -q "fan2go" + # The space after the program name is essential to trigger completion for the program + # and not completion of the program name itself. + # Also, we use '> /dev/null 2>&1' since '&>' is not supported in older versions of fish. + complete --do-complete "fan2go " > /dev/null 2>&1 +end + +# Remove any pre-existing completions for the program since we will be handling all of them. +complete -c fan2go -e + +# this will get called after the two calls below and clear the $__fan2go_perform_completion_once_result global +complete -c fan2go -n '__fan2go_clear_perform_completion_once_result' +# The call to __fan2go_prepare_completions will setup __fan2go_comp_results +# which provides the program's completion choices. +# If this doesn't require order preservation, we don't use the -k flag +complete -c fan2go -n 'not __fan2go_requires_order_preservation && __fan2go_prepare_completions' -f -a '$__fan2go_comp_results' +# otherwise we use the -k flag +complete -k -c fan2go -n '__fan2go_requires_order_preservation && __fan2go_prepare_completions' -f -a '$__fan2go_comp_results' diff --git a/config/fish/fish_variables b/config/fish/fish_variables index 8b22d9a6..7992cf47 100644 --- a/config/fish/fish_variables +++ b/config/fish/fish_variables @@ -9,17 +9,14 @@ SETUVAR --export VISUAL:kks\x20edit SETUVAR __fish_initialized:3400 SETUVAR _fish_abbr_cheatsheet:cat\x20/home/andy/dotfiles/banner\x2easc SETUVAR _fish_abbr_cheatsheet_2D_bash:cat\x20/home/andy/dotfiles/banner\x2dbash\x2easc -SETUVAR _fish_abbr_df:/usr/bin/df\x20\x2dh\x20\x2d\x2doutput\x3dtarget\x2cfstype\x2cused\x2cavail\x2cpcent\x2csource\x20\x7c\x20sort\x20\x2dn SETUVAR _fish_abbr_free:free\x20\x2d\x2dgiga\x20\x2dh\x20\x2dw SETUVAR _fish_abbr_gco:git\x20checkout SETUVAR _fish_abbr_gcp:git\x20cherry\x2dpick SETUVAR _fish_abbr_glo:git\x20log\x20\x2d\x2doneline -SETUVAR _fish_abbr_grep:grep\x20\x2di\x20\x2d\x2dcolor\x3dauto SETUVAR _fish_abbr_gst:git\x20status SETUVAR _fish_abbr_hc:hyperctl SETUVAR _fish_abbr_hcc:hyperctl\x20clients SETUVAR _fish_abbr_lf:lfrun -SETUVAR _fish_abbr_lsblk:lsblk\x20\x2do\x20name\x2csize\x2cpartuuid\x2cfstype\x2cmountpoints\x2clabel SETUVAR _fish_abbr_zdiff:zdiff\x20\x2d\x2dcolor\x3dauto SETUVAR fish_color_autosuggestion:777777 SETUVAR fish_color_cancel:\x2d\x2dreverse diff --git a/config/fish/functions/df.fish b/config/fish/functions/df.fish new file mode 100644 index 00000000..d2777921 --- /dev/null +++ b/config/fish/functions/df.fish @@ -0,0 +1,4 @@ +function df --wraps='/usr/bin/df -h --output=target,fstype,used,avail,pcent,source | sort -n' --description 'alias df=/usr/bin/df -h --output=target,fstype,used,avail,pcent,source | sort -n' + /usr/bin/df -h --output=target,fstype,used,avail,pcent,source | sort -n $argv + +end diff --git a/config/fish/functions/eza-aliases.fish b/config/fish/functions/eza-aliases.fish index 378232de..bb813b43 100644 --- a/config/fish/functions/eza-aliases.fish +++ b/config/fish/functions/eza-aliases.fish @@ -29,9 +29,9 @@ end function ll --wraps='eza' --description='alias eza' switch $(tty) case /dev/tty** - EZA_GRID_ROWS=26 eza -w 220 --group --long --grid --group-directories-first $argv + EZA_GRID_ROWS=26 eza -w 220 --group --long --group-directories-first $argv case /dev/pts/** - EZA_GRID_ROWS=26 eza -w 0 --group --long --grid --group-directories-first $argv + EZA_GRID_ROWS=26 eza -w 0 --group --long --group-directories-first $argv end end diff --git a/config/fish/functions/grep.fish b/config/fish/functions/grep.fish new file mode 100644 index 00000000..8633360a --- /dev/null +++ b/config/fish/functions/grep.fish @@ -0,0 +1,4 @@ +function grep --description 'alias grep=grep -i --color=auto' + command grep -i --color=auto $argv + +end diff --git a/config/fish/functions/lsblk.fish b/config/fish/functions/lsblk.fish new file mode 100644 index 00000000..15448349 --- /dev/null +++ b/config/fish/functions/lsblk.fish @@ -0,0 +1,4 @@ +function lsblk --description 'alias lsblk=lsblk -o name,size,partuuid,fstype,mountpoints,label' + command lsblk -o name,size,partuuid,fstype,mountpoints,label $argv + +end -- 2.51.2