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 tag names (v 1.5.0)

Browse source 
* rename CODEMIRROR_VERSION to EXT_CODEMIRROR_VERSION

Change-Id: I20b1cb872595a1491bb2c0485cb49c68fa908dd0
This commit is contained in:
Pavel Astakhov 2014-08-25 16:56:52 +06:00
parent 0697497834
commit ac5080f18d
2 changed files with 67 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CodeMirror.php
View file

@ -15,13 +15,13 @@ if ( !defined( 'MEDIAWIKI' ) ) {
die( 'This file is an extension to MediaWiki and thus not a valid entry point.' );
}
const CODEMIRROR_VERSION = '1.4.1';
const EXT_CODEMIRROR_VERSION = '1.5.0';
// Register this extension on Special:Version
$wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,
'name' => 'CodeMirror',
'version' => CODEMIRROR_VERSION,
'version' => EXT_CODEMIRROR_VERSION,
'url' => 'https://www.mediawiki.org/wiki/Extension:CodeMirror',
'author' => '[https://www.mediawiki.org/wiki/User:Pastakhov Pavel Astakhov]',
'descriptionmsg' => 'codemirror-desc'

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

@ -11,6 +11,9 @@
'use strict';
CodeMirror.defineMode('mediawiki', function( /*config, parserConfig*/ ) {
var tagName = false;
function inWikitext( stream, state ) {
function chain( parser ) {
state.tokenize = parser;
@ -31,7 +34,7 @@ CodeMirror.defineMode('mediawiki', function( /*config, parserConfig*/ ) {
state.ImInBlock.push( 'ParserFunctionName' );
return 'keyword strong';
} else {
if ( stream.eatWhile( /[^<\{\&\s\}\|]/ ) ) {
if ( stream.eatWhile( /[^\s\u00a0\}\|<\{\&]/ ) ) {
state.ImInBlock.push( 'TemplatePageNameContinue' );
return 'link';
}
@ -39,7 +42,7 @@ CodeMirror.defineMode('mediawiki', function( /*config, parserConfig*/ ) {
break;
case 'TemplatePageNameContinue':
stream.eatSpace();
if ( stream.match( /\s*[^<\{\&\s\}\|]/ ) ) {
if ( stream.match( /[\s\u00a0]*[^\s\u00a0\}\|<\{\&]/ ) ) {
return 'link';
}
if ( stream.eat( '|' ) ) {
@ -54,7 +57,7 @@ CodeMirror.defineMode('mediawiki', function( /*config, parserConfig*/ ) {
}
break;
case 'TemplateArgument':
if ( stream.eatWhile( /[^=<\{\&\}\|]/ ) ) {
if ( stream.eatWhile( /[^=\}\|<\{\&]/ ) ) {
if ( blockType === 'TemplateArgument' && stream.eat('=') ) {
state.ImInBlock.pop();
state.ImInBlock.push( 'TemplateArgumentContinue' );
@ -71,7 +74,7 @@ CodeMirror.defineMode('mediawiki', function( /*config, parserConfig*/ ) {
}
break;
case 'TemplateArgumentContinue':
if ( stream.eatWhile( /[^<\{\&\}\|]/ ) ) {
if ( stream.eatWhile( /[^\}\|<\{\&]/ ) ) {
state.ImInBlock.pop();
state.ImInBlock.push( 'TemplateArgument' );
return 'string';
@ -97,7 +100,7 @@ CodeMirror.defineMode('mediawiki', function( /*config, parserConfig*/ ) {
}
break;
case 'ParserFunctionArgument':
if ( stream.eatWhile( /[^<\{\&\}\|]/ ) ) {
if ( stream.eatWhile( /[^\}\|<\{\&]/ ) ) {
return 'string-2';
} else if ( stream.eat( '|' ) ) {
return 'tag strong';
@ -108,6 +111,49 @@ CodeMirror.defineMode('mediawiki', function( /*config, parserConfig*/ ) {
}
}
break;
case 'TagName':
var tmp = stream.eatWhile( /[^>\/\s\u00a0<\{\&]/ );
if ( tmp ) {
if ( stream.eatSpace() || /[>\/\s\u00a0]/.test( stream.peek() ) ) {
state.ImInBlock.pop();
state.ImInBlock.push( 'TagAttribute' );
state.ImInTag.push( tagName === true ? tmp : null );
}
tagName = false;
return 'tag';
}
tagName = false;
break;
case 'TagAttribute':
var attributName = stream.eatWhile( /[^>\/\s\u00a0<\{\&]/ );
if ( attributName ) {
stream.eatSpace();
// if ( stream.eat( '=' ) ) {
// //state.tokenize = inTagAttributeValue( attributName );
// }
return 'attribute';
}
if ( stream.eat( '>' ) ) {
state.ImInBlock.pop();
return 'tag bracket';
}
break;
case 'TagClose':
if ( stream.eatWhile( /[^>\/\s\u00a0<\{\&]/ ) ) {
stream.eatSpace();
if ( /[^<\{\&]/.test( stream.peek() ) ) {
state.ImInBlock.pop();
state.ImInBlock.push( 'TagCloseEnd' );
}
return 'tag';
}
break;
case 'TagCloseEnd':
if ( stream.eat( '>' ) ) {
state.ImInBlock.pop();
return 'tag bracket';
}
return 'error';
case null:
if ( sol ) {
state.isBold = false;
@ -146,6 +192,19 @@ CodeMirror.defineMode('mediawiki', function( /*config, parserConfig*/ ) {
if ( stream.match( '!--' ) ) {
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();
}
state.ImInBlock.push( 'TagClose' );
return 'tag bracket';
}
} else if ( /[\w\{<]/.test( stream.peek() ) ) {
tagName = true;
state.ImInBlock.push( 'TagName' );
return 'tag bracket';
}
break;
case '&':
// this code was copied from mode/xml/xml.js
@ -187,7 +246,7 @@ CodeMirror.defineMode('mediawiki', function( /*config, parserConfig*/ ) {
return {
startState: function() {
return { tokenize: inWikitext, ImInBlock: [], isBold: false, isItalic: false };
return { tokenize: inWikitext, ImInBlock: [], ImInTag:[], isBold: false, isItalic: false };
},
token: function( stream, state ) {
return state.tokenize( stream, state );