From 09299b2237f77ca390bc04b3ce006733d0181c4b Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Sat, 19 Mar 2022 21:36:53 +0000
Subject: [PATCH] Fix object search

---
 sphinx/themes/basic/static/searchtools.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sphinx/themes/basic/static/searchtools.js b/sphinx/themes/basic/static/searchtools.js
index a37b7e55e..403718cd3 100644
--- a/sphinx/themes/basic/static/searchtools.js
+++ b/sphinx/themes/basic/static/searchtools.js
@@ -323,7 +323,8 @@ const Search = {
 
     const results = [];
 
-    const objectSearchCallback = (prefix, name) => {
+    const objectSearchCallback = (prefix, match) => {
+      const name = match[4]
       const fullname = (prefix ? prefix + "." : "") + name;
       const fullnameLower = fullname.toLowerCase();
       if (fullnameLower.indexOf(object) < 0) return;
@@ -338,7 +339,6 @@ const Search = {
       else if (parts.slice(-1)[0].indexOf(object) > -1)
         score += Scorer.objPartialMatch; // matches in last name
 
-      const match = objects[prefix][name];
       const objName = objNames[match[1]][2];
       const title = titles[match[0]];
 
@@ -375,8 +375,8 @@ const Search = {
       ]);
     };
     Object.keys(objects).forEach((prefix) =>
-      Object.keys(objects[prefix]).forEach((name) =>
-        objectSearchCallback(prefix, name)
+      objects[prefix].forEach((array) =>
+        objectSearchCallback(prefix, array)
       )
     );
     return results;