Bug 1825739 - Replace generic ESLint disable statements with specific and prettier ones in devtools. r=devtools-reviewers,nchevobbe

Differential Revision: https://phabricator.services.mozilla.com/D174225

.eslintignore

@@ -87,6 +87,12 @@ devtools/client/webconsole/test/browser/code_bundle_nosource.js
 devtools/client/webconsole/test/browser/code_bundle_invalidmap.js
 devtools/client/webconsole/test/browser/test-autocomplete-mapped.js
 devtools/client/webconsole/test/browser/test-autocomplete-mapped.src.js
+devtools/client/inspector/markup/test/shadowdom_open_debugger.min.js
+devtools/client/webconsole/test/browser/test-click-function-to-source*.js
+devtools/client/webconsole/test/browser/test-external-script-errors.js
+devtools/client/webconsole/test/browser/test-message-categories-canvas-css.js
+devtools/client/webconsole/test/browser/test-message-categories-empty-getelementbyid.js
+devtools/client/webconsole/test/browser/test-sourcemap*.js
 devtools/server/tests/xpcshell/setBreakpoint*
 devtools/server/tests/xpcshell/sourcemapped.js
 

.prettierignore

@@ -42,18 +42,17 @@ dom/base/test/file_bug687859-charset.js
 dom/base/test/file_bug687859-inherit.js
 
 # Ignore devtools debugger files
-# Keep in sync with devtools/client/debugger/.prettierignore
+devtools/client/debugger/src/test/examples/**
-devtools/client/debugger/src/workers/parser/tests/fixtures/functionNames.js
+devtools/client/debugger/src/test/integration/**
-devtools/client/debugger/src/workers/parser/tests/fixtures/scopes/*.js
+devtools/client/debugger/src/test/unit-sources/**
-devtools/client/debugger/src/workers/parser/tests/fixtures/pause/*.js
+devtools/client/debugger/src/**/fixtures/**
-devtools/client/debugger/src/test/mochitest/examples/babel/polyfill-bundle.js
+devtools/client/debugger/src/test/mochitest/**
-devtools/client/debugger/src/test/mochitest/examples/babel/fixtures/*/input.js
-devtools/client/debugger/src/test/mochitest/examples/babel/fixtures/*/output.js
-devtools/client/debugger/src/test/mochitest/examples/babel/fixtures/*/output.js.map
-devtools/client/debugger/src/test/mochitest/examples/ember/quickstart
 
 # These are source mapped and the locations are asserted in the test case.
 devtools/client/webconsole/test/browser/test-mangled-function.*
 
+# This file is based on another and we want to keep the syntax the same.
+devtools/shared/plural-form.js
+
 # Ignore backgroundtasks preferences files.
 toolkit/components/backgroundtasks/defaults

devtools/client/debugger/src/selectors/getCallStackFrames.js

@@ -45,8 +45,7 @@ export function formatCallStackFrames(
   return annotateFrames(formattedFrames);
 }
 
-// eslint-disable-next-line
+export const getCallStackFrames = createSelector(
-export const getCallStackFrames = (createSelector)(
   getCurrentThreadFrames,
   getSelectedSource,
   getBlackBoxRanges,

devtools/client/framework/test/browser_toolbox_toolbar_reorder_with_extension.js

@@ -46,9 +46,13 @@ add_task(async function() {
                            </body>
                          </html>`,
       "extension.js": async () => {
-        // eslint-disable-next-line
+        // eslint-disable-next-line no-undef
-        await browser.devtools.panels.create("extension", "fake-icon.png", "empty.html");
+        await browser.devtools.panels.create(
-        // eslint-disable-next-line
+          "extension",
+          "fake-icon.png",
+          "empty.html"
+        );
+        // eslint-disable-next-line no-undef
         browser.test.sendMessage("devtools-page-ready");
       },
       "empty.html": "",

devtools/client/inspector/markup/test/browser_markup_image_tooltip_mutations.js

@@ -6,9 +6,8 @@
 // Test that image preview tooltip shows updated content when the image src
 // changes.
 
-/*eslint-disable */
+// prettier-ignore
 const INITIAL_SRC = "data:image/png;base64,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";
-/* eslint-enable */
 
 const UPDATED_SRC = URL_ROOT + "doc_markup_tooltip.png";
 

devtools/client/inspector/markup/test/browser_markup_shadowdom_open_debugger_pretty_printed.js

@@ -34,7 +34,7 @@ add_task(async function() {
   const dbg = createDebuggerContext(toolbox);
 
   await waitForSelectedSource(dbg, "shadowdom_open_debugger.min.js");
-  await waitForSelectedLocation(dbg, 2);
+  await waitForSelectedLocation(dbg, 1);
 
   info("Pretty-print source.");
   clickElement(dbg, "prettyPrintButton");
@@ -49,5 +49,5 @@ add_task(async function() {
   customBadge.click();
 
   await waitForSelectedSource(dbg, "shadowdom_open_debugger.min.js:formatted");
-  await waitForSelectedLocation(dbg, 4);
+  await waitForSelectedLocation(dbg, 3);
 });

devtools/client/inspector/markup/test/helper_diff.js

@@ -25,8 +25,6 @@
  * THE SOFTWARE.
  */
 
-/* eslint-disable */
-
 /**
  * USAGE:
  *   diff(text1, text2);

devtools/client/inspector/markup/test/shadowdom_open_debugger.min.js

@@ -1,2 +1 @@
-/* eslint-disable */
 "use strict";customElements.define("test-component",class extends HTMLElement{constructor(){super();let shadowRoot=this.attachShadow({mode:"open"});shadowRoot.innerHTML="<slot>some default content</slot>"}connectedCallback(){}disconnectedCallback(){}});

devtools/client/shared/test/browser_outputparser.js

@@ -81,13 +81,12 @@ function makeColorTest(name, value, segments) {
         .map(([attr, v]) => `${attr}="${v}"`)
         .join(" ");
 
-      /* eslint-disable */
+      // prettier-ignore
       result.expected +=
         `<span data-color="${segment.name}">` +
           `<span ${buttonAttrString}></span>`+
           `<span>${segment.name}</span>` +
         `</span>`;
-      /* eslint-enable */
     }
   }
 
@@ -147,9 +146,7 @@ function testParseCssProperty(doc, parser) {
     // Test a very long property.
     makeColorTest(
       "background-image",
-      /* eslint-disable max-len */
       "linear-gradient(to left, transparent 0, transparent 5%,#F00 0, #F00 10%,#FF0 0, #FF0 15%,#0F0 0, #0F0 20%,#0FF 0, #0FF 25%,#00F 0, #00F 30%,#800 0, #800 35%,#880 0, #880 40%,#080 0, #080 45%,#088 0, #088 50%,#008 0, #008 55%,#FFF 0, #FFF 60%,#EEE 0, #EEE 65%,#CCC 0, #CCC 70%,#999 0, #999 75%,#666 0, #666 80%,#333 0, #333 85%,#111 0, #111 90%,#000 0, #000 95%,transparent 0, transparent 100%)",
-      /* eslint-enable max-len */
       [
         "linear-gradient(to left, ",
         { name: "transparent", colorFunction: "linear-gradient" },
@@ -548,29 +545,27 @@ function testParseVariable(doc, parser) {
       text: "var(--seen)",
       variables: { "--seen": "chartreuse" },
       expected:
-        /* eslint-disable */
+        // prettier-ignore
         '<span data-color="chartreuse">' +
           "<span>var(" +
             '<span data-variable="--seen = chartreuse">--seen</span>)' +
           "</span>" +
         "</span>",
-        /* eslint-enable */
     },
     {
       text: "var(--not-seen)",
       variables: {},
       expected:
-        /* eslint-disable */
+        // prettier-ignore
         "<span>var(" +
           '<span class="unmatched-class" data-variable="--not-seen is not set">--not-seen</span>' +
         ")</span>",
-        /* eslint-enable */
     },
     {
       text: "var(--seen, seagreen)",
       variables: { "--seen": "chartreuse" },
       expected:
-        /* eslint-disable */
+        // prettier-ignore
         '<span data-color="chartreuse">' +
           "<span>var(" +
             '<span data-variable="--seen = chartreuse">--seen</span>,' +
@@ -581,13 +576,12 @@ function testParseVariable(doc, parser) {
             "</span>)" +
           "</span>" +
         "</span>",
-        /* eslint-enable */
     },
     {
       text: "var(--not-seen, var(--seen))",
       variables: { "--seen": "chartreuse" },
       expected:
-        /* eslint-disable */
+        // prettier-ignore
         "<span>var(" +
           '<span class="unmatched-class" data-variable="--not-seen is not set">--not-seen</span>,' +
           "<span> " +
@@ -598,13 +592,12 @@ function testParseVariable(doc, parser) {
             "</span>" +
           "</span>)" +
         "</span>",
-        /* eslint-enable */
     },
     {
       text: "color-mix(in sgrb, var(--x), purple)",
       variables: { "--x": "yellow" },
       expected:
-        /* eslint-disable */
+        // prettier-ignore
         `color-mix(in sgrb, ` +
         `<span data-color="yellow">` +
           `<span class="test-class" style="background-color:yellow" tabindex="0" role="button" data-color-function="color-mix">` +
@@ -618,7 +611,6 @@ function testParseVariable(doc, parser) {
           `<span>purple</span>` +
         `</span>` +
         `)`,
-        /* eslint-enable */
       parserExtraOptions: {
         colorSwatchClass: COLOR_TEST_CLASS,
       },

devtools/client/webconsole/test/browser/test-click-function-to-source.js

@@ -1,4 +1,4 @@
-/* eslint-disable */
+// prettier-ignore
 
 /**
  * this

devtools/client/webconsole/test/browser/test-click-function-to-source.min.js

@@ -1,3 +1,3 @@
-/* eslint-disable */
+// prettier-ignore
 function foo(){console.log(foo)}
 //# sourceMappingURL=test-click-function-to-source.min.js.map

devtools/client/webconsole/test/browser/test-click-function-to-source.unmapped.min.js

@@ -1,2 +1,2 @@
-/* eslint-disable */
+// prettier-ignore
 function foo(){console.log(foo)}

devtools/client/webconsole/test/browser/test-external-script-errors.js

@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-/* eslint-disable */
-
 function f() {
   bogus.g();
 }

devtools/client/webconsole/test/browser/test-message-categories-canvas-css.js

@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-/* eslint-disable */
-
 window.addEventListener("DOMContentLoaded", function () {
   var canvas = document.querySelector("canvas");
   var context = canvas.getContext("2d");

devtools/client/webconsole/test/browser/test-message-categories-empty-getelementbyid.js

@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-/* eslint-disable */
-
 window.addEventListener("load", function () {
   document.getElementById("");
 });

devtools/client/webconsole/test/browser/test-sourcemap-original.js

@@ -1,4 +1,4 @@
-/* eslint-disable */
+// prettier-ignore
 
 /**
  * this

devtools/client/webconsole/test/browser/test-sourcemap.min.js

@@ -1,3 +1,3 @@
-/* eslint-disable */
+// prettier-ignore
 function logString(str){console.log(str)}function logTrace(){var logTraceInner=function(){console.trace()};logTraceInner()}
-//# sourceMappingURL=test-sourcemap.min.js.map
+//# sourceMappingURL=test-sourcemap.min.js.map

devtools/server/tests/xpcshell/test_blackboxing-01.js

@@ -97,7 +97,8 @@ const testBlackBox = async function() {
 };
 
 function evalCode() {
-  /* eslint-disable */
+  /* eslint-disable mozilla/var-only-at-top-level, no-undef */
+  // prettier-ignore
   Cu.evalInSandbox(
     "" + function doStuff(k) { // line 1
       var arg = 15;            // line 2 - Step in here
@@ -109,6 +110,7 @@ function evalCode() {
     1
   );
 
+  // prettier-ignore
   Cu.evalInSandbox(
     "" + function runTest() { // line 1
       doStuff(                // line 2 - Break here
@@ -124,7 +126,6 @@ function evalCode() {
     SOURCE_URL,
     1
   );
-  /* eslint-enable */
 }
 
 const runTest = async function(onSteppedLocation, onDebuggerStatementFrames) {

devtools/server/tests/xpcshell/test_breakpoint-01.js

@@ -41,7 +41,7 @@ function evaluateTestCode(debuggee) {
    * along with the debuggee's.
    */
   do_timeout(0, () => {
-    /* eslint-disable */
+    // prettier-ignore
     Cu.evalInSandbox(
       "var line0 = Error().lineNumber;\n" +
       "debugger;\n" + // line0 + 1
@@ -49,6 +49,5 @@ function evaluateTestCode(debuggee) {
       "var b = 2;\n", // line0 + 3
       debuggee
     );
-    /* eslint-enable */
   });
 }

devtools/server/tests/xpcshell/test_breakpoint-03.js

@@ -60,16 +60,15 @@ add_task(
 
       // Use `evalInSandbox` to make the debugger treat it as normal
       // globally-scoped code, where breakpoint sliding rules apply.
-      /* eslint-disable */
+      // prettier-ignore
-    Cu.evalInSandbox(
+      Cu.evalInSandbox(
-      "var line0 = Error().lineNumber;\n" +
+        "var line0 = Error().lineNumber;\n" +
-      "debugger;\n" +      // line0 + 1
+        "debugger;\n" +      // line0 + 1
-      "var a = 1;\n" +     // line0 + 2
+        "var a = 1;\n" +     // line0 + 2
-      "// A comment.\n" +  // line0 + 3
+        "// A comment.\n" +  // line0 + 3
-      "var b = 2;",        // line0 + 4
+        "var b = 2;",        // line0 + 4
-      debuggee
+        debuggee
-    );
+      );
-      /* eslint-enable */
     });
   })
 );

devtools/server/tests/xpcshell/test_breakpoint-04.js

@@ -42,7 +42,7 @@ add_task(
 );
 
 function evaluateTestCode(debuggee) {
-  /* eslint-disable */
+  // prettier-ignore
   Cu.evalInSandbox(
     "var line0 = Error().lineNumber;\n" +
     "function foo() {\n" + // line0 + 1
@@ -53,5 +53,4 @@ function evaluateTestCode(debuggee) {
     "foo();\n",            // line0 + 6
     debuggee
   );
-  /* eslint-disable */
 }

devtools/server/tests/xpcshell/test_breakpoint-05.js

@@ -45,7 +45,7 @@ add_task(
         });
       });
 
-      /* eslint-disable */
+      // prettier-ignore
       Cu.evalInSandbox(
         "var line0 = Error().lineNumber;\n" +
         "function foo() {\n" + // line0 + 1
@@ -57,7 +57,6 @@ add_task(
         "foo();\n",            // line0 + 7
         debuggee
       );
-      /* eslint-enable */
     });
   })
 );

devtools/server/tests/xpcshell/test_breakpoint-06.js

@@ -45,7 +45,7 @@ add_task(
         });
       });
 
-      /* eslint-disable */
+      // prettier-ignore
       Cu.evalInSandbox(
         "var line0 = Error().lineNumber;\n" +
         "function foo() {\n" +     // line0 + 1
@@ -63,7 +63,6 @@ add_task(
         "foo();\n",               // line0 + 13
         debuggee
       );
-      /* eslint-enable */
     });
   })
 );

devtools/server/tests/xpcshell/test_breakpoint-07.js

@@ -45,7 +45,7 @@ add_task(
         });
       });
 
-      /* eslint-disable */
+      // prettier-ignore
       Cu.evalInSandbox(
         "var line0 = Error().lineNumber;\n" +
         "function foo() {\n" + // line0 + 1
@@ -60,7 +60,6 @@ add_task(
         "foo();\n",           // line0 + 10
         debuggee
       );
-      /* eslint-enable */
     });
   })
 );

devtools/server/tests/xpcshell/test_breakpoint-08.js

@@ -52,7 +52,7 @@ add_task(
         threadFront.resume();
       });
 
-      /* eslint-disable */
+      // prettier-ignore
       Cu.evalInSandbox("var line0 = Error().lineNumber;\n" +
                        "function foo() {\n" + // line0 + 1
                        "  this.a = 1;\n" +    // line0 + 2
@@ -63,13 +63,13 @@ add_task(
                        "1.7",
                        "script1.js");
 
+      // prettier-ignore
       Cu.evalInSandbox("var line1 = Error().lineNumber;\n" +
                        "debugger;\n" +        // line1 + 1
                        "foo();\n",           // line1 + 2
                        debuggee,
                        "1.7",
                        "script2.js");
-      /* eslint-enable */
     });
   })
 );

devtools/server/tests/xpcshell/test_breakpoint-09.js

@@ -55,18 +55,17 @@ add_task(
 );
 
 function evaluateTestCode(debuggee) {
-  /* eslint-disable */
+  // prettier-ignore
-      Cu.evalInSandbox("var line0 = Error().lineNumber;\n" +
+  Cu.evalInSandbox("var line0 = Error().lineNumber;\n" +
-                       "function foo(stop) {\n" + // line0 + 1
+                    "function foo(stop) {\n" + // line0 + 1
-                       "  this.a = 1;\n" +        // line0 + 2
+                    "  this.a = 1;\n" +        // line0 + 2
-                       "  if (stop) return;\n" +  // line0 + 3
+                    "  if (stop) return;\n" +  // line0 + 3
-                       "  delete this.a;\n" +     // line0 + 4
+                    "  delete this.a;\n" +     // line0 + 4
-                       "  foo(true);\n" +         // line0 + 5
+                    "  foo(true);\n" +         // line0 + 5
-                       "}\n" +                    // line0 + 6
+                    "}\n" +                    // line0 + 6
-                       "debugger;\n" +            // line0 + 7
+                    "debugger;\n" +            // line0 + 7
-                       "foo();\n",                // line0 + 8
+                    "foo();\n",                // line0 + 8
-                       debuggee);
+                    debuggee);
-      /* eslint-enable */
   if (!done) {
     Assert.ok(false);
   }

devtools/server/tests/xpcshell/test_breakpoint-10.js

@@ -70,13 +70,12 @@ add_task(
 );
 
 function evaluateTestCode(debuggee) {
-  /* eslint-disable */
+  // prettier-ignore
-      Cu.evalInSandbox("var line0 = Error().lineNumber;\n" +
+  Cu.evalInSandbox("var line0 = Error().lineNumber;\n" +
-                       "debugger;\n" +                      // line0 + 1
+                   "debugger;\n" +                      // line0 + 1
-                       "var a, i = 0;\n" +                  // line0 + 2
+                   "var a, i = 0;\n" +                  // line0 + 2
-                       "for (i = 1; i <= 2; i++) {\n" +     // line0 + 3
+                   "for (i = 1; i <= 2; i++) {\n" +     // line0 + 3
-                       "  a = i;\n" +                       // line0 + 4
+                   "  a = i;\n" +                       // line0 + 4
-                       "}\n",                               // line0 + 5
+                   "}\n",                               // line0 + 5
-                       debuggee);
+                   debuggee);
-      /* eslint-enable */
 }

devtools/server/tests/xpcshell/test_breakpoint-11.js

@@ -68,11 +68,10 @@ add_task(
 );
 
 function evaluateTestCode(debuggee) {
-  /* eslint-disable */
+  // prettier-ignore
-      Cu.evalInSandbox("var line0 = Error().lineNumber;\n" +
+  Cu.evalInSandbox("var line0 = Error().lineNumber;\n" +
-                       "debugger;\n" +                      // line0 + 1
+                   "debugger;\n" +                      // line0 + 1
-                       "var a = { b: 1, f: function() { return 2; } };\n" + // line0+2
+                   "var a = { b: 1, f: function() { return 2; } };\n" + // line0+2
-                       "var res = a.f();\n",               // line0 + 3
+                   "var res = a.f();\n",               // line0 + 3
-                       debuggee);
+                   debuggee);
-      /* eslint-enable */
 }

devtools/server/tests/xpcshell/test_breakpoint-14.js

@@ -77,15 +77,14 @@ add_task(
 );
 
 function evaluateTestCode(debuggee) {
-  /* eslint-disable */
+  // prettier-ignore
-      Cu.evalInSandbox("var line0 = Error().lineNumber;\n" +
+  Cu.evalInSandbox("var line0 = Error().lineNumber;\n" +
-                       "function foo() {\n" + // line0 + 1
+                   "function foo() {\n" + // line0 + 1
-                       "  this.a = 1;\n" +    // line0 + 2 <-- Breakpoint is set here.
+                   "  this.a = 1;\n" +    // line0 + 2 <-- Breakpoint is set here.
-                       "}\n" +                // line0 + 3
+                   "}\n" +                // line0 + 3
-                       "debugger;\n" +        // line0 + 4
+                   "debugger;\n" +        // line0 + 4
-                       "foo();\n" +           // line0 + 5
+                   "foo();\n" +           // line0 + 5
-                       "debugger;\n" +        // line0 + 6
+                   "debugger;\n" +        // line0 + 6
-                       "var b = 2;\n",        // line0 + 7
+                   "var b = 2;\n",        // line0 + 7
-                       debuggee);
+                   debuggee);
-      /* eslint-enable */
 }

devtools/server/tests/xpcshell/test_breakpoint-16.js

@@ -44,13 +44,12 @@ add_task(
 );
 
 function evaluateTestCode(debuggee) {
-  /* eslint-disable */
+  // prettier-ignore
-      Cu.evalInSandbox(
+  Cu.evalInSandbox(
-        "var line0 = Error().lineNumber;\n" +
+    "var line0 = Error().lineNumber;\n" +
-        "(function () { debugger; this.acc = 0; for (var i = 0; i < 3; i++) this.acc++; }());",
+    "(function () { debugger; this.acc = 0; for (var i = 0; i < 3; i++) this.acc++; }());",
-        debuggee
+    debuggee
-      );
+  );
-      /* eslint-enable */
 }
 
 async function testAssertions(

devtools/server/tests/xpcshell/test_breakpoint-19.js

@@ -11,7 +11,8 @@
 const URL = "test.js";
 
 function setUpCode(debuggee) {
-  /* eslint-disable */
+  /* eslint-disable mozilla/var-only-at-top-level, no-unused-vars */
+  // prettier-ignore
   Cu.evalInSandbox(
     "" + function test() { // 1
       var a = 1;           // 2
@@ -22,7 +23,7 @@ function setUpCode(debuggee) {
     "1.8",
     URL
   );
-  /* eslint-enable */
+  /* eslint-enable mozilla/var-only-at-top-level, no-unused-vars */
 }
 
 add_task(

devtools/server/tests/xpcshell/test_breakpoint-21.js

@@ -36,9 +36,10 @@ add_task(
   })
 );
 
-/* eslint-disable */
 function evalCode(debuggee) {
   // Start a new script
+  /* eslint-disable mozilla/var-only-at-top-level, max-nested-callbacks, no-unused-vars */
+  // prettier-ignore
   Cu.evalInSandbox(
     "var line0 = Error().lineNumber;\n(" + function () {
       debugger;
@@ -57,4 +58,5 @@ function evalCode(debuggee) {
     } + ")()",
     debuggee
   );
+  /* eslint-enable mozilla/var-only-at-top-level, max-nested-callbacks, no-unused-vars */
 }

devtools/server/tests/xpcshell/test_ignore_caught_exceptions.js

@@ -35,7 +35,7 @@ add_task(
 );
 
 function evaluateTestCode(debuggee) {
-  /* eslint-disable */
+  // prettier-ignore
   try {
   Cu.evalInSandbox(`                    // 1
    debugger;                            // 2
@@ -50,5 +50,4 @@ function evaluateTestCode(debuggee) {
     1
   );
   } catch (e) {}
-  /* eslint-disable */
 }

devtools/server/tests/xpcshell/test_ignore_no_interface_exceptions.js

@@ -28,7 +28,7 @@ add_task(
 );
 
 function evaluateTestCode(debuggee) {
-  /* eslint-disable */
+  // prettier-ignore
   Cu.evalInSandbox(`                    // 1
     function QueryInterface() {         // 2
       throw Cr.NS_ERROR_NO_INTERFACE;   // 3
@@ -47,5 +47,4 @@ function evaluateTestCode(debuggee) {
     "test_ignore_no_interface_exceptions.js",
     1
   );
-  /* eslint-disable */
 }

devtools/server/tests/xpcshell/test_pause_exceptions-01.js

@@ -28,7 +28,8 @@ add_task(
 );
 
 function evaluateTestCode(debuggee) {
-  /* eslint-disable */
+  /* eslint-disable no-throw-literal */
+  // prettier-ignore
   debuggee.eval("(" + function () {
     function stopMe() {
       debugger;
@@ -38,5 +39,5 @@ function evaluateTestCode(debuggee) {
       stopMe();
     } catch (e) {}
   } + ")()");
-  /* eslint-enable */
+  /* eslint-enable no-throw-literal */
 }

devtools/server/tests/xpcshell/test_pause_exceptions-02.js

@@ -27,7 +27,8 @@ add_task(
 );
 
 function evaluateTestCode(debuggee) {
-  /* eslint-disable */
+  /* eslint-disable no-throw-literal */
+  // prettier-ignore
   debuggee.eval("(" + function () {    // 1
     function stopMe() {                // 2
       throw 42;                        // 3
@@ -36,5 +37,4 @@ function evaluateTestCode(debuggee) {
       stopMe();                        // 6
     } catch (e) {}                     // 7
   } + ")()");
-  /* eslint-enable */
 }

devtools/server/tests/xpcshell/test_pause_exceptions-03.js

@@ -35,7 +35,7 @@ add_task(
 );
 
 function evaluateTestCode(debuggee) {
-  /* eslint-disable */
+  // prettier-ignore
   Cu.evalInSandbox(
     `                                   // 1
     function stopMe() {                 // 2
@@ -50,5 +50,4 @@ function evaluateTestCode(debuggee) {
     "test_pause_exceptions-03.js",
     1
   );
-  /* eslint-disable */
 }

devtools/server/tests/xpcshell/test_pause_exceptions-04.js

@@ -76,7 +76,7 @@ add_task(
 async function evaluateTestCode(debuggee, throwValue) {
   await waitForTick();
   try {
-    /* eslint-disable */
+    // prettier-ignore
     Cu.evalInSandbox(
       `                                   // 1
       function stopMeAgain() {            // 2
@@ -89,6 +89,5 @@ async function evaluateTestCode(debuggee, throwValue) {
       "test_pause_exceptions-04.js",
       1
     );
-    /* eslint-enable */
   } catch (e) {}
 }

devtools/server/tests/xpcshell/test_promise_state-01.js

@@ -30,7 +30,8 @@ add_task(
 );
 
 function evalCode(debuggee) {
-  /* eslint-disable */
+  /* eslint-disable mozilla/var-only-at-top-level, no-unused-vars */
+  // prettier-ignore
   Cu.evalInSandbox(
     "doTest();\n" +
     function doTest() {
@@ -39,5 +40,5 @@ function evalCode(debuggee) {
     },
     debuggee
   );
-  /* eslint-enable */
+  /* eslint-enable mozilla/var-only-at-top-level, no-unused-vars */
 }

devtools/server/tests/xpcshell/test_promise_state-02.js

@@ -42,7 +42,8 @@ add_task(
 );
 
 function evalCode(debuggee) {
-  /* eslint-disable */
+  /* eslint-disable mozilla/var-only-at-top-level, no-unused-vars */
+  // prettier-ignore
   Cu.evalInSandbox(
     "doTest();\n" +
     function doTest() {
@@ -54,5 +55,5 @@ function evalCode(debuggee) {
     },
     debuggee
   );
-  /* eslint-enable */
+  /* eslint-enable mozilla/var-only-at-top-level, no-unused-vars */
 }

devtools/server/tests/xpcshell/test_promise_state-03.js

@@ -41,7 +41,8 @@ add_task(
 );
 
 function evalCode(debuggee) {
-  /* eslint-disable */
+  /* eslint-disable mozilla/var-only-at-top-level, no-unused-vars */
+  // prettier-ignore
   Cu.evalInSandbox(
     "doTest();\n" +
     function doTest() {
@@ -53,5 +54,5 @@ function evalCode(debuggee) {
     },
     debuggee
   );
-  /* eslint-enable */
+  /* eslint-enable mozilla/var-only-at-top-level, no-unused-vars */
 }

devtools/server/tests/xpcshell/test_stepping-02.js

@@ -43,7 +43,7 @@ add_task(
 );
 
 function evaluateTestCode(debuggee) {
-  /* eslint-disable */
+  // prettier-ignore
   Cu.evalInSandbox(
     `                                   // 1
     debugger;                           // 2
@@ -54,5 +54,4 @@ function evaluateTestCode(debuggee) {
     "test_stepping-01-test-code.js",
     1
   );
-  /* eslint-disable */
 }

devtools/server/tests/xpcshell/test_stepping-03.js

@@ -25,7 +25,7 @@ add_task(
 );
 
 function evaluateTestCode(debuggee) {
-  /* eslint-disable */
+  // prettier-ignore
   Cu.evalInSandbox(
     `                                   // 1
     function f() {                      // 2
@@ -40,5 +40,4 @@ function evaluateTestCode(debuggee) {
     "test_stepping-01-test-code.js",
     1
   );
-  /* eslint-disable */
 }

devtools/server/tests/xpcshell/test_stepping-04.js

@@ -32,7 +32,7 @@ add_task(
 );
 
 function evaluateTestCode(debuggee) {
-  /* eslint-disable */
+  // prettier-ignore
   Cu.evalInSandbox(
     `                                   // 1
     function f() {                      // 2
@@ -47,5 +47,4 @@ function evaluateTestCode(debuggee) {
     "test_stepping-01-test-code.js",
     1
   );
-  /* eslint-disable */
 }

devtools/server/tests/xpcshell/test_stepping-with-skip-breakpoints.js

@@ -70,7 +70,7 @@ add_task(
 );
 
 function evaluateTestCode(debuggee) {
-  /* eslint-disable */
+  // prettier-ignore
   Cu.evalInSandbox(
     `                                   // 1
     debugger;                           // 2
@@ -81,5 +81,4 @@ function evaluateTestCode(debuggee) {
     "test_stepping-01-test-code.js",
     1
   );
-  /* eslint-disable */
 }

devtools/server/tests/xpcshell/test_symbols-01.js

@@ -17,7 +17,8 @@ add_task(
 
 async function testSymbols(threadFront, debuggee) {
   const evalCode = () => {
-    /* eslint-disable */
+    /* eslint-disable mozilla/var-only-at-top-level, no-unused-vars */
+    // prettier-ignore
     Cu.evalInSandbox(
       "(" + function () {
         var symbolWithName = Symbol("Chris");
@@ -30,7 +31,7 @@ async function testSymbols(threadFront, debuggee) {
       URL,
       1
     );
-    /* eslint-enable */
+    /* eslint-enable mozilla/var-only-at-top-level, no-unused-vars */
   };
 
   const packet = await executeOnNextTickAndWaitForPause(evalCode, threadFront);

devtools/server/tests/xpcshell/test_symbols-02.js

@@ -17,7 +17,8 @@ add_task(
 
 async function testSymbols(threadFront, debuggee) {
   const evalCode = () => {
-    /* eslint-disable */
+    /* eslint-disable mozilla/var-only-at-top-level, no-extend-native, no-unused-vars */
+    // prettier-ignore
     Cu.evalInSandbox(
       "(" + function () {
         Symbol.prototype.toString = () => {
@@ -31,7 +32,7 @@ async function testSymbols(threadFront, debuggee) {
       URL,
       1
     );
-    /* eslint-enable */
+    /* eslint-enable mozilla/var-only-at-top-level, no-extend-native, no-unused-vars */
   };
 
   const packet = await executeOnNextTickAndWaitForPause(evalCode, threadFront);

devtools/shared/heapsnapshot/tests/xpcshell/test_ReadHeapSnapshot_worker.js

@@ -1,9 +1,10 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 // Test that we can read core dumps into HeapSnapshot instances in a worker.
-// eslint-disable-next-line
+add_task(async function() {
-add_task(async function () {
   const worker = new ChromeWorker("resource://test/heap-snapshot-worker.js");
   worker.postMessage({});
 

devtools/shared/heapsnapshot/tests/xpcshell/test_getCensusIndividuals_01.js

@@ -25,8 +25,8 @@ function run_test() {
         CensusUtils.countToBucketBreakdown(BREAKDOWN)
       );
 
-      /* eslint-disable */
       //                                DFS Index
+      // prettier-ignore
       return new Map([               // 0
         [stack1, {                   // 1
           JSObject: [101, 102, 103], // 2
@@ -45,7 +45,6 @@ function run_test() {
           JSString: [411, 412, 413], // 12
         }],
       ]);
-      /* eslint-enable */
     },
   };
 

tools/rewriting/ThirdPartyPaths.txt

@@ -12,6 +12,7 @@ devtools/client/shared/sourceeditor/codemirror/
 devtools/client/shared/sourceeditor/test/cm_mode_ruby.js
 devtools/client/shared/sourceeditor/test/codemirror/
 devtools/client/shared/vendor/
+devtools/client/inspector/markup/test/helper_diff.js
 devtools/shared/acorn/
 devtools/shared/heapsnapshot/CoreDump.pb.cc
 devtools/shared/heapsnapshot/CoreDump.pb.h