Merge pull request #3495 from overleaf/ae-prettier-2

Upgrade Prettier to v2 GitOrigin-RevId: 85aa3fa1acb6332c4f58c46165a43d1a51471f33
2021-04-15 02:05:22 +00:00
parent 930d7ba028
commit 1ebc8a79cb
582 changed files with 20382 additions and 20374 deletions
@@ -30,10 +30,10 @@ module.exports = CompileManager = {
      options = {}
    }
    if (_callback == null) {
-      _callback = function(error) {}
+      _callback = function (error) {}
    }
    const timer = new Metrics.Timer('editor.compile')
-    const callback = function(...args) {
+    const callback = function (...args) {
      timer.done()
      return _callback(...Array.from(args || []))
    }
@@ -41,7 +41,7 @@ module.exports = CompileManager = {
    return CompileManager._checkIfRecentlyCompiled(
      project_id,
      user_id,
-      function(error, recentlyCompiled) {
+      function (error, recentlyCompiled) {
        if (error != null) {
          return callback(error)
        }
@@ -52,20 +52,20 @@ module.exports = CompileManager = {
        return CompileManager._checkIfAutoCompileLimitHasBeenHit(
          options.isAutoCompile,
          'everyone',
-          function(err, canCompile) {
+          function (err, canCompile) {
            if (!canCompile) {
              return callback(null, 'autocompile-backoff', [])
            }

            return ProjectRootDocManager.ensureRootDocumentIsSet(
              project_id,
-              function(error) {
+              function (error) {
                if (error != null) {
                  return callback(error)
                }
                return CompileManager.getProjectCompileLimits(
                  project_id,
-                  function(error, limits) {
+                  function (error, limits) {
                    if (error != null) {
                      return callback(error)
                    }
@@ -77,7 +77,7 @@ module.exports = CompileManager = {
                    return CompileManager._checkCompileGroupAutoCompileLimit(
                      options.isAutoCompile,
                      limits.compileGroup,
-                      function(err, canCompile) {
+                      function (err, canCompile) {
                        if (!canCompile) {
                          return callback(null, 'autocompile-backoff', [])
                        }
@@ -89,7 +89,7 @@ module.exports = CompileManager = {
                          project_id,
                          compileAsUser,
                          options,
-                          function(
+                          function (
                            error,
                            status,
                            outputFiles,
@@ -123,100 +123,105 @@ module.exports = CompileManager = {

  stopCompile(project_id, user_id, callback) {
    if (callback == null) {
-      callback = function(error) {}
+      callback = function (error) {}
    }
-    return CompileManager.getProjectCompileLimits(project_id, function(
-      error,
-      limits
-    ) {
-      if (error != null) {
-        return callback(error)
+    return CompileManager.getProjectCompileLimits(
+      project_id,
+      function (error, limits) {
+        if (error != null) {
+          return callback(error)
+        }
+        return ClsiManager.stopCompile(project_id, user_id, limits, callback)
      }
-      return ClsiManager.stopCompile(project_id, user_id, limits, callback)
-    })
+    )
  },

  deleteAuxFiles(project_id, user_id, clsiserverid, callback) {
    if (callback == null) {
-      callback = function(error) {}
+      callback = function (error) {}
    }
-    return CompileManager.getProjectCompileLimits(project_id, function(
-      error,
-      limits
-    ) {
-      if (error != null) {
-        return callback(error)
+    return CompileManager.getProjectCompileLimits(
+      project_id,
+      function (error, limits) {
+        if (error != null) {
+          return callback(error)
+        }
+        ClsiManager.deleteAuxFiles(
+          project_id,
+          user_id,
+          limits,
+          clsiserverid,
+          callback
+        )
      }
-      ClsiManager.deleteAuxFiles(
-        project_id,
-        user_id,
-        limits,
-        clsiserverid,
-        callback
-      )
-    })
+    )
  },

  getProjectCompileLimits(project_id, callback) {
    if (callback == null) {
-      callback = function(error, limits) {}
+      callback = function (error, limits) {}
    }
-    return ProjectGetter.getProject(project_id, { owner_ref: 1 }, function(
-      error,
-      project
-    ) {
-      if (error != null) {
-        return callback(error)
-      }
-      return UserGetter.getUser(
-        project.owner_ref,
-        { alphaProgram: 1, betaProgram: 1, features: 1 },
-        function(err, owner) {
-          if (error != null) {
-            return callback(error)
-          }
-          let ownerFeatures = (owner && owner.features) || {}
-          // put alpha users into their own compile group
-          if (owner && owner.alphaProgram) {
-            ownerFeatures.compileGroup = 'alpha'
-          }
-          return callback(null, {
-            timeout:
-              ownerFeatures.compileTimeout ||
-              Settings.defaultFeatures.compileTimeout,
-            compileGroup:
-              ownerFeatures.compileGroup ||
-              Settings.defaultFeatures.compileGroup
-          })
+    return ProjectGetter.getProject(
+      project_id,
+      { owner_ref: 1 },
+      function (error, project) {
+        if (error != null) {
+          return callback(error)
        }
-      )
-    })
+        return UserGetter.getUser(
+          project.owner_ref,
+          { alphaProgram: 1, betaProgram: 1, features: 1 },
+          function (err, owner) {
+            if (error != null) {
+              return callback(error)
+            }
+            let ownerFeatures = (owner && owner.features) || {}
+            // put alpha users into their own compile group
+            if (owner && owner.alphaProgram) {
+              ownerFeatures.compileGroup = 'alpha'
+            }
+            return callback(null, {
+              timeout:
+                ownerFeatures.compileTimeout ||
+                Settings.defaultFeatures.compileTimeout,
+              compileGroup:
+                ownerFeatures.compileGroup ||
+                Settings.defaultFeatures.compileGroup
+            })
+          }
+        )
+      }
+    )
  },

  COMPILE_DELAY: 1, // seconds
  _checkIfRecentlyCompiled(project_id, user_id, callback) {
    if (callback == null) {
-      callback = function(error, recentlyCompiled) {}
+      callback = function (error, recentlyCompiled) {}
    }
    const key = `compile:${project_id}:${user_id}`
-    return rclient.set(key, true, 'EX', this.COMPILE_DELAY, 'NX', function(
-      error,
-      ok
-    ) {
-      if (error != null) {
-        return callback(error)
+    return rclient.set(
+      key,
+      true,
+      'EX',
+      this.COMPILE_DELAY,
+      'NX',
+      function (error, ok) {
+        if (error != null) {
+          return callback(error)
+        }
+        if (ok === 'OK') {
+          return callback(null, false)
+        } else {
+          return callback(null, true)
+        }
      }
-      if (ok === 'OK') {
-        return callback(null, false)
-      } else {
-        return callback(null, true)
-      }
-    })
+    )
  },

  _checkCompileGroupAutoCompileLimit(isAutoCompile, compileGroup, callback) {
    if (callback == null) {
-      callback = function(err, canCompile) {}
+      callback = function (err, canCompile) {}
    }
    if (!isAutoCompile) {
      return callback(null, true)
@@ -236,7 +241,7 @@ module.exports = CompileManager = {

  _checkIfAutoCompileLimitHasBeenHit(isAutoCompile, compileGroup, callback) {
    if (callback == null) {
-      callback = function(err, canCompile) {}
+      callback = function (err, canCompile) {}
    }
    if (!isAutoCompile) {
      return callback(null, true)
@@ -248,7 +253,7 @@ module.exports = CompileManager = {
      subjectName: compileGroup,
      throttle: Settings.rateLimit.autoCompile[compileGroup] || 25
    }
-    return rateLimiter.addCount(opts, function(err, canCompile) {
+    return rateLimiter.addCount(opts, function (err, canCompile) {
      if (err != null) {
        canCompile = false
      }
@@ -261,23 +266,23 @@ module.exports = CompileManager = {

  wordCount(project_id, user_id, file, clsiserverid, callback) {
    if (callback == null) {
-      callback = function(error) {}
+      callback = function (error) {}
    }
-    return CompileManager.getProjectCompileLimits(project_id, function(
-      error,
-      limits
-    ) {
-      if (error != null) {
-        return callback(error)
+    return CompileManager.getProjectCompileLimits(
+      project_id,
+      function (error, limits) {
+        if (error != null) {
+          return callback(error)
+        }
+        ClsiManager.wordCount(
+          project_id,
+          user_id,
+          file,
+          limits,
+          clsiserverid,
+          callback
+        )
      }
-      ClsiManager.wordCount(
-        project_id,
-        user_id,
-        file,
-        limits,
-        clsiserverid,
-        callback
-      )
-    })
+    )
  }
 }