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

fix highlighting mnemonic (v 1.7.3)

Browse source 
Change-Id: I10a650b26caf8ce6d2d5d60706d8bd1f5adfd4c4
This commit is contained in:
Pavel Astakhov 2014-08-28 10:20:03 +06:00
parent 152360f8cc
commit 675e892f8d
2 changed files with 44 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CodeMirror.php
View file

@ -15,7 +15,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
die( 'This file is an extension to MediaWiki and thus not a valid entry point.' );
}
const EXT_CODEMIRROR_VERSION = '1.7.2';
const EXT_CODEMIRROR_VERSION = '1.7.3';
// Register this extension on Special:Version
$wgExtensionCredits['parserhook'][] = array(

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

@ -22,6 +22,7 @@ CodeMirror.defineMode('mediawiki', function( /*config, parserConfig*/ ) {
}
var style = [];
var mnemonicStyle = []; // character entity references style
var sol = stream.sol();
var blockType = null;
if ( state.ImInBlock.length > 0 ) {
@ -33,8 +34,11 @@ CodeMirror.defineMode('mediawiki', function( /*config, parserConfig*/ ) {
if ( sol ) {
state.ImInBlock.pop(); //FIXME: it is wrong Link
return null;
} else if ( stream.eatWhile( /[^#\s\u00a0\|\]]/ ) ) { //FIXME '{{' brokes Link, sample [[z{{page]]
} else if ( stream.eatWhile( /[^#\s\u00a0\|\]\&]/ ) ) { //FIXME '{{' brokes Link, sample [[z{{page]]
return 'attribute mw-underline strong';
} else if ( stream.peek() === '&' ) { // check for character entity references
style = ['attribute', 'mw-underline', 'strong'];
mnemonicStyle = ['mw-underline'];
} else if ( stream.eat( '#' ) ) {
state.ImInBlock.push( 'LinkToSection' );
return 'attribute strong';
@ -59,43 +63,55 @@ CodeMirror.defineMode('mediawiki', function( /*config, parserConfig*/ ) {
}
break;
case 'LinkToSection':
state.ImInBlock.pop();
if ( sol ) {
state.ImInBlock.pop();
state.ImInBlock.pop(); //FIXME: it is wrong Link
return null;
}
stream.eatWhile( /[^\|\]]/ ); //FIXME '{{' brokes Link, sample [[z{{page]]
return 'attribute';
if ( stream.eatWhile( /[^\|\]\&]/ ) ) { //FIXME '{{' brokes Link, sample [[z{{page]]
mustEat = false;
style = ['attribute'];
} else if ( stream.peek() === '&' ) {
style = ['attribute'];
} else {
state.ImInBlock.pop();
return 'attribute';
}
break;
case 'LinkText':
stream.eatSpace();
if ( stream.match( /[\s\u00a0]*\]\]/ ) ) {
state.ImInBlock.pop();
if ( !stream.eatSpace() ) {
state.ImInBlock.push( 'LinkTrail' );
}
// if ( !stream.eatSpace() ) {
// state.ImInBlock.push( 'LinkTrail' );
// }
return 'tag bracket';
}
mustEat = false;
stream.eatWhile( /[^\]\s\u00a0]/ );
style.push( 'mw-underline' );
break;
case 'LinkTrail': // FIXME with Language::linkTrail()
state.ImInBlock.pop();
if ( !stream.sol && stream.eatWhile( /[^\s\u00a0>\}\[\]<\{\']/ ) ) { // &
if ( stream.eatWhile( /[^\]\s\u00a0\&]/ ) ) {
mustEat = false;
style.push( 'mw-underline' );
style = ['mw-underline'];
} else if ( stream.peek() === '&' ) {
style = ['mw-underline'];
mnemonicStyle = ['mw-underline'];
}
break;
// case 'LinkTrail': // FIXME with Language::linkTrail()
// state.ImInBlock.pop();
// if ( sol !== true && stream.eatWhile( /[^\s\u00a0>\}\[\]<\{\']/ ) ) { // &
// mustEat = false;
// style.push( 'mw-underline' );
// }
// break;
case 'TemplatePageName':
state.ImInBlock.pop();
if ( stream.eat( '#' ) ) {
state.ImInBlock.push( 'ParserFunctionName' );
return 'keyword strong';
} else {
if ( stream.eatWhile( /[^\s\u00a0\}\|<\{\&]/ ) ) {
state.ImInBlock.push( 'TemplatePageNameContinue' );
return 'attribute mw-underline';
}
}
if ( stream.eatWhile( /[^\s\u00a0\}\|<\{\&]/ ) ) {
state.ImInBlock.push( 'TemplatePageNameContinue' );
return 'attribute mw-underline';
}
break;
case 'TemplatePageNameContinue':
@ -114,6 +130,10 @@ CodeMirror.defineMode('mediawiki', function( /*config, parserConfig*/ ) {
state.ImInBlock.pop();
return 'tag bracket';
}
if ( stream.peek() === '&' ) {
style = ['attribute', 'mw-underline'];
mnemonicStyle = ['mw-underline'];
}
break;
case 'TemplateArgument':
if ( state.bTempArgName && stream.eatWhile( /[^=\}\|<\{\&]/ ) ) {
@ -242,7 +262,8 @@ CodeMirror.defineMode('mediawiki', function( /*config, parserConfig*/ ) {
ok = stream.eatWhile( /[\w\.\-:]/ ) && stream.eat( ';' );
}
if ( ok ) {
return 'atom';
mnemonicStyle.push( 'atom' );
return mnemonicStyle.join(' ');
}
} else if ( state.allowWikimarkup ) {
state.bTempArgName = false;
@ -282,7 +303,7 @@ CodeMirror.defineMode('mediawiki', function( /*config, parserConfig*/ ) {
}
break;
}
stream.eatWhile( /[^\s\u00a0>\}\[\]<\{\'\&]/ );
stream.eatWhile( /[^\s\u00a0>\}\[\]<\{\'\|\&]/ );
if ( state.isBold ) {
style.push( 'strong' );
}