diff --git a/build_tools/diff_profiles.fish b/build_tools/diff_profiles.fish
index d96af3063..c58c3ced4 100644
--- a/build_tools/diff_profiles.fish
+++ b/build_tools/diff_profiles.fish
@@ -10,37 +10,37 @@ set profile2 (cat $argv[2])
 
 set line_no 0
 while set next_line_no (math $line_no + 1) && set -q profile1[$next_line_no] && set -q profile2[$next_line_no]
-	set line_no $next_line_no
+    set line_no $next_line_no
 
-	set line1 $profile1[$line_no]
-	set line2 $profile2[$line_no]
+    set line1 $profile1[$line_no]
+    set line2 $profile2[$line_no]
 
-	if not string match -qr '^\d+\t\d+' $line1
-		echo $line1
-		continue
-	end
+    if not string match -qr '^\d+\t\d+' $line1
+        echo $line1
+        continue
+    end
 
-	set results1 (string match -r '^(\d+)\t(\d+)\s+(.*)' $line1)
-	set results2 (string match -r '^(\d+)\t(\d+)\s+(.*)' $line2)
+    set results1 (string match -r '^(\d+)\t(\d+)\s+(.*)' $line1)
+    set results2 (string match -r '^(\d+)\t(\d+)\s+(.*)' $line2)
 
-	# times from both files
-	set time1 $results1[2..3]
-	set time2 $results2[2..3]
+    # times from both files
+    set time1 $results1[2..3]
+    set time2 $results2[2..3]
 
-	# leftover from both files
-	set remainder1 $results1[4]
-	set remainder2 $results2[4]
+    # leftover from both files
+    set remainder1 $results1[4]
+    set remainder2 $results2[4]
 
-	if not string match -q -- $remainder1 $remainder2
-		echo Mismatch on line $line_no:
-		echo - $remainder1
-		echo + $remainder2
-		exit 1
-	end
+    if not string match -q -- $remainder1 $remainder2
+        echo Mismatch on line $line_no:
+        echo - $remainder1
+        echo + $remainder2
+        exit 1
+    end
 
-	set -l diff
-	set diff[1] (math $time1[1] - $time2[1])
-	set diff[2] (math $time1[2] - $time2[2])
+    set -l diff
+    set diff[1] (math $time1[1] - $time2[1])
+    set diff[2] (math $time1[2] - $time2[2])
 
-	echo $diff[1] $diff[2] $remainder1
+    echo $diff[1] $diff[2] $remainder1
 end
diff --git a/share/completions/bat.fish b/share/completions/bat.fish
index 78741480d..036543fac 100644
--- a/share/completions/bat.fish
+++ b/share/completions/bat.fish
@@ -38,7 +38,7 @@ set -l italic_text_opts '
 '
 
 set -l decorations_opts "$color_opts"
-set -l paging_opts      "$color_opts"
+set -l paging_opts "$color_opts"
 
 set -l wrap_opts '
     auto\tdefault
@@ -55,34 +55,34 @@ set -l tabs_opts '
     8\t
 '
 
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s l -l language       -a  '(__bat_complete_languages_and_extensions)' -d 'Set language for syntax highlighting'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -f -s L -l list-language                                                  -d 'List supported languages for syntax highlighting'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s m -l map-syntax                                                     -d 'Map file name/extension to existing syntax'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l theme          -a  '(__bat_complete_themes)'                   -d 'Set theme for syntax highlighting'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -f      -l list-themes                                                    -d 'List syntax-highlighting themes'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l style          -a  "$style_opts"                               -d 'Choose what to add to the file contents'
-complete -c bat -n 'not __fish_seen_subcommand_from cache'    -s p -l plain                                                          -d 'Show no decorations; -pp disables paging too'
-complete -c bat -n 'not __fish_seen_subcommand_from cache'    -s n -l number                                                         -d 'Only show line numbers and no other decorations'
-complete -c bat -n 'not __fish_seen_subcommand_from cache'    -s A -l show-all                                                       -d 'Show non-printable characters'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s r -l line-range                                                     -d 'Only print lines from [M]:[N] (either optional)'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s H -l highlight-line                                                 -d 'Highlight the given line'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l color          -ka "$color_opts"                               -d 'Specify when to use colors'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l italic-text    -ka "$italic_text_opts"                         -d 'Specify when to use ANSI italic-text sequences'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l decorations    -ka "$decorations_opts"                         -d 'Specify when to use --style decorations'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l paging         -ka "$paging_opts"                              -d 'Specify when to use a pager'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l pager                                                          -d 'Specify what pager to use'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l wrap           -ka "$wrap_opts"                                -d 'Specify text-wrapping mode'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l tabs           -a  "$tabs_opts"                                -d 'Sets tab width to N spaces'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s l -l language -a '(__bat_complete_languages_and_extensions)' -d 'Set language for syntax highlighting'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -f -s L -l list-language -d 'List supported languages for syntax highlighting'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s m -l map-syntax -d 'Map file name/extension to existing syntax'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l theme -a '(__bat_complete_themes)' -d 'Set theme for syntax highlighting'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -f -l list-themes -d 'List syntax-highlighting themes'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l style -a "$style_opts" -d 'Choose what to add to the file contents'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -s p -l plain -d 'Show no decorations; -pp disables paging too'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -s n -l number -d 'Only show line numbers and no other decorations'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -s A -l show-all -d 'Show non-printable characters'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s r -l line-range -d 'Only print lines from [M]:[N] (either optional)'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s H -l highlight-line -d 'Highlight the given line'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l color -ka "$color_opts" -d 'Specify when to use colors'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l italic-text -ka "$italic_text_opts" -d 'Specify when to use ANSI italic-text sequences'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l decorations -ka "$decorations_opts" -d 'Specify when to use --style decorations'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l paging -ka "$paging_opts" -d 'Specify when to use a pager'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l pager -d 'Specify what pager to use'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l wrap -ka "$wrap_opts" -d 'Specify text-wrapping mode'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l tabs -a "$tabs_opts" -d 'Sets tab width to N spaces'
 # Don’t suggest the always-ignored added-only-for-POSIX-compliance -u/--unbuffered. Output is always unbuffered.
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l terminal-width                                                 -d 'Explicitly set terminal width, optionally prefixed with +/-'
-complete -c bat -n 'not __fish_seen_subcommand_from cache'    -s h -l help                                                           -d 'Print help'
-complete -c bat -n 'not __fish_seen_subcommand_from cache'    -s V -l version                                                        -d 'Show version information'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l terminal-width -d 'Explicitly set terminal width, optionally prefixed with +/-'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -s h -l help -d 'Print help'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -s V -l version -d 'Show version information'
 
 # cache things
-complete -c bat -n '__fish_use_subcommand'   -a cache                    -d 'Manage syntax-definition and theme cache'
-complete -c bat -n '__fish_seen_subcommand_from cache' -f -s b -l build  -d 'Initialize/update cache from the source directory'
-complete -c bat -n '__fish_seen_subcommand_from cache' -f -s c -l clear  -d 'Remove cached definitions and themes'
-complete -c bat -n '__fish_seen_subcommand_from cache' -r      -l source -d 'Specify directory to load syntaxes/themes from'
-complete -c bat -n '__fish_seen_subcommand_from cache' -r      -l target -d 'Specify directory to store cached syntaxes/themes'
-complete -c bat -n '__fish_seen_subcommand_from cache' -f      -l blank  -d 'Create completely new syntax/theme sets instead of appending to the defaults'
-complete -c bat -n '__fish_seen_subcommand_from cache' -f -s h -l help   -d 'Print help about cache management'
+complete -c bat -n '__fish_use_subcommand' -a cache -d 'Manage syntax-definition and theme cache'
+complete -c bat -n '__fish_seen_subcommand_from cache' -f -s b -l build -d 'Initialize/update cache from the source directory'
+complete -c bat -n '__fish_seen_subcommand_from cache' -f -s c -l clear -d 'Remove cached definitions and themes'
+complete -c bat -n '__fish_seen_subcommand_from cache' -r -l source -d 'Specify directory to load syntaxes/themes from'
+complete -c bat -n '__fish_seen_subcommand_from cache' -r -l target -d 'Specify directory to store cached syntaxes/themes'
+complete -c bat -n '__fish_seen_subcommand_from cache' -f -l blank -d 'Create completely new syntax/theme sets instead of appending to the defaults'
+complete -c bat -n '__fish_seen_subcommand_from cache' -f -s h -l help -d 'Print help about cache management'
diff --git a/share/completions/cwebp.fish b/share/completions/cwebp.fish
index a7434af83..3ce394730 100644
--- a/share/completions/cwebp.fish
+++ b/share/completions/cwebp.fish
@@ -89,58 +89,58 @@ function __fish_cwebp_is_first_arg_or_its_value -a 'arg' -d 'Like __fish_is_firs
     end
 end
 
-complete -c cwebp -f -o h -o help             -d 'Help (short)'
+complete -c cwebp -f -o h -o help -d 'Help (short)'
 complete -c cwebp -f -o H -o longhelp -l help -d 'Help (long)'
 
-complete -c cwebp -x -o q       -d 'Quality (float; 0…100; default: 75)'
+complete -c cwebp -x -o q -d 'Quality (float; 0…100; default: 75)'
 complete -c cwebp -x -o alpha_q -d 'Transparency-compression quality (integer 0…100; default: 100)'
 
 complete -c cwebp -x -n '__fish_cwebp_is_first_arg_or_its_value -preset' -o preset -a $preset_opts -d 'Preset setting'
 
-complete -c cwebp -x -o z        -a "$z_opts"        -d 'Lossless preset of level'
-complete -c cwebp -x -o m        -a "$m_opts"        -d 'Compression method'
+complete -c cwebp -x -o z -a "$z_opts" -d 'Lossless preset of level'
+complete -c cwebp -x -o m -a "$m_opts" -d 'Compression method'
 complete -c cwebp -x -o segments -a "$segments_opts" -d 'Number of segments to use'
-complete -c cwebp -x -o size                         -d 'Target size (in bytes)'
-complete -c cwebp -x -o psnr                         -d 'Target PSNR (in dB; typically: 42)'
+complete -c cwebp -x -o size -d 'Target size (in bytes)'
+complete -c cwebp -x -o psnr -d 'Target PSNR (in dB; typically: 42)'
 
-complete -c cwebp -x -o s                                       -d 'Input size (width x height) for YUV'
-complete -c cwebp -x -o sns                                     -d 'Spatial noise shaping (integer 0…100; default: 50)'
-complete -c cwebp -x -o f                                       -d 'Filter strength (integer 0…100; default: 60)'
-complete -c cwebp -x -o sharpness -a "$sharpness_opts"          -d 'Filter sharpness'
-complete -c cwebp    -o strong                                  -d 'Use strong filter'
-complete -c cwebp    -o simple                                  -d 'Use simple filter'
-complete -c cwebp    -o sharp_yuv                               -d 'Use sharper (and slower) RGB->YUV conversion'
-complete -c cwebp -x -o partition_limit                         -d 'Limit quality to fit the 512k limit on the first partition (integer 0:no degradation…100:full degradation)'
-complete -c cwebp -x -o pass -a '(__fish_cwebp_pass_opts)'      -d 'Analysis pass number'
-complete -c cwebp -x -o crop                                    -d 'Crop picture with <x> <y> <v> <h> rectangle'
-complete -c cwebp -x -o resize                                  -d 'Resize picture to <w> <h> after any cropping'
-complete -c cwebp    -o mt                                      -d 'Use multi-threading if available'
-complete -c cwebp    -o low_memory                              -d 'Reduce memory usage (slows encoding)'
-complete -c cwebp -x -o map                                     -d 'Print map of extra info'
-complete -c cwebp    -o print_psnr                              -d 'Print averaged PSNR distortion'
-complete -c cwebp    -o print_ssim                              -d 'Print averaged SSIM distortion'
-complete -c cwebp    -o print_lsim                              -d 'Print local-similarity distortion'
-complete -c cwebp -r -o d -a '(__fish_complete_suffix .pgm)'    -d 'Dump compressed output to given PGM file'
-complete -c cwebp -x -o alpha_method -a "$alpha_method_opts"    -d 'Transparency-compression method'
+complete -c cwebp -x -o s -d 'Input size (width x height) for YUV'
+complete -c cwebp -x -o sns -d 'Spatial noise shaping (integer 0…100; default: 50)'
+complete -c cwebp -x -o f -d 'Filter strength (integer 0…100; default: 60)'
+complete -c cwebp -x -o sharpness -a "$sharpness_opts" -d 'Filter sharpness'
+complete -c cwebp -o strong -d 'Use strong filter'
+complete -c cwebp -o simple -d 'Use simple filter'
+complete -c cwebp -o sharp_yuv -d 'Use sharper (and slower) RGB->YUV conversion'
+complete -c cwebp -x -o partition_limit -d 'Limit quality to fit the 512k limit on the first partition (integer 0:no degradation…100:full degradation)'
+complete -c cwebp -x -o pass -a '(__fish_cwebp_pass_opts)' -d 'Analysis pass number'
+complete -c cwebp -x -o crop -d 'Crop picture with <x> <y> <v> <h> rectangle'
+complete -c cwebp -x -o resize -d 'Resize picture to <w> <h> after any cropping'
+complete -c cwebp -o mt -d 'Use multi-threading if available'
+complete -c cwebp -o low_memory -d 'Reduce memory usage (slows encoding)'
+complete -c cwebp -x -o map -d 'Print map of extra info'
+complete -c cwebp -o print_psnr -d 'Print averaged PSNR distortion'
+complete -c cwebp -o print_ssim -d 'Print averaged SSIM distortion'
+complete -c cwebp -o print_lsim -d 'Print local-similarity distortion'
+complete -c cwebp -r -o d -a '(__fish_complete_suffix .pgm)' -d 'Dump compressed output to given PGM file'
+complete -c cwebp -x -o alpha_method -a "$alpha_method_opts" -d 'Transparency-compression method'
 complete -c cwebp -x -o alpha_filter -a "$alpha_filter_opts" -k -d 'Predictive filtering for alpha plane'
-complete -c cwebp -x -o exact                                   -d 'Preserve RGB values in transparent area'
-complete -c cwebp -x -o blend_alpha                             -d 'Blend colors against background color (e.g. 0xc0e0d0)'
-complete -c cwebp    -o noalpha                                 -d 'Discard any transparency information'
-complete -c cwebp    -o lossless                                -d 'Encode image losslessly'
-complete -c cwebp -x -o near_lossless                           -d 'Use near-lossless image preprocessing (integer 0…100:off; default: 100)'
-complete -c cwebp -x -o hint -a 'photo picture graph'           -d 'Specify image-characteristics hint'
+complete -c cwebp -x -o exact -d 'Preserve RGB values in transparent area'
+complete -c cwebp -x -o blend_alpha -d 'Blend colors against background color (e.g. 0xc0e0d0)'
+complete -c cwebp -o noalpha -d 'Discard any transparency information'
+complete -c cwebp -o lossless -d 'Encode image losslessly'
+complete -c cwebp -x -o near_lossless -d 'Use near-lossless image preprocessing (integer 0…100:off; default: 100)'
+complete -c cwebp -x -o hint -a 'photo picture graph' -d 'Specify image-characteristics hint'
 
-complete -c cwebp -x -o metadata -a "$metadata_opts"  -k -d 'Comma-separated list of metadata to copy, if present'
+complete -c cwebp -x -o metadata -a "$metadata_opts" -k -d 'Comma-separated list of metadata to copy, if present'
 
-complete -c cwebp -o short    -d 'Condense printed messages'
-complete -c cwebp -o quiet    -d 'Don\'t print anything'
-complete -c cwebp -o version  -d 'Print version number and exit'
-complete -c cwebp -o noasm    -d 'Disable all assembly optimizations'
-complete -c cwebp -o v        -d 'Be verbose (print encoding/decoding times)'
+complete -c cwebp -o short -d 'Condense printed messages'
+complete -c cwebp -o quiet -d 'Don\'t print anything'
+complete -c cwebp -o version -d 'Print version number and exit'
+complete -c cwebp -o noasm -d 'Disable all assembly optimizations'
+complete -c cwebp -o v -d 'Be verbose (print encoding/decoding times)'
 complete -c cwebp -o progress -d 'Report encoding progress'
 
-complete -c cwebp    -o jpeg_like -d 'Roughly match expected JPEG size'
-complete -c cwebp    -o af        -d 'Auto-adjust filter strength'
-complete -c cwebp -x -o pre       -d 'Pre-processing filter (integer)'
+complete -c cwebp -o jpeg_like -d 'Roughly match expected JPEG size'
+complete -c cwebp -o af -d 'Auto-adjust filter strength'
+complete -c cwebp -x -o pre -d 'Pre-processing filter (integer)'
 
 complete -c cwebp -r -o o -a '(__fish_complete_suffix .webp)' -d 'Output to file'
diff --git a/share/completions/env.fish b/share/completions/env.fish
index adcff27f9..3e231cc66 100644
--- a/share/completions/env.fish
+++ b/share/completions/env.fish
@@ -8,7 +8,7 @@ function __fish_complete_env_subcommand
     # Remove all VAR=VAL arguments up to the first that isn't
     while set -q argv[1]
         if string match -q '*=*' -- $argv[1]
-        or string match -q -- '-*' $argv[1]
+            or string match -q -- '-*' $argv[1]
             set -e argv[1]
         else
             break
diff --git a/share/completions/fzf.fish b/share/completions/fzf.fish
index bfdd62795..cf1327c90 100644
--- a/share/completions/fzf.fish
+++ b/share/completions/fzf.fish
@@ -22,13 +22,13 @@ complete -c fzf -l tiebreak -d 'Comma-separated list of sort criteria to apply w
 complete -c fzf -s m -l multi -d 'Enable multi-select with tab/shift-tab'
 complete -c fzf -l no-multi -d 'Disable multi-select'
 complete -c fzf -n 'string match "+*" -- (commandline -ct)' -a +m -d 'Disable multi-select'
-complete -c fzf -l no-mouse -d  'Disable mouse'
-complete -c fzf -l bind -d  'Comma-separated list of custom key bindings' -x
+complete -c fzf -l no-mouse -d 'Disable mouse'
+complete -c fzf -l bind -d 'Comma-separated list of custom key bindings' -x
 complete -c fzf -l cycle -d 'Enable cyclic scroll'
 complete -c fzf -l no-hscroll -d 'Disable horizontal scroll'
 complete -c fzf -l hscroll-off -d 'Number of screen columns to keep to the right of the highlighted substring' -x
 complete -c fzf -l filepath-word -d 'Make word-wise movements and actions respect path separators'
-complete -c fzf -l jump-labels  -d 'Make word-wise movements and actions respect path separators' -x
+complete -c fzf -l jump-labels -d 'Make word-wise movements and actions respect path separators' -x
 
 # layout
 complete -c fzf -l height -d 'Display fzf window below the cursor with the given height instead of using the full screen' -x
diff --git a/share/completions/go.fish b/share/completions/go.fish
index 7523214ef..b7be9ea36 100644
--- a/share/completions/go.fish
+++ b/share/completions/go.fish
@@ -75,40 +75,40 @@ complete -c go -n '__fish_seen_subcommand_from get' -o run -d "prints the names
 
 # help
 complete -c go -n '__fish_use_subcommand' -a help -d 'get help on topic'
-complete -c go -n '__fish_seen_subcommand_from help' -xa bug            -d "start a bug report"
-complete -c go -n '__fish_seen_subcommand_from help' -xa build          -d "compile packages and dependencies"
-complete -c go -n '__fish_seen_subcommand_from help' -xa clean          -d "remove object files and cached files"
-complete -c go -n '__fish_seen_subcommand_from help' -xa doc            -d "show documentation for package or symbol"
-complete -c go -n '__fish_seen_subcommand_from help' -xa env            -d "print Go environment information"
-complete -c go -n '__fish_seen_subcommand_from help' -xa fix            -d "update packages to use new APIs"
-complete -c go -n '__fish_seen_subcommand_from help' -xa fmt            -d "gofmt (reformat) package sources"
-complete -c go -n '__fish_seen_subcommand_from help' -xa generate       -d "generate Go files by processing source"
-complete -c go -n '__fish_seen_subcommand_from help' -xa get            -d "download and install packages and dependencies"
-complete -c go -n '__fish_seen_subcommand_from help' -xa install        -d "compile and install packages and dependencies"
-complete -c go -n '__fish_seen_subcommand_from help' -xa list           -d "list packages or modules"
-complete -c go -n '__fish_seen_subcommand_from help' -xa mod            -d "module maintenance"
-complete -c go -n '__fish_seen_subcommand_from help' -xa run            -d "compile and run Go program"
-complete -c go -n '__fish_seen_subcommand_from help' -xa test           -d "test packages"
-complete -c go -n '__fish_seen_subcommand_from help' -xa tool           -d "run specified go tool"
-complete -c go -n '__fish_seen_subcommand_from help' -xa version        -d "print Go version"
-complete -c go -n '__fish_seen_subcommand_from help' -xa vet            -d "report likely mistakes in packages"
-complete -c go -n '__fish_seen_subcommand_from help' -xa buildmode      -d "build modes"
-complete -c go -n '__fish_seen_subcommand_from help' -xa c              -d "calling between Go and C"
-complete -c go -n '__fish_seen_subcommand_from help' -xa cache          -d "build and test caching"
-complete -c go -n '__fish_seen_subcommand_from help' -xa environment    -d "environment variables"
-complete -c go -n '__fish_seen_subcommand_from help' -xa filetype       -d "file types"
-complete -c go -n '__fish_seen_subcommand_from help' -xa go.mod         -d "the go.mod file"
-complete -c go -n '__fish_seen_subcommand_from help' -xa gopath         -d "GOPATH environment variable"
-complete -c go -n '__fish_seen_subcommand_from help' -xa gopath-get     -d "legacy GOPATH go get"
-complete -c go -n '__fish_seen_subcommand_from help' -xa goproxy        -d "module proxy protocol"
-complete -c go -n '__fish_seen_subcommand_from help' -xa importpath     -d "import path syntax"
-complete -c go -n '__fish_seen_subcommand_from help' -xa modules        -d "modules, module versions, and more"
-complete -c go -n '__fish_seen_subcommand_from help' -xa module-get     -d "module-aware go get"
-complete -c go -n '__fish_seen_subcommand_from help' -xa module-auth    -d "module authentication using go.sum"
+complete -c go -n '__fish_seen_subcommand_from help' -xa bug -d "start a bug report"
+complete -c go -n '__fish_seen_subcommand_from help' -xa build -d "compile packages and dependencies"
+complete -c go -n '__fish_seen_subcommand_from help' -xa clean -d "remove object files and cached files"
+complete -c go -n '__fish_seen_subcommand_from help' -xa doc -d "show documentation for package or symbol"
+complete -c go -n '__fish_seen_subcommand_from help' -xa env -d "print Go environment information"
+complete -c go -n '__fish_seen_subcommand_from help' -xa fix -d "update packages to use new APIs"
+complete -c go -n '__fish_seen_subcommand_from help' -xa fmt -d "gofmt (reformat) package sources"
+complete -c go -n '__fish_seen_subcommand_from help' -xa generate -d "generate Go files by processing source"
+complete -c go -n '__fish_seen_subcommand_from help' -xa get -d "download and install packages and dependencies"
+complete -c go -n '__fish_seen_subcommand_from help' -xa install -d "compile and install packages and dependencies"
+complete -c go -n '__fish_seen_subcommand_from help' -xa list -d "list packages or modules"
+complete -c go -n '__fish_seen_subcommand_from help' -xa mod -d "module maintenance"
+complete -c go -n '__fish_seen_subcommand_from help' -xa run -d "compile and run Go program"
+complete -c go -n '__fish_seen_subcommand_from help' -xa test -d "test packages"
+complete -c go -n '__fish_seen_subcommand_from help' -xa tool -d "run specified go tool"
+complete -c go -n '__fish_seen_subcommand_from help' -xa version -d "print Go version"
+complete -c go -n '__fish_seen_subcommand_from help' -xa vet -d "report likely mistakes in packages"
+complete -c go -n '__fish_seen_subcommand_from help' -xa buildmode -d "build modes"
+complete -c go -n '__fish_seen_subcommand_from help' -xa c -d "calling between Go and C"
+complete -c go -n '__fish_seen_subcommand_from help' -xa cache -d "build and test caching"
+complete -c go -n '__fish_seen_subcommand_from help' -xa environment -d "environment variables"
+complete -c go -n '__fish_seen_subcommand_from help' -xa filetype -d "file types"
+complete -c go -n '__fish_seen_subcommand_from help' -xa go.mod -d "the go.mod file"
+complete -c go -n '__fish_seen_subcommand_from help' -xa gopath -d "GOPATH environment variable"
+complete -c go -n '__fish_seen_subcommand_from help' -xa gopath-get -d "legacy GOPATH go get"
+complete -c go -n '__fish_seen_subcommand_from help' -xa goproxy -d "module proxy protocol"
+complete -c go -n '__fish_seen_subcommand_from help' -xa importpath -d "import path syntax"
+complete -c go -n '__fish_seen_subcommand_from help' -xa modules -d "modules, module versions, and more"
+complete -c go -n '__fish_seen_subcommand_from help' -xa module-get -d "module-aware go get"
+complete -c go -n '__fish_seen_subcommand_from help' -xa module-auth -d "module authentication using go.sum"
 complete -c go -n '__fish_seen_subcommand_from help' -xa module-private -d "module configuration for non-public modules"
-complete -c go -n '__fish_seen_subcommand_from help' -xa packages       -d "package lists and patterns"
-complete -c go -n '__fish_seen_subcommand_from help' -xa testflag       -d "testing flags"
-complete -c go -n '__fish_seen_subcommand_from help' -xa testfunc       -d "testing functions"
+complete -c go -n '__fish_seen_subcommand_from help' -xa packages -d "package lists and patterns"
+complete -c go -n '__fish_seen_subcommand_from help' -xa testflag -d "testing flags"
+complete -c go -n '__fish_seen_subcommand_from help' -xa testfunc -d "testing functions"
 
 # install
 complete -c go -n '__fish_use_subcommand' -a install -d 'compile and install packages and dependencies'
@@ -146,10 +146,10 @@ complete -c go -n '__fish_seen_subcommand_from vet' -s x -d "prints commands as
 # mod
 complete -c go -n '__fish_use_subcommand' -a mod -d 'module maintenance'
 complete -c go -f -n '__fish_seen_subcommand_from mod' -a download -d "download modules to local cache"
-complete -c go -f -n '__fish_seen_subcommand_from mod' -a edit     -d "edit go.mod from tools or scripts"
-complete -c go -f -n '__fish_seen_subcommand_from mod' -a graph    -d "print module requirement graph"
-complete -c go -f -n '__fish_seen_subcommand_from mod' -a init     -d "initialize new module in current directory"
-complete -c go -f -n '__fish_seen_subcommand_from mod' -a tidy     -d "add missing and remove unused modules"
-complete -c go -f -n '__fish_seen_subcommand_from mod' -a vendor   -d "make vendored copy of dependencies"
-complete -c go -f -n '__fish_seen_subcommand_from mod' -a verify   -d "verify dependencies have expected content"
-complete -c go -f -n '__fish_seen_subcommand_from mod' -a why      -d "explain why packages or modules are needed"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a edit -d "edit go.mod from tools or scripts"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a graph -d "print module requirement graph"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a init -d "initialize new module in current directory"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a tidy -d "add missing and remove unused modules"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a vendor -d "make vendored copy of dependencies"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a verify -d "verify dependencies have expected content"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a why -d "explain why packages or modules are needed"
diff --git a/share/completions/hledger.fish b/share/completions/hledger.fish
index ec33a6cae..be74055d9 100644
--- a/share/completions/hledger.fish
+++ b/share/completions/hledger.fish
@@ -14,153 +14,153 @@ set -l debug_opts '
     9\t
 '
 
-set -l takes_general_input_flags     'add commodities files'
+set -l takes_general_input_flags 'add commodities files'
 set -l takes_general_reporting_flags 'import check-dates check-dupes close equity rewrite balancesheet bs balancesheetequity bse cashflow cf incomestatement is roi accounts a activity balance bal b prices print txns p print-unique register reg r register-match stats tags'
 
 # General input flags
-complete -c hledger -r -s f -l file              -d 'Input file'                                 -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
-complete -c hledger -r      -l rules-file        -d 'CSV-conversion-rules file'                  -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
-complete -c hledger -x      -l separator         -d 'CSV separator'                              -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
-complete -c hledger -r      -l alias             -d 'Rename account'                             -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
-complete -c hledger -f      -l anon              -d 'Anonymize accounts and payees'              -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
-complete -c hledger -x      -l pivot             -d 'Use some other field/tag for account names' -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
-complete -c hledger -x -s I -l ignore-assertions -d 'Ignore any balance assertions'              -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -r -s f -l file -d 'Input file' -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -r -l rules-file -d 'CSV-conversion-rules file' -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -x -l separator -d 'CSV separator' -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -r -l alias -d 'Rename account' -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -f -l anon -d 'Anonymize accounts and payees' -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -x -l pivot -d 'Use some other field/tag for account names' -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -x -s I -l ignore-assertions -d 'Ignore any balance assertions' -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
 
 # General reporting flags
-complete -c hledger -x -s b -l begin     -d 'Include postings/txns on or after this date'               -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -x -s e -l end       -d 'Include postings/txns before this date'                    -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s D -l daily     -d 'Multiperiod/multicolumn report by day'                     -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s W -l weekly    -d 'Multiperiod/multicolumn report by week'                    -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s M -l monthly   -d 'Multiperiod/multicolumn report by month'                   -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s Q -l quarterly -d 'Multiperiod/multicolumn report by quarter'                 -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s Y -l yearly    -d 'Multiperiod/multicolumn report by year'                    -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -x -s p -l period    -d 'Set start date, end date, and report interval'             -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f      -l date2     -d 'Match secondary date instead'                              -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s U -l unmarked  -d 'Include only unmarked postings/txns'                       -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s P -l pending   -d 'Include only pending (“!”) postings/txns'                  -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s C -l cleared   -d 'Include only cleared (“*”) postings/txns'                  -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s R -l real      -d 'Include only non-virtual postings'                         -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -x      -l depth     -d 'Hide accounts/postings deeper than this'                   -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s E -l empty     -d 'Show items with zero amount'                               -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s B -l cost      -d 'Converts amounts to their cost at txn time'                -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s V -l value     -d 'Converts amounts to their market value on report end date' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f      -l auto      -d 'Apply automated posting rules to modify txns'              -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f      -l forecast  -d 'Apply periodic txn rules to generate future txns'          -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -x -s b -l begin -d 'Include postings/txns on or after this date' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -x -s e -l end -d 'Include postings/txns before this date' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s D -l daily -d 'Multiperiod/multicolumn report by day' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s W -l weekly -d 'Multiperiod/multicolumn report by week' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s M -l monthly -d 'Multiperiod/multicolumn report by month' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s Q -l quarterly -d 'Multiperiod/multicolumn report by quarter' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s Y -l yearly -d 'Multiperiod/multicolumn report by year' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -x -s p -l period -d 'Set start date, end date, and report interval' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -l date2 -d 'Match secondary date instead' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s U -l unmarked -d 'Include only unmarked postings/txns' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s P -l pending -d 'Include only pending (“!”) postings/txns' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s C -l cleared -d 'Include only cleared (“*”) postings/txns' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s R -l real -d 'Include only non-virtual postings' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -x -l depth -d 'Hide accounts/postings deeper than this' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s E -l empty -d 'Show items with zero amount' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s B -l cost -d 'Converts amounts to their cost at txn time' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s V -l value -d 'Converts amounts to their market value on report end date' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -l auto -d 'Apply automated posting rules to modify txns' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -l forecast -d 'Apply periodic txn rules to generate future txns' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
 
 # General help flags
-complete -c hledger -x -s h -l help                   -d 'Show help for this command'
-complete -c hledger -x      -l debug -a "$debug_opts" -d 'Show debug output'
-complete -c hledger -x      -l version                -d 'Show version information'
+complete -c hledger -x -s h -l help -d 'Show help for this command'
+complete -c hledger -x -l debug -a "$debug_opts" -d 'Show debug output'
+complete -c hledger -x -l version -d 'Show version information'
 
 # Commands
 
 # Data entry
-complete -c hledger -f -n '__fish_use_subcommand'   -a add                     -d 'Add transactions using guided prompts'
+complete -c hledger -f -n '__fish_use_subcommand' -a add -d 'Add transactions using guided prompts'
 complete -c hledger -f -n '__fish_seen_subcommand_from add' -l no-new-accounts -d 'Don’t allow creating new accounts'
 
-complete -c hledger    -n '__fish_use_subcommand'   -a import             -d 'Add new transactions from other files'
+complete -c hledger -n '__fish_use_subcommand' -a import -d 'Add new transactions from other files'
 complete -c hledger -f -n '__fish_seen_subcommand_from import' -l dry-run -d 'Just show the transactions to be imported'
 
 # Data management
-complete -c hledger -f -n '__fish_use_subcommand'   -a check-dates            -d 'Ensure transactions are ordered by date'
+complete -c hledger -f -n '__fish_use_subcommand' -a check-dates -d 'Ensure transactions are ordered by date'
 complete -c hledger -f -n '__fish_seen_subcommand_from check-dates' -l strict -d 'Makes date comparing strict'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a check-dupes    -d 'Ensure accounts have different leaf names'
+complete -c hledger -f -n '__fish_use_subcommand' -a check-dupes -d 'Ensure accounts have different leaf names'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a  'close equity'     -d 'Generate balance-resetting transactions'
+complete -c hledger -f -n '__fish_use_subcommand' -a 'close equity' -d 'Generate balance-resetting transactions'
 complete -c hledger -f -n '__fish_seen_subcommand_from close' -l opening -d 'Show just opening transaction'
 complete -c hledger -f -n '__fish_seen_subcommand_from close' -l closing -d 'Show just closing transaction'
 
-complete -c hledger -f -n '__fish_use_subcommand'   -a rewrite                 -d 'Generate automated postings/diffs'
+complete -c hledger -f -n '__fish_use_subcommand' -a rewrite -d 'Generate automated postings/diffs'
 complete -c hledger -f -n '__fish_seen_subcommand_from rewrite' -l add-posting -d 'Add a posting to account'
-complete -c hledger -f -n '__fish_seen_subcommand_from rewrite' -l diff        -d 'Generate diff suitable for patch(1)'
+complete -c hledger -f -n '__fish_seen_subcommand_from rewrite' -l diff -d 'Generate diff suitable for patch(1)'
 
 # Financial reports
 set -l financial_reports_commands 'balancesheet bs balancesheetequity bse cashflow cf incomestatement is' # these four (but not roi!) use the same commands
-complete -c hledger -f -n '__fish_use_subcommand' -a 'balancesheet       bs'                                                -d 'Show assets, liabilities, and net worth'
-complete -c hledger -f -n '__fish_use_subcommand' -a 'balancesheetequity bse'                                               -d 'Show assets, liabilities, and equity'
-complete -c hledger -f -n '__fish_use_subcommand' -a 'cashflow           cf'                                                -d 'Show changes in liquid assets'
-complete -c hledger -f -n '__fish_use_subcommand' -a 'incomestatement    is'                                                -d 'Show revenues and expenses'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands"      -l change                          -d 'Show balance change in each period'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands"      -l cumulative                      -d 'Show balance change accumulated across periods'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s H -l historical                      -d 'Show historical ending balance in each period'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands"      -l flat                            -d 'Show accounts as a list'
-complete -c hledger -x -n "__fish_seen_subcommand_from $financial_reports_commands"      -l drop                            -d 'Omit N leading account-name parts (in flat mode)'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s N -l no-total                        -d 'Omit the final total row'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands"      -l tree                            -d 'Show accounts as a tree; amounts include subaccounts'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s A -l average                         -d 'Show a row average column in multicolumn reports'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s T -l row-total                       -d 'Show a row total column in multicolumn reports'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands"      -l no-elide                        -d 'Don’t squash boring parent accounts in tree mode'
-complete -c hledger -x -n "__fish_seen_subcommand_from $financial_reports_commands"      -l format                          -d 'Use a custom line format in multicolumn reports'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands"      -l pretty-tables                   -d 'Use Unicode when displaying tables'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s S -l sort-amount                     -d 'Sort by amount instead of account code/name'
+complete -c hledger -f -n '__fish_use_subcommand' -a 'balancesheet       bs' -d 'Show assets, liabilities, and net worth'
+complete -c hledger -f -n '__fish_use_subcommand' -a 'balancesheetequity bse' -d 'Show assets, liabilities, and equity'
+complete -c hledger -f -n '__fish_use_subcommand' -a 'cashflow           cf' -d 'Show changes in liquid assets'
+complete -c hledger -f -n '__fish_use_subcommand' -a 'incomestatement    is' -d 'Show revenues and expenses'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -l change -d 'Show balance change in each period'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -l cumulative -d 'Show balance change accumulated across periods'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s H -l historical -d 'Show historical ending balance in each period'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -l flat -d 'Show accounts as a list'
+complete -c hledger -x -n "__fish_seen_subcommand_from $financial_reports_commands" -l drop -d 'Omit N leading account-name parts (in flat mode)'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s N -l no-total -d 'Omit the final total row'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -l tree -d 'Show accounts as a tree; amounts include subaccounts'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s A -l average -d 'Show a row average column in multicolumn reports'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s T -l row-total -d 'Show a row total column in multicolumn reports'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -l no-elide -d 'Don’t squash boring parent accounts in tree mode'
+complete -c hledger -x -n "__fish_seen_subcommand_from $financial_reports_commands" -l format -d 'Use a custom line format in multicolumn reports'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -l pretty-tables -d 'Use Unicode when displaying tables'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s S -l sort-amount -d 'Sort by amount instead of account code/name'
 complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s O -l output-format -a 'txt csv html' -d 'Select an output format'
-complete -c hledger -r -n "__fish_seen_subcommand_from $financial_reports_commands" -s o -l output-file                     -d 'Write output to given file; extension selects format'
+complete -c hledger -r -n "__fish_seen_subcommand_from $financial_reports_commands" -s o -l output-file -d 'Write output to given file; extension selects format'
 
-complete -c hledger -f -n '__fish_use_subcommand'   -a roi                        -d 'Show return on investments'
-complete -c hledger -f -n '__fish_seen_subcommand_from roi' -l cashflow           -d 'Show all amounts that were used to compute returns'
-complete -c hledger -x -n '__fish_seen_subcommand_from roi' -l investment         -d 'Query to select investment transactions'
+complete -c hledger -f -n '__fish_use_subcommand' -a roi -d 'Show return on investments'
+complete -c hledger -f -n '__fish_seen_subcommand_from roi' -l cashflow -d 'Show all amounts that were used to compute returns'
+complete -c hledger -x -n '__fish_seen_subcommand_from roi' -l investment -d 'Query to select investment transactions'
 complete -c hledger -x -n '__fish_seen_subcommand_from roi' -l profit-loss -l pnl -d 'Query to select profit-and-loss or appreciation/valuation transactions'
 
 # Low-level reports
-complete -c hledger -f -n '__fish_use_subcommand'   -a accounts              -d 'Show account names'
+complete -c hledger -f -n '__fish_use_subcommand' -a accounts -d 'Show account names'
 complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l declared -d 'Show account names declared with account directives'
-complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l used     -d 'Show account names referenced by transactions'
-complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l tree     -d 'Show short account names as a tree'
-complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l flat     -d 'Show short account names as a list'
-complete -c hledger -x -n '__fish_seen_subcommand_from accounts' -l drop     -d 'Omit N leading account name parts in flat mode'
+complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l used -d 'Show account names referenced by transactions'
+complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l tree -d 'Show short account names as a tree'
+complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l flat -d 'Show short account names as a list'
+complete -c hledger -x -n '__fish_seen_subcommand_from accounts' -l drop -d 'Omit N leading account name parts in flat mode'
 
 complete -c hledger -f -n '__fish_use_subcommand' -a activity -d 'Show postings-per-interval bar charts'
 
-complete -c hledger -f -n '__fish_use_subcommand'   -a balance                                          -d 'Show balance changes/end balances/budgets in accounts'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l change                          -d 'Show balance change in each period'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l cumulative                      -d 'Show balance change accumulated across periods'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s H -l historical                      -d 'Show historical ending balance in each period'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l tree                            -d 'Show accounts as a tree'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l flat                            -d 'Show accounts as a list'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s A -l average                         -d 'Show a row average column in multicolumn reports'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s T -l row-total                       -d 'Show a row total column in multicolumn reports'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s N -l no-total                        -d 'Omit the final row'
-complete -c hledger -x -n '__fish_seen_subcommand_from balance'      -l drop                            -d 'Omit N leading account name parts in flat mode'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l no-elide                        -d 'Don’t squash boring parent accounts in tree mode'
-complete -c hledger -x -n '__fish_seen_subcommand_from balance'      -l format                          -d 'Use a custom line format in multicolumn reports'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l pretty-tables                   -d 'Use Unicode when displaying tables'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s S -l sort-amount                     -d 'Sort by amount instead of account code/name'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l budget                          -d 'Show performance compared to budget goals defined by periodic transactions'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l invert                          -d 'Display all amounts with reversed sign'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l transpose                       -d 'Transpose rows and columns'
+complete -c hledger -f -n '__fish_use_subcommand' -a balance -d 'Show balance changes/end balances/budgets in accounts'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l change -d 'Show balance change in each period'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l cumulative -d 'Show balance change accumulated across periods'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s H -l historical -d 'Show historical ending balance in each period'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l tree -d 'Show accounts as a tree'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l flat -d 'Show accounts as a list'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s A -l average -d 'Show a row average column in multicolumn reports'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s T -l row-total -d 'Show a row total column in multicolumn reports'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s N -l no-total -d 'Omit the final row'
+complete -c hledger -x -n '__fish_seen_subcommand_from balance' -l drop -d 'Omit N leading account name parts in flat mode'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l no-elide -d 'Don’t squash boring parent accounts in tree mode'
+complete -c hledger -x -n '__fish_seen_subcommand_from balance' -l format -d 'Use a custom line format in multicolumn reports'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l pretty-tables -d 'Use Unicode when displaying tables'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s S -l sort-amount -d 'Sort by amount instead of account code/name'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l budget -d 'Show performance compared to budget goals defined by periodic transactions'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l invert -d 'Display all amounts with reversed sign'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l transpose -d 'Transpose rows and columns'
 complete -c hledger -x -n '__fish_seen_subcommand_from balance' -s O -l output-format -a 'txt csv html' -d 'Select an output format'
-complete -c hledger -r -n '__fish_seen_subcommand_from balance' -s o -l output-file                     -d 'Write output to given file; extension selects format'
+complete -c hledger -r -n '__fish_seen_subcommand_from balance' -s o -l output-file -d 'Write output to given file; extension selects format'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a commodities    -d 'Show commodity/currency symbols'
+complete -c hledger -f -n '__fish_use_subcommand' -a commodities -d 'Show commodity/currency symbols'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a files          -d 'Show input file paths'
+complete -c hledger -f -n '__fish_use_subcommand' -a files -d 'Show input file paths'
 
-complete -c hledger -f -n '__fish_use_subcommand'   -a prices                    -d 'Show market-price records'
-complete -c hledger -f -n '__fish_seen_subcommand_from prices' -l costs          -d 'Print transaction prices from postings'
+complete -c hledger -f -n '__fish_use_subcommand' -a prices -d 'Show market-price records'
+complete -c hledger -f -n '__fish_seen_subcommand_from prices' -l costs -d 'Print transaction prices from postings'
 complete -c hledger -f -n '__fish_seen_subcommand_from prices' -l inverted-costs -d 'Print transaction inverted prices from postings also'
 
-complete -c hledger -f -n '__fish_use_subcommand'  -a 'print txns'                                                      -d 'Show transactions'
-complete -c hledger -f -n '__fish_use_subcommand'  -a            'print-unique'                                         -d 'Show only transactions with unique descriptions'
-complete -c hledger -x -n '__fish_seen_subcommand_from print txns print-unique' -s m -l match                           -d 'Show the most-recent transaction most similar to STR'
-complete -c hledger -f -n '__fish_seen_subcommand_from print txns print-unique' -s x -l explicit                        -d 'Show all amounts explicitly'
-complete -c hledger -f -n '__fish_seen_subcommand_from print txns print-unique'      -l new                             -d 'Show only newer-dated transactions added in each file since last run'
+complete -c hledger -f -n '__fish_use_subcommand' -a 'print txns' -d 'Show transactions'
+complete -c hledger -f -n '__fish_use_subcommand' -a 'print-unique' -d 'Show only transactions with unique descriptions'
+complete -c hledger -x -n '__fish_seen_subcommand_from print txns print-unique' -s m -l match -d 'Show the most-recent transaction most similar to STR'
+complete -c hledger -f -n '__fish_seen_subcommand_from print txns print-unique' -s x -l explicit -d 'Show all amounts explicitly'
+complete -c hledger -f -n '__fish_seen_subcommand_from print txns print-unique' -l new -d 'Show only newer-dated transactions added in each file since last run'
 complete -c hledger -x -n '__fish_seen_subcommand_from print txns print-unique' -s O -l output-format -a 'txt csv html' -d 'Select an output format'
-complete -c hledger -r -n '__fish_seen_subcommand_from print txns print-unique' -s o -l output-file                     -d 'Write output to given file; extension selects format'
+complete -c hledger -r -n '__fish_seen_subcommand_from print txns print-unique' -s o -l output-file -d 'Write output to given file; extension selects format'
 
-complete -c hledger -f -n '__fish_use_subcommand'   -a register                                          -d 'Show postings in one or more accounts & running total'
-complete -c hledger -f -n '__fish_seen_subcommand_from register'      -l cumulative                      -d 'Show running total from report start date'
-complete -c hledger -f -n '__fish_seen_subcommand_from register' -s H -l historical                      -d 'Show historical running total/balance'
-complete -c hledger -f -n '__fish_seen_subcommand_from register' -s A -l average                         -d 'Show running average of posting amounts instead of total (implies --empty)'
-complete -c hledger -f -n '__fish_seen_subcommand_from register' -s r -l related                         -d 'Show postings’ siblings instead'
-complete -c hledger -f -n '__fish_seen_subcommand_from register'      -l invert                          -d 'Display all amounts with reversed sign'
-complete -c hledger -x -n '__fish_seen_subcommand_from register' -s w -l width                           -d 'Set output width (defaults to terminal width or $COLUMNS)'
+complete -c hledger -f -n '__fish_use_subcommand' -a register -d 'Show postings in one or more accounts & running total'
+complete -c hledger -f -n '__fish_seen_subcommand_from register' -l cumulative -d 'Show running total from report start date'
+complete -c hledger -f -n '__fish_seen_subcommand_from register' -s H -l historical -d 'Show historical running total/balance'
+complete -c hledger -f -n '__fish_seen_subcommand_from register' -s A -l average -d 'Show running average of posting amounts instead of total (implies --empty)'
+complete -c hledger -f -n '__fish_seen_subcommand_from register' -s r -l related -d 'Show postings’ siblings instead'
+complete -c hledger -f -n '__fish_seen_subcommand_from register' -l invert -d 'Display all amounts with reversed sign'
+complete -c hledger -x -n '__fish_seen_subcommand_from register' -s w -l width -d 'Set output width (defaults to terminal width or $COLUMNS)'
 complete -c hledger -x -n '__fish_seen_subcommand_from register' -s O -l output-format -a 'txt csv html' -d 'Select an output format'
-complete -c hledger -r -n '__fish_seen_subcommand_from register' -s o -l output-file                     -d 'Write output to given file; extension selects format'
+complete -c hledger -r -n '__fish_seen_subcommand_from register' -s o -l output-file -d 'Write output to given file; extension selects format'
 
 complete -c hledger -f -n '__fish_use_subcommand' -a register-match -d 'Show a recent posting that best matches a description'
 
-complete -c hledger -f -n '__fish_use_subcommand'   -a stats                      -d 'Show journal statistics'
+complete -c hledger -f -n '__fish_use_subcommand' -a stats -d 'Show journal statistics'
 complete -c hledger -r -n '__fish_seen_subcommand_from stats' -s o -l output-file -d 'Write output to given file; extension selects format'
 
 complete -c hledger -f -n '__fish_use_subcommand' -a tags -d 'Show tag names'
diff --git a/share/completions/keybase.fish b/share/completions/keybase.fish
index 4fa7660df..7d35f70bd 100644
--- a/share/completions/keybase.fish
+++ b/share/completions/keybase.fish
@@ -3,7 +3,9 @@
 function __fish_keybase_line_ends_with
     set -l line (commandline -poc | string match -v -r '^-')
     for i in (seq -1 -1 -(count $argv))
-        if test "$line[$i]" != "$argv[$i]"; return 1; end
+        if test "$line[$i]" != "$argv[$i]"
+            return 1
+        end
     end
 end
 
diff --git a/share/completions/pipenv.fish b/share/completions/pipenv.fish
index 45ae4ed25..cb05df286 100644
--- a/share/completions/pipenv.fish
+++ b/share/completions/pipenv.fish
@@ -1,5 +1,5 @@
 if command -sq pipenv
     # pipenv determines which completions to print via some automagic that might not be perfect.
     # Force it to be correct.
-    _PIPENV_COMPLETE=source-fish  pipenv --completion 2>/dev/null | source
+    _PIPENV_COMPLETE=source-fish pipenv --completion 2>/dev/null | source
 end
diff --git a/share/completions/setxkbmap.fish b/share/completions/setxkbmap.fish
index 3ef699ce1..4076f6d5a 100644
--- a/share/completions/setxkbmap.fish
+++ b/share/completions/setxkbmap.fish
@@ -1,5 +1,5 @@
 function __fish_complete_setxkbmap --description 'Complete setxkb options' --argument-names what
-     sed -e "1,/! $what/d" -e '/^\s*$/,$d' /usr/share/X11/xkb/rules/xorg.lst | sed -r 's/\s+(\S+)\s+(.+)/\1\t\2/'
+    sed -e "1,/! $what/d" -e '/^\s*$/,$d' /usr/share/X11/xkb/rules/xorg.lst | sed -r 's/\s+(\S+)\s+(.+)/\1\t\2/'
 end
 
 set -l filter '"s/\S+\s\S+\s(.+)\((.+)\)/\1\t\2/;"'
diff --git a/share/completions/sfdx.fish b/share/completions/sfdx.fish
index 84f274a78..b5c98cffa 100644
--- a/share/completions/sfdx.fish
+++ b/share/completions/sfdx.fish
@@ -23,380 +23,380 @@ set -l sfdx_loglevels 'trace debug info warn error fatal TRACE DEBUG INFO WARN E
 # commands
 #
 complete $sfdx_looking -xa commands -d 'list all the commands'
-complete -c sfdx -n '__fish_sfdx_using_command commands' -s h -l help   -d 'show CLI help'
-complete -c sfdx -n '__fish_sfdx_using_command commands' -s j -l json   -d 'output in json format'
-complete -c sfdx -n '__fish_sfdx_using_command commands'      -l hidden -d 'also show hidden commands'
+complete -c sfdx -n '__fish_sfdx_using_command commands' -s h -l help -d 'show CLI help'
+complete -c sfdx -n '__fish_sfdx_using_command commands' -s j -l json -d 'output in json format'
+complete -c sfdx -n '__fish_sfdx_using_command commands' -l hidden -d 'also show hidden commands'
 
 #
 # force
 #
 complete $sfdx_looking -xa force -d 'tools for the Salesforce developer'
-complete -c sfdx -n '__fish_sfdx_using_command force' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:alias -d 'manage username aliases'
 
 complete $sfdx_looking -xa force:alias:list -d 'list username aliases for the Salesforce CLI'
-complete -c sfdx -n '__fish_sfdx_using_command force:alias:list' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:alias:list' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force:alias:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
-complete $sfdx_looking -xa force:alias:set  -d 'set username aliases for the Salesforce CLI'
-complete -c sfdx -n '__fish_sfdx_using_command force:alias:set' -l json     -d 'format output as json'
+complete $sfdx_looking -xa force:alias:set -d 'set username aliases for the Salesforce CLI'
+complete -c sfdx -n '__fish_sfdx_using_command force:alias:set' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force:alias:set' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:apex -d 'work with Apex code'
 
 complete $sfdx_looking -xa force:apex:execute -d 'execute anonymous Apex code'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute' -s f -l apexcodefile   -d 'path to a local file containing Apex code'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute' -s f -l apexcodefile -d 'path to a local file containing Apex code'
 complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:apex:class -d 'create an Apex class'
 
 complete $sfdx_looking -xa force:apex:class:create -d 'create an Apex class'
 complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -s a -l apiversion -d '[default: 46.0] API version number'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -s d -l outputdir  -d 'folder for saving the created files'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -s n -l classname  -d '(required) name of the generated Apex class'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -s t -l template   -d '[default: DefaultApexClass] template to use for file creation' -xa 'DefaultApexClass ApexException ApexUnitTest InboundEmailService'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create'      -l json       -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create'      -l loglevel   -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -s d -l outputdir -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -s n -l classname -d '(required) name of the generated Apex class'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -s t -l template -d '[default: DefaultApexClass] template to use for file creation' -xa 'DefaultApexClass ApexException ApexUnitTest InboundEmailService'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:apex:log -d 'work with Apex logs'
 
 complete $sfdx_looking -xa force:apex:log:get -d 'fetch the last debug log'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -s c -l color          -d 'colorize noteworthy log lines'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -s i -l logid          -d 'ID of the log to display'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -s n -l number         -d 'number of most recent logs to display'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -s c -l color -d 'colorize noteworthy log lines'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -s i -l logid -d 'ID of the log to display'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -s n -l number -d 'number of most recent logs to display'
 complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:apex:log:list -d 'list debug logs'
 complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:list' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:list'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:list'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:list'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:list' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:apex:log:tail -d 'start debug logging and display logs'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -s c -l color          -d 'colorize noteworthy log lines'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -s d -l debuglevel     -d 'debug level for trace flag'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -s s -l skiptraceflag  -d 'skip trace flag setup'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -s c -l color -d 'colorize noteworthy log lines'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -s d -l debuglevel -d 'debug level for trace flag'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -s s -l skiptraceflag -d 'skip trace flag setup'
 complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:apex:test -d 'work with Apex tests'
 
 complete $sfdx_looking -xa force:apex:test:report -d 'display test results'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s c -l codecoverage   -d 'retrieve code coverage results'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s d -l outputdir      -d 'directory to store test run files'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s i -l testrunid      -d '(required) ID of test run'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s r -l resultformat   -d '[default: human] result format emitted to stdout; --json flag overrides this parameter' -xa 'human tap junit json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s c -l codecoverage -d 'retrieve code coverage results'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s d -l outputdir -d 'directory to store test run files'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s i -l testrunid -d '(required) ID of test run'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s r -l resultformat -d '[default: human] result format emitted to stdout; --json flag overrides this parameter' -xa 'human tap junit json'
 complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s w -l wait           -d '[default: 6 minutes] the streaming client socket timeout (in minutes)'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report'      -l verbose        -d 'display Apex test processing details'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s w -l wait -d '[default: 6 minutes] the streaming client socket timeout (in minutes)'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -l verbose -d 'display Apex test processing details'
 
 complete $sfdx_looking -xa force:apex:test:run -d 'invoke Apex tests'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s c -l codecoverage   -d 'retrieve code coverage results'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s d -l outputdir      -d 'directory to store test run files'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s l -l testlevel      -d 'testlevel enum value' -xa 'RunLocalTests RunAllTestsInOrg RunSpecifiedTests'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s n -l classnames     -d 'comma-separated list of Apex test class names to run'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s r -l resultformat   -d 'result format emitted to stdout; --json flag overrides this parameter' -xa 'human tap junit json'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s s -l suitenames     -d 'comma-separated list of Apex test suite names to run'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s t -l tests          -d 'comma-separated list of Apex test class names or IDs and, if applicable, test methods to run'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s c -l codecoverage -d 'retrieve code coverage results'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s d -l outputdir -d 'directory to store test run files'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s l -l testlevel -d 'testlevel enum value' -xa 'RunLocalTests RunAllTestsInOrg RunSpecifiedTests'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s n -l classnames -d 'comma-separated list of Apex test class names to run'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s r -l resultformat -d 'result format emitted to stdout; --json flag overrides this parameter' -xa 'human tap junit json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s s -l suitenames -d 'comma-separated list of Apex test suite names to run'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s t -l tests -d 'comma-separated list of Apex test class names or IDs and, if applicable, test methods to run'
 complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s w -l wait           -d 'the streaming client socket timeout (in minutes)'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s y -l synchronous    -d 'run tests from a single class synchronously'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run'      -l verbose        -d 'display Apex test processing details'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s w -l wait -d 'the streaming client socket timeout (in minutes)'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s y -l synchronous -d 'run tests from a single class synchronously'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -l verbose -d 'display Apex test processing details'
 
 complete $sfdx_looking -xa force:apex:trigger -d 'create an Apex trigger'
 
 complete $sfdx_looking -xa force:apex:trigger:create -d 'create an Apex trigger'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s a -l apiversion    -d '[default: 46.0] API version number'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s d -l outputdir     -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s a -l apiversion -d '[default: 46.0] API version number'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s d -l outputdir -d 'folder for saving the created files'
 complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s e -l triggerevents -d '[default: before insert] events that fire the trigger (before insert|before update|before delete|after insert|after update|after delete|after undelete)'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s n -l triggername   -d '(required) name of the generated Apex trigger'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s s -l sobject       -d '[default: SOBJECT] sObject to create a trigger on'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s t -l template      -d '[default: ApexTrigger] template to use for file creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create'      -l json          -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create'      -l loglevel      -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s n -l triggername -d '(required) name of the generated Apex trigger'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s s -l sobject -d '[default: SOBJECT] sObject to create a trigger on'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s t -l template -d '[default: ApexTrigger] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:auth -d 'authorize an org for use with the Salesforce'
 
 complete $sfdx_looking -xa force:auth:list -d 'list auth connection information'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:list' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:list' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force:auth:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:auth:logout -d 'log out from authorized orgs'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -s a -l all            -d 'include all authenticated orgs'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -s p -l noprompt       -d 'do not prompt for confirmation'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -s a -l all -d 'include all authenticated orgs'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -s p -l noprompt -d 'do not prompt for confirmation'
 complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:auth:jwt -d 'authorize an org using JWT'
 
 complete $sfdx_looking -xa force:auth:jwt:grant -d 'authorize an org using the JWT flow'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s a -l setalias                 -d 'set an alias for the authenticated org'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s a -l setalias -d 'set an alias for the authenticated org'
 complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s d -l setdefaultdevhubusername -d 'set the authenticated org as the default dev hub org for scratch org creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s f -l jwtkeyfile               -d '(required) path to a file containing the private key'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s i -l clientid                 -d '(required) OAuth client ID (sometimes called the consumer key)'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s r -l instanceurl              -d 'the login URL of the instance the org lives on'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s s -l setdefaultusername       -d 'set the authenticated org as the default username that all commands run against'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s u -l username                 -d '(required) authentication username'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant'      -l json                     -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant'      -l loglevel                 -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s f -l jwtkeyfile -d '(required) path to a file containing the private key'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s i -l clientid -d '(required) OAuth client ID (sometimes called the consumer key)'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s r -l instanceurl -d 'the login URL of the instance the org lives on'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s s -l setdefaultusername -d 'set the authenticated org as the default username that all commands run against'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s u -l username -d '(required) authentication username'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:auth:sfdxurl -d 'authorize an org using sfdxurl'
 
 complete $sfdx_looking -xa force:auth:sfdxurl:store -d 'authorize an org using an SFDX auth URL'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -s a -l setalias                 -d 'set an alias for the authenticated org'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -s a -l setalias -d 'set an alias for the authenticated org'
 complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -s d -l setdefaultdevhubusername -d 'set the authenticated org as the default dev hub org for scratch org creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -s f -l sfdxurlfile              -d '(required) path to a file containing the sfdx url'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -s s -l setdefaultusername       -d 'set the authenticated org as the default username that all commands run against'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store'      -l json                     -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store'      -l loglevel                 -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -s f -l sfdxurlfile -d '(required) path to a file containing the sfdx url'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -s s -l setdefaultusername -d 'set the authenticated org as the default username that all commands run against'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:auth:web -d 'authorize an org using a web browser'
 
 complete $sfdx_looking -xa force:auth:web:login -d 'authorize an org using the web login flow'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s a -l setalias                 -d 'set an alias for the authenticated org'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s a -l setalias -d 'set an alias for the authenticated org'
 complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s d -l setdefaultdevhubusername -d 'set the authenticated org as the default dev hub org for scratch org creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s i -l clientid                 -d '(required) OAuth client ID (sometimes called the consumer key)'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s r -l instanceurl              -d 'the login URL of the instance the org lives on'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s s -l setdefaultusername       -d 'set the authenticated org as the default username that all commands run against'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login'      -l json                     -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login'      -l loglevel                 -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s i -l clientid -d '(required) OAuth client ID (sometimes called the consumer key)'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s r -l instanceurl -d 'the login URL of the instance the org lives on'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s s -l setdefaultusername -d 'set the authenticated org as the default username that all commands run against'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:config -d 'configure the Salesforce CLI'
 
 complete $sfdx_looking -xa force:config:get -d 'get config var values for given names'
-complete -c sfdx -n '__fish_sfdx_using_command force:config:get' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:config:get' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force:config:get' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:config:get' -l verbose  -d 'emit additional command output to stdout'
+complete -c sfdx -n '__fish_sfdx_using_command force:config:get' -l verbose -d 'emit additional command output to stdout'
 
 complete $sfdx_looking -xa force:config:list -d 'list config vars for the Salesforce CLI'
-complete -c sfdx -n '__fish_sfdx_using_command force:config:list' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:config:list' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force:config:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:config:set -d 'set config vars for the Salesforce CLI'
-complete -c sfdx -n '__fish_sfdx_using_command force:config:set' -s g -l global   -d 'set config var globally (to be used from any directory)'
-complete -c sfdx -n '__fish_sfdx_using_command force:config:set'      -l json     -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:config:set'      -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:config:set' -s g -l global -d 'set config var globally (to be used from any directory)'
+complete -c sfdx -n '__fish_sfdx_using_command force:config:set' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:config:set' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:data -d 'manipulate records in your org'
 
 complete $sfdx_looking -xa force:data:bulk -d 'manipulate records using the bulk API'
 
 complete $sfdx_looking -xa force:data:bulk:delete -d 'bulk delete records from a csv file'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s f -l csvfile        -d '(required) the path to the CSV file containing the ids of the records to delete'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s s -l sobjecttype    -d '(required) the sObject type of the records you’re deleting'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s f -l csvfile -d '(required) the path to the CSV file containing the ids of the records to delete'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s s -l sobjecttype -d '(required) the sObject type of the records you’re deleting'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s w -l wait           -d 'the number of minutes to wait for the command to complete before displaying the results'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s w -l wait -d 'the number of minutes to wait for the command to complete before displaying the results'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:data:bulk:status -d 'view the status of a bulk data load job or batch'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -s b -l batchid        -d 'the ID of the batch whose status you want to view'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -s i -l jobid          -d '(required) the ID of the job you want to view or of the job whose batch you want to view'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -s b -l batchid -d 'the ID of the batch whose status you want to view'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -s i -l jobid -d '(required) the ID of the job you want to view or of the job whose batch you want to view'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:data:bulk:upsert -d 'bulk upsert records from a CSV file'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s f -l csvfile        -d '(required) the path to the CSV file that defines the records to upsert'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s i -l externalid     -d '(required) the column name of the external ID'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s s -l sobjecttype    -d '(required) the sObject type of the records you want to upsert'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s f -l csvfile -d '(required) the path to the CSV file that defines the records to upsert'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s i -l externalid -d '(required) the column name of the external ID'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s s -l sobjecttype -d '(required) the sObject type of the records you want to upsert'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s w -l wait           -d 'the number of minutes to wait for the command to complete before displaying the results'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s w -l wait -d 'the number of minutes to wait for the command to complete before displaying the results'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:data:record -d 'manipulate records using the enterprise API'
 
 complete $sfdx_looking -xa force:data:record:create -d 'create a record'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -s s -l sobjecttype    -d '(required) the type of the record you’re creating'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -s t -l usetoolingapi  -d 'create the record with tooling api'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -s s -l sobjecttype -d '(required) the type of the record you’re creating'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -s t -l usetoolingapi -d 'create the record with tooling api'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -s v -l values         -d '(required) the <fieldName>=<value> pairs you’re creating'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create'      -l perflog        -d 'get API performance data'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -s v -l values -d '(required) the <fieldName>=<value> pairs you’re creating'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -l perflog -d 'get API performance data'
 
 complete $sfdx_looking -xa force:data:record:delete -d 'delete a record'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s i -l sobjectid      -d 'the ID of the record you’re deleting'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s s -l sobjecttype    -d '(required) the type of the record you’re creating'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s t -l usetoolingapi  -d 'create the record with tooling api'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s i -l sobjectid -d 'the ID of the record you’re deleting'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s s -l sobjecttype -d '(required) the type of the record you’re creating'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s t -l usetoolingapi -d 'create the record with tooling api'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s w -l where          -d 'a list of <fieldName>=<value> pairs to search for'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete'      -l perflog        -d 'get API performance data'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s w -l where -d 'a list of <fieldName>=<value> pairs to search for'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -l perflog -d 'get API performance data'
 
 complete $sfdx_looking -xa force:data:record:get -d 'view a record'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s i -l sobjectid      -d 'the ID of the record you’re deleting'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s s -l sobjecttype    -d '(required) the type of the record you’re creating'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s t -l usetoolingapi  -d 'create the record with tooling api'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s i -l sobjectid -d 'the ID of the record you’re deleting'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s s -l sobjecttype -d '(required) the type of the record you’re creating'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s t -l usetoolingapi -d 'create the record with tooling api'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s w -l where          -d 'a list of <fieldName>=<value> pairs to search for'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get'      -l perflog        -d 'get API performance data'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s w -l where -d 'a list of <fieldName>=<value> pairs to search for'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -l perflog -d 'get API performance data'
 
 complete $sfdx_looking -xa force:data:record:update -d 'update a record'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s i -l sobjectid      -d 'the ID of the record you’re deleting'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s s -l sobjecttype    -d '(required) the type of the record you’re creating'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s t -l usetoolingapi  -d 'create the record with tooling api'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s i -l sobjectid -d 'the ID of the record you’re deleting'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s s -l sobjecttype -d '(required) the type of the record you’re creating'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s t -l usetoolingapi -d 'create the record with tooling api'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s w -l where          -d 'a list of <fieldName>=<value> pairs to search for'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update'      -l perflog        -d 'get API performance data'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s w -l where -d 'a list of <fieldName>=<value> pairs to search for'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -l perflog -d 'get API performance data'
 
 complete $sfdx_looking -xa force:data:soql -d 'fetch records using SOQL'
 
 complete $sfdx_looking -xa force:data:soql:query -d 'execute a SOQL query'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -s q -l query          -d '(required) SOQL query to execute'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -s r -l resultformat   -d '[default: human] result format emitted to stdout; --json flag overrides this parameter' -xa 'human csv json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -s t -l usetoolingapi  -d 'execute query with Tooling API'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -s q -l query -d '(required) SOQL query to execute'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -s r -l resultformat -d '[default: human] result format emitted to stdout; --json flag overrides this parameter' -xa 'human csv json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -s t -l usetoolingapi -d 'execute query with Tooling API'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query'      -l perflog        -d 'get API performance data'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -l perflog -d 'get API performance data'
 
 complete $sfdx_looking -xa force:data:tree -d 'manipulate records using the tree API'
 
 complete $sfdx_looking -xa force:data:tree:export -d 'export data from an org into sObject tree format for force:data:tree:import consumption'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s d -l outputdir      -d 'directory to store files'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s p -l plan           -d 'generate multiple sobject tree files and a plan definition file for aggregated import'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s q -l query          -d '(required) soql query, or filepath of file containing a soql query, to retrieve records'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s d -l outputdir -d 'directory to store files'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s p -l plan -d 'generate multiple sobject tree files and a plan definition file for aggregated import'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s q -l query -d '(required) soql query, or filepath of file containing a soql query, to retrieve records'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s x -l prefix         -d 'prefix of generated files'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s x -l prefix -d 'prefix of generated files'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:data:tree:import -d 'import data into an org using SObject Tree Save API'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -s f -l sobjecttreefiles -d 'comma-delimited, ordered paths of json files containing collection of record trees to insert'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -s p -l plan             -d 'path to plan to insert multiple data files that have master-detail relationships'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -s u -l targetusername   -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import'      -l confighelp       -d 'display schema information for the --plan configuration file to stdout; if you use this option, all other options except --json are ignored'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import'      -l apiversion       -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import'      -l json             -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import'      -l loglevel         -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -s p -l plan -d 'path to plan to insert multiple data files that have master-detail relationships'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -l confighelp -d 'display schema information for the --plan configuration file to stdout; if you use this option, all other options except --json are ignored'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:doc -d 'display help for force commands'
 
 complete $sfdx_looking -xa force:doc:commands -d 'display help for force commands'
 
 complete $sfdx_looking -xa force:doc:commands:display -d 'display help for force commands'
-complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:display' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:display' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:display' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:doc:commands:list -d 'list the force commands'
-complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:list' -s u -l usage    -d 'list only docopt usage strings'
-complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:list'      -l json     -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:list'      -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:list' -s u -l usage -d 'list only docopt usage strings'
+complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:lightning -d 'create Aura components and Lightning web'
 
 complete $sfdx_looking -xa force:lightning:lint -d 'analyze (lint) Aura component code'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint' -s i -l ignore   -d 'pattern used to ignore some folders'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint'      -l config   -d 'path to a custom ESLint configuration file'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint'      -l exit     -d 'exit with error code 1 if there are lint issues'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint'      -l files    -d 'pattern used to include specific files'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint'      -l json     -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint'      -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint'      -l verbose  -d 'report warnings in addition to errors'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint' -s i -l ignore -d 'pattern used to ignore some folders'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint' -l config -d 'path to a custom ESLint configuration file'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint' -l exit -d 'exit with error code 1 if there are lint issues'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint' -l files -d 'pattern used to include specific files'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint' -l verbose -d 'report warnings in addition to errors'
 
 complete $sfdx_looking -xa force:lightning:app -d 'create a Lightning app'
 
 complete $sfdx_looking -xa force:lightning:app:create -d 'create a Lightning app'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -s a -l apiversion -d '[default: 46.0] API version number'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -s d -l outputdir  -d 'folder for saving the created files'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -s n -l appname    -d '(required) name of the generated Lightning app'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -s t -l template   -d '[default: DefaultLightningApp] template to use for file creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create'      -l json       -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create'      -l loglevel   -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -s d -l outputdir -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -s n -l appname -d '(required) name of the generated Lightning app'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -s t -l template -d '[default: DefaultLightningApp] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:lightning:component -d 'create a bundle for an Aura component or a Lightning web component'
 
 complete $sfdx_looking -xa force:lightning:component:create -d 'create a bundle for an Aura component or a Lightning web component'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -s a -l apiversion    -d '[default: 46.0] API version number'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -s d -l outputdir     -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -s a -l apiversion -d '[default: 46.0] API version number'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -s d -l outputdir -d 'folder for saving the created files'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -s n -l componentname -d '(required) name of the generated Lightning component'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -s t -l template      -d '[default: DefaultLightningCmp] template to use for file creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create'      -l json          -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create'      -l loglevel      -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create'      -l type          -d '[default: aura] type of the Lightning component' -xa 'aura lwc'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -s t -l template -d '[default: DefaultLightningCmp] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -l type -d '[default: aura] type of the Lightning component' -xa 'aura lwc'
 
 complete $sfdx_looking -xa force:lightning:event -d 'create a Lightning event'
 
 complete $sfdx_looking -xa force:lightning:event:create -d 'create a Lightning event'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -s a -l apiversion -d '[default: 46.0] API version number'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -s d -l outputdir  -d 'folder for saving the created files'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -s n -l eventname  -d '(required) name of the generated Lightning event'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -s t -l template   -d '[default: DefaultLightningEvt] template to use for file creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create'      -l json       -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create'      -l loglevel   -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -s d -l outputdir -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -s n -l eventname -d '(required) name of the generated Lightning event'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -s t -l template -d '[default: DefaultLightningEvt] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:lightning:interface -d 'create a Lightning interface'
 
 complete $sfdx_looking -xa force:lightning:interface:create -d 'create a Lightning interface'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -s a -l apiversion    -d '[default: 46.0] API version number'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -s d -l outputdir     -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -s a -l apiversion -d '[default: 46.0] API version number'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -s d -l outputdir -d 'folder for saving the created files'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -s n -l interfacename -d '(required) name of the generated Lightning interface'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -s t -l template      -d '[default: DefaultLightningIntf] template to use for file creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create'      -l json          -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create'      -l loglevel      -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -s t -l template -d '[default: DefaultLightningIntf] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:lightning:test -d 'test Aura components'
 
 complete $sfdx_looking -xa force:lightning:test:create -d 'create a Lightning test'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create' -s d -l outputdir -d 'folder for saving the created files'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create' -s n -l testname  -d '(required) name of the generated Lightning test'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create' -s t -l template  -d '[default: DefaultLightningTest] template to use for file creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create'      -l json      -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create'      -l loglevel  -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create' -s n -l testname -d '(required) name of the generated Lightning test'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create' -s t -l template -d '[default: DefaultLightningTest] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:lightning:test:install -d 'install Lightning Testing Service unmanaged package in your org'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s r -l releaseversion -d '[default: latest] release version of Lightning Testing Service'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s t -l packagetype    -d '[default: full] type of unmanaged package. \'full\' option contains both jasmine and mocha, plus examples' -xa 'jasmine mocha full'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s t -l packagetype -d '[default: full] type of unmanaged package. \'full\' option contains both jasmine and mocha, plus examples' -xa 'jasmine mocha full'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s w -l wait           -d '[default: 2 minutes] number of minutes to wait for installation status'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s w -l wait -d '[default: 2 minutes] number of minutes to wait for installation status'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:lightning:test:run -d 'invoke Aura component tests'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s a -l appname          -d 'name of your Lightning test application'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s d -l outputdir        -d 'directory path to store test run artifacts: for example, log files and test results'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s f -l configfile       -d 'path to config file for the test'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s a -l appname -d 'name of your Lightning test application'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s d -l outputdir -d 'directory path to store test run artifacts: for example, log files and test results'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s f -l configfile -d 'path to config file for the test'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s o -l leavebrowseropen -d 'leave browser open'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s r -l resultformat     -d '[default: human] result format emitted to stdout; --json flag overrides this parameter' -xa 'human tap junit json'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s t -l timeout          -d '[default: 60000] time (ms) to wait for results element in dom'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s u -l targetusername   -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run'      -l apiversion       -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run'      -l json             -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run'      -l loglevel         -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s r -l resultformat -d '[default: human] result format emitted to stdout; --json flag overrides this parameter' -xa 'human tap junit json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s t -l timeout -d '[default: 60000] time (ms) to wait for results element in dom'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:limits -d 'view your org’s limits'
 
@@ -404,324 +404,324 @@ complete $sfdx_looking -xa force:limits:api -d 'view your org’s API limits'
 
 complete $sfdx_looking -xa force:limits:api:display -d 'display current org’s limits'
 complete -c sfdx -n '__fish_sfdx_using_command force:limits:api:display' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:limits:api:display'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:limits:api:display'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:limits:api:display'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:limits:api:display' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:limits:api:display' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:limits:api:display' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:mdapi -d 'retrieve and deploy metadata using Metadata'
 
 complete $sfdx_looking -xa force:mdapi:convert -d 'convert metadata from the Metadata API format into the source format'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:convert' -s d -l outputdir -d 'the output directory to store the source–formatted files'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:convert' -s r -l rootdir   -d '(required) the root directory containing the Metadata API–formatted metadata'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:convert'      -l json      -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:convert'      -l loglevel  -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:convert' -s r -l rootdir -d '(required) the root directory containing the Metadata API–formatted metadata'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:convert' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:convert' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:mdapi:deploy -d 'deploy metadata using Metadata API'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s c -l checkonly                -d 'validate deploy but don’t save to the org'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s d -l deploydir                -d 'root of directory tree of files to deploy'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s f -l zipfile                  -d 'path to .zip file of metadata to deploy'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s g -l ignorewarnings           -d 'whether a warning will allow a deployment to complete successfully'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s l -l testlevel                -d 'deployment testing level' -xa 'NoTestRun RunSpecifiedTests RunLocalTests RunAllTestsInOrg'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s o -l ignoreerrors             -d 'ignore any errors and do not roll back deployment'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s c -l checkonly -d 'validate deploy but don’t save to the org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s d -l deploydir -d 'root of directory tree of files to deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s f -l zipfile -d 'path to .zip file of metadata to deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s g -l ignorewarnings -d 'whether a warning will allow a deployment to complete successfully'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s l -l testlevel -d 'deployment testing level' -xa 'NoTestRun RunSpecifiedTests RunLocalTests RunAllTestsInOrg'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s o -l ignoreerrors -d 'ignore any errors and do not roll back deployment'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s q -l validateddeployrequestid -d 'request ID of the validated deployment to run a Quick Deploy'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s r -l runtests                 -d 'tests to run if --testlevel RunSpecifiedTests'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s u -l targetusername           -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s w -l wait                     -d 'wait time for command to finish in minutes (default: 0)'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy'      -l apiversion               -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy'      -l json                     -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy'      -l loglevel                 -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy'      -l verbose                  -d 'verbose output of deploy results'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s r -l runtests -d 'tests to run if --testlevel RunSpecifiedTests'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s w -l wait -d 'wait time for command to finish in minutes (default: 0)'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -l verbose -d 'verbose output of deploy results'
 
 complete $sfdx_looking -xa force:mdapi:deploy:cancel -d 'cancel a metadata deployment'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -s i -l jobid          -d 'job ID of the deployment you want to cancel; defaults to your most recent CLI deployment if not specified'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -s i -l jobid -d 'job ID of the deployment you want to cancel; defaults to your most recent CLI deployment if not specified'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes 33'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes 33'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:mdapi:deploy:report -d 'check the status of a metadata deployment'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -s i -l jobid          -d 'job ID of the deployment you want to cancel; defaults to your most recent CLI deployment if not specified'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -s i -l jobid -d 'job ID of the deployment you want to cancel; defaults to your most recent CLI deployment if not specified'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes 33'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report'      -l verbose        -d 'verbose output of deploy results'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes 33'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -l verbose -d 'verbose output of deploy results'
 
 complete $sfdx_looking -xa force:mdapi:describemetadata -d 'display the metadata types enabled for your org'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata' -s a -l apiversion     -d 'API version to use (the default is 46.0)'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata' -s f -l resultfile     -d 'filter metadata known by the CLI'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata' -s a -l apiversion -d 'API version to use (the default is 46.0)'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata' -s f -l resultfile -d 'filter metadata known by the CLI'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:mdapi:listmetadata -d 'display properties of metadata components of a specified type'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s a -l apiversion      -d 'API version to use (the default is 46.0)'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s f -l resultfile      -d 'path to the file where results are stored'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s m -l metadatatype    -d '(required) metadata type to be retrieved, such as CustomObject; metadata type value is case-sensitive'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s u -l targetusername  -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata'      -l folder          -d 'folder associated with the component; required for components that use folders; folder names are case-sensitive'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata'      -l json            -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata'      -l loglevel        -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s a -l apiversion -d 'API version to use (the default is 46.0)'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s f -l resultfile -d 'path to the file where results are stored'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s m -l metadatatype -d '(required) metadata type to be retrieved, such as CustomObject; metadata type value is case-sensitive'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -l folder -d 'folder associated with the component; required for components that use folders; folder names are case-sensitive'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:mdapi:retrieve -d 'retrieve metadata using Metadata API'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s a -l apiversion        -d 'target API version for the retrieve (default 46.0)'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s d -l sourcedir         -d 'source dir to use instead of the default package dir in sfdx-project.json'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s k -l unpackaged        -d 'file path of manifest of components to retrieve'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s p -l packagenames      -d 'a comma-separated list of packages to retrieve'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s a -l apiversion -d 'target API version for the retrieve (default 46.0)'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s d -l sourcedir -d 'source dir to use instead of the default package dir in sfdx-project.json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s k -l unpackaged -d 'file path of manifest of components to retrieve'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s p -l packagenames -d 'a comma-separated list of packages to retrieve'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s r -l retrievetargetdir -d '(required) directory root for the retrieved files'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s s -l singlepackage     -d 'a single-package retrieve (default: false)'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s u -l targetusername    -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s w -l wait              -d 'wait time for command to finish in minutes (default: -1 (no limit))'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve'      -l json              -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve'      -l loglevel          -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve'      -l verbose           -d 'verbose output of retrieve result'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s s -l singlepackage -d 'a single-package retrieve (default: false)'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s w -l wait -d 'wait time for command to finish in minutes (default: -1 (no limit))'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -l verbose -d 'verbose output of retrieve result'
 
 complete $sfdx_looking -xa force:mdapi:retrieve:report -d 'check the status of a metadata retrieval'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -s i -l jobid             -d 'job ID of the retrieve you want to check; defaults to your most recent CLI retrieval if not specified'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -s i -l jobid -d 'job ID of the retrieve you want to check; defaults to your most recent CLI retrieval if not specified'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -s r -l retrievetargetdir -d 'directory root for the retrieved files'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -s u -l targetusername    -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -s w -l wait              -d 'wait time for command to finish in minutes (default: -1 (no limit))'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report'      -l apiversion        -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report'      -l json              -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report'      -l loglevel          -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report'      -l verbose           -d 'verbose output of retrieve result'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -s w -l wait -d 'wait time for command to finish in minutes (default: -1 (no limit))'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -l verbose -d 'verbose output of retrieve result'
 
 complete $sfdx_looking -xa force:org -d 'manage your orgs'
 
 complete $sfdx_looking -xa force:org:clone -d 'clone a sandbox org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s a -l setalias           -d 'alias for the created org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s f -l definitionfile     -d 'path to an org definition file'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s a -l setalias -d 'alias for the created org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s f -l definitionfile -d 'path to an org definition file'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s s -l setdefaultusername -d 'set the created org as the default username'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s t -l type               -d '(required) type of org to create' -xa 'sandbox'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s u -l targetusername     -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s w -l wait               -d '[default: 6 minutes] the streaming client socket timeout (in minutes)'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:clone'      -l apiversion         -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:clone'      -l json               -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:clone'      -l loglevel           -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s t -l type -d '(required) type of org to create' -xa 'sandbox'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s w -l wait -d '[default: 6 minutes] the streaming client socket timeout (in minutes)'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:create -d 'create a scratch or sandbox org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s a -l setalias             -d 'alias for the created org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s c -l noancestors          -d 'do not include second-generation package ancestors in the scratch org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s d -l durationdays         -d 'duration of the scratch org (in days) (default:7, min:1, max:30)'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s f -l definitionfile       -d 'path to an org definition file'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s i -l clientid             -d 'connected app consumer key; not supported for sandbox org creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s n -l nonamespace          -d 'create the scratch org with no namespace'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s s -l setdefaultusername   -d 'set the created org as the default username'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s t -l type                 -d '[default: scratch] type of org to create; sandbox org creation is in beta' -xa 'scratch sandbox'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s a -l setalias -d 'alias for the created org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s c -l noancestors -d 'do not include second-generation package ancestors in the scratch org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s d -l durationdays -d 'duration of the scratch org (in days) (default:7, min:1, max:30)'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s f -l definitionfile -d 'path to an org definition file'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s i -l clientid -d 'connected app consumer key; not supported for sandbox org creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s n -l nonamespace -d 'create the scratch org with no namespace'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s s -l setdefaultusername -d 'set the created org as the default username'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s t -l type -d '[default: scratch] type of org to create; sandbox org creation is in beta' -xa 'scratch sandbox'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s w -l wait                 -d '[default: 6 minutes] the streaming client socket timeout (in minutes)'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s w -l wait -d '[default: 6 minutes] the streaming client socket timeout (in minutes)'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:delete -d 'mark a scratch org for deletion'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -s p -l noprompt             -d 'no prompt to confirm deletion'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -s p -l noprompt -d 'no prompt to confirm deletion'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:delete'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:delete'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:delete'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:display -d 'get org description'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:display' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:display'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:display'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:display'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:org:display'      -l verbose        -d 'emit additional command output to stdout'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:display' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:display' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:display' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:display' -l verbose -d 'emit additional command output to stdout'
 
 complete $sfdx_looking -xa force:org:list -d 'list all orgs you’ve created or authenticated to'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:list' -s p -l noprompt -d 'do not prompt for confirmation'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:list'      -l all      -d 'include expired, deleted, and unknown-status scratch orgs'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:list'      -l clean    -d 'remove all local org authorizations for non-active orgs'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:list'      -l json     -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:list'      -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:org:list'      -l verbose  -d 'list more information about each org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:list' -l all -d 'include expired, deleted, and unknown-status scratch orgs'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:list' -l clean -d 'remove all local org authorizations for non-active orgs'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:list' -l verbose -d 'list more information about each org'
 
 complete $sfdx_looking -xa force:org:open -d 'open an org in your browser'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -s p -l path           -d 'navigation URL path'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -s r -l urlonly        -d 'display navigation URL, but don’t launch browser'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -s p -l path -d 'navigation URL path'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -s r -l urlonly -d 'display navigation URL, but don’t launch browser'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:open'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:open'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:open'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:status -d 'report sandbox org creation status and headlessly authenticate to org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s a -l setalias           -d 'alias for the created org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s n -l sandboxname        -d '(required) name of the sandbox org to check status for'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s a -l setalias -d 'alias for the created org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s n -l sandboxname -d '(required) name of the sandbox org to check status for'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s s -l setdefaultusername -d 'set the created org as the default username'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s u -l targetusername     -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s w -l wait               -d '[default: 6 minutes] number of minutes to wait while polling for status'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:status'      -l apiversion         -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:status'      -l json               -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:status'      -l loglevel           -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s w -l wait -d '[default: 6 minutes] number of minutes to wait while polling for status'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:shape -d 'manage org shape'
 
 complete $sfdx_looking -xa force:org:shape:create -d 'create a snapshot of org edition, features, and licenses'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:create' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:create'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:create'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:create'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:create' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:shape:delete -d 'delete all org shapes for a target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete' -s p -l noprompt       -d 'do not prompt for confirmation'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete' -s p -l noprompt -d 'do not prompt for confirmation'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:shape:list -d 'list all org shapes you’ve created'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:list' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:list' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:list' -l verbose  -d 'list more information about each org shape'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:list' -l verbose -d 'list more information about each org shape'
 
 complete $sfdx_looking -xa force:org:snapshot -d 'snapshot a scratch org'
 
 complete $sfdx_looking -xa force:org:snapshot:create -d 'snapshot a scratch org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -s d -l description          -d 'description of snapshot'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -s n -l snapshotname         -d '(required) unique name of snapshot'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -s o -l sourceorg            -d '(required) ID or locally authenticated username or alias of scratch org to snapshot'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -s d -l description -d 'description of snapshot'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -s n -l snapshotname -d '(required) unique name of snapshot'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -s o -l sourceorg -d '(required) ID or locally authenticated username or alias of scratch org to snapshot'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:snapshot:delete -d 'delete a scratch org snapshot'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete' -s s -l snapshot             -d '(required) name or ID of snapshot to delete'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete' -s s -l snapshot -d '(required) name or ID of snapshot to delete'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:snapshot:get -d 'get details about a scratch org snapshot'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get' -s s -l snapshot             -d '(required) name or ID of snapshot to retrieve'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get' -s s -l snapshot -d '(required) name or ID of snapshot to retrieve'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:snapshot:list -d 'list scratch org snapshots'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:list' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:list'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:list'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:list'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:list' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package -d 'develop and install packages'
 
 complete $sfdx_looking -xa force:package:create -d 'create a package'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s d -l description -d 'package description'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s e -l nonamespace -d 'creates the package with no namespace; available only for unlocked packages.'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s n -l name        -d '(required) package name'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s r -l path        -d '(required) path to directory that contains the contents of the package'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s n -l name -d '(required) package name'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s r -l path -d '(required) path to directory that contains the contents of the package'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s t -l packagetype -d '(required) package type' -xa 'Managed Unlocked'
 
 complete $sfdx_looking -xa force:package:install -d 'install packages'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s a -l apexcompile     -d '[default: all] compile all Apex in the org and package, or only Apex in the package' -xa 'all package'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s b -l publishwait     -d 'number of minutes to wait for subscriber package version ID to become available in the target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s a -l apexcompile -d '[default: all] compile all Apex in the org and package, or only Apex in the package' -xa 'all package'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s b -l publishwait -d 'number of minutes to wait for subscriber package version ID to become available in the target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s k -l installationkey -d 'installation key for key-protected package (default: null)'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s p -l package         -d 'ID (starts with 04t) or alias of the package version to install'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s r -l noprompt        -d 'do not prompt for confirmation'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s s -l securitytype    -d '[default: AllUsers] security access type for the installed package (deprecation notice: The default --securitytype value will change from AllUsers to AdminsOnly in v47.0 or later.)' -xa 'AllUsers AdminsOnly'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s t -l upgradetype     -d '[default: Mixed] the upgrade type for the package installation' -xa 'DeprecateOnly Mixed Delete'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s u -l targetusername  -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s w -l wait            -d 'number of minutes to wait for installation status'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s p -l package -d 'ID (starts with 04t) or alias of the package version to install'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s r -l noprompt -d 'do not prompt for confirmation'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s s -l securitytype -d '[default: AllUsers] security access type for the installed package (deprecation notice: The default --securitytype value will change from AllUsers to AdminsOnly in v47.0 or later.)' -xa 'AllUsers AdminsOnly'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s t -l upgradetype -d '[default: Mixed] the upgrade type for the package installation' -xa 'DeprecateOnly Mixed Delete'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s w -l wait -d 'number of minutes to wait for installation status'
 
 complete $sfdx_looking -xa force:package:list -d 'list all packages in the Dev Hub org'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:list' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:list'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:list'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:list'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:package:list'      -l verbose              -d 'display extended package detail'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:list' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:list' -l verbose -d 'display extended package detail'
 
 complete $sfdx_looking -xa force:package:uninstall -d 'uninstall packages'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s p -l package        -d 'ID (starts with 04t) or alias of the package version to uninstall'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s p -l package -d 'ID (starts with 04t) or alias of the package version to uninstall'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s w -l wait           -d 'number of minutes to wait for uninstall status'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s w -l wait -d 'number of minutes to wait for uninstall status'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package:update -d 'update package details'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -s d -l description          -d 'new package description'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -s n -l name                 -d 'new package name'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -s p -l package              -d '(required) ID (starts with 0Ho) or alias of the package to update'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -s d -l description -d 'new package description'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -s n -l name -d 'new package name'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -s p -l package -d '(required) ID (starts with 0Ho) or alias of the package to update'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:update'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:update'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:update'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package:hammertest -d 'run ISV Hammer tests'
 
 complete $sfdx_looking -xa force:package:hammertest:list -d 'list the statuses of running and completed ISV Hammer tests'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list' -s i -l packageversionid     -d 'ID of the package version to list results for'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list' -s i -l packageversionid -d 'ID of the package version to list results for'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package:hammertest:report -d 'display the status or results of a ISV Hammer test'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -s i -l requestid      -d '(required) ID of the hammer request to report on'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -s s -l summary        -d 'report only a results summary (hide Apex test failures)'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -s i -l requestid -d '(required) ID of the hammer request to report on'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -s s -l summary -d 'report only a results summary (hide Apex test failures)'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package:hammertest:run -d 'run ISV Hammer'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s d -l scheduledrundatetime -d 'earliest date/time to run the package upgrade test (YYYY-MM-DD HH:mm:ss, in GMT)'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s f -l subscriberfile       -d 'file with list of subscriber orgs IDs, one per line'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s i -l packageversionids    -d '(required) comma-separated list of package version IDs to test'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s p -l preview              -d 'run the package hammer test in the Salesforce preview version'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s s -l subscriberorgs       -d 'comma-separated list of subscriber org IDs'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s t -l apextests            -d 'after package upgrade validation, run the package\'s Apex tests in the subscriber org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s f -l subscriberfile -d 'file with list of subscriber orgs IDs, one per line'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s i -l packageversionids -d '(required) comma-separated list of package version IDs to test'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s p -l preview -d 'run the package hammer test in the Salesforce preview version'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s s -l subscriberorgs -d 'comma-separated list of subscriber org IDs'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s t -l apextests -d 'after package upgrade validation, run the package\'s Apex tests in the subscriber org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package:install -d 'install packages'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s a -l apexcompile     -d '[default: all] compile all Apex in the org and package, or only Apex in the package' -xa 'all package'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s b -l publishwait     -d 'number of minutes to wait for subscriber package version ID to become available in the target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s a -l apexcompile -d '[default: all] compile all Apex in the org and package, or only Apex in the package' -xa 'all package'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s b -l publishwait -d 'number of minutes to wait for subscriber package version ID to become available in the target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s k -l installationkey -d 'installation key for key-protected package (default: null)'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s p -l package         -d 'ID (starts with 04t) or alias of the package version to install'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s r -l noprompt        -d 'do not prompt for confirmation'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s s -l securitytype    -d '[default: AllUsers] security access type for the installed package (deprecation notice: The default --securitytype value will change from AllUsers to AdminsOnly in v47.0 or later.)' -xa 'AllUsers AdminsOnly'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s t -l upgradetype     -d '[default: Mixed] the upgrade type for the package installation' -xa 'DeprecateOnly Mixed Delete'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s u -l targetusername  -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s w -l wait            -d 'number of minutes to wait for installation status'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s p -l package -d 'ID (starts with 04t) or alias of the package version to install'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s r -l noprompt -d 'do not prompt for confirmation'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s s -l securitytype -d '[default: AllUsers] security access type for the installed package (deprecation notice: The default --securitytype value will change from AllUsers to AdminsOnly in v47.0 or later.)' -xa 'AllUsers AdminsOnly'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s t -l upgradetype -d '[default: Mixed] the upgrade type for the package installation' -xa 'DeprecateOnly Mixed Delete'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s w -l wait -d 'number of minutes to wait for installation status'
 
 complete $sfdx_looking -xa force:package:install:report -d 'retrieve the status of a package installation request'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report' -s i -l requestid      -d '(required) ID of the package install request you want to check'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report' -s i -l requestid -d '(required) ID of the package install request you want to check'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package:installed -d 'list installed packages'
 
 complete $sfdx_looking -xa force:package:installed:list -d 'list the org’s installed packages'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:installed:list' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:installed:list'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:installed:list'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:installed:list'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:installed:list' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:installed:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:installed:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package:uninstall -d 'uninstall packages'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s p -l package        -d 'ID (starts with 04t) or alias of the package version to uninstall'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s p -l package -d 'ID (starts with 04t) or alias of the package version to uninstall'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s w -l wait           -d 'number of minutes to wait for uninstall status'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s w -l wait -d 'number of minutes to wait for uninstall status'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package:uninstall:report -d 'retrieve status of package uninstall request'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report' -s i -l requestid      -d '(required) ID of the package uninstall request you want to check'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report' -s i -l requestid -d '(required) ID of the package uninstall request you want to check'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package:version -d 'develop package versions'
 
@@ -730,278 +730,278 @@ complete $sfdx_looking -xa force:package1 -d 'develop first-generation managed a
 complete $sfdx_looking -xa force:package1:version -d 'develop package versions'
 
 complete $sfdx_looking -xa force:package1:version:create -d 'report on created package versions'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s d -l description     -d 'package version description'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s i -l packageid       -d '(required) ID of the metadata package (starts with 033) of which you’re creating a new version'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s d -l description -d 'package version description'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s i -l packageid -d '(required) ID of the metadata package (starts with 033) of which you’re creating a new version'
 complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s k -l installationkey -d 'installation key for key-protected package (default: null)'
 complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s m -l managedreleased -d 'create a managed package version'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s n -l name            -d '(required) package version name'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s p -l postinstallurl  -d 'post install URL'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s n -l name -d '(required) package version name'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s p -l postinstallurl -d 'post install URL'
 complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s r -l releasenotesurl -d 'release notes URL'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s u -l targetusername  -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s v -l version         -d 'package version in major.minor format, for example, 3.2'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s w -l wait            -d 'minutes to wait for the package version to be created (default: 2 minutes)'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create'      -l apiversion      -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create'      -l json            -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create'      -l loglevel        -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s v -l version -d 'package version in major.minor format, for example, 3.2'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s w -l wait -d 'minutes to wait for the package version to be created (default: 2 minutes)'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package1:version:display -d 'display details about a first-generation package version'
 complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display' -s i -l packageversionid -d '(required) metadata package version ID (starts with 04t)'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display' -s u -l targetusername   -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display'      -l apiversion       -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display'      -l json             -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display'      -l loglevel         -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package1:version:list -d 'list package versions for the specified first-generation package or for the org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list' -s i -l packageid      -d 'metadata package ID (starts with 033)'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list' -s i -l packageid -d 'metadata package ID (starts with 033)'
 complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package1:version:create -d 'report on created package versions'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s d -l description     -d 'package version description'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s i -l packageid       -d '(required) ID of the metadata package (starts with 033) of which you’re creating a new version'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s d -l description -d 'package version description'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s i -l packageid -d '(required) ID of the metadata package (starts with 033) of which you’re creating a new version'
 complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s k -l installationkey -d 'installation key for key-protected package (default: null)'
 complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s m -l managedreleased -d 'create a managed package version'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s n -l name=name       -d '(required) package version name'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s p -l postinstallurl  -d 'post install URL'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s n -l name=name -d '(required) package version name'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s p -l postinstallurl -d 'post install URL'
 complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s r -l releasenotesurl -d 'release notes URL'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s u -l targetusername  -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s v -l version         -d 'package version in major.minor format, for example, 3.2'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s w -l wait            -d 'minutes to wait for the package version to be created (default: 2 minutes)'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create'      -l apiversion      -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create'      -l json            -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create'      -l loglevel        -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s v -l version -d 'package version in major.minor format, for example, 3.2'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s w -l wait -d 'minutes to wait for the package version to be created (default: 2 minutes)'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package1:version:create:get -d 'retrieve the status of a package version creation request'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get' -s i -l requestid      -d '(required) PackageUploadRequest ID'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get' -s i -l requestid -d '(required) PackageUploadRequest ID'
 complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:project -d 'set up a Salesforce DX project'
 
 complete $sfdx_looking -xa force:project:create -d 'create a Salesforce DX project'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s d -l outputdir                      -d 'folder for saving the created files'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s n -l projectname                    -d '(required) name of the generated project'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s p -l defaultpackagedir              -d '[default: force-app] default package directory name'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s s -l namespace                      -d 'project associated namespace'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s t -l template                       -d '[default: standard] template to use for project creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s x -l manifest                       -d 'generate a manifest (package.xml) for change-set-based development'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s d -l outputdir -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s n -l projectname -d '(required) name of the generated project'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s p -l defaultpackagedir -d '[default: force-app] default package directory name'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s s -l namespace -d 'project associated namespace'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s t -l template -d '[default: standard] template to use for project creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s x -l manifest -d 'generate a manifest (package.xml) for change-set-based development'
 complete -c sfdx -n '__fish_sfdx_using_command force:project:create; and __fish_contains_opt -s x manifest' -xa '(__fish_sfdx_find_packagexml)'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:create'      -l json                           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:create'      -l loglevel                       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:project:upgrade -d 'update project config files to the latest format'
 complete -c sfdx -n '__fish_sfdx_using_command force:project:upgrade' -s f -l forceupgrade -d 'run all upgrades even if project has already been upgraded'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:upgrade'      -l json         -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:upgrade'      -l loglevel     -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:project:upgrade' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:upgrade' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:schema -d 'view standard and custom objects'
 
 complete $sfdx_looking -xa force:schema:sobject -d 'view standard and custom objects'
 
 complete $sfdx_looking -xa force:schema:sobject:describe -d 'describe an object'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -s s -l sobjecttype    -d '(required) the API name of the object to describe'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -s t -l usetoolingapi  -d 'execute with Tooling API'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -s s -l sobjecttype -d '(required) the API name of the object to describe'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -s t -l usetoolingapi -d 'execute with Tooling API'
 complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:schema:sobject:list -d 'list all objects of a specified category'
 complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list' -s c -l sobjecttypecategory -d '(required) the type of objects to list (all|custom|standard)'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list' -s u -l targetusername      -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list'      -l apiversion          -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list'      -l json                -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list'      -l loglevel            -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:source -d 'sync your project with your orgs'
 
 complete $sfdx_looking -xa force:source:convert -d 'convert source into Metadata API format'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:conevrt' -s d -l outputdir   -d 'output directory to store the Metadata API–formatted files in'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:conevrt' -s d -l outputdir -d 'output directory to store the Metadata API–formatted files in'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:conevrt' -s n -l packagename -d 'name of the package to associate with the metadata-formatted files'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:conevrt' -s r -l rootdir     -d 'a source directory other than the default package to convert'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:convert'      -l json        -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:convert'      -l loglevel    -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:conevrt' -s r -l rootdir -d 'a source directory other than the default package to convert'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:convert' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:convert' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:source:delete -d 'delete source from your project and from a non-source-tracked org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s m -l metadata       -d 'comma-separated list of names of metadata components to delete'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s p -l sourcepath     -d 'comma-separated list of paths to the local metadata to delete'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s r -l noprompt       -d 'do not prompt for delete confirmation'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s m -l metadata -d 'comma-separated list of names of metadata components to delete'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s p -l sourcepath -d 'comma-separated list of paths to the local metadata to delete'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s r -l noprompt -d 'do not prompt for delete confirmation'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes 33'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:delete'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:delete'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:delete'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes 33'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:source:deploy -d 'deploy source to an org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s c -l checkonly                      -d 'validate deploy but don’t save to the org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s g -l ignorewarnings                 -d 'whether a warning will allow a deployment to complete successfully'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s l -l testlevel                      -d 'deployment testing level' -xa 'NoTestRun RunSpecifiedTests RunLocalTests RunAllTestsInOrg'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s m -l metadata                       -d 'comma-separated list of metadata component names'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s o -l ignoreerrors                   -d 'ignore any errors and do not roll back deployment'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s p -l sourcepath                     -d 'comma-separated list of paths to the local source files to deploy'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s q -l validateddeployrequestid       -d 'request ID of the validated deployment to run a Quick Deploy'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s r -l runtests                       -d 'tests to run if --testlevel RunSpecifiedTests'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s u -l targetusername                 -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s w -l wait                           -d '[default: 33 minutes] wait time for command to finish in minutes'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s x -l manifest                       -d 'file path for manifest (package.xml) of components to deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s c -l checkonly -d 'validate deploy but don’t save to the org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s g -l ignorewarnings -d 'whether a warning will allow a deployment to complete successfully'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s l -l testlevel -d 'deployment testing level' -xa 'NoTestRun RunSpecifiedTests RunLocalTests RunAllTestsInOrg'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s m -l metadata -d 'comma-separated list of metadata component names'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s o -l ignoreerrors -d 'ignore any errors and do not roll back deployment'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s p -l sourcepath -d 'comma-separated list of paths to the local source files to deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s q -l validateddeployrequestid -d 'request ID of the validated deployment to run a Quick Deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s r -l runtests -d 'tests to run if --testlevel RunSpecifiedTests'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s x -l manifest -d 'file path for manifest (package.xml) of components to deploy'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy; and __fish_contains_opt -s x manifest' -xa '(__fish_sfdx_find_packagexml)'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l apiversion                     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l json                           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l loglevel                       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l verbose                        -d 'display Apex test processing details'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -l verbose -d 'display Apex test processing details'
 
 complete $sfdx_looking -xa force:source:open -d 'edit a Lightning Page with Lightning App Builder'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -s f -l sourcefile     -d  '(required) file to edit'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -s r -l urlonly        -d  'generate a navigation URL; don’t launch the editor'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -s f -l sourcefile -d '(required) file to edit'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -s r -l urlonly -d 'generate a navigation URL; don’t launch the editor'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:open'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:open'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:open'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:source:pull -d 'pull source from the scratch org to the project'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:pull' -s f -l forceoverwrite -d 'ignore conflict warnings and overwrite changes to the project'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:pull' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:pull' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes (default: 33)'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:pull'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:pull'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:pull'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:pull' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes (default: 33)'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:pull' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:pull' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:pull' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:source:push -d 'push source to a scratch org from the project'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -s f -l forceoverwrite -d 'ignore conflict warnings and overwrite changes to scratch org'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -s g -l ignorewarnings -d 'deploy changes even if warnings are generated'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes (default: 33)'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:push'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:push'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:push'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes (default: 33)'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:source:retrieve -d 'retrieve source from an org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s a -l apiversion                     -d 'target API version for the retrieve (default 46.0)'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s m -l metadata                       -d 'comma-separated list of metadata component names'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s n -l packagenames                   -d 'a comma-separated list of packages to retrieve'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s p -l sourcepath                     -d 'comma-separated list of source file paths to retrieve'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s u -l targetusername                 -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s w -l wait                           -d '[default: 33 minutes] wait time for command to finish in minutes'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s x -l manifest                       -d 'file path for manifest (package.xml) of components to retrieve'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s a -l apiversion -d 'target API version for the retrieve (default 46.0)'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s m -l metadata -d 'comma-separated list of metadata component names'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s n -l packagenames -d 'a comma-separated list of packages to retrieve'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s p -l sourcepath -d 'comma-separated list of source file paths to retrieve'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s x -l manifest -d 'file path for manifest (package.xml) of components to retrieve'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve; and __fish_contains_opt -s x manifest' -xa '(__fish_use_subcommand)'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve'      -l json                           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve'      -l loglevel                       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve'      -l verbose                        -d 'verbose output of retrieve result'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -l verbose -d 'verbose output of retrieve result'
 
 complete $sfdx_looking -xa force:source:status -d 'list local changes and/or changes in a scratch org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -s a -l all            -d 'list all the changes that have been made'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -s l -l local          -d 'list the changes that have been made locally'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -s r -l remote         -d 'list the changes that have been made in the scratch org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -s a -l all -d 'list all the changes that have been made'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -s l -l local -d 'list the changes that have been made locally'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -s r -l remote -d 'list the changes that have been made in the scratch org'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:status'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:status'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:status'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:source:deploy -d 'deploy source to an org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s c -l checkonly                      -d 'validate deploy but don’t save to the org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s g -l ignorewarnings                 -d 'whether a warning will allow a deployment to complete successfully'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s l -l testlevel                      -d 'deployment testing level' -xa 'NoTestRun RunSpecifiedTests RunLocalTests RunAllTestsInOrg'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s m -l metadata                       -d 'comma-separated list of metadata component names'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s o -l ignoreerrors                   -d 'ignore any errors and do not roll back deployment'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s p -l sourcepath                     -d 'comma-separated list of paths to the local source files to deploy'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s q -l validateddeployrequestid       -d 'request ID of the validated deployment to run a Quick Deploy'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s r -l runtests                       -d 'tests to run if --testlevel RunSpecifiedTests'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s u -l targetusername                 -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s w -l wait                           -d '[default: 33 minutes] wait time for command to finish in minutes'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s x -l manifest                       -d 'file path for manifest (package.xml) of components to deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s c -l checkonly -d 'validate deploy but don’t save to the org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s g -l ignorewarnings -d 'whether a warning will allow a deployment to complete successfully'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s l -l testlevel -d 'deployment testing level' -xa 'NoTestRun RunSpecifiedTests RunLocalTests RunAllTestsInOrg'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s m -l metadata -d 'comma-separated list of metadata component names'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s o -l ignoreerrors -d 'ignore any errors and do not roll back deployment'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s p -l sourcepath -d 'comma-separated list of paths to the local source files to deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s q -l validateddeployrequestid -d 'request ID of the validated deployment to run a Quick Deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s r -l runtests -d 'tests to run if --testlevel RunSpecifiedTests'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s x -l manifest -d 'file path for manifest (package.xml) of components to deploy'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy; and __fish_contains_opt -s x manifest' -xa '(__fish_use_subcommand)'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l apiversion                     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l json                           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l loglevel                       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l verbose                        -d 'display Apex test processing details'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -l verbose -d 'display Apex test processing details'
 
 complete $sfdx_looking -xa force:source:deploy:cancel -d 'cancel a source deployment'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -s i -l jobid          -d 'job ID of the deployment you want to cancel; defaults to your most recent CLI deployment if not specified'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -s i -l jobid -d 'job ID of the deployment you want to cancel; defaults to your most recent CLI deployment if not specified'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes 33'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes 33'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:source:deploy:report -d 'check the status of a metadata deployment'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -s i -l jobid          -d 'job ID of the deployment you want to check; defaults to your most recent CLI deployment if not specified'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -s i -l jobid -d 'job ID of the deployment you want to check; defaults to your most recent CLI deployment if not specified'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes 33'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes 33'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:user -d 'perform user-related admin tasks'
 
 complete $sfdx_looking -xa force:user:create -d 'create a user for a scratch org'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -s a -l setalias             -d 'set an alias for the created username to reference within the CLI'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -s f -l definitionfile       -d 'file path to a user definition'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -s a -l setalias -d 'set an alias for the created username to reference within the CLI'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -s f -l definitionfile -d 'file path to a user definition'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:create'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:create'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:user:display -d 'displays information about a user of a scratch org'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:display' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:display' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:user:display' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:display'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:display'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:display'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:user:display' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:display' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:display' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:user:list -d 'lists all users of a scratch org'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:list' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:list' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:user:list' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:list'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:list'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:list'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:user:list' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:user:password -d 'perform password-related admin tasks'
 
 complete $sfdx_looking -xa force:user:password:generate -d 'generate a password for scratch org users'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -s o -l onbehalfof           -d 'comma-separated list of usernames for which to generate passwords'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -s o -l onbehalfof -d 'comma-separated list of usernames for which to generate passwords'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:user:permset -d 'perform permset-related admin tasks'
 
 complete $sfdx_looking -xa force:user:permset:assign -d 'assign a permission set to one or more users of an org'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -s n -l permsetname    -d '(required) the name of the permission set to assign'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -s o -l onbehalfof     -d 'comma-separated list of usernames or aliases to assign the permission set to'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -s n -l permsetname -d '(required) the name of the permission set to assign'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -s o -l onbehalfof -d 'comma-separated list of usernames or aliases to assign the permission set to'
 complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:visualforce -d 'create and edit Visualforce files'
 
 complete $sfdx_looking -xa force:visualforce:component -d 'create a Visualforce component'
 
 complete $sfdx_looking -xa force:visualforce:component:create -d 'create a Visualforce component'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p a -l apiversion    -d '[default: 46.0] API version number'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p d -l outputdir     -d 'folder for saving the created files'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p l -l label         -d '(required) Visualforce component label'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p a -l apiversion -d '[default: 46.0] API version number'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p d -l outputdir -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p l -l label -d '(required) Visualforce component label'
 complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p n -l componentname -d '(required) name of the generated Visualforce component'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p t -l template      -d '[default: DefaultVFComponent] template to use for file creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create'      -l json          -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create'      -l loglevel      -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p t -l template -d '[default: DefaultVFComponent] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:visualforce:page -d 'create a Visualforce page'
 
 complete $sfdx_looking -xa force:visualforce:page:create -d 'create a Visualforce page'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p a -l apiversion    -d '[default: 46.0] API version number'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p d -l outputdir     -d 'folder for saving the created files'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p l -l label         -d '(required) Visualforce page label'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p a -l apiversion -d '[default: 46.0] API version number'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p d -l outputdir -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p l -l label -d '(required) Visualforce page label'
 complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p n -l componentname -d '(required) name of the generated Visualforce page'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p t -l template      -d '[default: DefaultVFPage] template to use for file creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create'      -l json          -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create'      -l loglevel      -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p t -l template -d '[default: DefaultVFPage] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 #
 # help
@@ -1015,41 +1015,41 @@ complete $sfdx_looking -xa plugins -d 'add/remove/create CLI plug-ins'
 complete -c sfdx -n '__fish_sfdx_using_command plugins' -l core -d 'show core plugins'
 
 complete $sfdx_looking -xa plugins:install -d 'installs a plugin into the CLI'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:install' -s f -l force   -d 'yarn install with force flag'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:install' -s h -l help    -d 'show CLI help'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:install' -s f -l force -d 'yarn install with force flag'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:install' -s h -l help -d 'show CLI help'
 complete -c sfdx -n '__fish_sfdx_using_command plugins:install' -s v -l verbose
 
 complete $sfdx_looking -xa plugins:link -d 'links a plugin into the CLI for development'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:link' -s h -l help    -d 'show CLI help'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:link' -s h -l help -d 'show CLI help'
 complete -c sfdx -n '__fish_sfdx_using_command plugins:link' -s v -l verbose
 
 complete $sfdx_looking -xa plugins:uninstall -d 'removes a plugin from the CLI'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:uninstall' -s h -l help    -d 'show CLI help'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:uninstall' -s h -l help -d 'show CLI help'
 complete -c sfdx -n '__fish_sfdx_using_command plugins:uninstall' -s v -l verbose
 
 complete $sfdx_looking -xa plugins:update -d 'update installed plugins'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:update' -s h -l help    -d 'show CLI help'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:update' -s h -l help -d 'show CLI help'
 complete -c sfdx -n '__fish_sfdx_using_command plugins:update' -s v -l verbose
 
 complete $sfdx_looking -xa plugins:generate -d 'create a new sfdx-cli plugin'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:generate' -s h -l help     -d 'show CLI help'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:generate'      -l defaults -d 'use defaults for every setting'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:generate'      -l force    -d 'overwrite existing files'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:generate' -s h -l help -d 'show CLI help'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:generate' -l defaults -d 'use defaults for every setting'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:generate' -l force -d 'overwrite existing files'
 
 complete $sfdx_looking -xa plugins:trust -d 'pack an npm package and produce a tgz file along with a corresponding digital signature'
 
 complete $sfdx_looking -xa plugins:trust:sign -d 'pack an npm package and produce a tgz file along with a corresponding digital signature'
 complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign' -s k -l privatekeypath -d '(required) the local file path for the private key.'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign' -s p -l publickeyurl   -d '(required) the url where the public key/certificate will be hosted.'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign' -s s -l signatureurl   -d '(required) the url location where the signature will be hosted minus the name of the actual signature file.'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign' -s p -l publickeyurl -d '(required) the url where the public key/certificate will be hosted.'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign' -s s -l signatureurl -d '(required) the url location where the signature will be hosted minus the name of the actual signature file.'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa plugins:trust:verify -d 'For an npm validate the associated digital signature if it exits.'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:verify' -s n -l npm      -d '(required) Specify the npm name. This can include a tag/version'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:verify' -s n -l npm -d '(required) Specify the npm name. This can include a tag/version'
 complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:verify' -s r -l registry -d 'The registry name. the behavior is the same as npm.'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:verify'      -l json     -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:verify'      -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:verify' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:verify' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 #
 # update
diff --git a/share/completions/src.fish b/share/completions/src.fish
index fe62d1301..469201204 100644
--- a/share/completions/src.fish
+++ b/share/completions/src.fish
@@ -3,83 +3,83 @@
 # TODO?: add short synonyms like ci, am
 # TODO: extract tag/branch names and feed to -a for tag delete, branch delete, rename
 
-complete -c src -f -n '__fish_use_subcommand'   -a help  -d 'Displays help for commands'
+complete -c src -f -n '__fish_use_subcommand' -a help -d 'Displays help for commands'
 complete -c src -f -n '__fish_seen_subcommand_from help' -a 'intro revisions commands commit amend checkout cat status log list diff fast-export fast-import ignores'
 
-complete -c src    -n '__fish_use_subcommand'   -a commit       -d 'Enters a commit for the specified files'
+complete -c src -n '__fish_use_subcommand' -a commit -d 'Enters a commit for the specified files'
 complete -c src -x -n '__fish_seen_subcommand_from commit' -s m -d 'Enter commit message as a string'
 complete -c src -r -n '__fish_seen_subcommand_from commit' -s f -d 'Enter file containing commit message'
-complete -c src    -n '__fish_seen_subcommand_from commit' -s e -d 'Further edit commit message'
+complete -c src -n '__fish_seen_subcommand_from commit' -s e -d 'Further edit commit message'
 
-complete -c src -r -n '__fish_use_subcommand'   -a amend       -d 'Amends the stored comment for a specified revision'
+complete -c src -r -n '__fish_use_subcommand' -a amend -d 'Amends the stored comment for a specified revision'
 complete -c src -x -n '__fish_seen_subcommand_from amend' -s m -d 'Enter commit message as a string'
 complete -c src -r -n '__fish_seen_subcommand_from amend' -s f -d 'Enter file containing commit message'
-complete -c src    -n '__fish_seen_subcommand_from amend' -s e -d 'Further edit commit message'
+complete -c src -n '__fish_seen_subcommand_from amend' -s e -d 'Further edit commit message'
 
 complete -c src -r -n '__fish_use_subcommand' -a checkout -d 'Refresh working copy from history'
 
 complete -c src -r -n '__fish_use_subcommand' -a cat -d 'Send the specified revision of the files to standard output'
 
-complete -c src -r -n '__fish_use_subcommand'   -a status       -d 'Show status of files'
-complete -c src    -n '__fish_seen_subcommand_from status' -s a -d 'Show all files'
+complete -c src -r -n '__fish_use_subcommand' -a status -d 'Show status of files'
+complete -c src -n '__fish_seen_subcommand_from status' -s a -d 'Show all files'
 
-complete -c src -r -n '__fish_use_subcommand'   -a tag            -d 'List/create/delete tags'
-complete -c src    -n '__fish_seen_subcommand_from tag' -a list   -d 'List tags'
-complete -c src    -n '__fish_seen_subcommand_from tag' -s l      -d 'List tags'
+complete -c src -r -n '__fish_use_subcommand' -a tag -d 'List/create/delete tags'
+complete -c src -n '__fish_seen_subcommand_from tag' -a list -d 'List tags'
+complete -c src -n '__fish_seen_subcommand_from tag' -s l -d 'List tags'
 complete -c src -r -n '__fish_seen_subcommand_from tag' -a create -d 'Create tag'
-complete -c src -r -n '__fish_seen_subcommand_from tag' -s c      -d 'Create tag'
+complete -c src -r -n '__fish_seen_subcommand_from tag' -s c -d 'Create tag'
 complete -c src -r -n '__fish_seen_subcommand_from tag' -a delete -d 'Delete tag'
-complete -c src -r -n '__fish_seen_subcommand_from tag' -s d      -d 'Delete tag'
+complete -c src -r -n '__fish_seen_subcommand_from tag' -s d -d 'Delete tag'
 
-complete -c src -r -n '__fish_use_subcommand'   -a branch            -d 'List/create/delete branches'
-complete -c src    -n '__fish_seen_subcommand_from branch' -a list   -d 'List branches'
-complete -c src    -n '__fish_seen_subcommand_from branch' -s l      -d 'List branches'
+complete -c src -r -n '__fish_use_subcommand' -a branch -d 'List/create/delete branches'
+complete -c src -n '__fish_seen_subcommand_from branch' -a list -d 'List branches'
+complete -c src -n '__fish_seen_subcommand_from branch' -s l -d 'List branches'
 complete -c src -r -n '__fish_seen_subcommand_from branch' -a create -d 'Create branch'
-complete -c src -r -n '__fish_seen_subcommand_from branch' -s c      -d 'Create branch'
+complete -c src -r -n '__fish_seen_subcommand_from branch' -s c -d 'Create branch'
 complete -c src -r -n '__fish_seen_subcommand_from branch' -a delete -d 'Delete branch'
-complete -c src -r -n '__fish_seen_subcommand_from branch' -s d      -d 'Delete branch'
+complete -c src -r -n '__fish_seen_subcommand_from branch' -s d -d 'Delete branch'
 
-complete -c src -r -n '__fish_use_subcommand'   -a rename            -d 'Rename tag/branch'
+complete -c src -r -n '__fish_use_subcommand' -a rename -d 'Rename tag/branch'
 
-complete -c src -r -n '__fish_use_subcommand'   -a list              -d 'List information about commits'
+complete -c src -r -n '__fish_use_subcommand' -a list -d 'List information about commits'
 # TODO: support `src list -<n>`
-complete -c src -x -n '__fish_seen_subcommand_from list' -s l        -d 'Limit per-file commit count'
-complete -c src -x -n '__fish_seen_subcommand_from list' -s f        -d 'Specify format string'
+complete -c src -x -n '__fish_seen_subcommand_from list' -s l -d 'Limit per-file commit count'
+complete -c src -x -n '__fish_seen_subcommand_from list' -s f -d 'Specify format string'
 
 # NOTE: pretending -b and -w are old-style options means they won’t be suggested as, say, “-pb” (which src can’t handle)
-complete -c src -r -n '__fish_use_subcommand'   -a log                                           -d 'List information about commits'
-complete -c src -x -n '__fish_seen_subcommand_from log' -s v                                     -d 'Be more verbose'
+complete -c src -r -n '__fish_use_subcommand' -a log -d 'List information about commits'
+complete -c src -x -n '__fish_seen_subcommand_from log' -s v -d 'Be more verbose'
 # TODO: support `src log -<n>`
-complete -c src -x -n '__fish_seen_subcommand_from log' -s l                                     -d 'Limit per-file log entries'
-complete -c src    -n '__fish_seen_subcommand_from log' -s p -l patch -s u                       -d 'Print unified-format diff'
-complete -c src    -n '__fish_seen_subcommand_from log' -s c                                     -d 'Print context diff'
-complete -c src    -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s p patch' -o b -d 'Ignore whitespace changes'
-complete -c src    -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s p patch' -o w -d 'Ignore all whitespace'
-complete -c src    -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s u'       -o b -d 'Ignore whitespace changes'
-complete -c src    -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s u'       -o w -d 'Ignore all whitespace'
+complete -c src -x -n '__fish_seen_subcommand_from log' -s l -d 'Limit per-file log entries'
+complete -c src -n '__fish_seen_subcommand_from log' -s p -l patch -s u -d 'Print unified-format diff'
+complete -c src -n '__fish_seen_subcommand_from log' -s c -d 'Print context diff'
+complete -c src -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s p patch' -o b -d 'Ignore whitespace changes'
+complete -c src -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s p patch' -o w -d 'Ignore all whitespace'
+complete -c src -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s u' -o b -d 'Ignore whitespace changes'
+complete -c src -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s u' -o w -d 'Ignore all whitespace'
 
 # NOTE: pretending -b and -w are old-style options means they won’t be suggested as, say, “-pb” (which src can’t handle)
-complete -c src -r -n '__fish_use_subcommand'   -a diff       -d 'Print diff'
-complete -c src    -n '__fish_seen_subcommand_from diff' -s u -d 'Print unified-format diff'
-complete -c src    -n '__fish_seen_subcommand_from diff' -s c -d 'Print context diff'
-complete -c src    -n '__fish_seen_subcommand_from diff' -o b -d 'Ignore whitespace changes'
-complete -c src    -n '__fish_seen_subcommand_from diff' -o w -d 'Ignore all whitespace'
+complete -c src -r -n '__fish_use_subcommand' -a diff -d 'Print diff'
+complete -c src -n '__fish_seen_subcommand_from diff' -s u -d 'Print unified-format diff'
+complete -c src -n '__fish_seen_subcommand_from diff' -s c -d 'Print context diff'
+complete -c src -n '__fish_seen_subcommand_from diff' -o b -d 'Ignore whitespace changes'
+complete -c src -n '__fish_seen_subcommand_from diff' -o w -d 'Ignore all whitespace'
 
-complete -c src -r -n '__fish_use_subcommand'   -a ls          -d 'List all registered files'
+complete -c src -r -n '__fish_use_subcommand' -a ls -d 'List all registered files'
 
-complete -c src -r -n '__fish_use_subcommand'   -a visualize   -d 'Emit DOT visualization'
+complete -c src -r -n '__fish_use_subcommand' -a visualize -d 'Emit DOT visualization'
 
-complete -c src -r -n '__fish_use_subcommand'   -a move        -d 'Rename a workfile and its history'
+complete -c src -r -n '__fish_use_subcommand' -a move -d 'Rename a workfile and its history'
 
-complete -c src -r -n '__fish_use_subcommand'   -a copy        -d 'Copy a file and its master'
+complete -c src -r -n '__fish_use_subcommand' -a copy -d 'Copy a file and its master'
 
-complete -c src -r -n '__fish_use_subcommand'   -a fast-export -d 'Export as a Git fast-import stream'
+complete -c src -r -n '__fish_use_subcommand' -a fast-export -d 'Export as a Git fast-import stream'
 
-complete -c src -r -n '__fish_use_subcommand'   -a fast-import       -d 'Parse a git-fast-import stream from stdin'
-complete -c src    -n '__fish_seen_subcommand_from fast-import' -s p -d 'Discards metadata'
+complete -c src -r -n '__fish_use_subcommand' -a fast-import -d 'Parse a git-fast-import stream from stdin'
+complete -c src -n '__fish_seen_subcommand_from fast-import' -s p -d 'Discards metadata'
 
-complete -c src -r -n '__fish_use_subcommand'   -a release           -d 'Release locks on files'
+complete -c src -r -n '__fish_use_subcommand' -a release -d 'Release locks on files'
 
-complete -c src    -s d -d 'Enable debugging output'
+complete -c src -s d -d 'Enable debugging output'
 complete -c src -r -s S -d 'Set repository directory'
-complete -c src    -s T -d 'Set up for fast-export tests'
+complete -c src -s T -d 'Set up for fast-export tests'
diff --git a/share/completions/tokei.fish b/share/completions/tokei.fish
index 47653e825..48b82e3b1 100644
--- a/share/completions/tokei.fish
+++ b/share/completions/tokei.fish
@@ -6,20 +6,20 @@ function __fish_tokei_supported_serializations
     command tokei --help | grep 'with serialization support' | cut -d : -f 2 | string trim | string split ', '
 end
 
-complete -c tokei    -s f -l files            -d 'Print out statistics for individual files'
-complete -c tokei -f -s h -l help             -d 'Print help information'
-complete -c tokei         -l hidden           -d 'Count hidden files, too'
-complete -c tokei -f -s l -l languages        -d 'Print out supported languages'
-complete -c tokei         -l no-ignore        -d 'Don’t respect ignore files'
-complete -c tokei         -l no-ignore-parent -d 'Don’t respect ignore files in parent directories'
-complete -c tokei         -l no-ignore-vcs    -d 'Don’t respect version-control ignore files'
-complete -c tokei -f -s V -l version          -d 'Print version information'
-complete -c tokei    -s v -l verbose          -d 'Increase log output level'
+complete -c tokei -s f -l files -d 'Print out statistics for individual files'
+complete -c tokei -f -s h -l help -d 'Print help information'
+complete -c tokei -l hidden -d 'Count hidden files, too'
+complete -c tokei -f -s l -l languages -d 'Print out supported languages'
+complete -c tokei -l no-ignore -d 'Don’t respect ignore files'
+complete -c tokei -l no-ignore-parent -d 'Don’t respect ignore files in parent directories'
+complete -c tokei -l no-ignore-vcs -d 'Don’t respect version-control ignore files'
+complete -c tokei -f -s V -l version -d 'Print version information'
+complete -c tokei -s v -l verbose -d 'Increase log output level'
 
 # Options
-complete -c tokei -x -s c -l columns                                               -d 'Set column width for terminal output'
-complete -c tokei -x -s e -l exclude                                               -d 'Ignore all files and directories containing this word'
-complete -c tokei -r -s i -l input                                                 -d 'Gives statistics from a previous Tokei run'
-complete -c tokei -x -s o -l output  -a  '(__fish_tokei_supported_serializations)' -d 'Choose output format'
-complete -c tokei -x -s s -l sort    -ka 'files lines code comments blanks'        -d 'Sort languages based on column'
-complete -c tokei -x -s t -l type    -a  '(command tokei --languages)'             -d 'Filters output by language type, comma-separated'
+complete -c tokei -x -s c -l columns -d 'Set column width for terminal output'
+complete -c tokei -x -s e -l exclude -d 'Ignore all files and directories containing this word'
+complete -c tokei -r -s i -l input -d 'Gives statistics from a previous Tokei run'
+complete -c tokei -x -s o -l output -a '(__fish_tokei_supported_serializations)' -d 'Choose output format'
+complete -c tokei -x -s s -l sort -ka 'files lines code comments blanks' -d 'Sort languages based on column'
+complete -c tokei -x -s t -l type -a '(command tokei --languages)' -d 'Filters output by language type, comma-separated'
diff --git a/share/completions/zpaq.fish b/share/completions/zpaq.fish
index 95402f738..77728ade4 100644
--- a/share/completions/zpaq.fish
+++ b/share/completions/zpaq.fish
@@ -17,7 +17,7 @@ complete -c zpaq -f -n "not $seen $commands" -a l -d "list"
 complete -c zpaq -f -n "not $seen $commands" -a list -d "List or compare external files to archive"
 
 #options
-complete -c zpaq -x -n "$seen $commands" -o all -a N -d "Extract/list versions in N [4] digit directories" 
+complete -c zpaq -x -n "$seen $commands" -o all -a N -d "Extract/list versions in N [4] digit directories"
 complete -c zpaq -f -n "$seen $commands" -s f -d "-force"
 complete -c zpaq -f -n "$seen $command1" -o force -d "Append files if contents have changed"
 complete -c zpaq -f -n "$seen $command2" -o force -d "Compare file contents instead of dates"
diff --git a/share/completions/zypper.fish b/share/completions/zypper.fish
index bdda36602..be8365b99 100644
--- a/share/completions/zypper.fish
+++ b/share/completions/zypper.fish
@@ -92,71 +92,71 @@ complete -f -n '__fish_zypper_not_use_file' -c zypper
 
 # Commands:
 
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'help ?'   -d 'Print help'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'help ?' -d 'Print help'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'shell sh' -d 'Accept multiple commands at once'
 
 #  Repository Management:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'repos lr'      -d 'List all defined repositories'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addrepo ar'    -d 'Add a new repository'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'repos lr' -d 'List all defined repositories'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addrepo ar' -d 'Add a new repository'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removerepo rr' -d 'Remove specified repository'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'renamerepo nr' -d 'Rename specified repository'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'modifyrepo mr' -d 'Modify specified repository'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh ref'   -d 'Refresh all repositories'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'clean cc'      -d 'Clean local caches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh ref' -d 'Refresh all repositories'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'clean cc' -d 'Clean local caches'
 
 #  Service Management:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'services ls'      -d 'List all defined services'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addservice as'    -d 'Add a new service'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'services ls' -d 'List all defined services'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addservice as' -d 'Add a new service'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'modifyservice ms' -d 'Modify specified service'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removeservice rs' -d 'Remove specified service'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh-services refs' -d 'Refresh all services'
 
 #  Software Management:
-complete    -n '__fish_zypper_no_subcommand' -c zypper -a 'install in'        -d 'Install packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'remove rm'         -d 'Remove packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'verify ve'         -d 'Verify integrity of package dependencies'
+complete -n '__fish_zypper_no_subcommand' -c zypper -a 'install in' -d 'Install packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'remove rm' -d 'Remove packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'verify ve' -d 'Verify integrity of package dependencies'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'source-install si' -d 'Install source packages and their build dependencies'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'install-new-recommends inr' -d 'Install newly added packages recommended by installed packages'
 
 #  Update Management:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'update up'        -d 'Update installed packages with newer versions'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-updates lu'  -d 'List available updates'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch'            -d 'Install needed patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-patches lp'  -d 'List needed patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'update up' -d 'Update installed packages with newer versions'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-updates lu' -d 'List available updates'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch' -d 'Install needed patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-patches lp' -d 'List needed patches'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'dist-upgrade dup' -d 'Perform a distribution upgrade'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-check pchk' -d 'Check for patches'
 
 #  Querying:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'search se'        -d 'Search for packages matching a pattern'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'info if'          -d 'Show full information for specified packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-info'       -d 'Show full information for specified patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'pattern-info'     -d 'Show full information for specified patterns'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'product-info'     -d 'Show full information for specified products'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patches pch'      -d 'List all available patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'packages pa'      -d 'List all available packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patterns pt'      -d 'List all available patterns'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'products pd'      -d 'List all available products'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'search se' -d 'Search for packages matching a pattern'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'info if' -d 'Show full information for specified packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-info' -d 'Show full information for specified patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'pattern-info' -d 'Show full information for specified patterns'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'product-info' -d 'Show full information for specified products'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patches pch' -d 'List all available patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'packages pa' -d 'List all available packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patterns pt' -d 'List all available patterns'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'products pd' -d 'List all available products'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'what-provides wp' -d 'List packages providing specified capability'
 
 #  Package Locks:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addlock al'    -d 'Add a package lock'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addlock al' -d 'Add a package lock'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removelock rl' -d 'Remove a package lock'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'locks ll'      -d 'List current package locks'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'locks ll' -d 'List current package locks'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'cleanlocks cl' -d 'Remove unused locks'
 
 #  Locale Management:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'locales lloc'      -d 'List requested locales (languages codes)'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addlocale aloc'    -d 'Add locale(s) to requested locales'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'locales lloc' -d 'List requested locales (languages codes)'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addlocale aloc' -d 'Add locale(s) to requested locales'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removelocale rloc' -d 'Remove locale(s) from requested locales'
 
 #  Other Commands:
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'versioncmp vcmp' -d 'Compare two version strings'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'targetos tos'    -d 'Print the target operating system ID string'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'licenses'        -d 'Print report about licenses and EULAs of installed packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'download'        -d 'Download rpms specified on the commandline to a local directory'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'targetos tos' -d 'Print the target operating system ID string'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'licenses' -d 'Print report about licenses and EULAs of installed packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'download' -d 'Download rpms specified on the commandline to a local directory'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'source-download' -d 'Download source rpms for all installed packages to a local directory'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'needs-rebooting' -d 'Check if the needs-reboot flag was set'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'ps'              -d 'List running processes which might still use files and libraries deleted by recent upgrades'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'ps' -d 'List running processes which might still use files and libraries deleted by recent upgrades'
 
 #  Subcommands:
 
@@ -164,175 +164,175 @@ complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'subcommand' -d 'Lists
 
 # Global Options:
 
-complete -c zypper -n '__fish_zypper_no_subcommand' -l help            -s h -d 'Help'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l version         -s V -d 'Output the version number'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l promptids            -d 'Output a list of zypper user prompts'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l config       -r -s c -d 'Use specified config file instead of the default'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l userdata             -d 'User defined transaction id used in history and plugins'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l quiet           -s q -d 'Suppress normal output, print only error messages'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l verbose         -s v -d 'Increase verbosity'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-abbrev       -s A -d 'Do not abbreviate text in tables'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l table-style     -s s -d 'Table style (integer)'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l rug-compatible  -s r -d 'Turn on rug compatibility'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l help -s h -d 'Help'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l version -s V -d 'Output the version number'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l promptids -d 'Output a list of zypper user prompts'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l config -r -s c -d 'Use specified config file instead of the default'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l userdata -d 'User defined transaction id used in history and plugins'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l quiet -s q -d 'Suppress normal output, print only error messages'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l verbose -s v -d 'Increase verbosity'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-abbrev -s A -d 'Do not abbreviate text in tables'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l table-style -s s -d 'Table style (integer)'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l rug-compatible -s r -d 'Turn on rug compatibility'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l non-interactive -s n -d 'Do not ask anything, use default answers automatically'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l non-interactive-include-reboot-patches -d 'Do not treat patches as interactive, which have the rebootSuggested-flag set'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l xmlout          -s x -d 'Switch to XML output'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l ignore-unknown  -s i -d 'Ignore unknown packages'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l terse           -s t -d 'Terse output for machine consumption. Implies --no-abbrev and --no-color'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l xmlout -s x -d 'Switch to XML output'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l ignore-unknown -s i -d 'Ignore unknown packages'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l terse -s t -d 'Terse output for machine consumption. Implies --no-abbrev and --no-color'
 
-complete -c zypper -n '__fish_zypper_no_subcommand' -l reposd-dir -s D  -r -d 'Use alternative repository definition file directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l cache-dir  -s C  -r -d 'Use alternative directory for all caches'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l raw-cache-dir    -r -d 'Use alternative raw meta-data cache directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l solv-cache-dir   -r -d 'Use alternative solv file cache directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l pkg-cache-dir    -r -d 'Use alternative package cache directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l reposd-dir -s D -r -d 'Use alternative repository definition file directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l cache-dir -s C -r -d 'Use alternative directory for all caches'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l raw-cache-dir -r -d 'Use alternative raw meta-data cache directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l solv-cache-dir -r -d 'Use alternative solv file cache directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l pkg-cache-dir -r -d 'Use alternative package cache directory'
 
 #  Repository Options
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-gpg-checks        -d 'Ignore GPG check failures and continue'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-gpg-checks -d 'Ignore GPG check failures and continue'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l gpg-auto-import-keys -d 'Automatically trust and import new repository signing keys'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-repo    -s p -rf -d 'Use an additional repository'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-repo -s p -rf -d 'Use an additional repository'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-content -s p -rf -d 'Additionally use disabled repositories providing a specific keyword'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l disable-repositories -d 'Do not read meta-data from repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-refresh           -d 'Do not refresh the repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-cd                -d 'Ignore CD/DVD repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-remote            -d 'Ignore remote repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l releasever           -d 'Set the value of $releasever in all .repo files'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-refresh -d 'Do not refresh the repositories'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-cd -d 'Ignore CD/DVD repositories'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-remote -d 'Ignore remote repositories'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l releasever -d 'Set the value of $releasever in all .repo files'
 
 #  Target Options
-complete -c zypper -n '__fish_zypper_no_subcommand' -l root               -s R -r -d 'Operate on a different root directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l installroot             -r -d 'Operate on a different root directory, but share repositories with the host'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l root -s R -r -d 'Operate on a different root directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l installroot -r -d 'Operate on a different root directory, but share repositories with the host'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l disable-system-resolvables -d 'Do not read installed packages'
 
 function __fish_zypper_is_subcommand_lr
     __fish_zypper_cmd_in_array repos lr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l export         -r -s e -d 'Export all defined repositories as a single local .repo file'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l alias             -s a -d 'Show also repository alias'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l name              -s n -d 'Show also repository name'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l refresh           -s r -d 'Show also the autorefresh flag'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l uri               -s u -d 'Show also base URI of repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l priority          -s p -d 'Show also repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l details           -s d -d 'Show more information like URI, priority, type'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l service           -s s -d 'Show also alias of parent service'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l export -r -s e -d 'Export all defined repositories as a single local .repo file'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l alias -s a -d 'Show also repository alias'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l name -s n -d 'Show also repository name'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l refresh -s r -d 'Show also the autorefresh flag'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l uri -s u -d 'Show also base URI of repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l priority -s p -d 'Show also repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l details -s d -d 'Show more information like URI, priority, type'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l service -s s -d 'Show also alias of parent service'
 complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l show-enabled-only -s E -d 'Show enabled repos only'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-uri       -s U -d 'Sort the list by URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-name      -s N -d 'Sort the list by name'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-priority  -s P -d 'Sort the list by repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-alias     -s A -d 'Sort the list by alias'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-uri -s U -d 'Sort the list by URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-name -s N -d 'Sort the list by name'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-priority -s P -d 'Sort the list by repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-alias -s A -d 'Sort the list by alias'
 
 function __fish_zypper_is_subcommand_ar
     __fish_zypper_cmd_in_array addrepo ar
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l repo           -r -s r -d 'Just another means to specify a .repo file to read'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l check             -s c -d 'Probe URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-check          -s C -d "Don't probe URI, probe later during refresh"
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l priority          -s p -d 'Set the priority of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l keep-packages     -s k -d 'Enable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-keep-packages  -s K -d 'Disable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck          -s g -d 'Enable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-strict        -d 'Enable strict GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l repo -r -s r -d 'Just another means to specify a .repo file to read'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l check -s c -d 'Probe URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-check -s C -d "Don't probe URI, probe later during refresh"
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l priority -s p -d 'Set the priority of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l keep-packages -s k -d 'Enable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-keep-packages -s K -d 'Disable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck -s g -d 'Enable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-strict -d 'Enable strict GPG check for this repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned -d 'Short hand for --gpgcheck-allow-unsigned-repo --gpgcheck-allow-unsigned-package'
 complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned-repo -d 'Enable GPG check but allow the repository metadata to be unsigned'
 complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned-package -d 'Enable GPG check but allow installing unsigned packages from this repository.'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-gpgcheck       -s G -d 'Disable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l default-gpgcheck       -d 'Use the global GPG check setting defined in /etc/zypp/zypp.conf'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l name           -r -s n -d 'Specify descriptive name for the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l enable            -s d -d 'Add the repository as enabled'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l disable           -s d -d 'Add the repository as disabled'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l refresh           -s f -d 'Enable autorefresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-refresh        -s F -d 'Disable autorefresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-gpgcheck -s G -d 'Disable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l default-gpgcheck -d 'Use the global GPG check setting defined in /etc/zypp/zypp.conf'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l name -r -s n -d 'Specify descriptive name for the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l enable -s d -d 'Add the repository as enabled'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l disable -s d -d 'Add the repository as disabled'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l refresh -s f -d 'Enable autorefresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-refresh -s F -d 'Disable autorefresh of the repository'
 
 function __fish_zypper_is_subcommand_rr
     __fish_zypper_cmd_in_array removerepo rr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-auth          -d 'Ignore user authentication data in the URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-query         -d 'Ignore query string in the URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l all            -s a -d 'Apply changes to all repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l local          -s l -d 'Apply changes to all local repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l remote         -s t -d 'Apply changes to all remote repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-auth -d 'Ignore user authentication data in the URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-query -d 'Ignore query string in the URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l all -s a -d 'Apply changes to all repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l local -s l -d 'Apply changes to all local repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l remote -s t -d 'Apply changes to all remote repositories'
 complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l medium-type -r -s m -d 'Apply changes to repositories of specified type'
 
 function __fish_zypper_is_subcommand_mr
     __fish_zypper_cmd_in_array modifyrepo mr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l name           -r -s n -d 'Set a descriptive name for the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l disable           -s d -d "Disable the repository"
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l enable            -s e -d 'Enable the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l refresh           -s f -d 'Enable auto-refresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-refresh        -s F -d 'Disable auto-refresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l priority       -r -s p -d 'Set the priority of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l keep-packages     -s k -d 'Enable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-keep-packages  -s K -d 'Disable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck          -s g -d 'Enable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-strict        -d 'Enable strict GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l name -r -s n -d 'Set a descriptive name for the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l disable -s d -d "Disable the repository"
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l enable -s e -d 'Enable the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l refresh -s f -d 'Enable auto-refresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-refresh -s F -d 'Disable auto-refresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l priority -r -s p -d 'Set the priority of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l keep-packages -s k -d 'Enable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-keep-packages -s K -d 'Disable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck -s g -d 'Enable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-strict -d 'Enable strict GPG check for this repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned -d 'Short hand for --gpgcheck-allow-unsigned-repo --gpgcheck-allow-unsigned-package'
 complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned-repo -d 'Enable GPG check but allow the repository metadata to be unsigned'
 complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned-package -d 'Enable GPG check but allow installing unsigned packages from this repository.'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-gpgcheck       -s G -d 'Disable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l default-gpgcheck       -d 'Use the global GPG check setting defined in /etc/zypp/zypp.conf'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l all               -s a -d 'Apply changes to all repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l local             -s l -d 'Apply changes to all local repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l remote            -s t -d 'Apply changes to all remote repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l medium-type    -r -s m -d 'Apply changes to repositories of specified type'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-gpgcheck -s G -d 'Disable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l default-gpgcheck -d 'Use the global GPG check setting defined in /etc/zypp/zypp.conf'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l all -s a -d 'Apply changes to all repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l local -s l -d 'Apply changes to all local repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l remote -s t -d 'Apply changes to all remote repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l medium-type -r -s m -d 'Apply changes to repositories of specified type'
 
 function __fish_zypper_is_subcommand_ref
     __fish_zypper_cmd_in_array refresh ref
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force            -s f -d 'Force a complete refresh'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-build      -s b -d 'Force rebuild of the database'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-download   -s d -d 'Force download of raw metadata'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l build-only       -s B -d "Only build the database, don't download metadata"
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l download-only    -s D -d "Only download raw metadata, don't build the database"
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force -s f -d 'Force a complete refresh'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-build -s b -d 'Force rebuild of the database'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-download -s d -d 'Force download of raw metadata'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l build-only -s B -d "Only build the database, don't download metadata"
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l download-only -s D -d "Only download raw metadata, don't build the database"
 complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Refresh only specified repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l services         -s s -d 'Refresh also services before refreshing repos'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l services -s s -d 'Refresh also services before refreshing repos'
 
 function __fish_zypper_is_subcommand_ls
     __fish_zypper_cmd_in_array services ls
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l uri               -s u -d 'Show also base URI of repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l priority          -s p -d 'Show also repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l details           -s d -d 'Show more information like URI, priority, type'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l with-repos        -s r -d 'Show also repositories belonging to the services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l uri -s u -d 'Show also base URI of repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l priority -s p -d 'Show also repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l details -s d -d 'Show more information like URI, priority, type'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l with-repos -s r -d 'Show also repositories belonging to the services'
 complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l show-enabled-only -s E -d 'Show enabled repos only'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-priority  -s P -d 'Sort the list by repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-uri       -s U -d 'Sort the list by URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-name      -s N -d 'Sort the list by name'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-priority -s P -d 'Sort the list by repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-uri -s U -d 'Sort the list by URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-name -s N -d 'Sort the list by name'
 
 function __fish_zypper_is_subcommand_as
     __fish_zypper_cmd_in_array addservice as
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l name    -r -s n -d 'Set a descriptive name for the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l enable     -s d -d 'Add the service as enabled'
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l disable    -s d -d 'Add the service as disabled'
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l refresh    -s f -d 'Enable autorefresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_as' -l name -r -s n -d 'Set a descriptive name for the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_as' -l enable -s d -d 'Add the service as enabled'
+complete -c zypper -n '__fish_zypper_is_subcommand_as' -l disable -s d -d 'Add the service as disabled'
+complete -c zypper -n '__fish_zypper_is_subcommand_as' -l refresh -s f -d 'Enable autorefresh of the repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_as' -l no-refresh -s F -d 'Disable autorefresh of the repository'
 
 function __fish_zypper_is_subcommand_ms
     __fish_zypper_cmd_in_array modifyservice ms
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l name       -r -s n -d 'Set a descriptive name for the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l enable        -s e -d 'Enable a disabled service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l disable       -s d -d "Disable the service (but don't remove it)"
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l refresh       -s r -d 'Enable auto-refresh of the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l no-refresh    -s R -d 'Disable auto-refresh of the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l all           -s a -d 'Apply changes to all services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l local         -s l -d 'Apply changes to all local services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l remote        -s t -d 'Apply changes to all remote services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l medium-type   -s m -d 'Apply changes to services of specified type'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l name -r -s n -d 'Set a descriptive name for the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l enable -s e -d 'Enable a disabled service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l disable -s d -d "Disable the service (but don't remove it)"
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l refresh -s r -d 'Enable auto-refresh of the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l no-refresh -s R -d 'Disable auto-refresh of the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l all -s a -d 'Apply changes to all services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l local -s l -d 'Apply changes to all local services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l remote -s t -d 'Apply changes to all remote services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l medium-type -s m -d 'Apply changes to services of specified type'
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l ar-to-enable  -r -s i -d 'Add a RIS service repository to enable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l ar-to-enable -r -s i -d 'Add a RIS service repository to enable'
 complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l ar-to-disable -r -s I -d 'Add a RIS service repository to disable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l rr-to-enable  -r -s j -d 'Remove a RIS service repository to enable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l rr-to-enable -r -s j -d 'Remove a RIS service repository to enable'
 complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l rr-to-disable -r -s J -d 'Remove a RIS service repository to disable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-enable     -s k -d 'Clear the list of RIS repositories to enable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-disable    -s K -d 'Clear the list of RIS repositories to disable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-enable -s k -d 'Clear the list of RIS repositories to enable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-disable -s K -d 'Clear the list of RIS repositories to disable'
 
 function __fish_zypper_is_subcommand_rs
     __fish_zypper_cmd_in_array removeservice rs
@@ -345,24 +345,24 @@ function __fish_zypper_is_subcommand_refs
     __fish_zypper_cmd_in_array refresh-services refs
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l force          -s f -d 'Force a complete refresh'
-complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l with-repos     -s r -d 'Refresh also repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l force -s f -d 'Force a complete refresh'
+complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l with-repos -s r -d 'Refresh also repositories'
 complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l restore-status -s R -d 'Also restore service repositories enabled/disabled state'
 
 function __fish_zypper_subcommand_has_solver_expert_options
     __fish_zypper_cmd_in_array install in verify ve source-install si install-new-recommends inr update up dist-upgrade dup patch
 end
 
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l debug-solver      -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l force-resolution  -d 'Force the solver to find a solution (even an aggressive one)'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l no-force-resolution   -s R -d 'Do not force the solver to find solution, let it ask'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l debug-solver -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l force-resolution -d 'Force the solver to find a solution (even an aggressive one)'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l no-force-resolution -s R -d 'Do not force the solver to find solution, let it ask'
 complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l solver-focus -rf -a "$__fish_zypper_solver_focus_modes" -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l recommends        -d 'Install also recommended packages in addition to the required'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l no-recommends     -d 'Do not install recommended packages, only required'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l recommends -d 'Install also recommended packages in addition to the required'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l no-recommends -d 'Do not install recommended packages, only required'
 
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-downgrade     -l no-allow-downgrade     -d 'Whether to allow downgrading installed resolvables'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-name-change   -l no-allow-name-change   -d 'Whether to allow changing the names of installed resolvables'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-arch-change   -l no-allow-arch-change   -d 'Whether to allow changing the architecture of installed resolvables'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-downgrade -l no-allow-downgrade -d 'Whether to allow downgrading installed resolvables'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-name-change -l no-allow-name-change -d 'Whether to allow changing the names of installed resolvables'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-arch-change -l no-allow-arch-change -d 'Whether to allow changing the architecture of installed resolvables'
 complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-vendor-change -l no-allow-vendor-change -d 'Whether to allow changing the vendor of installed resolvables'
 
 function __fish_zypper_is_subcommand_in
@@ -370,17 +370,17 @@ function __fish_zypper_is_subcommand_in
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l name          -s n -d 'Select packages by plain name, not by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l capability    -s C -d 'Select packages by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l details            -d 'Show the detailed installation summary'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l name -s n -d 'Select packages by plain name, not by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l capability -s C -d 'Select packages by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l details -d 'Show the detailed installation summary'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l from -rf -a "(__fish_zypper_print_repos -e)" -d 'Select packages from the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l oldpackage         -d 'Allow to replace a newer item with an older one.'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l oldpackage -d 'Allow to replace a newer item with an older one.'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l allow-unsigned-rpm -d 'Silently install unsigned rpm packages given as commandline parameters'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l force         -s f -d 'Install even if the item is already installed (reinstall), downgraded or changes vendor or architecture'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l force -s f -d 'Install even if the item is already installed (reinstall), downgraded or changes vendor or architecture'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l no-confirm    -s y -d 'Don\'t require user interaction'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l dry-run       -s D -d 'Test the installation, do not actually install'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l replacefiles       -d 'Install the packages even if they replace files from other, already installed, packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l no-confirm -s y -d 'Don\'t require user interaction'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l dry-run -s D -d 'Test the installation, do not actually install'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l replacefiles -d 'Install the packages even if they replace files from other, already installed, packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l download-only -s d -d 'Only download the packages, do not install'
@@ -390,13 +390,13 @@ function __fish_zypper_is_subcommand_rm
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l name          -s n -d 'Select packages by plain name, not by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l capability    -s C -d 'Select packages by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l details            -d 'Show the detailed installation summary'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l name -s n -d 'Select packages by plain name, not by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l capability -s C -d 'Select packages by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l details -d 'Show the detailed installation summary'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-confirm    -s y -d 'Don\'t require user interaction'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l dry-run       -s D -d 'Test the removal, do not actually remove'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l clean-deps    -s u -d 'Automatically remove unneeded dependencies'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-confirm -s y -d 'Don\'t require user interaction'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l dry-run -s D -d 'Test the removal, do not actually remove'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l clean-deps -s u -d 'Automatically remove unneeded dependencies'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-clean-deps -s U -d 'No automatic removal of unneeded dependencies'
 
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l debug-solver -d 'Create solver test case for debugging'
@@ -408,22 +408,22 @@ function __fish_zypper_is_subcommand_ve
     __fish_zypper_cmd_in_array verify ve
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l details            -d 'Show the detailed installation summary'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l dry-run       -s D -d 'Test the repair, do not actually do anything to the system'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l details -d 'Show the detailed installation summary'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l dry-run -s D -d 'Test the repair, do not actually do anything to the system'
 complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l download-only -s d -d 'Only download the packages, do not install'
 complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l no-confirm    -s y -d 'Don\'t require user interaction'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l no-confirm -s y -d 'Don\'t require user interaction'
 
 function __fish_zypper_is_subcommand_si
     __fish_zypper_cmd_in_array source-install si
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_si' -l build-deps-only   -s d -d 'Install only build dependencies of specified packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_si' -l no-build-deps     -s D -d "Don't install build dependencies"
+complete -c zypper -n '__fish_zypper_is_subcommand_si' -l build-deps-only -s d -d 'Install only build dependencies of specified packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_si' -l no-build-deps -s D -d "Don't install build dependencies"
 complete -c zypper -n '__fish_zypper_is_subcommand_si' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Install packages only from specified repositories'
 complete -c zypper -n '__fish_zypper_is_subcommand_si' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_si' -l download-only     -s d -d 'Only download the packages, do not install'
+complete -c zypper -n '__fish_zypper_is_subcommand_si' -l download-only -s d -d 'Only download the packages, do not install'
 
 function __fish_zypper_is_subcommand_inr
     __fish_zypper_cmd_in_array install-new-recommends inr
@@ -440,15 +440,15 @@ function __fish_zypper_is_subcommand_up
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l details            -d 'Show the detailed installation summary'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l best-effort        -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l replacefiles       -d 'Install the packages even if they replace files from other, already installed, packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l details -d 'Show the detailed installation summary'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l best-effort -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l replacefiles -d 'Install the packages even if they replace files from other, already installed, packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l no-confirm    -s y -d 'Don\'t require user interaction'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l with-interactive   -d 'Do not skip interactive updates'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l skip-interactive   -d 'Skip interactive updates'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l no-confirm -s y -d 'Don\'t require user interaction'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l with-interactive -d 'Do not skip interactive updates'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l skip-interactive -d 'Skip interactive updates'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l dry-run       -s D -d 'Test the update, do not actually update'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l dry-run -s D -d 'Test the update, do not actually update'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l download-only -s d -d 'Only download the packages, do not install'
 
@@ -458,12 +458,12 @@ end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
 complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l best-effort -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l all    -s a -d 'List all packages for which newer versions are available, regardless whether they are installable or not'
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l all -s a -d 'List all packages for which newer versions are available, regardless whether they are installable or not'
 complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'List only updates from the specified repository'
 
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-downgrade     -l no-allow-downgrade     -d 'Whether to allow downgrading installed resolvables'
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-name-change   -l no-allow-name-change   -d 'Whether to allow changing the names of installed resolvables'
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-arch-change   -l no-allow-arch-change   -d 'Whether to allow changing the architecture of installed resolvables'
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-downgrade -l no-allow-downgrade -d 'Whether to allow downgrading installed resolvables'
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-name-change -l no-allow-name-change -d 'Whether to allow changing the names of installed resolvables'
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-arch-change -l no-allow-arch-change -d 'Whether to allow changing the architecture of installed resolvables'
 complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-vendor-change -l no-allow-vendor-change -d 'Whether to allow changing the vendor of installed resolvables'
 
 function __fish_zypper_is_subcommand_lp
@@ -473,14 +473,14 @@ end
 set -g __fish_zypper_patch_category security recommended optional feature document yast
 set -g __fish_zypper_patch_severity critical important moderate low unspecified
 
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l all      -s a -d 'List all patches, not only the needed ones'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l all -s a -d 'List all patches, not only the needed ones'
 complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'List only patches from the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l category -s g -rf -a "$__fish_zypper_patch_category" -d 'Select patches with the specified category'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l severity      -rf -a "$__fish_zypper_patch_severity" -d 'Select patches with the specified severity'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l date       -rf -d 'Select patches issued up to, but not including, the specified date'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l severity -rf -a "$__fish_zypper_patch_severity" -d 'Select patches with the specified severity'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l date -rf -d 'Select patches issued up to, but not including, the specified date'
 complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l bugzilla -s b -d 'Select applicable patches for the specified Bugzilla issues'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l cve           -d 'Select applicable patches for the specified CVE issues'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l issues        -d 'Select issues matching the specified string'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l cve -d 'Select applicable patches for the specified CVE issues'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l issues -d 'Select issues matching the specified string'
 complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l with-optional -l without-optional -d 'Whether applicable optional patches should be treated as needed or be excluded'
 
 function __fish_zypper_is_subcommand_dup
@@ -488,12 +488,12 @@ function __fish_zypper_is_subcommand_dup
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l from -rf -a "(__fish_zypper_print_repos -e)" -d 'Restrict upgrade to specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l details            -d 'Show the detailed installation summary'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l replacefiles       -d 'Install the packages even if they replace files from other, already installed, packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l details -d 'Show the detailed installation summary'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l replacefiles -d 'Install the packages even if they replace files from other, already installed, packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l dry-run       -s D -d 'Test the upgrade, do not actually upgrade'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-confirm    -s y -d 'Don\'t require user interaction'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l dry-run -s D -d 'Test the upgrade, do not actually upgrade'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-confirm -s y -d 'Don\'t require user interaction'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l download-only -s d -d 'Only download the packages, do not install'
 
@@ -509,28 +509,28 @@ function __fish_zypper_is_subcommand_se
     __fish_zypper_cmd_in_array search se
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-substrings         -d 'Search for a match to partial words (default)'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-words              -d 'Search for a match to whole words only'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-exact -s x         -d 'Searches for an exact package name'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l provides                 -d 'Search for packages which provide the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l requires                 -d 'Search for packages which require the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l recommends               -d 'Search for packages which recommend the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l supplements              -d 'Search for packages which supplements the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l conflicts                -d 'Search packages conflicting with search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l obsoletes                -d 'Search for packages which obsolete the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l suggests                 -d 'Search for packages which suggest the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-substrings -d 'Search for a match to partial words (default)'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-words -d 'Search for a match to whole words only'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-exact -s x -d 'Searches for an exact package name'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l provides -d 'Search for packages which provide the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l requires -d 'Search for packages which require the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l recommends -d 'Search for packages which recommend the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l supplements -d 'Search for packages which supplements the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l conflicts -d 'Search packages conflicting with search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l obsoletes -d 'Search for packages which obsolete the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l suggests -d 'Search for packages which suggest the search strings'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Search only for packages of the specified type'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l name                -s n -d 'Useful together with dependency options, otherwise searching in package name is default'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l file-list           -s f -d 'Search for a match in the file list of packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l name -s n -d 'Useful together with dependency options, otherwise searching in package name is default'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l file-list -s f -d 'Search for a match in the file list of packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l search-descriptions -s d -d 'Search also in package summaries and descriptions'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l case-sensitive      -s C -d 'Perform case-sensitive search'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l details             -s s -d 'Show each available version in each repository on a separate line'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l verbose             -s s -d 'Like --details, with additional information where the search has matched (useful for search in dependencies)'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-name             -d 'Sort packages by name (default)'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-repo             -d 'Sort packages by repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l case-sensitive -s C -d 'Perform case-sensitive search'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l details -s s -d 'Show each available version in each repository on a separate line'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l verbose -s s -d 'Like --details, with additional information where the search has matched (useful for search in dependencies)'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-name -d 'Sort packages by name (default)'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-repo -d 'Sort packages by repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Search only in the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l installed-only      -s i -d 'Show only packages that are already installed'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l not-installed-only  -s u -d 'Show only packages that are not currently installed'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l installed-only -s i -d 'Show only packages that are already installed'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l not-installed-only -s u -d 'Show only packages that are not currently installed'
 
 function __fish_zypper_is_subcommand_if
     __fish_zypper_cmd_in_array info if
@@ -538,13 +538,13 @@ end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_if' -l match-substrings -s s -d 'Print information for packages partially matching name'
 complete -c zypper -n '__fish_zypper_is_subcommand_if' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l provides              -d 'Show provides'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l requires              -d 'Show requires and prerequires'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l conflicts             -d 'Show conflicts'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l obsoletes             -d 'Show obsoletes'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l recommends            -d 'Show recommends'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l supplements           -d 'Show supplements'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l suggests              -d 'Show suggests'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l provides -d 'Show provides'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l requires -d 'Show requires and prerequires'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l conflicts -d 'Show conflicts'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l obsoletes -d 'Show obsoletes'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l recommends -d 'Show recommends'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l supplements -d 'Show supplements'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l suggests -d 'Show suggests'
 complete -c zypper -n '__fish_zypper_is_subcommand_if' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Work only with the specified repository'
 
 function __fish_zypper_is_subcommand_pch
@@ -557,14 +557,14 @@ function __fish_zypper_is_subcommand_pa
     __fish_zypper_cmd_in_array packages pa
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l orphaned                -d 'Show packages which are orphaned (without repository)'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l suggested               -d 'Show packages which are suggested'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l recommended             -d 'Show packages which are recommended'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l unneeded                -d 'Show packages which are unneeded'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-name       -s N -d 'Sort the list by package name'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-repo       -s R -d 'Sort the list by repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l orphaned -d 'Show packages which are orphaned (without repository)'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l suggested -d 'Show packages which are suggested'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l recommended -d 'Show packages which are recommended'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l unneeded -d 'Show packages which are unneeded'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-name -s N -d 'Sort the list by package name'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-repo -s R -d 'Sort the list by repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l installed-only     -s i -d 'Show only installed packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l installed-only -s i -d 'Show only installed packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l not-installed-only -s u -d 'Show only packages which are not installed'
 
 function __fish_zypper_is_subcommand_pt
@@ -572,16 +572,16 @@ function __fish_zypper_is_subcommand_pt
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l installed-only     -s i -d 'Show only installed patterns'
+complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l installed-only -s i -d 'Show only installed patterns'
 complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l not-installed-only -s u -d 'Show only patterns which are not installed'
 
 function __fish_zypper_is_subcommand_pd
     __fish_zypper_cmd_in_array products pd
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l xmlfwd               -r -d 'XML output only: Literally forward the XML tags found in a product file'
+complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l xmlfwd -r -d 'XML output only: Literally forward the XML tags found in a product file'
 complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l installed-only     -s i -d 'Show only installed products'
+complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l installed-only -s i -d 'Show only installed products'
 complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l not-installed-only -s u -d 'Show only products which are not installed'
 
 function __fish_zypper_is_subcommand_al
@@ -603,14 +603,14 @@ function __fish_zypper_is_subcommand_cl
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-duplicates -s d -d 'Clean only duplicate locks'
-complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-empty      -s e -d "Clean only locks which doesn't lock anything"
+complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-empty -s e -d "Clean only locks which doesn't lock anything"
 
 function __fish_zypper_is_subcommand_lloc
     __fish_zypper_cmd_in_array locales lloc
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_lloc' -l packages -s p -d 'Show corresponding packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_lloc' -l all      -s a -d 'List all available locales'
+complete -c zypper -n '__fish_zypper_is_subcommand_lloc' -l all -s a -d 'List all available locales'
 
 function __fish_zypper_is_subcommand_aloc
     __fish_zypper_cmd_in_array addlocale aloc
@@ -641,30 +641,30 @@ function __fish_zypper_is_subcommand_clean
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l repo -s r -rf -a "(__fish_zypper_print_repos)" -d 'Clean only specified repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l metadata     -s m -d 'Clean metadata cache'
+complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l metadata -s m -d 'Clean metadata cache'
 complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l raw-metadata -s M -d 'Clean raw metadata cache'
-complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l all          -s a -d 'Clean both metadata and package caches'
+complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l all -s a -d 'Clean both metadata and package caches'
 
 function __fish_zypper_is_subcommand_patch
     __fish_zypper_cmd_in_array patch
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l updatestack-only   -d 'Consider only patches which affect the package management itself'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-update        -d 'Additionally try to update all packages not covered by patches'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l details            -d 'Show the detailed installation summary'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l replacefiles       -d 'Install the packages even if they replace files from other, already installed, packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l repo    -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l updatestack-only -d 'Consider only patches which affect the package management itself'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-update -d 'Additionally try to update all packages not covered by patches'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l details -d 'Show the detailed installation summary'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l replacefiles -d 'Install the packages even if they replace files from other, already installed, packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l category -s g -rf -a "$__fish_zypper_patch_category" -d 'Select patches with the specified category'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l severity      -rf -a "$__fish_zypper_patch_severity" -d 'Select patches with the specified severity'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l date            -r -d 'Select patches issued up to, but not including, the specified date'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l bugzilla      -s b -d 'Select applicable patches for the specified Bugzilla issues'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l cve                -d 'Select applicable patches for the specified CVE issues'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l no-confirm    -s y -d 'Don\'t require user interaction'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l severity -rf -a "$__fish_zypper_patch_severity" -d 'Select patches with the specified severity'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l date -r -d 'Select patches issued up to, but not including, the specified date'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l bugzilla -s b -d 'Select applicable patches for the specified Bugzilla issues'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l cve -d 'Select applicable patches for the specified CVE issues'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l no-confirm -s y -d 'Don\'t require user interaction'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-optional -l without-optional -d 'Whether applicable optional patches should be treated as needed or be excluded'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-interactive   -d 'Do not skip interactive patches'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l skip-interactive   -d 'Skip interactive patches'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-interactive -d 'Do not skip interactive patches'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l skip-interactive -d 'Skip interactive patches'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l dry-run       -s D -d 'Test the update, do not actually update'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l dry-run -s D -d 'Test the update, do not actually update'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l download-only -s d -d 'Only download the packages, do not install'
 
@@ -673,16 +673,16 @@ function __fish_zypper_is_subcommand_sourcedownload
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l directory -r -s d -d 'Download all source rpms to this directory'
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l delete            -d 'Delete extraneous source rpms in the local directory'
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l no-delete         -d 'Do not delete extraneous source rpms'
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l status            -d "Don't download any source rpms, but show which source rpms are missing or extraneous"
+complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l delete -d 'Delete extraneous source rpms in the local directory'
+complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l no-delete -d 'Do not delete extraneous source rpms'
+complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l status -d "Don't download any source rpms, but show which source rpms are missing or extraneous"
 
 function __fish_zypper_is_subcommand_download
     __fish_zypper_cmd_in_array download
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_download' -l all-matches  -d 'Download all versions matching the commandline arguments'
-complete -c zypper -n '__fish_zypper_is_subcommand_download' -l from      -r -d 'Select packages from the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_download' -l all-matches -d 'Download all versions matching the commandline arguments'
+complete -c zypper -n '__fish_zypper_is_subcommand_download' -l from -r -d 'Select packages from the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_download' -l dry-run -s D -d 'Don\'t change anything, just report what would be done'
 complete -c zypper -n '__fish_zypper_is_subcommand_download' -l repo -r -s r -d 'Work only with the specified repository'
 
@@ -690,6 +690,6 @@ function __fish_zypper_is_subcommand_ps
     __fish_zypper_cmd_in_array ps
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ps' -l short        -s s -d 'Create a short table not showing the deleted files'
-complete -c zypper -n '__fish_zypper_is_subcommand_ps' -l print        -rf  -d 'For each associated system service print <format> on the standard output, followed by a newline'
+complete -c zypper -n '__fish_zypper_is_subcommand_ps' -l short -s s -d 'Create a short table not showing the deleted files'
+complete -c zypper -n '__fish_zypper_is_subcommand_ps' -l print -rf -d 'For each associated system service print <format> on the standard output, followed by a newline'
 complete -c zypper -n '__fish_zypper_is_subcommand_ps' -l debugFile -r -s d -d 'Write debug output to file'
diff --git a/share/functions/__fish_describe_command.fish b/share/functions/__fish_describe_command.fish
index 68b2f2802..d41598b4d 100644
--- a/share/functions/__fish_describe_command.fish
+++ b/share/functions/__fish_describe_command.fish
@@ -12,7 +12,8 @@ if test (uname) = Darwin
     # macOS 15 is Darwin 19, this is an issue at least up to 10.15.3.
     # If this is fixed in later versions uncomment the second check.
     if test "$darwin_version[1]" = 19 # -a "$darwin_version[2]" -le 3
-        function __fish_describe_command; end
+        function __fish_describe_command
+        end
         # (remember: exit when `source`ing only exits the file, not the shell)
         exit
     end
diff --git a/share/functions/fish_prompt.fish b/share/functions/fish_prompt.fish
index 1297008c2..91f43655c 100644
--- a/share/functions/fish_prompt.fish
+++ b/share/functions/fish_prompt.fish
@@ -10,10 +10,10 @@ function fish_prompt --description 'Write out the prompt'
     set -l prefix
     set -l suffix '>'
     if contains -- $USER root toor
-            if set -q fish_color_cwd_root
-                set color_cwd $fish_color_cwd_root
-            end
-            set suffix '#'
+        if set -q fish_color_cwd_root
+            set color_cwd $fish_color_cwd_root
+        end
+        set suffix '#'
     end
 
     # If we're running via SSH, change the host color.
diff --git a/share/functions/help.fish b/share/functions/help.fish
index 1835430d9..59cd5bacf 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -67,8 +67,8 @@ function help --description 'Show help for the fish shell'
             # If the OS appears to be Windows (graphical), try to use cygstart
             if type -q cygstart
                 set fish_browser cygstart
-            # If xdg-open is available, just use that
-            # but only if an X session is running
+                # If xdg-open is available, just use that
+                # but only if an X session is running
             else if type -q xdg-open; and set -q -x DISPLAY
                 set fish_browser xdg-open
             end
@@ -78,7 +78,7 @@ function help --description 'Show help for the fish shell'
             # We use this instead of xdg-open because that's useless without a backend
             # like wsl-open which we'll check in a minute.
             if not type -q cygstart
-            and set -l cmd (command -s cmd.exe /mnt/c/Windows/System32/cmd.exe)
+                and set -l cmd (command -s cmd.exe /mnt/c/Windows/System32/cmd.exe)
                 # Use the first of these.
                 set fish_browser $cmd[1]
             end
@@ -99,7 +99,7 @@ function help --description 'Show help for the fish shell'
     # only if a Windows browser is to be used.
     if type -q cygstart
         if test $fish_browser != "cygstart"
-        and not command -sq $fish_browser[1]
+            and not command -sq $fish_browser[1]
             # Escaped quotes are necessary to work with spaces in the path
             # when the command is finally eval'd.
             set fish_browser cygstart $fish_browser
@@ -145,10 +145,10 @@ function help --description 'Show help for the fish shell'
         # For Windows (Cygwin and WSL), we need to convert the base help dir to a Windows path before converting it to a file URL
         # but only if a Windows browser is being used
         if type -q cygpath
-        and string match -qr "cygstart" $fish_browser[1]
+            and string match -qr "cygstart" $fish_browser[1]
             set page_url file://(cygpath -m $__fish_help_dir)/$fish_help_page
         else if type -q wslpath
-        and string match -qr '.exe' $fish_browser[1]
+            and string match -qr '.exe' $fish_browser[1]
             set page_url file://(wslpath -w $__fish_help_dir)/$fish_help_page
         end
     else
@@ -174,10 +174,10 @@ function help --description 'Show help for the fish shell'
             # For Windows (Cygwin and WSL), we need to convert the base help dir to a Windows path before converting it to a file URL
             # but only if a Windows browser is being used
             if type -q cygpath
-            and string match -qr "cygstart" $fish_browser[1]
+                and string match -qr "cygstart" $fish_browser[1]
                 set page_url file://(cygpath -m $tmpname)
             else if type -q wslpath
-            and string match -qr '.exe' $fish_browser[1]
+                and string match -qr '.exe' $fish_browser[1]
                 set page_url file://(wslpath -w $tmpname)
             end
         end
@@ -194,7 +194,8 @@ function help --description 'Show help for the fish shell'
             case '*'
                 printf (_ 'help: Help is being displayed in %s.\n') $fish_browser[1]
         end
-        $fish_browser $page_url &; disown
+        $fish_browser $page_url &
+        disown
     else
         # Work around lynx bug where <div class="contents"> always has the same formatting as links (unreadable)
         # by using a custom style sheet. See https://github.com/fish-shell/fish-shell/issues/4170
diff --git a/share/tools/web_config/sample_prompts/classic_status.fish b/share/tools/web_config/sample_prompts/classic_status.fish
index 3322926c0..fab56aef2 100644
--- a/share/tools/web_config/sample_prompts/classic_status.fish
+++ b/share/tools/web_config/sample_prompts/classic_status.fish
@@ -21,6 +21,6 @@ function fish_prompt --description "Write out the prompt"
     end
 
     echo -n -s "$USER" @ (prompt_hostname) ' ' (set_color $color_cwd) (prompt_pwd) \
-    (__fish_print_pipestatus " [" "]" "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus) \
-    (set_color normal) "$suffix "
+        (__fish_print_pipestatus " [" "]" "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus) \
+        (set_color normal) "$suffix "
 end
diff --git a/share/tools/web_config/sample_prompts/classic_vcs.fish b/share/tools/web_config/sample_prompts/classic_vcs.fish
index bb8a98d06..f99d6e8ca 100644
--- a/share/tools/web_config/sample_prompts/classic_vcs.fish
+++ b/share/tools/web_config/sample_prompts/classic_vcs.fish
@@ -11,10 +11,10 @@ function fish_prompt --description 'Write out the prompt'
     set -l prefix
     set -l suffix '>'
     if contains -- $USER root toor
-            if set -q fish_color_cwd_root
-                set color_cwd $fish_color_cwd_root
-            end
-            set suffix '#'
+        if set -q fish_color_cwd_root
+            set color_cwd $fish_color_cwd_root
+        end
+        set suffix '#'
     end
 
     # If we're running via SSH, change the host color.
diff --git a/tests/checks/andandoror.fish b/tests/checks/andandoror.fish
index 1242fd259..4c4473019 100644
--- a/tests/checks/andandoror.fish
+++ b/tests/checks/andandoror.fish
@@ -3,9 +3,12 @@
 
 echo first && echo second
 echo third || echo fourth
-true && false ; echo "true && false: $status"
-true || false ; echo "true || false: $status"
-true && false || true ; echo "true && false || true: $status"
+true && false
+echo "true && false: $status"
+true || false
+echo "true || false: $status"
+true && false || true
+echo "true && false || true: $status"
 # CHECK: first
 # CHECK: second
 # CHECK: third
@@ -15,10 +18,19 @@ true && false || true ; echo "true && false || true: $status"
 
 # "&& and || in if statements"
 
-if true || false ; echo "if test 1 ok" ; end
-if true && false ; else; echo "if test 2 ok" ; end
-if true && false ; or true ; echo "if test 3 ok" ; end
-if [ 0 = 1 ] || [ 5 -ge 3 ] ; echo "if test 4 ok"; end
+if true || false
+    echo "if test 1 ok"
+end
+if true && false
+else
+    echo "if test 2 ok"
+end
+if true && false; or true
+    echo "if test 3 ok"
+end
+if [ 0 = 1 ] || [ 5 -ge 3 ]
+    echo "if test 4 ok"
+end
 # CHECK: if test 1 ok
 # CHECK: if test 2 ok
 # CHECK: if test 3 ok
@@ -31,7 +43,7 @@ set beta 0
 set gamma 0
 set delta 0
 while [ $alpha -lt 2 ] && [ $beta -lt 3 ]
-      or [ $gamma -lt 4 ] || [ $delta -lt 5 ]
+    or [ $gamma -lt 4 ] || [ $delta -lt 5 ]
     echo $alpha $beta $gamma
     set alpha ( math $alpha + 1 )
     set beta ( math $beta + 1 )
@@ -46,11 +58,16 @@ end
 
 # "Nots"
 
-true && ! false ; echo $status
-not true && ! false ; echo $status
-not not not true ; echo $status
-not ! ! not true ; echo $status
-not ! echo not ! ; echo $status
+true && ! false
+echo $status
+not true && ! false
+echo $status
+not not not true
+echo $status
+not ! ! not true
+echo $status
+not ! echo not !
+echo $status
 # CHECK: 0
 # CHECK: 1
 # CHECK: 1
@@ -60,11 +77,16 @@ not ! echo not ! ; echo $status
 
 # "Complex scenarios"
 
-begin; echo 1 ; false ; end || begin ; echo 2 && echo 3 ; end
+begin
+    echo 1
+    false
+end || begin
+    echo 2 && echo 3
+end
 
 if false && true
-   or not false
-   echo 4
+    or not false
+    echo 4
 end
 # CHECK: 1
 # CHECK: 2
diff --git a/tests/checks/complete.fish b/tests/checks/complete.fish
index 2e6a953f2..28b1a3261 100644
--- a/tests/checks/complete.fish
+++ b/tests/checks/complete.fish
@@ -1,5 +1,7 @@
 # RUN: %fish %s
-function complete_test_alpha1; echo $argv; end
+function complete_test_alpha1
+    echo $argv
+end
 
 complete -c complete_test_alpha1 --no-files -a '(commandline)'
 complete -c complete_test_alpha2 --no-files -w 'complete_test_alpha1 extra1'
@@ -29,7 +31,9 @@ complete -C'myalias2 call3 '
 
 # Ensure that commands can't wrap themselves - if this did,
 # the completion would be executed a bunch of times.
-function t --wraps t; echo t; end
+function t --wraps t
+    echo t
+end
 complete -c t -fa '(t)'
 complete -C't '
 # CHECK: t
@@ -155,8 +159,8 @@ complete -C'echo > /' | string length -q && echo ok
 # CHECK: ok
 
 function some_function
-     echo line1
-     echo line2
+    echo line1
+    echo line2
 end
 complete -c complete_test_function_desc -xa '(complete -Csome_function)'
 complete -C'complete_test_function_desc ' | count
diff --git a/tests/checks/directory-redirect.fish b/tests/checks/directory-redirect.fish
index ead426055..003bb7666 100644
--- a/tests/checks/directory-redirect.fish
+++ b/tests/checks/directory-redirect.fish
@@ -1,5 +1,7 @@
 #RUN: %fish %s
-begin; end > . ; status -b; and echo "status -b returned true after bad redirect on a begin block"
+begin
+end >.
+status -b; and echo "status -b returned true after bad redirect on a begin block"
 # Note that we sometimes get fancy quotation marks here, so let's match three characters
 #CHECKERR: <W> fish: An error occurred while redirecting file {{...}}
 #CHECKERR: {{open: Is a directory|open: Invalid argument}}
diff --git a/tests/checks/empty.fish b/tests/checks/empty.fish
index c5c598fca..aa25cdb60 100644
--- a/tests/checks/empty.fish
+++ b/tests/checks/empty.fish
@@ -6,13 +6,23 @@ function empty
 end
 
 # functions should not preserve $status
-false; empty; echo $status
+false
+empty
+echo $status
 # CHECK: 0
-true; empty; echo $status
+true
+empty
+echo $status
 # CHECK: 0
 
 # blocks should preserve $status
-false; begin; end; echo $status
+false
+begin
+end
+echo $status
 # CHECK: 1
-true; begin; end; echo $status
+true
+begin
+end
+echo $status
 # CHECK: 0
diff --git a/tests/checks/eval.fish b/tests/checks/eval.fish
index 3017be4c7..e33050de8 100644
--- a/tests/checks/eval.fish
+++ b/tests/checks/eval.fish
@@ -8,18 +8,26 @@ echo $previously_undefined
 eval "echo you can\\'t see this 1>&2" 2>/dev/null
 
 # Test return statuses
-false; eval true; echo $status
+false
+eval true
+echo $status
 # CHECK: 0
-false; eval false; echo $status
+false
+eval false
+echo $status
 # CHECK: 1
 
 # Test return status in case of parsing error
-false; eval "("; echo $status
+false
+eval "("
+echo $status
 # CHECK: 1
 # CHECKERR: {{.*}}checks/eval.fish (line {{\d+}}): Unexpected end of string, expecting ')'
 # CHECKERR: (
 # CHECKERR: ^
-false; eval '""'; echo $status
+false
+eval '""'
+echo $status
 # CHECK: 1
 # CHECKERR: {{.*}}checks/eval.fish (line {{\d+}}): The expanded command was empty.
 # CHECKERR: ""
@@ -29,18 +37,22 @@ function empty
 end
 
 # Regression tests for issue #5692
-false; eval;
+false
+eval
 echo blank eval: $status # 0
 # CHECK: blank eval: 0
 
-false; eval "";
+false
+eval ""
 echo empty arg eval: $status # 0
 # CHECK: empty arg eval: 0
 
-false; eval empty;
+false
+eval empty
 echo empty function eval $status # 0
 # CHECK: empty function eval 0
 
-false; eval "begin; end;";
+false
+eval "begin; end;"
 echo empty block eval: $status # 0
 # CHECK: empty block eval: 0
diff --git a/tests/checks/exit-status-with-closing-stderr.fish b/tests/checks/exit-status-with-closing-stderr.fish
index 149a59f42..98266f1f3 100644
--- a/tests/checks/exit-status-with-closing-stderr.fish
+++ b/tests/checks/exit-status-with-closing-stderr.fish
@@ -1,5 +1,7 @@
 # RUN: %fish %s
-argparse r-require= -- --require 2>/dev/null ; echo $status
+argparse r-require= -- --require 2>/dev/null
+echo $status
 # CHECK: 2
-argparse r-require= -- --require 2>&- ; echo $status
+argparse r-require= -- --require 2>&-
+echo $status
 # CHECK: 2
diff --git a/tests/checks/math.fish b/tests/checks/math.fish
index 321a03a15..381a26bed 100644
--- a/tests/checks/math.fish
+++ b/tests/checks/math.fish
@@ -34,11 +34,15 @@ math -- '-4 * 2'
 # CHECK: -8
 
 # Validate some rounding functions
-math 'round(3/2)' ; math 'floor(3/2)' ; math 'ceil(3/2)'
+math 'round(3/2)'
+math 'floor(3/2)'
+math 'ceil(3/2)'
 # CHECK: 2
 # CHECK: 1
 # CHECK: 2
-math 'round(-3/2)' ; math 'floor(-3/2)' ; math 'ceil(-3/2)'
+math 'round(-3/2)'
+math 'floor(-3/2)'
+math 'ceil(-3/2)'
 # CHECK: -2
 # CHECK: -2
 # CHECK: -1
diff --git a/tests/checks/pipeline-pgroup.fish b/tests/checks/pipeline-pgroup.fish
index 7939adb45..a604b3bd8 100644
--- a/tests/checks/pipeline-pgroup.fish
+++ b/tests/checks/pipeline-pgroup.fish
@@ -7,7 +7,9 @@ function save_pgroup -a var_name
 end
 
 # Here everything should live in the pgroup of the first fish_test_helper.
-$fth print_pgrp | read -g global_group | save_pgroup g1 | begin; save_pgroup g2; end
+$fth print_pgrp | read -g global_group | save_pgroup g1 | begin
+    save_pgroup g2
+end
 
 [ "$global_group" -eq "$g1" ] && [ "$g1" -eq "$g2" ]
 and echo "All pgroups agreed"
@@ -18,13 +20,18 @@ or echo "Pgroups disagreed. Should be in $global_group but found $g1 and $g2"
 # Unfortunately we don't know what fish's pgroup is (it may not be fish's pid).
 # So run it twice and verify that everything agrees; this implies that it could
 # not have used any of the pids of the child procs.
-function nothing ; end
-nothing | $fth print_pgrp | read -g a0 | save_pgroup a1 | begin; save_pgroup a2; end
-nothing | $fth print_pgrp | read -g b0 | save_pgroup b1 | begin; save_pgroup b2; end
+function nothing
+end
+nothing | $fth print_pgrp | read -g a0 | save_pgroup a1 | begin
+    save_pgroup a2
+end
+nothing | $fth print_pgrp | read -g b0 | save_pgroup b1 | begin
+    save_pgroup b2
+end
 
 [ "$a0" -eq "$a1" ] && [ "$a1" -eq "$a2" ] \
-  && [ "$b0" -eq "$b1" ] && [ "$b1" -eq "$b2" ] \
-  && [ "$a0" -eq "$b0" ]
+    && [ "$b0" -eq "$b1" ] && [ "$b1" -eq "$b2" ] \
+    && [ "$a0" -eq "$b0" ]
 and echo "All pgroups agreed"
 or echo "Pgroups disagreed. Found $a0 $a1 $a2, and $b0 $b1 $b2"
 # CHECK: All pgroups agreed
diff --git a/tests/checks/printf.fish b/tests/checks/printf.fish
index c2696c7b1..3e255a92c 100644
--- a/tests/checks/printf.fish
+++ b/tests/checks/printf.fish
@@ -61,10 +61,10 @@ printf '\376' | display_bytes
 # Verify that floating point conversions and output work correctly with
 # different combinations of locales and floating point strings. See issue
 # #3334. This starts by assuming an locale using english conventions.
-printf '%e\n' "1.23"  # should succeed, output should be 1.230000e+00
+printf '%e\n' "1.23" # should succeed, output should be 1.230000e+00
 # CHECK: 1.230000e+00
 
-printf '%e\n' "2,34"  # should fail
+printf '%e\n' "2,34" # should fail
 # CHECK: 2.000000e+00
 # CHECKERR: 2,34: value not completely converted
 
@@ -86,8 +86,8 @@ end
 # OpenBSD's wcstod does not honor LC_NUMERIC, meaning this feature is broken there.
 if set -q numeric_locale[1]; and test (uname) != "OpenBSD"
     set -x LC_NUMERIC $numeric_locale
-    printf '%e\n' "3,45"  # should succeed, output should be 3,450000e+00
-    printf '%e\n' "4.56"  # should succeed, output should be 4,560000e+00
+    printf '%e\n' "3,45" # should succeed, output should be 3,450000e+00
+    printf '%e\n' "4.56" # should succeed, output should be 4,560000e+00
 else
     echo '3,450000e+00'
     echo '4,560000e+00'
diff --git a/tests/checks/read.fish b/tests/checks/read.fish
index 210f6022c..205824430 100644
--- a/tests/checks/read.fish
+++ b/tests/checks/read.fish
@@ -13,10 +13,12 @@ set -l
 # CHECK: b
 # CHECK: c
 
-echo "a  b b" | read a b; string escape $a $b
+echo "a  b b" | read a b
+string escape $a $b
 # CHECK: a
 # CHECK: 'b b'
 
-echo 'a<><>b<>b' | read -d '<>' a b; printf %s\n $a $b
+echo 'a<><>b<>b' | read -d '<>' a b
+printf %s\n $a $b
 # CHECK: a
 # CHECK: <>b<>b
diff --git a/tests/checks/set.fish b/tests/checks/set.fish
index 260a582af..070fda35d 100644
--- a/tests/checks/set.fish
+++ b/tests/checks/set.fish
@@ -449,7 +449,9 @@ echo "global-vs-universal 5: $__fish_test_global_vs_universal"
 # CHECK: global-vs-universal 5: 
 
 # Export local variables from all parent scopes (issue #6153).
-function func; echo $local; end
+function func
+    echo $local
+end
 set -lx local outer
 func
 # CHECK: outer
@@ -458,12 +460,16 @@ begin
     # CHECK: outer
 
     set -lx local inner
-    begin; func; end
+    begin
+        func
+    end
     # CHECK: inner
 end
 
 # Skip importing universal variables (#5258)
-while set -q EDITOR; set -e EDITOR; end
+while set -q EDITOR
+    set -e EDITOR
+end
 set -Ux EDITOR emacs -nw
 # CHECK: $EDITOR: not set in global scope
 # CHECK: $EDITOR: set in universal scope, exported, with 2 elements
diff --git a/tests/checks/sigint.fish b/tests/checks/sigint.fish
index 07f03b1cd..17916d6c2 100644
--- a/tests/checks/sigint.fish
+++ b/tests/checks/sigint.fish
@@ -4,7 +4,8 @@
 
 echo About to sigint
 $helper sigint_parent &
-while true ; end
+while true
+end
 echo I should not be printed because I got sigint
 
 #CHECK: About to sigint
diff --git a/tests/checks/signal.fish b/tests/checks/signal.fish
index 504fff97d..f4e55e926 100644
--- a/tests/checks/signal.fish
+++ b/tests/checks/signal.fish
@@ -1,27 +1,31 @@
 # RUN: %fish -C 'set -l fish %fish' %s
 
-$fish -c 'function main; exit 4; true; end; main'; echo $status
+$fish -c 'function main; exit 4; true; end; main'
+echo $status
 #CHECK: 4
 
-$fish -c 'begin; exit 5; true; end'; echo $status
+$fish -c 'begin; exit 5; true; end'
+echo $status
 #CHECK: 5
 
-$fish -c 'kill -SIGHUP %self'; echo $status
+$fish -c 'kill -SIGHUP %self'
+echo $status
 #CHECK: 129
 
-$fish -c 'function main; kill -SIGTERM %self; true; end; main'; echo $status
+$fish -c 'function main; kill -SIGTERM %self; true; end; main'
+echo $status
 #CHECK: 143
 
 function alarm --on-signal ALRM
-  echo ALRM received
+    echo ALRM received
 end
 
 kill -s ALRM $fish_pid
 # CHECK: ALRM received
 
 function anychild --on-process-exit 0
-  # Type and exit status
-  echo $argv[1] $argv[3]
+    # Type and exit status
+    echo $argv[1] $argv[3]
 end
 
 echo "command false:"
@@ -44,9 +48,9 @@ command false | command true
 # CHECK: JOB_EXIT 0
 
 function test_blocks
-  block -l
-  command echo "This is the process whose exit event shuld be blocked"
-  echo "This should come before the event handler"
+    block -l
+    command echo "This is the process whose exit event shuld be blocked"
+    echo "This should come before the event handler"
 end
 test_blocks
 # CHECK: This is the process whose exit event shuld be blocked
diff --git a/tests/checks/string.fish b/tests/checks/string.fish
index 11464baa9..be2b77e76 100644
--- a/tests/checks/string.fish
+++ b/tests/checks/string.fish
@@ -296,10 +296,12 @@ string repeat -n0; or echo "exit 1"
 string repeat -m0; or echo "exit 1"
 # CHECK: exit 1
 
-string repeat -n1 -N "there is "; echo "no newline"
+string repeat -n1 -N "there is "
+echo "no newline"
 # CHECK: there is no newline
 
-string repeat -n1 --no-newline "there is "; echo "no newline"
+string repeat -n1 --no-newline "there is "
+echo "no newline"
 # CHECK: there is no newline
 
 string repeat -n10 -m4 "foo"
@@ -491,9 +493,9 @@ count (string join0 $tmp | string split0)
 # This function outputs some newline-separated content, and some
 # explicitly separated content.
 function dualsplit
-  echo alpha
-  echo beta
-  echo -ne 'gamma\x00delta' | string split0
+    echo alpha
+    echo beta
+    echo -ne 'gamma\x00delta' | string split0
 end
 count (dualsplit)
 # CHECK: 4
@@ -553,9 +555,9 @@ string collect \n\n >/dev/null; and echo unexpected success; or echo expected fa
 # This function outputs some newline-separated content, and some
 # explicitly un-separated content.
 function dualcollect
-  echo alpha
-  echo beta
-  echo gamma\ndelta\nomega | string collect
+    echo alpha
+    echo beta
+    echo gamma\ndelta\nomega | string collect
 end
 count (dualcollect)
 # CHECK: 3
diff --git a/tests/checks/variable-assignment.fish b/tests/checks/variable-assignment.fish
index a683a6b3c..590e6fac9 100644
--- a/tests/checks/variable-assignment.fish
+++ b/tests/checks/variable-assignment.fish
@@ -58,13 +58,20 @@ xPATH={/usr,}/bin sh -c 'echo $xPATH'
 yPATH=/usr/bin:/bin count $yPATH
 
 # CHECK: b
-a=b begin; true | echo $a; end
+a=b begin
+    true | echo $a
+end
 
 # CHECK: b
-a=b if true; echo $a; end
+a=b if true
+    echo $a
+end
 
 # CHECK: b
-a=b switch x; case x; echo $a; end
+a=b switch x
+    case x
+        echo $a
+end
 
 complete -c x --erase
 complete -c x -xa arg
diff --git a/tests/test.fish b/tests/test.fish
index 3ee1da1b5..fa471f357 100644
--- a/tests/test.fish
+++ b/tests/test.fish
@@ -76,9 +76,9 @@ function test_littlecheck_file
     echo -n "Testing file $file ... "
     set starttime (timestamp)
     $python ../littlecheck.py \
-      -s fish=../test/root/bin/fish \
-      -s fish_test_helper=../test/root/bin/fish_test_helper \
-      $file
+        -s fish=../test/root/bin/fish \
+        -s fish_test_helper=../test/root/bin/fish_test_helper \
+        $file
     set -l exit_status $status
     set -l res ok
     set test_duration (delta $starttime)