Merge pull request #3226 from luisscholl-at-software-ag/html-syntax-h…

…ighlighting-script-type-module Add script type module syntax highlighting to html
microsoft · Aug 3, 2022 · acc3d9a · acc3d9a
2 parents f90ab42 + 83cb8fa
commit acc3d9a
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/src/basic-languages/html/html.test.ts b/src/basic-languages/html/html.test.ts
@@ -396,6 +396,32 @@ testTokenization(
 			}
 		],
 
+		// Embedded Content #10
+		[
+			{
+				line: '<script type="module">var i= 10;</script>',
+				tokens: [
+					{ startIndex: 0, type: 'delimiter.html' },
+					{ startIndex: 1, type: 'tag.html' },
+					{ startIndex: 7, type: '' },
+					{ startIndex: 8, type: 'attribute.name.html' },
+					{ startIndex: 12, type: 'delimiter.html' },
+					{ startIndex: 13, type: 'attribute.value.html' },
+					{ startIndex: 21, type: 'delimiter.html' },
+					{ startIndex: 22, type: 'keyword.js' },
+					{ startIndex: 25, type: '' },
+					{ startIndex: 26, type: 'identifier.js' },
+					{ startIndex: 27, type: 'delimiter.js' },
+					{ startIndex: 28, type: '' },
+					{ startIndex: 29, type: 'number.js' },
+					{ startIndex: 31, type: 'delimiter.js' },
+					{ startIndex: 32, type: 'delimiter.html' },
+					{ startIndex: 34, type: 'tag.html' },
+					{ startIndex: 40, type: 'delimiter.html' }
+				]
+			}
+		],
+
 		// Tag with Attribute
 		[
 			{

diff --git a/src/basic-languages/html/html.ts b/src/basic-languages/html/html.ts
@@ -160,6 +160,20 @@ export const language = <languages.IMonarchLanguage>{
 
 		// After <script ... type =
 		scriptAfterTypeEquals: [
+			[
+				/"module"/,
+				{
+					token: 'attribute.value',
+					switchTo: '@scriptWithCustomType.text/javascript'
+				}
+			],
+			[
+				/'module'/,
+				{
+					token: 'attribute.value',
+					switchTo: '@scriptWithCustomType.text/javascript'
+				}
+			],
 			[
 				/"([^"]*)"/,
 				{