Avoid parentheses in single argument lambda functions

js/.prettierrc

@@ -2,3 +2,6 @@ overrides:
     - files: [".eslintrc.js", "*.json"]
       options:
           quoteProps: preserve
+    - files: ["*.js"]
+      options:
+          arrowParens: avoid

js/dts-bundle.js

@@ -27,20 +27,20 @@ function collectReferences(filePath) {
     const fileContent = fs.readFileSync(filePath, "utf-8");
     const sourceFile = ts.createSourceFile(filePath, fileContent, ts.ScriptTarget.Latest, true);
 
-    sourceFile.referencedFiles.forEach((reference) => {
+    sourceFile.referencedFiles.forEach(reference => {
         const referencePath = path.resolve(path.dirname(filePath), reference.fileName);
         collectReferences(referencePath);
     });
 
-    sourceFile.forEachChild((node) => {
+    sourceFile.forEachChild(node => {
         if (ts.isModuleDeclaration(node)) {
             const moduleName = node.name.getText();
             const moduleBody = node.body;
 
             if (moduleBody && ts.isModuleBlock(moduleBody)) {
                 const moduleContent = moduleBody.statements
-                    .filter((stmt) => !ts.isImportEqualsDeclaration(stmt))
-                    .map((stmt) => stmt.getText())
+                    .filter(stmt => !ts.isImportEqualsDeclaration(stmt))
+                    .map(stmt => stmt.getText())
                     .join("\n");
 
                 if (!moduleDeclarations.has(moduleName)) {

js/gulpfile.js

@@ -21,7 +21,7 @@ import tsc from "gulp-typescript";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const iceBinDist = (process.env.ICE_BIN_DIST || "").split(" ");
-const useBinDist = iceBinDist.find((v) => v == "js" || v == "all") !== undefined;
+const useBinDist = iceBinDist.find(v => v == "js" || v == "all") !== undefined;
 
 function parseArg(argv, key) {
     for (let i = 0; i < argv.length; ++i) {
@@ -80,14 +80,14 @@ const excludes = {
 };
 
 function createCleanTask(taskName, patterns, extension, dest = undefined) {
-    gulp.task(taskName, async (cb) => {
+    gulp.task(taskName, async cb => {
         const pumpArgs = [gulp.src(patterns), extReplace(extension)];
         if (dest !== undefined) {
             pumpArgs.push(gulp.dest(dest));
         }
         pumpArgs.push(vinylPaths(deleteAsync));
         return new Promise((resolve, reject) => {
-            pump(pumpArgs, (err) => {
+            pump(pumpArgs, err => {
                 if (err) {
                     reject(err);
                 } else {
@@ -100,7 +100,7 @@ function createCleanTask(taskName, patterns, extension, dest = undefined) {
 
 for (const lib of libs) {
     const slicePatterns = [`../slice/${lib}/*.ice`, ...(excludes[lib] || [])];
-    gulp.task(libTask(lib, "generate"), (cb) => {
+    gulp.task(libTask(lib, "generate"), cb => {
         pump(
             [
                 gulp.src(slicePatterns),
@@ -122,20 +122,20 @@ for (const lib of libs) {
 }
 
 if (useBinDist) {
-    gulp.task("ice:module", (cb) => cb());
-    gulp.task("ice:module:clean", (cb) => cb());
-    gulp.task("dist", (cb) => cb());
-    gulp.task("dist:clean", (cb) => cb());
+    gulp.task("ice:module", cb => cb());
+    gulp.task("ice:module:clean", cb => cb());
+    gulp.task("dist", cb => cb());
+    gulp.task("dist:clean", cb => cb());
 } else {
-    gulp.task("dist", gulp.parallel(libs.map((libName) => libTask(libName, "generate"))));
+    gulp.task("dist", gulp.parallel(libs.map(libName => libTask(libName, "generate"))));
 
-    gulp.task("dist:clean", gulp.parallel(libs.map((libName) => libTask(libName, "clean"))));
+    gulp.task("dist:clean", gulp.parallel(libs.map(libName => libTask(libName, "clean"))));
 
     gulp.task("ice:module:package", () => gulp.src(["package.json"]).pipe(gulp.dest("node_modules/ice")));
 
     gulp.task(
         "ice:module",
-        gulp.series("ice:module:package", (cb) => {
+        gulp.series("ice:module:package", cb => {
             pump([gulp.src([`${root}/src/**/*`]), gulp.dest(`${root}/node_modules/ice/src`)], cb);
         }),
     );
@@ -175,7 +175,7 @@ const tests = [
     "test/Slice/macros",
 ];
 
-gulp.task("test:common:generate", (cb) => {
+gulp.task("test:common:generate", cb => {
     pump([gulp.src(["../scripts/Controller.ice"]), slice2js(), gulp.dest("test/Common")], cb);
 });
 
@@ -194,7 +194,7 @@ function NodeMockupResolver() {
     };
 }
 
-gulp.task("ice:bundle", (cb) => {
+gulp.task("ice:bundle", cb => {
     return new Promise(async (resolve, reject) => {
         try {
             let bundle = await rollup({
@@ -225,7 +225,7 @@ function IceResolver() {
     };
 }
 
-gulp.task("test:common:bundle", (cb) => {
+gulp.task("test:common:bundle", cb => {
     return new Promise(async (resolve, reject) => {
         try {
             let bundle = await rollup({
@@ -245,15 +245,15 @@ gulp.task("test:common:bundle", (cb) => {
     });
 });
 
-gulp.task("test:common:clean", (cb) => {
+gulp.task("test:common:clean", cb => {
     deleteAsync(["test/Common/Controller.js", "test/Common/.depend"]);
     cb();
 });
 
 const testTask = (testName, taskName) => testName.replace(/\//g, "_") + ":" + taskName;
 
 for (const name of tests) {
-    gulp.task(testTask(name, "build"), (cb) => {
+    gulp.task(testTask(name, "build"), cb => {
         const outputDirectory = `${root}/${name}`;
         pump(
             [
@@ -270,7 +270,7 @@ for (const name of tests) {
         );
     });
 
-    gulp.task(testTask(name, "ts-compile"), (cb) => {
+    gulp.task(testTask(name, "ts-compile"), cb => {
         pump(
             [
                 gulp.src([`${root}/${name}/*.ts`, `!${root}/${name}/*.d.ts`]),
@@ -287,7 +287,7 @@ for (const name of tests) {
         );
     });
 
-    gulp.task(testTask(name, "bundle"), async (cb) => {
+    gulp.task(testTask(name, "bundle"), async cb => {
         let input = fs.existsSync(`${name}/index.js`) ? `${name}/index.js` : `${name}/Client.js`;
 
         let bundle = await rollup({
@@ -300,7 +300,7 @@ for (const name of tests) {
         });
     });
 
-    gulp.task(testTask(name, "copy:assets"), async (cb) => {
+    gulp.task(testTask(name, "copy:assets"), async cb => {
         pump([gulp.src("test/Common/controller.html"), gulp.dest(`dist/${name}`)], cb);
     });
 
@@ -320,10 +320,10 @@ gulp.task(
         "ice:bundle",
         "test:common:generate",
         "test:common:bundle",
-        gulp.series(tests.map((testName) => testTask(testName, "build"))),
-        gulp.series(tests.map((testName) => testTask(testName, "ts-compile"))),
-        gulp.series(tests.map((testName) => testTask(testName, "bundle"))),
-        gulp.series(tests.map((testName) => testTask(testName, "copy:assets"))),
+        gulp.series(tests.map(testName => testTask(testName, "build"))),
+        gulp.series(tests.map(testName => testTask(testName, "ts-compile"))),
+        gulp.series(tests.map(testName => testTask(testName, "bundle"))),
+        gulp.series(tests.map(testName => testTask(testName, "copy:assets"))),
     ),
 );
 
@@ -334,7 +334,7 @@ gulp.task(
     gulp.series(
         "test:common:clean",
         "test:bundle:clean",
-        tests.map((testName) => testTask(testName, "clean")),
+        tests.map(testName => testTask(testName, "clean")),
     ),
 );
 

js/src/Ice/ConnectRequestHandler.js

@@ -74,7 +74,7 @@ export class ConnectRequestHandler {
             ri.addProxy(this._reference).then(
                 // The proxy was added to the router info, we're now ready to send the queued requests.
                 () => this.flushRequests(),
-                (ex) => this.setException(ex),
+                ex => this.setException(ex),
             );
             return; // The request handler will be initialized once addProxy completes.
         }

js/src/Ice/ConnectionI.js

@@ -244,7 +244,7 @@ export class ConnectionI {
             //
             Timer.setImmediate(() => {
                 this.setState(StateClosing, new ConnectionManuallyClosedException(true));
-                this._closePromises.forEach((p) => p.resolve());
+                this._closePromises.forEach(p => p.resolve());
                 this._closePromises = [];
             });
         }
@@ -1512,7 +1512,7 @@ export class ConnectionI {
             // Clear the OA. See bug 1673 for the details of why this is necessary.
             //
             this._adapter = null;
-            this._finishedPromises.forEach((p) => p.resolve());
+            this._finishedPromises.forEach(p => p.resolve());
             this._finishedPromises = [];
         }
     }

js/src/Ice/EndpointFactoryManager.js

@@ -16,12 +16,12 @@ export class EndpointFactoryManager {
     }
 
     add(factory) {
-        Debug.assert(this._factories.find((f) => factory.type() == f.type()) === undefined);
+        Debug.assert(this._factories.find(f => factory.type() == f.type()) === undefined);
         this._factories.push(factory);
     }
 
     get(type) {
-        return this._factories.find((f) => type == f.type()) || null;
+        return this._factories.find(f => type == f.type()) || null;
     }
 
     create(str, oaEndpoint) {
@@ -113,7 +113,7 @@ export class EndpointFactoryManager {
     }
 
     destroy() {
-        this._factories.forEach((factory) => factory.destroy());
+        this._factories.forEach(factory => factory.destroy());
         this._factories = [];
     }
 }

js/src/Ice/IncomingAsync.js

@@ -354,7 +354,7 @@ export class IncomingAsync {
             if (promise !== null) {
                 promise.then(
                     () => this.completed(null),
-                    (ex) => this.completed(ex),
+                    ex => this.completed(ex),
                 );
                 return;
             }

js/src/Ice/InstanceExtensions.js

@@ -394,7 +394,7 @@ Instance.prototype.destroy = function () {
             }
 
             if (this._objectFactoryMap !== null) {
-                this._objectFactoryMap.forEach((factory) => factory.destroy());
+                this._objectFactoryMap.forEach(factory => factory.destroy());
                 this._objectFactoryMap.clear();
             }
 
@@ -413,7 +413,7 @@ Instance.prototype.destroy = function () {
                 if (unusedProperties.length > 0) {
                     const message = [];
                     message.push("The following properties were set but never read:");
-                    unusedProperties.forEach((p) => message.push("\n    ", p));
+                    unusedProperties.forEach(p => message.push("\n    ", p));
                     this._initData.logger.warning(message.join(""));
                 }
             }
@@ -431,13 +431,13 @@ Instance.prototype.destroy = function () {
             this._state = StateDestroyed;
 
             if (this._destroyPromises) {
-                this._destroyPromises.forEach((p) => p.resolve());
+                this._destroyPromises.forEach(p => p.resolve());
             }
             promise.resolve();
         })
-        .catch((ex) => {
+        .catch(ex => {
             if (this._destroyPromises) {
-                this._destroyPromises.forEach((p) => p.reject(ex));
+                this._destroyPromises.forEach(p => p.reject(ex));
             }
             promise.reject(ex);
         });

js/src/Ice/LocatorInfo.js

@@ -54,7 +54,7 @@ export class LocatorInfo {
             return Promise.resolve(this._locatorRegistry);
         }
 
-        return this._locator.getRegistry().then((reg) => {
+        return this._locator.getRegistry().then(reg => {
             //
             // The locator registry can't be located. We use ordered
             // endpoint selection in case the locator returned a proxy
@@ -157,7 +157,7 @@ export class LocatorInfo {
         }
 
         s.push("endpoints = ");
-        s.push(endpoints.map((e) => e.toString()).join(":"));
+        s.push(endpoints.map(e => e.toString()).join(":"));
         ref.getInstance().initializationData().logger.trace(ref.getInstance().traceLevels().locationCat, s.join(""));
     }
 
@@ -378,12 +378,12 @@ class RequestCallback {
                     );
                 }
                 locatorInfo.getEndpoints(r, this._ref, this._ttl).then(
-                    (values) => {
+                    values => {
                         if (this._promise !== null) {
                             this._promise.resolve(values);
                         }
                     },
-                    (ex) => {
+                    ex => {
                         if (this._promise !== null) {
                             this._promise.reject(ex);
                         }
@@ -475,8 +475,8 @@ class ObjectRequest extends Request {
                 .getLocator()
                 .findObjectById(this._ref.getIdentity())
                 .then(
-                    (proxy) => this.response(proxy),
-                    (ex) => this.exception(ex),
+                    proxy => this.response(proxy),
+                    ex => this.exception(ex),
                 );
         } catch (ex) {
             this.exception(ex);
@@ -496,8 +496,8 @@ class AdapterRequest extends Request {
                 .getLocator()
                 .findAdapterById(this._ref.getAdapterId())
                 .then(
-                    (proxy) => this.response(proxy),
-                    (ex) => this.exception(ex),
+                    proxy => this.response(proxy),
+                    ex => this.exception(ex),
                 );
         } catch (ex) {
             this.exception(ex);