Avoid unnecessary work

Author: josevalim

lib/ex_doc/formatter/html/search_data.ex

@@ -58,6 +58,7 @@ defmodule ExDoc.Formatter.HTML.SearchData do
   end
 
   defp module(%ExDoc.ModuleNode{} = node) do
+    # TODO: This should work on DocAST
     {intro, sections} = extract_sections(node.doc_format, node)
 
     module =
@@ -132,6 +133,7 @@ defmodule ExDoc.Formatter.HTML.SearchData do
     {"", []}
   end
 
+  # TODO: This should work on DocAST when we prebuild extra.
   defp extract_sections_from_markdown(string) do
     [intro | sections] =
       Regex.split(~r/(?<!#)###? (?<header>\b.+)/, string, include_captures: true)

lib/ex_doc/formatter/html/templates.ex

@@ -184,9 +184,7 @@ defmodule ExDoc.Formatter.HTML.Templates do
   defp sidebar_type(:livemd), do: "extras"
   defp sidebar_type(:extra), do: "extras"
 
-  # TODO: Move link_headings and friends to html.ex (possibly via DocAST)
-  # or even to autolinking code, so content is built with it upfront instead
-  # of added at the template level.
+  # TODO: Adding the link headings must be done via DocAST instead of using regexes.
 
   @doc """
   Add link headings for the given `content`.
@@ -203,7 +201,7 @@ defmodule ExDoc.Formatter.HTML.Templates do
     ~r/<(h[23]).*?>(.*?)<\/\1>/m
     |> Regex.scan(content)
     |> Enum.reduce({content, %{}}, fn [match, tag, title], {content, occurrences} ->
-      possible_id = text_to_id(title)
+      possible_id = title |> ExDoc.Utils.strip_tags() |> text_to_id()
       id_occurred = Map.get(occurrences, possible_id, 0)
 
       anchor_id = if id_occurred >= 1, do: "#{possible_id}-#{id_occurred}", else: possible_id

lib/ex_doc/utils.ex

@@ -102,7 +102,6 @@ defmodule ExDoc.Utils do
 
   def text_to_id(text) when is_binary(text) do
     text
-    |> strip_tags()
     |> String.replace(~r/&#\d+;/, "")
     |> String.replace(~r/&[A-Za-z0-9]+;/, "")
     |> String.replace(~r/\W+/u, "-")

test/ex_doc/utils_test.exs

@@ -100,6 +100,5 @@ defmodule ExDoc.UtilsTest do
     assert Utils.text_to_id(" ☃ ") == ""
     assert Utils.text_to_id(" ² ") == ""
     assert Utils.text_to_id(" ⏜ ") == ""
-    assert Utils.text_to_id("Git opts (<code class=\"inline\">:git</code>)") == "git-opts-git"
   end
 end