SERVER-22696 Enable clang-format for code with JS template strings

clang-format 3.8 supports JS template strings, whereas 3.6 did not.

4 files changed, 1 insertions, 14 deletions

diff --git a/jstests/core/jssymbol.js b/jstests/core/jssymbol.js
index 62843405c9a..23c949b0a8e 100644
--- a/jstests/core/jssymbol.js
+++ b/jstests/core/jssymbol.js
@@ -2,9 +2,7 @@
 //
 (function() {
     // Exercise Symbol.toPrimitive on DB objects
-    // clang-format off
     assert(`${db}` === 'test');
-    // clang-format on
     assert(isNaN(+db));
 
     // Exercise the special Symbol methods and make sure DB.getProperty handles them
@@ -20,10 +18,8 @@
 
     assert(isNaN(+a));
     assert(+a.v == 1);
-    // clang-format off
     assert(`${a.v}` == 1);
     assert(`${a}` == '[object BSON]');
-    // clang-format on
 
     // Exercise the special Symbol methods and make sure BSON.resolve handles them
     assert(db[Symbol.iterator] != 1);
diff --git a/jstests/libs/override_methods/set_majority_read_and_write_concerns.js b/jstests/libs/override_methods/set_majority_read_and_write_concerns.js
index 232d97e6562..9914d35c73a 100644
--- a/jstests/libs/override_methods/set_majority_read_and_write_concerns.js
+++ b/jstests/libs/override_methods/set_majority_read_and_write_concerns.js
@@ -35,13 +35,9 @@
 
         if (typeof(jsCode) === "function") {
             // Load the override file and immediately invoke the supplied function.
-            // clang-format off
             newCode = `load("${overridesFile}"); (${jsCode})();`;
-            // clang-format on
         } else {
-            // clang-format off
             newCode = `load("${overridesFile}"); ${jsCode};`;
-            // clang-format on
         }
 
         return originalStartParallelShell(newCode, port, noConnect);
diff --git a/jstests/noPassthrough/update_yield1.js b/jstests/noPassthrough/update_yield1.js
index 29d1e99d46a..0c1f9f16376 100644
--- a/jstests/noPassthrough/update_yield1.js
+++ b/jstests/noPassthrough/update_yield1.js
@@ -21,12 +21,10 @@
     const worksPerYield = 50;
 
     // Start a mongod that will yield every 50 work cycles.
-    // clang-format off
     var mongod = MongoRunner.runMongod({
         setParameter: `internalQueryExecYieldIterations=${worksPerYield}`,
         profile: 2,
     });
-    // clang-format on
     assert.neq(null, mongod, 'mongod was unable to start up');
 
     var coll = mongod.getDB('test').update_yield1;
diff --git a/src/mongo/shell/servers.js b/src/mongo/shell/servers.js
index 2f86ff31962..0972f47be41 100644
--- a/src/mongo/shell/servers.js
+++ b/src/mongo/shell/servers.js
@@ -793,10 +793,7 @@ var MongoRunner, _startMongod, startMongoProgram, runMongoProgram, startMongoPro
 
         if (!Array.contains(allowedExitCodes, returnCode)) {
             throw new MongoRunner.StopError(
-                // clang-format off
-            `MongoDB process on port ${port} exited with error code ${returnCode}`,
-                // clang-format on
-                returnCode);
+                `MongoDB process on port ${port} exited with error code ${returnCode}`, returnCode);
         }
 
         return returnCode;