fix(aio): handle html docregions that do not end on the same line

This commit is contained in:
Peter Bacon Darwin 2017-02-21 10:17:08 +00:00 committed by Igor Minar
parent 6a9251874b
commit 649bab8ff8
2 changed files with 14 additions and 6 deletions

View File

@ -1,7 +1,7 @@
// These kind of comments are used in HTML // These kind of comments are used in HTML
module.exports = { module.exports = {
regionStartMatcher: /^\s*<!--\s*#docregion\s*(.*)\s*-->\s*$/, regionStartMatcher: /^\s*<!--\s*#docregion\s*(.*?)\s*(?:-->)?\s*$/,
regionEndMatcher: /^\s*<!--\s*#enddocregion\s*(.*)\s*-->\s*$/, regionEndMatcher: /^\s*<!--\s*#enddocregion\s*(.*?)\s*-->\s*$/,
plasterMatcher: /^\s*<!--\s*#docplaster\s*(.*)\s*-->\s*$/, plasterMatcher: /^\s*<!--\s*#docplaster\s*(.*?)\s*-->\s*$/,
createPlasterComment: plaster => `<!-- ${plaster} -->` createPlasterComment: plaster => `<!-- ${plaster} -->`
}; };

View File

@ -33,6 +33,14 @@ describe('html region-matcher', () => {
expect(matches[1]).toEqual(''); expect(matches[1]).toEqual('');
}); });
it('should handle annotations that do not close the comment on the same line', () => {
let matches;
matches = matcher.regionStartMatcher.exec('<!-- #docregion A b c');
expect(matches).not.toBeNull();
expect(matches[1]).toEqual('A b c');
});
it('should match plaster annotations', () => { it('should match plaster annotations', () => {
let matches; let matches;