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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
aio/transforms/examples-package/services/region-matchers/html.js
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} -->`
}; };

14
aio/transforms/examples-package/services/region-matchers/html.spec.js
View File

@ -6,7 +6,7 @@ describe('html region-matcher', () => {
matches = matcher.regionStartMatcher.exec('<!-- #docregion A b c -->'); matches = matcher.regionStartMatcher.exec('<!-- #docregion A b c -->');
expect(matches).not.toBeNull(); expect(matches).not.toBeNull();
expect(matches[1]).toEqual('A b c '); expect(matches[1]).toEqual('A b c');
matches = matcher.regionStartMatcher.exec('<!--#docregion A b c-->'); matches = matcher.regionStartMatcher.exec('<!--#docregion A b c-->');
expect(matches).not.toBeNull(); expect(matches).not.toBeNull();
@ -22,7 +22,7 @@ describe('html region-matcher', () => {
matches = matcher.regionEndMatcher.exec('<!-- #enddocregion A b c -->'); matches = matcher.regionEndMatcher.exec('<!-- #enddocregion A b c -->');
expect(matches).not.toBeNull(); expect(matches).not.toBeNull();
expect(matches[1]).toEqual('A b c '); expect(matches[1]).toEqual('A b c');
matches = matcher.regionEndMatcher.exec('<!--#enddocregion A b c-->'); matches = matcher.regionEndMatcher.exec('<!--#enddocregion A b c-->');
expect(matches).not.toBeNull(); expect(matches).not.toBeNull();
@ -33,12 +33,20 @@ 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;
matches = matcher.plasterMatcher.exec('<!-- #docplaster A b c -->'); matches = matcher.plasterMatcher.exec('<!-- #docplaster A b c -->');
expect(matches).not.toBeNull(); expect(matches).not.toBeNull();
expect(matches[1]).toEqual('A b c '); expect(matches[1]).toEqual('A b c');
matches = matcher.plasterMatcher.exec('<!--#docplaster A b c-->'); matches = matcher.plasterMatcher.exec('<!--#docplaster A b c-->');
expect(matches).not.toBeNull(); expect(matches).not.toBeNull();