Fix for #929

CHANGELOG.md

@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - [#957](https://github.com/prettier/plugin-ruby/issues/957) - azz, kddnewton - Make it so that the format pragma does not have to be on the first line of the file.
 - [#895](https://github.com/prettier/plugin-ruby/issues/895) - rsslldnphy, kddnewton - Ensure quotes are properly escaped in the content of a hash value for HAML attributes.
 - [#900](https://github.com/prettier/plugin-ruby/issues/900) - rsslldnphy, kddnewton - Ensure that in a HAML line where you have interpolation inside of a tag content that you print it properly.
+- [#929](https://github.com/prettier/plugin-ruby/issues/929) - ryanb, kddnewton - Deeply nested blocks should not break their call chains.
 
 ## [1.6.1] - 2021-06-30
 

src/ruby/nodes/calls.ts

@@ -253,6 +253,22 @@ export const printMethodAddBlock: Plugin.Printer<ChainedMethodAddBlock> = (
     (node.chain || 0) >= 3 &&
     node.breakDoc
   ) {
+    // 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
+    // a method call with a block, then we're effectively trying to call a
+    // method with arguments that is nested under a bunch of stuff. So we group
+    // together to first part to make it so just the block breaks. This looks
+    // like, for example:
+    //
+    //     Rails.application.routes.draw do
+    //       root 'articles#index'
+    //       resources :articles
+    //     end
+    //
+    if (node.callChain === node.chain) {
+      return [group(indent(node.breakDoc)), group(blockDoc)];
+    }
+
     return ifBreak(group(indent(node.breakDoc.concat(blockDoc))), [
       callDoc,
       blockDoc

test/js/ruby/nodes/calls.test.ts

@@ -47,15 +47,7 @@ describe("calls", () => {
       end
     `);
 
-    const expected = ruby(`
-      aaa
-        .bbb
-        .ccc
-        .ddd
-        .eee { ${block} }
-    `);
-
-    return expect(content).toChangeFormat(expected);
+    return expect(content).toMatchFormat();
   });
 
   test("tons of calls that fit on one line", () => {