feat: improve shell completions

Author: KSXGitHub

Cargo.lock

@@ -60,7 +60,7 @@ assert-cmp = "^0.2.1"
 zero-copy-pads = "^0.2.0"
 terminal_size = "^0.4.0"
 clap = { version = "^4.3.8", optional = true }
-clap_complete = { version = "^4.1.3", optional = true }
+clap_complete = { version = "^4.5.36", optional = true }
 clap-utilities = { version = "^0.2.0", optional = true }
 serde = { version = "^1.0.214", optional = true }
 serde_json = { version = "^1.0.132", optional = true }

Cargo.toml

@@ -1,5 +1,5 @@
-complete -c pdu -l bytes-format -d 'How to display the numbers of bytes' -r -f -a "{plain	'Display plain number of bytes without units',metric	'Use metric scale, i.e. 1K = 1000B, 1M = 1000K, and so on',binary	'Use binary scale, i.e. 1K = 1024B, 1M = 1024K, and so on'}"
-complete -c pdu -l quantity -d 'Aspect of the files/directories to be measured' -r -f -a "{apparent-size	'Measure apparent sizes',block-size	'Measure block sizes (block-count * 512B)',block-count	'Count numbers of blocks'}"
+complete -c pdu -l bytes-format -d 'How to display the numbers of bytes' -r -f -a "{plain\t'Display plain number of bytes without units',metric\t'Use metric scale, i.e. 1K = 1000B, 1M = 1000K, and so on',binary\t'Use binary scale, i.e. 1K = 1024B, 1M = 1024K, and so on'}"
+complete -c pdu -l quantity -d 'Aspect of the files/directories to be measured' -r -f -a "{apparent-size\t'Measure apparent sizes',block-size\t'Measure block sizes (block-count * 512B)',block-count\t'Count numbers of blocks'}"
 complete -c pdu -l max-depth -d 'Maximum depth to display the data (must be greater than 0)' -r
 complete -c pdu -l total-width -d 'Width of the visualization' -r
 complete -c pdu -l column-width -d 'Maximum widths of the tree column and width of the bar column' -r

exports/completion.fish

@@ -21,23 +21,23 @@ Register-ArgumentCompleter -Native -CommandName 'pdu' -ScriptBlock {
 
     $completions = @(switch ($command) {
         'pdu' {
-            [CompletionResult]::new('--bytes-format', 'bytes-format', [CompletionResultType]::ParameterName, 'How to display the numbers of bytes')
-            [CompletionResult]::new('--quantity', 'quantity', [CompletionResultType]::ParameterName, 'Aspect of the files/directories to be measured')
-            [CompletionResult]::new('--max-depth', 'max-depth', [CompletionResultType]::ParameterName, 'Maximum depth to display the data (must be greater than 0)')
-            [CompletionResult]::new('--total-width', 'total-width', [CompletionResultType]::ParameterName, 'Width of the visualization')
-            [CompletionResult]::new('--column-width', 'column-width', [CompletionResultType]::ParameterName, 'Maximum widths of the tree column and width of the bar column')
-            [CompletionResult]::new('--min-ratio', 'min-ratio', [CompletionResultType]::ParameterName, 'Minimal size proportion required to appear')
-            [CompletionResult]::new('--json-input', 'json-input', [CompletionResultType]::ParameterName, 'Read JSON data from stdin')
-            [CompletionResult]::new('--json-output', 'json-output', [CompletionResultType]::ParameterName, 'Print JSON data instead of an ASCII chart')
-            [CompletionResult]::new('--top-down', 'top-down', [CompletionResultType]::ParameterName, 'Print the tree top-down instead of bottom-up')
-            [CompletionResult]::new('--align-right', 'align-right', [CompletionResultType]::ParameterName, 'Set the root of the bars to the right')
-            [CompletionResult]::new('--no-sort', 'no-sort', [CompletionResultType]::ParameterName, 'Preserve order of entries')
-            [CompletionResult]::new('--silent-errors', 'silent-errors', [CompletionResultType]::ParameterName, 'Prevent filesystem error messages from appearing in stderr')
-            [CompletionResult]::new('--progress', 'progress', [CompletionResultType]::ParameterName, 'Report progress being made at the expense of performance')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
-            [CompletionResult]::new('-V', 'V ', [CompletionResultType]::ParameterName, 'Print version')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Print version')
+            [CompletionResult]::new('--bytes-format', '--bytes-format', [CompletionResultType]::ParameterName, 'How to display the numbers of bytes')
+            [CompletionResult]::new('--quantity', '--quantity', [CompletionResultType]::ParameterName, 'Aspect of the files/directories to be measured')
+            [CompletionResult]::new('--max-depth', '--max-depth', [CompletionResultType]::ParameterName, 'Maximum depth to display the data (must be greater than 0)')
+            [CompletionResult]::new('--total-width', '--total-width', [CompletionResultType]::ParameterName, 'Width of the visualization')
+            [CompletionResult]::new('--column-width', '--column-width', [CompletionResultType]::ParameterName, 'Maximum widths of the tree column and width of the bar column')
+            [CompletionResult]::new('--min-ratio', '--min-ratio', [CompletionResultType]::ParameterName, 'Minimal size proportion required to appear')
+            [CompletionResult]::new('--json-input', '--json-input', [CompletionResultType]::ParameterName, 'Read JSON data from stdin')
+            [CompletionResult]::new('--json-output', '--json-output', [CompletionResultType]::ParameterName, 'Print JSON data instead of an ASCII chart')
+            [CompletionResult]::new('--top-down', '--top-down', [CompletionResultType]::ParameterName, 'Print the tree top-down instead of bottom-up')
+            [CompletionResult]::new('--align-right', '--align-right', [CompletionResultType]::ParameterName, 'Set the root of the bars to the right')
+            [CompletionResult]::new('--no-sort', '--no-sort', [CompletionResultType]::ParameterName, 'Preserve order of entries')
+            [CompletionResult]::new('--silent-errors', '--silent-errors', [CompletionResultType]::ParameterName, 'Prevent filesystem error messages from appearing in stderr')
+            [CompletionResult]::new('--progress', '--progress', [CompletionResultType]::ParameterName, 'Report progress being made at the expense of performance')
+            [CompletionResult]::new('-h', '-h', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
+            [CompletionResult]::new('--help', '--help', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
+            [CompletionResult]::new('-V', '-V ', [CompletionResultType]::ParameterName, 'Print version')
+            [CompletionResult]::new('--version', '--version', [CompletionResultType]::ParameterName, 'Print version')
             break
         }
     })

exports/completion.ps1

@@ -14,17 +14,17 @@ _pdu() {
     fi
 
     local context curcontext="$curcontext" state line
-    _arguments "${_arguments_options[@]}" \
+    _arguments "${_arguments_options[@]}" : \
 '--bytes-format=[How to display the numbers of bytes]:BYTES_FORMAT:((plain\:"Display plain number of bytes without units"
 metric\:"Use metric scale, i.e. 1K = 1000B, 1M = 1000K, and so on"
 binary\:"Use binary scale, i.e. 1K = 1024B, 1M = 1024K, and so on"))' \
 '--quantity=[Aspect of the files/directories to be measured]:QUANTITY:((apparent-size\:"Measure apparent sizes"
 block-size\:"Measure block sizes (block-count * 512B)"
 block-count\:"Count numbers of blocks"))' \
-'--max-depth=[Maximum depth to display the data (must be greater than 0)]:MAX_DEPTH: ' \
-'(--column-width)--total-width=[Width of the visualization]:TOTAL_WIDTH: ' \
-'*--column-width=[Maximum widths of the tree column and width of the bar column]:TREE_WIDTH: :TREE_WIDTH: ' \
-'--min-ratio=[Minimal size proportion required to appear]:MIN_RATIO: ' \
+'--max-depth=[Maximum depth to display the data (must be greater than 0)]:MAX_DEPTH:_default' \
+'(--column-width)--total-width=[Width of the visualization]:TOTAL_WIDTH:_default' \
+'*--column-width=[Maximum widths of the tree column and width of the bar column]:TREE_WIDTH:_default:TREE_WIDTH:_default' \
+'--min-ratio=[Minimal size proportion required to appear]:MIN_RATIO:_default' \
 '(--quantity)--json-input[Read JSON data from stdin]' \
 '--json-output[Print JSON data instead of an ASCII chart]' \
 '--top-down[Print the tree top-down instead of bottom-up]' \