prettier 0.22.0 → 1.0.0.pre.rc1

data/src/printer.js

@@ -40,8 +40,10 @@ function canAttachComment(node) {
 // where it needs to attach the comments.
 function getCommentChildNodes(node) {
   switch (node.type) {
+    case "heredoc":
+      return [node.beging];
     case "rescue":
-      return node.body[0].concat(node.body.slice(1));
+      return [].concat(node.body[0]).concat(node.body.slice(1));
     case "aryptn":
       return [node.body[0]]
         .concat(node.body[1])

data/src/ruby.js

@@ -76,42 +76,28 @@ module.exports = {
     ruby: printer
   },
   options: {
-    addTrailingCommas: {
-      type: "boolean",
-      category: "Global",
-      default: false,
-      description:
-        "Adds a trailing comma to array literals, hash literals, and method calls."
-    },
-    inlineConditionals: {
-      type: "boolean",
-      category: "Global",
-      default: true,
-      description:
-        "When it fits on one line, allows if and unless statements to use the modifier form."
-    },
-    inlineLoops: {
+    rubyHashLabel: {
       type: "boolean",
       category: "Global",
       default: true,
       description:
-        "When it fits on one line, allows while and until statements to use the modifier form."
+        "When possible, uses the shortened hash key syntax, as opposed to hash rockets."
     },
-    preferHashLabels: {
+    rubyModifier: {
       type: "boolean",
       category: "Global",
       default: true,
       description:
-        "When possible, uses the shortened hash key syntax, as opposed to hash rockets."
+        "When it fits on one line, allows if, unless, while, and until statements to use the modifier form."
     },
-    preferSingleQuotes: {
+    rubySingleQuote: {
       type: "boolean",
       category: "Global",
       default: true,
       description:
         "When double quotes are not necessary for interpolation, prefers the use of single quotes for string literals."
     },
-    toProcTransform: {
+    rubyToProc: {
       type: "boolean",
       category: "Global",
       default: false,
@@ -121,6 +107,7 @@ module.exports = {
   },
   defaultOptions: {
     printWidth: 80,
-    tabWidth: 2
+    tabWidth: 2,
+    trailingComma: "none"
   }
 };

data/src/toProc.js

@@ -12,7 +12,7 @@ const isCall = (node) => ["::", "."].includes(node) || node.type === "@period";
 //
 // This works with `do` blocks as well.
 const toProc = (path, opts, node) => {
-  if (!node || !opts.toProcTransform) {
+  if (!node || !opts.rubyToProc) {
     return null;
   }
 

data/src/utils.js

@@ -31,6 +31,8 @@ const empty = () => "";
 
 const first = (path, opts, print) => path.call(print, "body", 0);
 
+const getTrailingComma = (opts) => ["all", "es5"].includes(opts.trailingComma);
+
 const hasAncestor = (path, types) => {
   let parent = 0;
   let parentNode = path.getParentNode();
@@ -59,6 +61,15 @@ const makeCall = (path, opts, print) => {
   return operation === "::" ? "." : path.call(print, "body", 1);
 };
 
+const noIndent = [
+  "array",
+  "hash",
+  "heredoc",
+  "if",
+  "method_add_block",
+  "xstring_literal"
+];
+
 const prefix = (value) => (path, opts, print) =>
   concat([value, path.call(print, "body", 0)]);
 
@@ -73,11 +84,13 @@ module.exports = {
   docLength,
   empty,
   first,
+  getTrailingComma,
   hasAncestor,
   isEmptyStmts,
   literal,
   literalLineNoBreak,
   makeCall,
+  noIndent,
   prefix,
   skipAssignIndent
 };

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 1.0.0.pre.rc1
 platform: ruby
 authors:
 - Kevin Deisz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-08 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,9 +130,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: