prettier 2.0.0 → 2.0.4

package/standalone.js

@@ -5,7 +5,7 @@
 }(this, (function () { 'use strict';
 
   var name = "prettier";
-  var version = "2.0.0";
+  var version = "2.0.4";
   var description = "Prettier is an opinionated code formatter";
   var bin = "./bin/prettier.js";
   var repository = "prettier/prettier";
@@ -19,14 +19,14 @@
   var dependencies = {
   	"@angular/compiler": "9.0.5",
   	"@babel/code-frame": "7.8.0",
-  	"@babel/parser": "7.9.2",
-  	"@glimmer/syntax": "0.48.0",
+  	"@babel/parser": "7.9.4",
+  	"@glimmer/syntax": "0.50.0",
   	"@iarna/toml": "2.2.3",
-  	"@typescript-eslint/typescript-estree": "2.24.0",
+  	"@typescript-eslint/typescript-estree": "2.26.0",
   	"angular-estree-parser": "1.3.0",
   	"angular-html-parser": "1.4.0",
   	camelcase: "5.3.1",
-  	chalk: "3.0.0",
+  	chalk: "4.0.0",
   	"ci-info": "watson/ci-info#f43f6a1cefff47fb361c88cf4b943fdbcaafe540",
   	"cjk-regex": "2.0.0",
   	cosmiconfig: "6.0.0",
@@ -40,24 +40,25 @@
   	"fast-glob": "3.2.2",
   	"find-parent-dir": "0.3.0",
   	"find-project-root": "1.1.1",
-  	"flow-parser": "0.121.0",
+  	"flow-parser": "0.122.0",
   	"get-stream": "5.1.0",
   	globby: "11.0.0",
-  	graphql: "14.6.0",
+  	graphql: "15.0.0",
   	"html-element-attributes": "2.2.1",
   	"html-styles": "1.0.0",
   	"html-tag-names": "1.1.5",
   	ignore: "4.0.6",
-  	"jest-docblock": "25.1.0",
+  	"jest-docblock": "25.2.6",
   	"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",
@@ -71,40 +72,39 @@
   	"string-width": "4.2.0",
   	typescript: "3.8.3",
   	"unicode-regex": "3.0.0",
-  	unified: "8.4.2",
+  	unified: "9.0.0",
   	vnopts: "1.0.2",
   	"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-import": "2.20.2",
   	"eslint-plugin-prettier": "3.1.2",
   	"eslint-plugin-react": "7.19.0",
-  	"eslint-plugin-unicorn": "17.2.0",
+  	"eslint-plugin-unicorn": "18.0.1",
   	execa: "4.0.0",
-  	jest: "25.1.0",
-  	"jest-junit": "10.0.0",
+  	jest: "25.2.7",
   	"jest-snapshot-serializer-ansi": "1.0.0",
   	"jest-snapshot-serializer-raw": "1.1.0",
-  	"jest-watch-typeahead": "0.4.2",
-  	prettier: "1.19.1",
+  	"jest-watch-typeahead": "0.5.0",
+  	prettier: "2.0.3",
   	rimraf: "3.0.2",
-  	rollup: "2.1.0",
+  	rollup: "2.3.2",
   	"rollup-plugin-babel": "4.4.0",
   	"rollup-plugin-node-globals": "1.4.0",
   	"rollup-plugin-terser": "5.3.0",
@@ -114,7 +114,7 @@
   	"synchronous-promise": "2.0.10",
   	tempy: "0.5.0",
   	"terser-webpack-plugin": "2.3.5",
-  	webpack: "4.42.0"
+  	webpack: "4.42.1"
   };
   var scripts = {
   	prepublishOnly: "echo \"Error: must publish from dist/\" && exit 1",
@@ -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"
@@ -10178,7 +10178,7 @@
   const TEMPLATE_REGEX$1 = /(?:\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi;
   const STYLE_REGEX$1 = /(?:^|\.)(\w+)(?:\(([^)]*)\))?/g;
   const STRING_REGEX$1 = /^(['"])((?:\\.|(?!\1)[^\\])*)\1$/;
-  const ESCAPE_REGEX$1 = /\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.)|([^\\])/gi;
+  const ESCAPE_REGEX$1 = /\\(u(?:[a-f\d]{4}|{[a-f\d]{1,6}})|x[a-f\d]{2}|.)|([^\\])/gi;
   const ESCAPES$1 = new Map([['n', '\n'], ['r', '\r'], ['t', '\t'], ['b', '\b'], ['f', '\f'], ['v', '\v'], ['0', '\0'], ['\\', '\\'], ['e', '\u001B'], ['a', '\u0007']]);
 
   function unescape$1(c) {
@@ -10292,8 +10292,8 @@
     chunks.push(chunk.join(''));
 
     if (styles.length > 0) {
-      const errMsg = "Chalk template literal is missing ".concat(styles.length, " closing bracket").concat(styles.length === 1 ? '' : 's', " (`}`)");
-      throw new Error(errMsg);
+      const errMessage = "Chalk template literal is missing ".concat(styles.length, " closing bracket").concat(styles.length === 1 ? '' : 's', " (`}`)");
+      throw new Error(errMessage);
     }
 
     return chunks.join('');
@@ -10312,7 +10312,7 @@
   const styles = Object.create(null);
 
   const applyOptions = (object, options = {}) => {
-    if (options.level > 3 || options.level < 0) {
+    if (options.level && !(Number.isInteger(options.level) && options.level >= 0 && options.level <= 3)) {
       throw new Error('The `level` option should be an integer from 0 to 3');
     } // Detect level if not set manually
 
@@ -10323,6 +10323,7 @@
 
   class ChalkClass {
     constructor(options) {
+      // eslint-disable-next-line no-constructor-return
       return chalkFactory(options);
     }
 
@@ -10446,12 +10447,11 @@
       // Single argument is hot path, implicit coercion is faster than anything
       // eslint-disable-next-line no-implicit-coercion
       return applyStyle(builder, arguments_.length === 1 ? '' + arguments_[0] : arguments_.join(' '));
-    }; // `__proto__` is used because we must return a function, but there is
+    }; // We alter the prototype because we must return a function, but there is
     // no way to create a function with a different prototype
 
 
-    builder.__proto__ = proto; // eslint-disable-line no-proto
-
+    Object.setPrototypeOf(builder, proto);
     builder._generator = self;
     builder._styler = _styler;
     builder._isEmpty = _isEmpty;
@@ -10529,18 +10529,7 @@
     level: stderrColor ? stderrColor.level : 0
   }); // eslint-disable-line new-cap
 
-  chalk$1.stderr.supportsColor = stderrColor; // For TypeScript
-
-  chalk$1.Level = {
-    None: 0,
-    Basic: 1,
-    Ansi256: 2,
-    TrueColor: 3,
-    0: 'None',
-    1: 'Basic',
-    2: 'Ansi256',
-    3: 'TrueColor'
-  };
+  chalk$1.stderr.supportsColor = stderrColor;
   var source = chalk$1;
 
   const cliDescriptor = {
@@ -13842,6 +13831,7 @@
     try {
       fd = fs.openSync(filepath, "r");
     } catch (err) {
+      // istanbul ignore next
       return "";
     }
 
@@ -13878,13 +13868,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 +14981,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 +15085,7 @@
     printNumber,
     hasIgnoreComment,
     hasNodeIgnoreComment,
+    isNodeIgnoreComment,
     makeString,
     addLeadingComment,
     addDanglingComment,
@@ -15396,8 +15398,9 @@
       const [ind, mode, doc] = cmds.pop();
 
       if (typeof doc === "string") {
-        out.push(doc);
-        pos += getStringWidth$1(doc);
+        const formatted = newLine !== "\n" && doc.includes("\n") ? doc.replace(/\n/g, newLine) : doc;
+        out.push(formatted);
+        pos += getStringWidth$1(formatted);
       } else {
         switch (doc.type) {
           case "cursor":
@@ -17067,9 +17070,6 @@
     convertEndOfLineToChars: convertEndOfLineToChars$2
   } = endOfLine;
   const {
-    utils: {
-      mapDoc: mapDoc$1
-    },
     printer: {
       printDocToString: printDocToString$1
     },
@@ -17091,7 +17091,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;
@@ -17145,8 +17145,7 @@
 
     const astComments = attachComments(text, ast, opts);
     const doc = astToDoc(ast, opts, addAlignmentSize);
-    const eol = convertEndOfLineToChars$2(opts.endOfLine);
-    const result = printDocToString$1(opts.endOfLine === "lf" ? doc : mapDoc$1(doc, currentDoc => typeof currentDoc === "string" && currentDoc.includes("\n") ? currentDoc.replace(/\n/g, eol) : currentDoc), opts);
+    const result = printDocToString$1(doc, opts);
     ensureAllCommentsPrinted(astComments); // Remove extra leading indentation as well as the added indentation after last newline
 
     if (addAlignmentSize > 0) {
@@ -17552,7 +17551,7 @@
       markAsRoot: markAsRoot$1
     },
     utils: {
-      mapDoc: mapDoc$2
+      mapDoc: mapDoc$1
     }
   } = document;
 
@@ -17570,7 +17569,7 @@
     return null;
 
     function replaceNewlinesWithLiterallines(doc) {
-      return mapDoc$2(doc, currentDoc => typeof currentDoc === "string" && currentDoc.includes("\n") ? concat$4(currentDoc.split(/(\n)/g).map((v, i) => i % 2 === 0 ? v : literalline$1)) : currentDoc);
+      return mapDoc$1(doc, currentDoc => typeof currentDoc === "string" && currentDoc.includes("\n") ? concat$4(currentDoc.split(/(\n)/g).map((v, i) => i % 2 === 0 ? v : literalline$1)) : currentDoc);
     }
   }
 
@@ -18041,7 +18040,7 @@
 
   function isSCSS(parser, text) {
     const hasExplicitParserChoice = parser === "less" || parser === "scss";
-    const IS_POSSIBLY_SCSS = /(\w\s*: [^}:]+|#){|@import[^\n]+(url|,)/;
+    const IS_POSSIBLY_SCSS = /(\w\s*:\s*[^}:]+|#){|@import[^\n]+(?:url|,)/;
     return hasExplicitParserChoice ? parser === "scss" : IS_POSSIBLY_SCSS.test(text);
   }
 
@@ -18485,7 +18484,7 @@
           return concat$5(["@", // If a Less file ends up being parsed with the SCSS parser, Less
           // variable declarations will be parsed as at-rules with names ending
           // with a colon, so keep the original case then.
-          isDetachedRulesetCallNode$1(node) || node.name.endsWith(":") ? node.name : maybeToLowerCase$1(node.name), node.params ? concat$5([isDetachedRulesetCallNode$1(node) ? "" : isTemplatePlaceholderNode$1(node) && /^\s*\n/.test(node.raws.afterName) ? /^\s*\n\s*\n/.test(node.raws.afterName) ? concat$5([hardline$4, hardline$4]) : hardline$4 : " ", path.call(print, "params")]) : "", node.selector ? indent$2(concat$5([" ", path.call(print, "selector")])) : "", node.value ? group$1(concat$5([" ", path.call(print, "value"), isSCSSControlDirectiveNode$1(node) ? hasParensAroundNode$1(node) ? " " : line$2 : ""])) : node.name === "else" ? " " : "", node.nodes ? concat$5([isSCSSControlDirectiveNode$1(node) ? "" : " ", "{", indent$2(concat$5([node.nodes.length > 0 ? softline$1 : "", printNodeSequence(path, options, print)])), softline$1, "}"]) : isTemplatePlaceholderNodeWithoutSemiColon ? "" : ";"]);
+          isDetachedRulesetCallNode$1(node) || node.name.endsWith(":") ? node.name : maybeToLowerCase$1(node.name), node.params ? concat$5([isDetachedRulesetCallNode$1(node) ? "" : isTemplatePlaceholderNode$1(node) ? node.raws.afterName === "" ? "" : node.name.endsWith(":") ? " " : /^\s*\n\s*\n/.test(node.raws.afterName) ? concat$5([hardline$4, hardline$4]) : /^\s*\n/.test(node.raws.afterName) ? hardline$4 : " " : " ", path.call(print, "params")]) : "", node.selector ? indent$2(concat$5([" ", path.call(print, "selector")])) : "", node.value ? group$1(concat$5([" ", path.call(print, "value"), isSCSSControlDirectiveNode$1(node) ? hasParensAroundNode$1(node) ? " " : line$2 : ""])) : node.name === "else" ? " " : "", node.nodes ? concat$5([isSCSSControlDirectiveNode$1(node) ? "" : " ", "{", indent$2(concat$5([node.nodes.length > 0 ? softline$1 : "", printNodeSequence(path, options, print)])), softline$1, "}"]) : isTemplatePlaceholderNodeWithoutSemiColon ? "" : ";"]);
         }
       // postcss-media-query-parser
 
@@ -18691,6 +18690,11 @@
 
             if (!iNextNode) {
               continue;
+            } // styled.div` background: var(--${one}); `
+
+
+            if (!iPrevNode && iNode.value === "--" && iNextNode.type === "value-atword") {
+              continue;
             } // Ignore spaces before/after string interpolation (i.e. `"#{my-fn("_")}"`)
 
 
@@ -21344,7 +21348,7 @@
   }
 
   function isScriptLikeTag(node) {
-    return node.type === "element" && (node.fullName === "script" || node.fullName === "style" || node.fullName === "svg:style");
+    return node.type === "element" && (node.fullName === "script" || node.fullName === "style" || node.fullName === "svg:style" || isUnknownNamespace(node) && (node.name === "script" || node.name === "style"));
   }
 
   function isFrontMatterNode(node) {
@@ -22345,7 +22349,7 @@
     builders,
     utils: {
       stripTrailingHardline: stripTrailingHardline$1,
-      mapDoc: mapDoc$3
+      mapDoc: mapDoc$2
     }
   } = document;
   const {
@@ -22459,7 +22463,7 @@
           }, opts)), options);
 
           if (embeddedAttributeValueDoc) {
-            return concat$a([node.rawName, '="', group$9(mapDoc$3(embeddedAttributeValueDoc, doc => typeof doc === "string" ? doc.replace(/"/g, "&quot;") : doc)), '"']);
+            return concat$a([node.rawName, '="', group$9(mapDoc$2(embeddedAttributeValueDoc, doc => typeof doc === "string" ? doc.replace(/"/g, "&quot;") : doc)), '"']);
           }
 
           break;
@@ -22667,7 +22671,7 @@
     }
 
     function printBetweenLine(prevNode, nextNode) {
-      return isTextLikeNode$1(prevNode) && isTextLikeNode$1(nextNode) ? prevNode.isTrailingSpaceSensitive ? prevNode.hasTrailingSpaces ? preferHardlineAsLeadingSpaces$1(nextNode) ? hardline$7 : line$6 : "" : preferHardlineAsLeadingSpaces$1(nextNode) ? hardline$7 : softline$4 : needsToBorrowNextOpeningTagStartMarker(prevNode) && (
+      return isTextLikeNode$1(prevNode) && isTextLikeNode$1(nextNode) ? prevNode.isTrailingSpaceSensitive ? prevNode.hasTrailingSpaces ? preferHardlineAsLeadingSpaces$1(nextNode) ? hardline$7 : line$6 : "" : preferHardlineAsLeadingSpaces$1(nextNode) ? hardline$7 : softline$4 : needsToBorrowNextOpeningTagStartMarker(prevNode) && (hasPrettierIgnore$3(nextNode) ||
       /**
        *     123<a
        *          ~
@@ -23638,8 +23642,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;
@@ -23825,7 +23843,7 @@
       dedentToRoot: dedentToRoot$2
     },
     utils: {
-      mapDoc: mapDoc$4,
+      mapDoc: mapDoc$3,
       stripTrailingHardline: stripTrailingHardline$2
     }
   } = document;
@@ -23848,7 +23866,7 @@
               return idx === 0 ? currVal : prevVal + "@prettier-placeholder-" + placeholderID++ + "-id" + currVal;
             }, "");
             const doc = textToDoc(text, {
-              parser: "css"
+              parser: "scss"
             });
             return transformCssDoc(doc, path, print);
           }
@@ -23974,7 +23992,7 @@
   }
 
   function escapeTemplateCharacters(doc, raw) {
-    return mapDoc$4(doc, currentDoc => {
+    return mapDoc$3(doc, currentDoc => {
       if (!currentDoc.parts) {
         return currentDoc;
       }
@@ -24023,7 +24041,7 @@
 
     const expressions = expressionDocs.slice();
     let replaceCounter = 0;
-    const newDoc = mapDoc$4(quasisDoc, doc => {
+    const newDoc = mapDoc$3(quasisDoc, doc => {
       if (!doc || !doc.parts || !doc.parts.length) {
         return doc;
       }
@@ -24238,7 +24256,7 @@
 
     const placeholderRegex = new RegExp(composePlaceholder("(\\d+)"), "g");
     let topLevelCount = 0;
-    const contentDoc = mapDoc$4(stripTrailingHardline$2(textToDoc(text, {
+    const contentDoc = mapDoc$3(stripTrailingHardline$2(textToDoc(text, {
       parser,
 
       __onHtmlRoot(root) {
@@ -24622,8 +24640,10 @@
     return (node.type === "TypeAnnotation" || node.type === "TSTypeAnnotation") && node.typeAnnotation.type === "FunctionTypeAnnotation" && !node.static && !sameLocStart(node, node.typeAnnotation, options);
   }
 
+  const binaryishNodeTypes = new Set(["BinaryExpression", "LogicalExpression", "NGPipeExpression"]);
+
   function isBinaryish(node) {
-    return node.type === "BinaryExpression" || node.type === "LogicalExpression" || node.type === "NGPipeExpression";
+    return binaryishNodeTypes.has(node.type);
   }
 
   function isMemberish(node) {
@@ -25176,7 +25196,7 @@
     }
 
     if (node.type === "ArrayExpression") {
-      return node.elements.every(isChildSimple);
+      return node.elements.every(x => x == null || isChildSimple(x));
     }
 
     if (node.type === "CallExpression" || node.type === "OptionalCallExpression" || node.type === "NewExpression") {
@@ -25850,7 +25870,7 @@
   }
 
   function isStatement(node) {
-    return node.type === "BlockStatement" || node.type === "BreakStatement" || node.type === "ClassBody" || node.type === "ClassDeclaration" || node.type === "ClassMethod" || node.type === "ClassProperty" || node.type === "ClassPrivateProperty" || node.type === "ContinueStatement" || node.type === "DebuggerStatement" || node.type === "DeclareClass" || node.type === "DeclareExportAllDeclaration" || node.type === "DeclareExportDeclaration" || node.type === "DeclareFunction" || node.type === "DeclareInterface" || node.type === "DeclareModule" || node.type === "DeclareModuleExports" || node.type === "DeclareVariable" || node.type === "DoWhileStatement" || node.type === "EnumDeclaration" || node.type === "ExportAllDeclaration" || node.type === "ExportDefaultDeclaration" || node.type === "ExportNamedDeclaration" || node.type === "ExpressionStatement" || node.type === "ForAwaitStatement" || node.type === "ForInStatement" || node.type === "ForOfStatement" || node.type === "ForStatement" || node.type === "FunctionDeclaration" || node.type === "IfStatement" || node.type === "ImportDeclaration" || node.type === "InterfaceDeclaration" || node.type === "LabeledStatement" || node.type === "MethodDefinition" || node.type === "ReturnStatement" || node.type === "SwitchStatement" || node.type === "ThrowStatement" || node.type === "TryStatement" || node.type === "TSDeclareFunction" || node.type === "TSEnumDeclaration" || node.type === "TSImportEqualsDeclaration" || node.type === "TSInterfaceDeclaration" || node.type === "TSModuleDeclaration" || node.type === "TSNamespaceExportDeclaration" || node.type === "TypeAlias" || node.type === "VariableDeclaration" || node.type === "WhileStatement" || node.type === "WithStatement";
+    return node.type === "BlockStatement" || node.type === "BreakStatement" || node.type === "ClassBody" || node.type === "ClassDeclaration" || node.type === "ClassMethod" || node.type === "ClassProperty" || node.type === "ClassPrivateProperty" || node.type === "ContinueStatement" || node.type === "DebuggerStatement" || node.type === "DeclareClass" || node.type === "DeclareExportAllDeclaration" || node.type === "DeclareExportDeclaration" || node.type === "DeclareFunction" || node.type === "DeclareInterface" || node.type === "DeclareModule" || node.type === "DeclareModuleExports" || node.type === "DeclareVariable" || node.type === "DoWhileStatement" || node.type === "EnumDeclaration" || node.type === "ExportAllDeclaration" || node.type === "ExportDefaultDeclaration" || node.type === "ExportNamedDeclaration" || node.type === "ExpressionStatement" || node.type === "ForInStatement" || node.type === "ForOfStatement" || node.type === "ForStatement" || node.type === "FunctionDeclaration" || node.type === "IfStatement" || node.type === "ImportDeclaration" || node.type === "InterfaceDeclaration" || node.type === "LabeledStatement" || node.type === "MethodDefinition" || node.type === "ReturnStatement" || node.type === "SwitchStatement" || node.type === "ThrowStatement" || node.type === "TryStatement" || node.type === "TSDeclareFunction" || node.type === "TSEnumDeclaration" || node.type === "TSImportEqualsDeclaration" || node.type === "TSInterfaceDeclaration" || node.type === "TSModuleDeclaration" || node.type === "TSNamespaceExportDeclaration" || node.type === "TypeAlias" || node.type === "VariableDeclaration" || node.type === "WhileStatement" || node.type === "WithStatement";
   }
 
   function includesFunctionTypeInObjectType(node) {
@@ -26389,7 +26409,9 @@
         /* sameIndent */
         true)); // Only force a trailing newline if there were any contents.
 
-        if (n.body.length || n.comments) {
+        if (!n.body.every(({
+          type
+        }) => type === "EmptyStatement") || n.comments) {
           parts.push(hardline$9);
         }
 
@@ -26564,7 +26586,6 @@
 
       case "SpreadElement":
       case "SpreadElementPattern":
-      case "RestProperty":
       case "SpreadProperty":
       case "SpreadPropertyPattern":
       case "RestElement":
@@ -26931,11 +26952,23 @@
           });
 
           if (n.inexact) {
-            props.push(concat$d(separatorParts.concat(group$b("..."))));
+            let printed;
+
+            if (hasDanglingComments$1(n)) {
+              const hasLineComments = !n.comments.every(comments$1.isBlockComment);
+              const printedDanglingComments = comments.printDanglingComments(path, options,
+              /* sameIndent */
+              true);
+              printed = concat$d([printedDanglingComments, hasLineComments || hasNewline$5(options.originalText, options.locEnd(n.comments[n.comments.length - 1])) ? hardline$9 : line$9, "..."]);
+            } else {
+              printed = "...";
+            }
+
+            props.push(concat$d(separatorParts.concat(printed)));
           }
 
           const lastElem = getLast$3(n[propertiesField]);
-          const canHaveTrailingSeparator = !(lastElem && (lastElem.type === "RestProperty" || lastElem.type === "RestElement" || hasNodeIgnoreComment$2(lastElem) || n.inexact));
+          const canHaveTrailingSeparator = !(n.inexact || lastElem && (lastElem.type === "RestElement" || hasNodeIgnoreComment$2(lastElem)));
           let content;
 
           if (props.length === 0) {
@@ -27174,7 +27207,7 @@
           // semicolon, except when they in the () part of for loops.
 
           const parentNode = path.getParentNode();
-          const isParentForLoop = parentNode.type === "ForStatement" || parentNode.type === "ForInStatement" || parentNode.type === "ForOfStatement" || parentNode.type === "ForAwaitStatement";
+          const isParentForLoop = parentNode.type === "ForStatement" || parentNode.type === "ForInStatement" || parentNode.type === "ForOfStatement";
           const hasValue = n.declarations.some(decl => decl.init);
           let firstVariable;
 
@@ -27258,14 +27291,7 @@
         return group$b(concat$d([n.each ? "for each (" : "for (", path.call(print, "left"), " in ", path.call(print, "right"), ")", adjustClause(n.body, path.call(print, "body"))]));
 
       case "ForOfStatement":
-      case "ForAwaitStatement":
-        {
-          // Babel 7 removed ForAwaitStatement in favor of ForOfStatement
-          // with `"await": true`:
-          // https://github.com/estree/estree/pull/138
-          const isAwait = n.type === "ForAwaitStatement" || n.await;
-          return group$b(concat$d(["for", isAwait ? " await" : "", " (", path.call(print, "left"), " of ", path.call(print, "right"), ")", adjustClause(n.body, path.call(print, "body"))]));
-        }
+        return group$b(concat$d(["for", n.await ? " await" : "", " (", path.call(print, "left"), " of ", path.call(print, "right"), ")", adjustClause(n.body, path.call(print, "body"))]));
 
       case "DoWhileStatement":
         {
@@ -27415,8 +27441,8 @@
       case "JSXExpressionContainer":
         {
           const parent = path.getParentNode(0);
-          const preventInline = parent.type === "JSXAttribute" && n.expression.comments && n.expression.comments.length > 0;
-          const shouldInline = !preventInline && (n.expression.type === "ArrayExpression" || n.expression.type === "ObjectExpression" || n.expression.type === "ArrowFunctionExpression" || n.expression.type === "CallExpression" || n.expression.type === "OptionalCallExpression" || n.expression.type === "FunctionExpression" || n.expression.type === "JSXEmptyExpression" || n.expression.type === "TemplateLiteral" || n.expression.type === "TaggedTemplateExpression" || n.expression.type === "DoExpression" || isJSXNode$1(parent) && (n.expression.type === "ConditionalExpression" || isBinaryish$1(n.expression)));
+          const hasComments = n.expression.comments && n.expression.comments.length > 0;
+          const shouldInline = n.expression.type === "JSXEmptyExpression" || !hasComments && (n.expression.type === "ArrayExpression" || n.expression.type === "ObjectExpression" || n.expression.type === "ArrowFunctionExpression" || n.expression.type === "CallExpression" || n.expression.type === "OptionalCallExpression" || n.expression.type === "FunctionExpression" || n.expression.type === "TemplateLiteral" || n.expression.type === "TaggedTemplateExpression" || n.expression.type === "DoExpression" || isJSXNode$1(parent) && (n.expression.type === "ConditionalExpression" || isBinaryish$1(n.expression)));
 
           if (shouldInline) {
             return group$b(concat$d(["{", path.call(print, "expression"), lineSuffixBoundary$1, "}"]));
@@ -27622,7 +27648,7 @@
               if (!isSimple) {
                 // Breaks at the template element boundaries (${ and }) are preferred to breaking
                 // in the middle of a MemberExpression
-                if (n.expressions[i].comments && n.expressions[i].comments.length || n.expressions[i].type === "MemberExpression" || n.expressions[i].type === "OptionalMemberExpression" || n.expressions[i].type === "ConditionalExpression" || n.expressions[i].type === "LogicalExpression" || n.expressions[i].type === "BinaryExpression" || n.expressions[i].type === "SequenceExpression" || n.expressions[i].type === "TSAsExpression") {
+                if (n.expressions[i].comments && n.expressions[i].comments.length || n.expressions[i].type === "MemberExpression" || n.expressions[i].type === "OptionalMemberExpression" || n.expressions[i].type === "ConditionalExpression" || n.expressions[i].type === "SequenceExpression" || n.expressions[i].type === "TSAsExpression" || isBinaryish$1(n.expressions[i])) {
                   printed = concat$d([indent$7(concat$d([softline$6, printed])), softline$6]);
                 }
               }
@@ -28255,8 +28281,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 : ""]);
         }
 
@@ -28463,7 +28494,7 @@
         return "";
 
       case "NGQuotedExpression":
-        return concat$d([n.prefix, ":", n.value]);
+        return concat$d([n.prefix, ": ", n.value.trim()]);
 
       case "NGMicrosyntax":
         return concat$d(path.map((childPath, index) => concat$d([index === 0 ? "" : isNgForOf$1(childPath.getValue(), index, n) ? " " : concat$d([";", line$9]), print(childPath)]), "body"));
@@ -30020,7 +30051,7 @@
     if (node.argument) {
       if (returnArgumentHasLeadingComment$1(options, node.argument)) {
         parts.push(concat$d([" (", indent$7(concat$d([hardline$9, path.call(print, "argument")])), hardline$9, ")"]));
-      } else if (node.argument.type === "LogicalExpression" || node.argument.type === "BinaryExpression" || node.argument.type === "SequenceExpression") {
+      } else if (isBinaryish$1(node.argument) || node.argument.type === "SequenceExpression") {
         parts.push(group$b(concat$d([ifBreak$6(" (", " "), indent$7(concat$d([softline$6, path.call(print, "argument")])), softline$6, ifBreak$6(")")])));
       } else {
         parts.push(" ", path.call(print, "argument"));
@@ -30052,7 +30083,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 +30606,7 @@
   	"jsonc"
   ];
   var extensions$d = [
+  	".jsonc",
   	".sublime-build",
   	".sublime-commands",
   	".sublime-completions",
@@ -30928,7 +30960,7 @@
       markAsRoot: markAsRoot$3
     },
     utils: {
-      mapDoc: mapDoc$5
+      mapDoc: mapDoc$4
     }
   } = document;
   const {
@@ -30990,7 +31022,7 @@
     }
 
     function replaceNewlinesWithLiterallines(doc) {
-      return mapDoc$5(doc, currentDoc => typeof currentDoc === "string" && currentDoc.includes("\n") ? concat$f(currentDoc.split(/(\n)/g).map((v, i) => i % 2 === 0 ? v : literalline$5)) : currentDoc);
+      return mapDoc$4(doc, currentDoc => typeof currentDoc === "string" && currentDoc.includes("\n") ? concat$f(currentDoc.split(/(\n)/g).map((v, i) => i % 2 === 0 ? v : literalline$5)) : currentDoc);
     }
   }
 
@@ -31295,7 +31327,7 @@
       group: group$f
     },
     utils: {
-      mapDoc: mapDoc$6
+      mapDoc: mapDoc$5
     },
     printer: {
       printDocToString: printDocToString$3
@@ -31612,19 +31644,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;
     }
@@ -31876,7 +31895,7 @@
   }
 
   function normalizeDoc(doc) {
-    return mapDoc$6(doc, currentDoc => {
+    return mapDoc$5(doc, currentDoc => {
       if (!currentDoc.parts) {
         return currentDoc;
       }
@@ -32795,7 +32814,8 @@
   	".clang-format",
   	".clang-tidy",
   	".gemrc",
-  	"glide.lock"
+  	"glide.lock",
+  	"yarn.lock"
   ];
   var aceMode$g = "yaml";
   var codemirrorMode$c = "yaml";
@@ -32831,10 +32851,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,