wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-28 16:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tolerate more newlines and spaces in templates, and support templates and

Browse source 
comments in urls.
This commit is contained in:
Gabriel Wicke 2012-03-12 14:31:06 +00:00
parent ae4ab7a39c
commit 3c5fe2523c
Notes: Gabriel Wicke 2012-03-12 14:31:06 +00:00 
https://mediawiki.org/wiki/Special:Code/MediaWiki/113624
1 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
modules/parser/pegTokenizer.pegjs.txt
View file

@ -662,21 +662,25 @@ urlencoded_char = "%" c0:[0-9a-fA-F] c1:[0-9a-fA-F] {
//[^][<>"\\x00-\\x20\\x7F\p{Zs}] //[^][<>"\\x00-\\x20\\x7F\p{Zs}]
no_punctuation_char = [^ :\]\[\n"'<>\x00-\x20\x7f,.&%\u00A0\u1680\u180E\u2000-\u200A\u202F\u205F\u3000] // no punctiation, and '{<' to trigger directives
no_punctuation_char = [^ :\]\[\n"'<>\x00-\x20\x7f,.&%\u00A0\u1680\u180E\u2000-\u200A\u202F\u205F\u3000{]
url url
= proto:url_protocol = proto:url_protocol
addr:( ipv6_address / ipv4_address )? addr:( ipv6_address / ipv4_address )?
rest:( ( !inline_breaks path:( ( !inline_breaks
c:no_punctuation_char c:no_punctuation_char
{ return c } { return c }
) )
/ s:[.:,] !(space / eolf) { return s } / s:[.:,] !(space / eolf) { return s }
/ comment
/ tplarg_or_template
/ htmlentity / htmlentity
/// urlencoded_char / [&%{]
/ [&%] )+ )+
{ {
return proto + addr + rest.join(''); //console.warn( "path: " + pp( flatten_stringlist( [proto + addr].concat( path ) ) ) );
return flatten_string( [proto + addr].concat( path ) );
} }
ipv4_address ipv4_address
@ -710,9 +714,10 @@ template
= "{{" (newline / space)* target:template_param_text = "{{" (newline / space)* target:template_param_text
params:(( newline / space )* "|" params:(( newline / space )* "|"
r:( &"|" { return new KV( '', '') } // empty argument r:( &"|" { return new KV( '', '') } // empty argument
/ newline? p:template_param { return p } / ( newline / space )* p:template_param { return p }
) { return r } ) { return r }
)* )*
( newline / space )*
"}}" { "}}" {
// Insert target as first positional attribute, so that it can be // Insert target as first positional attribute, so that it can be
// generically expanded. The TemplateHandler then needs to shift it out // generically expanded. The TemplateHandler then needs to shift it out
@ -730,7 +735,8 @@ template
tplarg tplarg
= "{{{" = "{{{"
name:template_param_text name:template_param_text
params:( newline? "|" newline? p:template_param { return p })* params:( ( space / newline )* "|" ( space / newline )* p:template_param { return p })*
( space / newline )*
"}}}" { "}}}" {
name = flatten( name ); name = flatten( name );
params.unshift( { k: '', v: name } ); params.unshift( { k: '', v: name } );
@ -741,17 +747,23 @@ tplarg
template_param template_param
= name:template_param_name = name:template_param_name
val:(
s0:space* s0:space*
eq:"="? "="
s1:space* s1:space*
value:template_param_value? value:template_param_value? {
return { s0: s0, s1: s1, value: value };
}
)?
{ {
//console.warn( 'named template_param matched' + pp([name, value ]) ); //console.warn( 'named template_param matched' + pp([name, value ]) );
if ( value !== '' ) { if ( val !== '' ) {
return new KV( name, flatten( value ) ); if ( val.value !== '' ) {
} else if ( eq !== '' ) { return new KV( name, flatten( val.value ) );
} else {
return new KV(flatten( name ), []); return new KV(flatten( name ), []);
}
} else { } else {
return new KV([], flatten(name)); return new KV([], flatten(name));
} }