Elixir: Fix empty comment + add test for issue #775

PrismJS · Sep 22, 2015 · ccb6566 · ccb6566
1 parent 2e637f0
commit ccb6566
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/components/prism-elixir.js b/components/prism-elixir.js
@@ -3,8 +3,8 @@ Prism.languages.elixir = {
 	// Negative look-behind is needed to avoid highlighting markdown headers in
 	// multi-line doc strings
 	'comment': {
-			pattern: /([^#])#(?![{#]).*/,
-			lookbehind: true
+		pattern: /(^|[^#])#(?![{#]).*/m,
+		lookbehind: true
 	},
 	// ~r"""foo""", ~r'''foo''', ~r/foo/, ~r|foo|, ~r"foo", ~r'foo', ~r(foo), ~r[foo], ~r{foo}, ~r<foo>
 	'regex': /~[rR](?:("""|'''|[\/|"'])(?:\\.|(?!\1)[^\\])+\1|\((?:\\\)|[^)])+\)|\[(?:\\\]|[^\]])+\]|\{(?:\\\}|[^}])+\}|<(?:\\>|[^>])+>)[uismxfr]*/,

diff --git a/components/prism-elixir.min.js b/components/prism-elixir.min.js
diff --git a/tests/languages/elixir/issue775.test b/tests/languages/elixir/issue775.test
@@ -0,0 +1,17 @@
+@doc """
+## Parameters
+"""
+
+----------------------------------------------------
+
+[
+	["attribute", "@doc"],
+	["string", [
+		"\"\"\"\r\n## Parameters\r\n\"\"\""
+	]]
+]
+
+----------------------------------------------------
+
+Ensures that markdown headers are not highlighted as comments inside strings.
+See #775 for details.