prettier 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4d48bb295fd20db723ba6491459aa439df3258c9ccea2ebbca3d47e76001de4
-  data.tar.gz: ac54ec92f5cfb7812419c04993c8113143bd0610a433969e96d5d2651a931974
+  metadata.gz: b8e2166de3bdb098137b5445e9db41d9c6eb1f1677fe8edfd9bbb7fb25704091
+  data.tar.gz: 8284b60434648ad65daae6a2d24677ec197cde21b986e69e88adcbc0560592bf
 SHA512:
-  metadata.gz: 9dff32300805824e2ca6d0353ea17525f26dbbeea44140cd1c25bd65f28cd3a00b9b69d3702d4fce82bbfe65dee5464919f069d02d191b6a93fd15d4f2501284
-  data.tar.gz: e71972c078fec8a949efe8398ad649b10e5f74860daa2789c891d613203dfb23d4568f9ce88a7c926886fce853c7e1423bf13c64e2262e39b1cf5c5c9bf19cdc
+  metadata.gz: 9d94d15c6f8c4b295596bfd821884937954ebc854cc6d2c292a8ea77a8ba23d99bf3c80cda43bcd8c5fb60b72e334b7f90ae18729b884c8c2a7eab6b44bda0d3
+  data.tar.gz: 563ab1b61b66e0ade505742063c9c949c16087942d68853eb07ec9ee4b4d56ec69219355ab80a230028efa44af1c9012a30c1556743f19025ffe625c8f2affbd

data/CHANGELOG.md

@@ -6,6 +6,46 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [0.14.0] - 2019-07-17
+
+### Added
+
+- Support for pattern matching for variables and array patterns. Currently waiting on Ripper support for hash patterns. For examples, check out the [test/js/patterns.test.js](test/js/patterns.test.js) file.
+
+### Changed
+
+- if/else blocks that had method calls on the end of them that were also transformed into ternaries need to have parens added to them. For example,
+
+<!-- prettier-ignore -->
+```ruby
+if foo
+  1
+else
+  2
+end.to_s
+```
+
+now correctly gets transformed into:
+
+<!-- prettier-ignore -->
+```ruby
+(foo ? 1 : 2).to_s
+```
+
+(Thanks to @jviney for the report.)
+
+- Fixed a bug where multiple newlines at the end of the file would cause a crash. (Thanks to @acrewdson for the report.)
+- If a variable is assigned inside of the predicate of a conditional, then we can't change it into the single-line version as this breaks. For example,
+
+<!-- prettier-ignore -->
+```ruby
+if foo = 1
+  foo
+end
+```
+
+must stay the same. (Thanks to @jviney for the report.)
+
 ## [0.13.0] - 2019-07-05
 
 ### Added
@@ -423,7 +463,8 @@ would previously result in `array[]`, but now prints properly. (Thanks to @xipgr
 
 - Initial release 🎉
 
-[unreleased]: https://github.com/prettier/plugin-ruby/compare/v0.13.0...HEAD
+[unreleased]: https://github.com/prettier/plugin-ruby/compare/v0.14.0...HEAD
+[0.14.0]: https://github.com/prettier/plugin-ruby/compare/v0.13.0...v0.14.0
 [0.13.0]: https://github.com/prettier/plugin-ruby/compare/v0.12.3...v0.13.0
 [0.12.3]: https://github.com/prettier/plugin-ruby/compare/v0.12.2...v0.12.3
 [0.12.2]: https://github.com/prettier/plugin-ruby/compare/v0.12.1...v0.12.2

data/README.md

@@ -182,6 +182,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <td align="center"><a href="https://janpiotrowski.de"><img src="https://avatars0.githubusercontent.com/u/183673?v=4" width="100px;" alt="Jan Piotrowski"/><br /><sub><b>Jan Piotrowski</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/commits?author=janpio" title="Documentation">📖</a></td>
     <td align="center"><a href="https://www.andywaite.com"><img src="https://avatars1.githubusercontent.com/u/13400?v=4" width="100px;" alt="Andy Waite"/><br /><sub><b>Andy Waite</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/commits?author=andyw8" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/jviney"><img src="https://avatars3.githubusercontent.com/u/7051?v=4" width="100px;" alt="Jonathan Viney"/><br /><sub><b>Jonathan Viney</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/issues?q=author%3Ajviney" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/acrewdson"><img src="https://avatars0.githubusercontent.com/u/10353074?v=4" width="100px;" alt="acrewdson"/><br /><sub><b>acrewdson</b></sub></a><br /><a href="https://github.com/prettier/plugin-ruby/issues?q=author%3Aacrewdson" title="Bug reports">🐛</a></td>
   </tr>
 </table>
 

data/package.json

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

data/src/nodes.js

@@ -20,6 +20,7 @@ module.exports = Object.assign(
   require("./nodes/methods"),
   require("./nodes/operators"),
   require("./nodes/params"),
+  require("./nodes/patterns"),
   require("./nodes/regexp"),
   require("./nodes/rescue"),
   require("./nodes/scopes"),

data/src/nodes/calls.js

@@ -2,7 +2,7 @@ const { concat, group, indent, softline } = require("../prettier");
 const toProc = require("../toProc");
 const { concatBody, first, makeCall } = require("../utils");
 
-const noIndent = ["array", "hash", "method_add_block", "xstring_literal"];
+const noIndent = ["array", "hash", "if", "method_add_block", "xstring_literal"];
 
 module.exports = {
   call: (path, opts, print) => {

data/src/nodes/conditionals.js

@@ -113,11 +113,11 @@ const printSingle = keyword => (path, { inlineConditionals }, print) => {
     concat([softline, "end"])
   ]);
 
-  const stmts = path.getValue().body[1];
+  const [predicate, stmts] = path.getValue().body;
   const hasComments =
     stmts.type === "stmts" && stmts.body.some(stmt => stmt.type === "@comment");
 
-  if (!inlineConditionals || hasComments) {
+  if (!inlineConditionals || hasComments || predicate.type === "assign") {
     return multiline;
   }
 
@@ -154,17 +154,20 @@ const canTernary = path => {
 // A normalized print function for both `if` and `unless` nodes.
 const printConditional = keyword => (path, { inlineConditionals }, print) => {
   if (canTernary(path)) {
-    const ternaryConditions = printTernaryClauses(
-      keyword,
-      path.call(print, "body", 1),
-      path.call(print, "body", 2, "body", 0)
+    let ternaryParts = [path.call(print, "body", 0), " ? "].concat(
+      printTernaryClauses(
+        keyword,
+        path.call(print, "body", 1),
+        path.call(print, "body", 2, "body", 0)
+      )
     );
 
+    if (["binary", "call"].includes(path.getParentNode().type)) {
+      ternaryParts = ["("].concat(ternaryParts).concat(")");
+    }
+
     return group(
-      ifBreak(
-        printWithAddition(keyword, path, print),
-        concat([path.call(print, "body", 0), " ? "].concat(ternaryConditions))
-      )
+      ifBreak(printWithAddition(keyword, path, print), concat(ternaryParts))
     );
   }
 

data/src/nodes/patterns.js

@@ -0,0 +1,43 @@
+const { concat, group, hardline, indent, join, line } = require("../prettier");
+
+module.exports = {
+  aryptn: (path, opts, print) => {
+    const [constant, preargs, splatarg, postargs] = path.getValue().body;
+    let args = [];
+
+    if (preargs) {
+      args = args.concat(path.map(print, "body", 1));
+    }
+
+    if (splatarg) {
+      args.push(concat(["*", path.call(print, "body", 2)]));
+    }
+
+    if (postargs) {
+      args = args.concat(path.map(print, "body", 3));
+    }
+
+    args = group(join(concat([",", line]), args));
+
+    if (constant || path.getParentNode().type === "binary") {
+      args = concat(["[", args, "]"]);
+    }
+
+    if (constant) {
+      return concat([path.call(print, "body", 0), args]);
+    }
+
+    return args;
+  },
+  hshptn: () => {
+    throw new Error(
+      "Hash pattern not currently supported (https://bugs.ruby-lang.org/issues/16008)"
+    );
+  },
+  in: (path, opts, print) =>
+    concat([
+      "in ",
+      path.call(print, "body", 0),
+      indent(concat([hardline, path.call(print, "body", 1)]))
+    ])
+};

data/src/ripper.rb

@@ -123,9 +123,7 @@ class RipperJS < Ripper
         @scanner_events = []
         @line_counts = [0]
 
-        source.split("\n").each do |line|
-          line_counts << line_counts.last + line.size + 1
-        end
+        source.lines.each { |line| line_counts << line_counts.last + line.size }
       end
 
       def self.prepended(base)
@@ -156,12 +154,6 @@ class RipperJS < Ripper
         scanner_events.delete_at(index)
       end
 
-      # :backref, :const, :embdoc, :embdoc_beg, :embdoc_end,
-      # :embexpr_beg, :embexpr_end, :embvar, :heredoc_beg, :heredoc_end,
-      # :ident, :lbrace, :lbracket, :lparen, :op, :period, :regexp_beg,
-      # :regexp_end, :rparen, :symbeg, :symbols_beg, :tlambda, :tlambeg,
-      # :tstring_beg, :tstring_content, :tstring_end
-
       events = {
         BEGIN: [:@kw, 'BEGIN'],
         END: [:@kw, 'END'],
@@ -186,6 +178,7 @@ class RipperJS < Ripper
         for: [:@kw, 'for'],
         hash: :@lbrace,
         if: [:@kw, 'if'],
+        in: [:@kw, 'in'],
         kwrest_param: [:@op, '**'],
         lambda: :@tlambda,
         mlhs_paren: :@lparen,
@@ -253,6 +246,21 @@ class RipperJS < Ripper
         end
       end
 
+      # Array pattern nodes contain an odd mix of potential child nodes based on
+      # which kind of pattern is being used.
+      def on_aryptn(*body)
+        char_start, char_end = char_pos, char_pos
+
+        body.flatten(1).each do |part|
+          next unless part
+
+          char_start = [char_start, part[:char_start]].min
+          char_end = [char_end, part[:char_end]].max
+        end
+
+        super(*body).merge!(char_start: char_start, char_end: char_end)
+      end
+
       # Params have a somewhat interesting structure in that they are an array
       # of arrays where the position in the top-level array indicates the type
       # of param and the subarray is the list of parameters of that type. We

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Kevin Deisz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2019-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,7 @@ files:
 - src/nodes/methods.js
 - src/nodes/operators.js
 - src/nodes/params.js
+- src/nodes/patterns.js
 - src/nodes/regexp.js
 - src/nodes/rescue.js
 - src/nodes/scopes.js