From 14023e4c0ce51dd240d99d329eaff1ca556941e9 Mon Sep 17 00:00:00 2001
From: Ruben Verborgh <ruben@verborgh.org>
Date: Sun, 13 Dec 2020 14:44:44 +0000
Subject: [PATCH] chore: Add eslint:recommended linter rules.

---
 .eslintrc.js                                     |  2 ++
 src/util/locking/SingleThreadedResourceLocker.ts | 15 +++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 31fd967c9..a64a864fa 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -16,6 +16,7 @@ module.exports = {
   ],
   extends: [
     'es/node',
+    'eslint:recommended',
     'plugin:import/errors',
     'plugin:import/warnings',
     'plugin:import/typescript',
@@ -46,6 +47,7 @@ module.exports = {
     'new-cap': 'off', // used for RDF constants
     'no-param-reassign': 'off', // necessary in constructor overloading
     'no-underscore-dangle': 'off', // conflicts with external libraries
+    'no-unused-vars': 'off', // already checked by @typescript-eslint/no-unused-vars
     'padding-line-between-statements': 'off',
     'prefer-named-capture-group': 'off',
     'tsdoc/syntax': 'error',
diff --git a/src/util/locking/SingleThreadedResourceLocker.ts b/src/util/locking/SingleThreadedResourceLocker.ts
index e981d25f5..082ff45f0 100644
--- a/src/util/locking/SingleThreadedResourceLocker.ts
+++ b/src/util/locking/SingleThreadedResourceLocker.ts
@@ -25,13 +25,16 @@ export class SingleThreadedResourceLocker implements ResourceLocker {
    */
   public async acquire(identifier: ResourceIdentifier): Promise<Lock> {
     this.logger.verbose(`Acquiring lock for ${identifier.path}`);
-    return new Promise(async(resolve): Promise<Lock> =>
+    return new Promise((resolve, reject): void => {
       this.locks.acquire(identifier.path, (done): void => {
         this.logger.verbose(`Acquired lock for ${identifier.path}`);
-        resolve({ release: async(): Promise<void> => {
-          this.logger.verbose(`Released lock for ${identifier.path}`);
-          done();
-        } });
-      }));
+        resolve({
+          release: async(): Promise<void> => {
+            this.logger.verbose(`Released lock for ${identifier.path}`);
+            done();
+          },
+        });
+      }).catch(reject);
+    });
   }
 }