feat(search): Check keywords when searching applications

Author: jacobgkau

TESTING.md

@@ -88,6 +88,10 @@ Tasks for a tester to verify when approving a patch. Use complex window layouts
 - [ ] t: executes a command in a terminal
 - [ ] : executes a command in sh
 - [ ] = calculates an equation
+- [ ] Search results are as expected:
+    - `cal` returns Calendar and Calculator before Color
+    - `pops` returns Popsicle first
+    - `shop` returns the Pop!_Shop first
 
 ### Window Titles
 

src/dialog_launcher.ts

@@ -109,53 +109,80 @@ export class Launcher extends search.Search {
             // Filter matching desktop apps
             for (const [where, app] of this.desktop_apps) {
                 const name = app.name()
-                const name_match = name.toLowerCase()
-                const retain = name_match.startsWith(pattern)
-                    || name_match.includes(pattern)
-                    || levenshtein.compare(name_match, pattern) < 3
-
-                if (retain) {
-                    const generic = app.generic_name();
-
-                    const button = new launch.SearchOption(
-                        name,
-                        generic ? generic + " — " + where : where,
-                        'application-default-symbolic',
-                        { gicon: app.icon() },
-                        this.icon_size(),
-                        { app }
-                    )
+                const keywords = app.keywords()
+                const app_items = keywords !== null ? name.split().concat(keywords) : [name]
+                
+                for (const item of app_items) {
+                    const item_match = item.toLowerCase()
+                    if ( item_match.startsWith(pattern)
+                         || item_match.includes(pattern)
+                         || levenshtein.compare(item_match, pattern) < 3 {
+                        const generic = app.generic_name();
+                        const button = new launch.SearchOption(
+                            name,
+                            generic ? generic + " — " + where : where,
+                            'application-default-symbolic',
+                            { gicon: app.icon() },
+                            this.icon_size(),
+                            { app },
+                            keywords
+                        )
 
-                    DedicatedGPU.addPopup(app, button.widget)
+                        DedicatedGPU.addPopup(app, button.widget)
 
-                    this.options.push(button)
+                        this.options.push(button)
+                        break
+                    }
                 }
             }
 
             const sorter = (a: launch.SearchOption, b: launch.SearchOption) => {
                 const a_name = a.title.toLowerCase()
                 const b_name = b.title.toLowerCase()
 
-                let a_name_weight = 0, b_name_weight = 0;
+                let a_weight = 0, b_weight = 0;
 
                 if (!a_name.startsWith(pattern)) {
-                    a_name_weight = levenshtein.compare(a_name, pattern)
-                    if (a.description) {
-                        a_name_weight = Math.min(a_name_weight, levenshtein.compare(pattern, a.description.toLowerCase()))
+                    a_weight = 1
+                    if (!a_name.includes(pattern) {
+                        a_weight = levenshtein.compare(a_name, pattern)
+                        if (a.description) {
+                            a_weight = Math.min(a_weight, levenshtein.compare(pattern, a.description.toLowerCase()))
+                        }
+                        if (a.keywords) {
+                            for (const keyword of a.keywords) {
+                                if keyword.toLowerCase().startsWith(pattern) || keyword.toLowerCase().includes(pattern) {
+                                    a_weight = 1
+                                } else {
+                                    a_weight = Math.min(a_weight, (levenshtein.compare(pattern, keyword.toLowerCase()) + 1))
+                                }
+                            }
+                        }
                     }
                 }
 
                 if (!b_name.startsWith(pattern)) {
-                    b_name_weight = levenshtein.compare(b_name, pattern)
-
-                    if (b.description) {
-                        b_name_weight = Math.min(b_name_weight, levenshtein.compare(pattern, b.description.toLowerCase()))
+                    b_weight = 1
+                    if (!b_name.includes(pattern)) {
+                        b_weight = levenshtein.compare(b_name, pattern)
+                        if (b.description) {
+                            b_weight = Math.min(b_weight, levenshtein.compare(pattern, b.description.toLowerCase()))
+                        }
+                        if (b.keywords) {
+                            for (const keyword of b.keywords) {
+                                if keyword.toLowerCase().startsWith(pattern) || keyword.toLowerCase().includes(pattern) {
+                                    b_weight = 1
+                                } else {
+                                    b_weight = Math.min(b_weight, (levenshtein.compare(pattern, keyword.toLowerCase()) + 1))
+                                }
+                            }
+                        }
                     }
                 }
 
-                return a_name_weight === b_name_weight
+                return a_weight === b_weight
                     ? a_name.length > b_name.length ? 1 : 0
-                    : a_name_weight > b_name_weight ? 1 : 0
+                    : a_weight > b_weight ? 1 : 0
             }
 
             // Sort the list of matched selections

src/launcher_service.ts

@@ -178,15 +178,17 @@ export class SearchOption {
     title: string
     description: null | string
     id: Identity
+    keywords: null | array
 
     widget: St.Button
 
     shortcut: St.Widget = new St.Label({ text: "", y_align: Clutter.ActorAlign.CENTER, style: "padding-left: 6px;padding-right: 6px" })
 
-    constructor(title: string, description: null | string, category_icon: string, icon: null | IconSrc, icon_size: number, id: Identity) {
+    constructor(title: string, description: null | string, category_icon: string, icon: null | IconSrc, icon_size: number, id: Identity, keywords: null | array) {
         this.title = title
         this.description = description
         this.id = id
+        this.keywords = keywords
 
         let cat_icon
         const cat_icon_file = Gio.File.new_for_path(category_icon)