prettier 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1f1b3a234ed95cb01a603dafef678f5363e34953a35fb662ce59a83a0462393
-  data.tar.gz: 77fbbb7333e1d119a3ec3fbd6f4c3c305cba1826b9b03e5b22a7876ef5f0f686
+  metadata.gz: 053a1f574f1b5a2ba7b9bc721c0541af8a8455d9bfe56eafcf78e55634458ae8
+  data.tar.gz: 94c18ccd603fdb0df700d21ae2d3cdffc327acc42074e39fcc0f4c02301f71b6
 SHA512:
-  metadata.gz: 541b753615c3d8daab03eaeb2d82ec4fcca83e112ffc252a86be359f44f98368244701e92f386ab3c9b38f519e308144d9f8274017a25ee9258ca0f2af075226
-  data.tar.gz: 60da4e2ab1e640bb58df4ffccdade65c7dad1b923372f30d43799939ad084623ec996c3ef24c501681119a09d4ecaf481583770cb367d21f43a308748ac84483
+  metadata.gz: 6d072b0718ba67963b0e115b1f61006668ac512789226dd34ba2912c2426fc1841764920961a10b550ac8c0f106d4a41c50ec73484c7eef419b94e892970a9c8
+  data.tar.gz: 68583e2a4ed6b8b5ba4a5f45a7c40684e2b8127d1118140c0b94424b3818473eb99a6f174c54cae703c37f59206fa844ca2809399423ef595949b1e346359c4c

data/CHANGELOG.md

@@ -6,6 +6,25 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [0.20.0] - 2020-08-28
+
+### Added
+
+- [@kddeisz] - Allow embedded formatting on heredocs by the name placed at the start. For example,
+
+<!-- prettier-ignore -->
+```ruby
+javascript = <<~JAVASCRIPT
+  const a=1;
+  const b=2;
+  return a+b;
+JAVASCRIPT
+```
+
+### Changed
+
+- [@mmainz] - Fix the encoding setting such that we're not overwriting the entire set of environment variables.
+
 ## [0.19.1] - 2020-08-21
 
 ### Changed
@@ -819,7 +838,8 @@ would previously result in `array[]`, but now prints properly.
 
 - Initial release 🎉
 
-[unreleased]: https://github.com/prettier/plugin-ruby/compare/v0.19.1...HEAD
+[unreleased]: https://github.com/prettier/plugin-ruby/compare/v0.20.0...HEAD
+[0.20.0]: https://github.com/prettier/plugin-ruby/compare/v0.19.1...v0.20.0
 [0.19.1]: https://github.com/prettier/plugin-ruby/compare/v0.19.0...v0.19.1
 [0.19.0]: https://github.com/prettier/plugin-ruby/compare/v0.18.2...v0.19.0
 [0.18.2]: https://github.com/prettier/plugin-ruby/compare/v0.18.1...v0.18.2

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prettier/plugin-ruby",
-  "version": "0.19.1",
+  "version": "0.20.0",
   "description": "prettier plugin for the Ruby programming language",
   "main": "src/ruby.js",
   "scripts": {

data/src/embed.js

@@ -0,0 +1,71 @@
+const {
+  concat,
+  indent,
+  literalline,
+  mapDoc,
+  markAsRoot,
+  stripTrailingHardline
+} = require("./prettier");
+
+const parsers = {
+  css: "css",
+  javascript: "babel",
+  js: "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();
+
+  // Currently we only support embedded formatting on heredoc nodes
+  if (node.type !== "heredoc") {
+    return null;
+  }
+
+  // First, ensure that we don't have any interpolation
+  const { beging, body, ending } = node;
+  if (body.some((part) => part.type !== "@tstring_content")) {
+    return null;
+  }
+
+  // Next, find the parser associated with this heredoc (if there is one). For
+  // example, if you use <<~CSS, we'd hook it up to the css parser.
+  const parser = parsers[beging.slice(3).toLowerCase()];
+  if (!parser) {
+    return null;
+  }
+
+  // Get the content as if it were a source string, and then pass that content
+  // into the embedded parser. Get back the doc node.
+  const content = body.map((part) => part.body).join("");
+  const formatted = concat([
+    literalline,
+    replaceNewlines(stripTrailingHardline(textToDoc(content, { parser })))
+  ]);
+
+  // If we're using a squiggly heredoc, then we can properly handle indentation
+  // ourselves.
+  if (beging[2] === "~") {
+    return concat([beging, indent(markAsRoot(formatted)), literalline, ending]);
+  }
+
+  // Otherwise, we need to just assume it's formatted correctly and return the
+  // content as it is.
+  return markAsRoot(concat([beging, formatted, literalline, ending]));
+};
+
+module.exports = embed;

data/src/parse.js

@@ -21,7 +21,7 @@ module.exports = (text, _parsers, _opts) => {
     "ruby",
     ["--disable-gems", path.join(__dirname, "./ripper.rb")],
     {
-      env: { LANG },
+      env: Object.assign({}, process.env, { LANG }),
       input: text,
       maxBuffer: 10 * 1024 * 1024 // 10MB
     }

data/src/ruby.js

@@ -1,3 +1,4 @@
+const embed = require("./embed");
 const parse = require("./parse");
 const print = require("./print");
 
@@ -101,6 +102,7 @@ module.exports = {
   },
   printers: {
     ruby: {
+      embed,
       print
     },
     haml: {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Kevin Deisz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2020-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,7 @@ files:
 - node_modules/prettier/index.js
 - node_modules/prettier/third-party.js
 - package.json
+- src/embed.js
 - src/haml.js
 - src/haml/embed.js
 - src/haml/nodes/comment.js