Refactor MD049/emphasis-style and MD050/strong-style slightly to simplify.

This commit is contained in:
David Anson 2023-05-25 02:50:56 +00:00
parent d5f108b35e
commit a4a38ec9d2
2 changed files with 64 additions and 52 deletions

View file

@ -6092,7 +6092,8 @@ var _require = __webpack_require__(/*! ../helpers */ "../helpers/helpers.js"),
forEachInlineChild = _require.forEachInlineChild, forEachInlineChild = _require.forEachInlineChild,
getNextChildToken = _require.getNextChildToken, getNextChildToken = _require.getNextChildToken,
getRangeAndFixInfoIfFound = _require.getRangeAndFixInfoIfFound; getRangeAndFixInfoIfFound = _require.getRangeAndFixInfoIfFound;
var impl = function impl(params, onError, tagPrefix, asterisk, underline, style) { var impl = function impl(params, onError, tagPrefix, asterisk, underline) {
var style = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : "consistent";
var lastLineNumber = -1; var lastLineNumber = -1;
var instances = new Map(); var instances = new Map();
forEachInlineChild(params, "".concat(tagPrefix, "_open"), function (token, parent) { forEachInlineChild(params, "".concat(tagPrefix, "_open"), function (token, parent) {
@ -6118,7 +6119,7 @@ var impl = function impl(params, onError, tagPrefix, asterisk, underline, style)
instances.set(expected, instance); instances.set(expected, instance);
rangeAndFixInfo = getRangeAndFixInfoIfFound(params.lines, lineNumber - 1, actual, expected, instance); rangeAndFixInfo = getRangeAndFixInfoIfFound(params.lines, lineNumber - 1, actual, expected, instance);
} }
addError(onError, lineNumber, "Expected: ".concat(style, "; Actual: ").concat(markupStyle), null, rangeAndFixInfo.range, rangeAndFixInfo.fixInfo); addError(onError, lineNumber, "Expected: ".concat(style, "; Actual: ").concat(markupStyle), undefined, rangeAndFixInfo.range, rangeAndFixInfo.fixInfo);
} }
}); });
}; };
@ -6127,16 +6128,14 @@ module.exports = [{
"description": "Emphasis style should be consistent", "description": "Emphasis style should be consistent",
"tags": ["emphasis"], "tags": ["emphasis"],
"function": function MD049(params, onError) { "function": function MD049(params, onError) {
var style = String(params.config.style || "consistent"); return impl(params, onError, "em", "*", "_", params.config.style || undefined);
return impl(params, onError, "em", "*", "_", style);
} }
}, { }, {
"names": ["MD050", "strong-style"], "names": ["MD050", "strong-style"],
"description": "Strong style should be consistent", "description": "Strong style should be consistent",
"tags": ["emphasis"], "tags": ["emphasis"],
"function": function MD050(params, onError) { "function": function MD050(params, onError) {
var style = String(params.config.style || "consistent"); return impl(params, onError, "strong", "**", "__", params.config.style || undefined);
return impl(params, onError, "strong", "**", "__", style);
} }
}]; }];

View file

@ -5,7 +5,8 @@
const { addError, emphasisOrStrongStyleFor, forEachInlineChild, const { addError, emphasisOrStrongStyleFor, forEachInlineChild,
getNextChildToken, getRangeAndFixInfoIfFound } = require("../helpers"); getNextChildToken, getRangeAndFixInfoIfFound } = require("../helpers");
const impl = (params, onError, tagPrefix, asterisk, underline, style) => { const impl =
(params, onError, tagPrefix, asterisk, underline, style = "consistent") => {
let lastLineNumber = -1; let lastLineNumber = -1;
const instances = new Map(); const instances = new Map();
forEachInlineChild(params, `${tagPrefix}_open`, (token, parent) => { forEachInlineChild(params, `${tagPrefix}_open`, (token, parent) => {
@ -43,13 +44,13 @@ const impl = (params, onError, tagPrefix, asterisk, underline, style) => {
onError, onError,
lineNumber, lineNumber,
`Expected: ${style}; Actual: ${markupStyle}`, `Expected: ${style}; Actual: ${markupStyle}`,
null, undefined,
rangeAndFixInfo.range, rangeAndFixInfo.range,
rangeAndFixInfo.fixInfo rangeAndFixInfo.fixInfo
); );
} }
}); });
}; };
module.exports = [ module.exports = [
{ {
@ -57,8 +58,14 @@ module.exports = [
"description": "Emphasis style should be consistent", "description": "Emphasis style should be consistent",
"tags": [ "emphasis" ], "tags": [ "emphasis" ],
"function": function MD049(params, onError) { "function": function MD049(params, onError) {
const style = String(params.config.style || "consistent"); return impl(
return impl(params, onError, "em", "*", "_", style); params,
onError,
"em",
"*",
"_",
params.config.style || undefined
);
} }
}, },
{ {
@ -66,8 +73,14 @@ module.exports = [
"description": "Strong style should be consistent", "description": "Strong style should be consistent",
"tags": [ "emphasis" ], "tags": [ "emphasis" ],
"function": function MD050(params, onError) { "function": function MD050(params, onError) {
const style = String(params.config.style || "consistent"); return impl(
return impl(params, onError, "strong", "**", "__", style); params,
onError,
"strong",
"**",
"__",
params.config.style || undefined
);
} }
} }
]; ];