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

Merge branch 'ciwchris-master' (fixes #12).

Browse source
This commit is contained in:
David Anson 2016-02-24 21:13:07 -08:00
commit dbf909b184
5 changed files with 37 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
doc/Rules.md
View file

@ -59,7 +59,8 @@ Tags: headers
Aliases: header-style Aliases: header-style
Parameters: style ("consistent", "atx", "atx_closed", "setext", "setext_with_atx"; default "consistent") Parameters: style ("consistent", "atx", "atx_closed", "setext",
"setext_with_atx", "setext_with_atx_closed"; default "consistent")
This rule is triggered when different header styles (atx, setext, and 'closed' This rule is triggered when different header styles (atx, setext, and 'closed'
atx) are used in the same document: atx) are used in the same document:
@ -77,8 +78,8 @@ Be consistent with the style of header used in a document:
## ATX style H2 ## ATX style H2
The setext_with_atx doc style allows atx-style headers of level 3 or more in The setext_with_atx and settext_with_atx_closed doc styles allow atx-style
documents with setext style headers: headers of level 3 or more in documents with setext style headers:
Setext style H1 Setext style H1
=============== ===============
@ -89,8 +90,8 @@ documents with setext style headers:
### ATX style H3 ### ATX style H3
Note: the configured header style can be a specific style to use (atx, Note: the configured header style can be a specific style to use (atx,
atx_closed, setext, setext_with_atx), or simply require that the usage be atx_closed, setext, setext_with_atx, setext_with_atx_closed), or simply require
consistent within the document. that the usage be consistent within the document.
## MD004 - Unordered list style ## MD004 - Unordered list style

17
lib/rules.js
View file

@ -196,12 +196,21 @@ module.exports = [
if (style === "consistent") { if (style === "consistent") {
style = styleForToken; style = styleForToken;
} }
if ((styleForToken !== style) && if (styleForToken !== style) {
!((style === "setext_with_atx") && var h12 = /h[12]/.test(token.tag);
(/h[12]/.test(token.tag) && (styleForToken === "setext")) || var hOther = /h[^12]/.test(token.tag);
(/h[^12]/.test(token.tag) && (styleForToken === "atx")))) { var setextWithAtx =
(style === "setext_with_atx") &&
((h12 && (styleForToken === "setext")) ||
(hOther && (styleForToken === "atx")));
var setextWithAtxClosed =
(style === "setext_with_atx_closed") &&
((h12 && (styleForToken === "setext")) ||
(hOther && (styleForToken === "atx_closed")));
if (!setextWithAtx && !setextWithAtxClosed) {
errors.push(token.lineNumber); errors.push(token.lineNumber);
} }
}
}); });
} }
}, },

2
test/headers_good_setext_with_atx.md
View file

@ -5,3 +5,5 @@ Header 2
-------- --------
### Header 3 ### Header 3
#### Header 4 {MD003} ####

6
test/headers_good_setext_with_atx_closed.json Normal file
View file

@ -0,0 +1,6 @@
{
"default": true,
"MD003": {
"style": "setext_with_atx_closed"
}
}

9
test/headers_good_setext_with_atx_closed.md Normal file
View file

@ -0,0 +1,9 @@
Header 1
========
Header 2
--------
### Header 3 ###
#### Header 4 {MD003}