Ruby: Added missing regex interpolation (#2841)

PrismJS · Apr 3, 2021 · f08c2f7 · f08c2f7
1 parent 4ec7535
commit f08c2f7
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 32 deletions.
diff --git a/components/prism-ruby.js b/components/prism-ruby.js
@@ -53,9 +53,12 @@
 				}
 			},
 			{
-				pattern: /(^|[^/])\/(?!\/)(?:\[[^\r\n\]]+\]|\\.|[^[/\\\r\n])+\/[gim]{0,3}(?=\s*(?:$|[\r\n,.;})]))/,
+				pattern: /(^|[^/])\/(?!\/)(?:\[[^\r\n\]]+\]|\\.|[^[/\\\r\n])+\/[gim]{0,3}(?=\s*(?:$|[\r\n,.;})#]))/,
 				lookbehind: true,
-				greedy: true
+				greedy: true,
+				inside: {
+					'interpolation': interpolation
+				}
 			}
 		],
 		'variable': /[@$]+[a-zA-Z_]\w*(?:[?!]|\b)/,

diff --git a/components/prism-ruby.min.js b/components/prism-ruby.min.js
diff --git a/tests/languages/ruby/regex_feature.test b/tests/languages/ruby/regex_feature.test
@@ -1,45 +1,113 @@
 /[foo]\/bar/gim
 /[bar]/,
 /./i;
+/foo#{bar}/;
 %r!foo?bar#{39+3}!
 %r(foo?bar#{39+3})
 %r{foo?bar#{39+3}}
 %r[foo?bar#{39+3}]
 %r<foo?bar#{39+3}>
 
+/foo/ # comment
+/foo#{bar}/ # comment
+
 ----------------------------------------------------
 
 [
-	["regex", "/[foo]\\/bar/gim"],
-	["regex", "/[bar]/"], ["punctuation", ","],
-	["regex", "/./i"], ["punctuation", ";"],
-	["regex", ["%r!foo?bar", ["interpolation", [
-		["delimiter", "#{"],
-		["number", "39"], ["operator", "+"], ["number", "3"],
-		["delimiter", "}"]
-	]], "!"]],
-	["regex", ["%r(foo?bar", ["interpolation", [
-		["delimiter", "#{"],
-		["number", "39"], ["operator", "+"], ["number", "3"],
-		["delimiter", "}"]
-	]], ")"]],
-	["regex", ["%r{foo?bar", ["interpolation", [
-		["delimiter", "#{"],
-		["number", "39"], ["operator", "+"], ["number", "3"],
-		["delimiter", "}"]
-	]], "}"]],
-	["regex", ["%r[foo?bar", ["interpolation", [
-		["delimiter", "#{"],
-		["number", "39"], ["operator", "+"], ["number", "3"],
-		["delimiter", "}"]
-	]], "]"]],
-	["regex", ["%r<foo?bar", ["interpolation", [
-		["delimiter", "#{"],
-		["number", "39"], ["operator", "+"], ["number", "3"],
-		["delimiter", "}"]
-	]], ">"]]
+	["regex", ["/[foo]\\/bar/gim"]],
+
+	["regex", ["/[bar]/"]],
+	["punctuation", ","],
+
+	["regex", ["/./i"]],
+	["punctuation", ";"],
+
+	["regex", [
+		"/foo",
+		["interpolation", [
+			["delimiter", "#{"],
+			"bar",
+			["delimiter", "}"]
+		]],
+		"/"
+	]],
+	["punctuation", ";"],
+
+	["regex", [
+		"%r!foo?bar",
+		["interpolation", [
+			["delimiter", "#{"],
+			["number", "39"],
+			["operator", "+"],
+			["number", "3"],
+			["delimiter", "}"]
+		]],
+		"!"
+	]],
+
+	["regex", [
+		"%r(foo?bar",
+		["interpolation", [
+			["delimiter", "#{"],
+			["number", "39"],
+			["operator", "+"],
+			["number", "3"],
+			["delimiter", "}"]
+		]],
+		")"
+	]],
+
+	["regex", [
+		"%r{foo?bar",
+		["interpolation", [
+			["delimiter", "#{"],
+			["number", "39"],
+			["operator", "+"],
+			["number", "3"],
+			["delimiter", "}"]
+		]],
+		"}"
+	]],
+
+	["regex", [
+		"%r[foo?bar",
+		["interpolation", [
+			["delimiter", "#{"],
+			["number", "39"],
+			["operator", "+"],
+			["number", "3"],
+			["delimiter", "}"]
+		]],
+		"]"
+	]],
+
+	["regex", [
+		"%r<foo?bar",
+		["interpolation", [
+			["delimiter", "#{"],
+			["number", "39"],
+			["operator", "+"],
+			["number", "3"],
+			["delimiter", "}"]
+		]],
+		">"
+	]],
+
+	["regex", ["/foo/"]],
+	["comment", "# comment"],
+
+	["regex", [
+		"/foo",
+		["interpolation", [
+			["delimiter", "#{"],
+			"bar",
+			["delimiter", "}"]
+		]],
+		"/"
+	]],
+	["comment", "# comment"]
 ]
 
 ----------------------------------------------------
 
-Checks for regex.
+Checks for regex.