Comments

src/index.js

@@ -1,5 +1,6 @@
 "use strict";
 
+const utilShared = require("prettier").util;
 const util = require("./_util-from-prettier");
 const parse = require("./parser");
 const print = require("./printer");
@@ -20,10 +21,79 @@ const languages = [
 const parsers = {
   ruby: {
     parse,
-    astFormat: "ruby"
+    astFormat: "ruby",
+    locStart: locStart,
+    locEnd: locEnd
   }
 };
 
+function locStart(node) {
+  // This function is copied from the code that used to live in the main prettier repo.
+
+  // Handle nodes with decorators. They should start at the first decorator
+  if (
+    node.declaration &&
+    node.declaration.decorators &&
+    node.declaration.decorators.length > 0
+  ) {
+    return locStart(node.declaration.decorators[0]);
+  }
+  if (node.decorators && node.decorators.length > 0) {
+    return locStart(node.decorators[0]);
+  }
+
+  if (node.__location) {
+    return node.__location.startOffset;
+  }
+  if (node.range) {
+    return node.range[0];
+  }
+  if (typeof node.start === "number") {
+    return node.start;
+  }
+  if (node.source) {
+    return (
+      utilShared.lineColumnToIndex(node.source.start, node.source.input.css) - 1
+    );
+  }
+  if (node.loc) {
+    return node.loc.start;
+  }
+
+  return 0;
+}
+
+function locEnd(node) {
+  // This function is copied from the code that used to live in the main prettier repo.
+
+  const endNode = node.nodes && utilShared.getLast(node.nodes);
+  if (endNode && node.source && !node.source.end) {
+    node = endNode;
+  }
+
+  let loc;
+  if (node.range) {
+    loc = node.range[1];
+  } else if (typeof node.end === "number") {
+    loc = node.end;
+  } else if (node.source) {
+    loc = utilShared.lineColumnToIndex(node.source.end, node.source.input.css);
+  }
+
+  if (node.__location) {
+    return node.__location.endOffset;
+  }
+  if (node.typeAnnotation) {
+    return Math.max(loc, locEnd(node.typeAnnotation));
+  }
+
+  if (node.loc && !loc) {
+    return node.loc.end;
+  }
+
+  return loc || 0;
+}
+
 function canAttachComment(node) {
   return node.ast_type && node.ast_type !== "comment";
 }
@@ -32,8 +102,20 @@ function printComment(commentPath) {
   const comment = commentPath.getValue();
 
   switch (comment.ast_type) {
-    case "comment":
-      return comment.value;
+    case "comment": {
+      const hasNewLine = comment.value.lastIndexOf("\n");
+      let value = comment.value;
+      const hasSpaceAfterHash = value.charAt(1) === " ";
+      if (hasNewLine) {
+        value = value.slice(0, hasNewLine);
+      }
+
+      if (!hasSpaceAfterHash) {
+        value = "# " + value.slice(1, value.length);
+      }
+
+      return value;
+    }
     default:
       throw new Error("Not a comment: " + JSON.stringify(comment));
   }

src/printer/index.js

@@ -208,7 +208,7 @@ function genericPrint(path, options, print) {
     }
 
     case "@ident": {
-      return concat([n.value, n.hardline ? hardline : ""]);
+      return path.call(print, "value");
     }
 
     case "var_field": {
@@ -525,7 +525,7 @@ function genericPrint(path, options, print) {
           : path.call(print, "args");
       let finalBody = group(concat(["(", body, ")"]));
       const name = n.name && path.call(print, "name");
-      const value = name && name.parts[0];
+      const value = name;
       if (keywords.hasOwnProperty(value)) {
         finalBody = group(concat([" ", body]));
       }
@@ -602,7 +602,7 @@ function genericPrint(path, options, print) {
     }
 
     case "symbol": {
-      return concat([":", path.call(print, "symbol")]);
+      return group(concat([":", path.call(print, "symbol")]));
     }
 
     case "dyna_symbol": {
@@ -651,7 +651,8 @@ function genericPrint(path, options, print) {
         " ",
         path.call(print, "from"),
         " ",
-        path.call(print, "to")
+        path.call(print, "to"),
+        n.hardline ? hardline : ""
       ]);
     }
 
@@ -713,13 +714,13 @@ function genericPrint(path, options, print) {
       const targetParts = [];
       targetParts.push(path.call(print, "target"), line, "=");
       let value = group(path.call(print, "value"));
-      if (n.value.ast_type !== "hash") {
-        value = indent(group(concat([line, value])));
-      } else {
+      if (n.value.ast_type === "hash" || n.value.ast_type === "array") {
         targetParts.push(line);
+      } else {
+        value = indent(group(concat([line, value])));
       }
       const target = group(concat(targetParts));
-      return concat([target, value]);
+      return group(concat([target, value, n.hardline ? hardline : ""]));
     }
 
     case "massign": {
@@ -1014,8 +1015,8 @@ function genericPrint(path, options, print) {
     }
 
     case "array": {
-      if (n.body === null) {
-        return "[]";
+      if (n.body === null || (n.body && n.body.length === 0)) {
+        return group(concat(["[", "]"]));
       }
       let parts = [];
       const type = n.array_type;
@@ -1024,8 +1025,15 @@ function genericPrint(path, options, print) {
           parts = group(
             concat([
               "[",
-              join(concat([", ", softline]), path.map(print, "body")),
-              "]"
+              indent(
+                group(
+                  concat([
+                    softline,
+                    join(concat([",", line]), path.map(print, "body"))
+                  ])
+                )
+              ),
+              concat([softline, dedent("]")])
             ])
           );
           break;

tests/array/__snapshots__/jsfmt.spec.js.snap

@@ -2,18 +2,22 @@
 
 exports[`empty_array.rb 1`] = `
 empty_array = []
+
 empty_array
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 empty_array = []
+
 empty_array
 
 `;
 
 exports[`number_array.rb 1`] = `
-numbers = [1, 2, 3, 4, 5, 6, 7, 8, 9]
+numbers = [1, 2, 3, 4, 5, 6, 7, 8, 9] 
+
 numbers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 numbers = [1, 2, 3, 4, 5, 6, 7, 8, 9]
+
 numbers
 
 `;

tests/array/empty_array.rb

@@ -1,2 +1,3 @@
 empty_array = []
+
 empty_array

tests/array/number_array.rb

@@ -1,2 +1,3 @@
-numbers = [1, 2, 3, 4, 5, 6, 7, 8, 9]
+numbers = [1, 2, 3, 4, 5, 6, 7, 8, 9] 
+
 numbers

tests/comments/__snapshots__/jsfmt.spec.js.snap

@@ -0,0 +1,20 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`comments.rb 1`] = `
+alias $foo $bar #comment
+
+alias store []= #comment 2
+
+alias :foo :bar #comment test test test test
+
+alias foo bar
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+alias $foo $bar # comment
+
+alias store []= # comment 2
+
+alias :foo :bar # comment test test test test
+
+alias foo bar
+
+`;

tests/comments/comments.rb

@@ -0,0 +1,7 @@
+alias $foo $bar #comment
+
+alias store []= #comment 2
+
+alias :foo :bar #comment test test test test
+
+alias foo bar

tests/comments/jsfmt.spec.js

@@ -0,0 +1 @@
+run_spec(__dirname, ["ruby"]);