prettier 1.2.3 → 1.5.0

data/src/ruby/printer.js

@@ -54,8 +54,6 @@ function getCommentChildNodes(node) {
   switch (node.type) {
     case "heredoc":
       return [node.beging];
-    case "rescue":
-      return [].concat(node.body[0]).concat(node.body.slice(1));
     case "aryptn":
       return [node.body[0]]
         .concat(node.body[1])

data/src/ruby/toProc.js

@@ -12,15 +12,11 @@ const isCall = (node) => ["::", "."].includes(node) || node.type === "@period";
 //
 // This works with `do` blocks as well.
 const toProc = (path, node) => {
-  if (!node) {
-    return null;
-  }
-
   const [variables, blockContents] = node.body;
 
   // Ensure that there are variables being passed to this block.
   const params = variables && variables.body[0];
-  if (!params || params.type !== "params") {
+  if (!params) {
     return null;
   }
 
@@ -39,7 +35,7 @@ const toProc = (path, node) => {
   if (blockContents.type === "bodystmt") {
     // We’re in a `do` block
     const blockStatements = blockContents.body[0];
-    const rescueElseEnsure = blockStatements.body.slice(1);
+    const rescueElseEnsure = blockContents.body.slice(1);
 
     // You can’t use the to_proc shortcut if you’re rescuing
     if (rescueElseEnsure.some(Boolean)) {
@@ -84,7 +80,7 @@ const toProc = (path, node) => {
 
   if (path.getValue().type === "method_add_block") {
     assocNode = path.getParentNode();
-  } else if (path.getValue().type === "args") {
+  } else {
     assocNode = path.getParentNode(2);
   }
 
@@ -97,7 +93,7 @@ const toProc = (path, node) => {
 
     if (
       key.type === "symbol_literal" &&
-      ["if", "unless"].includes(key.body[0].body[0].body)
+      ["if", "unless"].includes(key.body[0].body)
     ) {
       return null;
     }

data/src/utils.js

@@ -1,6 +1,7 @@
 module.exports = {
   containsAssignment: require("./utils/containsAssignment"),
   getTrailingComma: require("./utils/getTrailingComma"),
+  isEmptyBodyStmt: require("./utils/isEmptyBodyStmt"),
   isEmptyStmts: require("./utils/isEmptyStmts"),
   hasAncestor: require("./utils/hasAncestor"),
   literal: require("./utils/literal"),

data/src/utils/isEmptyBodyStmt.js

@@ -0,0 +1,7 @@
+const isEmptyStmts = require("./isEmptyStmts");
+
+function isEmptyBodyStmt(node) {
+  return isEmptyStmts(node.body[0]) && !node.body.slice(1).some(Boolean);
+}
+
+module.exports = isEmptyBodyStmt;

data/src/utils/isEmptyStmts.js

@@ -1,7 +1,11 @@
-const isEmptyStmts = (node) =>
-  node &&
-  node.type === "stmts" &&
-  node.body.length === 1 &&
-  node.body[0].type === "void_stmt";
+function isEmptyStmts(node) {
+  return (
+    node &&
+    node.type === "stmts" &&
+    node.body.length === 1 &&
+    node.body[0].type === "void_stmt" &&
+    !node.body[0].comments
+  );
+}
 
 module.exports = isEmptyStmts;

data/src/utils/makeCall.js

@@ -1,6 +1,9 @@
 function makeCall(path, opts, print) {
   const operation = path.getValue().body[1];
 
+  // Ignoring the next block for coverage information because it's only relevant
+  // in Ruby 2.5 and below.
+  /* istanbul ignore next */
   if ([".", "&."].includes(operation)) {
     return operation;
   }

data/src/utils/noIndent.js

@@ -4,6 +4,7 @@ const noIndent = [
   "heredoc",
   "if",
   "method_add_block",
+  "unless",
   "xstring_literal"
 ];
 

data/src/utils/printEmptyCollection.js

@@ -1,5 +1,11 @@
 const { concat, group, hardline, indent, join, line } = require("../prettier");
 
+function containedWithin(node) {
+  return function containedWithinNode(comment) {
+    return comment.sc >= node.sc && comment.ec <= node.ec;
+  };
+}
+
 // Empty collections are array or hash literals that do not contain any
 // contents. They can, however, have comments inside the body. You can solve
 // this by having a child node inside the array that gets the comments attached
@@ -7,11 +13,12 @@ const { concat, group, hardline, indent, join, line } = require("../prettier");
 // print out the non-leading comments here.
 function printEmptyCollection(path, opts, startToken, endToken) {
   const node = path.getValue();
+  const containedWithinNode = containedWithin(node);
 
   // If there are no comments or only leading comments, then we can just print
   // out the start and end token and be done, as there are no comments inside
   // the body of this node.
-  if (!node.comments || !node.comments.some((comment) => !comment.leading)) {
+  if (!node.comments || !node.comments.some(containedWithinNode)) {
     return `${startToken}${endToken}`;
   }
 
@@ -21,7 +28,7 @@ function printEmptyCollection(path, opts, startToken, endToken) {
   const printComment = (commentPath) => {
     const comment = commentPath.getValue();
 
-    if (!comment.leading) {
+    if (containedWithinNode(comment)) {
       comment.printed = true;
       comments.push(opts.printer.printComment(commentPath));
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Kevin Deisz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-03 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -30,8 +30,31 @@ files:
 - node_modules/prettier/index.js
 - node_modules/prettier/third-party.js
 - package.json
+- rubocop.yml
+- src/haml/embed.js
+- src/haml/nodes/comment.js
+- src/haml/nodes/doctype.js
+- src/haml/nodes/filter.js
+- src/haml/nodes/hamlComment.js
+- src/haml/nodes/plain.js
+- src/haml/nodes/root.js
+- src/haml/nodes/script.js
+- src/haml/nodes/silentScript.js
+- src/haml/nodes/tag.js
+- src/haml/parser.js
+- src/haml/parser.rb
+- src/haml/printer.js
+- src/parser/getLang.js
+- src/parser/getNetcat.js
+- src/parser/netcat.js
+- src/parser/parseSync.js
+- src/parser/requestParse.js
+- src/parser/server.rb
 - src/plugin.js
 - src/prettier.js
+- src/rbs/parser.js
+- src/rbs/parser.rb
+- src/rbs/printer.js
 - src/ruby/embed.js
 - src/ruby/nodes.js
 - src/ruby/nodes/alias.js
@@ -74,6 +97,7 @@ files:
 - src/utils/getTrailingComma.js
 - src/utils/hasAncestor.js
 - src/utils/inlineEnsureParens.js
+- src/utils/isEmptyBodyStmt.js
 - src/utils/isEmptyStmts.js
 - src/utils/literal.js
 - src/utils/literalLineNoBreak.js