nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1860988 - Enable ESLint rule object-shorthand on remaining parts of dom/*. r=dom-core,mccr8

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D191849
This commit is contained in:
Mark Banner 2023-10-27 12:43:04 +00:00
parent 6119729476
commit 21e52b9399
18 changed files with 26 additions and 47 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

21
.eslintrc.js
View file

@ -508,32 +508,12 @@ module.exports = {
},
{
files: [
"dom/base/test/chrome/file_bug549682.xhtml",
"dom/base/test/chrome/file_bug616841.xhtml",
"dom/base/test/chrome/test_bug1098074_throw_from_ReceiveMessage.xhtml",
"dom/base/test/chrome/test_bug429785.xhtml",
"dom/base/test/chrome/test_bug467123.xhtml",
"dom/base/test/chrome/test_bug683852.xhtml",
"dom/base/test/chrome/test_bug800386.xhtml",
"dom/base/test/chrome/test_bug884693.xhtml",
"dom/base/test/chrome/test_domparsing.xhtml",
"dom/base/test/chrome/window_nsITextInputProcessor.xhtml",
"dom/base/test/chrome/window_swapFrameLoaders.xhtml",
"dom/base/test/test_domrequesthelper.xhtml",
"dom/bindings/test/test_bug1123516_maplikesetlikechrome.xhtml",
"dom/console/tests/test_jsm.xhtml",
"dom/events/test/test_bug415498.xhtml",
"dom/events/test/test_bug602962.xhtml",
"dom/notification/test/chrome/test_notification_system_principal.xhtml",
"dom/serviceworkers/test/test_serviceworkerinfo.xhtml",
"dom/serviceworkers/test/test_serviceworkermanager.xhtml",
"dom/tests/mochitest/chrome/sizemode_attribute.xhtml",
"dom/tests/mochitest/chrome/test_cyclecollector.xhtml",
"dom/workers/test/test_WorkerDebugger.xhtml",
"dom/workers/test/test_WorkerDebugger_console.xhtml",
"dom/workers/test/test_fileReadSlice.xhtml",
"dom/workers/test/test_fileReaderSync.xhtml",
"dom/workers/test/test_fileSlice.xhtml",
],
rules: {
"mozilla/use-services": "off",
@ -542,7 +522,6 @@ module.exports = {
"no-redeclare": "off",
"no-shadow": "off",
"no-throw-literal": "off",
"object-shorthand": "off",
},
},
{

4
dom/base/test/chrome/file_bug549682.xhtml
View file

@ -93,7 +93,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=549682
var weakListener = {
QueryInterface: ChromeUtils.generateQI(["nsISupportsWeakReference"]),
receiveMessage: function(msg) {
receiveMessage(msg) {
if (weakMessageReceived) {
ok(false, 'Weak listener fired twice.');
return;
@ -109,7 +109,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=549682
var weakListener2 = {
QueryInterface: ChromeUtils.generateQI(["nsISupportsWeakReference"]),
receiveMessage: function(msg) {
receiveMessage(msg) {
ok(false, 'Should not have received a message.');
}
};

2
dom/base/test/chrome/file_bug616841.xhtml
View file

@ -31,7 +31,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=616841
for (var i = 0; i < toCompare.length; ++i) {
var pair = toCompare[i];
messageManager.broadcastAsyncMessage("cmp",
{ i: i, a: pair[0], b: pair[1] });
{ i, a: pair[0], b: pair[1] });
}
}

2
dom/base/test/chrome/test_bug429785.xhtml
View file

@ -23,7 +23,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=429785
.getService(Ci.nsIConsoleService);
var listener = {
QueryInterface: ChromeUtils.generateQI(["nsIConsoleListener"]),
observe : function (msg) { errorLogged = true; }
observe(msg) { errorLogged = true; }
};
function step2() {

2
dom/base/test/chrome/test_bug800386.xhtml
View file

@ -32,7 +32,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=800386
// Now jump through some hoops to get us a getInterface call from C++
var requestor = {
getInterface: function(aIID) {
getInterface(aIID) {
if (aIID.equals(Ci.nsIProgressEventSink)) {
triedForwarding = true;
try {

2
dom/base/test/chrome/test_domparsing.xhtml
View file

@ -120,7 +120,7 @@ function runTest(win, expectSystem) {
let array = Array.from(t.input, function(c) { return c.charCodeAt(c); });
let inputs = [
{array: array, name: "parseFromBuffer (array)"},
{array, name: "parseFromBuffer (array)"},
{array: new Uint8Array(array), name: "parseFromBuffer (Uint8Array)"},
];
for (let input of inputs) {

10
dom/base/test/test_domrequesthelper.xhtml
View file

@ -26,7 +26,7 @@
}
DummyHelperSubclass.prototype = {
__proto__: DOMRequestIpcHelper.prototype,
uninit: function() {
uninit() {
if (typeof this.onuninit === "function") {
this.onuninit();
}
@ -132,7 +132,7 @@
// can then reasonably expect uninitCalled to be set properly on the
// next tick.
let observer = {
observe: function(aSubject, aTopic, aData) {
observe(aSubject, aTopic, aData) {
if (aTopic !== TOPIC) {
return;
}
@ -422,7 +422,7 @@
var id;
var resolver;
var promise = dummy.createPromise(function(resolve, reject) {
var r = { resolve: resolve, reject: reject };
var r = { resolve, reject };
id = dummy.getPromiseResolverId(r);
resolver = r;
ok(typeof id === "string", "id is a string");
@ -437,7 +437,7 @@
info("== Test removeResolver");
var id;
var promise = dummy.createPromise(function(resolve, reject) {
var r = { resolve: resolve, reject: reject };
var r = { resolve, reject };
id = dummy.getPromiseResolverId(r);
ok(typeof id === "string", "id is a string");
@ -458,7 +458,7 @@
var id;
var resolver;
var promise = dummy.createPromise(function(resolve, reject) {
var r = { resolve: resolve, reject: reject };
var r = { resolve, reject };
id = dummy.getPromiseResolverId(r);
resolver = r;
ok(typeof id === "string", "id is a string");

2
dom/console/tests/test_jsm.xhtml
View file

@ -28,7 +28,7 @@ function promiseConsoleListenerCalled() {
let consoleListener = {
count: 0,
observe: function(aSubject) {
observe(aSubject) {
var obj = aSubject.wrappedJSObject;
ok(obj.chromeContext, "MJS is always a chrome context");

2
dom/events/test/test_bug415498.xhtml
View file

@ -37,7 +37,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=415498
getService(Ci.nsIConsoleService);
gConsoleListener = {
observe: function(aObject) {
observe(aObject) {
gMessages.push(aObject);
}
};

6
dom/notification/test/chrome/test_notification_system_principal.xhtml
View file

@ -23,20 +23,20 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=874090
const ALERTS_SERVICE_CONTRACT_ID = "@mozilla.org/alerts-service;1";
var mockAlertsService = {
showAlert: function(alert, alertListener) {
showAlert(alert, alertListener) {
ok(true, "System principal was granted permission and is able to call showAlert.");
unregisterMock();
SimpleTest.finish();
},
showAlertNotification: function(imageUrl, title, text, textClickable,
showAlertNotification(imageUrl, title, text, textClickable,
cookie, alertListener, name, dir, lang, data) {
this.showAlert();
},
QueryInterface: ChromeUtils.generateQI(["nsIAlertsService"]),
createInstance: function(aIID) {
createInstance(aIID) {
return this.QueryInterface(aIID);
}
};

2
dom/serviceworkers/test/test_serviceworkerinfo.xhtml
View file

@ -21,7 +21,7 @@
return;
}
let listener = {
onChange: function() {
onChange() {
if (registration.activeWorker) {
registration.removeListener(listener);
res(registration);

2
dom/serviceworkers/test/test_serviceworkermanager.xhtml
View file

@ -44,7 +44,7 @@
"listeners when a service worker is registered with the same " +
"scope as an existing registration.");
let listener = {
onRegister: function () {
onRegister () {
ok(false, "Listener should not have been notified.");
}
};

2
dom/tests/mochitest/chrome/test_cyclecollector.xhtml
View file

@ -28,7 +28,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
return this;
throw Components.Exception("", Cr.NS_NOINTERFACE);
},
observe: function(subject, topic, data) {
observe(subject, topic, data) {
obs.removeObserver(observer, "cycle-collector-begin");
observer = null;
didCall = true;

2
dom/workers/test/test_WorkerDebugger.xhtml
View file

@ -86,7 +86,7 @@
info("Create a shared worker with the same URL and check that its " +
"debugger is not registered again.");
let listener = {
onRegistered: function () {
onRegistered () {
ok(false,
"Shared worker debugger should not be registered again.");
},

4
dom/workers/test/test_WorkerDebugger_console.xhtml
View file

@ -30,7 +30,7 @@
}
consoleListener.prototype = {
observe: function(aSubject) {
observe(aSubject) {
var obj = aSubject.wrappedJSObject;
if (obj.arguments[0] == "Hello from the debugger script!" &&
!consoleMessagesReceived) {
@ -58,7 +58,7 @@
info("Send a request to the worker debugger. This should cause the " +
"the worker debugger to send a response.");
dbg.addListener({
onMessage: function(msg) {
onMessage(msg) {
try {
msg = JSON.parse(msg);
} catch(e) {

2
dom/workers/test/test_fileReadSlice.xhtml
View file

@ -71,7 +71,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=664783
finish();
};
var params = {blob: blob, start: start, end: end};
var params = {blob, start, end};
worker.postMessage(params);
waitForWorkerFinish();
}

2
dom/workers/test/test_fileReaderSync.xhtml
View file

@ -88,7 +88,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=664783
finish();
};
var params = {file: createFileWithData(fileData), encoding: encoding};
var params = {file: createFileWithData(fileData), encoding};
worker.postMessage(params);

2
dom/workers/test/test_fileSlice.xhtml
View file

@ -69,7 +69,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=664783
finish();
};
var params = {blob: blob, start: start, end: end, contentType: contentType};
var params = {blob, start, end, contentType};
worker.postMessage(params);
waitForWorkerFinish();
}