prettier 0.18.2 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48c219668f2ca222fa405eb95257dd602bb40f4324659f65886d80ebf92f22ef
-  data.tar.gz: fd8a810805dab87cabe91a49a7a2192831297c2e38995cfc2e169363195c15dc
+  metadata.gz: 358b5350f0d237d510b4da937cf34a1aac4af594929f8b1799b2da05fce6a755
+  data.tar.gz: add73454d3a6e45214e568940551182313334ff4d43bf93196d1637b946e5866
 SHA512:
-  metadata.gz: 45249b936136e2231789d6582fe15052400a1a73a67266b3ebee52b1962a0b047832610a722b1ab0fdab66c51ee8845bc9c2141f769140086ac763463aa63eb7
-  data.tar.gz: fddf3cd589b8421aa84e71afe3ea9b02c2ad28890f309e42b8ec22f7387687c25d5de1c3edb8b4c3cd440b4ff63047d396d93858dc8661ecb32fb9c7d4c6aa71
+  metadata.gz: 5277fec090d225d2aff51abb198c3b61580f0304252a088bc574868dd2d122b666dabf627faadf50f9e8b066de3fd8593a149a61b9609e605acaae54f73e2de6
+  data.tar.gz: 4571eed09e3a0e492b8b1c7a8dd157ca45db4fb617e17dada815f29beb598c23cfe0008a21d1dff329c4e19c659b2fa8751a339901d59ec156b7c37d75c9afe1

data/CHANGELOG.md

@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [0.19.0] - 2020-07-03
+
+### Added
+
+- [@ryan-hunter-pc] - Add the option to disable the `Symbol#to_proc` transform.
+- [@ryan-hunter-pc], [@SViccari], [@kddeisz] - Disable `Symbol#to_proc` transform when used as a key inside of a hash where the key is either `:if` or `:unless`.
+
 ## [0.18.2] - 2020-05-01
 
 ### Changed
@@ -803,7 +810,8 @@ would previously result in `array[]`, but now prints properly.
 
 - Initial release 🎉
 
-[unreleased]: https://github.com/prettier/plugin-ruby/compare/v0.18.2...HEAD
+[unreleased]: https://github.com/prettier/plugin-ruby/compare/v0.19.0...HEAD
+[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
 [0.18.1]: https://github.com/prettier/plugin-ruby/compare/v0.18.0...v0.18.1
 [0.18.0]: https://github.com/prettier/plugin-ruby/compare/v0.17.0...v0.18.0

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prettier/plugin-ruby",
-  "version": "0.18.2",
+  "version": "0.19.0",
   "description": "prettier plugin for the Ruby programming language",
   "main": "src/ruby.js",
   "scripts": {
@@ -23,10 +23,10 @@
   },
   "devDependencies": {
     "all-contributors-cli": "^6.14.1",
-    "eslint": "^6.8.0",
+    "eslint": "^7.1.0",
     "eslint-config-prettier": "^6.10.1",
     "husky": "^4.2.5",
-    "jest": "^25.2.7",
+    "jest": "^26.0.0",
     "pretty-quick": "^2.0.1"
   },
   "eslintConfig": {

data/src/nodes/args.js

@@ -72,7 +72,7 @@ module.exports = {
       return blockNode;
     });
 
-    const proc = blockNode && toProc(blockNode);
+    const proc = blockNode && toProc(path, opts, blockNode);
 
     // If we have a successful to_proc transformation, but we're part of an aref
     // node, that means it's something to the effect of

data/src/nodes/calls.js

@@ -76,7 +76,7 @@ module.exports = {
   },
   method_add_block: (path, opts, print) => {
     const [method, block] = path.getValue().body;
-    const proc = toProc(block);
+    const proc = toProc(path, opts, block);
 
     if (proc && method.type === "call") {
       return group(

data/src/ruby.js

@@ -142,6 +142,13 @@ module.exports = {
       default: true,
       description:
         "When double quotes are not necessary for interpolation, prefers the use of single quotes for string literals."
+    },
+    toProcTransform: {
+      type: "boolean",
+      category: "Global",
+      default: true,
+      description:
+        "When possible, convert blocks to the more concise Symbol#to_proc syntax."
     }
   },
   defaultOptions: {

data/src/toProc.js

@@ -11,8 +11,8 @@ const isCall = (node) => ["::", "."].includes(node) || node.type === "@period";
 //     [1, 2, 3].map(&:to_s)
 //
 // This works with `do` blocks as well.
-const toProc = (node) => {
-  if (!node) {
+const toProc = (path, opts, node) => {
+  if (!node || !opts.toProcTransform) {
     return null;
   }
 
@@ -76,6 +76,33 @@ const toProc = (node) => {
     return null;
   }
 
+  // Ensure that we're not inside of a hash that is being passed to a key that
+  // corresponds to `:if` or `:unless` to avoid problems with callbacks with
+  // Rails. For more context, see:
+  // https://github.com/prettier/plugin-ruby/issues/449
+  let assocNode = null;
+
+  if (path.getValue().type === "method_add_block") {
+    assocNode = path.getParentNode();
+  } else if (path.getValue().type === "args") {
+    assocNode = path.getParentNode(2);
+  }
+
+  if (assocNode && assocNode.type === "assoc_new") {
+    const [key] = assocNode.body;
+
+    if (key.type === "@label" && ["if:", "unless:"].includes(key.body)) {
+      return null;
+    }
+
+    if (
+      key.type === "symbol_literal" &&
+      ["if", "unless"].includes(key.body[0].body[0].body)
+    ) {
+      return null;
+    }
+  }
+
   return `&:${method.body}`;
 };
 

metadata

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