Transform languages to use the updated API

src/languages/actionscript.js

@@ -1,37 +1,30 @@
-import { insertBefore } from '../util/language-util.js';
 import javascript from './javascript.js';
 
 /** @type {import('../types.d.ts').LanguageProto<'actionscript'>} */
 export default {
 	id: 'actionscript',
 	base: javascript,
-	grammar ({ base }) {
-		const className = /** @type {GrammarToken} */ (base['class-name']);
-		className.alias = 'function';
-
-		delete base['doc-comment'];
-
-		// doesn't work with AS because AS is too complex
-		delete base['parameter'];
-		delete base['literal-property'];
-
-		insertBefore(base, 'string', {
-			'xml': {
-				pattern:
-					/(^|[^.])<\/?\w+(?:\s+[^\s>\/=]+=("|')(?:\\[\s\S]|(?!\2)[^\\])*\2)*\s*\/?>/,
-				lookbehind: true,
-				inside: 'markup',
-			},
-		});
-
+	grammar () {
 		return {
 			'keyword':
 				/\b(?:as|break|case|catch|class|const|default|delete|do|dynamic|each|else|extends|final|finally|for|function|get|if|implements|import|in|include|instanceof|interface|internal|is|namespace|native|new|null|override|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|use|var|void|while|with)\b/,
 			'operator': /\+\+|--|(?:[+\-*\/%^]|&&?|\|\|?|<<?|>>?>?|[!=]=?)=?|[~?@]/,
+			// doesn't work with AS because AS is too complex
+			$delete: ['doc-comment', 'parameter', 'literal-property'],
+			$merge: {
+				'class-name': {
+					alias: 'function',
+				},
+			},
+			$insert: {
+				'xml': {
+					$before: 'string',
+					pattern:
+						/(^|[^.])<\/?\w+(?:\s+[^\s>\/=]+=("|')(?:\\[\s\S]|(?!\2)[^\\])*\2)*\s*\/?>/,
+					lookbehind: true,
+					inside: 'markup',
+				},
+			},
 		};
 	},
 };
-
-/**
- * @typedef {import('../types.d.ts').GrammarToken} GrammarToken
- */

src/languages/aspnet.js

@@ -1,4 +1,3 @@
-import { insertBefore } from '../util/language-util.js';
 import csharp from './csharp.js';
 import markup from './markup.js';
 
@@ -16,42 +15,11 @@ export default {
 					pattern: /<%\s*?[$=%#:]{0,2}|%>/,
 					alias: 'tag',
 				},
-				$rest: /** @type {Grammar['$rest']} */ ('csharp'),
+				$rest: 'csharp',
 			},
 		});
 
-		const tag =
-			/** @type {GrammarToken & { inside: { 'attr-value': { inside: Grammar } } }} */ (
-				base['tag']
-			);
-
-		// Regexp copied from markup, with a negative look-ahead added
-		tag.pattern =
-			/<(?!%)\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+))?)*\s*\/?>/;
-
-		// match directives of attribute value foo="<% Bar %>"
-		insertBefore(tag.inside['attr-value'].inside, 'punctuation', {
-			'directive': directive,
-		});
-
-		insertBefore(base, 'comment', {
-			'asp-comment': {
-				pattern: /<%--[\s\S]*?--%>/,
-				alias: ['asp', 'comment'],
-			},
-		});
-
-		// script runat="server" contains csharp, not javascript
-		insertBefore(base, 'script' in base ? 'script' : 'tag', {
-			'asp-script': {
-				pattern: /(<script(?=.*runat=['"]?server\b)[^>]*>)[\s\S]*?(?=<\/script>)/i,
-				lookbehind: true,
-				alias: ['asp', 'script'],
-				inside: 'csharp',
-			},
-		});
-
-		return /** @type {Grammar} */ ({
+		return {
 			'page-directive': {
 				pattern: /<%\s*@.*%>/,
 				alias: 'tag',
@@ -61,15 +29,42 @@ export default {
 							/<%\s*@\s*(?:Assembly|Control|Implements|Import|Master(?:Type)?|OutputCache|Page|PreviousPageType|Reference|Register)?|%>/i,
 						alias: 'tag',
 					},
-					$rest: /** @type {Grammar['$rest']} */ (tag.inside),
+					$rest: /** @type {GrammarToken} */ (base['tag']).inside,
 				},
 			},
 			'directive': directive,
-		});
+			$merge: {
+				'tag': {
+					// Regexp copied from markup, with a negative look-ahead added
+					pattern:
+						/<(?!%)\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+))?)*\s*\/?>/,
+				},
+			},
+			$insertBefore: {
+				'tag/attr-value/punctuation': {
+					// match directives of attribute value foo="<% Bar %>"
+					'directive': directive,
+				},
+				'comment': {
+					'asp-comment': {
+						pattern: /<%--[\s\S]*?--%>/,
+						alias: ['asp', 'comment'],
+					},
+				},
+				// script runat="server" contains csharp, not javascript
+				['script' in base ? 'script' : 'tag']: {
+					'asp-script': {
+						pattern: /(<script(?=.*runat=['"]?server\b)[^>]*>)[\s\S]*?(?=<\/script>)/i,
+						lookbehind: true,
+						alias: ['asp', 'script'],
+						inside: 'csharp',
+					},
+				},
+			},
+		};
 	},
 };
 
 /**
- * @typedef {import('../types.d.ts').Grammar} Grammar
  * @typedef {import('../types.d.ts').GrammarToken} GrammarToken
  */

src/languages/birb.js

@@ -1,19 +1,10 @@
-import { insertBefore } from '../util/language-util.js';
 import clike from './clike.js';
 
 /** @type {import('../types.d.ts').LanguageProto<'birb'>} */
 export default {
 	id: 'birb',
 	base: clike,
-	grammar ({ base }) {
-		insertBefore(base, 'function', {
-			'metadata': {
-				pattern: /<\w+>/,
-				greedy: true,
-				alias: 'symbol',
-			},
-		});
-
+	grammar () {
 		return {
 			'string': {
 				pattern: /r?("|')(?:\\.|(?!\1)[^\\])*\1/,
@@ -29,6 +20,14 @@ export default {
 				/\b(?:assert|break|case|class|const|default|else|enum|final|follows|for|grab|if|nest|new|next|noSeeb|return|static|switch|throw|var|void|while)\b/,
 			'operator': /\+\+|--|&&|\|\||<<=?|>>=?|~(?:\/=?)?|[+\-*\/%&^|=!<>]=?|\?|:/,
 			'variable': /\b[a-z_]\w*\b/,
+			$insert: {
+				'metadata': {
+					$before: 'function',
+					pattern: /<\w+>/,
+					greedy: true,
+					alias: 'symbol',
+				},
+			},
 		};
 	},
 };

src/languages/bison.js

@@ -1,53 +1,49 @@
-import { insertBefore } from '../util/language-util.js';
 import c from './c.js';
 
 /** @type {import('../types.d.ts').LanguageProto<'bison'>} */
 export default {
 	id: 'bison',
 	base: c,
 	grammar ({ base }) {
-		insertBefore(base, 'comment', {
-			'bison': {
-				// This should match all the beginning of the file
-				// including the prologue(s), the bison declarations and
-				// the grammar rules.
-				pattern: /^(?:[^%]|%(?!%))*%%[\s\S]*?%%/,
-				inside: {
-					'c': {
-						// Allow for one level of nested braces
-						pattern: /%\{[\s\S]*?%\}|\{(?:\{[^}]*\}|[^{}])*\}/,
-						inside: /** @type {Grammar} */ ({
-							'delimiter': {
-								pattern: /^%?\{|%?\}$/,
-								alias: 'punctuation',
-							},
-							'bison-variable': {
-								pattern: /[$@](?:<[^\s>]+>)?[\w$]+/,
-								alias: 'variable',
-								inside: {
-									'punctuation': /<|>/,
+		return {
+			$insert: {
+				'bison': {
+					$before: 'comment',
+					// This should match all the beginning of the file
+					// including the prologue(s), the bison declarations and
+					// the grammar rules.
+					pattern: /^(?:[^%]|%(?!%))*%%[\s\S]*?%%/,
+					inside: {
+						'c': {
+							// Allow for one level of nested braces
+							pattern: /%\{[\s\S]*?%\}|\{(?:\{[^}]*\}|[^{}])*\}/,
+							inside: {
+								'delimiter': {
+									pattern: /^%?\{|%?\}$/,
+									alias: 'punctuation',
+								},
+								'bison-variable': {
+									pattern: /[$@](?:<[^\s>]+>)?[\w$]+/,
+									alias: 'variable',
+									inside: {
+										'punctuation': /<|>/,
+									},
 								},
+								$rest: 'c',
 							},
-							$rest: /** @type {Grammar['$rest']} */ ('c'),
-						}),
-					},
-					'comment': base.comment,
-					'string': base.string,
-					'property': /\S+(?=:)/,
-					'keyword': /%\w+/,
-					'number': {
-						pattern: /(^|[^@])\b(?:0x[\da-f]+|\d+)/i,
-						lookbehind: true,
+						},
+						'comment': base.comment,
+						'string': base.string,
+						'property': /\S+(?=:)/,
+						'keyword': /%\w+/,
+						'number': {
+							pattern: /(^|[^@])\b(?:0x[\da-f]+|\d+)/i,
+							lookbehind: true,
+						},
+						'punctuation': /%[%?]|[|:;\[\]<>]/,
 					},
-					'punctuation': /%[%?]|[|:;\[\]<>]/,
 				},
 			},
-		});
-
-		return {};
+		};
 	},
 };
-
-/**
- * @typedef {import('../types.d.ts').Grammar} Grammar
- */