Skip to content

Commit 23ad63e

Browse files
authored
fix: handle CRLF in element-newline (#272)
1 parent 4a0ee93 commit 23ad63e

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

packages/eslint-plugin/lib/rules/element-newline.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,14 @@ module.exports = {
246246
* @param {NewlineNode} node
247247
*/
248248
function isNotNewlineEnd(node) {
249-
return node.type !== `Text` || /\n\s*$/.test(node.value) === false;
249+
return node.type !== `Text` || /(\n|\r\n)\s*$/.test(node.value) === false;
250250
}
251251

252252
/**
253253
* @param {NewlineNode} node
254254
*/
255255
function isNotNewlineStart(node) {
256-
return node.type !== `Text` || /^\n/.test(node.value) === false;
256+
return node.type !== `Text` || /^(\n|\r\n)/.test(node.value) === false;
257257
}
258258

259259
/**

packages/eslint-plugin/tests/rules/element-newline.test.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ ruleTester.run("element-newline", rule, {
1414
</html>
1515
`,
1616
},
17+
{
18+
code: "<body>\r\n<div></div>\r\n test\r\n</body>",
19+
},
1720
{
1821
code: "<html>\r\n<body>\r\n</body>\r\n</html>",
1922
},
@@ -57,6 +60,14 @@ ruleTester.run("element-newline", rule, {
5760
},
5861
],
5962
},
63+
{
64+
code: "<div>\r\n<span><a></a></span>\r\n</div>",
65+
options: [
66+
{
67+
skip: ["div"],
68+
},
69+
],
70+
},
6071
{
6172
code: `
6273
<div>

0 commit comments

Comments
 (0)