From 2db759813dc0d75507e906f4bb24f432f4120c79 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 26 Sep 2018 14:10:46 -0500
Subject: [PATCH] Revert "Fix completion descriptions for functions"

This reverts commit 9c63ad3209e8d9eb5dec5e498725491ead037765 until I can
figure out what is causing the assertion and test failures.

It *seems* to be that passing in the correct function name to the
description lookup is causing a previously present error to be realized,
but I can't yet be certain.
---
 src/wildcard.cpp | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 3cc28fd20..8e36154c5 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -119,8 +119,7 @@ static enum fuzzy_match_type_t wildcard_match_internal(const wchar_t *str, const
                     return fuzzy_match_none;
                 }
 
-                // Common case of * at the end. In that case we can early out since we know it will
-                // match.
+                // Common case of * at the end. In that case we can early out since we know it will match.
                 if (wc_x[1] == L'\0') {
                     return fuzzy_match_exact;
                 }
@@ -138,7 +137,7 @@ static enum fuzzy_match_type_t wildcard_match_internal(const wchar_t *str, const
                 wc_x++;
                 str_x++;
                 continue;
-            } else if (*str_x != 0 && *str_x == *wc_x) {  // ordinary character
+            } else if (*str_x != 0 && *str_x == *wc_x) { // ordinary character
                 wc_x++;
                 str_x++;
                 continue;
@@ -157,8 +156,7 @@ static enum fuzzy_match_type_t wildcard_match_internal(const wchar_t *str, const
 }
 
 // This does something horrible refactored from an even more horrible function.
-static wcstring resolve_description(const wchar_t *full_completion, wcstring *completion,
-                                    const wchar_t *explicit_desc,
+static wcstring resolve_description(wcstring *completion, const wchar_t *explicit_desc,
                                     wcstring (*desc_func)(const wcstring &)) {
     size_t complete_sep_loc = completion->find(PROG_COMPLETE_SEP);
     if (complete_sep_loc != wcstring::npos) {
@@ -168,7 +166,7 @@ static wcstring resolve_description(const wchar_t *full_completion, wcstring *co
         return description;
     }
 
-    const wcstring func_result = (desc_func ? desc_func(full_completion) : wcstring());
+    const wcstring func_result = (desc_func ? desc_func(*completion) : wcstring());
     if (!func_result.empty()) {
         return func_result;
     }
@@ -243,8 +241,7 @@ static bool wildcard_complete_internal(const wchar_t *str, const wchar_t *wc,
         // the wildcard.
         assert(!full_replacement || wcslen(wc) <= wcslen(str));
         wcstring out_completion = full_replacement ? params.orig : str + wcslen(wc);
-        wcstring out_desc =
-            resolve_description(str, &out_completion, params.desc, params.desc_func);
+        wcstring out_desc = resolve_description(&out_completion, params.desc, params.desc_func);
 
         // Note: out_completion may be empty if the completion really is empty, e.g. tab-completing
         // 'foo' when a file 'foo' exists.
@@ -326,8 +323,8 @@ bool wildcard_complete(const wcstring &str, const wchar_t *wc, const wchar_t *de
 }
 
 bool wildcard_match(const wcstring &str, const wcstring &wc, bool leading_dots_fail_to_match) {
-    enum fuzzy_match_type_t match =
-        wildcard_match_internal(str.c_str(), wc.c_str(), leading_dots_fail_to_match);
+    enum fuzzy_match_type_t match = wildcard_match_internal(
+        str.c_str(), wc.c_str(), leading_dots_fail_to_match);
     return match != fuzzy_match_none;
 }
 
@@ -430,8 +427,7 @@ static bool wildcard_test_flags_then_complete(const wcstring &filepath, const wc
         return false;
     }
 
-    if (is_windows_subsystem_for_linux() &&
-        string_suffixes_string_case_insensitive(L".dll", filename)) {
+    if (is_windows_subsystem_for_linux() && string_suffixes_string_case_insensitive(L".dll", filename)) {
         return false;
     }