wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-27 12:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable preformatted text from indents in template args

Browse source 
Change-Id: I84144d3fab6541ed264d9b092806c8bf9de6e8b2
This commit is contained in:
Gabriel Wicke 2012-04-27 10:44:35 +02:00
parent f188772259
commit 1d70e7b81c
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/parser/ext.core.LinkHandler.js
View file

@ -328,7 +328,8 @@ ExternalLinkHandler.prototype.rank = 1.15;
ExternalLinkHandler.prototype._imageExtensions = {
'jpg': true,
'png': true,
'gif': true
'gif': true,
'svg': true
};
ExternalLinkHandler.prototype._isImageLink = function ( href ) {

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

@ -520,7 +520,7 @@ block_line
) {
return st.concat(r);
}
/ pre_indent
/ ! { return stops.counters.nopre } pre_indent
/ pre
/*
@ -846,14 +846,14 @@ tplarg_or_template
)
template
= "{{" (newline / space)*
target:template_name
params:(( newline / space )* "|"
r:( (newline / space )* &"|" { return new KV( '', '') } // empty argument
= "{{" nl_comment_space*
target:template_param_value
params:(nl_comment_space* "|"
r:( nl_comment_space* &"|" { return new KV( '', '') } // empty argument
/ p:template_param { return p }
) { return r }
)*
( newline / space )*
nl_comment_space*
"}}" {
// Insert target as first positional attribute, so that it can be
// generically expanded. The TemplateHandler then needs to shift it out
@ -871,15 +871,15 @@ template
tplarg
= "{{{"
name:template_name?
params:( ( space / newline )*
'|' ( space / newline )*
name:template_param_value?
params:( nl_comment_space*
'|' nl_comment_space*
r:(
&'}}' { return new KV( '', '') }
/ p:template_param { return p }
) { return r }
)*
( space / newline )*
nl_comment_space*
"}}}" {
name = flatten( name );
params.unshift( { k: '', v: name } );
@ -918,8 +918,6 @@ template_param
/ & [|}] { return new KV([], []); }
template_name = template_param_value
// FIXME: handle template args and templates in key! (or even parser functions?)
template_param_name
= & { return stops.push( 'equal', true ) }
@ -934,14 +932,15 @@ template_param_name
//= h:( !"}}" x:([^=|\n]) { return x } )* { return h.join(''); }
template_param_value
= & { return stops.push( 'equal', false ) }
= & { stops.inc( 'nopre' ); return stops.push( 'equal', false ) }
tpt:template_param_text
{
stops.dec( 'nopre' );
stops.pop( 'equal' );
//console.warn( 'template param value matched: ' + pp( tpt ) );
return tpt;
}
/ & { return stops.pop( 'equal' ) }
/ & { stops.dec( 'nopre' ); return stops.pop( 'equal' ) }
template_param_text
= & { /*console.warn( 'tpt: ' +
@ -1881,6 +1880,8 @@ sol
return nl.concat(cn, niToken);
}
nl_comment_space = newline / comment / space
/**
* noinclude / includeonly / onlyinclude productions. These are normally
* handled by the generic_tag production, except where generic tags are not