prettier 2.0.0.pre.rc2 → 2.0.0.pre.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63604b2dbf27994c44f507ef2e0b22d257c5371f45e66a78fa805c82313c5166
-  data.tar.gz: 546196f52a8a0ac8034e8cf4d170f61a916f9948f109d9bba18ff0d60160b100
+  metadata.gz: 8aa6c76fdc06048c17f4ae26b2179b181e2e10f4210c6d840d8059c661becdb5
+  data.tar.gz: 186e3d071167018e2eeb16d50818be1a1684710a0007226f2b3b3c403a190cd1
 SHA512:
-  metadata.gz: 034daa67861d8ac125b501dc00729b3830889a9182befa40c147f4459118b62565cc1ff458ed691a6e16d290f3ba2690aa241a620f38cfe17970fd5660a332aa
-  data.tar.gz: 7d5d1bd5e45859d32df6d7bc151fc229bcec702d5eb556b16b5b21a58986f5d319d891aa082aff1eac68a962b120593415fa0160b37e8ee99e835453a6fec4ee
+  metadata.gz: 31b4ebe0dc6c6a382c858f1349f4de1161e311df22d122c2f8935d833417e2ed235e42f075ded605f5e6924d3d2a2fb545123b9a5f66bfb89615c4cde3216758
+  data.tar.gz: 81a4467f636867133da2a93c5fc2f9a595e54dae597f9cde5ba45e98c0485cb3e2ab890151ce6e2da765881b753f1ce140b758bba70f25dcd1e64e950326a6ba

data/CHANGELOG.md

@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [2.0.0-rc3]
+
+### 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]
 
 ### Added
@@ -1162,7 +1169,8 @@ would previously result in `array[]`, but now prints properly.
 
 - Initial release 🎉
 
-[unreleased]: https://github.com/prettier/plugin-ruby/compare/v2.0.0-rc2...HEAD
+[unreleased]: https://github.com/prettier/plugin-ruby/compare/v2.0.0-rc3...HEAD
+[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
 [2.0.0-rc1]: https://github.com/prettier/plugin-ruby/compare/v1.6.1...v2.0.0-rc1
 [1.6.1]: https://github.com/prettier/plugin-ruby/compare/v1.6.0...v1.6.1

data/dist/parser/server.rb

@@ -112,8 +112,9 @@ candidates.map! do |candidate|
   Thread.new do
     Thread.current.report_on_exception = false
 
-    stdout, status =
-      Open3.capture2("#{candidate} #{information}", stdin_data: 'ping')
+    # We do not care about stderr here, so throw it away
+    stdout, _stderr, status =
+      Open3.capture3("#{candidate} #{information}", stdin_data: 'ping')
 
     candidate if JSON.parse(stdout) == 'pong' && status.exitstatus == 0
   rescue StandardError

data/dist/ruby/nodes/blocks.js

@@ -17,6 +17,23 @@ const printBlockVar = (path, opts, print) => {
     return parts;
 };
 exports.printBlockVar = printBlockVar;
+// You have to go through the main print function if you could potentially have
+// comments attached. So we're doing this weird reflection on the printed docs
+// to retroactively change the printed keyword depending on if we're using
+// braces or not. Ideally we wouldn't do this, we would instead do this
+// reflection in the child printer, but this keeps the logic to just this file
+// and contains it, so keeping it here for now.
+function printBlockBeging(path, print, useBraces) {
+    let docs = print(path);
+    const doc = useBraces ? "{" : "do";
+    if (Array.isArray(docs)) {
+        docs[1] = doc;
+    }
+    else {
+        docs = doc;
+    }
+    return docs;
+}
 function printBlock(braces) {
     return function printBlockWithBraces(path, opts, print) {
         const [variables, statements] = path.getValue().body;
@@ -34,7 +51,8 @@ function printBlock(braces) {
         // switch to using braces instead.
         const useBraces = braces && (0, utils_1.hasAncestor)(path, ["command", "command_call"]);
         const doBlock = [
-            useBraces ? " {" : " do",
+            " ",
+            path.call((begingPath) => printBlockBeging(begingPath, print, useBraces), "beging"),
             variables ? [" ", path.call(print, "body", 0)] : "",
             doBlockBody,
             [softline, useBraces ? "}" : "end"]
@@ -54,7 +72,8 @@ function printBlock(braces) {
         }
         const hasBody = stmts.some(({ type }) => type !== "void_stmt");
         const braceBlock = [
-            " {",
+            " ",
+            path.call((begingPath) => printBlockBeging(begingPath, print, true), "beging"),
             hasBody || variables ? " " : "",
             variables ? path.call(print, "body", 0) : "",
             path.call(print, "body", 1),

data/dist/ruby/parser.rb

@@ -136,12 +136,6 @@ class Prettier::Parser < Ripper
     # keyword.
     @__end__ = nil
 
-    # Magic comments are a certain kind of comment that can impact the way the
-    # file is parsed (encoding/string frozen default/etc.). These scanner events
-    # are immediately followed by a comment scanner event, so we only need the
-    # one variable to set/unset it immediately.
-    @magic_comment = nil
-
     # Heredocs can actually be nested together if you're using interpolation, so
     # this is a stack of heredoc nodes that are currently being created. When we
     # get to the scanner event that finishes off a heredoc node, we pop the top
@@ -799,11 +793,15 @@ class Prettier::Parser < Ripper
     beging = find_scanner_event(:@lbrace)
     ending = find_scanner_event(:@rbrace)
 
-    stmts.bind((block_var || beging)[:ec], ending[:sc])
+    stmts.bind(
+      find_next_statement_start((block_var || beging)[:ec]),
+      ending[:sc]
+    )
 
     {
       type: :brace_block,
       body: [block_var, stmts],
+      beging: beging,
       sl: beging[:sl],
       sc: beging[:sc],
       el: [ending[:el], stmts[:el]].max,
@@ -970,22 +968,6 @@ class Prettier::Parser < Ripper
     start_line = lineno
     start_char = char_pos
 
-    # If we already had special handling of a magic comment, then we can just
-    # skip and return the value of that node.
-    if @magic_comment
-      comment = @magic_comment
-      @magic_comment = nil
-
-      # At the moment, merging in the value of the string being passed into
-      # here. In the next major version I'd like to remove this and just use the
-      # value of the magic comment. At the moment though that would change
-      # comments like -*- encoding: UTF-8 -*- into encoding: UTF-8 so need to
-
-      # wait for a major version to do that.
-      @comments << comment.merge(value: body, ec: start_char + value.length - 1)
-      return comment
-    end
-
     @comments << {
       type: :@comment,
       value: body,
@@ -1208,11 +1190,15 @@ class Prettier::Parser < Ripper
     beging = find_scanner_event(:@kw, 'do')
     ending = find_scanner_event(:@kw, 'end')
 
-    bodystmt.bind((block_var || beging)[:ec], ending[:sc])
+    bodystmt.bind(
+      find_next_statement_start((block_var || beging)[:ec]),
+      ending[:sc]
+    )
 
     {
       type: :do_block,
       body: [block_var, bodystmt],
+      beging: beging,
       sl: beging[:sl],
       sc: beging[:sc],
       el: ending[:el],
@@ -2012,20 +1998,12 @@ class Prettier::Parser < Ripper
   # magic_comment is a scanner event that represents the use of a pragma at the
   # beginning of the file. Usually it will inside something like
   # frozen_string_literal (the key) with a value of true (the value). Both
-  # children come is a string literals.
-  def on_magic_comment(key, value)
-    start_line = lineno
-    start_char = char_pos
-
-    @magic_comment = {
-      type: :@comment,
-      value: " #{key}: #{value}",
-      sl: start_line,
-      el: start_line,
-      sc: start_char,
-      ec: start_char + @line_counts[start_line][-1]
-    }
-  end
+  # children come is a string literals. We're going to leave these alone as they
+  # come in all kinds of shapes and sizes.
+  #
+  #     def on_magic_comment(key, value)
+  #       @magic_comment = { value: " #{key}: #{value}" }
+  #     end
 
   # massign is a parser event that is a parent node of any kind of multiple
   # assignment. This includes splitting out variables on the left like:

data/dist/ruby/printer.js

@@ -67,6 +67,10 @@ const printer = {
                 }
                 return parts;
             }
+            case "brace_block":
+                return [node.body[0], node.body[1], node.beging];
+            case "do_block":
+                return [node.body[0], node.body[1], node.beging];
             case "paren":
                 return [node.lparen, node.body[0]];
             default: {

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prettier/plugin-ruby",
-  "version": "2.0.0-rc2",
+  "version": "2.0.0-rc3",
   "description": "prettier plugin for the Ruby programming language",
   "main": "dist/plugin.js",
   "scripts": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.rc2
+  version: 2.0.0.pre.rc3
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2021-10-01 00:00:00.000000000 Z
 dependencies: []
 description:
 email: