f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-08 20:23:39 +00:00
Code Wiki Activity

Merge pull request #3992 from dbolack-ab/issue_3448

Browse Source 
Implement suggested fix for 3448
This commit is contained in:
Trevor Buckner
2025-01-17 11:25:08 -05:00
committed by GitHub
parent 4df2a73800 5dbb5499c6
commit 953c612830
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
shared/naturalcrit/markdown.js
View File

@@ -1,3 +1,4 @@
/* eslint-disable max-depth */
/* eslint-disable max-lines */ /* eslint-disable max-lines */
import _ from 'lodash'; import _ from 'lodash';
import { Parser as MathParser } from 'expr-eval'; import { Parser as MathParser } from 'expr-eval';
@@ -680,7 +681,7 @@ function MarkedVariables() {
} }
if(match[8]) { // Inline Definition if(match[8]) { // Inline Definition
const label = match[10] ? match[10].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space const label = match[10] ? match[10].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
let content = match[11] ? match[11].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space let content = match[11] || null;
// In case of nested (), find the correct matching end ) // In case of nested (), find the correct matching end )
let level = 0; let level = 0;
@@ -696,10 +697,8 @@ function MarkedVariables() {
break; break;
} }
} }
if(i > -1) { combinedRegex.lastIndex = combinedRegex.lastIndex - (content.length - i);
combinedRegex.lastIndex = combinedRegex.lastIndex - (content.length - i); content = content.slice(0, i).trim().replace(/\s+/g, ' ');
content = content.slice(0, i).trim().replace(/\s+/g, ' ');
}
varsQueue.push( varsQueue.push(
{ type : 'varDefBlock', { type : 'varDefBlock',

8
tests/markdown/variables.test.js
View File

@@ -402,4 +402,12 @@ describe('Variable names that are subsets of other names', ()=>{
const rendered = Markdown.render(source).trimReturns(); const rendered = Markdown.render(source).trimReturns();
expect(rendered).toBe('<p>14</p>'); expect(rendered).toBe('<p>14</p>');
}); });
});
describe('Regression Tests', ()=>{
it('Don\'t Eat all the parentheticals!', function() {
const source='\n| title 1 | title 2 | title 3 | title 4|\n|-----------|---------|---------|--------|\n|[foo](bar) | Ipsum | ) | ) |\n';
const rendered = Markdown.render(source).trimReturns();
expect(rendered).toBe('<table><thead><tr><th>title 1</th><th>title 2</th><th>title 3</th><th>title 4</th></tr></thead><tbody><tr><td><a href=\"bar\">foo</a></td><td>Ipsum</td><td>)</td><td>)</td></tr></tbody></table>');
});
}); });