Keep source formatting in blockquotes

Closes #37, closes #36, closes #39.
Stardown-app · Jun 29, 2024 · ef68b2a · ef68b2a
1 parent 135fb4e
commit ef68b2a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/src/htmlSelection.js b/src/htmlSelection.js
@@ -35,11 +35,12 @@ export async function createMd(title, url, selection) {
     const selectionFormat = await getSetting('selectionFormat');
     switch (selectionFormat) {
         case 'source with link':
-            return await getSourceFormatMdWithLink(title, url, selection, selectedText);
+            return await getSourceFormatMdWithLink(title, url, selection, selectedText) + '\n';
         case 'source':
-            return await getSourceFormatMd(selection, selectedText);
+            return await getSourceFormatMd(selection, selectedText) + '\n';
         case 'blockquote with link':
-            return await md.createBlockquote(selectedText, title, url) + '\n';
+            const body = await getSourceFormatMd(selection, selectedText);
+            return await md.createBlockquote(body, title, url) + '\n';
         case 'link with selection as title':
             selectedText = selectedText.replaceAll('\r\n', ' ').replaceAll('\n', ' ');
             return await md.createLink(selectedText, url);
@@ -66,9 +67,9 @@ async function getSourceFormatMdWithLink(title, url, selection, selectedText) {
     const alert = await md.createAlert('note', `from ${link}`);
     const html = await getSelectionHtml(selection);
     if (html === null) {
-        return alert + '\n\n' + selectedText + '\n';
+        return alert + '\n\n' + selectedText;
     } else {
-        return alert + '\n\n' + await md.htmlToMarkdown(html) + '\n';
+        return alert + '\n\n' + await md.htmlToMarkdown(html);
     }
 }
 
@@ -83,9 +84,9 @@ async function getSourceFormatMdWithLink(title, url, selection, selectedText) {
 async function getSourceFormatMd(selection, selectedText) {
     const html = await getSelectionHtml(selection);
     if (html === null) {
-        return selectedText + '\n';
+        return selectedText;
     } else {
-        return await md.htmlToMarkdown(html) + '\n';
+        return await md.htmlToMarkdown(html);
     }
 }
 

diff --git a/src/md.js b/src/md.js
@@ -132,21 +132,15 @@ export async function createAlert(type, text) {
 
 /**
  * createBlockquote creates a markdown blockquote with a link at the end.
- * @param {string} text - the text of the blockquote. Many markdown patterns are
- * escaped.
+ * @param {string} body - the body of the blockquote.
  * @param {string} title - the title of the link.
  * @param {string} url - the URL of the link.
  * @returns {Promise<string>}
  */
-export async function createBlockquote(text, title, url) {
-    text = escape(text)
-        .replaceAll('[', '\\[')
-        .replaceAll(']', '\\]')
-        .replaceAll('\n', '\n> ');
-
+export async function createBlockquote(body, title, url) {
+    body = body.replaceAll('\n', '\n> ');
     const link = await createLink(title, url);
-
-    return `> ${text}\n> \n> — ${link}`;
+    return `> ${body}\n> \n> — ${link}`;
 }
 
 /**