prettier 2.0.1 → 2.0.2

package/standalone.js

@@ -5,7 +5,7 @@
 }(this, (function () { 'use strict';
 
   var name = "prettier";
-  var version = "2.0.1";
+  var version = "2.0.2";
   var description = "Prettier is an opinionated code formatter";
   var bin = "./bin/prettier.js";
   var repository = "prettier/prettier";
@@ -19,7 +19,7 @@
   var dependencies = {
   	"@angular/compiler": "9.0.5",
   	"@babel/code-frame": "7.8.0",
-  	"@babel/parser": "7.9.2",
+  	"@babel/parser": "7.9.3",
   	"@glimmer/syntax": "0.48.0",
   	"@iarna/toml": "2.2.3",
   	"@typescript-eslint/typescript-estree": "2.24.0",
@@ -52,12 +52,13 @@
   	"json-stable-stringify": "1.0.1",
   	leven: "3.1.0",
   	"lines-and-columns": "1.1.6",
-  	"linguist-languages": "7.8.0",
+  	"linguist-languages": "7.9.0",
   	lodash: "4.17.15",
   	mem: "6.0.1",
   	minimatch: "3.0.4",
   	minimist: "1.2.5",
   	"n-readlines": "1.0.0",
+  	"please-upgrade-node": "3.2.0",
   	"postcss-less": "3.1.4",
   	"postcss-media-query-parser": "0.2.3",
   	"postcss-scss": "2.0.0",
@@ -76,21 +77,21 @@
   	"yaml-unist-parser": "1.1.1"
   };
   var devDependencies = {
-  	"@babel/core": "7.8.7",
-  	"@babel/preset-env": "7.8.7",
+  	"@babel/core": "7.9.0",
+  	"@babel/preset-env": "7.9.0",
   	"@rollup/plugin-alias": "3.0.1",
   	"@rollup/plugin-commonjs": "11.0.2",
   	"@rollup/plugin-json": "4.0.2",
   	"@rollup/plugin-node-resolve": "7.1.1",
   	"@rollup/plugin-replace": "2.3.1",
-  	"babel-loader": "8.0.6",
+  	"babel-loader": "8.1.0",
   	benchmark: "2.1.4",
   	"builtin-modules": "3.1.0",
   	codecov: "3.6.5",
   	"cross-env": "7.0.2",
   	cspell: "4.0.55",
   	eslint: "6.8.0",
-  	"eslint-config-prettier": "6.10.0",
+  	"eslint-config-prettier": "6.10.1",
   	"eslint-formatter-friendly": "7.0.0",
   	"eslint-plugin-import": "2.20.1",
   	"eslint-plugin-prettier": "3.1.2",
@@ -98,11 +99,10 @@
   	"eslint-plugin-unicorn": "17.2.0",
   	execa: "4.0.0",
   	jest: "25.1.0",
-  	"jest-junit": "10.0.0",
   	"jest-snapshot-serializer-ansi": "1.0.0",
   	"jest-snapshot-serializer-raw": "1.1.0",
   	"jest-watch-typeahead": "0.4.2",
-  	prettier: "2.0.0",
+  	prettier: "2.0.1",
   	rimraf: "3.0.2",
   	rollup: "2.1.0",
   	"rollup-plugin-babel": "4.4.0",
@@ -130,7 +130,7 @@
   	"lint:changelog": "node ./scripts/lint-changelog.js",
   	"lint:prettier": "prettier \"**/*.{md,json,yml,html,css}\" --check",
   	"lint:dist": "eslint --no-eslintrc --no-ignore --env=es6,browser --parser-options=ecmaVersion:2016 \"dist/!(bin-prettier|index|third-party).js\"",
-  	"lint:spellcheck": "cspell {bin,scripts,src}/**/*.js {docs,website/blog,changelog_unreleased}/**/*.md",
+  	"lint:spellcheck": "cspell {bin,scripts,src,website}/**/*.js {docs,website/blog,changelog_unreleased}/**/*.md",
   	"lint:deps": "node ./scripts/check-deps.js",
   	build: "node --max-old-space-size=3072 ./scripts/build/build.js",
   	"build-docs": "node ./scripts/build-docs.js"
@@ -13842,6 +13842,7 @@
     try {
       fd = fs.openSync(filepath, "r");
     } catch (err) {
+      // istanbul ignore next
       return "";
     }
 
@@ -13878,13 +13879,20 @@
   }
 
   function inferParser(filepath, plugins) {
-    const filename = path.basename(filepath).toLowerCase(); // If the file has no extension, we can try to infer the language from the
+    const filename = path.basename(filepath).toLowerCase();
+    const languages = getSupportInfo$1({
+      plugins
+    }).languages.filter(language => language.since !== null); // If the file has no extension, we can try to infer the language from the
     // interpreter in the shebang line, if any; but since this requires FS access,
     // do it last.
 
-    const language = getSupportInfo$1({
-      plugins
-    }).languages.find(language => language.since !== null && (language.extensions && language.extensions.some(extension => filename.endsWith(extension)) || language.filenames && language.filenames.find(name => name.toLowerCase() === filename) || !filename.includes(".") && language.interpreters && language.interpreters.includes(getInterpreter(filepath))));
+    let language = languages.find(language => language.extensions && language.extensions.some(extension => filename.endsWith(extension)) || language.filenames && language.filenames.find(name => name.toLowerCase() === filename));
+
+    if (!language && !filename.includes(".")) {
+      const interpreter = getInterpreter(filepath);
+      language = languages.find(language => language.interpreters && language.interpreters.includes(interpreter));
+    }
+
     return language && language.parsers[0];
   }
 
@@ -14984,7 +14992,11 @@
   }
 
   function hasNodeIgnoreComment(node) {
-    return node && node.comments && node.comments.length > 0 && node.comments.some(comment => comment.value.trim() === "prettier-ignore");
+    return node && (node.comments && node.comments.length > 0 && node.comments.some(comment => isNodeIgnoreComment(comment) && !comment.unignore) || node.prettierIgnore);
+  }
+
+  function isNodeIgnoreComment(comment) {
+    return comment.value.trim() === "prettier-ignore";
   }
 
   function addCommentHelper(node, comment) {
@@ -15084,6 +15096,7 @@
     printNumber,
     hasIgnoreComment,
     hasNodeIgnoreComment,
+    isNodeIgnoreComment,
     makeString,
     addLeadingComment,
     addDanglingComment,
@@ -17091,7 +17104,7 @@
     }
 
     for (let i = 0; i < astComments.length; ++i) {
-      if (astComments[i].value.trim() === "prettier-ignore") {
+      if (util$1.isNodeIgnoreComment(astComments[i])) {
         // If there's a prettier-ignore, we're not printing that sub-tree so we
         // don't know if the comments was printed or not.
         return;
@@ -23638,8 +23651,22 @@
 
   function handleUnionTypeComments(precedingNode, enclosingNode, followingNode, comment) {
     if (enclosingNode && (enclosingNode.type === "UnionTypeAnnotation" || enclosingNode.type === "TSUnionType")) {
-      addTrailingComment$3(precedingNode, comment);
-      return true;
+      if (util$1.isNodeIgnoreComment(comment)) {
+        followingNode.prettierIgnore = true;
+        comment.unignore = true;
+      }
+
+      if (precedingNode) {
+        addTrailingComment$3(precedingNode, comment);
+        return true;
+      }
+
+      return false;
+    }
+
+    if (followingNode && (followingNode.type === "UnionTypeAnnotation" || followingNode.type === "TSUnionType") && util$1.isNodeIgnoreComment(comment)) {
+      followingNode.types[0].prettierIgnore = true;
+      comment.unignore = true;
     }
 
     return false;
@@ -23845,7 +23872,31 @@
             const rawQuasis = node.quasis.map(q => q.value.raw);
             let placeholderID = 0;
             const text = rawQuasis.reduce((prevVal, currVal, idx) => {
-              return idx === 0 ? currVal : prevVal + "@prettier-placeholder-" + placeholderID++ + "-id" + currVal;
+              if (idx === 0) {
+                return currVal;
+              }
+
+              let specialSuffix = ""; // colons and whitespaces
+
+              const trailingColons = currVal.match(/^(\s*)(:+)(\s*)/);
+
+              if (trailingColons) {
+                const whitespaceBeforeColons = !!trailingColons[1];
+                const numberOfColons = trailingColons[2].length;
+                const whitespaceAfterColons = !!trailingColons[3];
+
+                if (whitespaceAfterColons) ; else {
+                  if (whitespaceBeforeColons) {
+                    specialSuffix += "-whitespace";
+                  }
+
+                  specialSuffix += "-colon".repeat(numberOfColons);
+                  currVal = "\uffff" + currVal.slice(trailingColons[0].length);
+                }
+              }
+
+              const placeholder = "@prettier-placeholder".concat(specialSuffix, "-").concat(placeholderID++, "-id");
+              return prevVal + placeholder + currVal;
             }, "");
             const doc = textToDoc(text, {
               parser: "css"
@@ -24047,12 +24098,19 @@
       if (atPlaceholderIndex > -1) {
         const placeholder = parts[atPlaceholderIndex];
         const rest = parts.slice(atPlaceholderIndex + 1);
-        const placeholderMatch = placeholder.match(/@prettier-placeholder-(.+)-id([\s\S]*)/);
-        const placeholderID = placeholderMatch[1]; // When the expression has a suffix appended, like:
+        const placeholderMatch = placeholder.match(/@prettier-placeholder((?:-whitespace|-colon)*)-(.+)-id([\s\S]*)/);
+        const specialSuffix = placeholderMatch[1]; // colons and whitespaces
+
+        const placeholderID = placeholderMatch[2]; // When the expression has a suffix appended, like:
         // animation: linear ${time}s ease-out;
 
-        const suffix = placeholderMatch[2];
+        let suffix = placeholderMatch[3];
         const expression = expressions[placeholderID];
+
+        if (specialSuffix) {
+          suffix = specialSuffix.replace(/-whitespace/g, " ").replace(/-colon/g, ":") + suffix.replace(/^\uffff/g, "");
+        }
+
         replaceCounter++;
         parts = parts.slice(0, atPlaceholderIndex).concat(["${", expression, "}" + suffix]).concat(rest);
       }
@@ -28255,8 +28313,13 @@
 
       case "TSIndexSignature":
         {
-          const parent = path.getParentNode();
-          const parametersGroup = group$b(concat$d([indent$7(concat$d([softline$6, join$9(concat$d([", ", softline$6]), path.map(print, "parameters"))])), ifBreak$6(shouldPrintComma$1(options) ? "," : ""), softline$6]));
+          const parent = path.getParentNode(); // The typescript parser accepts multiple parameters here. If you're
+          // using them, it makes sense to have a trailing comma. But if you
+          // aren't, this is more like a computed property name than an array.
+          // So we leave off the trailing comma when there's just one parameter.
+
+          const trailingComma = n.parameters.length > 1 ? ifBreak$6(shouldPrintComma$1(options) ? "," : "") : "";
+          const parametersGroup = group$b(concat$d([indent$7(concat$d([softline$6, join$9(concat$d([", ", softline$6]), path.map(print, "parameters"))])), trailingComma, softline$6]));
           return concat$d([n.export ? "export " : "", n.accessibility ? concat$d([n.accessibility, " "]) : "", n.static ? "static " : "", n.readonly ? "readonly " : "", "[", n.parameters ? parametersGroup : "", n.typeAnnotation ? "]: " : "]", n.typeAnnotation ? path.call(print, "typeAnnotation") : "", parent.type === "ClassBody" ? semi : ""]);
         }
 
@@ -30052,7 +30115,7 @@
   ) {
     const node = path.getValue();
     const parent = path.getParentNode();
-    return (node && (isJSXNode$1(node) || hasFlowShorthandAnnotationComment$2(node) || parent && (parent.type === "CallExpression" || parent.type === "OptionalCallExpression") && (hasFlowAnnotationComment$1(node.leadingComments) || hasFlowAnnotationComment$1(node.trailingComments))) || parent && (parent.type === "JSXSpreadAttribute" || parent.type === "JSXSpreadChild" || parent.type === "UnionTypeAnnotation" || parent.type === "TSUnionType" || (parent.type === "ClassDeclaration" || parent.type === "ClassExpression") && parent.superClass === node)) && !hasIgnoreComment$4(path);
+    return (node && (isJSXNode$1(node) || hasFlowShorthandAnnotationComment$2(node) || parent && (parent.type === "CallExpression" || parent.type === "OptionalCallExpression") && (hasFlowAnnotationComment$1(node.leadingComments) || hasFlowAnnotationComment$1(node.trailingComments))) || parent && (parent.type === "JSXSpreadAttribute" || parent.type === "JSXSpreadChild" || parent.type === "UnionTypeAnnotation" || parent.type === "TSUnionType" || (parent.type === "ClassDeclaration" || parent.type === "ClassExpression") && parent.superClass === node)) && (!hasIgnoreComment$4(path) || parent.type === "UnionTypeAnnotation" || parent.type === "TSUnionType");
   }
 
   function canAttachComment$1(node) {
@@ -30575,6 +30638,7 @@
   	"jsonc"
   ];
   var extensions$d = [
+  	".jsonc",
   	".sublime-build",
   	".sublime-commands",
   	".sublime-completions",
@@ -31612,19 +31676,6 @@
   }
 
   function printLine(path, value, options) {
-    const greatGrandParentNode = path.getParentNode(2);
-
-    if (greatGrandParentNode && greatGrandParentNode.type === "listItem") {
-      const parentNode = path.getParentNode();
-      const grandParentNode = path.getParentNode(1);
-      const index = grandParentNode.children.indexOf(parentNode);
-      const prevGrandParentNode = grandParentNode.children[index - 1];
-
-      if (prevGrandParentNode && prevGrandParentNode.type === "break") {
-        return "";
-      }
-    }
-
     if (options.proseWrap === "preserve" && value === "\n") {
       return hardline$c;
     }
@@ -32795,7 +32846,8 @@
   	".clang-format",
   	".clang-tidy",
   	".gemrc",
-  	"glide.lock"
+  	"glide.lock",
+  	"yarn.lock"
   ];
   var aceMode$g = "yaml";
   var codemirrorMode$c = "yaml";
@@ -32831,10 +32883,12 @@
 
   var require$$0$8 = getCjsExportFromNamespace(YAML$1);
 
-  const languages$6 = [createLanguage(require$$0$8, () => ({
+  const languages$6 = [createLanguage(require$$0$8, data => ({
     since: "1.14.0",
     parsers: ["yaml"],
-    vscodeLanguageIds: ["yaml"]
+    vscodeLanguageIds: ["yaml"],
+    // yarn.lock is not YAML: https://github.com/yarnpkg/yarn/issues/5629
+    filenames: data.filenames.filter(filename => filename !== "yarn.lock")
   }))];
   var languageYaml = {
     languages: languages$6,