rustdoc: fix some missing/incorrect function signatures

Author: lolbinarycat

src/librustdoc/html/static/js/search.js

@@ -2132,8 +2132,8 @@ class DocSearch {
      *
      * @param  {rustdoc.ParsedQuery<rustdoc.ParserQueryElement>} parsedQuery
      *     - The parsed user query
-     * @param  {Object} filterCrates - Crate to search in if defined
-     * @param  {string} currentCrate - Current crate, to rank results from this crate higher
+     * @param  {string|null} filterCrates - Crate to search in if defined
+     * @param  {string|null} currentCrate - Current crate, to rank results from this crate higher
      *
      * @return {Promise<rustdoc.ResultsTable>}
      */
@@ -2765,7 +2765,7 @@ class DocSearch {
              * @this {DocSearch}
              * @param {Array<rustdoc.PlainResultObject|null>} results
              * @param {"sig"|"elems"|"returned"|null} typeInfo
-             * @param {string} preferredCrate
+             * @param {string|null} preferredCrate
              * @param {Set<string>} duplicates
              * @returns {AsyncGenerator<rustdoc.ResultObject, number>}
              */
@@ -3903,7 +3903,7 @@ class DocSearch {
         const innerRunNameQuery =
             /**
              * @this {DocSearch}
-             * @param {string} currentCrate
+             * @param {string|null} currentCrate
              * @returns {AsyncGenerator<rustdoc.ResultObject>}
              */
             async function*(currentCrate) {
@@ -4145,7 +4145,7 @@ class DocSearch {
              * @param {rustdoc.ParserQueryElement[]} inputs
              * @param {rustdoc.ParserQueryElement[]} output
              * @param {"sig"|"elems"|"returned"|null} typeInfo
-             * @param {string} currentCrate
+             * @param {string|null} currentCrate
              * @returns {AsyncGenerator<rustdoc.ResultObject>}
              */
             async function*(inputs, output, typeInfo, currentCrate) {
@@ -5178,7 +5178,7 @@ function makeTab(tabNb, text, results, query, isTypeSearch, goToFirst) {
  * @param {DocSearch} docSearch
  * @param {rustdoc.ResultsTable} results
  * @param {boolean} goToFirst
- * @param {string} filterCrates
+ * @param {string|null} filterCrates
  */
 async function showResults(docSearch, results, goToFirst, filterCrates) {
     const search = window.searchState.outputElement();
@@ -5251,6 +5251,8 @@ async function showResults(docSearch, results, goToFirst, filterCrates) {
     }
     const crateSearch = document.getElementById("crate-search");
     if (crateSearch) {
+        // #crate-search is an input element
+        // @ts-expect-error
         crateSearch.addEventListener("input", updateCrate);
     }
     search.appendChild(tabsElem);
@@ -5328,12 +5330,12 @@ async function search(forced) {
     // recent search query is added to the browser history.
     updateSearchHistory(buildUrl(query.userQuery, filterCrates));
 
+    console.log(filterCrates);
+
     await showResults(
         docSearch,
-        // @ts-expect-error
         await docSearch.execQuery(query, filterCrates, window.currentCrate),
         params.go_to_first,
-        // @ts-expect-error
         filterCrates);
 }
 
@@ -5421,16 +5423,17 @@ function registerSearchEvents() {
             }
             e.preventDefault();
         } else if (e.which === 40) { // down
-            // @ts-expect-error
-            const next = document.activeElement.nextElementSibling;
-            if (next) {
-                // @ts-expect-error
-                next.focus();
-            }
-            // @ts-expect-error
-            const rect = document.activeElement.getBoundingClientRect();
-            if (window.innerHeight - rect.bottom < rect.height) {
-                window.scrollBy(0, rect.height);
+            const active = document.activeElement;
+            if (active) {
+                const next = active.nextElementSibling;
+                if (next) {
+                    // @ts-expect-error
+                    next.focus();
+                }
+                const rect = active.getBoundingClientRect();
+                if (window.innerHeight - rect.bottom < rect.height) {
+                    window.scrollBy(0, rect.height);
+                }
             }
             e.preventDefault();
         } else if (e.which === 37) { // left
@@ -5454,7 +5457,9 @@ function registerSearchEvents() {
     });
 }
 
-// @ts-expect-error
+/**
+ * @param {Event & { target: HTMLInputElement }} ev
+ */
 function updateCrate(ev) {
     if (ev.target.value === "all crates") {
         // If we don't remove it from the URL, it'll be picked up again by the search.