From 349ae52b9c0bea2cc0aa40966f4b97f3e9fae2de Mon Sep 17 00:00:00 2001
From: abaevbog <bogdan@zotero.org>
Date: Sun, 3 Mar 2024 23:55:32 -0500
Subject: [PATCH] fx115: working autocomplete (#3789)

- autocomplete registration removed from chrome.manifest
- static registration happening in zotero.js
- tweaks to autocomplete methods to implement nsIAutoCompleteSearch based on
https://searchfox.org/mozilla-central/source/toolkit/components/autocomplete/tests/unit/test_378079.js#154
---
 chrome.manifest                               |  3 ---
 chrome/content/zotero/xpcom/zotero.js         |  5 ++++
 .../content/zotero}/zotero-autocomplete.js    | 24 +++++++++++++------
 3 files changed, 22 insertions(+), 10 deletions(-)
 rename {components => chrome/content/zotero}/zotero-autocomplete.js (94%)

diff --git a/chrome.manifest b/chrome.manifest
index bf39691f25..d4c5700ca0 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -63,9 +63,6 @@ locale	zotero	zh-TW		chrome/locale/zh-TW/zotero/
 
 skin		zotero	default		chrome/skin/default/zotero/
 
-component	{06a2ed11-d0a4-4ff0-a56f-a44545eee6ea}			components/zotero-autocomplete.js
-contract	@mozilla.org/autocomplete/search;1?name=zotero 	{06a2ed11-d0a4-4ff0-a56f-a44545eee6ea}
-
 # Scaffold
 content scaffold             chrome/content/scaffold/
 locale  scaffold   en-US     chrome/locale/en-US/scaffold/
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index 33b665e1bc..1d682f7750 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -674,6 +674,11 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
 			);
 			ZoteroProtocolHandler.init();
 
+			const { ZoteroAutoComplete } = ChromeUtils.import(
+				`chrome://zotero/content/zotero-autocomplete.js`
+			);
+			ZoteroAutoComplete.init();
+
 			yield Zotero.Users.init();
 			yield Zotero.Libraries.init();
 			
diff --git a/components/zotero-autocomplete.js b/chrome/content/zotero/zotero-autocomplete.js
similarity index 94%
rename from components/zotero-autocomplete.js
rename to chrome/content/zotero/zotero-autocomplete.js
index 83bbcf26f3..a607b888c8 100644
--- a/components/zotero-autocomplete.js
+++ b/chrome/content/zotero/zotero-autocomplete.js
@@ -24,6 +24,7 @@
 */
 
 const ZOTERO_AC_CID = Components.ID('{06a2ed11-d0a4-4ff0-a56f-a44545eee6ea}');
+const EXPORTED_SYMBOLS = ['ZoteroAutoComplete'];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
@@ -31,9 +32,7 @@ const Cr = Components.results;
 
 Components.utils.import("resource://gre/modules/ComponentUtils.jsm");
 
-var Zotero = Components.classes["@zotero.org/Zotero;1"]
-	.getService(Components.interfaces.nsISupports)
-	.wrappedJSObject;
+var { Zotero } = ChromeUtils.importESModule("chrome://zotero/content/zotero.mjs");
 
 /*
  * Implements nsIAutoCompleteSearch
@@ -340,6 +339,9 @@ ZoteroAutoComplete.prototype.updateResults = function (values, ids, ongoing, res
 	this._listener.onSearchResult(this, this._result);
 }
 
+ZoteroAutoComplete.prototype.createInstance = function (iid) {
+	return this.QueryInterface(iid);
+};
 
 // FIXME
 ZoteroAutoComplete.prototype.stopSearch = function(){
@@ -347,14 +349,22 @@ ZoteroAutoComplete.prototype.stopSearch = function(){
 	this._cancelled = true;
 }
 
+// Static
+ZoteroAutoComplete.init = function () {
+	let search = new ZoteroAutoComplete();
+	var name = "@mozilla.org/autocomplete/search;1?name=zotero";
+	var componentManager = Components.manager.QueryInterface(
+		Ci.nsIComponentRegistrar
+	);
+	componentManager.registerFactory(ZOTERO_AC_CID, "", name, search);
+};
+
 //
 // XPCOM goop
 //
 
 ZoteroAutoComplete.prototype.classID = ZOTERO_AC_CID;
 ZoteroAutoComplete.prototype.QueryInterface = ChromeUtils.generateQI([
-	Components.interfaces.nsIAutoCompleteSearch,
-	Components.interfaces.nsIAutoCompleteObserver
+	"nsIFactory",
+	"nsIAutoCompleteSearch"
 ]);
-
-var NSGetFactory = ComponentUtils.generateNSGetFactory([ZoteroAutoComplete]);