Andreas/markdownlint
1
0
Fork 0
mirror of https://github.com/DavidAnson/markdownlint.git synced 2025-12-16 22:10:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update MD034/no-bare-urls to report multiple instances on the same line.

Browse source
This commit is contained in:
David Anson 2019-09-22 21:31:02 -07:00
parent a75f1ecf2a
commit 737126cf93
5 changed files with 37 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
helpers/helpers.js
View file

@ -21,7 +21,7 @@ const inlineCommentRe =
module.exports.inlineCommentRe = inlineCommentRe;
// Regular expressions for range matching
module.exports.bareUrlRe = /(?:http|ftp)s?:\/\/[^\s]*/i;
module.exports.bareUrlRe = /(?:http|ftp)s?:\/\/[^\s]*/ig;
module.exports.listItemMarkerRe = /^[\s>]*(?:[*+-]|\d+[.)])\s+/;
module.exports.orderedListItemMarkerRe = /^[\s>]*0*(\d+)[.)]/;

45
lib/md034.js
View file

@ -18,28 +18,29 @@ module.exports = {
inLink = true;
} else if (type === "link_close") {
inLink = false;
} else if ((type === "text") && !inLink &&
(match = bareUrlRe.exec(content))) {
const [ bareUrl ] = match;
const index = line.indexOf(content);
const range = (index === -1) ? null : [
line.indexOf(content) + match.index + 1,
bareUrl.length
];
const fixInfo = range ? {
"editColumn": range[0],
"deleteCount": range[1],
"insertText": `<${bareUrl}>`
} : null;
addErrorContext(
onError,
lineNumber,
bareUrl,
null,
null,
range,
fixInfo
);
} else if ((type === "text") && !inLink) {
while ((match = bareUrlRe.exec(content)) !== null) {
const [ bareUrl ] = match;
const index = line.indexOf(content);
const range = (index === -1) ? null : [
line.indexOf(content) + match.index + 1,
bareUrl.length
];
const fixInfo = range ? {
"editColumn": range[0],
"deleteCount": range[1],
"insertText": `<${bareUrl}>`
} : null;
addErrorContext(
onError,
lineNumber,
bareUrl,
null,
null,
range,
fixInfo
);
}
}
});
});

2
test/detailed-results-links.md
View file

@ -24,3 +24,5 @@ Code https://example.com/code?type=fence code
Text <https://example.com/same> more text https://example.com/same still more text <https://example.com/same> done
Text <https://example.com/same> more \* text https://example.com/same more \[ text <https://example.com/same> done
Text https://example.com/first more text https://example.com/second still more text https://example.com/third done

2
test/detailed-results-links.md.fixed
View file

@ -24,3 +24,5 @@ Code https://example.com/code?type=fence code
Text <https://example.com/same> more text <https://example.com/same> still more text <https://example.com/same> done
Text <https://example.com/same> more \* text https://example.com/same more \[ text <https://example.com/same> done
Text <https://example.com/first> more text <https://example.com/second> still more text <https://example.com/third> done

9
test/detailed-results-links.results.json
View file

@ -88,5 +88,14 @@
"errorDetail": null,
"errorContext": "https://example.com/same",
"errorRange": null
},
{
"lineNumber": 28,
"ruleNames": [ "MD034", "no-bare-urls" ],
"ruleDescription": "Bare URL used",
"ruleInformation": "https://github.com/DavidAnson/markdownlint/blob/v0.0.0/doc/Rules.md#md034",
"errorDetail": null,
"errorContext": "https://example.com/first",
"errorRange": [ 6, 25 ]
}
]