rustdoc-search: show type signatures in results

Author: notriddle

src/librustdoc/html/render/write_shared.rs

@@ -370,8 +370,7 @@ else if (window.initSearch) window.initSearch(searchIndex);
         std::fs::write(
             &path,
             &format!(
-                r##"searchState.loadedParamNames({kratename}, JSON.parse('{data}'))"##,
-                kratename = serde_json::to_string(&kratename).unwrap(),
+                r##"searchState.loadedParamNames('{kratename}','{data}')"##,
                 data = search_index.param_names,
             )
             .into_bytes()

src/librustdoc/html/static/js/externs.js

@@ -9,12 +9,12 @@ function initSearch(searchIndex){}
 /**
  * @typedef {{
  *     name: string,
- *     id: integer|null,
+ *     id: number|null,
  *     fullPath: Array<string>,
  *     pathWithoutLast: Array<string>,
  *     pathLast: string,
  *     generics: Array<QueryElement>,
- *     bindings: Map<integer, Array<QueryElement>>,
+ *     bindings: Map<number, Array<QueryElement>>,
  * }}
  */
 let QueryElement;
@@ -91,6 +91,9 @@ let Results;
  *     parent: (Object|undefined),
  *     path: string,
  *     ty: number,
+ *     type: FunctionSearchType?,
+ *     displayType: Promise<Array<Array<string>>>|null,
+ *     displayTypeMappedNames: Promise<Array<[string, Array<string>]>>|null,
  * }}
  */
 let ResultObject;

src/librustdoc/html/static/js/main.js

@@ -353,6 +353,27 @@ function preLoadCss(cssUrl) {
         loadedDescShard: function(crate, shard, data) {
             this.descShards.get(crate)[shard].resolve(data.split("\n"));
         },
+        paramNameShards: new Map(),
+        paramNameResolvers: new Map(),
+        loadParamNames: async function(crate) {
+            if (this.paramNameShards.has(crate)) {
+                return this.paramNameShards.get(crate);
+            } else {
+                const promise = new Promise((resolve, reject) => {
+                    this.paramNameResolvers.set(crate, resolve);
+                    const url = resourcePath(
+                        `search.desc/${crate}/${crate}-param-names`,
+                        ".js",
+                    );
+                    loadScript(url, reject);
+                });
+                this.paramNameShards.set(crate, promise);
+                return promise;
+            }
+        },
+        loadedParamNames: function(crate, data) {
+            this.paramNameResolvers.get(crate)(JSON.parse(data));
+        },
     };
 
     const toggleAllDocsId = "toggle-all-docs";
@@ -1108,6 +1129,9 @@ function preLoadCss(cssUrl) {
                 titleContent.appendChild(document.createTextNode(e.getAttribute("data-title")));
                 wrapper.appendChild(titleContent);
             }
+            if (e.RUSTDOC_TOOLTIP_DOM) {
+                wrapper.appendChild(e.RUSTDOC_TOOLTIP_DOM);
+            }
         }
         wrapper.className = "tooltip popover";
         const focusCatcher = document.createElement("div");
@@ -1245,7 +1269,7 @@ function preLoadCss(cssUrl) {
         }
     }
 
-    onEachLazy(document.getElementsByClassName("tooltip"), e => {
+    window.rustdocConfigureTooltip = e => {
         e.onclick = () => {
             e.TOOLTIP_FORCE_VISIBLE = e.TOOLTIP_FORCE_VISIBLE ? false : true;
             if (window.CURRENT_TOOLTIP_ELEMENT && !e.TOOLTIP_FORCE_VISIBLE) {
@@ -1313,7 +1337,8 @@ function preLoadCss(cssUrl) {
                 addClass(window.CURRENT_TOOLTIP_ELEMENT, "fade-out");
             }
         };
-    });
+    };
+    onEachLazy(document.getElementsByClassName("tooltip"), window.rustdocConfigureTooltip);
 
     const sidebar_menu_toggle = document.getElementsByClassName("sidebar-menu-toggle")[0];
     if (sidebar_menu_toggle) {