mirror of
https://github.com/DavidAnson/markdownlint.git
synced 2025-09-21 21:30:47 +02:00
Update MD018/no-missing-space-atx and MD020/no-missing-space-closed-atx to ignore the content of HTML blocks (fixes #1268).
This commit is contained in:
parent
a80387a0a0
commit
6c8d0fdef8
7 changed files with 76 additions and 8 deletions
|
@ -365,7 +365,7 @@ module.exports.filterTokens = filterTokens;
|
||||||
*/
|
*/
|
||||||
function getLineMetadata(params) {
|
function getLineMetadata(params) {
|
||||||
const lineMetadata = params.lines.map(
|
const lineMetadata = params.lines.map(
|
||||||
(line, index) => [ line, index, false, 0, false, false, false ]
|
(line, index) => [ line, index, false, 0, false, false, false, false ]
|
||||||
);
|
);
|
||||||
filterTokens(params, "fence", (token) => {
|
filterTokens(params, "fence", (token) => {
|
||||||
lineMetadata[token.map[0]][3] = 1;
|
lineMetadata[token.map[0]][3] = 1;
|
||||||
|
@ -394,6 +394,11 @@ function getLineMetadata(params) {
|
||||||
filterTokens(params, "hr", (token) => {
|
filterTokens(params, "hr", (token) => {
|
||||||
lineMetadata[token.map[0]][6] = true;
|
lineMetadata[token.map[0]][6] = true;
|
||||||
});
|
});
|
||||||
|
filterTokens(params, "html_block", (token) => {
|
||||||
|
for (let i = token.map[0]; i < token.map[1]; i++) {
|
||||||
|
lineMetadata[i][7] = true;
|
||||||
|
}
|
||||||
|
});
|
||||||
return lineMetadata;
|
return lineMetadata;
|
||||||
}
|
}
|
||||||
module.exports.getLineMetadata = getLineMetadata;
|
module.exports.getLineMetadata = getLineMetadata;
|
||||||
|
@ -407,6 +412,7 @@ module.exports.getLineMetadata = getLineMetadata;
|
||||||
* @param {boolean} inTable Iff in a table.
|
* @param {boolean} inTable Iff in a table.
|
||||||
* @param {boolean} inItem Iff in a list item.
|
* @param {boolean} inItem Iff in a list item.
|
||||||
* @param {boolean} inBreak Iff in semantic break.
|
* @param {boolean} inBreak Iff in semantic break.
|
||||||
|
* @param {boolean} inHtml Iff in HTML block.
|
||||||
* @returns {void}
|
* @returns {void}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -4210,8 +4216,9 @@ module.exports = {
|
||||||
"tags": [ "headings", "atx", "spaces" ],
|
"tags": [ "headings", "atx", "spaces" ],
|
||||||
"parser": "none",
|
"parser": "none",
|
||||||
"function": function MD018(params, onError) {
|
"function": function MD018(params, onError) {
|
||||||
forEachLine(lineMetadata(), (line, lineIndex, inCode) => {
|
forEachLine(lineMetadata(), (line, lineIndex, inCode, inFence, inTable, inItem, inBreak, inHtml) => {
|
||||||
if (!inCode &&
|
if (!inCode &&
|
||||||
|
!inHtml &&
|
||||||
/^#+[^# \t]/.test(line) &&
|
/^#+[^# \t]/.test(line) &&
|
||||||
!/#\s*$/.test(line) &&
|
!/#\s*$/.test(line) &&
|
||||||
!line.startsWith("#️⃣")) {
|
!line.startsWith("#️⃣")) {
|
||||||
|
@ -4353,8 +4360,9 @@ module.exports = {
|
||||||
"tags": [ "headings", "atx_closed", "spaces" ],
|
"tags": [ "headings", "atx_closed", "spaces" ],
|
||||||
"parser": "none",
|
"parser": "none",
|
||||||
"function": function MD020(params, onError) {
|
"function": function MD020(params, onError) {
|
||||||
forEachLine(lineMetadata(), (line, lineIndex, inCode) => {
|
forEachLine(lineMetadata(), (line, lineIndex, inCode, inFence, inTable, inItem, inBreak, inHtml) => {
|
||||||
if (!inCode) {
|
if (!inCode &&
|
||||||
|
!inHtml) {
|
||||||
const match =
|
const match =
|
||||||
/^(#+)([ \t]*)([^#]*?[^#\\])([ \t]*)((?:\\#)?)(#+)(\s*)$/.exec(line);
|
/^(#+)([ \t]*)([^#]*?[^#\\])([ \t]*)((?:\\#)?)(#+)(\s*)$/.exec(line);
|
||||||
if (match) {
|
if (match) {
|
||||||
|
|
|
@ -353,7 +353,7 @@ module.exports.filterTokens = filterTokens;
|
||||||
*/
|
*/
|
||||||
function getLineMetadata(params) {
|
function getLineMetadata(params) {
|
||||||
const lineMetadata = params.lines.map(
|
const lineMetadata = params.lines.map(
|
||||||
(line, index) => [ line, index, false, 0, false, false, false ]
|
(line, index) => [ line, index, false, 0, false, false, false, false ]
|
||||||
);
|
);
|
||||||
filterTokens(params, "fence", (token) => {
|
filterTokens(params, "fence", (token) => {
|
||||||
lineMetadata[token.map[0]][3] = 1;
|
lineMetadata[token.map[0]][3] = 1;
|
||||||
|
@ -382,6 +382,11 @@ function getLineMetadata(params) {
|
||||||
filterTokens(params, "hr", (token) => {
|
filterTokens(params, "hr", (token) => {
|
||||||
lineMetadata[token.map[0]][6] = true;
|
lineMetadata[token.map[0]][6] = true;
|
||||||
});
|
});
|
||||||
|
filterTokens(params, "html_block", (token) => {
|
||||||
|
for (let i = token.map[0]; i < token.map[1]; i++) {
|
||||||
|
lineMetadata[i][7] = true;
|
||||||
|
}
|
||||||
|
});
|
||||||
return lineMetadata;
|
return lineMetadata;
|
||||||
}
|
}
|
||||||
module.exports.getLineMetadata = getLineMetadata;
|
module.exports.getLineMetadata = getLineMetadata;
|
||||||
|
@ -395,6 +400,7 @@ module.exports.getLineMetadata = getLineMetadata;
|
||||||
* @param {boolean} inTable Iff in a table.
|
* @param {boolean} inTable Iff in a table.
|
||||||
* @param {boolean} inItem Iff in a list item.
|
* @param {boolean} inItem Iff in a list item.
|
||||||
* @param {boolean} inBreak Iff in semantic break.
|
* @param {boolean} inBreak Iff in semantic break.
|
||||||
|
* @param {boolean} inHtml Iff in HTML block.
|
||||||
* @returns {void}
|
* @returns {void}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -13,8 +13,9 @@ module.exports = {
|
||||||
"tags": [ "headings", "atx", "spaces" ],
|
"tags": [ "headings", "atx", "spaces" ],
|
||||||
"parser": "none",
|
"parser": "none",
|
||||||
"function": function MD018(params, onError) {
|
"function": function MD018(params, onError) {
|
||||||
forEachLine(lineMetadata(), (line, lineIndex, inCode) => {
|
forEachLine(lineMetadata(), (line, lineIndex, inCode, inFence, inTable, inItem, inBreak, inHtml) => {
|
||||||
if (!inCode &&
|
if (!inCode &&
|
||||||
|
!inHtml &&
|
||||||
/^#+[^# \t]/.test(line) &&
|
/^#+[^# \t]/.test(line) &&
|
||||||
!/#\s*$/.test(line) &&
|
!/#\s*$/.test(line) &&
|
||||||
!line.startsWith("#️⃣")) {
|
!line.startsWith("#️⃣")) {
|
||||||
|
|
|
@ -13,8 +13,9 @@ module.exports = {
|
||||||
"tags": [ "headings", "atx_closed", "spaces" ],
|
"tags": [ "headings", "atx_closed", "spaces" ],
|
||||||
"parser": "none",
|
"parser": "none",
|
||||||
"function": function MD020(params, onError) {
|
"function": function MD020(params, onError) {
|
||||||
forEachLine(lineMetadata(), (line, lineIndex, inCode) => {
|
forEachLine(lineMetadata(), (line, lineIndex, inCode, inFence, inTable, inItem, inBreak, inHtml) => {
|
||||||
if (!inCode) {
|
if (!inCode &&
|
||||||
|
!inHtml) {
|
||||||
const match =
|
const match =
|
||||||
/^(#+)([ \t]*)([^#]*?[^#\\])([ \t]*)((?:\\#)?)(#+)(\s*)$/.exec(line);
|
/^(#+)([ \t]*)([^#]*?[^#\\])([ \t]*)((?:\\#)?)(#+)(\s*)$/.exec(line);
|
||||||
if (match) {
|
if (match) {
|
||||||
|
|
13
test/ignore-html-block.md
Normal file
13
test/ignore-html-block.md
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
# ignore-html-block.md
|
||||||
|
|
||||||
|
<style> {MD033}
|
||||||
|
|
||||||
|
##Heading 1
|
||||||
|
|
||||||
|
## Heading 2
|
||||||
|
|
||||||
|
##Heading 3##
|
||||||
|
|
||||||
|
## Heading 4 ##
|
||||||
|
|
||||||
|
</style>
|
|
@ -19683,6 +19683,45 @@ Generated by [AVA](https://avajs.dev).
|
||||||
`,
|
`,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
## ignore-html-block.md
|
||||||
|
|
||||||
|
> Snapshot 1
|
||||||
|
|
||||||
|
{
|
||||||
|
errors: [
|
||||||
|
{
|
||||||
|
errorContext: null,
|
||||||
|
errorDetail: 'Element: style',
|
||||||
|
errorRange: [
|
||||||
|
1,
|
||||||
|
7,
|
||||||
|
],
|
||||||
|
fixInfo: null,
|
||||||
|
lineNumber: 3,
|
||||||
|
ruleDescription: 'Inline HTML',
|
||||||
|
ruleInformation: 'https://github.com/DavidAnson/markdownlint/blob/v0.0.0/doc/md033.md',
|
||||||
|
ruleNames: [
|
||||||
|
'MD033',
|
||||||
|
'no-inline-html',
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
fixed: `# ignore-html-block.md␊
|
||||||
|
␊
|
||||||
|
<style> {MD033}␊
|
||||||
|
␊
|
||||||
|
##Heading 1␊
|
||||||
|
␊
|
||||||
|
## Heading 2␊
|
||||||
|
␊
|
||||||
|
##Heading 3##␊
|
||||||
|
␊
|
||||||
|
## Heading 4 ##␊
|
||||||
|
␊
|
||||||
|
</style>␊
|
||||||
|
`,
|
||||||
|
}
|
||||||
|
|
||||||
## inconsistent_bullet_indent_same_level.md
|
## inconsistent_bullet_indent_same_level.md
|
||||||
|
|
||||||
> Snapshot 1
|
> Snapshot 1
|
||||||
|
|
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue