Don't crash on markdown that triggers warning, fixes #1222

Author: wojtekmach

lib/ex_doc/markdown/earmark.ex

@@ -44,13 +44,13 @@ defmodule ExDoc.Markdown.Earmark do
 
       {:error, ast, messages} ->
         print_messages(messages, options)
-        ast
+        fixup(ast)
     end
   end
 
   defp print_messages(messages, options) do
     for {severity, line, message} <- messages do
-      file = options.file
+      file = options[:file]
       IO.warn("#{inspect(__MODULE__)} (#{severity}) #{file}:#{line} #{message}", [])
     end
   end
@@ -71,8 +71,7 @@ defmodule ExDoc.Markdown.Earmark do
     fixup({tag, attrs, ast})
   end
 
-  # E.g. `{:comment, _}`
-  defp fixup(_) do
+  defp fixup({:comment, _, _, _}) do
     []
   end
 

test/ex_doc/autolink_test.exs

@@ -218,16 +218,16 @@ defmodule ExDoc.AutolinkTest do
 
     test "special case links" do
       assert autolink(~m"`//2`") ==
-                {:a, [href: "https://hexdocs.pm/elixir/Kernel.html#//2"], [ast("//2")]}
+               {:a, [href: "https://hexdocs.pm/elixir/Kernel.html#//2"], [ast("//2")]}
 
       assert autolink(~m"[division](`//2`)") ==
-                {:a, [href: "https://hexdocs.pm/elixir/Kernel.html#//2"], ["division"]}
+               {:a, [href: "https://hexdocs.pm/elixir/Kernel.html#//2"], ["division"]}
 
       assert autolink(~m"`Kernel.//2`") ==
-                {:a, [href: "https://hexdocs.pm/elixir/Kernel.html#//2"], [ast("Kernel.//2")]}
+               {:a, [href: "https://hexdocs.pm/elixir/Kernel.html#//2"], [ast("Kernel.//2")]}
 
       assert autolink(~m"[division](`Kernel.//2`)") ==
-                {:a, [href: "https://hexdocs.pm/elixir/Kernel.html#//2"], ["division"]}
+               {:a, [href: "https://hexdocs.pm/elixir/Kernel.html#//2"], ["division"]}
     end
 
     test "other link" do

test/ex_doc/markdown/earmark_test.exs

@@ -19,5 +19,12 @@ defmodule ExDoc.Markdown.EarmarkTest do
     test "comments" do
       assert Markdown.to_ast("<!-- INCLUDE -->", []) == []
     end
+
+    test "bug #1222" do
+      assert ExUnit.CaptureIO.capture_io(:stderr, fn ->
+               assert [{:p, [], _}] =
+                        Markdown.to_ast("{:ok, status, %MyApp.User{}} on success", [])
+             end) =~ "ExDoc.Markdown.Earmark (warning)"
+    end
   end
 end