fix(launcher): Completion requests now submit the ID of the active option

Author: mmstick

src/dialog_launcher.ts

@@ -279,14 +279,19 @@ export class Launcher extends search.Search {
         };
 
         let complete = (): boolean => {
-            if (this.last_plugin) {
-                plugins.Plugin.complete(ext, this.last_plugin)
-                const res = plugins.Plugin.listen(this.last_plugin)
-                if (res && res.event === "fill") {
-                    this.set_text(res.text)
-                    return true
+            const option = this.options[this.active_id]
+            if (option) {
+                if ("plugin" in option.id) {
+                    const { plugin, id } = option.id
+                    plugins.Plugin.complete(ext, plugin, id);
+                    const res = plugins.Plugin.listen(plugin)
+                    if (res && res.event === "fill") {
+                        this.set_text(res.text)
+                        return true
+                    }
                 }
             }
+
             return false
         }
 

src/dialog_search.ts

@@ -25,7 +25,8 @@ export class Search {
         shouldFadeOut: false
     });
 
-    private active_id: number;
+    active_id: number;
+
     private entry: St.Entry;
     private list: St.Widget;
     private text: Clutter.Text;

src/launcher_plugins.ts

@@ -54,6 +54,7 @@ export namespace Request {
 
     export interface Complete {
         event: 'complete',
+        id: number,
     }
 
     export interface Submit {
@@ -188,8 +189,8 @@ export namespace Plugin {
         }
     }
 
-    export function complete(ext: Ext, plugin: Plugin.Source): boolean {
-        return send(ext, plugin, { event: "complete" })
+    export function complete(ext: Ext, plugin: Plugin.Source, id: number): boolean {
+        return send(ext, plugin, { event: "complete", id })
     }
 
     export function query(ext: Ext, plugin: Plugin.Source, value: string): boolean {

src/plugins/files/main.js

@@ -36,11 +36,13 @@ class App {
 
     /**
      * Performs tab completion based on the last-given search query.
+     *
+     * @param {number} id
      */
-    complete() {
+    complete(id) {
         let text
 
-        const selected = this.selections[0]
+        const selected = this.selections[id]
         if (selected) {
             text = selection_path(this.parent, selected)
         } else {
@@ -207,7 +209,7 @@ function main() {
         if ((event_ = parse_event(input_str)) !== null) {
             switch (event_.event) {
                 case "complete":
-                    app.complete()
+                    app.complete(event_.id)
                     break
                 case "query":
                     if (event_.value) app.query(event_.value)