Bug 1489980 - Enable ESLint for editor/ - Manual fixes. r=masayuki

This enables the editor directory to be linted, and fixes the remaining issues raised by ESLint. Various rules were fixed here including, no-shadow, no-undef, no-unused-vars and others. I've generally gone conservative, disabling rules where it doesn't make sense to fix them (e.g. sometimes suggests use-services for tests, but it is only used once, or within a Chrome script). Depends on D5585 Differential Revision: https://phabricator.services.mozilla.com/D5587
bdekoz · Sep 13, 2018 · 475e2a9 · 475e2a9
1 parent a8c93f0
commit 475e2a9
Show file tree

Hide file tree

Showing 76 changed files with 249 additions and 238 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -6,6 +6,7 @@
 **/crashtests/**
 # Also ignore reftest - specially crafted to produce expected output.
 **/reftest/**
+**/reftests/**
 
 # Exclude expected objdirs.
 obj*/**
@@ -14,7 +15,6 @@ obj*/**
 # If you are enabling a directory, please add directory specific exclusions
 # below.
 docshell/**
-editor/**
 extensions/cookie/**
 extensions/spellcheck/**
 extensions/universalchardet/**
@@ -258,6 +258,9 @@ dom/xul/**
 # Third-party
 dom/media/webvtt/**
 
+# Third-party
+editor/libeditor/tests/browserscope/**
+
 # Third-party
 gfx/ots/**
 gfx/skia/**

diff --git a/editor/AsyncSpellCheckTestHelper.jsm b/editor/AsyncSpellCheckTestHelper.jsm
@@ -60,6 +60,7 @@ function onSpellCheck(editableElement, callback) {
     waitingForEnded = !waitingForEnded;
   }
 
+  // eslint-disable-next-line mozilla/use-services
   let os = Cc["@mozilla.org/observer-service;1"].
            getService(Ci.nsIObserverService);
   os.addObserver(observe, SPELL_CHECK_STARTED_TOPIC);

diff --git a/editor/composer/test/test_bug519928.html b/editor/composer/test/test_bug519928.html
@@ -5,14 +5,14 @@
 -->
 <head>
   <title>Test for Bug 519928</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=519928">Mozilla Bug 519928</a>
 <p id="display"></p>
 <div id="content">
-<iframe id="load-frame"></iframe>  
+<iframe id="load-frame"></iframe>
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
@@ -38,11 +38,13 @@
     is(self_.ICanRunMyJS, allowed, msg);
     callback();
   }, {once: true});
+  // eslint-disable-next-line no-useless-concat
   var iframeSrc = "<script>parent.parent.ICanRunMyJS = true;</scr" + "ipt>";
   innerFrame.srcdoc = iframeSrc;
 }
 
 SimpleTest.waitForExplicitFinish();
+/* eslint-disable max-nested-callbacks */
 addLoadEvent(function() {
   var enterDesignMode = function() { document.designMode = "on"; };
   var leaveDesignMode = function() { document.designMode = "off"; };
@@ -82,6 +84,7 @@
     });
   });
 });
+/* eslint-enable max-nested-callbacks */
 
 function testDocumentDisabledJS() {
   window.ICanRunMyJS = false;
@@ -105,6 +108,7 @@
     is(self_.ICanRunMyJS, false, msg);
     SimpleTest.finish();
   }, {once: true});
+  // eslint-disable-next-line no-useless-concat
   var iframeSrc = "<script>parent.parent.ICanRunMyJS = true;</scr" + "ipt>";
   innerFrame.srcdoc = iframeSrc;
 }

diff --git a/editor/libeditor/tests/.eslintrc.js b/editor/libeditor/tests/.eslintrc.js
@@ -4,5 +4,13 @@ module.exports = {
   "extends": [
     "plugin:mozilla/browser-test",
     "plugin:mozilla/mochitest-test",
-  ]
+  ],
+
+  "plugins": [
+    "no-unsanitized",
+  ],
+
+  "rules": {
+    "no-unsanitized/property": "off",
+  },
 };
diff --git a/editor/libeditor/tests/browser_bug629172.js b/editor/libeditor/tests/browser_bug629172.js
@@ -5,8 +5,8 @@ add_task(async function() {
   await BrowserTestUtils.withNewTab({
     gBrowser,
     url: kPageURL,
-  }, async function(aBrowser) {
-    await ContentTask.spawn(aBrowser, {}, async function() {
+  }, async function(browser) {
+    await ContentTask.spawn(browser, {}, async function() {
       var window = content.window.wrappedJSObject;
       var document = window.document;
 
@@ -50,8 +50,8 @@ add_task(async function() {
       return Promise.resolve();
     }
 
-    async function testDirection(initialDir, aBrowser) {
-      await ContentTask.spawn(aBrowser, {initialDir}, function({initialDir}) {
+    async function testDirection(initDir, aBrowser) {
+      await ContentTask.spawn(aBrowser, {initialDir: initDir}, function({initialDir}) {
         var window = content.window.wrappedJSObject;
         var document = window.document;
 
@@ -74,7 +74,7 @@ add_task(async function() {
         is(window.inputEventCount, 0, "input event count must be 0 before");
       });
       await simulateCtrlShiftX(aBrowser);
-      await ContentTask.spawn(aBrowser, {initialDir}, function({initialDir}) {
+      await ContentTask.spawn(aBrowser, {initialDir: initDir}, function({initialDir}) {
         var window = content.window.wrappedJSObject;
         var expectedDir = initialDir == "ltr" ? "rtl" : "ltr";
         is(window.t.getAttribute("dir"), expectedDir,
@@ -93,7 +93,7 @@ add_task(async function() {
         is(window.inputEventCount, 1, "input event count must be 1 before");
       });
       await simulateCtrlShiftX(aBrowser);
-      await ContentTask.spawn(aBrowser, {initialDir}, function({initialDir}) {
+      await ContentTask.spawn(aBrowser, {initialDir: initDir}, function({initialDir}) {
         var window = content.window.wrappedJSObject;
 
         is(window.inputEventCount, 2, "input event count must be 2 after");
@@ -111,7 +111,7 @@ add_task(async function() {
       });
     }
 
-    await testDirection("ltr", aBrowser);
-    await testDirection("rtl", aBrowser);
+    await testDirection("ltr", browser);
+    await testDirection("rtl", browser);
   });
 });
diff --git a/editor/libeditor/tests/file_select_all_without_body.html b/editor/libeditor/tests/file_select_all_without_body.html
@@ -17,7 +17,7 @@
   }
   root.appendChild(document.createTextNode("Mozilla"));
   root.focus();
-  cespan = document.createElementNS("http://www.w3.org/1999/xhtml", "span");
+  let cespan = document.createElementNS("http://www.w3.org/1999/xhtml", "span");
   cespan.setAttributeNS(null, "contenteditable", "true");
   root.appendChild(cespan);
   try {

diff --git a/editor/libeditor/tests/test_CF_HTML_clipboard.html b/editor/libeditor/tests/test_CF_HTML_clipboard.html
@@ -32,11 +32,10 @@
                  .QueryInterface(Ci.nsILoadContext);
   }
 
-  var cb = Cc["@mozilla.org/widget/clipboard;1"].
-           getService(Ci.nsIClipboard);
+  var cb = SpecialPowers.Services.clipboard;
 
   var counter = 0;
-  function copyCF_HTML_worker(success, failure) {
+  function copyCF_HTML_worker(successFn, failureFn) {
     if (++counter > 50) {
       ok(false, "Timed out while polling clipboard for pasted data");
       failure();
@@ -45,7 +44,7 @@
 
     var flavors = [CF_HTML];
     if (!cb.hasDataMatchingFlavors(flavors, flavors.length, cb.kGlobalClipboard)) {
-      setTimeout(function() { copyCF_HTML_worker(success, failure); }, 100);
+      setTimeout(function() { copyCF_HTML_worker(successFn, failureFn); }, 100);
       return;
     }
 
@@ -59,7 +58,7 @@
       trans.getTransferData(CF_HTML, data, {});
       data = SpecialPowers.wrap(data).value.QueryInterface(Ci.nsISupportsCString).data;
     } catch (e) {
-      setTimeout(function() { copyCF_HTML_worker(success, failure); }, 100);
+      setTimeout(function() { copyCF_HTML_worker(successFn, failureFn); }, 100);
       return;
     }
     success();

diff --git a/editor/libeditor/tests/test_backspace_vs.html b/editor/libeditor/tests/test_backspace_vs.html
@@ -51,7 +51,7 @@
   edit.focus();
   var sel = window.getSelection();
   sel.collapse(edit.childNodes[0], edit.textContent.length - 1);
-  for (i = 0; i < bsCount; ++i) {
+  for (let i = 0; i < bsCount; ++i) {
     synthesizeKey("KEY_Backspace");
   }
   is(edit.textContent, "ab", "The backspace key should delete the characters correctly");
@@ -92,7 +92,7 @@
    * Once the Firefox Emoji font is ready, we can load that via @font-face
    * and expect these tests to work across all platforms.
    */
-  hasEmojiFont =
+  let hasEmojiFont =
     (navigator.platform.indexOf("Mac") == 0 &&
      /10\.([7-9]|[1-9][0-9])/.test(navigator.oscpu));
 

diff --git a/editor/libeditor/tests/test_bug1053048.html b/editor/libeditor/tests/test_bug1053048.html
@@ -27,10 +27,10 @@
     var selectionListener = {
       count: 0,
       notifySelectionChanged(aDocument, aSelection, aReason) {
-      ok(true, "selectionStart: " + textarea.selectionStart);
-      ok(true, "selectionEnd: " + textarea.selectionEnd);
-      this.count++;
-    },
+        ok(true, "selectionStart: " + textarea.selectionStart);
+        ok(true, "selectionEnd: " + textarea.selectionEnd);
+        this.count++;
+      },
     };
 
     // Move caret to the end of the textarea

diff --git a/editor/libeditor/tests/test_bug1100966.html b/editor/libeditor/tests/test_bug1100966.html
@@ -34,9 +34,9 @@
 
   getSpellChecker().UpdateCurrentDictionary(() => {
     sendString(" ");
-    setTimeout(function() {
+    SimpleTest.executeSoon(function() {
       sendString("a");
-      setTimeout(function() {
+      SimpleTest.executeSoon(function() {
         synthesizeKey("KEY_Backspace");
 
         onSpellCheck(div, function() {
@@ -47,13 +47,12 @@
 
           SimpleTest.finish();
         });
-      }, 0);
-    }, 0);
+      });
+    });
   });
 });
 
 function getEditor() {
-  var Ci = SpecialPowers.Ci;
   var editingSession = SpecialPowers.wrap(window).docShell.editingSession;
   return editingSession.getEditorForWindow(window);
 }

diff --git a/editor/libeditor/tests/test_bug1102906.html b/editor/libeditor/tests/test_bug1102906.html
@@ -22,7 +22,7 @@
   SimpleTest.waitForFocus( () => {
     let content = document.getElementById("content");
     let drag = document.getElementById("drag");
-      let selection = window.getSelection();
+    let selection = window.getSelection();
 
     /* Perform drag-and-drop for an arbitrary content. The caret should be at
        the end of the contenteditable. */

diff --git a/editor/libeditor/tests/test_bug1154791.html b/editor/libeditor/tests/test_bug1154791.html
@@ -34,9 +34,9 @@
     synthesizeKey("KEY_ArrowLeft");
     synthesizeKey("KEY_ArrowLeft");
 
-    setTimeout(function() {
+    SimpleTest.executeSoon(function() {
       synthesizeKey("KEY_Backspace");
-      setTimeout(function() {
+      SimpleTest.executeSoon(function() {
         sendString(" ");
 
         onSpellCheck(div, function() {
@@ -47,13 +47,12 @@
 
           SimpleTest.finish();
         });
-      }, 0);
-    }, 0);
+      });
+    });
   });
 });
 
 function getEditor() {
-  var Ci = SpecialPowers.Ci;
   var editingSession = SpecialPowers.wrap(window).docShell.editingSession;
   return editingSession.getEditorForWindow(window);
 }

diff --git a/editor/libeditor/tests/test_bug1230473.html b/editor/libeditor/tests/test_bug1230473.html
@@ -32,12 +32,12 @@
     }
     function isComposing() {
       return isNSEditableElement() ? SpecialPowers.wrap(aEditor)
-                                                   .editor
-                                                   .composing :
-                                      SpecialPowers.wrap(window)
-                                                   .docShell
-                                                   .editor
-                                                   .composing;
+                                                  .editor
+                                                  .composing :
+                                     SpecialPowers.wrap(window)
+                                                  .docShell
+                                                  .editor
+                                                  .composing;
     }
     function clear() {
       if (isNSEditableElement()) {

diff --git a/editor/libeditor/tests/test_bug1257363.html b/editor/libeditor/tests/test_bug1257363.html
@@ -96,8 +96,8 @@
   div.focus();
   synthesizeMouse(div, 100, 2, {}); /* click behind and down */
 
-  var sel = window.getSelection();
-  var selRange = sel.getRangeAt(0);
+  sel = window.getSelection();
+  selRange = sel.getRangeAt(0);
   is(selRange.endContainer.nodeName, "#text", "selection should be at the end of text node");
   is(selRange.endOffset, 1, "offset should be 1");
 
@@ -136,8 +136,8 @@
   div.focus();
   synthesizeMouse(div, 100, 2, {}); /* click behind and down */
 
-  var sel = window.getSelection();
-  var selRange = sel.getRangeAt(0);
+  sel = window.getSelection();
+  selRange = sel.getRangeAt(0);
   is(selRange.endContainer.nodeName, "#text", "selection should be at the end of text node");
   is(selRange.endOffset, 1, "offset should be 1");
 

diff --git a/editor/libeditor/tests/test_bug1258085.html b/editor/libeditor/tests/test_bug1258085.html
@@ -55,7 +55,7 @@
   synthesizeKey("KEY_ArrowRight");
   synthesizeKey("KEY_ArrowRight");
   synthesizeKey("KEY_Backspace");
-  if (div.innerHTML, "x<br> ", "pre-wrap: Don't delete uncollapsed space");
+  is(div.innerHTML, "x<br> ", "pre-wrap: Don't delete uncollapsed space");
   ok(getSelection().isCollapsed, "pre-wrap: Selection must be collapsed");
   is(getSelection().focusNode, div.lastChild,
      "pre-wrap: Focus must be in final text node");

diff --git a/editor/libeditor/tests/test_bug1270235.html b/editor/libeditor/tests/test_bug1270235.html
@@ -23,7 +23,7 @@
   element.focus();
   let textNode = element.firstChild.firstChild;
   let node = textNode.splitText(0);
-  node.parentNode.removeChild(node);
+  node.remove();
 
   ok(!node.parentNode, "parent must be null");
 

diff --git a/editor/libeditor/tests/test_bug1306532.html b/editor/libeditor/tests/test_bug1306532.html
@@ -8,6 +8,10 @@
 <script class="testbody" type="application/javascript">
 
 function runTest() {
+  const headingone = document.getElementById("headingone");
+  const celltwo = document.getElementById("celltwo");
+  const pasteframe = document.getElementById("pasteframe");
+
   // Copy content from table.
   var selection = getSelection();
   var startRange = document.createRange();

diff --git a/editor/libeditor/tests/test_bug1315065.html b/editor/libeditor/tests/test_bug1315065.html
@@ -55,13 +55,13 @@
     }
   }
 
-  for (var i = 0; i < 4; i++) {
+  for (let i = 0; i < 4; i++) {
     const kDescription = i == 0 ? "Backspace from immediately after the last character" :
                                   "Backspace from " + i + "th empty text node";
     editor.focus();
     initForBackspace(i);
     synthesizeKey("KEY_Backspace");
-    var p = document.getElementById("p");
+    let p = document.getElementById("p");
     ok(p, kDescription + ": <p> element shouldn't be removed by Backspace key press");
     is(p.tagName.toLowerCase(), "p", kDescription + ": <p> element shouldn't be removed by Backspace key press");
     // When Backspace key is pressed even in empty text nodes, Gecko should not remove empty text nodes for now
@@ -112,7 +112,7 @@
     }
   }
 
-  for (var i = 0; i < 4; i++) {
+  for (let i = 0; i < 4; i++) {
     const kDescription = i == 0 ? "Delete from immediately before the first character" :
                                   "Delete from " + i + "th empty text node";
     editor.focus();

diff --git a/editor/libeditor/tests/test_bug1318312.html b/editor/libeditor/tests/test_bug1318312.html
@@ -16,6 +16,7 @@
 <script class="testbody" type="text/javascript">
 
 var outerEditor = document.getElementById("outerEditor");
+var innerEditor = document.getElementById("innerEditor");
 
 function runTests() {
   outerEditor.focus();

diff --git a/editor/libeditor/tests/test_bug1330796.html b/editor/libeditor/tests/test_bug1330796.html
@@ -68,7 +68,7 @@
   var theEdit = document.getElementById("editable");
   makeMailEditor();
 
-  for (i = 0; i < tests.length; i++) {
+  for (let i = 0; i < tests.length; i++) {
     theEdit.innerHTML = tests[i][0];
     theEdit.focus();
     var theText = theEdit.firstChild.firstChild;