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

fix: 全面改用环视进行匹配，以免“吃掉”回车，影响下一个匹配 

fix: html 标签中的属性匹配允许空格
This commit is contained in:
Zhicheng Wang 2018-03-07 10:43:12 +08:00
parent 1c028aee24
commit 076cd7940b
2 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
aio/tools/translator/utils.spec.ts
View File

@ -138,6 +138,19 @@ def
`); `);
}); });
it('拆解 code-example', function () {
const lines = normalizeLines(`
<code-example language="sh" class="code-shell">
ng generate directive highlight
`);
expect(lines).eql(`
<code-example language="sh" class="code-shell">
ng generate directive highlight
`);
});
it('拆解 @a 标记', function () { it('拆解 @a 标记', function () {
const lines = normalizeLines(` const lines = normalizeLines(`
a a
@ -241,19 +254,19 @@ def
<li> <li>
<a href="#">a</a> <a href="#">a</a>
</li> </li>
<li> <li>
<a href="#">b</a> <a href="#">b</a>
</li> </li>
<li> <li>
<a href="#">c</a> <a href="#">c</a>
</li> </li>

47
aio/tools/translator/utils.ts
View File

@ -50,34 +50,35 @@ export function normalizeLines(text: string): string {
// 列表、标题等自带换行含义的markdown // 列表、标题等自带换行含义的markdown
const blockElementPattern = /(?=\n *(\d+\.|-|\*) )\n/g; const blockElementPattern = /(?=\n *(\d+\.|-|\*) )\n/g;
text = text.replace(blockElementPattern, '\n\n'); text = text.replace(blockElementPattern, '\n\n');
const hxPattern = /(\n *#.*)\n/g; const hxPattern = /(\n *# .*)(?=\n)/g;
text = text.replace(hxPattern, '\n$1\n\n'); text = text.replace(hxPattern, '\n$1\n');
const leadHxPattern = /^( *#.*)\n/g; const oneLinePairedTagPattern = /\n( *)<(p|div|h\d+|a|code-example)( ?[^>\n]*)>([^<\n]*)<\/\2>( *)(?=\n)/g;
text = text.replace(leadHxPattern, '$1\n\n'); text = text.replace(oneLinePairedTagPattern, '\n\n$1<$2$3>$4</$2>$5\n');
const oneLinePairedTagPattern = /\n( *)<(p|code-example|div|h\d+|a)( ?[^> \n]*)>([^<\n]*)<\/\2>( *)\n/g; const oneLineThTdTagPattern = /\n( *)<(th|td|li)( ?[^>\n]*)>(.*)<\/\2>( *)(?=\n)/g;
text = text.replace(oneLinePairedTagPattern, '\n\n$1<$2$3>$4</$2>$5\n\n'); text = text.replace(oneLineThTdTagPattern, '\n\n$1<$2$3>\n\n$1 $4\n\n$1</$2>$5\n');
const oneLineThTdTagPattern = /\n( *)<(th|td|li)( ?[^> \n]*)>(.*)<\/\2>( *)/g; const oneLineCommentPattern = /\n( *)(<!--.*-->)( *)(?=\n)/g;
text = text.replace(oneLineThTdTagPattern, '\n\n$1<$2$3>\n\n$1 $4\n\n$1</$2>$5\n\n'); text = text.replace(oneLineCommentPattern, '\n\n$1$2$3\n');
const oneLineCommentPattern = /\n( *)(<!--.*-->)( *)\n/g; const oneLineBrTagPattern = /\n( *)(<br class="clear">)( *)(?=\n)/g;
text = text.replace(oneLineCommentPattern, '\n\n$1$2$3\n\n'); text = text.replace(oneLineBrTagPattern, '\n\n$1$2$3\n');
const oneLineBrTagPattern = /\n( *)(<br class="clear">)( *)\n/g; const atTagCommentPattern = /\n( *)({@a.*})( *)(?=\n)/g;
text = text.replace(oneLineBrTagPattern, '\n\n$1$2$3\n\n'); text = text.replace(atTagCommentPattern, '\n\n$1$2$3\n');
const atTagCommentPattern = /\n( *)({@a.*})( *)\n/g; const oneLineClosedTagPattern = /\n( *)<(hr|p)(\/?)>( *)(?=\n)/g;
text = text.replace(atTagCommentPattern, '\n\n$1$2$3\n\n'); text = text.replace(oneLineClosedTagPattern, '\n\n$1<$2$3>$4\n');
const oneLineClosedTagPattern = /\n( *)<(hr|p)(\/?)>( *)\n/g; const multiLinePairedTagPattern = /\n( *)<(header|p)( *[^>\n]*)>\n*(.*?)\n*( *)<\/\2>( *)(?=\n)/g;
text = text.replace(oneLineClosedTagPattern, '\n\n$1<$2$3>$4\n\n'); text = text.replace(multiLinePairedTagPattern, '\n\n$1<$2$3>\n\n$4\n\n$5</$2>$6\n');
const multiLinePairedTagPattern = /\n( *)<(header|p)( *[^> \n]*)>\n*(.*?)\n*( *)<\/\2>( *)\n/g;
text = text.replace(multiLinePairedTagPattern, '\n\n$1<$2$3>\n\n$1 $4\n\n$1</$2>$6\n\n');
const blockTagPattern = /\n( *)<(\/?)(td|th|div)( *[^> \n]*)>( *)\n/g; const blockTagPattern = /\n( *)<(\/?)(td|th|div|code-example)( *[^>\n]*)>( *)(?=\n)/g;
text = text.replace(blockTagPattern, '\n\n$1<$2$3$4>$5\n\n'); text = text.replace(blockTagPattern, '\n\n$1<$2$3$4>$5\n');
const multiLineCodePattern = /\n( *)```(\w*)( *)\n/g; const multiLineCodePattern = /\n( *)```(\w*)( *)(?=\n)/g;
text = text.replace(multiLineCodePattern, '\n\n$1```$2$3\n\n'); text = text.replace(multiLineCodePattern, '\n\n$1```$2$3\n');
const multipleBlankLinePattern = /\n\s*\n+/g; const multipleBlankLinePattern = /\n\s*\n+/g;
text = text.replace(multipleBlankLinePattern, '\n\n'); text = text.replace(multipleBlankLinePattern, '\n\n');
return text.replace(/^\n+/, '\n').replace(/\n+$/, '\n');
text = text.replace(/^\n+/, '\n').replace(/\n+$/, '\n');
return text;
} }
export function indentOf(line): number { export function indentOf(line): number {