Skip to content

Commit

Permalink
Fix multiple error on one line (#49)
Browse files Browse the repository at this point in the history
  • Loading branch information
fa93hws committed Nov 27, 2019
1 parent 434ad23 commit 41250b8
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 3 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-snapshot-test",
"version": "2.0.1",
"version": "3.0.0",
"description": "Provide snapshot test for eslint rule",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
Expand Down Expand Up @@ -39,7 +39,7 @@
"typescript": "^3.7.2"
},
"peerDependencies": {
"eslint": ">6.0.0"
"eslint": ">5.0.0"
},
"dependencies": {
"lodash.merge": "^4.6.2"
Expand Down
2 changes: 1 addition & 1 deletion src/mark-result.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function markErrorOnCode(
let markedIterIdx = 0;
for (let i = 0; i < codeLines.length; i += 1) {
markedCodes.push(codeLines[i]);
if (
while (
markedIterIdx < markedResult.length &&
i === markedResult[markedIterIdx].afterLine
) {
Expand Down
39 changes: 39 additions & 0 deletions src/tests/mark-result.tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -200,4 +200,43 @@ describe('markResult', () => {
'~~~~~~~~~~ [message]',
]);
});

it('generates for multiple errors on the same line', () => {
const codeLines = createLines(3);
const lintResult: Linter.LintMessage[] = [
createLintMessage({ line: 1, endLine: 1, column: 3, message: 'error0' }),
createLintMessage({
line: 1,
endLine: 3,
column: 4,
endColumn: 6,
message: 'error1',
}),
createLintMessage({
line: 1,
endLine: 2,
column: 2,
endColumn: 4,
message: 'error2',
}),
];
const positionHelper = new PositionHelper(codeLines);
const markedResult = markResult({
codeLines,
lintResult,
positionHelper,
});
expect(markedResult.split(EOL)).toEqual([
'',
codeLines[0],
' ~~~~~~~~ [error0]',
' ~~~~~~~ [error1]',
' ~~~~~~~~~ [error2]',
codeLines[1],
'~~~~~~~~~~ [error1]',
'~~~ [error2]',
codeLines[2],
'~~~~~ [error1]',
]);
});
});

0 comments on commit 41250b8

Please sign in to comment.