Merge branch 'master' into pr-3280

.eslintrc.js

@@ -131,7 +131,10 @@ module.exports = {
 				worker: true
 			},
 			globals: {
-				'Prism': true
+				'Prism': true,
+				// Allow Set and Map. They are partially supported by IE11
+				'Set': true,
+				'Map': true
 			},
 			rules: {
 				'no-var': 'off'

benchmark/benchmark.js

@@ -6,7 +6,7 @@ const crypto = require('crypto');
 const { argv } = require('yargs');
 const fetch = require('node-fetch').default;
 const Benchmark = require('benchmark');
-const simpleGit = require('simple-git/promise');
+const simpleGit = require('simple-git');
 const { parseLanguageNames } = require('../tests/helper/test-case');
 
 
@@ -401,7 +401,7 @@ async function getCandidates(config) {
 	const remoteBaseDir = path.join(__dirname, 'remotes');
 	await fs.promises.mkdir(remoteBaseDir, { recursive: true });
 
-	const baseGit = simpleGit(remoteBaseDir);
+	const baseGit = simpleGit.gitP(remoteBaseDir);
 
 	for (const remote of config.remotes) {
 		const user = /[^/]+(?=\/prism.git)/.exec(remote.repo);
@@ -413,9 +413,9 @@ async function getCandidates(config) {
 		if (!fs.existsSync(remoteDir)) {
 			console.log(`Cloning ${remote.repo}`);
 			await baseGit.clone(remote.repo, remoteName);
-			remoteGit = simpleGit(remoteDir);
+			remoteGit = simpleGit.gitP(remoteDir);
 		} else {
-			remoteGit = simpleGit(remoteDir);
+			remoteGit = simpleGit.gitP(remoteDir);
 			await remoteGit.fetch('origin', branch); // get latest version of branch
 		}
 		await remoteGit.checkout(branch); // switch to branch

components.json

@@ -139,6 +139,24 @@
 			"title": "ARFF",
 			"owner": "Golmote"
 		},
+		"armasm": {
+			"title": "ARM Assembly",
+			"alias": "arm-asm",
+			"owner": "RunDevelopment"
+		},
+		"arturo": {
+			"title": "Arturo",
+			"alias": "art",
+			"optional": [
+				"bash",
+				"css",
+				"javascript",
+				"markup",
+				"markdown",
+				"sql"
+			],
+			"owner": "drkameleon"
+		},
 		"asciidoc": {
 			"alias": "adoc",
 			"title": "AsciiDoc",
@@ -175,6 +193,14 @@
 			"alias": "avdl",
 			"owner": "RunDevelopment"
 		},
+		"awk": {
+			"title": "AWK",
+			"alias": "gawk",
+			"aliasTitles": {
+				"gawk": "GAWK"
+			},
+			"owner": "RunDevelopment"
+		},
 		"bash": {
 			"title": "Bash",
 			"alias": "shell",
@@ -299,6 +325,10 @@
 			"title": "Content-Security-Policy",
 			"owner": "ScottHelme"
 		},
+		"cooklang": {
+			"title": "Cooklang",
+			"owner": "ahue"
+		},
 		"coq": {
 			"title": "Coq",
 			"owner": "RunDevelopment"
@@ -318,6 +348,10 @@
 			"title": "CSV",
 			"owner": "RunDevelopment"
 		},
+		"cue": {
+			"title": "CUE",
+			"owner": "RunDevelopment"
+		},
 		"cypher": {
 			"title": "Cypher",
 			"owner": "RunDevelopment"
@@ -472,6 +506,11 @@
 			"title": "GEDCOM",
 			"owner": "Golmote"
 		},
+		"gettext": {
+			"title": "gettext",
+			"alias": "po",
+			"owner": "RunDevelopment"
+		},
 		"gherkin": {
 			"title": "Gherkin",
 			"owner": "hason"
@@ -490,6 +529,11 @@
 			"alias": "gni",
 			"owner": "RunDevelopment"
 		},
+		"linker-script": {
+			"title": "GNU Linker Script",
+			"alias": "ld",
+			"owner": "RunDevelopment"
+		},
 		"go": {
 			"title": "Go",
 			"require": "clike",
@@ -529,7 +573,10 @@
 		"handlebars": {
 			"title": "Handlebars",
 			"require": "markup-templating",
-			"alias": "hbs",
+			"alias": ["hbs", "mustache"],
+			"aliasTitles": {
+				"mustache": "Mustache"
+			},
 			"owner": "Golmote"
 		},
 		"haskell": {
@@ -559,7 +606,10 @@
 		"http": {
 			"title": "HTTP",
 			"optional": [
+				"csp",
 				"css",
+				"hpkp",
+				"hsts",
 				"javascript",
 				"json",
 				"markup",
@@ -827,6 +877,10 @@
 			"require": "markup",
 			"owner": "Golmote"
 		},
+		"mata": {
+			"title": "Mata",
+			"owner": "RunDevelopment"
+		},
 		"matlab": {
 			"title": "MATLAB",
 			"owner": "Golmote"
@@ -997,6 +1051,11 @@
 			"modify": "php",
 			"owner": "milesj"
 		},
+		"plant-uml": {
+			"title": "PlantUML",
+			"alias": "plantuml",
+			"owner": "RunDevelopment"
+		},
 		"plsql": {
 			"title": "PL/SQL",
 			"require": "sql",
@@ -1223,6 +1282,7 @@
 		"smarty": {
 			"title": "Smarty",
 			"require": "markup-templating",
+			"optional": "php",
 			"owner": "Golmote"
 		},
 		"sml": {
@@ -1277,6 +1337,11 @@
 			"title": "Stan",
 			"owner": "RunDevelopment"
 		},
+		"stata": {
+			"title": "Stata Ado",
+			"require": ["mata", "java", "python"],
+			"owner": "RunDevelopment"
+		},
 		"iecst": {
 			"title": "Structured Text (IEC 61131-3)",
 			"owner": "serhioromano"
@@ -1285,6 +1350,11 @@
 			"title": "Stylus",
 			"owner": "vkbansal"
 		},
+		"supercollider": {
+			"title": "SuperCollider",
+			"alias": "sclang",
+			"owner": "RunDevelopment"
+		},
 		"swift": {
 			"title": "Swift",
 			"owner": "chrischares"
@@ -1377,6 +1447,10 @@
 			"alias": ["uscript", "uc"],
 			"owner": "RunDevelopment"
 		},
+		"uorazor": {
+			"title": "UO Razor Script",
+			"owner": "jaseowns"
+		},
 		"uri": {
 			"title": "URI",
 			"alias": "url",