prettier 0.20.0 → 0.20.1

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prettier/plugin-ruby",
-  "version": "0.20.0",
+  "version": "0.20.1",
   "description": "prettier plugin for the Ruby programming language",
   "main": "src/ruby.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "all-contributors-cli": "^6.14.1",
-    "eslint": "^7.1.0",
+    "eslint": "^7.8.1",
     "eslint-config-prettier": "^6.10.1",
     "husky": "^4.2.5",
     "jest": "^26.0.0",

data/src/ruby.js

@@ -2,8 +2,6 @@ const embed = require("./embed");
 const parse = require("./parse");
 const print = require("./print");
 
-const haml = require("./haml");
-
 const pragmaPattern = /#\s*@(prettier|format)/;
 const hasPragma = (text) => pragmaPattern.test(text);
 
@@ -76,12 +74,6 @@ module.exports = {
       interpreters: ["jruby", "macruby", "rake", "rbx", "ruby"],
       linguistLanguageId: 326,
       vscodeLanguageIds: ["ruby"]
-    },
-    {
-      name: "HAML",
-      parsers: ["haml"],
-      extensions: [".haml"],
-      vscodeLanguageIds: ["haml"]
     }
   ],
   parsers: {
@@ -91,23 +83,12 @@ module.exports = {
       hasPragma,
       locStart,
       locEnd
-    },
-    haml: {
-      parse: haml.parse,
-      astFormat: "haml",
-      hasPragma: haml.hasPragma,
-      locStart: haml.locStart,
-      locEnd: haml.locEnd
     }
   },
   printers: {
     ruby: {
       embed,
       print
-    },
-    haml: {
-      embed: haml.embed,
-      print: haml.print
     }
   },
   options: {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Kevin Deisz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,18 +73,6 @@ files:
 - node_modules/prettier/third-party.js
 - package.json
 - src/embed.js
-- src/haml.js
-- 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/script.js
-- src/haml/nodes/silentScript.js
-- src/haml/nodes/tag.js
-- src/haml/parse.js
-- src/haml/parse.rb
-- src/haml/print.js
 - src/nodes.js
 - src/nodes/alias.js
 - src/nodes/args.js

data/src/haml.js

@@ -1,21 +0,0 @@
-const embed = require("./haml/embed");
-const parse = require("./haml/parse");
-const print = require("./haml/print");
-
-const pragmaPattern = /^\s*-#\s*@(prettier|format)/;
-const hasPragma = (text) => pragmaPattern.test(text);
-
-// These functions are just placeholders until we can actually perform this
-// properly. The functions are necessary otherwise the format with cursor
-// functions break.
-const locStart = (_node) => 0;
-const locEnd = (_node) => 0;
-
-module.exports = {
-  embed,
-  hasPragma,
-  locStart,
-  locEnd,
-  parse,
-  print
-};

data/src/haml/embed.js

@@ -1,58 +0,0 @@
-const {
-  concat,
-  hardline,
-  indent,
-  literalline,
-  mapDoc,
-  markAsRoot,
-  stripTrailingHardline
-} = require("../prettier");
-
-const parsers = {
-  css: "css",
-  javascript: "babel",
-  less: "less",
-  markdown: "markdown",
-  ruby: "ruby",
-  scss: "scss"
-};
-
-const replaceNewlines = (doc) =>
-  mapDoc(doc, (currentDoc) =>
-    typeof currentDoc === "string" && currentDoc.includes("\n")
-      ? concat(
-          currentDoc
-            .split(/(\n)/g)
-            .map((v, i) => (i % 2 === 0 ? v : literalline))
-        )
-      : currentDoc
-  );
-
-const embed = (path, print, textToDoc, _opts) => {
-  const node = path.getValue();
-  if (node.type !== "filter") {
-    return null;
-  }
-
-  const parser = parsers[node.value.name];
-  if (!parser) {
-    return null;
-  }
-
-  return markAsRoot(
-    concat([
-      ":",
-      node.value.name,
-      indent(
-        concat([
-          hardline,
-          replaceNewlines(
-            stripTrailingHardline(textToDoc(node.value.text, { parser }))
-          )
-        ])
-      )
-    ])
-  );
-};
-
-module.exports = embed;

data/src/haml/nodes/comment.js

@@ -1,27 +0,0 @@
-const { concat, group, hardline, indent, join } = require("../../prettier");
-
-// http://haml.info/docs/yardoc/file.REFERENCE.html#html-comments-
-const 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,32 +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"];
-
-// http://haml.info/docs/yardoc/file.REFERENCE.html#doctype-
-const doctype = (path, _opts, _print) => {
-  const { value } = path.getValue();
-  const parts = ["!!!"];
-
-  if (value.type in types) {
-    parts.push(types[value.type]);
-  } else if (value.version in versions) {
-    parts.push(versions[value.version]);
-  }
-
-  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");
-
-// http://haml.info/docs/yardoc/file.REFERENCE.html#filters
-const 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");
-
-// http://haml.info/docs/yardoc/file.REFERENCE.html#haml-comments--
-const 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/script.js

@@ -1,29 +0,0 @@
-const { concat, group, hardline, indent, join } = require("../../prettier");
-
-// http://haml.info/docs/yardoc/file.REFERENCE.html#inserting-ruby-
-const 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("=");
-  }
-
-  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");
-
-const 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;
-};
-
-// http://haml.info/docs/yardoc/file.REFERENCE.html#running-ruby--
-const 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,157 +0,0 @@
-const {
-  align,
-  concat,
-  fill,
-  group,
-  hardline,
-  ifBreak,
-  indent,
-  join,
-  line,
-  softline
-} = require("../../prettier");
-
-const 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)), ")"]));
-};
-
-const getHashValue = (value, opts) => {
-  if (typeof value === "string") {
-    const quote = opts.preferSingleQuotes ? "'" : '"';
-    return `${quote}${value}${quote}`;
-  }
-
-  return value;
-};
-
-const getHashRocket = (key, value, opts) => {
-  const quote = opts.preferSingleQuotes ? "'" : '"';
-  const leftSide = key.includes(":") ? `:${quote}${key}${quote}` : `:${key}`;
-
-  return `${leftSide} => ${getHashValue(value, opts)}`;
-};
-
-const getHashLabel = (key, value, opts) => {
-  const quote = opts.preferSingleQuotes ? "'" : '"';
-  const leftSide = key.includes(":") ? `${quote}${key}${quote}` : key;
-
-  return `${leftSide}: ${getHashValue(value, opts)}`;
-};
-
-const getStaticAttributes = (header, attributes, opts) => {
-  const keys = Object.keys(attributes).filter(
-    (name) => !["class", "id"].includes(name)
-  );
-
-  const getKeyValuePair = opts.preferHashLabels ? getHashLabel : getHashRocket;
-  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)), "}"]));
-};
-
-const 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");
-    }
-    parts.push(value.dynamic_attributes.old);
-  }
-
-  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));
-};
-
-// http://haml.info/docs/yardoc/file.REFERENCE.html#element-name-
-const 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;