prettier 3.1.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69429c1f7b0cc5b82babb8463afcdacbb30026b0c9a77afcf8f6c4dbddd5b545
-  data.tar.gz: f81d934981c3086071371a9013184fbb19543dd7a86ca4258addd5870defbe73
+  metadata.gz: 1a60ee62443799f6fdd3380700b4091b75e1f50658e01cad2cdf1ade440917f4
+  data.tar.gz: 4c95bb8ae2916d965e12cc376aa2c8df0ce985420e78edc45554c6412a4e3469
 SHA512:
-  metadata.gz: e6e612eb427b6c244c365b4595d1cefb0987e43255a541accd4843cadd4c73c0c5dd96268cf6ed8444afe2c2008e4792e3ad3155474d6ec20ffb880f65c23fb7
-  data.tar.gz: f825fb2f339e52c9c9dae9b287b5f21436fadaaea29ed0e93b14ee0ebb97bfaaac9aa1e16eaa2549b4a66e513c1007a3f48e1aa587efe6032568f77afd85d77f
+  metadata.gz: f449363349b3476457419d8374dd1127ac8bcfb7faf2afa1f20eb49b21968c2cd5301ad26731bde90e8de64f5604534f375ffcf7ef60bdb21b0fb3f95c160439
+  data.tar.gz: 27fde34295c91d167f693d5ab4c8e67c639d9302854a7ef2423552b978a9611615b94fa07b3dae6d20c611fc7bc9764820570555a88faf61450235c467ee757e

data/CHANGELOG.md

@@ -6,6 +6,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [3.2.0] - 2022-07-22
+
+### Added
+
+- [#1250](https://github.com/prettier/plugin-ruby/issues/1250) - alexf101, kddnewton - Respect the `tabWidth` option.
+
+### Changed
+
+- [#1255](https://github.com/prettier/plugin-ruby/pull/1255) - soberstadt - The rake task now runs check if write is false.
+- [#1237](https://github.com/prettier/plugin-ruby/issues/1237) - boris-petrov - Disable the style rules associated with quotes.
+- [#1248](https://github.com/prettier/plugin-ruby/pull/1248) - mhssmnn - Fix process waiting on STDIN.
+
 ## [3.1.2] - 2022-05-13
 
 ### Changed

data/lib/prettier/rake/task.rb

@@ -49,7 +49,7 @@ module Prettier
       end
 
       def run_task
-        Prettier.run([("--write" if write), source_files].compact)
+        Prettier.run([write ? "--write" : "--check", source_files].compact)
         exit($?.exitstatus) if $?&.exited?
       end
     end

data/lib/prettier.rb

@@ -11,9 +11,10 @@ module Prettier
   def self.run(args)
     quoted = args.map { |arg| arg.start_with?("-") ? arg : "\"#{arg}\"" }
     command = "node #{BINARY} --plugin \"#{PLUGIN}\" #{quoted.join(" ")}"
+    opts = STDIN.tty? ? {} : { stdin_data: STDIN }
 
     stdout, stderr, status =
-      Open3.capture3({ "RBPRETTIER" => "1" }, command, stdin_data: STDIN)
+      Open3.capture3({ "RBPRETTIER" => "1" }, command, opts)
     STDOUT.puts(stdout)
 
     # If we completed successfully, then just exit out.

data/package.json

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

data/rubocop.yml

@@ -32,16 +32,16 @@ Style/Lambda:
 Style/MultilineBlockChain:
   Enabled: false
 
-# Syntax Tree by default uses double quotes, so changing the configuration here
-# to match that.
+# Disable the single- vs double-quotes rules as these depend on whether the user
+# has added or not `plugin/single_quotes` for `syntax_tree`
 Style/StringLiterals:
-  EnforcedStyle: double_quotes
+  Enabled: false
 
 Style/StringLiteralsInInterpolation:
-  EnforcedStyle: double_quotes
+  Enabled: false
 
 Style/QuotedSymbols:
-  EnforcedStyle: double_quotes
+  Enabled: false
 
 # We let users have a little more freedom with symbol and words arrays. If the
 # user only has an individual item like ["value"] then we don't bother
@@ -52,8 +52,8 @@ Style/SymbolArray:
 Style/WordArray:
   Enabled: false
 
-# We don't support trailing commas in Syntax Tree by default, so just turning
-# these off for now.
+# Disable the trailing-comma rules as these depend on whether the user has added
+# or not `plugin/trailing_comma` for `syntax_tree`
 Style/TrailingCommaInArguments:
   Enabled: false
 

data/src/parseSync.js

@@ -181,7 +181,7 @@ function parseSync(parser, source, opts) {
   }
 
   const response = spawnSync(parserArgs.cmd, parserArgs.args, {
-    input: `${parser}|${opts.printWidth}|${source}`,
+    input: `${parser}|${opts.printWidth}|${opts.tabWidth}|${source}`,
     maxBuffer: 15 * 1024 * 1024
   });
 

data/src/server.rb

@@ -74,8 +74,8 @@ listener =
 
       # Start up a new thread that will handle each successive connection.
       Thread.new(server.accept_nonblock) do |socket|
-        parser, width, source =
-          socket.read.force_encoding("UTF-8").split("|", 3)
+        parser, maxwidth_string, tabwidth_string, source =
+          socket.read.force_encoding("UTF-8").split("|", 4)
 
         source.each_line do |line|
           case line
@@ -92,25 +92,40 @@ listener =
           end
         end
 
-        maxwidth = width.to_i
+        # At the moment, we're not going to support odd tabwidths. It's going to
+        # have to be a multiple of 2, because of the way that the prettyprint
+        # gem functions. So we're going to just use integer division here.
+        scalar = tabwidth_string.to_i / 2
+        genspace = ->(n) { " " * n * scalar }
+
+        maxwidth = maxwidth_string.to_i
         response =
           case parser
           when "ping"
             "pong"
           when "ruby"
-            formatter = SyntaxTree::Formatter.new(source, [], maxwidth)
+            formatter =
+              SyntaxTree::Formatter.new(source, [], maxwidth, "\n", &genspace)
             SyntaxTree.parse(source).format(formatter)
             formatter.flush
             formatter.output.join
           when "rbs"
-            formatter = SyntaxTree::RBS::Formatter.new(source, [], maxwidth)
+            formatter =
+              SyntaxTree::RBS::Formatter.new(
+                source,
+                [],
+                maxwidth,
+                "\n",
+                &genspace
+              )
             SyntaxTree::RBS.parse(source).format(formatter)
             formatter.flush
             formatter.output.join
           when "haml"
-            PrettierPrint.format(+"", maxwidth) do |q|
-              SyntaxTree::Haml.parse(source).format(q)
-            end
+            formatter = PrettierPrint.new(+"", maxwidth, "\n", &genspace)
+            SyntaxTree::Haml.parse(source).format(formatter)
+            formatter.flush
+            formatter.output
           end
 
         if response

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-14 00:00:00.000000000 Z
+date: 2022-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: syntax_tree
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
   name: syntax_tree-haml
   requirement: !ruby/object:Gem::Requirement