Pastakhov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/231494
Change subject: fix highlighting of external links, multiple apostrophes end
link (3.1.14)
......................................................................
fix highlighting of external links, multiple apostrophes end link (3.1.14)
Change-Id: Ibbb4850edc04ed6b184fa59c51e1978d60cd1269
---
M extension.json
M resources/mode/mediawiki/mediawiki.js
2 files changed, 18 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/94/231494/1
diff --git a/extension.json b/extension.json
index a2fb585..5c73a5f 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "CodeMirror",
- "version": "3.1.13",
+ "version": "3.1.14",
"author": [
"[https://www.mediawiki.org/wiki/User:Pastakhov Pavel
Astakhov]",
"[https://www.mediawiki.org/wiki/User:Florianschmidtwelzow
Florian Schmidt]"
diff --git a/resources/mode/mediawiki/mediawiki.js
b/resources/mode/mediawiki/mediawiki.js
index e35759f..0eca7f4 100644
--- a/resources/mode/mediawiki/mediawiki.js
+++ b/resources/mode/mediawiki/mediawiki.js
@@ -268,7 +268,14 @@
state.tokenize = inExternalLinkText;
return makeStyle( '', state );
}
- if ( stream.match( /[^\s\u00a0\]\{\&~]+/ ) || stream.eatSpace()
) {
+ if ( stream.match( /[^\s\u00a0\]\{\&~']+/ ) ||
stream.eatSpace() ) {
+ if ( stream.peek() === '\'' ) {
+ if ( stream.match( '\'\'', false ) ) {
+ state.tokenize = inExternalLinkText;
+ } else {
+ stream.next();
+ }
+ }
return makeStyle( 'mw-extlink', state );
}
return eatWikiText( 'mw-extlink', '' )( stream, state );
@@ -312,7 +319,7 @@
// if ( !stream.eatSpace() ) {
// state.ImInBlock.push(
'LinkTrail' );
// }
- }
+ }
if ( stream.match( /[\s\u00a0]*[^\s\u00a0#\|\]\&~\{]+/ ) ||
stream.eatSpace() ) { //FIXME '{{' brokes Link, sample [[z{{page]]
return makeStyle( 'mw-link-pagename mw-pagename', state
);
}
@@ -390,7 +397,7 @@
state.tokenize = state.stack.pop();
return makeLocalStyle( (isHtmlTag ?
'mw-htmltag-name' : 'mw-exttag-name'), state );
}
-
+
if ( isHtmlTag ) {
if ( isCloseTag ) {
state.tokenize = eatChar( '>',
'mw-htmltag-bracket' );
@@ -595,7 +602,7 @@
function eatFreeExternalLink( stream, state ) {
if ( stream.eol() ) {
// @todo error message
- } else if ( stream.match( /[^\s\u00a0\{\[\]<>~\)\.,]*/ ) ) {
+ } else if ( stream.match( /[^\s\u00a0\{\[\]<>~\)\.,']*/ ) ) {
if ( stream.peek() === '~' ) {
if ( !stream.match( /~{3,}/, false ) ) {
stream.match( /~*/ );
@@ -603,7 +610,12 @@
}
} else if ( stream.peek() === '{' ) {
if ( !stream.match( /\{\{/, false ) ) {
- stream.eat( '{' );
+ stream.next();
+ return makeLocalStyle(
'mw-free-extlink', state );
+ }
+ } else if ( stream.peek() === '\'' ) {
+ if ( !stream.match( '\'\'', false ) ) {
+ stream.next();
return makeLocalStyle(
'mw-free-extlink', state );
}
} else if ( stream.match(
/[\)\.,]+(?=[^\s\u00a0\{\[\]<>~\)\.,])/ ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/231494
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbb4850edc04ed6b184fa59c51e1978d60cd1269
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Pastakhov <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
