prettier 1.6.0 → 1.6.1

data/package.json

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

data/src/ruby/nodes/calls.js

@@ -33,12 +33,23 @@ function printCall(path, opts, print) {
 
   // The right side of the call node, as in everything including the operator
   // and beyond.
-  const rightSideDoc = concat([
+  let rightSideDoc = concat([
     receiverNode.comments ? hardline : softline,
     operatorDoc,
     messageDoc
   ]);
 
+  // This is very specialized behavior wherein we group .where.not calls
+  // together because it looks better. For more information, see
+  // https://github.com/prettier/plugin-ruby/issues/862.
+  if (
+    receiverNode.type === "call" &&
+    receiverNode.body[2].body === "where" &&
+    messageDoc === "not"
+  ) {
+    rightSideDoc = concat([operatorDoc, messageDoc]);
+  }
+
   // Get a reference to the parent node so we can check if we're inside a chain
   const parentNode = path.getParentNode();
 
@@ -110,9 +121,38 @@ function printMethodAddArg(path, opts, print) {
     parentNode.firstReceiverType = node.firstReceiverType;
   }
 
+  // This is the threshold at which we will start to try to make a nicely
+  // indented call chain. For the most part, it's always 3.
+  let threshold = 3;
+
+  // Here, we have very specialized behavior where if we're within a sig block,
+  // then we're going to assume we're creating a Sorbet type signature. In that
+  // case, we really want the threshold to be lowered to 2 so that we create
+  // method chains off of any two method calls within the block. For more
+  // details, see
+  // https://github.com/prettier/plugin-ruby/issues/863.
+  let sigBlock = path.getParentNode(2);
+  if (sigBlock) {
+    // If we're at a do_block, then we want to go one more level up. This is
+    // because do_blocks have bodystmt nodes instead of just stmt nodes.
+    if (sigBlock.type === "do_block") {
+      sigBlock = path.getParentNode(3);
+    }
+
+    if (
+      sigBlock.type === "method_add_block" &&
+      sigBlock.body[1] &&
+      sigBlock.body[0].type === "method_add_arg" &&
+      sigBlock.body[0].body[0].type === "fcall" &&
+      sigBlock.body[0].body[0].body[0].body === "sig"
+    ) {
+      threshold = 2;
+    }
+  }
+
   // 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) {
+  if (!chained.includes(parentNode.type) && (node.chain || 0) >= threshold) {
     // This is pretty specialized behavior. Basically if we're at the top of a
     // chain but we've only had method calls without arguments and now we have
     // arguments, then we're effectively trying to call a method with arguments

data/src/ruby/nodes/strings.js

@@ -152,8 +152,10 @@ function printDynaSymbol(path, opts, print) {
   if (isQuoteLocked(node)) {
     if (node.quote.startsWith("%")) {
       quote = opts.rubySingleQuote ? "'" : '"';
-    } else {
+    } else if (node.quote.startsWith(":")) {
       quote = node.quote.slice(1);
+    } else {
+      quote = node.quote;
     }
   } else {
     quote = opts.rubySingleQuote && isSingleQuotable(node) ? "'" : '"';

data/src/utils/noIndent.js

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Kevin Deisz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2021-06-30 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -27,7 +27,9 @@ files:
 - lib/prettier.rb
 - lib/prettier/rake/task.rb
 - node_modules/prettier/bin-prettier.js
+- node_modules/prettier/doc.js
 - node_modules/prettier/index.js
+- node_modules/prettier/package.json
 - node_modules/prettier/parser-angular.js
 - node_modules/prettier/parser-babel.js
 - node_modules/prettier/parser-espree.js