prettier 0.18.0 → 0.18.1

data/src/nodes/lambdas.js

@@ -21,7 +21,7 @@ module.exports = {
       paramsConcat = path.call(print, "body", 0, "body", 0);
     }
 
-    const noParams = params.body.every(type => !type);
+    const noParams = params.body.every((type) => !type);
     const inlineLambda = concat([
       "->",
       noParams ? "" : concat(["(", paramsConcat, ")"]),

data/src/nodes/methods.js

@@ -9,7 +9,7 @@ const {
 } = require("../prettier");
 const { first, literal } = require("../utils");
 
-const printMethod = offset => (path, opts, print) => {
+const printMethod = (offset) => (path, opts, print) => {
   const [_name, params, body] = path.getValue().body.slice(offset);
   const declaration = ["def "];
 
@@ -21,7 +21,7 @@ const printMethod = offset => (path, opts, print) => {
 
   // In case there are no parens but there are arguments
   const parens =
-    params.type === "params" && params.body.some(paramType => paramType);
+    params.type === "params" && params.body.some((paramType) => paramType);
 
   declaration.push(
     path.call(print, "body", offset),

data/src/nodes/operators.js

@@ -7,10 +7,18 @@ module.exports = {
 
     return group(
       concat([
-        concat([path.call(print, "body", 0), useNoSpace ? "" : " "]),
-        operator,
+        group(path.call(print, "body", 0)),
         indent(
-          concat([useNoSpace ? softline : line, path.call(print, "body", 2)])
+          concat([
+            useNoSpace ? "" : " ",
+            group(
+              concat([
+                operator,
+                useNoSpace ? softline : line,
+                path.call(print, "body", 2)
+              ])
+            )
+          ])
         )
       ])
     );

data/src/nodes/params.js

@@ -1,7 +1,7 @@
 const { concat, group, join, line } = require("../prettier");
 const { literal } = require("../utils");
 
-const printGenericRestParam = symbol => (path, opts, print) =>
+const printGenericRestParam = (symbol) => (path, opts, print) =>
   path.getValue().body[0]
     ? concat([symbol, path.call(print, "body", 0)])
     : symbol;

data/src/nodes/regexp.js

@@ -7,7 +7,7 @@ module.exports = {
     const [contents, ending] = path.map(print, "body");
 
     const useBraces = contents.some(
-      content => typeof content === "string" && content.includes("/")
+      (content) => typeof content === "string" && content.includes("/")
     );
     const parts = [useBraces ? "%r{" : "/"]
       .concat(contents)

data/src/nodes/return.js

@@ -9,6 +9,16 @@ const {
 } = require("../prettier");
 const { literal } = require("../utils");
 
+// You can't skip the parentheses if you have the `and` or `or` operator,
+// because they have low enough operator precedence that you need to explicitly
+// keep them in there.
+const canSkipParens = (args) => {
+  const statement = args.body[0].body[0].body[0];
+  return (
+    statement.type !== "binary" || !["and", "or"].includes(statement.body[1])
+  );
+};
+
 const printReturn = (path, opts, print) => {
   let args = path.getValue().body[0].body[0];
   let steps = ["body", 0, "body", 0];
@@ -20,7 +30,7 @@ const printReturn = (path, opts, print) => {
   // If the body of the return contains parens, then just skip directly to the
   // content of the parens so that we can skip printing parens if we don't
   // want them.
-  if (args.body[0] && args.body[0].type === "paren") {
+  if (args.body[0] && args.body[0].type === "paren" && canSkipParens(args)) {
     args = args.body[0].body[0];
     steps = steps.concat("body", 0, "body", 0);
   }

data/src/nodes/strings.js

@@ -15,18 +15,18 @@ const { concatBody, empty, makeList, prefix, surround } = require("../utils");
 // quote the user chose. (If they chose single quotes, then double quoting
 // would activate the escape sequence, and if they chose double quotes, then
 // single quotes would deactivate it.)
-const isQuoteLocked = string =>
+const isQuoteLocked = (string) =>
   string.body.some(
-    part =>
+    (part) =>
       part.type === "@tstring_content" &&
       (part.body.includes("#{") || part.body.includes("\\"))
   );
 
 // A string is considered to be able to use single quotes if it contains only
 // plain string content and that content does not contain a single quote.
-const isSingleQuotable = string =>
+const isSingleQuotable = (string) =>
   string.body.every(
-    part => part.type === "@tstring_content" && !part.body.includes("'")
+    (part) => part.type === "@tstring_content" && !part.body.includes("'")
   );
 
 const quotePattern = new RegExp("\\\\([\\s\\S])|(['\"])", "g");
@@ -61,7 +61,7 @@ const quotePairs = {
   "<": ">"
 };
 
-const getClosingQuote = quote => {
+const getClosingQuote = (quote) => {
   if (!quote.startsWith("%")) {
     return quote;
   }

data/src/prettier.js

@@ -3,7 +3,6 @@
 // directly, as it's been shipped with the gem.
 const source = process.env.RBPRETTIER ? "../node_modules/prettier" : "prettier";
 
-// eslint-disable-next-line import/no-dynamic-require
 const prettier = require(source);
 
 // Just combine all the things into one big object so that we can import

data/src/ruby.js

@@ -4,10 +4,10 @@ const print = require("./print");
 const haml = require("./haml");
 
 const pragmaPattern = /#\s*@(prettier|format)/;
-const hasPragma = text => pragmaPattern.test(text);
+const hasPragma = (text) => pragmaPattern.test(text);
 
-const locStart = node => node.char_start;
-const locEnd = node => node.char_end;
+const locStart = (node) => node.char_start;
+const locEnd = (node) => node.char_end;
 
 /*
  * metadata mostly pulled from linguist and rubocop:

data/src/toProc.js

@@ -1,4 +1,4 @@
-const isCall = node => ["::", "."].includes(node) || node.type === "@period";
+const isCall = (node) => ["::", "."].includes(node) || node.type === "@period";
 
 // If you have a simple block that only calls a method on the single required
 // parameter that is passed to it, then you can replace that block with the
@@ -11,7 +11,7 @@ const isCall = node => ["::", "."].includes(node) || node.type === "@period";
 //     [1, 2, 3].map(&:to_s)
 //
 // This works with `do` blocks as well.
-const toProc = node => {
+const toProc = (node) => {
   if (!node) {
     return null;
   }

data/src/utils.js

@@ -10,11 +10,11 @@ const concatBody = (path, opts, print) => concat(path.map(print, "body"));
 
 // If the node is a type of assignment or if the node is a paren and nested
 // inside that paren is a node that is a type of assignment.
-const containsAssignment = node =>
+const containsAssignment = (node) =>
   ["assign", "massign"].includes(node.type) ||
   (node.type === "paren" && node.body[0].body.some(containsAssignment));
 
-const docLength = doc => {
+const docLength = (doc) => {
   if (doc.length) {
     return doc.length;
   }
@@ -50,7 +50,7 @@ const hasAncestor = (path, types) => {
   return false;
 };
 
-const literal = value => () => value;
+const literal = (value) => () => value;
 
 const makeArgs = (path, opts, print, argsIndex) => {
   let argNodes = path.getValue().body[argsIndex];
@@ -103,13 +103,13 @@ const makeCall = (path, opts, print) => {
 
 const makeList = (path, opts, print) => path.map(print, "body");
 
-const prefix = value => (path, opts, print) =>
+const prefix = (value) => (path, opts, print) =>
   concat([value, path.call(print, "body", 0)]);
 
 const printComments = (printed, start, comments) => {
   let node = printed;
 
-  comments.forEach(comment => {
+  comments.forEach((comment) => {
     if (comment.start < start) {
       node = concat([
         comment.break ? breakParent : "",
@@ -129,7 +129,7 @@ const printComments = (printed, start, comments) => {
   return node;
 };
 
-const skipAssignIndent = node =>
+const skipAssignIndent = (node) =>
   ["array", "hash", "heredoc", "lambda", "regexp_literal"].includes(
     node.type
   ) ||

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Kevin Deisz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler