Bug 1481319 - Include prefix when matching bookmark keywords. r=mak

Differential Revision: https://phabricator.services.mozilla.com/D2804 --HG-- extra : moz-landing-system : lando
dothq · Aug 7, 2018 · bb9689b · bb9689b
1 parent 168027f
commit bb9689b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/toolkit/components/places/UnifiedComplete.js b/toolkit/components/places/UnifiedComplete.js
@@ -1531,7 +1531,7 @@ Search.prototype = {
 
   async _matchPlacesKeyword() {
     // The first word could be a keyword, so that's what we'll search.
-    let keyword = this._searchTokens[0];
+    let keyword = this._strippedPrefix + this._searchTokens[0];
     let entry = await PlacesUtils.keywords.fetch(keyword);
     if (!entry)
       return false;

diff --git a/toolkit/components/places/tests/unifiedcomplete/test_keyword_search.js b/toolkit/components/places/tests/unifiedcomplete/test_keyword_search.js
@@ -19,7 +19,7 @@ add_task(async function test_keyword_searc() {
   await PlacesTestUtils.addVisits([
     { uri: uri1, title: "Generic page title" },
     { uri: uri2, title: "Generic page title" },
-    { uri: uri3, title: "This page shouldn't be suggested" },
+    { uri: uri3, title: "This page uri contains the keyword" },
   ]);
   await addBookmark({ uri: uri1, title: "Bookmark title", keyword: "key"});
 
@@ -94,5 +94,12 @@ add_task(async function test_keyword_searc() {
     matches: [ { uri: NetUtil.newURI("http://abc/?search=test"), title: "abc", style: ["keyword", "heuristic"] } ]
   });
 
+  info("Bug 1481319 - Keyword with a prefix in front");
+  await check_autocomplete({
+    search: "http://key",
+    matches: [ { uri: uri3, title: "This page uri contains the keyword" } ],
+    completed: "http://key",
+  });
+
   await cleanup();
 });