Flatpak completion includes extra text

[TingPing]

Fish version: 2.6.0
Flatpak version: 0.9.12

Flatpak completion of applications is currently broken probably as the format of Flatpaks cli output has changed:

https://asciinema.org/a/8dCLh0bJNwqRiWfVvds2C1hIx

[mqudsi]

Can flatpack URLs contain spaces?

[TingPing]

An app-id cannot contain spaces.

[mqudsi]

Can you try the attached diff? You can just apply it to /usr/local/share/fish/completions/flatpak.fish:

diff --git a/share/completions/flatpak.fish b/share/completions/flatpak.fish
index 5860c6b..565ab0b 100644
--- a/share/completions/flatpak.fish
+++ b/share/completions/flatpak.fish
@@ -30,9 +30,9 @@ complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-i
 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 "__fish_seen_subcommand_from run" -a "(flatpak list --app | string trim)"
-complete -f -c flatpak -n "__fish_seen_subcommand_from info uninstall" -a "(flatpak list | string trim)"
-complete -f -c flatpak -n "__fish_seen_subcommand_from remote-ls remote-modify remote-delete" -a "(flatpak remote-list | string trim)"
+complete -f -c flatpak -n "__fish_seen_subcommand_from run" -a "(flatpak list --app | string trim | string match -r '^\S+')"
+complete -f -c flatpak -n "__fish_seen_subcommand_from info uninstall" -a "(flatpak list | string trim | string match -r '^\S+')"
+complete -f -c flatpak -n "__fish_seen_subcommand_from remote-ls remote-modify remote-delete" -a "(flatpak remote-list | string trim | string match -r '^\S+')"

 # Note that "remote-ls" opens an internet connection, so we don't want to complete "install"
 # Plenty of the other stuff is too free-form to complete (e.g. remote-add).

[TingPing]

That works as expected.

[mqudsi]

Thanks, @TingPing

This is fixed for fish3

[mqudsi]

@zanchey do you want me to cherry-pick for 2.7.0?

[zanchey]

Yes please!

[mqudsi]

Added to 2.7.0 and updated the changelog accordingly.