ep_markdown 11.0.14 → 11.0.16

package/exportMarkdown.ts

@@ -218,9 +218,27 @@ const getMarkdownFromAtext = (pad, atext) => {
         const url = urlData[1];
         const urlLength = url.length;
         processNextChars(startIndex - idx);
+        // Close any currently-open inline format tags (bold, italic, etc.)
+        // before writing the URL. If we don't, processing the URL's chars
+        // re-emits `**` / `*` markers *inside* the Markdown link token,
+        // producing broken output like `[url](**https://example.com**)`
+        // (regression for #156).
+        const reopen = [...openTags];
+        const tags2close = [...openTags];
+        orderdCloseTags(tags2close);
+        for (let i = 0; i < propVals.length; i++) { propVals[i] = false; }
         assem.append(`[${url}](`);
-        processNextChars(urlLength);
+        // Emit the URL's chars as raw text — links in Markdown never
+        // contain inline formatting markers.
+        assem.append(taker.take(urlLength));
+        idx += urlLength;
         assem.append(')');
+        // Restore the formatting tags so any trailing same-line text picks
+        // them back up.
+        for (const i of reopen.slice().reverse()) {
+          emitOpenTag(i);
+          propVals[i] = true;
+        }
       });
     }
 
@@ -229,8 +247,15 @@ const getMarkdownFromAtext = (pad, atext) => {
     // replace &, _
     assem = assem.toString();
     assem = assem.replace(/&/g, '\\&');
-    // this breaks Markdown math mode: $\sum_i^j$ becomes $\sum\_i^j$
-    assem = assem.replace(/_/g, '\\_');
+    // Only escape underscores OUTSIDE code spans / code blocks. On a line
+    // with the `heading: 'code'` attribute (rendered with the 4-space
+    // block-code prefix) underscores should be preserved verbatim,
+    // otherwise `myVar_name` comes out as `myVar\_name` in the exported
+    // Markdown rendering (regression for #156). Math-mode ($...$) still
+    // has no special handling here — that is a separate concern.
+    if (heading !== headingtags[6]) {
+      assem = assem.replace(/_/g, '\\_');
+    }
 
     return assem;
   };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ep_markdown",
   "description": "Edit and Export as Markdown in Etherpad",
-  "version": "11.0.14",
+  "version": "11.0.16",
   "author": {
     "name": "John McLear",
     "email": "john@mclear.co.uk",

package/static/tests/frontend-new/specs/markdown.spec.ts

@@ -0,0 +1,35 @@
+import {expect, test} from '@playwright/test';
+import {clearPadContent, getPadBody, goToNewPad, selectAllText, writeToPad}
+    from 'ep_etherpad-lite/tests/frontend-new/helper/padHelper';
+
+test.beforeEach(async ({page}) => {
+  await goToNewPad(page);
+});
+
+test.describe('ep_markdown', () => {
+  test('Bold section renders the markdown class on body when "Show Markdown" is enabled',
+      async ({page}) => {
+        const padBody = await getPadBody(page);
+        await padBody.click();
+        await clearPadContent(page);
+        await writeToPad(page, 'bold');
+        await selectAllText(page);
+
+        // Apply bold via the toolbar button.
+        await page.locator('.buttonicon-bold').click();
+
+        // Toggle "Show Markdown" in pad settings.
+        // Settings popup must be open for #options-markdown to be clickable.
+        await page.locator('.buttonicon-settings').click();
+        await page.locator('#options-markdown').click({force: true});
+
+        // The pad body should gain the `markdown` class so its CSS swaps
+        // <b> for visible **bold** rendering.
+        await expect(padBody).toHaveClass(/markdown/);
+
+        // The original text content is unchanged (the rendering is purely
+        // CSS-driven; the underlying text remains "bold" without the
+        // surrounding asterisks in the document model).
+        await expect(padBody.locator('div').first()).toHaveText('bold');
+      });
+});

package/static/tests/frontend/specs/test.js

@@ -1,30 +0,0 @@
-'use strict';
-
-describe('Set formatting attributes and ensure ep_markdown displays properly', function () {
-  // create a new pad before each test run
-  beforeEach(async function () {
-    this.timeout(60000);
-    await helper.aNewPad();
-  });
-
-  it('Bold section is shown as **foo** when clicking Show Markdown', async function () {
-    this.timeout(60000);
-    const chrome$ = helper.padChrome$;
-    const inner$ = helper.padInner$;
-
-    const $editorContents = inner$('div');
-
-    // clear pad
-    $editorContents.sendkeys('{selectall}');
-    inner$('div').first().sendkeys('bold');
-    inner$('div').first().sendkeys('{selectall}');
-    chrome$('.buttonicon-bold').click();
-    chrome$('#options-markdown').click();
-
-    await helper.waitForPromise(() => (inner$('div').first()[0].textContent === 'bold'));
-
-    const hasMarkdown = inner$('body').hasClass('markdown');
-    // TODO: Use a psuedo selector to ensure the value displayed to user is **bold**
-    expect(hasMarkdown).to.be(true);
-  });
-});