[MediaWiki-commits] [Gerrit] skip leading spaces in table syntax (v 3.1.7) - change (mediawiki...CodeMirror)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: skip leading spaces in table syntax (v 3.1.7)
......................................................................


skip leading spaces in table syntax (v 3.1.7)

Bug: T108453
Change-Id: I348855b9ae8a4f571bb765df2b0819ebe3fda75d
---
M CodeMirror.php
M resources/mode/mediawiki/mediawiki.js
2 files changed, 8 insertions(+), 9 deletions(-)

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



diff --git a/CodeMirror.php b/CodeMirror.php
index b8f05bd..cf5ef87 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 EXT_CODEMIRROR_VERSION = '3.1.6';
+const EXT_CODEMIRROR_VERSION = '3.1.7';
 
 // Register this extension on Special:Version
 $wgExtensionCredits['parserhook'][] = array(
diff --git a/resources/mode/mediawiki/mediawiki.js 
b/resources/mode/mediawiki/mediawiki.js
index ac12a3e..fde51ed 100644
--- a/resources/mode/mediawiki/mediawiki.js
+++ b/resources/mode/mediawiki/mediawiki.js
@@ -512,19 +512,19 @@
 
        function inTableCaption( stream, state ) {
                if ( stream.sol() ) {
-                       var peek = stream.peek();
-                       if ( peek === '|' || peek === '!' ) {
+                       state.isBold = false;
+                       state.isItalic = false;
+                       if ( stream.match( /[\s\u00a0]*[\|!]/, false ) ) {
                                state.tokenize = inTable;
                                return state.tokenize( stream, state );
                        }
-                       state.isBold = false;
-                       state.isItalic = false;
                }
                return eatWikiText( 'mw-table-caption', '' )( stream, state );
        }
 
        function inTable( stream, state ) {
                if ( stream.sol() ) {
+                       stream.eatSpace();
                        if ( stream.eat( '|' ) ) {
                                if ( stream.eat( '-' ) ) {
                                        stream.eatSpace();
@@ -556,13 +556,12 @@
        function eatTableRow( isStart, isHead ) {
                return function ( stream, state ) {
                        if ( stream.sol() ) {
-                               var peek = stream.peek();
-                               if ( peek === '|' || peek === '!' ) {
+                               state.isBold = false;
+                               state.isItalic = false;
+                               if ( stream.match( /[\s\u00a0]*[\|!]/, false ) 
) {
                                        state.tokenize = inTable;
                                        return state.tokenize( stream, state );
                                }
-                               state.isBold = false;
-                               state.isItalic = false;
                        } else {
                                if ( stream.match( /[^'\|\{\[<\&~]+/ ) ) {
                                        return makeStyle( (isHead ? 'strong' : 
''), state );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I348855b9ae8a4f571bb765df2b0819ebe3fda75d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Pastakhov <pastak...@yandex.ru>
Gerrit-Reviewer: Pastakhov <pastak...@yandex.ru>
Gerrit-Reviewer: jenkins-bot <>

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