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

add highlighting extension tags (v 1.11.0)

Browse source 
* fix some bugs...

Change-Id: Icf7eb836c6fbe3a686d67355064f57a6199d6b22
This commit is contained in:
Pavel Astakhov 2014-09-03 11:04:56 +06:00
parent 691ed8bec2
commit b9f40490f3
4 changed files with 67 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CodeMirror.hooks.php
View file

@ -18,11 +18,12 @@ class CodeMirrorHooks {
$wgParser->firstCallInit();
}
self::$globalVariableScript['FunctionSynonyms'] = $wgParser->mFunctionSynonyms;
self::$globalVariableScript['Tags'] = $wgParser->getTags();
$output->addModules( 'ext.CodeMirror' );
return true;
}
public static function onMakeGlobalVariablesScript( array &$vars, OutputPage $out ) {
public static function onMakeGlobalVariablesScript( array &$vars ) {
foreach ( self::$globalVariableScript as $key=> $value ) {
$vars["extCodeMirror$key"] = $value;
}

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.10.0';
const EXT_CODEMIRROR_VERSION = '1.11.0';
// Register this extension on Special:Version
$wgExtensionCredits['parserhook'][] = array(

1
resources/ext.CodeMirror.js
View file

@ -3,6 +3,7 @@ jQuery( document ).ready( function ( $ ) {
var textbox1 = $( '#wpTextbox1' );
var codeMirror = CodeMirror.fromTextArea( textbox1[0], {
mwextFunctionSynonyms: mw.config.get( 'extCodeMirrorFunctionSynonyms' ),
mwextTags: mw.config.get( 'extCodeMirrorTags' ),
styleActiveLine: true,
//lineNumbers: true,
lineWrapping: true,

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

@ -12,7 +12,7 @@
CodeMirror.defineMode('mediawiki', function( config/*, parserConfig */ ) {
var tagName = false;
var isTagNameClear = false;
var mustEat = true;
function inWikitext( stream, state ) {
@ -24,7 +24,7 @@ CodeMirror.defineMode('mediawiki', function( config/*, parserConfig */ ) {
var style = [];
var mnemonicStyle = []; // character entity references style
var sol = stream.sol();
var blockType = null;
var blockType = null, tmp, re, mt;
if ( state.ImInBlock.length > 0 ) {
blockType = state.ImInBlock[state.ImInBlock.length - 1];
}
@ -34,7 +34,7 @@ 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';
} else if ( stream.peek() === '&' ) { // check for character entity references
style = ['attribute', 'mw-underline'];
@ -66,7 +66,7 @@ CodeMirror.defineMode('mediawiki', function( config/*, parserConfig */ ) {
state.ImInBlock.pop(); //FIXME: it is wrong Link
return null;
}
if ( stream.eatWhile( /[^\|\]\&]/ ) ) { //FIXME '{{' brokes Link, sample [[z{{page]]
if ( stream.eatWhile( /[^\|\]\{\}\&]/ ) ) { //FIXME '{{' brokes Link, sample [[z{{page]]
mustEat = false;
style = ['attribute'];
} else if ( stream.peek() === '&' ) {
@ -86,7 +86,7 @@ CodeMirror.defineMode('mediawiki', function( config/*, parserConfig */ ) {
return 'attribute';
}
if ( stream.eatWhile( /[^\]\s\u00a0\&]/ ) ) {
if ( stream.eatWhile( /[^\]\s\u00a0\&\}\[\]\{]/ ) ) {
mustEat = false;
style = ['mw-underline'];
} else if ( stream.peek() === '&' ) {
@ -125,13 +125,13 @@ CodeMirror.defineMode('mediawiki', function( config/*, parserConfig */ ) {
}
break;
case 'TemplateArgument':
if ( state.bTempArgName && stream.eatWhile( /[^=\}\|<\{\&]/ ) ) {
if ( state.bTempArgName && stream.eatWhile( /[^=\[\]\}\|<\{\&]/ ) ) {
state.bTempArgName = false;
if ( stream.eat( '=' ) ) {
return 'string strong';
}
return 'string';
} else if ( stream.eatWhile( /[^\}\|<\{\&]/ ) ) {
} else if ( stream.eatWhile( /[^\[\]\}\|<\{\&]/ ) ) {
return 'string';
} else if ( stream.eat( '|' ) ) {
state.bTempArgName = true;
@ -168,7 +168,7 @@ CodeMirror.defineMode('mediawiki', function( config/*, parserConfig */ ) {
style = ['keyword'];
break;
case 'ParserFunctionArgument':
if ( stream.eatWhile( /[^\}\|<\{\&]/ ) ) {
if ( stream.eatWhile( /[^\[\]\}\|<\{\&]/ ) ) {
return 'string-2';
} else if ( stream.eat( '|' ) ) {
return 'keyword strong';
@ -179,17 +179,25 @@ CodeMirror.defineMode('mediawiki', function( config/*, parserConfig */ ) {
style.push( 'string-2' );
break;
case 'TagName':
var tmp = stream.match( /[^>\/\s\u00a0<\{\&]*/ )[0];
tmp = stream.match( /[^>\/\s\u00a0<\{\&]*/ );
if ( tmp ) {
tmp = tmp[0].toLowerCase();
if ( stream.eatSpace() || /[>\/\s\u00a0]/.test( stream.peek() ) ) {
state.ImInBlock.pop();
state.ImInBlock.push( 'TagAttribute' );
state.ImInTag.push( tagName === true ? tmp : null );
if ( isTagNameClear ) {
if ( config.mwextTags.indexOf( tmp ) >= 0 ) {
isTagNameClear = false;
state.ImInTag.push( tmp );
return 'keyword';
}
} else {
state.ImInTag.push( null );
}
}
tagName = false;
return 'tag';
}
tagName = false;
isTagNameClear = false;
break;
case 'TagAttribute':
var attributName = stream.eatWhile( /[^>\/\s\u00a0<\{\&]/ );
@ -200,20 +208,28 @@ CodeMirror.defineMode('mediawiki', function( config/*, parserConfig */ ) {
// }
return 'attribute';
}
if ( stream.match( '/>') ) {
state.ImInBlock.pop();
return 'tag bracket';
}
if ( stream.eat( '>' ) ) {
state.ImInBlock.pop();
state.ImInBlock.push( 'InsideTag' );
if ( state.ImInTag[ state.ImInTag.length - 1 ] ) {
state.ImInBlock.push( 'InsideTag' );
}
return 'tag bracket';
}
break;
case 'TagClose':
if ( stream.eatWhile( /[^>\/\s\u00a0<\{\&]/ ) ) {
state.ImInBlock.pop();
tmp = stream.match( /[^>\s\u00a0<\{]*/ );
if ( tmp ) {
tmp = tmp[0].toLowerCase();
stream.eatSpace();
if ( /[^<\{\&]/.test( stream.peek() ) ) {
state.ImInBlock.pop();
if ( /[>]/.test( stream.peek() ) ) {
state.ImInBlock.push( 'TagCloseEnd' );
}
return 'tag';
return config.mwextTags.indexOf( tmp ) >= 0 ? 'keyword' : 'tag';
}
break;
case 'TagCloseEnd':
@ -225,17 +241,36 @@ CodeMirror.defineMode('mediawiki', function( config/*, parserConfig */ ) {
return 'error';
case 'InsideTag':
var tag = state.ImInTag[ state.ImInTag.length - 1 ];
if ( tag === 'pre' ) {
if ( tag === 'pre' || tag === 'nowiki' ) {
var st = tag === 'pre' ? 'qualifier' : '';
if ( stream.eatWhile( /[^&<]/ ) ) {
return 'qualifier';
return st;
} else if ( stream.peek() === '&' ) {
style = ['qualifier'];
} else if ( stream.match( '</pre>') ) {
stream.backUp( 6 );
state.ImInBlock.pop();
style = [st];
} else {
stream.next();
return 'qualifier';
re = new RegExp( '</' + tag + '\\s*>', 'i' );
mt = stream.match( re );
if ( mt ) {
stream.backUp( mt[0].length );
state.ImInBlock.pop();
} else {
stream.next();
return st;
}
}
} else {
if ( stream.eatWhile( /[^<]/ ) ) {
return 'string-2';
} else {
re = new RegExp( '</' + tag + '\\s*>', 'i' );
mt = stream.match( re );
if ( mt ) {
stream.backUp( mt[0].length );
state.ImInBlock.pop();
} else {
stream.next();
return 'string-2';
}
}
}
break;
@ -322,15 +357,12 @@ CodeMirror.defineMode('mediawiki', function( config/*, parserConfig */ ) {
return chain( inBlock( 'comment', '-->' ) );
}
if ( stream.eat( '/' ) ) {
if ( /[\w\{<]/.test( stream.peek() ) ) {
if ( state.ImInBlock.length > 0 && state.ImInBlock[state.ImInBlock.length -1] === 'TagName' ) { // <nowiki><</nowiki>
state.ImInBlock.pop();
}
if ( /[^\s\u00a0\}\[\]<\{\'\|\&\:]/.test( stream.peek() ) ) {
state.ImInBlock.push( 'TagClose' );
return 'tag bracket';
}
} else if ( /[\w\{<]/.test( stream.peek() ) ) {
tagName = true;
} else if ( /[^\s\u00a0\}\[\]<\{\'\|\&\:]/.test( stream.peek() ) ) {
isTagNameClear = true;
state.ImInBlock.push( 'TagName' );
return 'tag bracket';
}