Liquid: Removed unmatchable object variants (#3135)

RunDevelopment · web-flow · commit 05e7ab045765 · 2021-10-05T23:38:00.000+02:00
diff --git a/components/prism-liquid.js b/components/prism-liquid.js
@@ -12,7 +12,7 @@ Prism.languages.liquid = {
 		greedy: true
 	},
 	'keyword': /\b(?:as|assign|break|(?:end)?(?:capture|case|comment|for|form|if|paginate|raw|style|tablerow|unless)|continue|cycle|decrement|echo|else|elsif|in|include|increment|limit|liquid|offset|range|render|reversed|section|when|with)\b/,
-	'object': /\b(?:address|all_country_option_tags|article|block|blog|cart|checkout|collection|color|comment|country|country_option_tags|currency|current_page|current_tags|customer|customer_address|date|discount_allocation|discount_application|external_video|filter|filter_value|font|forloop|form|fulfillment|generic_file|gift_card|group|handle|image|line_item|link|linklist|localization|location|measurement|media|metafield|model|model_source|order|page|page_description|page_image|page_title|paginate|part|policy|product|product_option|recommendations|request|robots|routes|rule|script|search|section|selling_plan|selling_plan_allocation|selling_plan_group|shipping_method|shop|shop_locale|sitemap|store_availability|tablerow|tax_line|template|theme|transaction|unit_price_measurement|user_agent|variant|video|video_source)\b/,
+	'object': /\b(?:address|all_country_option_tags|article|block|blog|cart|checkout|collection|color|country|country_option_tags|currency|current_page|current_tags|customer|customer_address|date|discount_allocation|discount_application|external_video|filter|filter_value|font|forloop|fulfillment|generic_file|gift_card|group|handle|image|line_item|link|linklist|localization|location|measurement|media|metafield|model|model_source|order|page|page_description|page_image|page_title|part|policy|product|product_option|recommendations|request|robots|routes|rule|script|search|selling_plan|selling_plan_allocation|selling_plan_group|shipping_method|shop|shop_locale|sitemap|store_availability|tax_line|template|theme|transaction|unit_price_measurement|user_agent|variant|video|video_source)\b/,
 	'function': [
 		{
 			pattern: /(\|\s*)\w+/,
diff --git a/components/prism-liquid.min.js b/components/prism-liquid.min.js
diff --git a/tests/languages/liquid/object_feature.test b/tests/languages/liquid/object_feature.test
@@ -7,7 +7,6 @@
 {{ checkout }}
 {{ collection }}
 {{ color }}
-{{ comment }}
 {{ country }}
 {{ country_option_tags }}
 {{ currency }}
@@ -23,7 +22,6 @@
 {{ filter_value }}
 {{ font }}
 {{ forloop }}
-{{ form }}
 {{ fulfillment }}
 {{ generic_file }}
 {{ gift_card }}
@@ -45,7 +43,6 @@
 {{ page_description }}
 {{ page_image }}
 {{ page_title }}
-{{ paginate }}
 {{ part }}
 {{ policy }}
 {{ product }}
@@ -57,7 +54,6 @@
 {{ rule }}
 {{ script }}
 {{ search }}
-{{ section }}
 {{ selling_plan }}
 {{ selling_plan_allocation }}
 {{ selling_plan_group }}
@@ -66,7 +62,6 @@
 {{ shop_locale }}
 {{ sitemap }}
 {{ store_availability }}
-{{ tablerow }}
 {{ tax_line }}
 {{ template }}
 {{ theme }}
@@ -125,11 +120,6 @@
 		["object", "color"],
 		["delimiter", "}}"]
 	]],
-	["liquid", [
-		["delimiter", "{{"],
-		["keyword", "comment"],
-		["delimiter", "}}"]
-	]],
 	["liquid", [
 		["delimiter", "{{"],
 		["object", "country"],
@@ -205,11 +195,6 @@
 		["object", "forloop"],
 		["delimiter", "}}"]
 	]],
-	["liquid", [
-		["delimiter", "{{"],
-		["keyword", "form"],
-		["delimiter", "}}"]
-	]],
 	["liquid", [
 		["delimiter", "{{"],
 		["object", "fulfillment"],
@@ -315,11 +300,6 @@
 		["object", "page_title"],
 		["delimiter", "}}"]
 	]],
-	["liquid", [
-		["delimiter", "{{"],
-		["keyword", "paginate"],
-		["delimiter", "}}"]
-	]],
 	["liquid", [
 		["delimiter", "{{"],
 		["object", "part"],
@@ -375,11 +355,6 @@
 		["object", "search"],
 		["delimiter", "}}"]
 	]],
-	["liquid", [
-		["delimiter", "{{"],
-		["keyword", "section"],
-		["delimiter", "}}"]
-	]],
 	["liquid", [
 		["delimiter", "{{"],
 		["object", "selling_plan"],
@@ -420,11 +395,6 @@
 		["object", "store_availability"],
 		["delimiter", "}}"]
 	]],
-	["liquid", [
-		["delimiter", "{{"],
-		["keyword", "tablerow"],
-		["delimiter", "}}"]
-	]],
 	["liquid", [
 		["delimiter", "{{"],
 		["object", "tax_line"],

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ Prism.languages.liquid = {`
`12`	`12`	`greedy: true`
`13`	`13`	`},`
`14`	`14`	`'keyword': /\b(?:as\|assign\|break\|(?:end)?(?:capture\|case\|comment\|for\|form\|if\|paginate\|raw\|style\|tablerow\|unless)\|continue\|cycle\|decrement\|echo\|else\|elsif\|in\|include\|increment\|limit\|liquid\|offset\|range\|render\|reversed\|section\|when\|with)\b/,`
`15`		- 'object': /\b(?:address\|all_country_option_tags\|article\|block\|blog\|cart\|checkout\|collection\|color\|comment\|country\|country_option_tags\|currency\|current_page\|current_tags\|customer\|customer_address\|date\|discount_allocation\|discount_application\|external_video\|filter\|filter_value\|font\|forloop\|form\|fulfillment\|generic_file\|gift_card\|group\|handle\|image\|line_item\|link\|linklist\|localization\|location\|measurement\|media\|metafield\|model\|model_source\|order\|page\|page_description\|page_image\|page_title\|paginate\|part\|policy\|product\|product_option\|recommendations\|request\|robots\|routes\|rule\|script\|search\|section\|selling_plan\|selling_plan_allocation\|selling_plan_group\|shipping_method\|shop\|shop_locale\|sitemap\|store_availability\|tablerow\|tax_line\|template\|theme\|transaction\|unit_price_measurement\|user_agent\|variant\|video\|video_source)\b/,
	`15`	+ 'object': /\b(?:address\|all_country_option_tags\|article\|block\|blog\|cart\|checkout\|collection\|color\|country\|country_option_tags\|currency\|current_page\|current_tags\|customer\|customer_address\|date\|discount_allocation\|discount_application\|external_video\|filter\|filter_value\|font\|forloop\|fulfillment\|generic_file\|gift_card\|group\|handle\|image\|line_item\|link\|linklist\|localization\|location\|measurement\|media\|metafield\|model\|model_source\|order\|page\|page_description\|page_image\|page_title\|part\|policy\|product\|product_option\|recommendations\|request\|robots\|routes\|rule\|script\|search\|selling_plan\|selling_plan_allocation\|selling_plan_group\|shipping_method\|shop\|shop_locale\|sitemap\|store_availability\|tax_line\|template\|theme\|transaction\|unit_price_measurement\|user_agent\|variant\|video\|video_source)\b/,
`16`	`16`	`'function': [`
`17`	`17`	`{`
`18`	`18`	`pattern: /(\\|\s*)\w+/,`