Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(tag-pair) point tag-pair to correct line and column number #1413

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/core/rules/tag-pair.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export default {
stack.push({
tagName: tagName,
line: event.line,
col: event.col,
raw: event.raw,
})
}
Expand Down Expand Up @@ -46,8 +47,8 @@ export default {
)} ], start tag match failed [ ${lastEvent.raw} ] on line ${
lastEvent.line
}.`,
event.line,
event.col,
lastEvent.line || event.line,
lastEvent.col || event.col,
this,
event.raw
)
Expand Down
13 changes: 12 additions & 1 deletion test/rules/tag-pair.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ describe(`Rules: ${ruleId}`, () => {
expect(messages.length).toBe(2)
expect(messages[0].rule.id).toBe(ruleId)
expect(messages[0].line).toBe(1)
expect(messages[0].col).toBe(9)
expect(messages[0].col).toBe(5)
expect(messages[1].rule.id).toBe(ruleId)
expect(messages[1].line).toBe(1)
expect(messages[1].col).toBe(20)
Expand All @@ -24,6 +24,17 @@ describe(`Rules: ${ruleId}`, () => {
expect(messages[0].col).toBe(9)
})

it('No end tag should result in an error with correct line number and column of the start tag', () => {
const code = '<div>\r\n <h1>\r\n <p>aaa</p>\r\n</div>'
const messages = HTMLHint.verify(code, ruleOptions)
expect(messages.length).toBe(1)
expect(messages[0].rule.id).toBe(ruleId)
expect(messages[0].line).not.toBe(4)
expect(messages[0].col).not.toBe(1)
expect(messages[0].line).toBe(2)
expect(messages[0].col).toBe(3)
})

it('No start tag should result in an error', () => {
const code = '</div>'
const messages = HTMLHint.verify(code, ruleOptions)
Expand Down
Loading