Ruby/ERB: Fixed block comments (#1768)

This fixes block comments in Ruby and ERB.

components/prism-erb.js

@@ -9,12 +9,12 @@
 	});
 
 	Prism.hooks.add('before-tokenize', function(env) {
-		var erbPattern = /<%=?[\s\S]+?%>/g;
+		var erbPattern = /<%=?(?:[^\r\n]|[\r\n](?!=begin)|[\r\n]=begin\s[\s\S]*?^=end)+?%>/gm;
 		Prism.languages['markup-templating'].buildPlaceholders(env, 'erb', erbPattern);
 	});
 
 	Prism.hooks.add('after-tokenize', function(env) {
 		Prism.languages['markup-templating'].tokenizePlaceholders(env, 'erb');
 	});
 
-}(Prism));
+}(Prism));

components/prism-ruby.js

@@ -9,7 +9,7 @@
 		'comment': [
 			/#.*/,
 			{
-				pattern: /^=begin(?:\r?\n|\r)(?:.*(?:\r?\n|\r))*?=end/m,
+				pattern: /^=begin\s[\s\S]*?^=end/m,
 				greedy: true
 			}
 		],

tests/languages/erb/issue1767.test

@@ -0,0 +1,56 @@
+<%# this is a block comment %>
+<%
+=begin %>
+	block comment
+	(both lines of both the begin and end tags must be at the start of their lines)
+<%
+=end %>
+
+<%# this is not %>
+	<%
+	=begin %>
+	not a comment
+	<%
+	=end %>
+
+----------------------------------------------------
+
+[
+	["erb", [
+		["delimiter", "<%"],
+		["comment", "# this is a block comment "],
+		["delimiter", "%>"]
+	]],
+
+	["erb", [
+		["delimiter", "<%"],
+		["comment", "=begin %>\n\tblock comment\n\t(both lines of both the begin and end tags must be at the start of their lines)\n<%\n=end"],
+		["delimiter", "%>"]
+	]],
+
+	["erb", [
+		["delimiter", "<%"],
+		["comment", "# this is not "],
+		["delimiter", "%>"]
+	]],
+
+	["erb", [
+		["delimiter", "<%"],
+		["operator", "="],
+		["keyword", "begin"],
+		["delimiter", "%>"]
+	]],
+
+	"\n\tnot a comment\n\t",
+
+	["erb", [
+		["delimiter", "<%"],
+		["operator", "="],
+		["keyword", "end"],
+		["delimiter", "%>"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for block comments (#1767).

tests/languages/ruby/comment_feature.test

@@ -5,6 +5,8 @@ foo bar baz
 =end
 =begin
 =end
+=begin foo
+=end
 #{comment}
 
 ----------------------------------------------------
@@ -14,9 +16,10 @@ foo bar baz
 	["comment", "# foobar"],
 	["comment", "=begin\r\nfoo bar baz\r\n=end"],
 	["comment", "=begin\r\n=end"],
+	["comment", "=begin foo\r\n=end"],
 	["comment", "#{comment}"]
 ]
 
 ----------------------------------------------------
 
-Checks for comments.
+Checks for comments.