From 392cdd4338e8079cd845a79a6cb3c8974d7b9d17 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sat, 28 Jul 2018 17:41:39 -0500
Subject: [PATCH] Show a meaningful description of packages in
 `__fish_print_packages`

Use `apt-cache show` instead of `apt-cache packagenames` to efficiently
print package names and a brief description instead of the placeholder
(localized) "Package" text that was previously printed. This applies to
both available and installed packages (for inistall and remove operations,
respectively).

TODO: update `__fish_print_packages` for non-debian platforms to do the
same.
---
 share/completions/apt.fish                 |  2 +-
 share/functions/__fish_print_packages.fish | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/share/completions/apt.fish b/share/completions/apt.fish
index 14cde0cdc..126027fae 100644
--- a/share/completions/apt.fish
+++ b/share/completions/apt.fish
@@ -19,7 +19,7 @@ end
 #using -r and not -e as string match -e is broken, this will cause problems
 #if the commandline contains special characters, but most package names do
 #not contain special characters. Can switch to -e after #4971 is fixed.
-complete -c apt -n "__fish_seen_subcommand_from $pkg_subcmds" -a '(__fish_print_packages | string match -r -- (commandline -ct) | head -n 100)' -d 'Package'
+complete -c apt -n "__fish_seen_subcommand_from $pkg_subcmds" -a '(__fish_print_packages | head -n 100)'
 complete -c apt -n "__fish_seen_subcommand_from $installed_pkg_subcmds" -a '(__fish_print_packages --installed | string match -r -- ".*"(commandline -ct)".*" | head -n 100)' -d 'Package'
 
 # Support flags
diff --git a/share/functions/__fish_print_packages.fish b/share/functions/__fish_print_packages.fish
index 2b9bdf944..e67546294 100644
--- a/share/functions/__fish_print_packages.fish
+++ b/share/functions/__fish_print_packages.fish
@@ -20,13 +20,18 @@ function __fish_print_packages
     set -l package (_ "Package")
 
     if type -q -f apt-cache
-        if set -q only_installed
-            dpkg --get-selections | string replace -fr '(\S+)\s+install' "\$1\t$package"
-            return
-        else
+        if not set -q only_installed
             # Do not generate the cache as apparently sometimes this is slow.
             # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=547550
-            apt-cache --no-generate pkgnames (commandline -ct) 2>/dev/null | sed -e 's/$/'\t$package'/'
+            # (It is safe to use `sed -r` here as we are guaranteed to be on a GNU platform
+            # if apt-cache was found. Using unicode reserved range in `fish/tr` and the
+            # little-endian bytecode equivalent in `sed`. Supports localization.)
+            apt-cache --no-generate show '.*'(commandline -ct)'.*' 2>/dev/null | sed -r '/^(Package|Description-[a-z]{2}):/!d;s/Package: (.*)/\1\t/g;s/Description-.*: (.*)/\1\xee\x80\x80\x0a/g' | tr -d \n | tr -s \uE000 \n | uniq
+            return
+        else
+            set -l packages (dpkg --get-selections | string replace -fr '(\S+)\s+install' "\$1" | string match -e (commandline -ct))
+            apt-cache --no-generate show $packages 2>/dev/null | sed -r '/^(Package|Description-[a-z]{2}):/!d;s/Package: (.*)/\1\t/g;s/Description-.*: (.*)/\1\xee\x80\x80\x0a/g' | tr -d \n | tr -s \uE000 \n | uniq
+
             return
         end
     end