Move bookmark info before title in completions, and show for "Smart" completions.

common/content/configbase.js

@@ -251,6 +251,7 @@ const ConfigBase = Class(ModuleBase, {
         Title       color: magenta; background: white; font-weight: bold;
         URL         text-decoration: none; color: green; background: inherit;
         URL:hover   text-decoration: underline; cursor: pointer;
+        URLExtra    color: gray;
 
         FrameIndicator;;* {
             /* This gets released into the wild, so everything is important */

common/modules/bookmarkcache.jsm

@@ -56,6 +56,14 @@ const BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver),
         return Bookmark(node.uri, node.title, node.icon && node.icon.spec, post, keyword, tags, node.itemId);
     },
 
+    get: function (url) {
+        let ids = bookmarks.getBookmarkIdsForURI(util.newURI(url));
+        for (let id in values(ids))
+            if (id in this.bookmarks)
+                return this.bookmarks[id];
+        return null;
+    },
+
     readBookmark: function readBookmark(id) {
         return {
             itemId: id,

common/modules/template.jsm

@@ -50,18 +50,17 @@ const Template = Module("Template", {
 
     bookmarkDescription: function (item, text)
     <>
-        <a xmlns:dactyl={NS} identifier={item.id} dactyl:command={item.command}
-           href={item.item.url} highlight="URL">{text || ""}</a>&#xa0;
         {
             !(item.extra && item.extra.length) ? "" :
-            <span class="extra-info">
+            <span highlight="URLExtra">
                 ({
                     template.map(item.extra, function (e)
                     <>{e[0]}: <span highlight={e[2]}>{e[1]}</span></>,
-                    <>&#xa0;</>/* Non-breaking space */)
+                    <>&#xa0;</>)
-                })
+                })&#xa0;</span>
-            </span>
         }
+        <a xmlns:dactyl={NS} identifier={item.id} dactyl:command={item.command}
+           href={item.item.url} highlight="URL">{text || ""}</a>
     </>,
 
     filter: function (str) <span highlight="Filter">{str}</span>,

common/skin/dactyl.css

@@ -58,8 +58,6 @@
     width: 0px;
 }
 
-.extra-info { color: gray; }
-
 .times-executed, .time-average { color: green; }
 .time-total { color: red; }
 

pentadactyl/content/config.js

@@ -254,8 +254,11 @@ const Config = Module("config", ConfigBase, {
             context.filterFunc = null;
             context.hasItems = context.completions.length > 0; // XXX
             context.incomplete = true;
-            context.keys.icon = 2;
+
+            context.format = bookmarks.format;
+            context.keys.extra = function (item) (bookmarkcache.get(item.url) || {}).extra;
             context.title = ["Smart Completions"];
+
             context.cancel = function () {
                 if (searchRunning) {
                     services.get("autoCompleteSearch").stopSearch();
@@ -267,8 +270,8 @@ const Config = Module("config", ConfigBase, {
             let timer = new Timer(50, 100, function (result) {
                 context.incomplete = result.searchResult >= result.RESULT_NOMATCH_ONGOING;
                 context.completions = [
-                    [result.getValueAt(i), result.getCommentAt(i), result.getImageAt(i)]
+                    { url: result.getValueAt(i), title: result.getCommentAt(i), icon: result.getImageAt(i) }
-                        for (i in util.range(0, result.matchCount))
+                    for (i in util.range(0, result.matchCount))
                 ];
             });
             services.get("autoCompleteSearch").startSearch(context.filter, "", context.result, {