prettier 0.22.0 → 1.0.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c098ce338da8191c1a6a46d6817aa38997aa0fbc318dbc045ae191600654d1a0
-  data.tar.gz: d75cc10cf135ffbcbd35f2bb0404dc07b5f645024d57fefdb598cbe99d54bcb1
+  metadata.gz: f2bdbafe8bc7bd8ebc0f77727584bfa80773721ca5e77f820df84b8e7c7e0951
+  data.tar.gz: 53e157e6880b56e642690fb90f6244ad669739a2e5fb697cde0c8082facc2c20
 SHA512:
-  metadata.gz: 7a4c41e7c19215101dee83152d3fd0dab79ee4d43c485254e4f65d963ffbab55e8b68cc5f6a670375552caba832071bfcf609668249139edd81d89a7960274c1
-  data.tar.gz: 655bd92259ffb6346cfd1120b8533dfb0ccf37bc78e7d9ed7041fc14c915abdbe7413a451f9bc9061153721110670603e4a4b5fbc638497033b5c0305a17144b
+  metadata.gz: 854c61aa25de0a708606f89cb4bd3dde7dee10ecec89cfc7660bf03722ea12603bbb4dbf5f8d8b25f14359de55b419f2758522198cae9926d03fe77fab7aa001
+  data.tar.gz: d9c821b5367084de39bbe51c60a58642210caa5da04757c6fafbabec6e204adfdd9d7b656e34c3a94e50af26d5c6ceda9236edf68e96c98ed1e941957fe47c4a

data/CHANGELOG.md

@@ -6,6 +6,57 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [1.0.0-rc1] - 2020-12-09
+
+### Changed
+
+- [@kddeisz] - Rename options to prep for v1.0 release.
+  - `addTrailingCommas` -> `trailingComma`, `"es5"` means `true`
+  - `inlineConditionals` and `inlineLoops` -> `rubyModifier`
+  - `preferHashLabels` -> `rubyHashLabel`
+  - `preferSingleQuotes` -> `rubySingleQuote`
+  - `toProcTransform` -> `rubyToProc`
+- [@andyw8], [@kddeisz] - Fix for Ruby `2.5.1` dyna_symbols. Turns out they were previously incorrectly reported as `xstring` nodes.
+- [@andyw8], [@kddeisz] - Fix for plain `rescue` nodes with only comments in the body.
+- [@andyw8], [@kddeisz] - Move declaration-type comments up to the line in the original source, as in:
+
+```ruby
+def foo # :nodoc:
+  bar
+end
+```
+
+The comment in the above example should stay in place.
+
+- [@janklimo] - Respect special call syntax, e.g., `a.(1, 2, 3)` should remain the same.
+- [@kddeisz] - Fix up a bug with `ensure` being used in a `bodystmt` and not a `begin`.
+- [@kddeisz] - Fix up a bug with negative ranges, e.g., `-4..-3`.
+- [@kddeisz] - Fix up a bug with operator aliases, e.g., `alias << push`.
+- [@kddeisz] - Fix up a bug with calls and unary nodes, e.g., `!!foo&.bar`.
+- [@kddeisz] - Fix up a bug with multiple rescue clauses and comments, e.g.,
+
+```ruby
+begin
+
+rescue Foo, Bar
+  # comment
+end
+```
+
+- [@kddeisz] - Handle string literals that start with `%Q`.
+- [@kddeisz] - Handle question method methods in the predicate of an if with a comment in the body.
+- [@kddeisz] - Fix bare `break` with comments immediately after.
+- [@kddeisz] - Fix for heredocs with comments immediately after the declaration.
+- [@kddeisz] - Fix for comments when you're defining a method whose name overlaps with a keyword.
+- [@kddeisz] - Don't automatically indent inside interpolated expressions from within a heredoc.
+- [@kddeisz] - Don't convert into string literal arrays if the elements have brackets.
+- [@kddeisz] - Ensure you break the parent when there is an assignment in the predicate of a loop.
+- [@kddeisz] - Fix up a bug with keyword aliases, e.g., `alias in within`.
+- [@kddeisz] - Force using braces for regex if a regex starts with a blank space.
+- [@kddeisz] - Force using braces for regex if a regex starts with an equals sign.
+- [@kddeisz] - Fix up a bug with constant aliases, e.g., `alias in IN`.
+- [@andyw8], [@kddeisz] - Ensure `rescue` comments stay on the same line as their declaration.
+
 # [0.22.0] - 2020-12-08
 
 ### Changed
@@ -877,7 +928,8 @@ would previously result in `array[]`, but now prints properly.
 
 - Initial release 🎉
 
-[unreleased]: https://github.com/prettier/plugin-ruby/compare/v0.22.0...HEAD
+[unreleased]: https://github.com/prettier/plugin-ruby/compare/v1.0.0-rc1...HEAD
+[1.0.0-rc1]: https://github.com/prettier/plugin-ruby/compare/v0.22.0...v1.0.0-rc1
 [0.22.0]: https://github.com/prettier/plugin-ruby/compare/v0.21.0...v0.22.0
 [0.21.0]: https://github.com/prettier/plugin-ruby/compare/v0.20.1...v0.21.0
 [0.20.1]: https://github.com/prettier/plugin-ruby/compare/v0.20.0...v0.20.1
@@ -930,6 +982,7 @@ would previously result in `array[]`, but now prints properly.
 [@alanfoster]: https://github.com/AlanFoster
 [@alse]: https://github.com/alse
 [@andrewraycode]: https://github.com/AndrewRayCode
+[@andyw8]: https://github.com/andyw8
 [@ashfurrow]: https://github.com/ashfurrow
 [@awinograd]: https://github.com/awinograd
 [@bugthing]: https://github.com/bugthing
@@ -937,12 +990,13 @@ would previously result in `array[]`, but now prints properly.
 [@christoomey]: https://github.com/christoomey
 [@cldevs]: https://github.com/cldevs
 [@codingitwrong]: https://github.com/CodingItWrong
+[@coiti]: https://github.com/coiti
 [@deecewan]: https://github.com/deecewan
 [@dudeofawesome]: https://github.com/dudeofawesome
 [@eins78]: https://github.com/eins78
-[@ftes]: https://github.com/ftes
 [@flyerhzm]: https://github.com/flyerhzm
 [@fruetel]: https://github.com/Fruetel
+[@ftes]: https://github.com/ftes
 [@gin0606]: https://github.com/gin0606
 [@github0013]: https://github.com/github0013
 [@glejeune]: https://github.com/glejeune
@@ -951,7 +1005,9 @@ would previously result in `array[]`, but now prints properly.
 [@jakeprime]: https://github.com/jakeprime
 [@jamescostian]: https://github.com/jamescostian
 [@janklimo]: https://github.com/janklimo
+[@jbielick]: https://github.com/jbielick
 [@joeyjoejoejr]: https://github.com/joeyjoejoejr
+[@johncsnyder]: https://github.com/johncsnyder
 [@johnschoeman]: https://github.com/johnschoeman
 [@joshuakgoldberg]: https://github.com/JoshuaKGoldberg
 [@jpickwell]: https://github.com/jpickwell
@@ -966,18 +1022,18 @@ would previously result in `array[]`, but now prints properly.
 [@matt-wratt]: https://github.com/matt-wratt
 [@meleyal]: https://github.com/meleyal
 [@mmainz]: https://github.com/mmainz
+[@mmcnl]: https://github.com/mmcnl
 [@noahtheduke]: https://github.com/NoahTheDuke
 [@overload119]: https://github.com/Overload119
 [@petevk]: https://github.com/petevk
 [@pje]: https://github.com/pje
 [@rosskinsella]: https://github.com/RossKinsella
+[@rsullivan00]: https://github.com/Rsullivan00
+[@ryan-hunter-pc]: https://github.com/ryan-hunter-pc
 [@shaydavidson]: https://github.com/ShayDavidson
+[@steobrien]: https://github.com/steobrien
+[@sviccari]: https://github.com/SViccari
 [@tobyndockerill]: https://github.com/tobyndockerill
 [@uri]: https://github.com/uri
 [@xipgroc]: https://github.com/xipgroc
 [@yuki24]: https://github.com/yuki24
-[@rsullivan00]: https://github.com/Rsullivan00
-[@steobrien]: https://github.com/steobrien
-[@jbielick]: https://github.com/jbielick
-[@coiti]: https://github.com/coiti
-[@johncsnyder]: https://github.com/johncsnyder

data/CONTRIBUTING.md

@@ -129,7 +129,7 @@ In order to support all preferences, the Ruby options need to be distinct from t
 
 ### What versions of Ruby are supported?
 
-At the moment, we support back to Ruby 2.5. This is because in Ruby 2.5, Ripper got some additional public methods for accessing lexer state, which is necessary for parsing comments. This is not to say that prettier can't parse and print earlier versions of Ruby, it's just that the Ruby process running prettier (whatever `ruby` resolves to when the process runs) must be >= 2.5.
+We support all Ruby versions that are under security maintenance or better (https://www.ruby-lang.org/en/downloads/branches/). This means at the moment we support back to Ruby 2.5. This is not to say that prettier can't parse and print code that was written while running earlier versions of Ruby, it's just that the Ruby process running prettier (whatever `ruby` resolves to when the process runs) must be >= 2.5.
 
 ### Do you support ERB files (.html.erb, .js.erb, etc.)?
 

data/README.md

@@ -122,31 +122,30 @@ The `prettier` executable is now installed and ready for use:
 
 Below are the options (from [`src/ruby.js`](src/ruby.js)) that `@prettier/plugin-ruby` currently supports:
 
-| API Option           | CLI Option               | Default | Description                                                                                                   |
-| -------------------- | ------------------------ | :-----: | ------------------------------------------------------------------------------------------------------------- |
-| `printWidth`         | `--print-width`          |  `80`   | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#print-width)).              |
-| `requirePragma`      | `--require-pragma`       | `false` | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#require-pragma)).           |
-| `tabWidth`           | `--tab-width`            |   `2`   | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#tab-width)).                |
-| `addTrailingCommas`  | `--add-trailing-commas`  | `false` | Adds a trailing comma to array literals, hash literals, and method calls.                                     |
-| `inlineConditionals` | `--inline-conditionals`  | `true`  | When it fits on one line, allows if and unless statements to use the modifier form.                           |
-| `inlineLoops`        | `--inline-loops`         | `true`  | When it fits on one line, allows while and until statements to use the modifier form.                         |
-| `preferHashLabels`   | `--prefer-hash-labels`   | `true`  | When possible, uses the shortened hash key syntax, as opposed to hash rockets.                                |
-| `preferSingleQuotes` | `--prefer-single-quotes` | `true`  | When double quotes are not necessary for interpolation, prefers the use of single quotes for string literals. |
-| `toProcTransform`    | `--to-proc-transform`    | `false` | When possible, convert blocks to the more concise `Symbol#to_proc` syntax.                                    |
+| API Option        | CLI Option            | Default | Description                                                                                                                          |
+| ----------------- | --------------------- | :-----: | ------------------------------------------------------------------------------------------------------------------------------------ |
+| `printWidth`      | `--print-width`       |  `80`   | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#print-width)).                                     |
+| `requirePragma`   | `--require-pragma`    | `false` | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#require-pragma)).                                  |
+| `rubyHashLabel`   | `--ruby-hash-label`   | `true`  | When possible, uses the shortened hash key syntax, as opposed to hash rockets.                                                       |
+| `rubyModifier`    | `--ruby-modifier`     | `true`  | When it fits on one line, allows while and until statements to use the modifier form.                                                |
+| `rubySingleQuote` | `--ruby-single-quote` | `true`  | When double quotes are not necessary for interpolation, prefers the use of single quotes for string literals.                        |
+| `rubyToProc`      | `--ruby-to-proc`      | `false` | When possible, convert blocks to the more concise `Symbol#to_proc` syntax.                                                           |
+| `tabWidth`        | `--tab-width`         |   `2`   | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#tab-width)).                                       |
+| `trailingComma`   | `--trailing-comma`    | `"es5"` | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#trailing-comma)). `"es5"` is equivalent to `true`. |
 
 Any of these can be added to your existing [prettier configuration
 file](https://prettier.io/docs/en/configuration.html). For example:
 
 ```json
 {
-  "preferSingleQuotes": false
+  "rubySingleQuote": false
 }
 ```
 
 Or, they can be passed to `prettier` as arguments:
 
 ```bash
-prettier --prefer-single-quotes false --write '**/*.rb'
+prettier --ruby-single-quote false --write '**/*.rb'
 ```
 
 ## Contributing
@@ -181,7 +180,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   </tr>
   <tr>
     <td align="center"><a href="https://janpiotrowski.de"><img src="https://avatars0.githubusercontent.com/u/183673?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jan Piotrowski</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/commits?author=janpio" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://www.andywaite.com"><img src="https://avatars1.githubusercontent.com/u/13400?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andy Waite</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/commits?author=andyw8" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://www.andywaite.com"><img src="https://avatars1.githubusercontent.com/u/13400?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andy Waite</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/commits?author=andyw8" title="Documentation">📖</a> <a href="https://github.com/prettier/plugin-ruby/issues?q=author%3Aandyw8" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jviney"><img src="https://avatars3.githubusercontent.com/u/7051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jonathan Viney</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/issues?q=author%3Ajviney" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/acrewdson"><img src="https://avatars0.githubusercontent.com/u/10353074?v=4?s=100" width="100px;" alt=""/><br /><sub><b>acrewdson</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/issues?q=author%3Aacrewdson" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://orleans.io"><img src="https://avatars0.githubusercontent.com/u/1683595?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Louis Orleans</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/issues?q=author%3Adudeofawesome" title="Bug reports">🐛</a></td>

data/package.json

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

data/src/embed.js

@@ -31,7 +31,7 @@ const replaceNewlines = (doc) =>
       : currentDoc
   );
 
-const embed = (path, _print, textToDoc, _opts) => {
+const embed = (path, print, textToDoc, _opts) => {
   const node = path.getValue();
 
   // Currently we only support embedded formatting on heredoc nodes
@@ -47,7 +47,7 @@ const embed = (path, _print, textToDoc, _opts) => {
 
   // Next, find the parser associated with this heredoc (if there is one). For
   // example, if you use <<~CSS, we'd hook it up to the css parser.
-  const parser = parsers[beging.slice(3).toLowerCase()];
+  const parser = parsers[beging.body.slice(3).toLowerCase()];
   if (!parser) {
     return null;
   }
@@ -62,9 +62,9 @@ const embed = (path, _print, textToDoc, _opts) => {
 
   // If we're using a squiggly heredoc, then we can properly handle indentation
   // ourselves.
-  if (beging[2] === "~") {
+  if (beging.body[2] === "~") {
     return concat([
-      beging,
+      path.call(print, "beging"),
       lineSuffix(
         group(
           concat([indent(markAsRoot(formatted)), literalLineNoBreak, ending])
@@ -77,7 +77,7 @@ const embed = (path, _print, textToDoc, _opts) => {
   // content as it is.
   return markAsRoot(
     concat([
-      beging,
+      path.call(print, "beging"),
       lineSuffix(group(concat([formatted, literalLineNoBreak, ending])))
     ])
   );

data/src/nodes/args.js

@@ -9,12 +9,11 @@ const {
 } = require("../prettier");
 
 const toProc = require("../toProc");
-const { docLength } = require("../utils");
+const { docLength, getTrailingComma } = require("../utils");
 
 module.exports = {
   arg_paren: (path, opts, print) => {
     const argsNode = path.getValue().body[0];
-    const { addTrailingCommas } = opts;
 
     if (argsNode === null) {
       return "";
@@ -41,7 +40,7 @@ module.exports = {
     // parentheses or surrounding lines yet added.
     let argsDocs = [
       join(concat([",", line]), args),
-      addTrailingCommas && !hasBlock ? ifBreak(",", "") : ""
+      getTrailingComma(opts) && !hasBlock ? ifBreak(",", "") : ""
     ];
 
     // Here we're going to make a determination on whether or not we should put

data/src/nodes/arrays.js

@@ -9,6 +9,8 @@ const {
   softline
 } = require("../prettier");
 
+const { getTrailingComma } = require("../utils");
+
 // Checks that every argument within this args node is a string_literal node
 // that has no spaces or interpolations. This means we're dealing with an array
 // that looks something like:
@@ -37,9 +39,10 @@ function isStringArray(args) {
       return false;
     }
 
-    // Finally, verify that the string doesn't contain a space or an escape
-    // character so that we know it can be put into a string literal array.
-    return !part.body.includes(" ") && !part.body.includes("\\");
+    // Finally, verify that the string doesn't contain a space, an escape
+    // character, or brackets so that we know it can be put into a string
+    // literal array.
+    return !/[\s\\[\]]/.test(part.body);
   });
 }
 
@@ -153,7 +156,7 @@ function printArray(path, opts, print) {
         concat([
           softline,
           join(concat([",", line]), path.call(print, "body", 0)),
-          opts.addTrailingCommas ? ifBreak(",", "") : ""
+          getTrailingComma(opts) ? ifBreak(",", "") : ""
         ])
       ),
       softline,

data/src/nodes/calls.js

@@ -6,12 +6,11 @@ const {
   indent,
   softline
 } = require("../prettier");
-const { concatBody, first, makeCall } = require("../utils");
+const { concatBody, first, makeCall, noIndent } = require("../utils");
 
 const toProc = require("../toProc");
 
 const chained = ["call", "method_add_arg"];
-const noIndent = ["array", "hash", "if", "method_add_block", "xstring_literal"];
 
 function printCall(path, opts, print) {
   const callNode = path.getValue();
@@ -21,9 +20,9 @@ function printCall(path, opts, print) {
   const operatorDoc = makeCall(path, opts, print);
 
   // You can call lambdas with a special syntax that looks like func.(*args).
-  // In this case, "call" is returned for the 3rd child node.
-  const messageDoc =
-    messageNode === "call" ? messageNode : path.call(print, "body", 2);
+  // In this case, "call" is returned for the 3rd child node. We don't alter
+  // call syntax so if `call` is implicit, we don't print it out.
+  const messageDoc = messageNode === "call" ? "" : path.call(print, "body", 2);
 
   // For certain left sides of the call nodes, we want to attach directly to
   // the } or end.

data/src/nodes/conditionals.js

@@ -81,7 +81,7 @@ const printTernary = (path, _opts, print) => {
 // modifier form, we're guaranteed to not have an additional node, so we can
 // just work with the predicate and the body.
 function printSingle(keyword, modifier = false) {
-  return function printSingleWithKeyword(path, { inlineConditionals }, print) {
+  return function printSingleWithKeyword(path, { rubyModifier }, print) {
     const [_predicateNode, statementsNode] = path.getValue().body;
     const predicateDoc = path.call(print, "body", 0);
     const statementsDoc = path.call(print, "body", 1);
@@ -97,7 +97,7 @@ function printSingle(keyword, modifier = false) {
     // If we do not allow modifier form conditionals or there are comments
     // inside of the body of the conditional, then we must print in the
     // multiline form.
-    if (!inlineConditionals || (!modifier && statementsNode.body[0].comments)) {
+    if (!rubyModifier || (!modifier && statementsNode.body[0].comments)) {
       return concat([concat(multilineParts), breakParent]);
     }
 
@@ -190,7 +190,7 @@ const canTernary = (path) => {
 };
 
 // A normalized print function for both `if` and `unless` nodes.
-const printConditional = (keyword) => (path, { inlineConditionals }, print) => {
+const printConditional = (keyword) => (path, { rubyModifier }, print) => {
   if (canTernary(path)) {
     let ternaryParts = [path.call(print, "body", 0), " ? "].concat(
       printTernaryClauses(
@@ -239,7 +239,7 @@ const printConditional = (keyword) => (path, { inlineConditionals }, print) => {
     ]);
   }
 
-  return printSingle(keyword)(path, { inlineConditionals }, print);
+  return printSingle(keyword)(path, { rubyModifier }, print);
 };
 
 module.exports = {

data/src/nodes/hashes.js

@@ -7,7 +7,8 @@ const {
   join,
   line
 } = require("../prettier");
-const { prefix, skipAssignIndent } = require("../utils");
+
+const { getTrailingComma, prefix, skipAssignIndent } = require("../utils");
 
 // When attempting to convert a hash rocket into a hash label, you need to take
 // care because only certain patterns are allowed. Ruby source says that they
@@ -24,24 +25,24 @@ function isValidHashLabel(symbolLiteral) {
   return label.match(/^[_A-Za-z]/) && !label.endsWith("=");
 }
 
-function printHashKey(path, { preferHashLabels }, print) {
+function printHashKey(path, { rubyHashLabel }, print) {
   const labelNode = path.getValue().body[0];
   const labelDoc = path.call(print, "body", 0);
 
   switch (labelNode.type) {
     case "@label":
-      if (preferHashLabels) {
+      if (rubyHashLabel) {
         return labelDoc;
       }
       return `:${labelDoc.slice(0, labelDoc.length - 1)} =>`;
     case "symbol_literal": {
-      if (preferHashLabels && isValidHashLabel(labelNode)) {
+      if (rubyHashLabel && isValidHashLabel(labelNode)) {
         return concat([path.call(print, "body", 0, "body", 0), ":"]);
       }
       return concat([labelDoc, " =>"]);
     }
     case "dyna_symbol":
-      if (preferHashLabels) {
+      if (rubyHashLabel) {
         return concat(labelDoc.parts.slice(1).concat(":"));
       }
       return concat([labelDoc, " =>"]);
@@ -98,7 +99,7 @@ function printHash(path, opts, print) {
         concat([
           line,
           path.call(print, "body", 0),
-          opts.addTrailingCommas ? ifBreak(",", "") : ""
+          getTrailingComma(opts) ? ifBreak(",", "") : ""
         ])
       ),
       line,

data/src/nodes/heredocs.js

@@ -2,7 +2,7 @@ const { concat, group, lineSuffix, join } = require("../prettier");
 const { literalLineNoBreak } = require("../utils");
 
 function printHeredoc(path, opts, print) {
-  const { beging, body, ending } = path.getValue();
+  const { body, ending } = path.getValue();
 
   const parts = body.map((part, index) => {
     if (part.type !== "@tstring_content") {
@@ -21,7 +21,7 @@ function printHeredoc(path, opts, print) {
   // possible, so we use a literalline without the break-parent.
   return group(
     concat([
-      beging,
+      path.call(print, "beging"),
       lineSuffix(
         group(concat([literalLineNoBreak].concat(parts).concat(ending)))
       )

data/src/nodes/hooks.js

@@ -17,11 +17,13 @@ const { isEmptyStmts } = require("../utils");
 // nodes contain one child which is a `stmts` node.
 function printHook(name) {
   return function printHookWithName(path, opts, print) {
-    const stmtsNode = path.getValue().body[0];
-    const printedStmts = path.call(print, "body", 0);
+    const stmtsNode = path.getValue().body[1];
+    const printedStmts = path.call(print, "body", 1);
 
     const parts = [
-      `${name} {`,
+      name,
+      " ",
+      path.call(print, "body", 0),
       indent(concat([line, printedStmts])),
       concat([line, "}"])
     ];

data/src/nodes/loops.js

@@ -1,5 +1,6 @@
 const {
   align,
+  breakParent,
   concat,
   group,
   hardline,
@@ -11,7 +12,7 @@ const {
 const { containsAssignment } = require("../utils");
 const inlineEnsureParens = require("../utils/inlineEnsureParens");
 
-const printLoop = (keyword, modifier) => (path, { inlineLoops }, print) => {
+const printLoop = (keyword, modifier) => (path, { rubyModifier }, print) => {
   const [_predicate, stmts] = path.getValue().body;
 
   // If the only statement inside this while loop is a void statement, then we
@@ -66,8 +67,8 @@ const printLoop = (keyword, modifier) => (path, { inlineLoops }, print) => {
   // an assignment (in which case we can't know for certain that that
   // assignment doesn't impact the statements inside the loop) then we can't
   // use the modifier form and we must use the block form.
-  if (!inlineLoops || containsAssignment(path.getValue().body[0])) {
-    return blockLoop;
+  if (!rubyModifier || containsAssignment(path.getValue().body[0])) {
+    return concat([breakParent, blockLoop]);
   }
 
   return group(ifBreak(blockLoop, inlineLoop));