Hoover391github
diff --git a/Collapse file
‎src/ruby/embed.ts‎
Copy file name to clipboardExpand all lines: src/ruby/embed.ts
+12-4Lines changed: 12 additions & 4 deletions b/Collapse file
‎src/ruby/embed.ts‎
Copy file name to clipboardExpand all lines: src/ruby/embed.ts
+12-4Lines changed: 12 additions & 4 deletions
diff --git a/Collapse file
‎test/js/ruby/embed.test.ts‎
Copy file name to clipboardExpand all lines: test/js/ruby/embed.test.ts
+62Lines changed: 62 additions & 0 deletions b/Collapse file
‎test/js/ruby/embed.test.ts‎
Copy file name to clipboardExpand all lines: test/js/ruby/embed.test.ts
+62Lines changed: 62 additions & 0 deletions
@@ -2,8 +2,15 @@ import type { Plugin, Ruby } from "../types";
 import prettier from "../prettier";
 import { literallineWithoutBreakParent } from "../utils";
 
-const { group, indent, lineSuffix, mapDoc, markAsRoot, stripTrailingHardline } =
-  prettier;
+const {
+  group,
+  indent,
+  dedent,
+  lineSuffix,
+  mapDoc,
+  markAsRoot,
+  stripTrailingHardline
+} = prettier;
 
 const parsers: Record<string, string> = {
   css: "css",
@@ -47,6 +54,7 @@ function getCommonLeadingWhitespace(content: string) {
   return content
     .split("\n")
     .slice(0, -1)
+    .filter((line) => line.trim().length > 0)
     .reduce((minimum, line) => {
       const matched = pattern.exec(line);
       const length = matched ? matched[0].length : 0;
@@ -109,9 +117,9 @@ const embed: Plugin.Embed<Ruby.AnyNode> = (path, print, textToDoc) => {
     return [
       path.call(print, "beging"),
       lineSuffix(
-        group([
+        dedent([
           indent(markAsRoot(formatted)),
-          literallineWithoutBreakParent,
+          { type: "line", hard: true },
           ending.trim()
         ])
       )
 
@@ -78,4 +78,66 @@ describe("embed", () => {
 
     return expect(content).toChangeFormat(expected);
   });
+
+  test("keeps parent indentation", () => {
+    const content = ruby(`
+      some_block do
+        another_block do
+          x += 1
+          description <<~JS
+            // This is a DSL method on the another_block inner block.
+            // This is another line of the string.
+          JS
+        end
+      end
+    `);
+
+    return expect(content).toMatchFormat();
+  });
+
+  test("correctly indents nested code while keeping parent indentation", () => {
+    const content = ruby(`
+      some_block do
+        another_block do
+          x += 1
+          description <<~JS
+            [1, function () { return 2; }, 3];
+          JS
+        end
+      end
+    `);
+    const expected = ruby(`
+      some_block do
+        another_block do
+          x += 1
+          description <<~JS
+            [
+              1,
+              function () {
+                return 2;
+              },
+              3
+            ];
+          JS
+        end
+      end
+    `);
+
+    return expect(content).toChangeFormat(expected);
+  });
+
+  test("doesn't consider empty lines as part of the common leading whitespace", () => {
+    const content = ruby(`
+      some_block do
+        x += 1
+        description <<~MARKDOWN
+          This is a line. It's followed by two literal line breaks.
+
+          This is another line of the string.
+        MARKDOWN
+      end
+    `);
+
+    return expect(content).toMatchFormat();
+  });
 });