Improve patterns for Nevod language.

PrismJS · Mar 12, 2021 · 7058f1a · 7058f1a
1 parent 483d8df
commit 7058f1a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/components/prism-nevod.js b/components/prism-nevod.js
@@ -4,19 +4,21 @@ Prism.languages.nevod = {
 		pattern: /(?:"(?:""|[^"])*"(?!")|'(?:''|[^'])*'(?!'))!?\*?/,
 		greedy: true,
 		inside: {
-			'modifiers': /!$|!\*$|\*$/,
+			'string-attrs': /!$|!\*$|\*$/,
 		},
 	},
 	'namespace': {
 		pattern: /(@namespace\s+)[a-zA-Z0-9\-.]+(?=\s*{)/,
 		lookbehind: true,
 	},
 	'pattern': {
-		pattern: /(@pattern\s+)?#?[a-zA-Z0-9\-.]+\s*(?:(?:[(]\s*(?:(?:~\s*)?[a-zA-Z0-9\-.]+\s*(?:,\s*(?:(?:~\s*)?[a-zA-Z0-9\-.]*))*)[)])\s*)?(?:=)/,
-		alias: 'class-name',
+		pattern: /(@pattern\s+)?#?[a-zA-Z0-9\-.]+(?:\s*(?:[(]\s*(?:(?:~\s*)?[a-zA-Z0-9\-.]+\s*(?:,\s*(?:(?:~\s*)?[a-zA-Z0-9\-.]*))*)[)]))?(?=\s*=)/,
 		lookbehind: true,
 		inside: {
-			'name': /#?[a-zA-Z0-9\-.]+/,
+			'pattern-name': {
+				pattern: /#?[a-zA-Z0-9\-.]+/,
+				alias: 'class-name',
+			},
 			'attributes': {
 				pattern: /\(.*\)/,
 				inside: {

diff --git a/components/prism-nevod.min.js b/components/prism-nevod.min.js
diff --git a/tests/languages/nevod/string_feature.test b/tests/languages/nevod/string_feature.test
@@ -14,11 +14,11 @@
 	["string", ["\"text in double quotes\""]],
 	["string", ["\"\""]],
 	["string", ["'text in single quotes'"]],
-	["string", ["'case-sensitive text'", ["modifiers", "!"]]],
+	["string", ["'case-sensitive text'", ["string-attrs", "!"]]],
 	["string", ["'text ''Nevod'' in quotes'"]],
 	["string", ["\"text \"\"Nevod\"\" in double quotes\""]],
-	["string", ["'text prefix'", ["modifiers", "*"]]],
-	["string", ["'case-sensitive text prefix'", ["modifiers", "!*"]]],
+	["string", ["'text prefix'", ["string-attrs", "*"]]],
+	["string", ["'case-sensitive text prefix'", ["string-attrs", "!*"]]],
 	["string", ["''"]]
 ]