prettier 2.0.0.pre.rc4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7001f9fc2c9aed2d630d5133b86baa047f44b1634690e0fcecc81c6186943c6d
-  data.tar.gz: 73cd58e7dec8253b2d1a9e9a4d18dd1cb968b147ddf71f069457ed2c1091a066
+  metadata.gz: a8393d82622bcce83298aa8e2833b37bccf9742b0a67e81cd3b730e57e6795b8
+  data.tar.gz: a66af4efc73854f143e0faa288fdde112bf87ba45364af3efd862a179734453c
 SHA512:
-  metadata.gz: 96f757bea8e85f036ba84dbd59a64e072264eedfcec6c901df5ef94bcb9f638a5fbb5c84a5b92c8f02cf26f75a8d1f8a5025a13eb3ec9a9bc3c2efc5f8790303
-  data.tar.gz: 13b2dd4e2d8e13f3bc01e5cca5d9abbaab975b668f164dd82e3c598344def9acd618082a0da7bb710e47886d85efaa7ca1d55bd33af24aee4ce2e41e0a7bbd89
+  metadata.gz: f780174b5b038bfd9583c637caefff23e442f4aef626e9e33769811c15afd7c267bb78f20c4eb223ab4b50f3c0b6664123c6ce00d997ff0a571b0d57228f5070
+  data.tar.gz: bdfbd3f42b4db020059b511b3176ee7b5393a5a008136dd06a584c26df69afbcfe7d937e6151e22029858d71bad68e8c68eb07241e67771debd802cf733c282d

data/CHANGELOG.md

@@ -6,7 +6,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
-## [2.0.0-rc4]
+## [2.0.0] - 2021-10-28
+
+### Changed
+
+- [#1018](https://github.com/prettier/plugin-ruby/issues/1018) - rindek, kddnewton - Ensure brackets are used when matching an array pattern with a single element.
+- [#906](https://github.com/prettier/plugin-ruby/issues/906) - Hansenq, kddnewton - Turn off the `Style/MultilineBlockChain` rubocop rule in our shipped configuration because multiple chained method calls with blocks can potentially conflict with rubocop's desired output.
+
+## [2.0.0-rc4] - 2021-10-18
 
 ### Added
 
@@ -17,14 +24,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 - [#1000](https://github.com/prettier/plugin-ruby/pull/1000) - nbudin, kddnewton - Fix for rescuing single top-level exceptions in `rescue` clauses.
 
-## [2.0.0-rc3]
+## [2.0.0-rc3] - 2021-10-01
 
 ### Changed
 
 - [#987](https://github.com/prettier/plugin-ruby/pull/9870) - valscion - Ignore stderr when checking for node <-> ruby connection clients, restoring the behavior of v1.x
 - [#989](https://github.com/prettier/plugin-ruby/issues/989) - hubertjakubiak, kddnewton - Make sure comments after the keyword/lbrace are not moved inside the body of the statements of do and brace blocks.
 
-## [2.0.0-rc2]
+## [2.0.0-rc2] - 2021-09-30
 
 ### Added
 
@@ -35,7 +42,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 - [#943](https://github.com/prettier/plugin-ruby/issues/943) - valscion, kddnewton - Trailing call operators that are followed by comments should stay on the first line.
 
-## [2.0.0-rc1]
+## [2.0.0-rc1] - 2021-09-30
 
 ### Added
 
@@ -1180,7 +1187,8 @@ would previously result in `array[]`, but now prints properly.
 
 - Initial release 🎉
 
-[unreleased]: https://github.com/prettier/plugin-ruby/compare/v2.0.0-rc4...HEAD
+[unreleased]: https://github.com/prettier/plugin-ruby/compare/v2.0.0...HEAD
+[2.0.0]: https://github.com/prettier/plugin-ruby/compare/v2.0.0-rc4...v2.0.0
 [2.0.0-rc4]: https://github.com/prettier/plugin-ruby/compare/v2.0.0-rc3...v2.0.0-rc4
 [2.0.0-rc3]: https://github.com/prettier/plugin-ruby/compare/v2.0.0-rc2...v2.0.0-rc3
 [2.0.0-rc2]: https://github.com/prettier/plugin-ruby/compare/v2.0.0-rc1...v2.0.0-rc2

data/dist/ruby/nodes/patterns.js

@@ -19,24 +19,36 @@ const printPatternArg = (path, opts, print) => {
 };
 const printAryPtn = (path, opts, print) => {
     const [constant, preargs, splatarg, postargs] = path.getValue().body;
-    let args = [];
+    let argDocs = [];
     if (preargs) {
-        args = args.concat(path.map((argPath) => printPatternArg(argPath, opts, print), "body", 1));
+        argDocs = argDocs.concat(path.map((argPath) => printPatternArg(argPath, opts, print), "body", 1));
     }
     if (splatarg) {
-        args.push(["*", path.call(print, "body", 2)]);
+        argDocs.push(["*", path.call(print, "body", 2)]);
     }
     if (postargs) {
-        args = args.concat(path.map(print, "body", 3));
+        argDocs = argDocs.concat(path.map(print, "body", 3));
     }
-    args = group(join([",", line], args));
-    if (constant || patterns.includes(path.getParentNode().type)) {
-        args = ["[", args, "]"];
+    let argDoc = group(join([",", line], argDocs));
+    // There are a couple of cases where we _must_ use brackets. They include:
+    //
+    // * When the number of arguments inside the array pattern is one 1, then we
+    //   have to include them, otherwise it matches the whole array. Consider the
+    //   difference between `in [elem]` and `in elem`.
+    // * If we have a wrapping constant, then we definitely need the brackets.
+    //   Consider the difference between `in Const[elem]` and `in Const elem`
+    // * If we're nested inside a parent pattern, then we have to have brackets.
+    //   Consider the difference between `in key: first, second` and
+    //   `in key: [first, second]`.
+    if (argDocs.length === 1 ||
+        constant ||
+        patterns.includes(path.getParentNode().type)) {
+        argDoc = ["[", argDoc, "]"];
     }
     if (constant) {
-        return [path.call(print, "body", 0), args];
+        return [path.call(print, "body", 0), argDoc];
     }
-    return args;
+    return argDoc;
 };
 exports.printAryPtn = printAryPtn;
 const printFndPtn = (path, opts, print) => {
@@ -86,9 +98,10 @@ const printHshPtn = (path, opts, print) => {
 };
 exports.printHshPtn = printHshPtn;
 const printIn = (path, opts, print) => {
+    const keyword = "in ";
     const parts = [
-        "in ",
-        align("in ".length, path.call((valuePath) => printPatternArg(valuePath, opts, print), "body", 0)),
+        keyword,
+        align(keyword.length, path.call((valuePath) => printPatternArg(valuePath, opts, print), "body", 0)),
         indent([hardline, path.call(print, "body", 1)])
     ];
     if (path.getValue().body[2]) {

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prettier/plugin-ruby",
-  "version": "2.0.0-rc4",
+  "version": "2.0.0",
   "description": "prettier plugin for the Ruby programming language",
   "main": "dist/plugin.js",
   "scripts": {
@@ -26,9 +26,9 @@
     "@types/jest": "^27.0.1",
     "@types/node": "^16.9.1",
     "@types/prettier": "^2.3.2",
-    "@typescript-eslint/eslint-plugin": "^4.31.2",
-    "@typescript-eslint/parser": "^4.31.2",
-    "eslint": "^7.22.0",
+    "@typescript-eslint/eslint-plugin": "^5.2.0",
+    "@typescript-eslint/parser": "^5.2.0",
+    "eslint": "^8.1.0",
     "eslint-config-prettier": "^8.0.0",
     "husky": "^7.0.0",
     "jest": "^27.0.1",

data/rubocop.yml

@@ -13,12 +13,16 @@ Layout:
 Layout/LineLength:
   Enabled: true
 
-# Disabling all of the following options because they could conflict with a
-# prettier configuration setting.
-
 Style/MultilineIfModifier: # rubyModifier
   Enabled: false
 
+# When method chains with multiple blocks are chained together, rubocop will let
+# them pass if they're using braces but not if they're using do and end
+# keywords. Because we will break individual blocks down to using keywords if
+# they are multiline, this conflicts with rubocop.
+Style/MultilineBlockChain:
+  Enabled: false
+
 Style/SymbolArray: # rubyArrayLiteral
   Enabled: false
 
@@ -34,5 +38,7 @@ Style/TrailingCommaInArrayLiteral: # trailingComma
 Style/TrailingCommaInHashLiteral: # trailingComma
   Enabled: false
 
+# lambdas that are constructed with the lambda method call cannot be safely
+# turned into lambda literals without removing a method call.
 Style/Lambda:
   Enabled: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.rc4
+  version: 2.0.0
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -129,9 +129,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.3
 signing_key: