diff --git a/lib/rules/linebreak-style.js b/lib/rules/linebreak-style.js index 078eaf2cd26..b3b393ead77 100644 --- a/lib/rules/linebreak-style.js +++ b/lib/rules/linebreak-style.js @@ -86,8 +86,14 @@ module.exports = { context.report({ node, loc: { - line: i, - column: sourceCode.lines[i - 1].length + start: { + line: i, + column: sourceCode.lines[i - 1].length + }, + end: { + line: i + 1, + column: 0 + } }, messageId: expectedLF ? "expectedLF" : "expectedCRLF", fix: createFix(range, expectedLFChars) diff --git a/tests/lib/rules/linebreak-style.js b/tests/lib/rules/linebreak-style.js index 7603288d8fa..60f247d39cb 100644 --- a/tests/lib/rules/linebreak-style.js +++ b/tests/lib/rules/linebreak-style.js @@ -46,6 +46,8 @@ ruleTester.run("linebreak-style", rule, { errors: [{ line: 1, column: 13, + endLine: 2, + endColumn: 1, messageId: "expectedLF" }] }, @@ -56,6 +58,8 @@ ruleTester.run("linebreak-style", rule, { errors: [{ line: 1, column: 13, + endLine: 2, + endColumn: 1, messageId: "expectedLF" }] }, @@ -66,6 +70,8 @@ ruleTester.run("linebreak-style", rule, { errors: [{ line: 1, column: 13, + endLine: 2, + endColumn: 1, messageId: "expectedCRLF" }] }, @@ -75,11 +81,15 @@ ruleTester.run("linebreak-style", rule, { errors: [{ line: 4, column: 24, + endLine: 5, + endColumn: 1, messageId: "expectedLF" }, { line: 6, column: 3, + endLine: 7, + endColumn: 1, messageId: "expectedLF" }] }, @@ -90,16 +100,46 @@ ruleTester.run("linebreak-style", rule, { errors: [{ line: 3, column: 1, + endLine: 4, + endColumn: 1, messageId: "expectedCRLF" }, { line: 5, column: 1, + endLine: 6, + endColumn: 1, messageId: "expectedCRLF" }, { line: 6, column: 17, + endLine: 7, + endColumn: 1, + messageId: "expectedCRLF" + }] + }, + { + code: "\r\n", + output: "\n", + options: ["unix"], + errors: [{ + line: 1, + column: 1, + endLine: 2, + endColumn: 1, + messageId: "expectedLF" + }] + }, + { + code: "\n", + output: "\r\n", + options: ["windows"], + errors: [{ + line: 1, + column: 1, + endLine: 2, + endColumn: 1, messageId: "expectedCRLF" }] }