Port bug 1620218 - Automatic code fixes for Prettier 1.18.2 upgrade. rs=linting-only DONTBUILD

--HG--
extra : amend_source : ac9f2ea254b5fbc66e2ef9ff52f3b659fc3d8c2b

calendar/providers/storage/CalStorageCalendar.jsm

@@ -1913,9 +1913,7 @@ CalStorageCalendar.prototype = {
             }
           } else {
             cal.WARN(
-              `[calStorageCalendar] Skipping invalid attendee for item '${item.title}' (${
-                item.id
-              }).`
+              `[calStorageCalendar] Skipping invalid attendee for item '${item.title}' (${item.id}).`
             );
           }
         });

common/bindings/customizable-toolbar.js

@@ -77,9 +77,7 @@
             : "";
 
           throw new Error(
-            `toolbar ID ${
-              this.id
-            }${tbName}: toolboxid attribute '${toolboxId}' points to a toolbox that doesn't exist`
+            `toolbar ID ${this.id}${tbName}: toolboxid attribute '${toolboxId}' points to a toolbox that doesn't exist`
           );
         }
         this._toolbox = toolbox;

mail/base/content/msgHdrView.js

@@ -2958,9 +2958,7 @@ function getIconForAttachment(attachment) {
   if (attachment.isDeleted) {
     return "chrome://messenger/skin/icons/attachment-deleted.png";
   }
-  return `moz-icon://${attachment.name}?size=16&contentType=${
-    attachment.contentType
-  }`;
+  return `moz-icon://${attachment.name}?size=16&contentType=${attachment.contentType}`;
 }
 
 /**

mail/components/cloudfile/wetransfer/background/background.js

@@ -94,9 +94,7 @@ class WeTransferSession {
       partNumber++
     ) {
       let uploadURL = await this._request(
-        `/v2/transfers/${transfer.id}/files/${
-          file.id
-        }/upload-url/${partNumber}`,
+        `/v2/transfers/${transfer.id}/files/${file.id}/upload-url/${partNumber}`,
         {
           method: "GET",
           signal,

mail/components/enterprisepolicies/Policies.jsm

@@ -630,9 +630,7 @@ function installAddonFromURL(url, extensionID) {
       onDownloadEnded: install => {
         if (extensionID && install.addon.id != extensionID) {
           log.error(
-            `Add-on downloaded from ${url} had unexpected id (got ${
-              install.addon.id
-            } expected ${extensionID})`
+            `Add-on downloaded from ${url} had unexpected id (got ${install.addon.id} expected ${extensionID})`
           );
           install.removeListener(listener);
           install.cancel();

mail/components/extensions/parent/ext-windows.js

@@ -149,9 +149,7 @@ this.windows = class extends ExtensionAPI {
           if (needResize) {
             if (createData.state && createData.state != "normal") {
               return Promise.reject({
-                message: `"state": "${
-                  createData.state
-                }" may not be combined with "left", "top", "width", or "height"`,
+                message: `"state": "${createData.state}" may not be combined with "left", "top", "width", or "height"`,
               });
             }
             createData.state = "normal";
@@ -288,9 +286,7 @@ this.windows = class extends ExtensionAPI {
               updateInfo.height !== null
             ) {
               return Promise.reject({
-                message: `"state": "${
-                  updateInfo.state
-                }" may not be combined with "left", "top", "width", or "height"`,
+                message: `"state": "${updateInfo.state}" may not be combined with "left", "top", "width", or "height"`,
               });
             }
           }

mail/components/extensions/test/browser/browser_ext_commands_getAll.js

@@ -85,9 +85,7 @@ add_task(async function() {
           command = commands.find(c => c.name == "with-platform-info");
           let platformKey = platformKeys[additionalScope.platform];
           let shortcut = `Ctrl+Shift+${platformKey}`;
-          errorMessage = `The shortcut should match the one provided in the manifest for OS='${
-            additionalScope.platform
-          }'`;
+          errorMessage = `The shortcut should match the one provided in the manifest for OS='${additionalScope.platform}'`;
           browser.test.assertEq(shortcut, command.shortcut, errorMessage);
 
           command = commands.find(c => c.name == "with-translation");

mail/components/extensions/test/browser/browser_ext_commands_onCommand.js

@@ -248,9 +248,7 @@ add_task(async function test_user_defined_commands() {
       is(
         message,
         testCommand.name,
-        `Expected onCommand listener to fire with the correct name: ${
-          testCommand.name
-        }`
+        `Expected onCommand listener to fire with the correct name: ${testCommand.name}`
       );
     }
   }

mail/components/extensions/test/xpcshell/test_ext_messages_query.js

@@ -106,9 +106,7 @@ add_task(async function() {
           .replace(/(.*) <.*>/, "$1")
           .padEnd(16, " ");
         browser.test.log(
-          `[${m.id}] ${date} From: ${author} To: ${recipients} Subject: ${
-            m.subject
-          }`
+          `[${m.id}] ${date} From: ${author} To: ${recipients} Subject: ${m.subject}`
         );
       }
 

mail/extensions/openpgp/content/modules/autoSetup.jsm

@@ -111,9 +111,7 @@ var EnigmailAutoSetup = {
           var account = accounts.queryElementAt(i, Ci.nsIMsgAccount);
           var accountMsgServer = account.incomingServer;
           EnigmailLog.DEBUG(
-            `autoSetup.jsm: determinePreviousInstallType: scanning account "${
-              accountMsgServer.prettyName
-            }"\n`
+            `autoSetup.jsm: determinePreviousInstallType: scanning account "${accountMsgServer.prettyName}"\n`
           );
 
           let msgFolderArr = [];
@@ -146,9 +144,7 @@ var EnigmailAutoSetup = {
             }
 
             EnigmailLog.DEBUG(
-              `autoSetup.jsm: determinePreviousInstallType: scanning folder "${
-                msgFolder.name
-              }"\n`
+              `autoSetup.jsm: determinePreviousInstallType: scanning folder "${msgFolder.name}"\n`
             );
 
             // Iterating through each message in the Folder
@@ -238,9 +234,7 @@ var EnigmailAutoSetup = {
 
           gDeterminedSetupType = returnMsgValue;
           EnigmailLog.DEBUG(
-            `autoSetup.jsm: determinePreviousInstallType: found type: ${
-              returnMsgValue.value
-            }\n`
+            `autoSetup.jsm: determinePreviousInstallType: found type: ${returnMsgValue.value}\n`
           );
           resolve(returnMsgValue);
         }

mail/extensions/openpgp/content/modules/autocrypt.jsm

@@ -269,9 +269,7 @@ var EnigmailAutocrypt = {
       }
       if (!acceptGossipKeys && keyArr[i].type === "1g") {
         EnigmailLog.DEBUG(
-          `autocrypt.jsm: importAutocryptKeys: skipping gossip key for ${
-            keyArr[i].email
-          }\n`
+          `autocrypt.jsm: importAutocryptKeys: skipping gossip key for ${keyArr[i].email}\n`
         );
         continue;
       }

mail/extensions/openpgp/content/modules/mimeDecrypt.jsm

@@ -510,9 +510,7 @@ MimeDecryptHandler.prototype = {
 
     let spec = this.uri ? this.uri.spec : null;
     EnigmailLog.DEBUG(
-      `mimeDecrypt.jsm: checking MIME structure for ${
-        this.mimePartNumber
-      } / ${spec}\n`
+      `mimeDecrypt.jsm: checking MIME structure for ${this.mimePartNumber} / ${spec}\n`
     );
 
     if (
@@ -870,9 +868,7 @@ MimeDecryptHandler.prototype = {
 
     let gossip = hdr.getHeader("autocrypt-gossip") || [];
     EnigmailLog.DEBUG(
-      `mimeDecrypt.jsm: extractAutocryptGossip: found ${
-        gossip.length
-      } headers\n`
+      `mimeDecrypt.jsm: extractAutocryptGossip: found ${gossip.length} headers\n`
     );
 
     let msgDate = null;

mail/test/browser/content-policy/browser_generalContentPolicy.js

@@ -460,9 +460,7 @@ function checkAllowForSenderWithPerms(test) {
     )
   ) {
     throw new Error(
-      `${
-        test.type
-      } has been unexpectedly blocked for sender=${authorEmailAddress}`
+      `${test.type} has been unexpectedly blocked for sender=${authorEmailAddress}`
     );
   }
 

mail/test/browser/shared-modules/FolderDisplayHelpers.jsm

@@ -885,9 +885,7 @@ function assert_tab_titled_from(aTab, aWhat) {
 
   mc.waitFor(
     () => aTab.title.includes(text),
-    `Tab title should include '${text}' but does not. (Current title: '${
-      aTab.title
-    }')`
+    `Tab title should include '${text}' but does not. (Current title: '${aTab.title}')`
   );
 }
 
@@ -2009,9 +2007,7 @@ function wait_for_blank_content_pane(aController) {
         true,
         undefined,
         undefined,
-        `Timeout waiting for blank content pane. Current location: ${
-          aController.window.content.location.href
-        }`
+        `Timeout waiting for blank content pane. Current location: ${aController.window.content.location.href}`
       );
     } else {
       throw e;

mail/test/browser/shared-modules/WindowHelpers.jsm

@@ -825,9 +825,7 @@ function _wait_for_generic_load(aDetails, aURLOrPredicate) {
         true,
         undefined,
         undefined,
-        `Timeout waiting for content page to load. Current URL is: ${
-          aDetails.currentURI.spec
-        }`
+        `Timeout waiting for content page to load. Current URL is: ${aDetails.currentURI.spec}`
       );
     } else {
       throw e;

mailnews/base/prefs/content/AccountManager.js

@@ -689,9 +689,7 @@ function checkUserServerChanges(showAlert) {
   if (!checkDirectoryIsUsable(dir)) {
     //          return false; // Temporarily disable this. Just show warning but do not block. See bug 921371.
     Cu.reportError(
-      `Local directory ${dir.path} of account ${
-        currentAccount.key
-      } is not safe to use. Consider changing it.`
+      `Local directory ${dir.path} of account ${currentAccount.key} is not safe to use. Consider changing it.`
     );
   }
 

mailnews/base/src/OAuth2Module.jsm

@@ -158,9 +158,7 @@ OAuth2Module.prototype = {
           () => {
             aListener.onSuccess(
               btoa(
-                `user=${this._username}\x01auth=Bearer ${
-                  oauth.accessToken
-                }\x01\x01`
+                `user=${this._username}\x01auth=Bearer ${oauth.accessToken}\x01\x01`
               )
             );
             if (callback) {