aspnet

Author: DmitrySharabin

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
  */