Fix #2761: canonicalise aliases in completions

src/completions.ts

@@ -59,6 +59,10 @@ export abstract class CompletionSource {
         this.trailingSpace = options.trailingSpace
     }
 
+    protected canonicalisePrefix(prefix: string) {
+        return aliases.expandExstr(prefix).trim()
+    }
+
     /** Control presentation of Source */
     set state(newstate: OptionState) {
         switch (newstate) {

src/completions/Autocmd.ts

@@ -59,7 +59,8 @@ export class AutocmdCompletionSource extends Completions.CompletionSourceFuse {
             this.state = "hidden"
             return
         }
-        const is_autocmddelete = /del/.test(prefix)
+        const is_autocmddelete =
+            this.canonicalisePrefix(prefix) === "autocmddelete"
         const filter_defined_autocmds = is_autocmddelete
         const defined_autocmds = config.get("autocmds")
         // Config may contain empty dictionnaries if user deleted all patterns

src/completions/Bindings.ts

@@ -51,6 +51,7 @@ export class BindingsCompletionSource extends Completions.CompletionSourceFuse {
             this.state = "hidden"
             return
         }
+        prefix = this.canonicalisePrefix(prefix)
 
         this.deselect()
 

src/completions/Bmark.ts

@@ -96,17 +96,6 @@ export class BmarkCompletionSource extends Completions.CompletionSourceFuse {
         // Call concrete class
         return this.updateDisplay()
     }
-
-    select(option: Completions.CompletionOption) {
-        if (this.lastExstr !== undefined && option !== undefined) {
-            this.completion = "bmarks " + option.value
-            this.args = option.value
-            option.state = "focused"
-            this.lastFocused = option
-        } else {
-            throw new Error("lastExstr and option must be defined!")
-        }
-    }
 }
 
 export class BookmarkFolderCompletionSource extends Completions.CompletionSourceFuse {

src/completions/Composite.ts

@@ -5,7 +5,6 @@ import * as config from "@src/lib/config"
 import * as aliases from "@src/lib/aliases"
 
 const PREFIX = "composite"
-const regex = new RegExp("^" + PREFIX + " ")
 
 // Most of this is copied verbatim from Excmd.ts - would have liked to inherit but constructor posed difficulties
 export class CompositeCompletionSource extends Completions.CompletionSourceFuse {
@@ -121,8 +120,8 @@ export class CompositeCompletionSource extends Completions.CompletionSourceFuse
     }
 
     private getendexstr(exstr) {
-        return exstr
-            .replace(regex, "")
+        const [, query = exstr] = this.splitOnPrefix(exstr)
+        return query
             .split("|")
             .slice(-1)[0]
             .split(";")

src/completions/Extensions.ts

@@ -61,12 +61,6 @@ export class ExtensionsCompletionSource extends Completions.CompletionSourceFuse
         return this.updateDisplay()
     }
 
-    select(option: ExtensionsCompletionOption) {
-        this.completion = "extoptions " + option.name
-        option.state = "focused"
-        this.lastFocused = option
-    }
-
     private scoreOptions(options: ExtensionsCompletionOption[]) {
         return options.sort((o1, o2) => o1.name.localeCompare(o2.name))
     }

src/completions/History.ts

@@ -72,6 +72,7 @@ export class HistoryCompletionSource extends Completions.CompletionSourceFuse {
         }
 
         const headerPostfix = []
+        prefix = this.canonicalisePrefix(prefix)
 
         // Ignoring command-specific arguments
         // It's terrible but it's ok because it's just a stopgap until an actual commandline-parsing API is implemented

src/completions/Settings.ts

@@ -52,6 +52,7 @@ export class SettingsCompletionSource extends Completions.CompletionSourceFuse {
             this.state = "hidden"
             return
         }
+        prefix = this.canonicalisePrefix(prefix)
 
         // Ignoring command-specific arguments
         // It's terrible but it's ok because it's just a stopgap until an actual commandline-parsing API is implemented

src/completions/Tab.ts

@@ -227,7 +227,8 @@ export class BufferCompletionSource extends Completions.CompletionSourceFuse {
     @Perf.measuredAsync
     private async updateOptions(exstr = "") {
         this.lastExstr = exstr
-        const [prefix, query] = this.splitOnPrefix(exstr)
+        let [prefix, query] = this.splitOnPrefix(exstr)
+        if (prefix) prefix = this.canonicalisePrefix(prefix)
         this.shouldSetStateFromScore =
             config.get("completions", "Tab", "autoselect") === "true" &&
             prefix !== "tabrename" &&

src/completions/TabAll.ts

@@ -199,7 +199,7 @@ export class TabAllCompletionSource extends Completions.CompletionSourceFuse {
 
         // Check to see if this is a command that needs to exclude the current
         // window
-        const excludeCurrentWindow = ["tabgrab"].includes(prefix.trim())
+        const excludeCurrentWindow = this.canonicalisePrefix(prefix) === "tabgrab"
         const currentWindow = await browserBg.windows.getCurrent()
         // Window Ids don't make sense so we're using LASTID and WININDEX to compute a window index
         // This relies on the fact that tabs are sorted by window ids

src/completions/Window.ts

@@ -69,7 +69,7 @@ export class WindowCompletionSource extends Completions.CompletionSourceFuse {
             return
         }
 
-        const excludeCurrentWindow = ["tabpush"].includes(prefix.trim())
+        const excludeCurrentWindow = this.canonicalisePrefix(prefix) === "tabpush"
         this.options = (await browserBg.windows.getAll({ populate: true }))
         .filter( win => !(excludeCurrentWindow && win.focused))
         .map(