prettier 1.11.0-rc.1 → 1.11.0

package/bin-prettier.js

@@ -190,7 +190,7 @@ function printKeyValues(key, valueOrArray) {
 unwrapExports(build);
 
 var name = "prettier";
-var version$1 = "1.11.0-rc.1";
+var version$1 = "1.11.0";
 var description = "Prettier is an opinionated code formatter";
 var bin = {"prettier":"./bin/prettier.js"};
 var repository = "prettier/prettier";
@@ -14118,6 +14118,7 @@ function printMemberChain(path$$1, options, print) {
   let i = 1;
   for (; i < printedNodes.length; ++i) {
     if (
+      printedNodes[i].node.type === "TSNonNullExpression" ||
       printedNodes[i].node.type === "CallExpression" ||
       (printedNodes[i].node.type === "MemberExpression" &&
         printedNodes[i].node.computed &&
@@ -16371,15 +16372,22 @@ function genericPrint$1(path$$1, options, print) {
       return adjustStrings(node.value, options);
     }
     case "selector-tag": {
+      const parentNode = path$$1.getParentNode();
+      const index = parentNode && parentNode.nodes.indexOf(node);
+      const prevNode = index && parentNode.nodes[index - 1];
+
       return concat$5([
         node.namespace
           ? concat$5([node.namespace === true ? "" : node.namespace.trim(), "|"])
           : "",
-        adjustNumbers(
-          isHTMLTag(node.value) || isKeyframeAtRuleKeywords(path$$1, node.value)
-            ? node.value.toLowerCase()
-            : node.value
-        )
+        prevNode.type === "selector-nesting"
+          ? node.value
+          : adjustNumbers(
+              isHTMLTag(node.value) ||
+              isKeyframeAtRuleKeywords(path$$1, node.value)
+                ? node.value.toLowerCase()
+                : node.value
+            )
       ]);
     }
     case "selector-id": {
@@ -16473,14 +16481,6 @@ function genericPrint$1(path$$1, options, print) {
 
       const printed = path$$1.map(print, "groups");
       const parts = [];
-      const hasProgidPrefix =
-        declAncestorNode &&
-        declAncestorNode.value.group &&
-        declAncestorNode.value.group.group &&
-        declAncestorNode.value.group.group.groups &&
-        declAncestorNode.value.group.group.groups[0] &&
-        declAncestorNode.value.group.group.groups[0].type === "value-word" &&
-        declAncestorNode.value.group.group.groups[0].value === "progid";
       const functionAncestorNode = getAncestorNode(path$$1, "value-func");
       const insideInFunction =
         functionAncestorNode && functionAncestorNode.value;
@@ -16511,15 +16511,6 @@ function genericPrint$1(path$$1, options, print) {
           continue;
         }
 
-        // Ignore `filter: progid:DXImageTransform.Microsoft.Gradient(params);`
-        if (
-          hasProgidPrefix &&
-          iNode.type === "value-word" &&
-          iNode.value.endsWith("=")
-        ) {
-          continue;
-        }
-
         // Ignore `@` in Less (i.e. `@@var;`)
         if (iNode.type === "value-atword" && iNode.value === "") {
           continue;
@@ -16684,7 +16675,7 @@ function genericPrint$1(path$$1, options, print) {
         return group$2(indent$4(concat$5(parts)));
       }
 
-      return group$2(hasProgidPrefix ? fill$3(parts) : indent$4(fill$3(parts)));
+      return group$2(indent$4(fill$3(parts)));
     }
     case "value-paren_group": {
       const parentNode = path$$1.getParentNode();
@@ -16767,15 +16758,7 @@ function genericPrint$1(path$$1, options, print) {
       return node.value;
     }
     case "value-colon": {
-      const parent = path$$1.getParentNode();
-      const index = getNodeIndex(path$$1, node);
-      const hasProgidPrefix =
-        parent.groups[index - 1] && parent.groups[index - 1].value === "progid";
-
-      return concat$5([
-        node.value,
-        hasProgidPrefix || insideURLFunctionNode(path$$1) ? "" : line$2
-      ]);
+      return concat$5([node.value, insideURLFunctionNode(path$$1) ? "" : line$2]);
     }
     case "value-comma": {
       return concat$5([node.value, " "]);
@@ -16839,16 +16822,6 @@ function insideURLFunctionNode(path$$1) {
   );
 }
 
-function getNodeIndex(path$$1, node) {
-  const parent = path$$1.getParentNode();
-  return (
-    parent &&
-    parent.groups &&
-    parent.groups.length > 0 &&
-    parent.groups.indexOf(node)
-  );
-}
-
 function isParenGroupNode(node) {
   return node.type && node.type === "value-paren_group";
 }
@@ -17451,7 +17424,8 @@ const languages$2 = [
     extensions: [".handlebars", ".hbs"],
     tm_scope: "text.html.handlebars",
     ace_mode: "handlebars",
-    language_id: 155
+    language_id: 155,
+    since: null // unreleased
   }
 ];
 
@@ -18455,12 +18429,7 @@ function genericPrint$3(path$$1, options, print) {
 
       return printChildren(path$$1, options, print, {
         processor: (childPath, index) => {
-          const prefix = node.ordered
-            ? (index === 0
-                ? node.start
-                : isGitDiffFriendlyOrderedList ? 1 : node.start + index) +
-              (nthSiblingIndex % 2 === 0 ? ". " : ") ")
-            : nthSiblingIndex % 2 === 0 ? "* " : "- ";
+          const prefix = getPrefix();
           return concat$8([
             prefix,
             align$2(
@@ -18468,6 +18437,23 @@ function genericPrint$3(path$$1, options, print) {
               printListItem(childPath, options, print, prefix)
             )
           ]);
+
+          function getPrefix() {
+            const rawPrefix = node.ordered
+              ? (index === 0
+                  ? node.start
+                  : isGitDiffFriendlyOrderedList ? 1 : node.start + index) +
+                (nthSiblingIndex % 2 === 0 ? ". " : ") ")
+              : nthSiblingIndex % 2 === 0 ? "* " : "- ";
+
+            // do not print trailing spaces for empty list item since it might be treated as `break` node
+            // by [doc-printer](https://github.com/prettier/prettier/blob/1.10.2/src/doc/doc-printer.js#L395-L405),
+            // we don't want to preserve unnecessary trailing spaces.
+            const listItem = childPath.getValue();
+            return listItem.children.length
+              ? alignListPrefix(rawPrefix, options)
+              : rawPrefix;
+          }
         }
       });
     }
@@ -18567,7 +18553,7 @@ function printListItem(path$$1, options, print, listPrefix) {
         }
 
         const alignment = " ".repeat(
-          clamp(options.tabWidth - listPrefix.length, 0, 3) // 4 will cause indented codeblock
+          clamp(options.tabWidth - listPrefix.length, 0, 3) // 4+ will cause indented code block
         );
         return concat$8([alignment, align$2(alignment, childPath.call(print))]);
       }
@@ -18575,6 +18561,21 @@ function printListItem(path$$1, options, print, listPrefix) {
   ]);
 }
 
+function alignListPrefix(prefix, options) {
+  const additionalSpaces = getAdditionalSpaces();
+  return (
+    prefix +
+    " ".repeat(
+      additionalSpaces >= 4 ? 0 : additionalSpaces // 4+ will cause indented code block
+    )
+  );
+
+  function getAdditionalSpaces() {
+    const restSpaces = prefix.length % options.tabWidth;
+    return restSpaces === 0 ? 0 : options.tabWidth - restSpaces;
+  }
+}
+
 function getNthListSiblingIndex(node, parentNode) {
   return getNthSiblingIndex(
     node,
@@ -19235,7 +19236,7 @@ var printerHtmlparser2 = {
 const languages$5 = [
   {
     name: "HTML",
-    since: undefined, // unreleased
+    since: null, // unreleased
     parsers: ["parse5"],
     group: "HTML",
     tmScope: "text.html.basic",
@@ -19915,7 +19916,12 @@ function getSupportInfo$1(version, opts) {
 
   const languages = plugins
     .reduce((all, plugin) => all.concat(plugin.languages), [])
-    .filter(language => language.since && semver.gte(version, language.since))
+    .filter(
+      language =>
+        language.since
+          ? semver.gte(version, language.since)
+          : language.since !== null
+    )
     .map(language => {
       // Prevent breaking changes
       if (language.name === "Markdown") {
@@ -23278,7 +23284,7 @@ function inferParser(filepath, plugins) {
     pluginsLoaded: true
   }).languages.find(
     language =>
-      typeof language.since === "string" &&
+      language.since !== null &&
       (language.extensions.indexOf(extension) > -1 ||
         (language.filenames &&
           language.filenames.find(name => name.toLowerCase() === filename)))
@@ -32220,7 +32226,7 @@ var resolveConfigEditorconfig = createCommonjsModule(function (module) {
 
 const maybeParse = (filePath, config, parse) => {
   const root = findProjectRoot(path.dirname(path.resolve(filePath)));
-  return filePath && !config && parse(filePath, { root });
+  return filePath && parse(filePath, { root });
 };
 
 const editorconfigAsyncNoCache = (filePath, config) => {

package/index.js

@@ -187,7 +187,7 @@ function printKeyValues(key, valueOrArray) {
 unwrapExports(build);
 
 var name = "prettier";
-var version$1 = "1.11.0-rc.1";
+var version$1 = "1.11.0";
 var description = "Prettier is an opinionated code formatter";
 var bin = {"prettier":"./bin/prettier.js"};
 var repository = "prettier/prettier";
@@ -14066,6 +14066,7 @@ function printMemberChain(path$$1, options, print) {
   let i = 1;
   for (; i < printedNodes.length; ++i) {
     if (
+      printedNodes[i].node.type === "TSNonNullExpression" ||
       printedNodes[i].node.type === "CallExpression" ||
       (printedNodes[i].node.type === "MemberExpression" &&
         printedNodes[i].node.computed &&
@@ -16319,15 +16320,22 @@ function genericPrint$1(path$$1, options, print) {
       return adjustStrings(node.value, options);
     }
     case "selector-tag": {
+      const parentNode = path$$1.getParentNode();
+      const index = parentNode && parentNode.nodes.indexOf(node);
+      const prevNode = index && parentNode.nodes[index - 1];
+
       return concat$5([
         node.namespace
           ? concat$5([node.namespace === true ? "" : node.namespace.trim(), "|"])
           : "",
-        adjustNumbers(
-          isHTMLTag(node.value) || isKeyframeAtRuleKeywords(path$$1, node.value)
-            ? node.value.toLowerCase()
-            : node.value
-        )
+        prevNode.type === "selector-nesting"
+          ? node.value
+          : adjustNumbers(
+              isHTMLTag(node.value) ||
+              isKeyframeAtRuleKeywords(path$$1, node.value)
+                ? node.value.toLowerCase()
+                : node.value
+            )
       ]);
     }
     case "selector-id": {
@@ -16421,14 +16429,6 @@ function genericPrint$1(path$$1, options, print) {
 
       const printed = path$$1.map(print, "groups");
       const parts = [];
-      const hasProgidPrefix =
-        declAncestorNode &&
-        declAncestorNode.value.group &&
-        declAncestorNode.value.group.group &&
-        declAncestorNode.value.group.group.groups &&
-        declAncestorNode.value.group.group.groups[0] &&
-        declAncestorNode.value.group.group.groups[0].type === "value-word" &&
-        declAncestorNode.value.group.group.groups[0].value === "progid";
       const functionAncestorNode = getAncestorNode(path$$1, "value-func");
       const insideInFunction =
         functionAncestorNode && functionAncestorNode.value;
@@ -16459,15 +16459,6 @@ function genericPrint$1(path$$1, options, print) {
           continue;
         }
 
-        // Ignore `filter: progid:DXImageTransform.Microsoft.Gradient(params);`
-        if (
-          hasProgidPrefix &&
-          iNode.type === "value-word" &&
-          iNode.value.endsWith("=")
-        ) {
-          continue;
-        }
-
         // Ignore `@` in Less (i.e. `@@var;`)
         if (iNode.type === "value-atword" && iNode.value === "") {
           continue;
@@ -16632,7 +16623,7 @@ function genericPrint$1(path$$1, options, print) {
         return group$2(indent$4(concat$5(parts)));
       }
 
-      return group$2(hasProgidPrefix ? fill$3(parts) : indent$4(fill$3(parts)));
+      return group$2(indent$4(fill$3(parts)));
     }
     case "value-paren_group": {
       const parentNode = path$$1.getParentNode();
@@ -16715,15 +16706,7 @@ function genericPrint$1(path$$1, options, print) {
       return node.value;
     }
     case "value-colon": {
-      const parent = path$$1.getParentNode();
-      const index = getNodeIndex(path$$1, node);
-      const hasProgidPrefix =
-        parent.groups[index - 1] && parent.groups[index - 1].value === "progid";
-
-      return concat$5([
-        node.value,
-        hasProgidPrefix || insideURLFunctionNode(path$$1) ? "" : line$2
-      ]);
+      return concat$5([node.value, insideURLFunctionNode(path$$1) ? "" : line$2]);
     }
     case "value-comma": {
       return concat$5([node.value, " "]);
@@ -16787,16 +16770,6 @@ function insideURLFunctionNode(path$$1) {
   );
 }
 
-function getNodeIndex(path$$1, node) {
-  const parent = path$$1.getParentNode();
-  return (
-    parent &&
-    parent.groups &&
-    parent.groups.length > 0 &&
-    parent.groups.indexOf(node)
-  );
-}
-
 function isParenGroupNode(node) {
   return node.type && node.type === "value-paren_group";
 }
@@ -17399,7 +17372,8 @@ const languages$2 = [
     extensions: [".handlebars", ".hbs"],
     tm_scope: "text.html.handlebars",
     ace_mode: "handlebars",
-    language_id: 155
+    language_id: 155,
+    since: null // unreleased
   }
 ];
 
@@ -18403,12 +18377,7 @@ function genericPrint$3(path$$1, options, print) {
 
       return printChildren(path$$1, options, print, {
         processor: (childPath, index) => {
-          const prefix = node.ordered
-            ? (index === 0
-                ? node.start
-                : isGitDiffFriendlyOrderedList ? 1 : node.start + index) +
-              (nthSiblingIndex % 2 === 0 ? ". " : ") ")
-            : nthSiblingIndex % 2 === 0 ? "* " : "- ";
+          const prefix = getPrefix();
           return concat$8([
             prefix,
             align$2(
@@ -18416,6 +18385,23 @@ function genericPrint$3(path$$1, options, print) {
               printListItem(childPath, options, print, prefix)
             )
           ]);
+
+          function getPrefix() {
+            const rawPrefix = node.ordered
+              ? (index === 0
+                  ? node.start
+                  : isGitDiffFriendlyOrderedList ? 1 : node.start + index) +
+                (nthSiblingIndex % 2 === 0 ? ". " : ") ")
+              : nthSiblingIndex % 2 === 0 ? "* " : "- ";
+
+            // do not print trailing spaces for empty list item since it might be treated as `break` node
+            // by [doc-printer](https://github.com/prettier/prettier/blob/1.10.2/src/doc/doc-printer.js#L395-L405),
+            // we don't want to preserve unnecessary trailing spaces.
+            const listItem = childPath.getValue();
+            return listItem.children.length
+              ? alignListPrefix(rawPrefix, options)
+              : rawPrefix;
+          }
         }
       });
     }
@@ -18515,7 +18501,7 @@ function printListItem(path$$1, options, print, listPrefix) {
         }
 
         const alignment = " ".repeat(
-          clamp(options.tabWidth - listPrefix.length, 0, 3) // 4 will cause indented codeblock
+          clamp(options.tabWidth - listPrefix.length, 0, 3) // 4+ will cause indented code block
         );
         return concat$8([alignment, align$2(alignment, childPath.call(print))]);
       }
@@ -18523,6 +18509,21 @@ function printListItem(path$$1, options, print, listPrefix) {
   ]);
 }
 
+function alignListPrefix(prefix, options) {
+  const additionalSpaces = getAdditionalSpaces();
+  return (
+    prefix +
+    " ".repeat(
+      additionalSpaces >= 4 ? 0 : additionalSpaces // 4+ will cause indented code block
+    )
+  );
+
+  function getAdditionalSpaces() {
+    const restSpaces = prefix.length % options.tabWidth;
+    return restSpaces === 0 ? 0 : options.tabWidth - restSpaces;
+  }
+}
+
 function getNthListSiblingIndex(node, parentNode) {
   return getNthSiblingIndex(
     node,
@@ -19183,7 +19184,7 @@ var printerHtmlparser2 = {
 const languages$5 = [
   {
     name: "HTML",
-    since: undefined, // unreleased
+    since: null, // unreleased
     parsers: ["parse5"],
     group: "HTML",
     tmScope: "text.html.basic",
@@ -19863,7 +19864,12 @@ function getSupportInfo$1(version, opts) {
 
   const languages = plugins
     .reduce((all, plugin) => all.concat(plugin.languages), [])
-    .filter(language => language.since && semver.gte(version, language.since))
+    .filter(
+      language =>
+        language.since
+          ? semver.gte(version, language.since)
+          : language.since !== null
+    )
     .map(language => {
       // Prevent breaking changes
       if (language.name === "Markdown") {
@@ -23226,7 +23232,7 @@ function inferParser(filepath, plugins) {
     pluginsLoaded: true
   }).languages.find(
     language =>
-      typeof language.since === "string" &&
+      language.since !== null &&
       (language.extensions.indexOf(extension) > -1 ||
         (language.filenames &&
           language.filenames.find(name => name.toLowerCase() === filename)))
@@ -32168,7 +32174,7 @@ var resolveConfigEditorconfig = createCommonjsModule(function (module) {
 
 const maybeParse = (filePath, config, parse) => {
   const root = findProjectRoot(path.dirname(path.resolve(filePath)));
-  return filePath && !config && parse(filePath, { root });
+  return filePath && parse(filePath, { root });
 };
 
 const editorconfigAsyncNoCache = (filePath, config) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "1.11.0-rc.1",
+  "version": "1.11.0",
   "description": "Prettier is an opinionated code formatter",
   "bin": "./bin-prettier.js",
   "repository": "prettier/prettier",

package/parser-postcss.js

@@ -40186,6 +40186,10 @@ function parseNestedCSS(node) {
           }
         }
 
+        if (value.startsWith("progid:")) {
+          return node;
+        }
+
         node.value = parseValue(value);
       } catch (e) {
         throw createError(