completions/flatpak.fish: Use terser/faster declarative style

share/completions/flatpak.fish

@@ -1,52 +1,51 @@
 # Completions for flatpak, an "Application deployment framework for desktop apps"
-# (http://flatpak.org)
-set -l commands install update uninstall list info config repair create-usb search run override make-current enter ps \
-    documents document-{export,unexport,info} permissions permission-{show,reset} remotes remote-{add,modify,delete,ls,info} \
-    build build-{init,finish,export,bundle,import-bundle,sign,update-repo,commit-from} repo \
-    history kill mask permission-{remove,set}
 
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a install -d 'Install an application or runtime from a remote'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a update -d 'Update an installed application or runtime'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a uninstall -d 'Uninstall an installed application or runtime'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a list -d 'List installed apps and/or runtimes'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a info -d 'Show info for installed app or runtime'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a config -d 'Configure flatpak'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a repair -d 'Repair flatpak installation'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a create-usb -d 'Put applications or runtimes onto removable media'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a search -d 'Search for remote apps/runtimes'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a run -d 'Run an application'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a override -d 'Override permissions for an application'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a make-current -d 'Specify default version to run'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a enter -d 'Enter the namespace of a running application'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a ps -d 'Enumerate running applications'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a documents -d 'List exported files'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-export -d 'Grant an application access to a specific file'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-unexport -d 'Revoke access to a specific file'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-info -d 'Show information about a specific file'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a permissions -d 'List permissions'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a permission-show -d 'Show app permissions'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a permission-reset -d 'Reset app permissions'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remotes -d 'List all configured remotes'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-add -d 'Add a new remote repository (by URL)'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-modify -d 'Modify properties of a configured remote'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-delete -d 'Delete a configured remote'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-ls -d 'List contents of a configured remote'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-info -d 'Show information about a remote app or runtime'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-init -d 'Initialize a directory for building'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build -d 'Run a build command inside the build dir'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-finish -d 'Finish a build dir for export'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-export -d 'Export a build dir to a repository'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-bundle -d 'Create a bundle file from a build directory'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-import-bundle -d 'Import a bundle file'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-sign -d 'Sign an application or runtime'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-update-repo -d 'Update the summary file in a repository'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-commit-from -d 'Create new commit based on existing ref'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a repo -d 'Show information about a repo'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a history -d 'Show history'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a kill -d 'Stop a running application'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a mask -d 'Mask out updates and automatic installation'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a permission-remove -d 'Remove item from permission store'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a permission-set -d 'Set permissions'
+function __fish_flatpak_subcommands
+    printf "%s\n" \
+        build-bundle\t"Create a bundle file from a build directory" \
+        build-commit-from\t"Create new commit based on existing ref" \
+        build-export\t"Export a build dir to a repository" \
+        build-finish\t"Finish a build dir for export" \
+        build-import-bundle\t"Import a bundle file" \
+        build-init\t"Initialize a directory for building" \
+        build-sign\t"Sign an application or runtime" \
+        build-update-repo\t"Update the summary file in a repository" \
+        build\t"Run a build command inside the build dir" \
+        config\t"Configure flatpak" \
+        create-usb\t"Put applications or runtimes onto removable media" \
+        document-export\t"Grant an application access to a specific file" \
+        document-info\t"Show information about a specific file" \
+        document-unexport\t"Revoke access to a specific file" \
+        documents\t"List exported files" \
+        enter\t"Enter the namespace of a running application" \
+        history\t"Show history" \
+        info\t"Show info for installed app or runtime" \
+        install\t"Install an application or runtime from a remote" \
+        kill\t"Stop a running application" \
+        list\t"List installed apps and/or runtimes" \
+        make-current\t"Specify default version to run" \
+        mask\t"Mask out updates and automatic installation" \
+        override\t"Override permissions for an application" \
+        permission-remove\t"Remove item from permission store" \
+        permission-reset\t"Reset app permissions" \
+        permission-set\t"Set permissions" \
+        permission-show\t"Show app permissions" \
+        permissions\t"List permissions" \
+        ps\t"Enumerate running applications" \
+        remote-add\t"Add a new remote repository (by URL)" \
+        remote-delete\t"Delete a configured remote" \
+        remote-info\t"Show information about a remote app or runtime" \
+        remote-ls\t"List contents of a configured remote" \
+        remote-modify\t"Modify properties of a configured remote" \
+        remotes\t"List all configured remotes" \
+        repair\t"Repair flatpak installation" \
+        repo\t"Show information about a repo" \
+        run\t"Run an application" \
+        search\t"Search for remote apps/runtimes" \
+        uninstall\t"Uninstall an installed application or runtime" \
+        update\t"Update an installed application or runtime"
+end
+complete -c flatpak -n __fish_is_first_token -xa "(__fish_flatpak_subcommands)"
 
 # Ancient versions of flatpak seem to assume output is always a tty and emit pretty-formatted output, with
 # a variable number of spaces for alignment, trailing \CR, and ANSI color/formatting sequences. This function is akin