Ruby: Make strings greedy. Fixes #1048

PrismJS · Nov 9, 2016 · 8b0520a · 8b0520a
1 parent b42fa77
commit 8b0520a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/components/prism-ruby.js b/components/prism-ruby.js
@@ -71,37 +71,43 @@
 	Prism.languages.ruby.string = [
 		{
 			pattern: /%[qQiIwWxs]?([^a-zA-Z0-9\s\{\(\[<])(?:[^\\]|\\[\s\S])*?\1/,
+			greedy: true,
 			inside: {
 				'interpolation': interpolation
 			}
 		},
 		{
 			pattern: /%[qQiIwWxs]?\((?:[^()\\]|\\[\s\S])*\)/,
+			greedy: true,
 			inside: {
 				'interpolation': interpolation
 			}
 		},
 		{
 			// Here we need to specifically allow interpolation
 			pattern: /%[qQiIwWxs]?\{(?:[^#{}\\]|#(?:\{[^}]+\})?|\\[\s\S])*\}/,
+			greedy: true,
 			inside: {
 				'interpolation': interpolation
 			}
 		},
 		{
 			pattern: /%[qQiIwWxs]?\[(?:[^\[\]\\]|\\[\s\S])*\]/,
+			greedy: true,
 			inside: {
 				'interpolation': interpolation
 			}
 		},
 		{
 			pattern: /%[qQiIwWxs]?<(?:[^<>\\]|\\[\s\S])*>/,
+			greedy: true,
 			inside: {
 				'interpolation': interpolation
 			}
 		},
 		{
 			pattern: /("|')(#\{[^}]+\}|\\(?:\r?\n|\r)|\\?.)*?\1/,
+			greedy: true,
 			inside: {
 				'interpolation': interpolation
 			}

diff --git a/components/prism-ruby.min.js b/components/prism-ruby.min.js
diff --git a/tests/languages/ruby/string_feature.test b/tests/languages/ruby/string_feature.test
@@ -7,6 +7,7 @@ bar'
 "foo\
 bar"
 
+"foo #bar"
 "foo #{ 42 } bar"
 
 %!foo #{ 42 }!
@@ -44,6 +45,7 @@ bar"
 	["string", ["\"foo\""]],
 	["string", ["'foo\\\r\nbar'"]],
 	["string", ["\"foo\\\r\nbar\""]],
+	["string", ["\"foo #bar\""]],
 	["string", [
         "\"foo ",
         ["interpolation", [