From 44fdf3c6b030716c8f5ce2a533b7ebf5cffbb11b Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Sat, 1 Apr 2023 16:40:01 +0000
Subject: [PATCH] Bug 1825715 - Replace disabling of ESLint rule
 prettier/prettier with prettier-specific disabling (other).
 r=Gijs,necko-reviewers,credential-management-reviewers,devtools-reviewers,dimi

Differential Revision: https://phabricator.services.mozilla.com/D174217
---
 .../content-src/components/ASRouterAdmin/ASRouterAdmin.jsx  | 3 +--
 .../newtab/data/content/activity-stream.bundle.js           | 2 +-
 devtools/client/debugger/src/components/shared/Dropdown.js  | 1 -
 dom/serviceworkers/test/fetch/deliver-gzip.sjs              | 4 +---
 layout/style/test/redundant_font_download.sjs               | 4 ++--
 netwerk/test/unit/test_idn_spoof.js                         | 3 +--
 .../tests/Harness_sanity/test_SpecialPowersSandbox.html     | 1 -
 .../tests/Harness_sanity/test_SpecialPowersSpawn.html       | 3 +--
 .../tests/Harness_sanity/test_SpecialPowersSpawnChrome.html | 2 --
 .../antitracking/test/browser/browser_socialtracking.js     | 2 --
 toolkit/components/passwordmgr/NewPasswordModel.jsm         | 6 ++----
 toolkit/components/passwordmgr/SignUpFormRuleset.jsm        | 6 ++----
 toolkit/components/utils/ClientEnvironment.sys.mjs          | 3 +--
 13 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx b/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
index 4e3bd3b518ed..8cd46919114a 100644
--- a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
+++ b/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
@@ -1155,8 +1155,7 @@ export class ASRouterAdminInner extends React.PureComponent {
         >
           Unblock All Snippets
         </button>
-        {/* eslint-disable-next-line prettier/prettier */}
-        Show messages from {/* eslint-disable-next-line jsx-a11y/no-onchange */}
+        Show messages from{" "}
         <select
           value={this.state.messageFilter}
           onChange={this.onChangeMessageFilter}
diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js
index fd7ae3c9c791..dc08dc472d20 100644
--- a/browser/components/newtab/data/content/activity-stream.bundle.js
+++ b/browser/components/newtab/data/content/activity-stream.bundle.js
@@ -1711,7 +1711,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent {
     return /*#__PURE__*/external_React_default().createElement("p", null, /*#__PURE__*/external_React_default().createElement("button", {
       className: "unblock-all ASRouterButton test-only",
       onClick: this.unblockAll
-    }, "Unblock All Snippets"), "Show messages from ", /*#__PURE__*/external_React_default().createElement("select", {
+    }, "Unblock All Snippets"), "Show messages from", " ", /*#__PURE__*/external_React_default().createElement("select", {
       value: this.state.messageFilter,
       onChange: this.onChangeMessageFilter
     }, /*#__PURE__*/external_React_default().createElement("option", {
diff --git a/devtools/client/debugger/src/components/shared/Dropdown.js b/devtools/client/debugger/src/components/shared/Dropdown.js
index 83ecfaf38807..7051cec9c58b 100644
--- a/devtools/client/debugger/src/components/shared/Dropdown.js
+++ b/devtools/client/debugger/src/components/shared/Dropdown.js
@@ -41,7 +41,6 @@ export class Dropdown extends Component {
 
   renderButton() {
     return (
-      // eslint-disable-next-line prettier/prettier
       <button className="dropdown-button" onClick={this.toggleDropdown}>
         {this.props.icon}
       </button>
diff --git a/dom/serviceworkers/test/fetch/deliver-gzip.sjs b/dom/serviceworkers/test/fetch/deliver-gzip.sjs
index 31d2a71f7a5e..d7cbdef06e23 100644
--- a/dom/serviceworkers/test/fetch/deliver-gzip.sjs
+++ b/dom/serviceworkers/test/fetch/deliver-gzip.sjs
@@ -2,14 +2,12 @@
 
 function handleRequest(request, response) {
   // The string "hello" repeated 10 times followed by newline. Compressed using gzip.
-  /* eslint-disable prettier/prettier */
+  // prettier-ignore
   let bytes = [0x1f, 0x8b, 0x08, 0x08, 0x4d, 0xe2, 0xf9, 0x54, 0x00, 0x03, 0x68,
                0x65, 0x6c, 0x6c, 0x6f, 0x00, 0xcb, 0x48, 0xcd, 0xc9, 0xc9, 0xcf,
                0x20, 0x85, 0xe0, 0x02, 0x00, 0xf5, 0x4b, 0x38, 0xcf, 0x33, 0x00,
                0x00, 0x00];
 
-  /* eslint-enable prettier/prettier */
-
   response.setHeader("Content-Encoding", "gzip", false);
   response.setHeader("Content-Length", "" + bytes.length, false);
   response.setHeader("Content-Type", "text/plain", false);
diff --git a/layout/style/test/redundant_font_download.sjs b/layout/style/test/redundant_font_download.sjs
index ed48bcfe8580..b2567d2ae019 100644
--- a/layout/style/test/redundant_font_download.sjs
+++ b/layout/style/test/redundant_font_download.sjs
@@ -7,7 +7,7 @@ const BinaryOutputStream = Components.Constructor(
 );
 
 // this is simply a hex dump of a red square .PNG image
-/* eslint-disable prettier/prettier */
+// prettier-ignore
 const RED_SQUARE =
   [
     0x89,  0x50,  0x4E,  0x47,  0x0D,  0x0A,  0x1A,  0x0A,  0x00,  0x00,
@@ -22,7 +22,7 @@ const RED_SQUARE =
     0xA3,  0xC4,  0x01,  0x3F,  0x58,  0x1D,  0xEF,  0x27,  0x00,  0x00,
     0x00,  0x00,  0x49,  0x45,  0x4E,  0x44,  0xAE,  0x42,  0x60,  0x82
   ];
-/* eslint-enable prettier/prettier */
+
 function handleRequest(request, response) {
   let query = {};
   request.queryString.split("&").forEach(function(val) {
diff --git a/netwerk/test/unit/test_idn_spoof.js b/netwerk/test/unit/test_idn_spoof.js
index b14ce9ade587..8512d3272e83 100644
--- a/netwerk/test/unit/test_idn_spoof.js
+++ b/netwerk/test/unit/test_idn_spoof.js
@@ -16,7 +16,7 @@ const kSafe = 1;
 const kUnsafe = 2;
 const kInvalid = 3;
 
-/* eslint-disable prettier/prettier */
+// prettier-ignore
 let testCases = [
   // No IDN
   ["www.google.com", "www.google.com", kSafe],
@@ -1012,7 +1012,6 @@ let testCases = [
   //    Chromium's IDN encoder/decoder to generate test files loses an
   //    advantage of having Python's IDN encode/decode the tests.
 ];
-/* eslint-enable prettier/prettier */
 
 function checkEquals(a, b, message, expectedFail) {
   if (!expectedFail) {
diff --git a/testing/mochitest/tests/Harness_sanity/test_SpecialPowersSandbox.html b/testing/mochitest/tests/Harness_sanity/test_SpecialPowersSandbox.html
index 11033d20861b..7946a18236f2 100644
--- a/testing/mochitest/tests/Harness_sanity/test_SpecialPowersSandbox.html
+++ b/testing/mochitest/tests/Harness_sanity/test_SpecialPowersSandbox.html
@@ -16,7 +16,6 @@
  * report the correct diagnostics in the caller scope.
  */
 
-/* eslint-disable prettier/prettier */
 /* globals SpecialPowers, Assert */
 
 async function interceptDiagnostics(func) {
diff --git a/testing/mochitest/tests/Harness_sanity/test_SpecialPowersSpawn.html b/testing/mochitest/tests/Harness_sanity/test_SpecialPowersSpawn.html
index 851b9195610b..fe93c1fe835c 100644
--- a/testing/mochitest/tests/Harness_sanity/test_SpecialPowersSpawn.html
+++ b/testing/mochitest/tests/Harness_sanity/test_SpecialPowersSpawn.html
@@ -12,7 +12,6 @@
 <span id="hello">World.</span>
 
 <script>
-/* eslint-disable prettier/prettier */
 /* globals SpecialPowers, content */
 
   add_task(async function() {
@@ -55,7 +54,7 @@
 
     is(result, "Hello there.", "Got correct element text from browsing context");
 
-    let line = 59; // Keep this in sync with the line number where the callback function starts.
+    let line = 58; // Keep this in sync with the line number where the callback function starts.
     let callback = () => {
       let e = new Error("Hello.");
       return { filename: e.fileName, lineNumber: e.lineNumber };
diff --git a/testing/mochitest/tests/Harness_sanity/test_SpecialPowersSpawnChrome.html b/testing/mochitest/tests/Harness_sanity/test_SpecialPowersSpawnChrome.html
index 0281a251a771..9c3f1ee6584c 100644
--- a/testing/mochitest/tests/Harness_sanity/test_SpecialPowersSpawnChrome.html
+++ b/testing/mochitest/tests/Harness_sanity/test_SpecialPowersSpawnChrome.html
@@ -8,8 +8,6 @@
 <body>
 
 <script>
-/* eslint-disable prettier/prettier */
-
   add_task(async function() {
     let { browsingContextId, innerWindowId } = await SpecialPowers.spawnChrome([12, { b: 42 }], (a, b) => {
       Assert.equal(a, 12, "Arg 1");
diff --git a/toolkit/components/antitracking/test/browser/browser_socialtracking.js b/toolkit/components/antitracking/test/browser/browser_socialtracking.js
index 9c5e598a8884..1cbf5d927875 100644
--- a/toolkit/components/antitracking/test/browser/browser_socialtracking.js
+++ b/toolkit/components/antitracking/test/browser/browser_socialtracking.js
@@ -1,5 +1,3 @@
-/* eslint-disable prettier/prettier */
-
 function runTest(obj) {
   add_task(async _ => {
     info("Test: " + obj.testName);
diff --git a/toolkit/components/passwordmgr/NewPasswordModel.jsm b/toolkit/components/passwordmgr/NewPasswordModel.jsm
index 3743ba3d83ad..9e8772d4a2ae 100644
--- a/toolkit/components/passwordmgr/NewPasswordModel.jsm
+++ b/toolkit/components/passwordmgr/NewPasswordModel.jsm
@@ -279,10 +279,8 @@ function makeRuleset(coeffs, biases) {
     );
 
     // Use the selector to grab the descendants:
-    return setDefault(
-      selectorToDescendants, // eslint-disable-line prettier/prettier
-      selector,
-      () => Array.from(element.querySelectorAll(selector))
+    return setDefault(selectorToDescendants, selector, () =>
+      Array.from(element.querySelectorAll(selector))
     );
   }
 
diff --git a/toolkit/components/passwordmgr/SignUpFormRuleset.jsm b/toolkit/components/passwordmgr/SignUpFormRuleset.jsm
index bcc18d5d562b..b907b4563d9c 100644
--- a/toolkit/components/passwordmgr/SignUpFormRuleset.jsm
+++ b/toolkit/components/passwordmgr/SignUpFormRuleset.jsm
@@ -381,10 +381,8 @@ function createRuleset(coeffs, biases) {
       () => new Map()
     );
 
-    return setDefault(
-      selectorToDescendants, // eslint-disable-line prettier/prettier
-      selector,
-      () => Array.from(element.querySelectorAll(selector))
+    return setDefault(selectorToDescendants, selector, () =>
+      Array.from(element.querySelectorAll(selector))
     );
   }
   function clearCache() {
diff --git a/toolkit/components/utils/ClientEnvironment.sys.mjs b/toolkit/components/utils/ClientEnvironment.sys.mjs
index 9e3ece3bfff8..db7062b0b585 100644
--- a/toolkit/components/utils/ClientEnvironment.sys.mjs
+++ b/toolkit/components/utils/ClientEnvironment.sys.mjs
@@ -6,7 +6,6 @@ import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
 
 const lazy = {};
 
-/* eslint-disable prettier/prettier */
 ChromeUtils.defineModuleGetter(
   lazy,
   "ShellService",
@@ -22,7 +21,7 @@ ChromeUtils.defineModuleGetter(
   "NormandyUtils",
   "resource://normandy/lib/NormandyUtils.jsm"
 );
-/* eslint-enable prettier/prettier */
+
 ChromeUtils.defineESModuleGetters(lazy, {
   TelemetryArchive: "resource://gre/modules/TelemetryArchive.sys.mjs",
   TelemetryController: "resource://gre/modules/TelemetryController.sys.mjs",