[MediaWiki-commits] [Gerrit] Fix pattern for matching wikitext headings - change (mediawiki...VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Fix pattern for matching wikitext headings
......................................................................

Fix pattern for matching wikitext headings

Remove redundant brackets, fixing the back-reference to
\1 (1st set of brakcets).

Add an test to make sure the example sequences actually trigger the
wikitextString handler.

Change-Id: I76187a12292a4923d1ee2505cfb955431ac252bb
---
M 
modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js
M modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js
2 files changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/01/233201/1

diff --git 
a/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js
 
b/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js
index d57deb9..b54ec68 100644
--- 
a/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js
+++ 
b/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js
@@ -15,7 +15,7 @@
 /* Tests */
 
 function runWikitextStringHandlerTest( assert, server, string, mimeType, 
expectedResponse, expectedData, annotations, msg ) {
-       var handler, i, j,
+       var handler, i, j, name,
                done = assert.async(),
                item = ve.ui.DataTransferItem.static.newFromString( string, 
mimeType ),
                doc = ve.dm.example.createExampleDocument(),
@@ -39,6 +39,10 @@
                        }
                }
        }
+
+       // Check we match the wikitext string handler
+       name = ve.ui.dataTransferHandlerFactory.getHandlerNameForItem( item );
+       assert.strictEqual( name, 'wikitextString', msg + ': triggers match 
function' );
 
        // Invoke the handler
        handler = ve.ui.dataTransferHandlerFactory.create( 'wikitextString', 
mockSurface, item );
@@ -226,7 +230,7 @@
                        }
                ];
 
-       QUnit.expect( cases.length );
+       QUnit.expect( cases.length * 2 );
        for ( i = 0; i < cases.length; i++ ) {
                runWikitextStringHandlerTest( assert, this.server, cases[ i 
].pasteString, cases[ i ].pasteType, cases[ i ].parsoidResponse, cases[ i 
].expectedData, cases[ i ].annotations, cases[ i ].msg );
        }
diff --git 
a/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js
 
b/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js
index e520c2b..baf8562 100644
--- 
a/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js
+++ 
b/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js
@@ -43,7 +43,7 @@
  * which occur on a single line of max 80 characters.
  */
 ve.ui.MWWikitextStringTransferHandler.static.matchRegExp =
-       /(^\s*(={2,6})[^=\r\n]{1,80}\1\s*$)|\[\[.{1,80}\]\]|\{\{.{1,80}\}\}/m;
+       /^\s*(={2,6})[^=\r\n]{1,80}\1\s*$|\[\[.{1,80}\]\]|\{\{.{1,80}\}\}/m;
 
 ve.ui.MWWikitextStringTransferHandler.static.matchFunction = function ( item ) 
{
        var text = item.getAsString();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76187a12292a4923d1ee2505cfb955431ac252bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>

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