prettier 1.5.0 → 1.5.5

data/src/ruby/printer.js

@@ -38,7 +38,8 @@ const noComments = [
   "args_add_star",
   "mlhs",
   "mlhs_add_post",
-  "mlhs_add_star"
+  "mlhs_add_star",
+  "mlhs_paren"
 ];
 
 // Certain nodes are used more for organizational purposed than for actually
@@ -97,8 +98,12 @@ function getCommentChildNodes(node) {
 
       return parts;
     }
-    default:
-      return node.body;
+    default: {
+      if (Array.isArray(node.body)) {
+        return node.body.filter((child) => child && typeof child === "object");
+      }
+      return [];
+    }
   }
 }
 

data/src/utils.js

@@ -5,7 +5,7 @@ module.exports = {
   isEmptyStmts: require("./utils/isEmptyStmts"),
   hasAncestor: require("./utils/hasAncestor"),
   literal: require("./utils/literal"),
-  literalLineNoBreak: require("./utils/literalLineNoBreak"),
+  literallineWithoutBreakParent: require("./utils/literallineWithoutBreakParent"),
   makeCall: require("./utils/makeCall"),
   noIndent: require("./utils/noIndent"),
   printEmptyCollection: require("./utils/printEmptyCollection"),

data/src/utils/inlineEnsureParens.js

@@ -1,4 +1,11 @@
-const needsParens = ["args", "assign", "assoc_new", "massign", "opassign"];
+const needsParens = [
+  "args",
+  "assign",
+  "assoc_new",
+  "call",
+  "massign",
+  "opassign"
+];
 
 // If you have a modifier statement (for instance an inline if statement or an
 // inline while loop) there are times when you need to wrap the entire statement

data/src/utils/literallineWithoutBreakParent.js

@@ -0,0 +1,7 @@
+const literallineWithoutBreakParent = {
+  type: "line",
+  hard: true,
+  literal: true
+};
+
+module.exports = literallineWithoutBreakParent;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.5
 platform: ruby
 authors:
 - Kevin Deisz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -28,6 +28,18 @@ files:
 - lib/prettier/rake/task.rb
 - node_modules/prettier/bin-prettier.js
 - node_modules/prettier/index.js
+- node_modules/prettier/parser-angular.js
+- node_modules/prettier/parser-babel.js
+- node_modules/prettier/parser-espree.js
+- node_modules/prettier/parser-flow.js
+- node_modules/prettier/parser-glimmer.js
+- node_modules/prettier/parser-graphql.js
+- node_modules/prettier/parser-html.js
+- node_modules/prettier/parser-markdown.js
+- node_modules/prettier/parser-meriyah.js
+- node_modules/prettier/parser-postcss.js
+- node_modules/prettier/parser-typescript.js
+- node_modules/prettier/parser-yaml.js
 - node_modules/prettier/third-party.js
 - package.json
 - rubocop.yml
@@ -44,11 +56,8 @@ files:
 - src/haml/parser.js
 - src/haml/parser.rb
 - src/haml/printer.js
-- src/parser/getLang.js
-- src/parser/getNetcat.js
 - src/parser/netcat.js
 - src/parser/parseSync.js
-- src/parser/requestParse.js
 - src/parser/server.rb
 - src/plugin.js
 - src/prettier.js
@@ -100,7 +109,7 @@ files:
 - src/utils/isEmptyBodyStmt.js
 - src/utils/isEmptyStmts.js
 - src/utils/literal.js
-- src/utils/literalLineNoBreak.js
+- src/utils/literallineWithoutBreakParent.js
 - src/utils/makeCall.js
 - src/utils/noIndent.js
 - src/utils/printEmptyCollection.js
@@ -124,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: prettier plugin for the Ruby programming language

data/src/parser/getLang.js

@@ -1,32 +0,0 @@
-// In order to properly parse ruby code, we need to tell the ruby process to
-// parse using UTF-8. Unfortunately, the way that you accomplish this looks
-// differently depending on your platform.
-/* istanbul ignore next */
-function getLang() {
-  const { env, platform } = process;
-  const envValue = env.LC_ALL || env.LC_CTYPE || env.LANG;
-
-  // If an env var is set for the locale that already includes UTF-8 in the
-  // name, then assume we can go with that.
-  if (envValue && envValue.includes("UTF-8")) {
-    return envValue;
-  }
-
-  // Otherwise, we're going to guess which encoding to use based on the system.
-  // This is probably not the best approach in the world, as you could be on
-  // linux and not have C.UTF-8, but in that case you're probably passing an env
-  // var for it. This object below represents all of the possible values of
-  // process.platform per:
-  // https://nodejs.org/api/process.html#process_process_platform
-  return {
-    aix: "C.UTF-8",
-    darwin: "en_US.UTF-8",
-    freebsd: "C.UTF-8",
-    linux: "C.UTF-8",
-    openbsd: "C.UTF-8",
-    sunos: "C.UTF-8",
-    win32: ".UTF-8"
-  }[platform];
-}
-
-module.exports = getLang;

data/src/parser/getNetcat.js

@@ -1,50 +0,0 @@
-const { spawnSync } = require("child_process");
-const os = require("os");
-
-// Checks to see if an executable is available.
-function hasCommand(name) {
-  let result;
-
-  if (os.type() === "Windows_NT") {
-    result = spawnSync("where", [name]);
-  } else {
-    result = spawnSync("command", ["-v", name]);
-  }
-
-  return result.status === 0;
-}
-
-// Finds an netcat-like adapter to use for sending data to a socket. We order
-// these by likelihood of being found so we can avoid some shell-outs.
-function getCommandAndArg() {
-  if (hasCommand("nc")) {
-    return ["nc", "-U"];
-  }
-
-  if (hasCommand("telnet")) {
-    return ["telnet", "-u"];
-  }
-
-  if (hasCommand("ncat")) {
-    return ["ncat", "-U"];
-  }
-
-  if (hasCommand("socat")) {
-    return ["socat", "-"];
-  }
-
-  return ["node", require.resolve("./netcat.js")];
-}
-
-let command;
-let arg;
-
-function getNetcat() {
-  if (!command) {
-    [command, arg] = getCommandAndArg();
-  }
-
-  return { command, arg };
-}
-
-module.exports = getNetcat;

data/src/parser/requestParse.js

@@ -1,74 +0,0 @@
-const { spawn, spawnSync, execSync } = require("child_process");
-const path = require("path");
-const { existsSync, mkdtempSync } = require("fs");
-const process = require("process");
-const os = require("os");
-
-const getNetcat = require("./getNetcat");
-const getLang = require("./getLang");
-
-let sockfile = process.env.PRETTIER_RUBY_HOST;
-
-// Spawn the parser.rb subprocess. We do this since booting Ruby is slow, and we
-// can re-use the parser process multiple times since it is statelesss.
-function spawnParseServer() {
-  const server = spawn(
-    "ruby",
-    [path.join(__dirname, "./server.rb"), sockfile],
-    {
-      env: Object.assign({}, process.env, { LANG: getLang() }),
-      detached: true,
-      stdio: "inherit"
-    }
-  );
-
-  process.on("exit", () => {
-    try {
-      process.kill(-server.pid);
-    } catch (e) {
-      // ignore
-    }
-  });
-
-  server.unref();
-  const now = new Date();
-
-  // Wait for server to go live.
-  while (!existsSync(sockfile) && new Date() - now < 3000) {
-    execSync("sleep 0.1");
-  }
-}
-
-// Ensures that a parser server is currently running by checking against the
-// sockfile variable. If it is not, create a temporary directory to house the
-// sockfile and spawn the ruby process.
-function ensureParseServer() {
-  if (sockfile) {
-    return;
-  }
-
-  const tmpDir = mkdtempSync(path.join(os.tmpdir(), "prettier-ruby"));
-  sockfile = path.join(tmpDir, `${process.pid}.sock`);
-
-  spawnParseServer();
-}
-
-// Sends a request to the parse server to parse the given content.
-function requestParse(parser, source) {
-  ensureParseServer();
-
-  const { command, arg } = getNetcat();
-  const { stdout, stderr, status } = spawnSync(command, [arg, sockfile], {
-    input: `${parser}|${source}`,
-    maxBuffer: 15 * 1024 * 1024
-  });
-
-  return {
-    command,
-    stdout: stdout.toString(),
-    stderr: stderr.toString(),
-    status
-  };
-}
-
-module.exports = requestParse;

data/src/utils/literalLineNoBreak.js

@@ -1,7 +0,0 @@
-const literalLineNoBreak = {
-  type: "line",
-  hard: true,
-  literal: true
-};
-
-module.exports = literalLineNoBreak;