Allow autosuggestions to do job expansion. Fixes

https://github.com/fish-shell/fish-shell/issues/1152

1 files changed, 131 insertions, 108 deletions

diff --git a/expand.cpp b/expand.cpp
index 2a3a1fe8..10e3cbf4 100644
--- a/expand.cpp
+++ b/expand.cpp
@@ -49,6 +49,7 @@ parameter expansion.
 #include "signal.h"
 #include "tokenizer.h"
 #include "complete.h"
+#include "iothread.h"
 
 #include "parse_util.h"
 
@@ -560,106 +561,100 @@ std::vector<wcstring> expand_get_all_process_names(void)
     return result;
 }
 
-/**
-   Searches for a job with the specified job id, or a job or process
-   which has the string \c proc as a prefix of its commandline.
+/* Helper function to do a job search. */
+struct find_job_data_t
+{
+    const wchar_t *proc; /* The process to search for - possibly numeric, possibly a name */
+    expand_flags_t flags;
+    std::vector<completion_t> *completions;
+};
 
-   If the ACCEPT_INCOMPLETE flag is set, the remaining string for any matches
-   are inserted.
+/* The following function is invoked on the main thread, because the job list is not thread safe. It should search the job list for something matching the given proc, and then return 1 to stop the search, 0 to continue it  */
+static int find_job(const struct find_job_data_t *info)
+{
+    ASSERT_IS_MAIN_THREAD();
 
-   Otherwise, any job matching the specified string is matched, and
-   the job pgid is returned. If no job matches, all child processes
-   are searched. If no child processes match, and <tt>fish</tt> can
-   understand the contents of the /proc filesystem, all the users
-   processes are searched for matches.
-*/
+    const wchar_t * const proc = info->proc;
+    const expand_flags_t flags = info->flags;
+    std::vector<completion_t> &completions = *info->completions;
 
-static int find_process(const wchar_t *proc,
-                        expand_flags_t flags,
-                        std::vector<completion_t> &out)
-{
+    const job_t *j;
     int found = 0;
-
-    if (!(flags & EXPAND_SKIP_JOBS))
+    // do the empty param check first, because an empty string passes our 'numeric' check
+    if (wcslen(proc)==0)
+    {
+        /*
+          This is an empty job expansion: '%'
+          It expands to the last job backgrounded.
+        */
+        job_iterator_t jobs;
+        while ((j = jobs.next()))
+        {
+            if (!j->command_is_empty())
+            {
+                append_completion(completions, to_string<long>(j->pgid));
+                break;
+            }
+        }
+        /*
+          You don't *really* want to flip a coin between killing
+          the last process backgrounded and all processes, do you?
+          Let's not try other match methods with the solo '%' syntax.
+        */
+        found = 1;
+    }
+    else if (iswnumeric(proc))
     {
-        ASSERT_IS_MAIN_THREAD();
-        const job_t *j;
+        /*
+          This is a numeric job string, like '%2'
+        */
 
-        // do the empty param check first, because an empty string passes our 'numeric' check
-        if (wcslen(proc)==0)
+        if (flags & ACCEPT_INCOMPLETE)
         {
-            /*
-              This is an empty job expansion: '%'
-              It expands to the last job backgrounded.
-            */
             job_iterator_t jobs;
             while ((j = jobs.next()))
             {
-                if (!j->command_is_empty())
+                wchar_t jid[16];
+                if (j->command_is_empty())
+                    continue;
+
+                swprintf(jid, 16, L"%d", j->job_id);
+
+                if (wcsncmp(proc, jid, wcslen(proc))==0)
                 {
-                    append_completion(out, to_string<long>(j->pgid));
-                    break;
+                    wcstring desc_buff = format_string(COMPLETE_JOB_DESC_VAL, j->command_wcstr());
+                    append_completion(completions,
+                                      jid+wcslen(proc),
+                                      desc_buff,
+                                      0);
                 }
             }
-            /*
-              You don't *really* want to flip a coin between killing
-              the last process backgrounded and all processes, do you?
-              Let's not try other match methods with the solo '%' syntax.
-            */
-            found = 1;
         }
-        else if (iswnumeric(proc))
+        else
         {
-            /*
-              This is a numeric job string, like '%2'
-            */
+            int jid;
+            wchar_t *end;
 
-            if (flags & ACCEPT_INCOMPLETE)
+            errno = 0;
+            jid = fish_wcstoi(proc, &end, 10);
+            if (jid > 0 && !errno && !*end)
             {
-                job_iterator_t jobs;
-                while ((j = jobs.next()))
+                j = job_get(jid);
+                if ((j != 0) && (j->command_wcstr() != 0) && (!j->command_is_empty()))
                 {
-                    wchar_t jid[16];
-                    if (j->command_is_empty())
-                        continue;
-
-                    swprintf(jid, 16, L"%d", j->job_id);
-
-                    if (wcsncmp(proc, jid, wcslen(proc))==0)
-                    {
-                        wcstring desc_buff = format_string(COMPLETE_JOB_DESC_VAL, j->command_wcstr());
-                        append_completion(out,
-                                          jid+wcslen(proc),
-                                          desc_buff,
-                                          0);
-                    }
-                }
-            }
-            else
-            {
-                int jid;
-                wchar_t *end;
-
-                errno = 0;
-                jid = fish_wcstoi(proc, &end, 10);
-                if (jid > 0 && !errno && !*end)
-                {
-                    j = job_get(jid);
-                    if ((j != 0) && (j->command_wcstr() != 0) && (!j->command_is_empty()))
-                    {
-                        append_completion(out, to_string<long>(j->pgid));
-                    }
+                    append_completion(completions, to_string<long>(j->pgid));
                 }
             }
-            /*
-               Stop here so you can't match a random process name
-               when you're just trying to use job control.
-            */
-            found = 1;
         }
-        if (found)
-            return 1;
+        /*
+           Stop here so you can't match a random process name
+           when you're just trying to use job control.
+        */
+        found = 1;
+    }
 
+    if (! found)
+    {
         job_iterator_t jobs;
         while ((j = jobs.next()))
         {
@@ -672,56 +667,84 @@ static int find_process(const wchar_t *proc,
             {
                 if (flags & ACCEPT_INCOMPLETE)
                 {
-                    append_completion(out,
+                    append_completion(completions,
                                       j->command_wcstr() + offset + wcslen(proc),
                                       COMPLETE_JOB_DESC,
                                       0);
                 }
                 else
                 {
-                    append_completion(out, to_string<long>(j->pgid));
+                    append_completion(completions, to_string<long>(j->pgid));
                     found = 1;
                 }
             }
         }
 
-        if (found)
+        if (! found)
         {
-            return 1;
-        }
-
-        jobs.reset();
-        while ((j = jobs.next()))
-        {
-            process_t *p;
-            if (j->command_is_empty())
-                continue;
-            for (p=j->first_process; p; p=p->next)
+            jobs.reset();
+            while ((j = jobs.next()))
             {
-                if (p->actual_cmd.empty())
+                process_t *p;
+                if (j->command_is_empty())
                     continue;
-
-                size_t offset;
-                if (match_pid(p->actual_cmd, proc, flags, &offset))
+                for (p=j->first_process; p; p=p->next)
                 {
-                    if (flags & ACCEPT_INCOMPLETE)
-                    {
-                        append_completion(out,
-                                          wcstring(p->actual_cmd, offset + wcslen(proc)),
-                                          COMPLETE_CHILD_PROCESS_DESC,
-                                          0);
-                    }
-                    else
+                    if (p->actual_cmd.empty())
+                        continue;
+
+                    size_t offset;
+                    if (match_pid(p->actual_cmd, proc, flags, &offset))
                     {
-                        append_completion(out,
-                                          to_string<long>(p->pid),
-                                          L"",
-                                          0);
-                        found = 1;
+                        if (flags & ACCEPT_INCOMPLETE)
+                        {
+                            append_completion(completions,
+                                              wcstring(p->actual_cmd, offset + wcslen(proc)),
+                                              COMPLETE_CHILD_PROCESS_DESC,
+                                              0);
+                        }
+                        else
+                        {
+                            append_completion(completions,
+                                              to_string<long>(p->pid),
+                                              L"",
+                                              0);
+                            found = 1;
+                        }
                     }
                 }
             }
         }
+    }
+
+    return found;
+}
+
+
+/**
+   Searches for a job with the specified job id, or a job or process
+   which has the string \c proc as a prefix of its commandline.
+
+   If the ACCEPT_INCOMPLETE flag is set, the remaining string for any matches
+   are inserted.
+
+   Otherwise, any job matching the specified string is matched, and
+   the job pgid is returned. If no job matches, all child processes
+   are searched. If no child processes match, and <tt>fish</tt> can
+   understand the contents of the /proc filesystem, all the users
+   processes are searched for matches.
+*/
+
+static int find_process(const wchar_t *proc,
+                        expand_flags_t flags,
+                        std::vector<completion_t> &out)
+{
+    int found = 0;
+
+    if (!(flags & EXPAND_SKIP_JOBS))
+    {
+        const struct find_job_data_t data = {proc, flags, &out};
+        found = iothread_perform_on_main(find_job, &data);
 
         if (found)
         {