jenkins-bot has submitted this change and it was merged.
Change subject: fix highlighting parameters inside a template transclusion (v
3.2.1)
......................................................................
fix highlighting parameters inside a template transclusion (v 3.2.1)
Bug: T108450
Change-Id: Ic686fe6aa211988d8458037c275779f512d03563
---
M extension.json
M resources/mode/mediawiki/mediawiki.js
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Pastakhov: Looks good to me, approved
Florianschmidtwelzow: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 907c317..f312481 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "CodeMirror",
- "version": "3.2",
+ "version": "3.2.1",
"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 60b65fb..303e035 100644
--- a/resources/mode/mediawiki/mediawiki.js
+++ b/resources/mode/mediawiki/mediawiki.js
@@ -734,7 +734,7 @@
}
break;
case '{':
- if ( stream.match( '{{' ) ) { //
Variable
+ if ( !stream.match( '{{{{', false ) &&
stream.match( '{{' ) ) { // Template parameter (skip parameters inside a
template transclusion, Bug: T108450)
stream.eatSpace();
state.stack.push(
state.tokenize );
state.tokenize = inVariable;
--
To view, visit https://gerrit.wikimedia.org/r/232678
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic686fe6aa211988d8458037c275779f512d03563
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Pastakhov <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Pastakhov <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
