prettier 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32366c0f21ecd68aa457ffa258101c877877a7154f3603eb2f26c7d51865937f
-  data.tar.gz: 06f87e22a36daf12111981b031a63d120c50ec24c30be2056f73b96d2b4a4e96
+  metadata.gz: 5c772ae9c41714e30e74b8d7d832a2efdd939835ada857eeb4ec80e1f036d4d5
+  data.tar.gz: f9895d25d44b055627a3518d13b3c81334bcc9bb13514a8617f3ad49ef0b8114
 SHA512:
-  metadata.gz: ccede4bd64194b7ca7de7b08e9957b78635813cacdad577b1a2c9e0041cde2281ef6175175d3c100086fe2895394437828cb52e79ac9ca534c32c486ca400935
-  data.tar.gz: 5b54c65167a99225f69569e3537e7a74d800ef675bc9b2a5c2eca69f126d937ba7c80b1909c7dfc68c1027d6537db765496810aa8b594b1686cb2409a34ad7d8
+  metadata.gz: 9a131aed0b99f4ea445a64c6c9c985931523ad6f5586df6e5d08d263d0ab4f1c40f4a17c685590b726afcae498ece6b34cf2fe9451a8e24bdc22ff8896719ea8
+  data.tar.gz: d3723afae5fdf5547e1f88f2d3443964951fe2faa8931434afa01aa8565643f93282b28bb15064079447022497234b7c28bd1eae0b78c5b6985053f4f498291e

data/CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [3.2.2] - 2022-09-20
+
+### Changed
+
+- [#1276](https://github.com/prettier/plugin-ruby/pull/1276) - kddnewton - Fix the parsing for options being passed to the server process.
+
 ## [3.2.1] - 2022-09-19
 
 ### Changed
@@ -1261,7 +1267,8 @@ would previously result in `array[]`, but now prints properly.
 
 - Initial release 🎉
 
-[unreleased]: https://github.com/prettier/plugin-ruby/compare/v3.2.1...HEAD
+[unreleased]: https://github.com/prettier/plugin-ruby/compare/v3.2.2...HEAD
+[3.2.2]: https://github.com/prettier/plugin-ruby/compare/v3.2.1...v3.2.2
 [3.2.1]: https://github.com/prettier/plugin-ruby/compare/v3.2.0...v3.2.1
 [3.2.0]: https://github.com/prettier/plugin-ruby/compare/v3.1.2...v3.2.0
 [3.1.2]: https://github.com/prettier/plugin-ruby/compare/v3.1.1...v3.1.2

data/package.json

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

data/src/parseSync.js

@@ -59,6 +59,26 @@ function getInfoFilepath() {
   return path.join(os.tmpdir(), `prettier-ruby-parser-${process.pid}.info`);
 }
 
+// Return the list of plugins that should be passed to the server process.
+function getPlugins(opts) {
+  const plugins = new Set();
+
+  const rubyPlugins = opts.rubyPlugins.trim();
+  if (rubyPlugins.length > 0) {
+    rubyPlugins.split(",").forEach((plugin) => plugins.add(plugin.trim()));
+  }
+
+  if (opts.singleQuote) {
+    plugins.add("plugin/single_quotes");
+  }
+
+  if (opts.trailingComma !== "none") {
+    plugins.add("plugin/trailing_comma");
+  }
+
+  return Array.from(plugins);
+}
+
 // Create a file that will act as a communication mechanism, spawn a parser
 // server with that filepath as an argument, then spawn another process that
 // will read that information in order to enable us to connect to it in the
@@ -114,20 +134,9 @@ function spawnServer(opts) {
     };
   }
 
-  const plugins = new Set(opts.rubyPlugins.split(","));
-  if (opts.singleQuote) {
-    plugins.add("plugin/single_quotes");
-  }
-
-  if (opts.trailingComma !== "none") {
-    plugins.add("plugin/trailing_comma");
-  }
-
-  const rubyPlugins = Array.from(plugins).join(",");
-
   const server = spawn(
     "ruby",
-    [serverRbPath, `--plugins=${rubyPlugins}`, filepath],
+    [serverRbPath, `--plugins=${getPlugins(opts).join(",")}`, filepath],
     {
       env: Object.assign({}, process.env, { LANG: getLang() }),
       detached: true,

data/src/server.rb

@@ -129,7 +129,9 @@ listener =
                 PrettierPrint
               end
 
-            formatter = formatter_class.new(+"", maxwidth, "\n", &genspace)
+            formatter =
+              formatter_class.new(source, +"", maxwidth, "\n", &genspace)
+
             SyntaxTree::Haml.parse(source).format(formatter)
             formatter.flush
             formatter.output

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-19 00:00:00.000000000 Z
+date: 2022-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: syntax_tree