prettier 1.2.3 → 1.2.4

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/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;
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Kevin Deisz
@@ -30,6 +30,7 @@ files:
 - node_modules/prettier/index.js
 - node_modules/prettier/third-party.js
 - package.json
+- rubocop.yml
 - src/plugin.js
 - src/prettier.js
 - src/ruby/embed.js