updated tests, ran build

PrismJS · Feb 18, 2022 · 4277077 · 4277077
1 parent fa33e58
commit 4277077
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 10 deletions.
diff --git a/components/prism-cooklang.js b/components/prism-cooklang.js
@@ -1,5 +1,7 @@
 (function (Prism) {
 
+	// see https://github.com/cooklang/spec/blob/main/EBNF.md
+
 	var single_token_suffix = /(?:(?!\s)[\d$+<=a-zA-Z\x80-\uFFFF])+/.source;
 	var multi_token_infix = /[^{}@#]+/.source;
 	var multi_token_suffix = /\{[^}#@]*\}/.source;

diff --git a/components/prism-cooklang.min.js b/components/prism-cooklang.min.js
diff --git a/tests/languages/cooklang/ingredient_feature.test b/tests/languages/cooklang/ingredient_feature.test
@@ -8,8 +8,8 @@
 @milk{3|1%L}
 @milk{3*L} must not match amount-group
 @milk{3|L} 
-@milk{3%*L} must noch match amount-group
-@milk{3%*%L} must noch match amount-group
+@milk{3%*L}
+@milk{3%*%L}
 
 ----------------------------------------------------
 
@@ -101,7 +101,13 @@
 	["ingredient-group", [
 		["ingredient-keyword", "@"],
 		["ingredient", "milk"],
-		"{3*L}"
+		["amount-group", [
+			["punctuation", "{"],
+			["amount", "3"],
+			["servings-scaler", "*"],
+			"L",
+			["punctuation", "}"]
+		]]
 	]],
 	" must not match amount-group\r\n",
 
@@ -120,14 +126,24 @@
 	["ingredient-group", [
 		["ingredient-keyword", "@"],
 		["ingredient", "milk"],
-		"{3%*L}"
+		["amount-group", [
+			["punctuation", "{"],
+			["amount", "3"],
+			["unit-separator", "%"],
+			["unit", "*L"],
+			["punctuation", "}"]
+		]]
 	]],
-	" must noch match amount-group\r\n",
 
 	["ingredient-group", [
 		["ingredient-keyword", "@"],
 		["ingredient", "milk"],
-		"{3%*%L}"
-	]],
-	" must noch match amount-group"
+		["amount-group", [
+			["punctuation", "{"],
+			["amount", "3"],
+			["unit-separator", "%"],
+			["unit", "*%L"],
+			["punctuation", "}"]
+		]]
+	]]
 ]
diff --git a/tests/languages/cooklang/timer_feature.test b/tests/languages/cooklang/timer_feature.test
@@ -17,6 +17,7 @@
 			["punctuation", "}"]
 		]]
 	]],
+
 	["timer-group", [
 		["timer-keyword", "~"],
 		["timer", "eggs"],
@@ -28,7 +29,19 @@
 			["punctuation", "}"]
 		]]
 	]],
-	"\r\n~{abc%minutes} must not match\r\n",
+
+	["timer-group", [
+		["timer-keyword", "~"],
+		["duration-group", [
+			["punctuation", "{"],
+			"abc",
+			["operator", "%"],
+			["unit", "minutes"],
+			["punctuation", "}"]
+		]]
+	]],
+	" must not match\r\n",
+
 	["timer-group", [
 		["timer-keyword", "~"],
 		["timer", "eggs"],
@@ -40,6 +53,7 @@
 			["punctuation", "}"]
 		]]
 	]],
+
 	["timer-group", [
 		["timer-keyword", "~"],
 		["timer", "eggs"],