Merge pull request #775 from danielberkompas/fix-elixir-markdown-docs

Highlight Elixir string markdown header correctly
PrismJS · Sep 22, 2015 · 2e637f0 · 2e637f0
2 parents 211a41c + 220f1df
commit 2e637f0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/components/prism-elixir.js b/components/prism-elixir.js
@@ -1,6 +1,11 @@
 Prism.languages.elixir = {
 	// Negative look-ahead is needed for string interpolation
-	'comment': /#(?!\{).*/,
+	// Negative look-behind is needed to avoid highlighting markdown headers in
+	// multi-line doc strings
+	'comment': {
+			pattern: /([^#])#(?![{#]).*/,
+			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]*/,
 	'string': [
@@ -81,4 +86,5 @@ Prism.languages.elixir.string.forEach(function(o) {
 			}
 		}
 	};
-});
+});
+
diff --git a/components/prism-elixir.min.js b/components/prism-elixir.min.js