Sync with upstream

.eslintignore

@@ -1,5 +1,6 @@
 # Upstream code
-/modules/lib/
+/modules/lib/*
+!modules/lib/foreign-resources.*
 
 # Build
 /vendor/

.gitignore

@@ -23,3 +23,4 @@ project.index
 ## Sublime
 sublime-*
 sftp-config.json
+/.stylelintcache

.phan/config.php

@@ -1,3 +1,18 @@
 <?php
 
-return require __DIR__ . '/../vendor/mediawiki/mediawiki-phan-config/src/config.php';
+$cfg = require __DIR__ . '/../vendor/mediawiki/mediawiki-phan-config/src/config.php';
+
+$cfg['directory_list'] = array_merge(
+	$cfg['directory_list'],
+	[
+		'../../extensions/BetaFeatures'
+	]
+);
+$cfg['exclude_analysis_directory_list'] = array_merge(
+	$cfg['exclude_analysis_directory_list'],
+	[
+		'../../extensions/BetaFeatures'
+	]
+);
+
+return $cfg;

Gruntfile.js

@@ -9,10 +9,7 @@
 module.exports = function ( grunt ) {
 	const conf = grunt.file.readJSON( 'extension.json' );
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
-	grunt.loadNpmTasks( 'grunt-contrib-clean' );
-	grunt.loadNpmTasks( 'grunt-contrib-copy' );
 	grunt.loadNpmTasks( 'grunt-eslint' );
-	grunt.loadNpmTasks( 'grunt-exec' );
 	grunt.loadNpmTasks( 'grunt-stylelint' );
 
 	grunt.initConfig( {
@@ -24,6 +21,9 @@ module.exports = function ( grunt ) {
 			all: [ '.' ]
 		},
 		stylelint: {
+			options: {
+				cache: true
+			},
 			all: [
 				'**/*.{css,less}',
 				'!node_modules/**',
@@ -36,42 +36,9 @@ module.exports = function ( grunt ) {
 				requireLowerCase: false
 			},
 			all: conf.MessagesDirs.CodeEditor
-		},
-		exec: {
-			'npm-update-ace': {
-				cmd: 'npm update ace-builds',
-				callback: function ( error, stdout, stderr ) {
-					grunt.log.write( stdout );
-					if ( stderr ) {
-						grunt.log.write( 'Error: ' + stderr );
-					}
-
-					if ( error !== null ) {
-						grunt.log.error( 'update error: ' + error );
-					}
-				}
-			}
-		},
-		clean: {
-			ace: [ 'modules/lib/ace/*' ]
-		},
-		copy: {
-			ace: {
-				expand: true,
-				cwd: 'node_modules/ace-builds/src-noconflict/',
-				src: [ '**' ],
-				dest: 'modules/lib/ace/'
-			},
-			'ace-misc-files': {
-				expand: true,
-				cwd: 'node_modules/ace-builds/',
-				src: [ 'LICENSE', 'CHANGELOG.md', 'README.md' ],
-				dest: 'modules/lib/ace/'
-			}
 		}
 	} );
 
-	grunt.registerTask( 'update-ace', [ 'exec:npm-update-ace', 'clean:ace', 'copy:ace', 'copy:ace-misc-files' ] );
 	grunt.registerTask( 'test', [ 'eslint', 'stylelint', 'banana' ] );
 	grunt.registerTask( 'default', 'test' );
 };

composer.json

@@ -1,7 +1,7 @@
 {
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "44.0.0",
-		"mediawiki/mediawiki-phan-config": "0.14.0",
+		"mediawiki/mediawiki-codesniffer": "48.0.0",
+		"mediawiki/mediawiki-phan-config": "0.17.0",
 		"mediawiki/minus-x": "1.1.3",
 		"php-parallel-lint/php-console-highlighter": "1.0.0",
 		"php-parallel-lint/php-parallel-lint": "1.4.0"

extension.json

@@ -9,11 +9,22 @@
 	"license-name": "GPL-2.0-or-later AND BSD-3-Clause",
 	"type": "editor",
 	"requires": {
-		"MediaWiki": ">= 1.43",
+		"MediaWiki": ">= 1.45",
 		"extensions": {
 			"WikiEditor": ">= 0.5.2"
 		}
 	},
+	"config": {
+		"CodeEditorEnabledModes": {
+			"value": {
+				"javascript": true,
+				"json": true,
+				"css": true,
+				"lua": true
+			},
+			"description": "Temporary configuration flag to control conflicts with Extension:CodeMirror. Only modes that exist in CodeMirror need to be specified."
+		}
+	},
 	"Hooks": {
 		"EditPage::showEditForm:initial": "CodeEditorHooks",
 		"EditPage::showReadOnlyForm:initial": "CodeEditorHooks",
@@ -24,7 +35,8 @@
 			"class": "MediaWiki\\Extension\\CodeEditor\\Hooks",
 			"services": [
 				"UserOptionsLookup",
-				"HookContainer"
+				"HookContainer",
+				"MainConfig"
 			]
 		}
 	},
@@ -113,6 +125,7 @@
 				"lib/ace/mode-javascript.js",
 				"lib/ace/mode-json.js",
 				"lib/ace/mode-css.js",
+				"lib/ace/mode-vue.js",
 				"lib/ace/mode-lua.js",
 				"lib/ace/ext-language_tools.js",
 				"lib/ace/ext-modelist.js"

i18n/ar.json

@@ -1,6 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
+			"Mohammed Qays",
 			"SaldırganSincap",
 			"ديفيد",
 			"علاء",
@@ -9,7 +10,7 @@
 	},
 	"codeeditor-desc": "بناء على ذلك، أبرز التحرير لصفحات جافا سكريبت وCSS باستخدام [https://ace.c9.io/ محرر Ace]",
 	"codeeditor-next-annotation": "انتقل إلى التعليق التوضيحي التالي",
-	"codeeditor-toolbar-toggle": "تبديل محرر الكود",
+	"codeeditor-toolbar-toggle": "تبديل محرر الأكواد",
 	"codeeditor-save-with-errors": "الملف يحتوي على أخطاء. هل أنت متأكد أنك تريد النشر؟",
 	"codeeditor-invisibleChars-toggle": "تبديل الأحرف غير المرئية",
 	"codeeditor-lineWrapping-toggle": "تبديل التفاف الخط",

i18n/az.json

@@ -8,14 +8,14 @@
 	"codeeditor-desc": "[https://ace.c9.io/ Ace editor] istifadə edərək JavaScript and CSS səhifələri üçün sintaksis-rəngləndirici redaktor",
 	"codeeditor-next-annotation": "Növbəti annotasiyaya keç",
 	"codeeditor-toolbar-toggle": "Kod redaktorunu dəyişdir",
-	"codeeditor-save-with-errors": "Sənəddə səhvlər var. Yayımlamaq istədiyinizə əminsiniz?",
+	"codeeditor-save-with-errors": "Kodda xətalar mövcuddur. Yayımlamaq istədiyinizə əminsiniz?",
 	"codeeditor-invisibleChars-toggle": "Görünməz simvolları dəyişdir",
 	"codeeditor-lineWrapping-toggle": "Sətir sürüşməsini dəyiş",
 	"codeeditor-searchReplace-toggle": "Axtarış və dəyişdirmə dialoqunu dəyiş",
 	"codeeditor-gotoline": "Sətirə get...",
 	"codeeditor-gotoline-placeholder": "sətir[:sütun]",
 	"codeeditor-gotoline-prompt": "Sətir nömrəsini daxil et",
-	"codeeditor-indent": "Giriş",
+	"codeeditor-indent": "Abzas",
 	"codeeditor-outdent": "Çıxış",
 	"codeeditor-error-title": "Paket uğursuz oldu",
 	"codeeditor-error-message": "CodeEditor-un yüklənməsi üçün WikiEditor lazımdır."

i18n/es.json

@@ -10,7 +10,7 @@
 	"codeeditor-desc": "Edición de páginas con resaltado de sintaxis para JavaScript y CSS, usando [https://ace.c9.io el editor Ace]",
 	"codeeditor-next-annotation": "Ir a la anotación siguiente",
 	"codeeditor-toolbar-toggle": "Activar o desactivar el editor de código",
-	"codeeditor-save-with-errors": "El documento contiene errores. ¿Confirmas que quieres publicarlo?",
+	"codeeditor-save-with-errors": "El documento contiene errores. ¿{{#FORMAL:Confirmas|Confirma}} que {{#FORMAL:quieres|quiere}} publicarlo?",
 	"codeeditor-invisibleChars-toggle": "Mostrar u ocultar los caracteres invisibles",
 	"codeeditor-lineWrapping-toggle": "Activar o desactivar el ajuste de renglones",
 	"codeeditor-searchReplace-toggle": "Mostrar u ocultar el cuadro de buscar y reemplazar",

i18n/fi.json

@@ -2,7 +2,8 @@
 	"@metadata": {
 		"authors": [
 			"01miki10",
-			"Nike"
+			"Nike",
+			"Samoasambia"
 		]
 	},
 	"codeeditor-desc": "Lisää syntaksinkorostuksen JavaScript ja CSS-sivuille käyttäen [https://ace.c9.io/ Ace-muokkainta]",
@@ -17,5 +18,6 @@
 	"codeeditor-gotoline-prompt": "Syötä rivin numero",
 	"codeeditor-indent": "Sisennä",
 	"codeeditor-outdent": "Poista sisennys",
+	"codeeditor-error-title": "Riippuvuus epäonnistui",
 	"codeeditor-error-message": "CodeEditor tarvitsee WikiEditorin lataamisen."
 }

i18n/fr.json

@@ -14,7 +14,7 @@
 	"codeeditor-desc": "Coloration syntaxique lors de la modification de pages écrites en JavaScript et CSS, en utilisant l’[https://ace.c9.io/ éditeur Ace]",
 	"codeeditor-next-annotation": "Aller à la prochaine annotation",
 	"codeeditor-toolbar-toggle": "Activer / désactiver l’éditeur de code",
-	"codeeditor-save-with-errors": "Le document contient des erreurs. Êtes-vous sûr{{GENDER:||e}} de vouloir le publier ?",
+	"codeeditor-save-with-errors": "Le document contient des erreurs. Êtes-vous {{GENDER:|sûr|sûre}} de vouloir le publier ?",
 	"codeeditor-invisibleChars-toggle": "Afficher / masquer les caractères invisibles",
 	"codeeditor-lineWrapping-toggle": "Activer / désactiver le repli de ligne",
 	"codeeditor-searchReplace-toggle": "Afficher / masquer l’outil de recherche et de remplacement",

i18n/id.json

@@ -3,16 +3,17 @@
 		"authors": [
 			"Daud I.F. Argana",
 			"Farras",
-			"William Surya Permana"
+			"William Surya Permana",
+			"Penyuwangi"
 		]
 	},
 	"codeeditor-desc": "Penyuntingan dengan penyorotan sintaks untuk halaman JavaScript dan CSS menggunakan [https://ace.c9.io/ penyunting Ace]",
 	"codeeditor-next-annotation": "Pergi ke anotasi berikutnya",
-	"codeeditor-toolbar-toggle": "Aktifkan/Nonaktifkan penyunting kode",
+	"codeeditor-toolbar-toggle": "Nyalakan/Matikan penyunting kode",
 	"codeeditor-save-with-errors": "Dokumen mengandung galat. Apakah Anda yakin ingin menerbitkannya?",
-	"codeeditor-invisibleChars-toggle": "Aktifkan/Nonaktifkan karakter tidak terlihat",
-	"codeeditor-lineWrapping-toggle": "Aktifkan/Nonaktifkan pembungkusan baris",
-	"codeeditor-searchReplace-toggle": "Aktifkan/Nonaktifkan dialog cari dan ganti",
+	"codeeditor-invisibleChars-toggle": "Nyalakan/Matikan karakter tak terlihat",
+	"codeeditor-lineWrapping-toggle": "Nyalakan/Matikan pembungkusan baris",
+	"codeeditor-searchReplace-toggle": "Nyalakan/Matikan dialog cari dan ganti",
 	"codeeditor-gotoline": "Pergi ke baris nomor...",
 	"codeeditor-gotoline-placeholder": "baris[:kolom]",
 	"codeeditor-gotoline-prompt": "Masukkan nomor baris",

i18n/lb.json

@@ -1,14 +1,20 @@
 {
 	"@metadata": {
 		"authors": [
-			"Robby"
+			"Robby",
+			"Volvox"
 		]
 	},
 	"codeeditor-desc": "Ännere vu JavaScript an CSS-Säite mam [https://ace.c9.io/ Ace editor] deen d'Syntax faarweg duerstellt",
 	"codeeditor-next-annotation": "Op déi nächst Notiz goen",
 	"codeeditor-toolbar-toggle": "Editeur vum Code an- an ausschalten",
-	"codeeditor-save-with-errors": "Et si Feeler am Dokument. Sidd Dir sécher datt dir e et späichere wëllt?",
-	"codeeditor-gotoline": "Gitt op d'Linn mat der Nummer...",
+	"codeeditor-save-with-errors": "Et si Feeler am Dokument. Sidd Dir sécher, datt Dir et verëffentleche wëllt?",
+	"codeeditor-invisibleChars-toggle": "Onsiichtbar Zeechen ëmschalten",
+	"codeeditor-lineWrapping-toggle": "Zeilenëmbroch ëmschalten",
+	"codeeditor-searchReplace-toggle": "Sichen-an-Ersetzen-Dialog ëmschalten",
+	"codeeditor-gotoline": "Gitt op d'Zeil mat der Nummer…",
+	"codeeditor-gotoline-placeholder": "Zeil[:Kolonn]",
+	"codeeditor-gotoline-prompt": "Gitt eng Zeilennummer an",
 	"codeeditor-indent": "Eraréckelen",
 	"codeeditor-outdent": "Erausréckelen",
 	"codeeditor-error-title": "Ofhängegkeet feelgeschlo",

i18n/ps.json

@@ -0,0 +1,19 @@
+{
+	"@metadata": {
+		"authors": [
+			"شاه زمان پټان"
+		]
+	},
+	"codeeditor-desc": "د جاوا سکريپټ او سي‌اېس‌اېس مخونو لپاره د [https://ace.c9.io/ ايس سمونگر] په کارولو سره د غونډلپوهې-روښانه‌شوی سمون کول",
+	"codeeditor-next-annotation": "راتلونکي څنگ‌ليک ته ورتلل",
+	"codeeditor-toolbar-toggle": "کوډ سمونگر بدلول",
+	"codeeditor-save-with-errors": "لاسوند تېروتنې لري. ايا تاسو ډاډه ياست چې خپور يې کړئ؟",
+	"codeeditor-invisibleChars-toggle": "نه ليد‌وړ لوښې بدلول",
+	"codeeditor-lineWrapping-toggle": "د کرښې نغاړل بدلول",
+	"codeeditor-gotoline": "د کرښې شمېرې ته ورتلل",
+	"codeeditor-gotoline-placeholder": "کرښه [:ستون]",
+	"codeeditor-gotoline-prompt": "کرښې شمېره وليکئ",
+	"codeeditor-indent": "دننکوږی",
+	"codeeditor-outdent": "بهرکوږی",
+	"codeeditor-error-message": "کوډسمونگر د ويکي‌سمونگر بارولو ته اړتيا لري."
+}

i18n/sh-latn.json

@@ -1,6 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
+			"Aca",
 			"Winston Sung"
 		]
 	},
@@ -13,7 +14,7 @@
 	"codeeditor-searchReplace-toggle": "Ukl/iskl. dijalog za pretragu i zamjenu",
 	"codeeditor-gotoline": "Idi na red broj...",
 	"codeeditor-gotoline-placeholder": "red[:kolona]",
-	"codeeditor-gotoline-prompt": "Upišite broj reda",
+	"codeeditor-gotoline-prompt": "Unesite broj reda",
 	"codeeditor-indent": "Uvlaka",
 	"codeeditor-outdent": "Izvlaka",
 	"codeeditor-error-title": "Zavisnost nije uspjela",

i18n/sjd.json

@@ -0,0 +1,9 @@
+{
+	"@metadata": {
+		"authors": [
+			"Merrahtar"
+		]
+	},
+	"codeeditor-toolbar-toggle": "Ко̄д воа̄йхэм режимм",
+	"codeeditor-save-with-errors": "Документэсьт ле̄в ся̄гкнэг. Та̄так то̄нн зоа̄бэль со̄н элмсаһтӭ?"
+}

i18n/sr-ec.json

@@ -1,6 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
+			"Aca",
 			"BadDog",
 			"Kizule",
 			"Obsuser"

i18n/yue-hant.json

@@ -0,0 +1,22 @@
+{
+	"@metadata": {
+		"authors": [
+			"JeffreyKim",
+			"Ktchankt"
+		]
+	},
+	"codeeditor-desc": "用[https://ace.c9.io/Ace editor]嚟編輯JavaScript同CSS頁面嘅語法突顯",
+	"codeeditor-next-annotation": "去下一個註解",
+	"codeeditor-toolbar-toggle": "切換代碼編輯器",
+	"codeeditor-save-with-errors": "呢份文件包含啲錯誤。 你肯定你想發佈？",
+	"codeeditor-invisibleChars-toggle": "切換隱形字元",
+	"codeeditor-lineWrapping-toggle": "切換線條包裝",
+	"codeeditor-searchReplace-toggle": "切換搜尋同替換對話框",
+	"codeeditor-gotoline": "去行嘅冧巴 ...",
+	"codeeditor-gotoline-placeholder": "行[:欄]",
+	"codeeditor-gotoline-prompt": "輸入一個行嘅冧巴",
+	"codeeditor-indent": "縮排",
+	"codeeditor-outdent": "過時",
+	"codeeditor-error-title": "依賴失敗咗",
+	"codeeditor-error-message": "代碼編輯器需要加載維基編輯器。"
+}