honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(compiler): improve error msg for unexpected closing tags (#14747) 

Closes #6652
This commit is contained in:
Dzmitry Shylovich 2017-03-11 00:05:17 +03:00 committed by Chuck Jazdzewski
parent d17d4a3b54
commit 5f9fb911f7
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/compiler/src/ml_parser/parser.ts
View File

@ -305,8 +305,9 @@ class _TreeBuilder {
fullName, endTagToken.sourceSpan, fullName, endTagToken.sourceSpan,
`Void elements do not have end tags "${endTagToken.parts[1]}"`)); `Void elements do not have end tags "${endTagToken.parts[1]}"`));
} else if (!this._popElement(fullName)) { } else if (!this._popElement(fullName)) {
this._errors.push(TreeError.create( const errMsg =
fullName, endTagToken.sourceSpan, `Unexpected closing tag "${endTagToken.parts[1]}"`)); `Unexpected closing tag "${fullName}". It may happen when the tag has already been closed by another tag. For more info see https://www.w3.org/TR/html5/syntax.html#closing-elements-that-have-implied-end-tags`;
this._errors.push(TreeError.create(fullName, endTagToken.sourceSpan, errMsg));
} }
} }

30
packages/compiler/test/ml_parser/html_parser_spec.ts
View File

@ -206,8 +206,16 @@ export function main() {
const errors = parser.parse('<DiV><P></p></dIv>', 'TestComp').errors; const errors = parser.parse('<DiV><P></p></dIv>', 'TestComp').errors;
expect(errors.length).toEqual(2); expect(errors.length).toEqual(2);
expect(humanizeErrors(errors)).toEqual([ expect(humanizeErrors(errors)).toEqual([
['p', 'Unexpected closing tag "p"', '0:8'], [
['dIv', 'Unexpected closing tag "dIv"', '0:12'], 'p',
'Unexpected closing tag "p". It may happen when the tag has already been closed by another tag. For more info see https://www.w3.org/TR/html5/syntax.html#closing-elements-that-have-implied-end-tags',
'0:8'
],
[
'dIv',
'Unexpected closing tag "dIv". It may happen when the tag has already been closed by another tag. For more info see https://www.w3.org/TR/html5/syntax.html#closing-elements-that-have-implied-end-tags',
'0:12'
],
]); ]);
}); });
@ -485,13 +493,21 @@ export function main() {
it('should report unexpected closing tags', () => { it('should report unexpected closing tags', () => {
const errors = parser.parse('<div></p></div>', 'TestComp').errors; const errors = parser.parse('<div></p></div>', 'TestComp').errors;
expect(errors.length).toEqual(1); expect(errors.length).toEqual(1);
expect(humanizeErrors(errors)).toEqual([['p', 'Unexpected closing tag "p"', '0:5']]); expect(humanizeErrors(errors)).toEqual([[
'p',
'Unexpected closing tag "p". It may happen when the tag has already been closed by another tag. For more info see https://www.w3.org/TR/html5/syntax.html#closing-elements-that-have-implied-end-tags',
'0:5'
]]);
}); });
it('should report subsequent open tags without proper close tag', () => { it('should report subsequent open tags without proper close tag', () => {
const errors = parser.parse('<div</div>', 'TestComp').errors; const errors = parser.parse('<div</div>', 'TestComp').errors;
expect(errors.length).toEqual(1); expect(errors.length).toEqual(1);
expect(humanizeErrors(errors)).toEqual([['div', 'Unexpected closing tag "div"', '0:4']]); expect(humanizeErrors(errors)).toEqual([[
'div',
'Unexpected closing tag "div". It may happen when the tag has already been closed by another tag. For more info see https://www.w3.org/TR/html5/syntax.html#closing-elements-that-have-implied-end-tags',
'0:4'
]]);
}); });
it('should report closing tag for void elements', () => { it('should report closing tag for void elements', () => {
@ -523,7 +539,11 @@ export function main() {
expect(errors.length).toEqual(2); expect(errors.length).toEqual(2);
expect(humanizeErrors(errors)).toEqual([ expect(humanizeErrors(errors)).toEqual([
[TokenType.COMMENT_START, 'Unexpected character "e"', '0:3'], [TokenType.COMMENT_START, 'Unexpected character "e"', '0:3'],
['p', 'Unexpected closing tag "p"', '0:14'] [
'p',
'Unexpected closing tag "p". It may happen when the tag has already been closed by another tag. For more info see https://www.w3.org/TR/html5/syntax.html#closing-elements-that-have-implied-end-tags',
'0:14'
]
]); ]);
}); });
}); });