prettier 1.0.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b3f385a13ce2aae0cef657abc5d33e5d3d2fbfb59edf1fb39193ded2828cf87
-  data.tar.gz: 1049cb733eb60e3221a7df64110f5841f39288f8e91cb589f08cc1c23a0ddfbe
+  metadata.gz: '0630719fd8b07b6f6fc180db0c88a5d2d2f0aad3d4cdeef4f14aeba83a87d2f1'
+  data.tar.gz: 925d6a78992ae155cb65ccd336ec34c3cda7538421151d91952a31461718be2b
 SHA512:
-  metadata.gz: ef14696b55d0dd1a544bba5fd45d88e3ab322ab9d2ae34d89b4b6bf84748ac35100022d5e050ed4ef0e5cf5ad93049c1782243cda27e4bae5b7dc87a2f951614
-  data.tar.gz: 1bedee0f2b091bc7b7b10ceb645d183271dcea847f8b843c79cd6db5ebf078bb94d7d91fd255127f77c71eb9edd185dcfa166ffe9c442f315f64beb9ba57f4ee
+  metadata.gz: b8e07ba6fd2839a1c055ec42b08c2f35a92b912a555c227bb644ea91afec560feaa27318df72dfda1023ffbe7a65c446f4ea1ba97ec6202a617d4622abcdbb4b
+  data.tar.gz: 7ef40ccd4d7bc5f3b521070402b1a592706d60cb19edfc3072ab45c9086e954f0f4b801a260e8ccb76efbede4b227ca07e4a6e7c1bd670b230b56b0ff01c3496

data/CHANGELOG.md

@@ -6,6 +6,58 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [1.2.3] - 2021-01-02
+
+### Changed
+
+- [@lukyth], [@kddeisz] - Ensure if a ternary breaks into an `if..else..end` within a `command_call` node that parentheses are added.
+- [@AlanFoster], [@kddeisz] - Ensure you consume the optional `do` keyword on `while` and `until` loops so that it doesn't confuse the parser.
+- [@AlanFoster], [@kddeisz] - Ensure key-value pairs split on line when the key has a comment attached within a hash.
+- [@AlanFoster], [@kddeisz] - Fix for `for` loops that have multiple index variables.
+- [@AlanFoster], [@kddeisz] - Fix parsing very large files by reducing the size of the JSON output from the parser.
+- [@AlanFoster], [@kddeisz] - Ensure you don't skip parentheses if you're returning a value with the `not` unary operator.
+
+## [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
+
+- [@kddeisz] - Handle single-line method definitions with parameters.
+- [@kddeisz] - Handle hash and array patterns nested within find patterns.
+- [@kddeisz] - Handle rightward assignment.
+- [@kddeisz] - Handle find patterns with named boundaries.
+- [@kddeisz] - Handle rightward assignment in conditionals.
+
+## [1.2.0] - 2020-12-26
+
+### Added
+
+- [@kddeisz] - Support for the `fndptn` node for Ruby 3.0 pattern matching.
+- [@kddeisz] - Support for Ruby 3.0+ single-line method definitions.
+
+## [1.1.0] - 2020-12-20
+
+### Added
+
+- [@kddeisz] - Now that the comments are all fixed up, we can support `# prettier-ignore` comments.
+
+### Changed
+
+- [@rindek], [@kddeisz] - Do not remove parentheses when receiver looks like a constant.
+- [@rindek], [@kddeisz] - Do not remove parentheses when using the special `call` syntax with no arguments.
+- [@ykpythemind] - Do not change regexp bounds if the body has certain content.
+- [@karanmandal], [@kddeisz] - Correctly print for loops.
+- [@rafbm], [@kddeisz] - If there are method chains with arguments only at the end, we should group the method chain and the method args.
+
 ## [1.0.1] - 2020-12-12
 
 ### Changed
@@ -957,7 +1009,12 @@ would previously result in `array[]`, but now prints properly.
 
 - Initial release 🎉
 
-[unreleased]: https://github.com/prettier/plugin-ruby/compare/v1.0.1...HEAD
+[unreleased]: https://github.com/prettier/plugin-ruby/compare/v1.2.3...HEAD
+[1.2.3]: https://github.com/prettier/plugin-ruby/compare/v1.2.2...v1.2.3
+[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
 [1.0.0-rc2]: https://github.com/prettier/plugin-ruby/compare/v1.0.0-rc1...v1.0.0-rc2
@@ -1017,6 +1074,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
@@ -1045,20 +1103,25 @@ would previously result in `array[]`, but now prints properly.
 [@jpickwell]: https://github.com/jpickwell
 [@jrdioko]: https://github.com/jrdioko
 [@jviney]: https://github.com/jviney
+[@karanmandal]: https://github.com/karanmandal
 [@kddeisz]: https://github.com/kddeisz
 [@kmcq]: https://github.com/kmcq
 [@krachtstefan]: https://github.com/krachtstefan
 [@localhostdotdev]: https://github.com/localhostdotdev
+[@lukyth]: https://github.com/lukyth
 [@marcmaniez]: https://github.com/MarcManiez
 [@masqita]: https://github.com/masqita
 [@matt-wratt]: https://github.com/matt-wratt
 [@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
 [@pje]: https://github.com/pje
+[@rafbm]: https://github.com/rafbm
+[@rindek]: https://github.com/rindek
 [@rosskinsella]: https://github.com/RossKinsella
 [@rsullivan00]: https://github.com/Rsullivan00
 [@ryan-hunter-pc]: https://github.com/ryan-hunter-pc
@@ -1068,4 +1131,5 @@ would previously result in `array[]`, but now prints properly.
 [@tobyndockerill]: https://github.com/tobyndockerill
 [@uri]: https://github.com/uri
 [@xipgroc]: https://github.com/xipgroc
+[@ykpythemind]: https://github.com/ykpythemind
 [@yuki24]: https://github.com/yuki24

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/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.
+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/ruby/parser.js). For the case of the Ruby plugin, that entails spawning a Ruby process that runs [parser.rb](src/ruby/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 [`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.
+Once prettier has a working AST, it will take it and call the selected plugin's [`printNode` function](src/ruby/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.
 

data/README.md

@@ -120,7 +120,7 @@ The `prettier` executable is now installed and ready for use:
 
 ## Configuration
 
-Below are the options (from [`src/ruby.js`](src/ruby.js)) that `@prettier/plugin-ruby` currently supports:
+Below are the options (from [`src/plugin.js`](src/plugin.js)) that `@prettier/plugin-ruby` currently supports:
 
 | API Option         | CLI Option             | Default | Description                                                                                                                          |
 | ------------------ | ---------------------- | :-----: | ------------------------------------------------------------------------------------------------------------------------------------ |
@@ -227,6 +227,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <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>
+    <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/node_modules/prettier/index.js

@@ -5249,19 +5249,19 @@ var errors = {
   UndefinedParserError
 };
 
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
 
 /* global Reflect, Promise */
@@ -14638,7 +14638,6 @@ function printAstToDoc(ast, options, alignmentSize = 0) {
     } // We let JSXElement print its comments itself because it adds () around
     // UnionTypeAnnotation has to align the child without the comments
 
-
     let res;
 
     if (printer.willPrintOwnComments && printer.willPrintOwnComments(path, options)) {
@@ -14675,6 +14674,7 @@ function printPrettierIgnoredNode(node, options) {
     locStart,
     locEnd
   } = options;
+
   const start = locStart(node);
   const end = locEnd(node);
 
@@ -24808,11 +24808,11 @@ var ini = createCommonjsModule(function (module, exports) {
   });
 
   var fs = __importStar(fs__default['default']);
-  /**
-   * define the possible values:
-   * section: [section]
-   * param: key=value
-   * comment: ;this is a comment
+  /**
+   * define the possible values:
+   * section: [section]
+   * param: key=value
+   * comment: ;this is a comment
    */
 
 
@@ -24821,9 +24821,9 @@ var ini = createCommonjsModule(function (module, exports) {
     param: /^\s*([\w\.\-\_]+)\s*[=:]\s*(.*?)\s*([#;].*)?$/,
     comment: /^\s*[#;].*$/
   };
-  /**
-   * Parses an .ini file
-   * @param file The location of the .ini file
+  /**
+   * Parses an .ini file
+   * @param file The location of the .ini file
    */
 
   function parse(file) {
@@ -29644,8 +29644,8 @@ var path_1 = createCommonjsModule(function (module, exports) {
   const LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; // ./ or .\\
 
   const UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\())/g;
-  /**
-   * Designed to work only with simple paths: `dir\\file`.
+  /**
+   * Designed to work only with simple paths: `dir\\file`.
    */
 
   function unixify(filepath) {
@@ -34268,17 +34268,17 @@ var pattern = createCommonjsModule(function (module, exports) {
   exports.isStaticPattern = isStaticPattern;
 
   function isDynamicPattern(pattern, options = {}) {
-    /**
-     * A special case with an empty string is necessary for matching patterns that start with a forward slash.
-     * An empty string cannot be a dynamic pattern.
-     * For example, the pattern `/lib/*` will be spread into parts: '', 'lib', '*'.
+    /**
+     * A special case with an empty string is necessary for matching patterns that start with a forward slash.
+     * An empty string cannot be a dynamic pattern.
+     * For example, the pattern `/lib/*` will be spread into parts: '', 'lib', '*'.
      */
     if (pattern === '') {
       return false;
     }
-    /**
-     * When the `caseSensitiveMatch` option is disabled, all patterns must be marked as dynamic, because we cannot check
-     * filepath directly (without read directory).
+    /**
+     * When the `caseSensitiveMatch` option is disabled, all patterns must be marked as dynamic, because we cannot check
+     * filepath directly (without read directory).
      */
 
 
@@ -34389,17 +34389,17 @@ var pattern = createCommonjsModule(function (module, exports) {
     } = picomatch$1.scan(pattern, Object.assign(Object.assign({}, options), {
       parts: true
     }));
-    /**
-     * The scan method returns an empty array in some cases.
-     * See micromatch/picomatch#58 for more details.
+    /**
+     * The scan method returns an empty array in some cases.
+     * See micromatch/picomatch#58 for more details.
      */
 
     if (parts.length === 0) {
       parts = [pattern];
     }
-    /**
-     * The scan method does not return an empty part for the pattern with a forward slash.
-     * This is another part of micromatch/picomatch#58.
+    /**
+     * The scan method does not return an empty part for the pattern with a forward slash.
+     * This is another part of micromatch/picomatch#58.
      */
 
 
@@ -34804,8 +34804,8 @@ var constants$5 = createCommonjsModule(function (module, exports) {
   const SUPPORTED_MINOR_VERSION = 10;
   const IS_MATCHED_BY_MAJOR = MAJOR_VERSION > SUPPORTED_MAJOR_VERSION;
   const IS_MATCHED_BY_MAJOR_AND_MINOR = MAJOR_VERSION === SUPPORTED_MAJOR_VERSION && MINOR_VERSION >= SUPPORTED_MINOR_VERSION;
-  /**
-   * IS `true` for Node.js 10.10 and greater.
+  /**
+   * IS `true` for Node.js 10.10 and greater.
    */
 
   exports.IS_SUPPORT_READDIR_WITH_FILE_TYPES = IS_MATCHED_BY_MAJOR || IS_MATCHED_BY_MAJOR_AND_MINOR;
@@ -35894,9 +35894,9 @@ var matcher = createCommonjsModule(function (module, exports) {
     }
 
     _fillStorage() {
-      /**
-       * The original pattern may include `{,*,**,a/*}`, which will lead to problems with matching (unresolved level).
-       * So, before expand patterns with brace expansion into separated patterns.
+      /**
+       * The original pattern may include `{,*,**,a/*}`, which will lead to problems with matching (unresolved level).
+       * So, before expand patterns with brace expansion into separated patterns.
        */
       const patterns = utils$3.pattern.expandPatternsWithBraceExpansion(this._patterns);
 
@@ -35958,12 +35958,12 @@ var partial = createCommonjsModule(function (module, exports) {
 
       for (const pattern of patterns) {
         const section = pattern.sections[0];
-        /**
-         * In this case, the pattern has a globstar and we must read all directories unconditionally,
-         * but only if the level has reached the end of the first group.
-         *
-         * fixtures/{a,b}/**
-         *  ^ true/false  ^ always true
+        /**
+         * In this case, the pattern has a globstar and we must read all directories unconditionally,
+         * but only if the level has reached the end of the first group.
+         *
+         * fixtures/{a,b}/**
+         *  ^ true/false  ^ always true
         */
 
         if (!pattern.complete && levels > section.length) {
@@ -36045,8 +36045,8 @@ var deep = createCommonjsModule(function (module, exports) {
     }
 
     _isSkippedByDeep(basePath, entryPath) {
-      /**
-       * Avoid unnecessary depth calculations when it doesn't matter.
+      /**
+       * Avoid unnecessary depth calculations when it doesn't matter.
        */
       if (this._settings.deep === Infinity) {
         return false;
@@ -36534,10 +36534,10 @@ async function FastGlob(source, options) {
   function stream(source, options) {
     assertPatternsInput(source);
     const works = getWorks(source, stream$5.default, options);
-    /**
-     * The stream returned by the provider cannot work with an asynchronous iterator.
-     * To support asynchronous iterators, regardless of the number of tasks, we always multiplex streams.
-     * This affects performance (+25%). I don't see best solution right now.
+    /**
+     * The stream returned by the provider cannot work with an asynchronous iterator.
+     * To support asynchronous iterators, regardless of the number of tasks, we always multiplex streams.
+     * This affects performance (+25%). I don't see best solution right now.
      */
 
     return utils$3.stream.merge(works);

data/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@prettier/plugin-ruby",
-  "version": "1.0.1",
+  "version": "1.2.3",
   "description": "prettier plugin for the Ruby programming language",
-  "main": "src/ruby.js",
+  "main": "src/plugin.js",
   "scripts": {
     "check-format": "prettier --check '**/*'",
     "lint": "eslint --cache .",
@@ -50,6 +50,8 @@
     }
   },
   "jest": {
+    "globalSetup": "./test/js/globalSetup.js",
+    "globalTeardown": "./test/js/globalTeardown.js",
     "setupFilesAfterEnv": [
       "./test/js/setupTests.js"
     ],

data/src/{ruby.js → plugin.js}

@@ -1,5 +1,5 @@
-const printer = require("./printer");
-const parser = require("./parser");
+const printer = require("./ruby/printer");
+const parser = require("./ruby/parser");
 
 /*
  * metadata mostly pulled from linguist and rubocop:

data/src/{embed.js → ruby/embed.js}

@@ -6,9 +6,9 @@ const {
   mapDoc,
   markAsRoot,
   stripTrailingHardline
-} = require("./prettier");
+} = require("../prettier");
 
-const { literalLineNoBreak } = require("./utils");
+const { literalLineNoBreak } = require("../utils");
 
 const parsers = {
   css: "css",

data/src/{nodes → ruby/nodes}/alias.js

@@ -5,7 +5,7 @@ const {
   group,
   hardline,
   line
-} = require("../prettier");
+} = 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

data/src/{nodes → ruby/nodes}/aref.js

@@ -1,4 +1,11 @@
-const { concat, group, indent, join, line, softline } = require("../prettier");
+const {
+  concat,
+  group,
+  indent,
+  join,
+  line,
+  softline
+} = require("../../prettier");
 
 // `aref` nodes are when you're pulling a value out of a collection at a
 // specific index. Put another way, it's any time you're calling the method

data/src/{nodes → ruby/nodes}/args.js

@@ -6,10 +6,10 @@ const {
   join,
   line,
   softline
-} = require("../prettier");
+} = require("../../prettier");
+const { getTrailingComma } = require("../../utils");
 
 const toProc = require("../toProc");
-const { getTrailingComma } = require("../utils");
 
 function printArgParen(path, opts, print) {
   const argsNode = path.getValue().body[0];