prettier 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3abef3acea4e49130ba81afdb9bc00e73277c69e0254a1087b2c5e47feb5b104
-  data.tar.gz: e851f061fc14352b7797ac0e2aca10c43f052b8bd19aa817473cfb6b75bde44c
+  metadata.gz: d7cbdd107fd5e3baad2ba213347858ef7eb45789ac6d716924b4df76f0c08eeb
+  data.tar.gz: af6af93bb28ec649ffddc3190f0a61fc9516cef6249f37968ab02e8c3606d80a
 SHA512:
-  metadata.gz: 6fd8aba1071ff34709e7f3ad3ddd256cfbdc890ffb02fdef3d3567331a53d9b1974d02fd943ce03cab565822d750288bbe5582bc3c4a2d26bf0f170d2c3d15c6
-  data.tar.gz: 8e66f396c113f162fb6c8c747a60d45dd38a554c13cab3ac1ae12456ff15fc49d2945ce69c1db53d89f1f82a69d0b30017ebfdcd99fbb2cb2fbbc29c4dbf398b
+  metadata.gz: 44e9831cbb10a8577f1bc7637775c9edf42765769338a355bb88b96cc6215f826a6ee7098eff1791c522c8d39d46c20a9f77082472704e7b10be04f37699d238
+  data.tar.gz: c2a7fe8fed19e9cefd90a322ab8e2bef45c83d360f07ba9f18d301961ca28e552719f7851fd27c2a9cb68c13d985dcd85555a345aa12ad9d0fe4ac2e10de531d

data/CHANGELOG.md

@@ -6,6 +6,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [1.2.2] - 2021-01-01
+
+### Changed
+
+- [@nathan-beam] - Gem does not work with CMD/Powershell.
+- [@blampe], [@kddeisz] - Comments inside keyword parameters in method declarations are not printed.
+- [@blampe], [@kddeisz] - `command_call` nodes with unary operators incorrectly parse their operator.
+- [@blampe], [@kddeisz] - Returning multiple values where the first has parentheses was incorrectly removing the remaining values.
+- [@johncsnyder], [@kddeisz] - Call chains whose left-most receiver is a no-indent expression should not indent their entire chain.
+
 ## [1.2.1] - 2020-12-27
 
 ### Changed
@@ -988,7 +998,10 @@ would previously result in `array[]`, but now prints properly.
 
 - Initial release 🎉
 
-[unreleased]: https://github.com/prettier/plugin-ruby/compare/v1.1.0...HEAD
+[unreleased]: https://github.com/prettier/plugin-ruby/compare/v1.2.2...HEAD
+[1.2.2]: https://github.com/prettier/plugin-ruby/compare/v1.2.1...v1.2.2
+[1.2.1]: https://github.com/prettier/plugin-ruby/compare/v1.2.0...v1.2.1
+[1.2.0]: https://github.com/prettier/plugin-ruby/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/prettier/plugin-ruby/compare/v1.0.1...v1.1.0
 [1.0.1]: https://github.com/prettier/plugin-ruby/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/prettier/plugin-ruby/compare/v1.0.0-rc2...v1.0.0
@@ -1049,6 +1062,7 @@ would previously result in `array[]`, but now prints properly.
 [@andyw8]: https://github.com/andyw8
 [@ashfurrow]: https://github.com/ashfurrow
 [@awinograd]: https://github.com/awinograd
+[@blampe]: https://github.com/blampe
 [@bugthing]: https://github.com/bugthing
 [@cbothner]: https://github.com/cbothner
 [@christoomey]: https://github.com/christoomey
@@ -1088,6 +1102,7 @@ would previously result in `array[]`, but now prints properly.
 [@meleyal]: https://github.com/meleyal
 [@mmainz]: https://github.com/mmainz
 [@mmcnl]: https://github.com/mmcnl
+[@nathan-beam]: https://github.com/nathan-beam
 [@noahtheduke]: https://github.com/NoahTheDuke
 [@overload119]: https://github.com/Overload119
 [@petevk]: https://github.com/petevk

data/README.md

@@ -230,6 +230,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/rindek"><img src="https://avatars1.githubusercontent.com/u/881209?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jacek Jakubik</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/issues?q=author%3Arindek" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://twitter.com/ykpythemind"><img src="https://avatars2.githubusercontent.com/u/22209702?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yukito Ito</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/issues?q=author%3Aykpythemind" title="Bug reports">🐛</a> <a href="https://github.com/prettier/plugin-ruby/commits?author=ykpythemind" title="Code">💻</a></td>
     <td align="center"><a href="https://studyfied.com/"><img src="https://avatars2.githubusercontent.com/u/45869605?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Karan Mandal</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/issues?q=author%3Akaranmandal" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="http://nathanbeam.codes/"><img src="https://avatars3.githubusercontent.com/u/24681333?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathan Beam</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/issues?q=author%3Anathan-beam" title="Bug reports">🐛</a> <a href="https://github.com/prettier/plugin-ruby/commits?author=nathan-beam" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/blampe"><img src="https://avatars3.githubusercontent.com/u/848843?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bryce Lampe</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/issues?q=author%3Ablampe" title="Bug reports">🐛</a></td>
   </tr>
 </table>
 

data/lib/prettier.rb

@@ -9,8 +9,8 @@ module Prettier
 
   class << self
     def run(args)
-      quoted = args.map { |arg| arg.start_with?('-') ? arg : "'#{arg}'" }
-      command = "node #{BINARY} --plugin '#{PLUGIN}' #{quoted.join(' ')}"
+      quoted = args.map { |arg| arg.start_with?('-') ? arg : "\"#{arg}\"" }
+      command = "node #{BINARY} --plugin \"#{PLUGIN}\" #{quoted.join(' ')}"
 
       system({ 'RBPRETTIER' => '1' }, command)
     end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prettier/plugin-ruby",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "prettier plugin for the Ruby programming language",
   "main": "src/ruby.js",
   "scripts": {

data/src/nodes/calls.js

@@ -41,15 +41,18 @@ function printCall(path, opts, print) {
     parentNode.chain = (node.chain || 0) + 1;
     parentNode.callChain = (node.callChain || 0) + 1;
     parentNode.breakDoc = (node.breakDoc || [receiverDoc]).concat(rightSideDoc);
+    parentNode.firstReceiverType = node.firstReceiverType || receiverNode.type;
   }
 
   // If we're at the top of a chain, then we're going to print out a nice
   // multi-line layout if this doesn't break into multiple lines.
   if (!chained.includes(parentNode.type) && (node.chain || 0) >= 3) {
-    return ifBreak(
-      group(indent(concat(node.breakDoc.concat(rightSideDoc)))),
-      concat([receiverDoc, group(rightSideDoc)])
-    );
+    let breakDoc = concat(node.breakDoc.concat(rightSideDoc));
+    if (!noIndent.includes(node.firstReceiverType)) {
+      breakDoc = indent(breakDoc);
+    }
+
+    return ifBreak(group(breakDoc), concat([receiverDoc, group(rightSideDoc)]));
   }
 
   // For certain left sides of the call nodes, we want to attach directly to
@@ -105,6 +108,7 @@ function printMethodAddArg(path, opts, print) {
   if (chained.includes(parentNode.type)) {
     parentNode.chain = (node.chain || 0) + 1;
     parentNode.breakDoc = (node.breakDoc || [methodDoc]).concat(argsDoc);
+    parentNode.firstReceiverType = node.firstReceiverType;
   }
 
   // If we're at the top of a chain, then we're going to print out a nice
@@ -152,7 +156,7 @@ function isSorbetTypeAnnotation(node) {
     callNode.body[0].body[0].body === "sig" &&
     callNode.body[1].type === "args" &&
     callNode.body[1].body.length === 0 &&
-    blockNode.type === "brace_block"
+    blockNode
   );
 }
 
@@ -198,6 +202,7 @@ function printMethodAddBlock(path, opts, print) {
   if (chained.includes(parentNode.type)) {
     parentNode.chain = (node.chain || 0) + 1;
     parentNode.breakDoc = (node.breakDoc || [callDoc]).concat(blockDoc);
+    parentNode.firstReceiverType = node.firstReceiverType;
   }
 
   // If we're at the top of a chain, then we're going to print out a nice

data/src/nodes/return.js

@@ -13,10 +13,13 @@ const { literal } = require("../utils");
 // because they have low enough operator precedence that you need to explicitly
 // keep them in there.
 const canSkipParens = (args) => {
-  const statement = args.body[0].body[0].body[0];
-  return (
-    statement.type !== "binary" || !["and", "or"].includes(statement.body[1])
-  );
+  const stmts = args.body[0].body[0];
+  if (stmts.comments) {
+    return false;
+  }
+
+  const stmt = stmts.body[0];
+  return stmt.type !== "binary" || !["and", "or"].includes(stmt.body[1]);
 };
 
 const printReturn = (path, opts, print) => {
@@ -27,25 +30,27 @@ const printReturn = (path, opts, print) => {
     return "return";
   }
 
-  // If the body of the return contains parens, then just skip directly to the
-  // content of the parens so that we can skip printing parens if we don't
-  // want them.
-  if (args.body[0] && args.body[0].type === "paren" && canSkipParens(args)) {
-    args = args.body[0].body[0];
-    steps = steps.concat("body", 0, "body", 0);
-  }
+  if (args.body.length === 1) {
+    // If the body of the return contains parens, then just skip directly to the
+    // content of the parens so that we can skip printing parens if we don't
+    // want them.
+    if (args.body[0] && args.body[0].type === "paren" && canSkipParens(args)) {
+      args = args.body[0].body[0];
+      steps = steps.concat("body", 0, "body", 0);
+    }
 
-  // If we're returning an array literal that isn't a special array, single
-  // element array, or an empty array, then we want to grab the arguments so
-  // that we can print them out as if they were normal return arguments.
-  if (
-    args.body[0] &&
-    args.body[0].type === "array" &&
-    args.body[0].body[0] &&
-    args.body[0].body[0].body.length > 1 &&
-    ["args", "args_add_star"].includes(args.body[0].body[0].type)
-  ) {
-    steps = steps.concat("body", 0, "body", 0);
+    // If we're returning an array literal that isn't a special array, single
+    // element array, or an empty array, then we want to grab the arguments so
+    // that we can print them out as if they were normal return arguments.
+    if (
+      args.body[0] &&
+      args.body[0].type === "array" &&
+      args.body[0].body[0] &&
+      args.body[0].body[0].body.length > 1 &&
+      ["args", "args_add_star"].includes(args.body[0].body[0].type)
+    ) {
+      steps = steps.concat("body", 0, "body", 0);
+    }
   }
 
   // Now that we've established which actual node is the arguments to return,
@@ -56,6 +61,12 @@ const printReturn = (path, opts, print) => {
   // be a singular doc as opposed to an array.
   const value = Array.isArray(parts) ? join(concat([",", line]), parts) : parts;
 
+  // We only get here if we have comments somewhere that would prevent us from
+  // skipping the parentheses.
+  if (args.body.length === 1 && args.body[0].type === "paren") {
+    return concat(["return", value]);
+  }
+
   return group(
     concat([
       "return",

data/src/parser.rb

@@ -753,6 +753,11 @@ class Prettier::Parser < Ripper
   # of the method, the operator being used to send the method, the name of
   # the method, and the arguments being passed to the method.
   def on_command_call(receiver, oper, ident, args)
+    # Make sure we take the operator out of the scanner events so that it
+    # doesn't get confused for a unary operator later.
+    scanner_events.delete(oper)
+
+    # Grab the ending from either the arguments or the method being sent
     ending = args || ident
 
     {

data/src/printer.js

@@ -67,6 +67,38 @@ function getCommentChildNodes(node) {
 
       return [node.body[0]].concat(values).concat(node.body[2]);
     }
+    case "params": {
+      const [reqs, optls, rest, post, kwargs, kwargRest, block] = node.body;
+      let parts = reqs || [];
+
+      (optls || []).forEach((optl) => {
+        parts = parts.concat(optl);
+      });
+
+      if (rest) {
+        parts.push(rest);
+      }
+
+      parts = parts.concat(post || []);
+
+      (kwargs || []).forEach((kwarg) => {
+        if (kwarg[1]) {
+          parts = parts.concat(kwarg);
+        } else {
+          parts.push(kwarg[0]);
+        }
+      });
+
+      if (kwargRest && kwargRest !== "nil") {
+        parts.push(kwargRest);
+      }
+
+      if (block) {
+        parts.push(block);
+      }
+
+      return parts;
+    }
     default:
       return node.body;
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Kevin Deisz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-27 00:00:00.000000000 Z
+date: 2021-01-01 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: prettier plugin for the Ruby programming language