prettier 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b3f385a13ce2aae0cef657abc5d33e5d3d2fbfb59edf1fb39193ded2828cf87
-  data.tar.gz: 1049cb733eb60e3221a7df64110f5841f39288f8e91cb589f08cc1c23a0ddfbe
+  metadata.gz: 0110d43bf561f7af177d93dce16dd6c8802bff3eb5c6603f6b72460903186b43
+  data.tar.gz: 48dd261628c7127b3baca0c6934c21993b68831c6d545494967642f5783e3d16
 SHA512:
-  metadata.gz: ef14696b55d0dd1a544bba5fd45d88e3ab322ab9d2ae34d89b4b6bf84748ac35100022d5e050ed4ef0e5cf5ad93049c1782243cda27e4bae5b7dc87a2f951614
-  data.tar.gz: 1bedee0f2b091bc7b7b10ceb645d183271dcea847f8b843c79cd6db5ebf078bb94d7d91fd255127f77c71eb9edd185dcfa166ffe9c442f315f64beb9ba57f4ee
+  metadata.gz: 2caa7e2cb715c7a3c1124210b1a2efa064425ef4b2075abd84b7092e28eae67c66fc1aabf93cd6c5493b86c5c735fe9965c9f0f347be4b57f5690f74690d79b4
+  data.tar.gz: 16f4abe1b2ca8099660cd22a541bac6a220f661db879bf9742e85645abfe0cbf36146872c6dfe33af30bc5c8b303144720abe5233d4a1748390a7ff587e8c005

data/CHANGELOG.md

@@ -6,6 +6,20 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [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 +971,8 @@ 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.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
@@ -1045,6 +1060,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
@@ -1059,6 +1075,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
@@ -1068,4 +1086,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

@@ -227,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,6 +1,6 @@
 {
   "name": "@prettier/plugin-ruby",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "prettier plugin for the Ruby programming language",
   "main": "src/ruby.js",
   "scripts": {
@@ -50,6 +50,8 @@
     }
   },
   "jest": {
+    "globalSetup": "./test/js/globalSetup.js",
+    "globalTeardown": "./test/js/globalTeardown.js",
     "setupFilesAfterEnv": [
       "./test/js/setupTests.js"
     ],

data/src/nodes/calls.js

@@ -39,6 +39,7 @@ function printCall(path, opts, print) {
   // right side of the expression, as we want to have a nice multi-line layout.
   if (chained.includes(parentNode.type)) {
     parentNode.chain = (node.chain || 0) + 1;
+    parentNode.callChain = (node.callChain || 0) + 1;
     parentNode.breakDoc = (node.breakDoc || [receiverDoc]).concat(rightSideDoc);
   }
 
@@ -62,13 +63,31 @@ function printCall(path, opts, print) {
 
 function printMethodAddArg(path, opts, print) {
   const node = path.getValue();
-  const argNode = node.body[1];
 
+  const [methodNode, argNode] = node.body;
   const [methodDoc, argsDoc] = path.map(print, "body");
 
   // You can end up here if you have a method with a ? ending, presumably
-  // because the parser knows that it cannot be a local variable.
+  // because the parser knows that it cannot be a local variable. You can also
+  // end up here if you are explicitly using an empty set of parentheses.
   if (argsDoc.length === 0) {
+    // If you're using an explicit set of parentheses on something that looks
+    // like a constant, then we need to match that in order to maintain valid
+    // Ruby. For example, you could do something like Foo(), on which we would
+    // need to keep the parentheses to make it look like a method call.
+    if (methodNode.type === "fcall" && methodNode.body[0].type === "@const") {
+      return concat([methodDoc, "()"]);
+    }
+
+    // If you're using an explicit set parentheses with the special call syntax,
+    // then we need to explicitly print out an extra set of parentheses. For
+    // example, if you call something like Foo.new.() (implicitly calling the
+    // #call method on a new instance of the Foo class), then we have to print
+    // out those parentheses, otherwise we'll end up with Foo.new.
+    if (methodNode.type === "call" && methodNode.body[2] === "call") {
+      return concat([methodDoc, "()"]);
+    }
+
     return methodDoc;
   }
 
@@ -91,6 +110,21 @@ function printMethodAddArg(path, opts, print) {
   // If we're at the top of a chain, then we're going to print out a nice
   // multi-line layout if this doesn't break into multiple lines.
   if (!chained.includes(parentNode.type) && (node.chain || 0) >= 3) {
+    // This is pretty specialized behavior. Basically if we're at the top of a
+    // chain but we've only had method calls without arguments and now we have
+    // arguments, then we're effectively trying to call a method with arguments
+    // that is nested under a bunch of stuff. So we group together to first part
+    // to make it so just the arguments break. This looks like, for example:
+    //
+    //     config.action_dispatch.rescue_responses.merge!(
+    //       'ActiveRecord::ConnectionTimeoutError' => :service_unavailable,
+    //       'ActiveRecord::QueryCanceled' => :service_unavailable
+    //     )
+    //
+    if (node.callChain === node.chain) {
+      return concat([group(indent(concat(node.breakDoc))), group(argsDoc)]);
+    }
+
     return ifBreak(
       group(indent(concat(node.breakDoc.concat(argsDoc)))),
       concat([methodDoc, argsDoc])

data/src/nodes/loops.js

@@ -12,85 +12,85 @@ const {
 const { containsAssignment } = require("../utils");
 const inlineEnsureParens = require("../utils/inlineEnsureParens");
 
-const printLoop = (keyword, modifier) => (path, { rubyModifier }, print) => {
-  const [_predicate, stmts] = path.getValue().body;
+function printLoop(keyword, modifier) {
+  return function printLoopWithOptions(path, { rubyModifier }, print) {
+    const [_predicate, stmts] = path.getValue().body;
 
-  // If the only statement inside this while loop is a void statement, then we
-  // can shorten to just displaying the predicate and then a semicolon.
-  if (
-    stmts.body.length === 1 &&
-    stmts.body[0].type === "void_stmt" &&
-    !stmts.body[0].comments
-  ) {
-    return group(
-      concat([
-        keyword,
-        " ",
-        path.call(print, "body", 0),
-        ifBreak(softline, "; "),
-        "end"
+    // If the only statement inside this while loop is a void statement, then we
+    // can shorten to just displaying the predicate and then a semicolon.
+    if (
+      stmts.body.length === 1 &&
+      stmts.body[0].type === "void_stmt" &&
+      !stmts.body[0].comments
+    ) {
+      return group(
+        concat([
+          keyword,
+          " ",
+          path.call(print, "body", 0),
+          ifBreak(softline, "; "),
+          "end"
+        ])
+      );
+    }
+
+    const inlineLoop = concat(
+      inlineEnsureParens(path, [
+        path.call(print, "body", 1),
+        ` ${keyword} `,
+        path.call(print, "body", 0)
       ])
     );
-  }
 
-  const inlineLoop = concat(
-    inlineEnsureParens(path, [
-      path.call(print, "body", 1),
-      ` ${keyword} `,
-      path.call(print, "body", 0)
-    ])
-  );
+    // If we're in the modifier form and we're modifying a `begin`, then this is
+    // a special case where we need to explicitly use the modifier form because
+    // otherwise the semantic meaning changes. This looks like:
+    //
+    //     begin
+    //       foo
+    //     end while bar
+    //
+    // The above is effectively a `do...while` loop (which we don't have in
+    // ruby).
+    if (modifier && path.getValue().body[1].type === "begin") {
+      return inlineLoop;
+    }
 
-  // If we're in the modifier form and we're modifying a `begin`, then this is a
-  // special case where we need to explicitly use the modifier form because
-  // otherwise the semantic meaning changes. This looks like:
-  //
-  //     begin
-  //       foo
-  //     end while bar
-  //
-  // The above is effectively a `do...while` loop (which we don't have in ruby).
-  if (modifier && path.getValue().body[1].type === "begin") {
-    return inlineLoop;
-  }
+    const blockLoop = concat([
+      concat([
+        `${keyword} `,
+        align(keyword.length + 1, path.call(print, "body", 0))
+      ]),
+      indent(concat([softline, path.call(print, "body", 1)])),
+      concat([softline, "end"])
+    ]);
 
-  const blockLoop = concat([
-    concat([
-      `${keyword} `,
-      align(keyword.length + 1, path.call(print, "body", 0))
-    ]),
-    indent(concat([softline, path.call(print, "body", 1)])),
-    concat([softline, "end"])
-  ]);
+    // If we're disallowing inline loops or if the predicate of the loop
+    // contains 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 (!rubyModifier || containsAssignment(path.getValue().body[0])) {
+      return concat([breakParent, blockLoop]);
+    }
 
-  // If we're disallowing inline loops or if the predicate of the loop contains
-  // 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 (!rubyModifier || containsAssignment(path.getValue().body[0])) {
-    return concat([breakParent, blockLoop]);
-  }
+    return group(ifBreak(blockLoop, inlineLoop));
+  };
+}
 
-  return group(ifBreak(blockLoop, inlineLoop));
-};
+function printFor(path, opts, print) {
+  const [variable, range, stmts] = path.map(print, "body");
 
-// Technically this is incorrect. A `for` loop actually introduces and modifies
-// a local variable that then remains in the outer scope. Additionally, if the
-// `each` method was somehow missing from the enumerable (it's possible...),
-// then this transformation would fail. However - I've never actually seen a
-// `for` loop used in production. If someone actually calls me on it, I'll fix
-// this, but for now I'm leaving it.
-const printFor = (path, opts, print) =>
-  group(
+  return group(
     concat([
-      path.call(print, "body", 1),
-      ".each do |",
-      path.call(print, "body", 0),
-      "|",
-      indent(concat([hardline, path.call(print, "body", 2)])),
+      "for ",
+      variable,
+      " in ",
+      range,
+      indent(concat([hardline, stmts])),
       concat([hardline, "end"])
     ])
   );
+}
 
 module.exports = {
   while: printLoop("while", false),

data/src/nodes/regexp.js

@@ -1,28 +1,25 @@
 const { concat } = require("../prettier");
 const { hasAncestor } = require("../utils");
 
-function isStringContent(node) {
-  return node.type === "@tstring_content";
+function hasContent(node, pattern) {
+  return node.body.some(
+    (child) => child.type === "@tstring_content" && pattern.test(child.body)
+  );
 }
 
-function shouldUseBraces(path) {
+// If the first part of this regex is plain string content, we have a space
+// or an =, and we're contained within a command or command_call node, then we
+// want to use braces because otherwise we could end up with an ambiguous
+// operator, e.g. foo / bar/ or foo /=bar/
+function forwardSlashIsAmbiguous(path) {
   const node = path.getValue();
-  const first = node.body[0];
-
-  // If the first part of this regex is plain string content and we have a
-  // space or an =, then we want to use braces because otherwise we could end up
-  // with an ambiguous operator, e.g. foo / bar/ or foo /=bar/
-  if (
-    first &&
-    isStringContent(first) &&
-    [" ", "="].includes(first.body[0]) &&
-    hasAncestor(path, ["command", "command_call"])
-  ) {
-    return true;
-  }
+  const firstChildNode = node.body[0];
 
-  return node.body.some(
-    (child) => isStringContent(child) && child.body.includes("/")
+  return (
+    firstChildNode &&
+    firstChildNode.type === "@tstring_content" &&
+    [" ", "="].includes(firstChildNode.body[0]) &&
+    hasAncestor(path, ["command", "command_call"])
   );
 }
 
@@ -35,13 +32,23 @@ function shouldUseBraces(path) {
 // itself. In that case we switch over to using %r with braces.
 function printRegexpLiteral(path, opts, print) {
   const node = path.getValue();
-  const useBraces = shouldUseBraces(path);
+  const docs = path.map(print, "body");
+
+  // We should use braces if using a forward slash would be ambiguous in the
+  // current context or if there's a forward slash in the content of the regexp.
+  const useBraces = forwardSlashIsAmbiguous(path) || hasContent(node, /\//);
 
-  const parts = [useBraces ? "%r{" : "/"]
-    .concat(path.map(print, "body"))
-    .concat([useBraces ? "}" : "/", node.ending.slice(1)]);
+  // If we should be using braces but we have braces in the body of the regexp,
+  // then we're just going to resort to using whatever the original content was.
+  if (useBraces && hasContent(node, /[{}]/)) {
+    return concat([node.beging].concat(docs).concat(node.ending));
+  }
 
-  return concat(parts);
+  return concat(
+    [useBraces ? "%r{" : "/"]
+      .concat(docs)
+      .concat(useBraces ? "}" : "/", node.ending.slice(1))
+  );
 }
 
 module.exports = {

data/src/parser.rb

@@ -1719,7 +1719,8 @@ class Prettier::Parser < Ripper
   # expression literal, like /foo/. It can be followed by any number of
   # regexp_add events, which we'll append onto an array body.
   def on_regexp_new
-    find_scanner_event(:@regexp_beg).merge!(type: :regexp, body: [])
+    beging = find_scanner_event(:@regexp_beg)
+    beging.merge!(type: :regexp, body: [], beging: beging[:body])
   end
 
   # regexp_add is a parser event that represents a piece of a regular

data/src/printer.js

@@ -20,6 +20,18 @@ function printNode(path, opts, print) {
   throw new Error(`Unsupported node encountered: ${type}\n${ast}`);
 }
 
+// This is an escape-hatch to ignore nodes in the tree. If you have a comment
+// that includes this pattern, then the entire node will be ignored and just the
+// original source will be printed out.
+function hasPrettierIgnore(path) {
+  const node = path.getValue();
+
+  return (
+    node.comments &&
+    node.comments.some((comment) => comment.value.includes("prettier-ignore"))
+  );
+}
+
 const noComments = [
   "args",
   "args_add_block",
@@ -83,6 +95,7 @@ function isBlockComment(comment) {
 module.exports = {
   embed,
   print: printNode,
+  hasPrettierIgnore,
   canAttachComment,
   getCommentChildNodes,
   printComment,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Kevin Deisz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-12 00:00:00.000000000 Z
+date: 2020-12-20 00:00:00.000000000 Z
 dependencies: []
 description:
 email: