wikimedia/mediawiki-extensions-CodeMirror
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/CodeMirror synced 2024-11-27 15:40:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Don't detect additional { as part of the template name"

Browse source
This commit is contained in:
jenkins-bot 2023-12-06 05:26:20 +00:00 committed by Gerrit Code Review
parent 3b4975f888 4c92345e6f
commit 64e7054717
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/mode/mediawiki/mediawiki.js
View file

@ -751,7 +751,7 @@
state.stack.push( state.tokenize ); state.stack.push( state.tokenize );
state.tokenize = inVariable; state.tokenize = inVariable;
return makeLocalStyle( 'mw-templatevariable-bracket', state ); return makeLocalStyle( 'mw-templatevariable-bracket', state );
} else if ( stream.match( /^\{[\s\u00a0]*/ ) ) { } else if ( stream.match( /^{(?!{(?!{))[\s\u00a0]*/ ) ) {
if ( stream.peek() === '#' ) { // Parser function if ( stream.peek() === '#' ) { // Parser function
state.nExt++; state.nExt++;
state.stack.push( state.tokenize ); state.stack.push( state.tokenize );

2
resources/mode/mediawiki/tests/qunit/CodeMirror.mediawiki.test.js
View file

@ -83,7 +83,7 @@
{ {
title: 'T292967: table syntax where all | are escaped with the {{!}} parser function', title: 'T292967: table syntax where all | are escaped with the {{!}} parser function',
input: '{{{!}}\n{{!}}-\n{{!}}}', input: '{{{!}}\n{{!}}-\n{{!}}}',
output: '<pre><span><span class="cm-mw-template-ground cm-mw-template-bracket">{{</span><span class="cm-mw-template-ground cm-mw-template-name cm-mw-pagename">{!</span><span class="cm-mw-template-ground cm-mw-template-bracket">}}</span></span></pre><pre><span><span class="cm-mw-ext-ground cm-mw-parserfunction-bracket">{{</span><span class="cm-mw-ext-ground cm-mw-parserfunction-name">!</span><span class="cm-mw-ext-ground cm-mw-parserfunction-bracket">}}</span>-</span></pre><pre><span><span class="cm-mw-ext-ground cm-mw-parserfunction-bracket">{{</span><span class="cm-mw-ext-ground cm-mw-parserfunction-name">!</span><span class="cm-mw-ext-ground cm-mw-parserfunction-bracket">}}</span>}</span></pre>' output: '<pre><span>{<span class="cm-mw-ext-ground cm-mw-parserfunction-bracket">{{</span><span class="cm-mw-ext-ground cm-mw-parserfunction-name">!</span><span class="cm-mw-ext-ground cm-mw-parserfunction-bracket">}}</span></span></pre><pre><span><span class="cm-mw-ext-ground cm-mw-parserfunction-bracket">{{</span><span class="cm-mw-ext-ground cm-mw-parserfunction-name">!</span><span class="cm-mw-ext-ground cm-mw-parserfunction-bracket">}}</span>-</span></pre><pre><span><span class="cm-mw-ext-ground cm-mw-parserfunction-bracket">{{</span><span class="cm-mw-ext-ground cm-mw-parserfunction-name">!</span><span class="cm-mw-ext-ground cm-mw-parserfunction-bracket">}}</span>}</span></pre>'
}, },
{ {
title: 'section headings', title: 'section headings',