Merge pull request #150 from lofcz/main

Fix razor + liquid render of tags with a dash symbol
microsoft · Jul 22, 2021 · c60db94 · c60db94
2 parents 52597f7 + d3e1f45
commit c60db94
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/liquid/liquid.ts b/src/liquid/liquid.ts
@@ -167,9 +167,9 @@ export const language = <languages.IMonarchLanguage>{
 			[/\{\%\s*comment\s*\%\}/, 'comment.start.liquid', '@comment'],
 			[/\{\{/, { token: '@rematch', switchTo: '@liquidState.root' }],
 			[/\{\%/, { token: '@rematch', switchTo: '@liquidState.root' }],
-			[/(<)(\w+)(\/>)/, ['delimiter.html', 'tag.html', 'delimiter.html']],
+			[/(<)([\w\-]+)(\/>)/, ['delimiter.html', 'tag.html', 'delimiter.html']],
 			[/(<)([:\w]+)/, ['delimiter.html', { token: 'tag.html', next: '@otherTag' }]],
-			[/(<\/)(\w+)/, ['delimiter.html', { token: 'tag.html', next: '@otherTag' }]],
+			[/(<\/)([\w\-]+)/, ['delimiter.html', { token: 'tag.html', next: '@otherTag' }]],
 			[/</, 'delimiter.html'],
 			[/\{/, 'delimiter.html'],
 			[/[^<{]+/] // text

diff --git a/src/razor/razor.ts b/src/razor/razor.ts
@@ -85,11 +85,11 @@ export const language = <languages.IMonarchLanguage>{
 			[/@[^@]/, { token: '@rematch', switchTo: '@razorInSimpleState.root' }],
 			[/<!DOCTYPE/, 'metatag.html', '@doctype'],
 			[/<!--/, 'comment.html', '@comment'],
-			[/(<)(\w+)(\/>)/, ['delimiter.html', 'tag.html', 'delimiter.html']],
+			[/(<)([\w\-]+)(\/>)/, ['delimiter.html', 'tag.html', 'delimiter.html']],
 			[/(<)(script)/, ['delimiter.html', { token: 'tag.html', next: '@script' }]],
 			[/(<)(style)/, ['delimiter.html', { token: 'tag.html', next: '@style' }]],
-			[/(<)([:\w]+)/, ['delimiter.html', { token: 'tag.html', next: '@otherTag' }]],
-			[/(<\/)(\w+)/, ['delimiter.html', { token: 'tag.html', next: '@otherTag' }]],
+			[/(<)([:\w\-]+)/, ['delimiter.html', { token: 'tag.html', next: '@otherTag' }]],
+			[/(<\/)([\w\-]+)/, ['delimiter.html', { token: 'tag.html', next: '@otherTag' }]],
 			[/</, 'delimiter.html'],
 			[/[ \t\r\n]+/], // whitespace
 			[/[^<@]+/] // text
@@ -453,9 +453,9 @@ export const language = <languages.IMonarchLanguage>{
 			[/'([^']*)'/, 'string.cs'],
 
 			// simple html
-			[/(<)(\w+)(\/>)/, ['delimiter.html', 'tag.html', 'delimiter.html']],
-			[/(<)(\w+)(>)/, ['delimiter.html', 'tag.html', 'delimiter.html']],
-			[/(<\/)(\w+)(>)/, ['delimiter.html', 'tag.html', 'delimiter.html']],
+			[/(<)([\w\-]+)(\/>)/, ['delimiter.html', 'tag.html', 'delimiter.html']],
+			[/(<)([\w\-]+)(>)/, ['delimiter.html', 'tag.html', 'delimiter.html']],
+			[/(<\/)([\w\-]+)(>)/, ['delimiter.html', 'tag.html', 'delimiter.html']],
 
 			// delimiters
 			[/[\+\-\*\%\&\|\^\~\!\=\<\>\/\?\;\:\.\,]/, 'delimiter.cs'],