Fix regexp patterns and tests for Nevod language.

PrismJS · Mar 18, 2021 · 66037d9 · 66037d9
1 parent f971bae
commit 66037d9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/components/prism-nevod.js b/components/prism-nevod.js
@@ -12,7 +12,7 @@ Prism.languages.nevod = {
 		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*=)/,
+		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: {
 			'pattern-name': {
@@ -49,7 +49,7 @@ Prism.languages.nevod = {
 				alias: 'builtin',
 			},
 			'quantifier': {
-				pattern: /\b\d+\s*(?:\+|-\s*\d+)?(?=\W)/,
+				pattern: /\b\d+(?:\s*\+|\s*-\s*\d+)?(?!\w)/,
 				alias: 'number',
 			},
 			'standard-pattern-attr': {
@@ -60,7 +60,7 @@ Prism.languages.nevod = {
 		},
 	},
 	'quantifier': {
-		pattern: /\b\d+\s*(?:\+|-\s*\d+)?(?=\W)/,
+		pattern: /\b\d+(?:\s*\+|\s*-\s*\d+)?(?!\w)/,
 		alias: 'number',
 	},
 	'operator': [

diff --git a/components/prism-nevod.min.js b/components/prism-nevod.min.js
diff --git a/tests/languages/nevod/keyword_feature.test b/tests/languages/nevod/keyword_feature.test
@@ -1,11 +1,13 @@
+@require @namespace @pattern @search
 @inside @outside @having
-@search @where
+@where
 
 ----------------------------------------------------
 
 [
+	["keyword", "@require"], ["keyword", "@namespace"], ["keyword", "@pattern"], ["keyword", "@search"], 
 	["keyword", "@inside"], ["keyword", "@outside"], ["keyword", "@having"],
-	["keyword", "@search"], ["keyword", "@where"]
+	["keyword", "@where"]
 ]
 
 ----------------------------------------------------