prettier 0.21.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 628031f901d9500c43e16890affeb303afcd9fc6241a5adde35ea59e2e8848da
-  data.tar.gz: 3e138dd11805ad5de42ebcd3d25541b1b897f183492fd488e91ca906ba51d784
+  metadata.gz: 2b3f385a13ce2aae0cef657abc5d33e5d3d2fbfb59edf1fb39193ded2828cf87
+  data.tar.gz: 1049cb733eb60e3221a7df64110f5841f39288f8e91cb589f08cc1c23a0ddfbe
 SHA512:
-  metadata.gz: 7b92c23628247bc53f6ebe5b39f4b7b961a38c0bccc2eb6ec701b52f8be8df7d507ec6dab28b3f48b0600cdafbc9ab51fcf52001c726535f191dab67a1d301aa
-  data.tar.gz: 0335f2171298ebe46ca5c960a252ec49abc315bfc0438bb75a28ff4204c5dda340532c93af936b27d861ab867308f7f149c3b0eebf26cdd8d3475ba133e52854
+  metadata.gz: ef14696b55d0dd1a544bba5fd45d88e3ab322ab9d2ae34d89b4b6bf84748ac35100022d5e050ed4ef0e5cf5ad93049c1782243cda27e4bae5b7dc87a2f951614
+  data.tar.gz: 1bedee0f2b091bc7b7b10ceb645d183271dcea847f8b843c79cd6db5ebf078bb94d7d91fd255127f77c71eb9edd185dcfa166ffe9c442f315f64beb9ba57f4ee

data/CHANGELOG.md

@@ -6,6 +6,100 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [1.0.1] - 2020-12-12
+
+### Changed
+
+- [@steobrien], [@kddeisz] - Ensure leading comments in empty array and hash literals do not duplicate.
+
+## [1.0.0] - 2020-12-11
+
+### Changed
+
+- [@kddeisz] - Do not unescape double quotes in a single quote string.
+- [@kddeisz] - Only force braces on regexp for spaces and equals if it's inside a command or command_call.
+- [@kddeisz] - Leave Sorbet type annotations in place.
+- [@kddeisz] - Don't group hash contents, just allow them to break with their parent node.
+- [@kddeisz] - Honor the UTF-8 lang passed in through ENV vars.
+
+## [1.0.0-rc2] - 2020-12-10
+
+### Changed
+
+- [@kddeisz] - Print hashes with consistent keys (e.g., if one key cannot be a hash label, use all hash rockets).
+- [@kddeisz] - Respect using `o` or not using `o` for octal numbers.
+- [@kddeisz] - Ensure `when` clauses with multiple predicates that can be split into multiple lines are split correctly.
+- [@kddeisz] - Ensure hash literal is split correctly when only its contents would fit on one line.
+- [@kddeisz] - Simplify `toProc` checks by not calling if the option is disabled.
+- [@johncsnyder], [@kddeisz] - Add `method_add_block` to the potential like of method calls that can be chained.
+- [@kddeisz] - Add the `rubyArrayLiteral` option for disabling automatically turning into array literals.
+
+## [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
+
+- [@flyerhzm] - Print method chains by one indentation.
+- [@mmcnl], [@kddeisz] - Handle heredocs and blocks being passed to the same method.
+- [@johncsnyder], [@kddeisz] - Ensure correct formatting when breaking up conditionals with `inlineConditionals: false`.
+- [@Rsullivan00] - Ensure that when ternaries as command arguments get broken into multiple lines we add the necessary parentheses.
+- [@jbielick] - Maintain parse order during if/unless modifier expressions
+- [@flyerhzm] - Slight prettifying of wrapped args if doc length is under a certain value.
+- [@github0013], [@kddeisz] - Ensure `not` keeps parentheses if they are being used.
+- [@jbielick] - Print heredocs consistently.
+- [@kddeisz] - Completely revamp the way we handle comments.
+- [@kddeisz] - Support `hshptn` and the remaining missing pattern matching syntax.
+
 ## [0.21.0] - 2020-12-02
 
 ### Changed
@@ -174,7 +268,8 @@ will now be printed as:
 ```ruby
 Config::Download.new(
   'prettier',
-  filename: 'prettier.yml', url: 'https://raw.githubusercontent.com/...'
+  filename: 'prettier.yml',
+  url: 'https://raw.githubusercontent.com/...'
 ).perform
 ```
 
@@ -862,7 +957,12 @@ would previously result in `array[]`, but now prints properly.
 
 - Initial release 🎉
 
-[unreleased]: https://github.com/prettier/plugin-ruby/compare/v0.21.0...HEAD
+[unreleased]: https://github.com/prettier/plugin-ruby/compare/v1.0.1...HEAD
+[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
+[1.0.0-rc2]: https://github.com/prettier/plugin-ruby/compare/v1.0.0-rc1...v1.0.0-rc2
+[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
 [0.20.0]: https://github.com/prettier/plugin-ruby/compare/v0.19.1...v0.20.0
@@ -914,6 +1014,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
@@ -921,12 +1022,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
@@ -935,7 +1037,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
@@ -950,17 +1054,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

data/CONTRIBUTING.md

@@ -22,7 +22,7 @@ In order to get printed, the code goes through a couple of transformations. The
 
 ### Text to AST
 
-When the prettier process first spins up, it examines which files it's going to print and selects an appropriate plugin for each one. Once selected, it runs that plugin's `parse` function, seen [here](src/parse.js). For the case of the Ruby plugin, that entails spawning a Ruby process that runs [parser.rb](src/parser.rb) with the input code preloaded on stdin.
+When the prettier process first spins up, it examines which files it's going to print and selects an appropriate plugin for each one. Once selected, it runs that plugin's `parse` function, seen [here](src/parser.js). For the case of the Ruby plugin, that entails spawning a Ruby process that runs [parser.rb](src/parser.rb) with the input code preloaded on stdin.
 
 `parser.rb` will read the text off of stdin and then feed it to a new `Ripper` instance, which is a Ruby standard library recursive-descent parser. Briefly, the way that `Ripper` works is by tokenizing the input and then matching those tokens against a grammar to form s-expressions. To extend `Ripper`, you overwrite the methods that control how those s-expressions are formed, e.g., to modify the s-expression that is formed when `Ripper` encounters a string literal, you would override the `#on_string_literal` method. Below is an example for seeing that in action.
 
@@ -71,7 +71,7 @@ Now that the text has been transformed into an AST that we can work with, `parse
 
 ### AST to Doc
 
-Once prettier has a working AST, it will take it and call the selected plugin's [`print` function](src/print.js), whose purpose is to convert that AST into prettier's intermediate representation called Docs. It does this by handing the print function a `FastPath` object that keeps track of the state of the printing as it goes, and allows accessing various parts of the AST quickly.
+Once prettier has a working AST, it will take it and call the selected plugin's [`printNode` function](src/printer.js), whose purpose is to convert that AST into prettier's intermediate representation called Docs. It does this by handing the print function a `FastPath` object that keeps track of the state of the printing as it goes, and allows accessing various parts of the AST quickly.
 
 Effectively, it walks the AST in the reverse direction from the way `Ripper` built it (top-down instead of bottom-up). The first node that gets passed into the `print` function is the `program` node as that's always on top. Then it is the `program` node's responsibility to recursively call print on its child nodes as it best sees fit.
 
@@ -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.)?
 
@@ -168,8 +168,8 @@ While developing, we've built a couple of small utilities for debugging the `pre
 
 - `bin/lex [file|source]` - outputs the tokens as ripper sees them
 - `bin/sexp [file|source]` - outputs the AST that ripper builds before it gets passed back to `prettier`
+- `bin/pragma [file]` - runs the `hasPragma` function against the given input file
 - `bin/print [file|source]` - outputs the printed source of a Ruby file after running it through `prettier`
-- `bin/has-pragma [file]` - runs the `hasPragma` function against the given input file
 
 ## Testing
 

data/README.md

@@ -122,31 +122,31 @@ 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)).                                  |
+| `rubyArrayLiteral` | `--ruby-array-literal` | `true`  | When possible, favor the use of string and symbol array literals.                                                                    |
+| `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 +181,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>
@@ -224,6 +224,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://joshbielick.com/"><img src="https://avatars2.githubusercontent.com/u/1413330?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Josh Bielick</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/issues?q=author%3Ajbielick" title="Bug reports">🐛</a> <a href="https://github.com/prettier/plugin-ruby/commits?author=jbielick" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/coiti"><img src="https://avatars3.githubusercontent.com/u/27384706?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Román Coitiño</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/issues?q=author%3Acoiti" title="Bug reports">🐛</a></td>
   </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/mmcnl"><img src="https://avatars2.githubusercontent.com/u/1498727?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matt McNeil</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/issues?q=author%3Ammcnl" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/johncsnyder"><img src="https://avatars2.githubusercontent.com/u/9882099?v=4?s=100" width="100px;" alt=""/><br /><sub><b>John Snyder</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/issues?q=author%3Ajohncsnyder" title="Bug reports">🐛</a></td>
+  </tr>
 </table>
 
 <!-- markdownlint-restore -->

data/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@prettier/plugin-ruby",
-  "version": "0.21.0",
+  "version": "1.0.1",
   "description": "prettier plugin for the Ruby programming language",
   "main": "src/ruby.js",
   "scripts": {
+    "check-format": "prettier --check '**/*'",
     "lint": "eslint --cache .",
-    "print": "prettier --plugin=.",
     "test": "jest"
   },
   "repository": {
@@ -24,10 +24,10 @@
   "devDependencies": {
     "all-contributors-cli": "^6.14.1",
     "eslint": "^7.8.1",
-    "eslint-config-prettier": "^6.10.1",
-    "husky": "^4.2.5",
+    "eslint-config-prettier": "^7.0.0",
+    "husky": "^4.3.5",
     "jest": "^26.0.0",
-    "pretty-quick": "^3.0.0"
+    "pretty-quick": "^3.1.0"
   },
   "eslintConfig": {
     "extends": [
@@ -61,6 +61,9 @@
     }
   },
   "prettier": {
-    "trailingComma": "none"
+    "trailingComma": "none",
+    "plugins": [
+      "."
+    ]
   }
 }

data/src/embed.js

@@ -1,12 +1,15 @@
 const {
   concat,
+  group,
   indent,
-  literalline,
+  lineSuffix,
   mapDoc,
   markAsRoot,
   stripTrailingHardline
 } = require("./prettier");
 
+const { literalLineNoBreak } = require("./utils");
+
 const parsers = {
   css: "css",
   javascript: "babel",
@@ -23,12 +26,12 @@ const replaceNewlines = (doc) =>
       ? concat(
           currentDoc
             .split(/(\n)/g)
-            .map((v, i) => (i % 2 === 0 ? v : literalline))
+            .map((v, i) => (i % 2 === 0 ? v : literalLineNoBreak))
         )
       : 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
@@ -44,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;
   }
@@ -53,19 +56,35 @@ const embed = (path, _print, textToDoc, _opts) => {
   // into the embedded parser. Get back the doc node.
   const content = body.map((part) => part.body).join("");
   const formatted = concat([
-    literalline,
+    literalLineNoBreak,
     replaceNewlines(stripTrailingHardline(textToDoc(content, { parser })))
   ]);
 
   // If we're using a squiggly heredoc, then we can properly handle indentation
   // ourselves.
-  if (beging[2] === "~") {
-    return concat([beging, indent(markAsRoot(formatted)), literalline, ending]);
+  if (beging.body[2] === "~") {
+    return concat([
+      path.call(print, "beging"),
+      lineSuffix(
+        group(
+          concat([
+            indent(markAsRoot(formatted)),
+            literalLineNoBreak,
+            ending.trim()
+          ])
+        )
+      )
+    ]);
   }
 
   // Otherwise, we need to just assume it's formatted correctly and return the
   // content as it is.
-  return markAsRoot(concat([beging, formatted, literalline, ending]));
+  return markAsRoot(
+    concat([
+      path.call(print, "beging"),
+      lineSuffix(group(concat([formatted, literalLineNoBreak, ending.trim()])))
+    ])
+  );
 };
 
 module.exports = embed;

data/src/nodes.js

@@ -8,11 +8,13 @@ module.exports = Object.assign(
   require("./nodes/blocks"),
   require("./nodes/calls"),
   require("./nodes/case"),
+  require("./nodes/class"),
   require("./nodes/commands"),
   require("./nodes/conditionals"),
   require("./nodes/constants"),
   require("./nodes/flow"),
   require("./nodes/hashes"),
+  require("./nodes/heredocs"),
   require("./nodes/hooks"),
   require("./nodes/ints"),
   require("./nodes/lambdas"),
@@ -25,7 +27,8 @@ module.exports = Object.assign(
   require("./nodes/regexp"),
   require("./nodes/rescue"),
   require("./nodes/return"),
-  require("./nodes/scopes"),
   require("./nodes/statements"),
-  require("./nodes/strings")
+  require("./nodes/strings"),
+  require("./nodes/super"),
+  require("./nodes/undef")
 );

data/src/nodes/alias.js

@@ -7,49 +7,47 @@ const {
   line
 } = require("../prettier");
 
-/* In general, return the printed doc of the argument at the provided index.
- * Special handling is given for symbol literals that are not bare words, as we
- * convert those into bare words by just pulling out the ident node.
- */
-function printAliasArgument(path, _opts, print, argIndex) {
+// In general, return the printed doc of the argument at the provided index.
+// Special handling is given for symbol literals that are not bare words, as we
+// convert those into bare words by just pulling out the ident node.
+function printAliasArgument(path, print, argIndex) {
   const node = path.getValue().body[argIndex];
 
-  if (node.type === "symbol_literal" && node.body[0].type === "symbol") {
+  if (node.type === "symbol_literal") {
     // If we're going to descend into the symbol literal to grab out the ident
     // node, then we need to make sure we copy over any comments as well,
     // otherwise we could accidentally skip printing them.
     if (node.comments) {
       node.comments.forEach((comment) => {
-        addTrailingComment(node.body[0].body[0], comment);
+        addTrailingComment(node.body[0], comment);
       });
     }
 
-    return path.call(print, "body", argIndex, "body", 0, "body", 0);
+    return path.call(print, "body", argIndex, "body", 0);
   }
 
   return path.call(print, "body", argIndex);
 }
 
-/* The `alias` keyword is used to make a method respond to another name as well
- * as the current one. For example, to get the method `foo` to also respond to
- * `bar`, you would:
- *
- *     alias bar foo
- *
- * Now, in the current context you can call `bar` and it will execute the `foo`
- * method.
- *
- * When you're aliasing two methods, you can either provide bare words (like the
- * example above) or you can provide symbols (note that this includes dynamic
- * symbols like :"foo-#{bar}-baz"). In general, to be consistent with the ruby
- * style guide, we prefer bare words:
- *
- *     https://github.com/rubocop-hq/ruby-style-guide#alias-method-lexically
- *
- * The `alias` node contains two children. The left and right align with the
- * arguments passed to the keyword. So, for the above example the left would be
- * the symbol literal `bar` and the right could be the symbol literal `foo`.
- */
+// The `alias` keyword is used to make a method respond to another name as well
+// as the current one. For example, to get the method `foo` to also respond to
+// `bar`, you would:
+//
+//     alias bar foo
+//
+// Now, in the current context you can call `bar` and it will execute the `foo`
+// method.
+//
+// When you're aliasing two methods, you can either provide bare words (like the
+// example above) or you can provide symbols (note that this includes dynamic
+// symbols like :"foo-#{bar}-baz"). In general, to be consistent with the ruby
+// style guide, we prefer bare words:
+//
+//     https://github.com/rubocop-hq/ruby-style-guide#alias-method-lexically
+//
+// The `alias` node contains two children. The left and right align with the
+// arguments passed to the keyword. So, for the above example the left would be
+// the symbol literal `bar` and the right could be the symbol literal `foo`.
 function printAlias(path, opts, print) {
   const keyword = "alias ";
 
@@ -57,14 +55,14 @@ function printAlias(path, opts, print) {
     // If the left child has any comments, then we need to explicitly break this
     // into two lines
     path.getValue().body[0].comments ? hardline : line,
-    printAliasArgument(path, opts, print, 1)
+    printAliasArgument(path, print, 1)
   ]);
 
   return group(
     concat([
       keyword,
-      printAliasArgument(path, opts, print, 0),
-      group(align(keyword, rightSide))
+      printAliasArgument(path, print, 0),
+      group(align(keyword.length, rightSide))
     ])
   );
 }