[MediaWiki-commits] [Gerrit] add highlighting comments (v 1.3.0) - change (mediawiki...CodeMirror)

2014-08-22 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: add highlighting comments (v 1.3.0)
..


add highlighting comments (v 1.3.0)

Change-Id: I0243202d8a7571570f6446bb0dca3b50f2b812a3
---
M CodeMirror.php
M resources/mode/mediawiki/mediawiki.js
2 files changed, 24 insertions(+), 1 deletion(-)

Approvals:
  Pastakhov: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/CodeMirror.php b/CodeMirror.php
index 3898666..aa658b3 100644
--- a/CodeMirror.php
+++ b/CodeMirror.php
@@ -15,7 +15,7 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry 
point.' );
 }
 
-const CODEMIRROR_VERSION = '1.2.0';
+const CODEMIRROR_VERSION = '1.3.0';
 
 // Register this extension on Special:Version
 $wgExtensionCredits['parserhook'][] = array(
diff --git a/resources/mode/mediawiki/mediawiki.js 
b/resources/mode/mediawiki/mediawiki.js
index 48dccff..ce30669 100644
--- a/resources/mode/mediawiki/mediawiki.js
+++ b/resources/mode/mediawiki/mediawiki.js
@@ -85,6 +85,11 @@
}
 
function inWikitext( stream, state ) {
+   function chain( parser ) {
+   state.tokenize = parser;
+   return parser( stream, state );
+   }
+
var style = [];
var sol = stream.sol();
var ch = stream.next();
@@ -107,6 +112,11 @@
state.isBold = state.isBold ? false : 
true;
} else if ( stream.match( '\'' ) ) {
state.isItalic = state.isItalic ? false 
: true;
+   }
+   break;
+   case '<':
+   if ( stream.match( '!--' ) ) {
+   return chain( inBlock( 'comment', '-->' 
) );
}
break;
case '&':
@@ -139,6 +149,19 @@
return null;
}
 
+   function inBlock( style, terminator ) {
+   return function( stream, state ) {
+   while ( !stream.eol() ) {
+   if ( stream.match( terminator ) ) {
+   state.tokenize = inWikitext;
+   break;
+   }
+   stream.next();
+   }
+   return style;
+   };
+   }
+
return {
startState: function() {
return { tokenize: inWikitext, isBold: false, isItalic: 
false };

-- 
To view, visit https://gerrit.wikimedia.org/r/155697
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0243202d8a7571570f6446bb0dca3b50f2b812a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Pastakhov 
Gerrit-Reviewer: Pastakhov 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] add highlighting comments (v 1.3.0) - change (mediawiki...CodeMirror)

2014-08-22 Thread Pastakhov (Code Review) 
Pastakhov has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/155697

Change subject: add highlighting comments (v 1.3.0)
..

add highlighting comments (v 1.3.0)

Change-Id: I0243202d8a7571570f6446bb0dca3b50f2b812a3
---
M CodeMirror.php
M resources/mode/mediawiki/mediawiki.js
2 files changed, 24 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror 
refs/changes/97/155697/1

diff --git a/CodeMirror.php b/CodeMirror.php
index 3898666..aa658b3 100644
--- a/CodeMirror.php
+++ b/CodeMirror.php
@@ -15,7 +15,7 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry 
point.' );
 }
 
-const CODEMIRROR_VERSION = '1.2.0';
+const CODEMIRROR_VERSION = '1.3.0';
 
 // Register this extension on Special:Version
 $wgExtensionCredits['parserhook'][] = array(
diff --git a/resources/mode/mediawiki/mediawiki.js 
b/resources/mode/mediawiki/mediawiki.js
index 48dccff..ce30669 100644
--- a/resources/mode/mediawiki/mediawiki.js
+++ b/resources/mode/mediawiki/mediawiki.js
@@ -85,6 +85,11 @@
}
 
function inWikitext( stream, state ) {
+   function chain( parser ) {
+   state.tokenize = parser;
+   return parser( stream, state );
+   }
+
var style = [];
var sol = stream.sol();
var ch = stream.next();
@@ -107,6 +112,11 @@
state.isBold = state.isBold ? false : 
true;
} else if ( stream.match( '\'' ) ) {
state.isItalic = state.isItalic ? false 
: true;
+   }
+   break;
+   case '<':
+   if ( stream.match( '!--' ) ) {
+   return chain( inBlock( 'comment', '-->' 
) );
}
break;
case '&':
@@ -139,6 +149,19 @@
return null;
}
 
+   function inBlock( style, terminator ) {
+   return function( stream, state ) {
+   while ( !stream.eol() ) {
+   if ( stream.match( terminator ) ) {
+   state.tokenize = inWikitext;
+   break;
+   }
+   stream.next();
+   }
+   return style;
+   };
+   }
+
return {
startState: function() {
return { tokenize: inWikitext, isBold: false, isItalic: 
false };

-- 
To view, visit https://gerrit.wikimedia.org/r/155697
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0243202d8a7571570f6446bb0dca3b50f2b812a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Pastakhov 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits