mirror of
https://github.com/DavidAnson/markdownlint.git
synced 2025-09-22 05:40:48 +02:00
Update to version 0.20.1.
This commit is contained in:
parent
f775b9d4fb
commit
7280ea2783
3 changed files with 77 additions and 31 deletions
|
@ -859,6 +859,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for more information.
|
||||||
* 0.20.0 - Add `markdownlint-configure-file` inline comment,
|
* 0.20.0 - Add `markdownlint-configure-file` inline comment,
|
||||||
improve MD005/MD007/MD013/MD018/MD029/MD031/MD034/MD037/MD038/MD039, improve HTML
|
improve MD005/MD007/MD013/MD018/MD029/MD031/MD034/MD037/MD038/MD039, improve HTML
|
||||||
comment handling, update dependencies.
|
comment handling, update dependencies.
|
||||||
|
* 0.20.1 - Fix regression in MD037.
|
||||||
|
|
||||||
[npm-image]: https://img.shields.io/npm/v/markdownlint.svg
|
[npm-image]: https://img.shields.io/npm/v/markdownlint.svg
|
||||||
[npm-url]: https://www.npmjs.com/package/markdownlint
|
[npm-url]: https://www.npmjs.com/package/markdownlint
|
||||||
|
|
|
@ -2702,7 +2702,7 @@ module.exports = {
|
||||||
},{"../helpers":2}],37:[function(require,module,exports){
|
},{"../helpers":2}],37:[function(require,module,exports){
|
||||||
// @ts-check
|
// @ts-check
|
||||||
"use strict";
|
"use strict";
|
||||||
var _a = require("../helpers"), addErrorContext = _a.addErrorContext, forEachLine = _a.forEachLine;
|
var _a = require("../helpers"), addErrorContext = _a.addErrorContext, forEachLine = _a.forEachLine, isBlankLine = _a.isBlankLine;
|
||||||
var lineMetadata = require("./cache").lineMetadata;
|
var lineMetadata = require("./cache").lineMetadata;
|
||||||
var emphasisRe = /(^|[^\\])(?:(\*\*?\*?)|(__?_?))/g;
|
var emphasisRe = /(^|[^\\])(?:(\*\*?\*?)|(__?_?))/g;
|
||||||
var asteriskListItemMarkerRe = /^(\s*)\*(\s+)/;
|
var asteriskListItemMarkerRe = /^(\s*)\*(\s+)/;
|
||||||
|
@ -2713,19 +2713,70 @@ module.exports = {
|
||||||
"description": "Spaces inside emphasis markers",
|
"description": "Spaces inside emphasis markers",
|
||||||
"tags": ["whitespace", "emphasis"],
|
"tags": ["whitespace", "emphasis"],
|
||||||
"function": function MD037(params, onError) {
|
"function": function MD037(params, onError) {
|
||||||
forEachLine(lineMetadata(), function (line, lineIndex, inCode, onFence, inTable, inItem, inBreak) {
|
// eslint-disable-next-line init-declarations
|
||||||
if (inCode || inBreak) {
|
var effectiveEmphasisLength, emphasisIndex, emphasisLength, pendingError;
|
||||||
|
// eslint-disable-next-line jsdoc/require-jsdoc
|
||||||
|
function resetRunTracking() {
|
||||||
|
emphasisIndex = -1;
|
||||||
|
emphasisLength = 0;
|
||||||
|
effectiveEmphasisLength = 0;
|
||||||
|
pendingError = null;
|
||||||
|
}
|
||||||
|
// eslint-disable-next-line jsdoc/require-jsdoc
|
||||||
|
function handleRunEnd(line, lineIndex, contextLength, match, matchIndex) {
|
||||||
|
// Close current run
|
||||||
|
var content = line.substring(emphasisIndex, matchIndex);
|
||||||
|
if (!emphasisLength) {
|
||||||
|
content = content.trimStart();
|
||||||
|
}
|
||||||
|
if (!match) {
|
||||||
|
content = content.trimEnd();
|
||||||
|
}
|
||||||
|
var leftSpace = leftSpaceRe.test(content);
|
||||||
|
var rightSpace = rightSpaceRe.test(content);
|
||||||
|
if (leftSpace || rightSpace) {
|
||||||
|
// Report the violation
|
||||||
|
var contextStart = emphasisIndex - emphasisLength;
|
||||||
|
var contextEnd = matchIndex + contextLength;
|
||||||
|
var context = line.substring(contextStart, contextEnd);
|
||||||
|
var column = contextStart + 1;
|
||||||
|
var length_1 = contextEnd - contextStart;
|
||||||
|
var leftMarker = line.substring(contextStart, emphasisIndex);
|
||||||
|
var rightMarker = match ? (match[2] || match[3]) : "";
|
||||||
|
var fixedText = "" + leftMarker + content.trim() + rightMarker;
|
||||||
|
return [
|
||||||
|
onError,
|
||||||
|
lineIndex + 1,
|
||||||
|
context,
|
||||||
|
leftSpace,
|
||||||
|
rightSpace,
|
||||||
|
[column, length_1],
|
||||||
|
{
|
||||||
|
"editColumn": column,
|
||||||
|
"deleteCount": length_1,
|
||||||
|
"insertText": fixedText
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
// Initialize
|
||||||
|
resetRunTracking();
|
||||||
|
forEachLine(lineMetadata(), function (line, lineIndex, inCode, onFence, inTable, inItem, onBreak) {
|
||||||
|
var onItemStart = (inItem === 1);
|
||||||
|
if (inCode || inTable || onBreak || onItemStart || isBlankLine(line)) {
|
||||||
|
// Emphasis resets when leaving a block
|
||||||
|
resetRunTracking();
|
||||||
|
}
|
||||||
|
if (inCode || onBreak) {
|
||||||
// Emphasis has no meaning here
|
// Emphasis has no meaning here
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (inItem === 1) {
|
if (onItemStart) {
|
||||||
// Trim overlapping '*' list item marker
|
// Trim overlapping '*' list item marker
|
||||||
line = line.replace(asteriskListItemMarkerRe, "$1 $2");
|
line = line.replace(asteriskListItemMarkerRe, "$1 $2");
|
||||||
}
|
}
|
||||||
var match = null;
|
var match = null;
|
||||||
var emphasisIndex = -1;
|
|
||||||
var emphasisLength = 0;
|
|
||||||
var effectiveEmphasisLength = 0;
|
|
||||||
// Match all emphasis-looking runs in the line...
|
// Match all emphasis-looking runs in the line...
|
||||||
while ((match = emphasisRe.exec(line))) {
|
while ((match = emphasisRe.exec(line))) {
|
||||||
var matchIndex = match.index + match[1].length;
|
var matchIndex = match.index + match[1].length;
|
||||||
|
@ -2737,30 +2788,17 @@ module.exports = {
|
||||||
effectiveEmphasisLength = matchLength;
|
effectiveEmphasisLength = matchLength;
|
||||||
}
|
}
|
||||||
else if (matchLength === effectiveEmphasisLength) {
|
else if (matchLength === effectiveEmphasisLength) {
|
||||||
// Close current run
|
// Ending an existing run, report any pending error
|
||||||
var content = line.substring(emphasisIndex, matchIndex);
|
if (pendingError) {
|
||||||
var leftSpace = leftSpaceRe.test(content);
|
addErrorContext.apply(void 0, pendingError);
|
||||||
var rightSpace = rightSpaceRe.test(content);
|
pendingError = null;
|
||||||
if (leftSpace || rightSpace) {
|
}
|
||||||
// Report the violation
|
var error = handleRunEnd(line, lineIndex, effectiveEmphasisLength, match, matchIndex);
|
||||||
var contextStart = emphasisIndex - emphasisLength;
|
if (error) {
|
||||||
var contextEnd = matchIndex + effectiveEmphasisLength;
|
addErrorContext.apply(void 0, error);
|
||||||
var context = line.substring(contextStart, contextEnd);
|
|
||||||
var column = contextStart + 1;
|
|
||||||
var length_1 = contextEnd - contextStart;
|
|
||||||
var leftMarker = line.substring(contextStart, emphasisIndex);
|
|
||||||
var rightMarker = match[2] || match[3];
|
|
||||||
var fixedText = "" + leftMarker + content.trim() + rightMarker;
|
|
||||||
addErrorContext(onError, lineIndex + 1, context, leftSpace, rightSpace, [column, length_1], {
|
|
||||||
"editColumn": column,
|
|
||||||
"deleteCount": length_1,
|
|
||||||
"insertText": fixedText
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
// Reset
|
// Reset
|
||||||
emphasisIndex = -1;
|
resetRunTracking();
|
||||||
emphasisLength = 0;
|
|
||||||
effectiveEmphasisLength = 0;
|
|
||||||
}
|
}
|
||||||
else if (matchLength === 3) {
|
else if (matchLength === 3) {
|
||||||
// Swap internal run length (1->2 or 2->1)
|
// Swap internal run length (1->2 or 2->1)
|
||||||
|
@ -2775,6 +2813,13 @@ module.exports = {
|
||||||
effectiveEmphasisLength += matchLength;
|
effectiveEmphasisLength += matchLength;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (emphasisIndex !== -1) {
|
||||||
|
pendingError = pendingError ||
|
||||||
|
handleRunEnd(line, lineIndex, 0, null, line.length);
|
||||||
|
// Adjust for pending run on new line
|
||||||
|
emphasisIndex = 0;
|
||||||
|
emphasisLength = 0;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -3223,7 +3268,7 @@ module.exports = rules;
|
||||||
},{"../package.json":50,"./md001":5,"./md002":6,"./md003":7,"./md004":8,"./md005":9,"./md006":10,"./md007":11,"./md009":12,"./md010":13,"./md011":14,"./md012":15,"./md013":16,"./md014":17,"./md018":18,"./md019":19,"./md020":20,"./md021":21,"./md022":22,"./md023":23,"./md024":24,"./md025":25,"./md026":26,"./md027":27,"./md028":28,"./md029":29,"./md030":30,"./md031":31,"./md032":32,"./md033":33,"./md034":34,"./md035":35,"./md036":36,"./md037":37,"./md038":38,"./md039":39,"./md040":40,"./md041":41,"./md042":42,"./md043":43,"./md044":44,"./md045":45,"./md046":46,"./md047":47,"./md048":48,"url":59}],50:[function(require,module,exports){
|
},{"../package.json":50,"./md001":5,"./md002":6,"./md003":7,"./md004":8,"./md005":9,"./md006":10,"./md007":11,"./md009":12,"./md010":13,"./md011":14,"./md012":15,"./md013":16,"./md014":17,"./md018":18,"./md019":19,"./md020":20,"./md021":21,"./md022":22,"./md023":23,"./md024":24,"./md025":25,"./md026":26,"./md027":27,"./md028":28,"./md029":29,"./md030":30,"./md031":31,"./md032":32,"./md033":33,"./md034":34,"./md035":35,"./md036":36,"./md037":37,"./md038":38,"./md039":39,"./md040":40,"./md041":41,"./md042":42,"./md043":43,"./md044":44,"./md045":45,"./md046":46,"./md047":47,"./md048":48,"url":59}],50:[function(require,module,exports){
|
||||||
module.exports={
|
module.exports={
|
||||||
"name": "markdownlint",
|
"name": "markdownlint",
|
||||||
"version": "0.20.0",
|
"version": "0.20.1",
|
||||||
"description": "A Node.js style checker and lint tool for Markdown/CommonMark files.",
|
"description": "A Node.js style checker and lint tool for Markdown/CommonMark files.",
|
||||||
"main": "lib/markdownlint.js",
|
"main": "lib/markdownlint.js",
|
||||||
"types": "lib/markdownlint.d.ts",
|
"types": "lib/markdownlint.d.ts",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "markdownlint",
|
"name": "markdownlint",
|
||||||
"version": "0.20.0",
|
"version": "0.20.1",
|
||||||
"description": "A Node.js style checker and lint tool for Markdown/CommonMark files.",
|
"description": "A Node.js style checker and lint tool for Markdown/CommonMark files.",
|
||||||
"main": "lib/markdownlint.js",
|
"main": "lib/markdownlint.js",
|
||||||
"types": "lib/markdownlint.d.ts",
|
"types": "lib/markdownlint.d.ts",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue