prettier 1.0.0.pre.rc1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2bdbafe8bc7bd8ebc0f77727584bfa80773721ca5e77f820df84b8e7c7e0951
-  data.tar.gz: 53e157e6880b56e642690fb90f6244ad669739a2e5fb697cde0c8082facc2c20
+  metadata.gz: c97988d5dd7fe35aa5fd73777f31f8217809ea0eee189cab7ac70c266569857b
+  data.tar.gz: 478c15e6cbd8d8efb16fc37e028afb8c88f3671aa77f36d3df0cd115b239c83a
 SHA512:
-  metadata.gz: 854c61aa25de0a708606f89cb4bd3dde7dee10ecec89cfc7660bf03722ea12603bbb4dbf5f8d8b25f14359de55b419f2758522198cae9926d03fe77fab7aa001
-  data.tar.gz: d9c821b5367084de39bbe51c60a58642210caa5da04757c6fafbabec6e204adfdd9d7b656e34c3a94e50af26d5c6ceda9236edf68e96c98ed1e941957fe47c4a
+  metadata.gz: 38ae06510c4872ba7f4ede36dc6b5f4aae3c7183c9c48b4e515733074e9ce27d2ddb4b189c25600d1daf123b8f5eccbb8b12c953e5192a62e08a63cb9716298e
+  data.tar.gz: 9456c53fe9ad823defb3d69fd4dd4504ee1e9d4af5d522fd8352141d61a5d975aa6043b62d78dd077f000258e400ee98fce8131ada5dac066021bb27e9f40de5

data/CHANGELOG.md

@@ -6,6 +6,55 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [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
+
+- [@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
@@ -240,7 +289,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
 ```
 
@@ -928,7 +978,11 @@ would previously result in `array[]`, but now prints properly.
 
 - Initial release 🎉
 
-[unreleased]: https://github.com/prettier/plugin-ruby/compare/v1.0.0-rc1...HEAD
+[unreleased]: https://github.com/prettier/plugin-ruby/compare/v1.1.0...HEAD
+[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
 [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
@@ -1013,6 +1067,7 @@ 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
@@ -1027,6 +1082,8 @@ would previously result in `array[]`, but now prints properly.
 [@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
@@ -1036,4 +1093,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/README.md

@@ -122,16 +122,17 @@ 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)).                                  |
-| `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`. |
+| 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:
@@ -226,6 +227,9 @@ 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>
   </tr>
 </table>
 

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,11 +1,11 @@
 {
   "name": "@prettier/plugin-ruby",
-  "version": "1.0.0-rc1",
+  "version": "1.2.0",
   "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": {
@@ -25,9 +25,9 @@
     "all-contributors-cli": "^6.14.1",
     "eslint": "^7.8.1",
     "eslint-config-prettier": "^7.0.0",
-    "husky": "^5.0.4",
+    "husky": "^4.3.5",
     "jest": "^26.0.0",
-    "pretty-quick": "^3.0.0"
+    "pretty-quick": "^3.1.0"
   },
   "eslintConfig": {
     "extends": [
@@ -50,6 +50,8 @@
     }
   },
   "jest": {
+    "globalSetup": "./test/js/globalSetup.js",
+    "globalTeardown": "./test/js/globalTeardown.js",
     "setupFilesAfterEnv": [
       "./test/js/setupTests.js"
     ],
@@ -61,6 +63,9 @@
     }
   },
   "prettier": {
-    "trailingComma": "none"
+    "trailingComma": "none",
+    "plugins": [
+      "."
+    ]
   }
 }

data/src/embed.js

@@ -67,7 +67,11 @@ const embed = (path, print, textToDoc, _opts) => {
       path.call(print, "beging"),
       lineSuffix(
         group(
-          concat([indent(markAsRoot(formatted)), literalLineNoBreak, ending])
+          concat([
+            indent(markAsRoot(formatted)),
+            literalLineNoBreak,
+            ending.trim()
+          ])
         )
       )
     ]);
@@ -78,7 +82,7 @@ const embed = (path, print, textToDoc, _opts) => {
   return markAsRoot(
     concat([
       path.call(print, "beging"),
-      lineSuffix(group(concat([formatted, literalLineNoBreak, ending])))
+      lineSuffix(group(concat([formatted, literalLineNoBreak, ending.trim()])))
     ])
   );
 };

data/src/nodes/args.js

@@ -9,80 +9,56 @@ const {
 } = require("../prettier");
 
 const toProc = require("../toProc");
-const { docLength, getTrailingComma } = require("../utils");
-
-module.exports = {
-  arg_paren: (path, opts, print) => {
-    const argsNode = path.getValue().body[0];
-
-    if (argsNode === null) {
-      return "";
-    }
-
-    // Here we can skip the entire rest of the method by just checking if it's
-    // an args_forward node, as we're guaranteed that there are no other arg
-    // nodes.
-    if (argsNode.type === "args_forward") {
-      return group(
+const { getTrailingComma } = require("../utils");
+
+function printArgParen(path, opts, print) {
+  const argsNode = path.getValue().body[0];
+
+  if (argsNode === null) {
+    return "";
+  }
+
+  // Here we can skip the entire rest of the method by just checking if it's
+  // an args_forward node, as we're guaranteed that there are no other arg
+  // nodes.
+  if (argsNode.type === "args_forward") {
+    return group(
+      concat([
+        "(",
+        indent(concat([softline, path.call(print, "body", 0)])),
+        softline,
+        ")"
+      ])
+    );
+  }
+
+  const args = path.call(print, "body", 0);
+  const hasBlock = argsNode.type === "args_add_block" && argsNode.body[1];
+
+  // Now here we return a doc that represents the whole grouped expression,
+  // including the surrouding parentheses.
+  return group(
+    concat([
+      "(",
+      indent(
         concat([
-          "(",
-          indent(concat([softline, path.call(print, "body", 0)])),
           softline,
-          ")"
+          join(concat([",", line]), args),
+          getTrailingComma(opts) && !hasBlock ? ifBreak(",", "") : ""
         ])
-      );
-    }
-
-    const args = path.call(print, "body", 0);
-    const hasBlock = argsNode.type === "args_add_block" && argsNode.body[1];
-
-    // These are the docs representing the actual arguments, without any
-    // parentheses or surrounding lines yet added.
-    let argsDocs = [
-      join(concat([",", line]), args),
-      getTrailingComma(opts) && !hasBlock ? ifBreak(",", "") : ""
-    ];
-
-    // Here we're going to make a determination on whether or not we should put
-    // a newline before the first argument. In some cases this makes the
-    // appearance a little better. For example, instead of taking this input:
-    //
-    //     foo(arg1, arg2).bar(arg1, arg2).baz(arg1)
-    //
-    // and transforming it into this:
-    //
-    //     foo(arg1, arg2).bar(arg1, arg2).baz(
-    //       arg1
-    //     )
-    //
-    // it instead gets transformed into this:
-    //
-    //     foo(arg1, arg2).bar(arg1, arg2)
-    //       .baz(arg1)
-    //
-    const maxDocLength = 15;
-    const firstArgDoc = args[0];
-
-    // prettier-ignore
-    const shouldWrapLine =
-      (args.reduce((sum, arg) => sum + docLength(arg), 0) > maxDocLength) ||
-      (args.length == 1 && firstArgDoc.type === "group" && docLength(firstArgDoc) > maxDocLength) ||
-      (firstArgDoc.type === "concat" && firstArgDoc.parts.some((part) => part.type === "group"));
-
-    // Here we're going to get all of the docs representing the doc that's
-    // inside the parentheses.
-    if (shouldWrapLine) {
-      argsDocs = [indent(concat([softline].concat(argsDocs))), softline];
-    } else {
-      argsDocs = [indent(concat(argsDocs))];
-    }
-
-    // Now here we return a doc that represents the whole grouped expression,
-    // including the surrouding parentheses.
-    return group(concat(["("].concat(argsDocs).concat(")")));
-  },
-  args: (path, opts, print) => {
-    const args = path.map(print, "body");
+      ),
+      softline,
+      ")"
+    ])
+  );
+}
+
+function printArgs(path, { rubyToProc }, print) {
+  const args = path.map(print, "body");
+
+  // Don't bother trying to do any kind of fancy toProc transform if the
+  // option is disabled.
+  if (rubyToProc) {
     let blockNode = null;
 
     // Look up the chain to see if these arguments are contained within a
@@ -99,21 +75,26 @@ module.exports = {
       return blockNode;
     });
 
-    const proc = blockNode && toProc(path, opts, blockNode);
+    const proc = blockNode && toProc(path, blockNode);
 
-    // If we have a successful to_proc transformation, but we're part of an aref
-    // node, that means it's something to the effect of
+    // If we have a successful to_proc transformation, but we're part of an
+    // aref node, that means it's something to the effect of
     //
     //     foo[:bar].each(&:to_s)
     //
-    // In this case we need to just return regular arguments, otherwise we would
-    // end up putting &:to_s inside the brackets accidentally.
+    // In this case we need to just return regular arguments, otherwise we
+    // would end up putting &:to_s inside the brackets accidentally.
     if (proc && path.getParentNode(1).type !== "aref") {
       args.push(proc);
     }
+  }
 
-    return args;
-  },
+  return args;
+}
+
+module.exports = {
+  arg_paren: printArgParen,
+  args: printArgs,
   args_add_block: (path, opts, print) => {
     const parts = path.call(print, "body", 0);