fix(md): parse Windows newlines

pskfyi · May 6, 2023 · 4336d8e · 4336d8e
1 parent 77b36c1
commit 4336d8e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/md/codeBlock/fenced.test.ts b/md/codeBlock/fenced.test.ts
@@ -96,6 +96,19 @@ describe("parse", () => {
     it("gets rest of info string", () =>
       assertEquals(parse("```lang meta data\n```").meta, "meta data"));
   });
+
+  it("handles Windows newlines", () =>
+    assertEquals(
+      parse("```\r\nHello!\r\n```"),
+      {
+        type: "fenced",
+        char: "`",
+        fence: "```",
+        code: "Hello!",
+        lang: undefined,
+        meta: undefined,
+      },
+    ));
 });
 
 describe("findAll", () => {

diff --git a/md/codeBlock/regex.ts b/md/codeBlock/regex.ts
@@ -1,14 +1,14 @@
 export const FENCED_CODE_BLOCK_REGEX = new RegExp(
   "^(?<fence>`{3,}|~{3,})" +
-    "(?<infoString>[^\n]*)\n" +
-    "((?<code>[\\s\\S]*?)\n)?" +
+    "(?<infoString>[^\r\n]*)\r?\n" +
+    "((?<code>[\\s\\S]*?)\r?\n)?" +
     "\\k<fence>",
 );
 
 export const INDENTED_CODE_BLOCK_REGEX = new RegExp(
-  "^ {4,}[^\n]+(\n" + // first line, w/ optional trailing newline
-    "(\n|^ {4,}.*\n)*" + // ... subsequent lines
-    "^ {4,}[^\n]+)?", // ... and final line, closing w/ )?
+  "^ {4,}[^\r\n]+(\r?\n" + // first line, w/ optional trailing newline
+    "(\r?\n|^ {4,}.*\r?\n)*" + // ... subsequent lines
+    "^ {4,}[^\r\n]+)?", // ... and final line, closing w/ )?
   "gm",
 );
 

diff --git a/md/script/evalCodeBlocks.ts b/md/script/evalCodeBlocks.ts
@@ -26,7 +26,7 @@ export async function evalCodeBlocks(
     const { lang, code } = details;
 
     const langLength = lang?.length ?? 0;
-    const inlineCode = code.trim().replace(/\n/g, "\\n");
+    const inlineCode = code.trim().replace(/\r?\n/g, "\\n");
     const firstChars = inlineCode.slice(0, consoleWidth - langLength - 4);
 
     const message = firstChars.length < inlineCode.length