prettier 1.5.1 → 1.6.0

data/src/ruby/printer.js

@@ -127,6 +127,14 @@ function isBlockComment(comment) {
   return comment.type === "@embdoc";
 }
 
+// This function handles adding the format pragma to a source string. This is an
+// optional workflow for incremental adoption.
+function insertPragma(text) {
+  const boundary = text.startsWith("#") ? "\n" : "\n\n";
+
+  return `# @format${boundary}${text}`;
+}
+
 module.exports = {
   embed,
   print: printNode,
@@ -134,5 +142,6 @@ module.exports = {
   canAttachComment,
   getCommentChildNodes,
   printComment,
-  isBlockComment
+  isBlockComment,
+  insertPragma
 };

data/src/utils.js

@@ -5,7 +5,7 @@ module.exports = {
   isEmptyStmts: require("./utils/isEmptyStmts"),
   hasAncestor: require("./utils/hasAncestor"),
   literal: require("./utils/literal"),
-  literalLineNoBreak: require("./utils/literalLineNoBreak"),
+  literallineWithoutBreakParent: require("./utils/literallineWithoutBreakParent"),
   makeCall: require("./utils/makeCall"),
   noIndent: require("./utils/noIndent"),
   printEmptyCollection: require("./utils/printEmptyCollection"),

data/src/utils/inlineEnsureParens.js

@@ -2,6 +2,7 @@ const needsParens = [
   "args",
   "assign",
   "assoc_new",
+  "binary",
   "call",
   "massign",
   "opassign"

data/src/utils/literallineWithoutBreakParent.js

@@ -0,0 +1,7 @@
+const literallineWithoutBreakParent = {
+  type: "line",
+  hard: true,
+  literal: true
+};
+
+module.exports = literallineWithoutBreakParent;

data/src/utils/skipAssignIndent.js

@@ -1,4 +1,11 @@
-const skippable = ["array", "hash", "heredoc", "lambda", "regexp_literal"];
+const skippable = [
+  "array",
+  "dyna_symbol",
+  "hash",
+  "heredoc",
+  "lambda",
+  "regexp_literal"
+];
 
 function skipAssignIndent(node) {
   return (

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Kevin Deisz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -28,27 +28,27 @@ files:
 - lib/prettier/rake/task.rb
 - node_modules/prettier/bin-prettier.js
 - node_modules/prettier/index.js
+- node_modules/prettier/parser-angular.js
+- node_modules/prettier/parser-babel.js
+- node_modules/prettier/parser-espree.js
+- node_modules/prettier/parser-flow.js
+- node_modules/prettier/parser-glimmer.js
+- node_modules/prettier/parser-graphql.js
+- node_modules/prettier/parser-html.js
+- node_modules/prettier/parser-markdown.js
+- node_modules/prettier/parser-meriyah.js
+- node_modules/prettier/parser-postcss.js
+- node_modules/prettier/parser-typescript.js
+- node_modules/prettier/parser-yaml.js
 - node_modules/prettier/third-party.js
 - package.json
 - rubocop.yml
 - src/haml/embed.js
-- src/haml/nodes/comment.js
-- src/haml/nodes/doctype.js
-- src/haml/nodes/filter.js
-- src/haml/nodes/hamlComment.js
-- src/haml/nodes/plain.js
-- src/haml/nodes/root.js
-- src/haml/nodes/script.js
-- src/haml/nodes/silentScript.js
-- src/haml/nodes/tag.js
 - src/haml/parser.js
 - src/haml/parser.rb
 - src/haml/printer.js
-- src/parser/getLang.js
-- src/parser/getNetcat.js
 - src/parser/netcat.js
 - src/parser/parseSync.js
-- src/parser/requestParse.js
 - src/parser/server.rb
 - src/plugin.js
 - src/prettier.js
@@ -100,7 +100,7 @@ files:
 - src/utils/isEmptyBodyStmt.js
 - src/utils/isEmptyStmts.js
 - src/utils/literal.js
-- src/utils/literalLineNoBreak.js
+- src/utils/literallineWithoutBreakParent.js
 - src/utils/makeCall.js
 - src/utils/noIndent.js
 - src/utils/printEmptyCollection.js

data/src/haml/nodes/comment.js

@@ -1,27 +0,0 @@
-const { concat, group, hardline, indent, join } = require("../../prettier");
-
-// https://haml.info/docs/yardoc/file.REFERENCE.html#html-comments-
-function comment(path, _opts, print) {
-  const { children, value } = path.getValue();
-  const parts = ["/"];
-
-  if (value.revealed) {
-    parts.push("!");
-  }
-
-  if (value.conditional) {
-    parts.push(value.conditional);
-  } else if (value.text) {
-    parts.push(" ", value.text);
-  }
-
-  if (children.length > 0) {
-    parts.push(
-      indent(concat([hardline, join(hardline, path.map(print, "children"))]))
-    );
-  }
-
-  return group(concat(parts));
-}
-
-module.exports = comment;

data/src/haml/nodes/doctype.js

@@ -1,34 +0,0 @@
-const { join } = require("../../prettier");
-
-const types = {
-  basic: "Basic",
-  frameset: "Frameset",
-  mobile: "Mobile",
-  rdfa: "RDFa",
-  strict: "Strict",
-  xml: "XML"
-};
-
-const versions = ["1.1", "5"];
-
-// https://haml.info/docs/yardoc/file.REFERENCE.html#doctype-
-function doctype(path, _opts, _print) {
-  const { value } = path.getValue();
-  const parts = ["!!!"];
-
-  if (value.type in types) {
-    parts.push(types[value.type]);
-  } else if (versions.includes(value.version)) {
-    parts.push(value.version);
-  } else {
-    parts.push(value.type);
-  }
-
-  if (value.encoding) {
-    parts.push(value.encoding);
-  }
-
-  return join(" ", parts);
-}
-
-module.exports = doctype;

data/src/haml/nodes/filter.js

@@ -1,16 +0,0 @@
-const { concat, group, hardline, indent, join } = require("../../prettier");
-
-// https://haml.info/docs/yardoc/file.REFERENCE.html#filters
-function filter(path, _opts, _print) {
-  const { value } = path.getValue();
-
-  return group(
-    concat([
-      ":",
-      value.name,
-      indent(concat([hardline, join(hardline, value.text.trim().split("\n"))]))
-    ])
-  );
-}
-
-module.exports = filter;

data/src/haml/nodes/hamlComment.js

@@ -1,21 +0,0 @@
-const { concat, hardline, indent, join } = require("../../prettier");
-
-// https://haml.info/docs/yardoc/file.REFERENCE.html#haml-comments--
-function hamlComment(path, opts, _print) {
-  const node = path.getValue();
-  const parts = ["-#"];
-
-  if (node.value.text) {
-    if (opts.originalText.split("\n")[node.line - 1].trim() === "-#") {
-      const lines = node.value.text.trim().split("\n");
-
-      parts.push(indent(concat([hardline, join(hardline, lines)])));
-    } else {
-      parts.push(" ", node.value.text.trim());
-    }
-  }
-
-  return concat(parts);
-}
-
-module.exports = hamlComment;

data/src/haml/nodes/plain.js

@@ -1,6 +0,0 @@
-// https://haml.info/docs/yardoc/file.REFERENCE.html#plain-text
-function plain(path, _opts, _print) {
-  return path.getValue().value.text;
-}
-
-module.exports = plain;

data/src/haml/nodes/root.js

@@ -1,8 +0,0 @@
-const { concat, hardline, join } = require("../../prettier");
-
-// The root node in the AST
-function root(path, _opts, print) {
-  return concat([join(hardline, path.map(print, "children")), hardline]);
-}
-
-module.exports = root;

data/src/haml/nodes/script.js

@@ -1,33 +0,0 @@
-const { concat, group, hardline, indent, join } = require("../../prettier");
-
-// https://haml.info/docs/yardoc/file.REFERENCE.html#inserting_ruby
-function script(path, opts, print) {
-  const { children, value } = path.getValue();
-  const parts = [];
-
-  if (value.escape_html) {
-    parts.unshift("&");
-  }
-
-  if (value.preserve) {
-    parts.push("~");
-  } else if (!value.interpolate) {
-    parts.push("=");
-  }
-
-  if (value.escape_html && !value.preserve && value.interpolate) {
-    parts.push(" ", value.text.trim().slice(1, -1));
-  } else {
-    parts.push(" ", value.text.trim());
-  }
-
-  if (children.length > 0) {
-    parts.push(
-      indent(concat([hardline, join(hardline, path.map(print, "children"))]))
-    );
-  }
-
-  return group(concat(parts));
-}
-
-module.exports = script;

data/src/haml/nodes/silentScript.js

@@ -1,59 +0,0 @@
-const { concat, group, hardline, indent, join } = require("../../prettier");
-
-function findKeywordIndices(children, keywords) {
-  const indices = [];
-
-  children.forEach((child, index) => {
-    if (child.type !== "silent_script") {
-      return;
-    }
-
-    if (keywords.includes(child.value.keyword)) {
-      indices.push(index);
-    }
-  });
-
-  return indices;
-}
-
-// https://haml.info/docs/yardoc/file.REFERENCE.html#running-ruby--
-function silentScript(path, _opts, print) {
-  const { children, value } = path.getValue();
-  const parts = [`- ${value.text.trim()}`];
-
-  if (children.length > 0) {
-    const scripts = path.map(print, "children");
-
-    if (value.keyword === "case") {
-      const keywordIndices = findKeywordIndices(children, ["when", "else"]);
-
-      parts.push(
-        concat(
-          scripts.map((script, index) => {
-            const concated = concat([hardline, script]);
-
-            return keywordIndices.includes(index) ? concated : indent(concated);
-          })
-        )
-      );
-    } else if (["if", "unless"].includes(value.keyword)) {
-      const keywordIndices = findKeywordIndices(children, ["elsif", "else"]);
-
-      parts.push(
-        concat(
-          scripts.map((script, index) => {
-            const concated = concat([hardline, script]);
-
-            return keywordIndices.includes(index) ? concated : indent(concated);
-          })
-        )
-      );
-    } else {
-      parts.push(indent(concat([hardline, join(hardline, scripts)])));
-    }
-  }
-
-  return group(concat(parts));
-}
-
-module.exports = silentScript;

data/src/haml/nodes/tag.js

@@ -1,193 +0,0 @@
-const {
-  align,
-  concat,
-  fill,
-  group,
-  hardline,
-  ifBreak,
-  indent,
-  join,
-  line,
-  softline
-} = require("../../prettier");
-
-function getDynamicAttributes(header, attributes) {
-  const pairs = attributes
-    .slice(1, -2)
-    .split(",")
-    .map((pair) => pair.slice(1).split('" => '));
-
-  const parts = [concat([pairs[0][0], "=", pairs[0][1]])];
-  pairs.slice(1).forEach((pair) => {
-    parts.push(line, concat([pair[0], "=", pair[1]]));
-  });
-
-  return group(concat(["(", align(header + 1, fill(parts)), ")"]));
-}
-
-function getHashValue(value, opts) {
-  if (typeof value !== "string") {
-    return value.toString();
-  }
-
-  // This is a very special syntax created by the parser to let us know that
-  // this should be printed literally instead of as a string.
-  if (value.startsWith("&")) {
-    return value.slice(1);
-  }
-
-  const quote = opts.rubySingleQuote ? "'" : '"';
-  return `${quote}${value}${quote}`;
-}
-
-function getHashKey(key, opts) {
-  let quoted = key;
-  const joiner = opts.rubyHashLabel ? ":" : " =>";
-
-  if (key.includes(":") || key.includes("-")) {
-    const quote = opts.rubySingleQuote ? "'" : '"';
-    quoted = `${quote}${key}${quote}`;
-  }
-
-  return `${opts.rubyHashLabel ? "" : ":"}${quoted}${joiner}`;
-}
-
-function getKeyValuePair(key, value, opts) {
-  return `${getHashKey(key, opts)} ${getHashValue(value, opts)}`;
-}
-
-function getStaticAttributes(header, attributes, opts) {
-  const keys = Object.keys(attributes).filter(
-    (name) => !["class", "id"].includes(name)
-  );
-
-  const parts = [getKeyValuePair(keys[0], attributes[keys[0]], opts)];
-
-  keys.slice(1).forEach((key) => {
-    parts.push(",", line, getKeyValuePair(key, attributes[key], opts));
-  });
-
-  return group(concat(["{", align(header + 1, fill(parts)), "}"]));
-}
-
-function getAttributesObject(object, opts, level = 0) {
-  if (typeof object !== "object") {
-    return getHashValue(object, opts);
-  }
-
-  const boundary = level === 0 ? softline : line;
-  const parts = Object.keys(object).map((key) =>
-    concat([
-      getHashKey(key, opts),
-      " ",
-      getAttributesObject(object[key], opts, level + 1)
-    ])
-  );
-
-  return group(
-    concat([
-      "{",
-      indent(group(concat([boundary, join(concat([",", line]), parts)]))),
-      boundary,
-      "}"
-    ])
-  );
-}
-
-function getHeader(value, opts) {
-  const { attributes } = value;
-  const parts = [];
-
-  if (value.name !== "div") {
-    parts.push(`%${value.name}`);
-  }
-
-  if (attributes.class) {
-    parts.push(`.${attributes.class.replace(/ /g, ".")}`);
-  }
-
-  if (attributes.id) {
-    parts.push(`#${attributes.id}`);
-  }
-
-  if (value.dynamic_attributes.new) {
-    parts.push(
-      getDynamicAttributes(parts.join("").length, value.dynamic_attributes.new)
-    );
-  }
-
-  if (
-    Object.keys(attributes).some((name) => name !== "class" && name !== "id")
-  ) {
-    parts.push(getStaticAttributes(parts.join("").length, attributes, opts));
-  }
-
-  if (value.dynamic_attributes.old) {
-    if (parts.length === 0) {
-      parts.push("%div");
-    }
-
-    if (typeof value.dynamic_attributes.old === "string") {
-      parts.push(value.dynamic_attributes.old);
-    } else {
-      parts.push(getAttributesObject(value.dynamic_attributes.old, opts));
-    }
-  }
-
-  if (value.object_ref) {
-    if (parts.length === 0) {
-      parts.push("%div");
-    }
-    parts.push(value.object_ref);
-  }
-
-  if (value.nuke_outer_whitespace) {
-    parts.push(">");
-  }
-
-  if (value.nuke_inner_whitespace) {
-    parts.push("<");
-  }
-
-  if (value.self_closing) {
-    parts.push("/");
-  }
-
-  if (value.value) {
-    const prefix = value.parse ? "= " : ifBreak("", " ");
-
-    return group(
-      concat([
-        group(concat(parts)),
-        indent(concat([softline, prefix, value.value]))
-      ])
-    );
-  }
-
-  // In case none of the other if statements have matched and we're printing a
-  // div, we need to explicitly add it back into the array.
-  if (parts.length === 0 && value.name === "div") {
-    parts.push("%div");
-  }
-
-  return group(concat(parts));
-}
-
-// https://haml.info/docs/yardoc/file.REFERENCE.html#element-name-
-function tag(path, opts, print) {
-  const { children, value } = path.getValue();
-  const header = getHeader(value, opts);
-
-  if (children.length === 0) {
-    return header;
-  }
-
-  return group(
-    concat([
-      header,
-      indent(concat([hardline, join(hardline, path.map(print, "children"))]))
-    ])
-  );
-}
-
-module.exports = tag;