Eiffel: Fix verbatim strings. Fix #1379

PrismJS · Apr 7, 2018 · 04df41b · 04df41b
1 parent 218f160
commit 04df41b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/components/prism-eiffel.js b/components/prism-eiffel.js
@@ -3,12 +3,12 @@ Prism.languages.eiffel = {
 	'string': [
 		// Aligned-verbatim-strings
 		{
-			pattern: /"([^[]*)\[[\s\S]+?\]\1"/,
+			pattern: /"([^[]*)\[[\s\S]*?\]\1"/,
 			greedy: true
 		},
 		// Non-aligned-verbatim-strings
 		{
-			pattern: /"([^{]*)\{[\s\S]+?\}\1"/,
+			pattern: /"([^{]*)\{[\s\S]*?\}\1"/,
 			greedy: true
 		},
 		// Single-line string

diff --git a/components/prism-eiffel.min.js b/components/prism-eiffel.min.js
diff --git a/tests/languages/eiffel/string_feature.test b/tests/languages/eiffel/string_feature.test
@@ -3,10 +3,12 @@
 "foo%
 %bar"
 
+"[]"
 "[fo"o
 bar]"
 "!-[fo"o[]
 bar]!-"
+"{}"
 "{fo"o
 bar}"
 "*?{fo"o{}
@@ -19,8 +21,10 @@ bar}*?"
 	["string", "\"fo%\"o\""],
 	["string", "\"foo%\r\n%bar\""],
 
+	["string", "\"[]\""],
 	["string", "\"[fo\"o\r\nbar]\""],
 	["string", "\"!-[fo\"o[]\r\nbar]!-\""],
+	["string", "\"{}\""],
 	["string", "\"{fo\"o\r\nbar}\""],
 	["string", "\"*?{fo\"o{}\r\nbar}*?\""]
 ]