Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/ex_doc/formatter/epub.ex
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ defmodule ExDoc.Formatter.EPUB do
config = normalize_config(config)
File.rm_rf!(config.output)
File.mkdir_p!(Path.join(config.output, "OEBPS"))
{project_nodes, autolink} = HTML.autolink_and_render(project_nodes, ".xhtml", config)
{project_nodes, compiled} = HTML.autolink_and_render(project_nodes, ".xhtml", config)

nodes_map = %{
modules: HTML.filter_list(:module, project_nodes),
exceptions: HTML.filter_list(:exception, project_nodes),
tasks: HTML.filter_list(:task, project_nodes)
}

extras = HTML.build_extras(config, autolink) |> group_extras()
extras = HTML.build_extras(config, compiled) |> group_extras()
config = %{config | extras: extras}

assets_dir = "OEBPS/assets"
Expand Down
24 changes: 12 additions & 12 deletions lib/ex_doc/formatter/html.ex
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ defmodule ExDoc.Formatter.HTML do
build = Path.join(config.output, ".build")
output_setup(build, config)

{project_nodes, autolink} = autolink_and_render(project_nodes, ".html", config)
extras = build_extras(config, autolink)
{project_nodes, compiled} = autolink_and_render(project_nodes, ".html", config)
extras = build_extras(config, compiled)

# Generate search early on without api reference in extras
static_files = generate_assets(config, @assets_dir, default_assets(config))
Expand Down Expand Up @@ -67,8 +67,8 @@ defmodule ExDoc.Formatter.HTML do
Autolinks and renders all docs.
"""
def autolink_and_render(project_nodes, ext, config) do
autolink = Autolink.compile(project_nodes, ext, config)
{project_nodes |> Autolink.all(autolink) |> render_docs(), autolink}
compiled = Autolink.compile(project_nodes, ext, config)
{project_nodes |> Autolink.all(compiled) |> render_docs(), compiled}
end

defp render_docs(nodes) do
Expand Down Expand Up @@ -218,32 +218,32 @@ defmodule ExDoc.Formatter.HTML do
@doc """
Builds extra nodes by normalizing the config entries.
"""
def build_extras(config, autolink) do
def build_extras(config, compiled) do
groups = config.groups_for_extras

config.extras
|> Task.async_stream(&build_extra(&1, autolink, groups), timeout: :infinity)
|> Task.async_stream(&build_extra(&1, compiled, groups), timeout: :infinity)
|> Enum.map(&elem(&1, 1))
|> Enum.sort_by(fn extra -> GroupMatcher.group_index(groups, extra.group) end)
end

defp build_extra({input, options}, autolink, groups) do
defp build_extra({input, options}, compiled, groups) do
input = to_string(input)
id = options[:filename] || input |> filename_to_title() |> text_to_id()
build_extra(input, id, options[:title], autolink, groups)
build_extra(input, id, options[:title], compiled, groups)
end

defp build_extra(input, autolink, groups) do
defp build_extra(input, compiled, groups) do
id = input |> filename_to_title() |> text_to_id()
build_extra(input, id, nil, autolink, groups)
build_extra(input, id, nil, compiled, groups)
end

defp build_extra(input, id, title, autolink, groups) do
defp build_extra(input, id, title, compiled, groups) do
if valid_extension_name?(input) do
content =
input
|> File.read!()
|> Autolink.project_doc(id, autolink)
|> Autolink.project_doc(id, compiled)

group = GroupMatcher.match_extra(groups, input)
html_content = Markdown.to_html(content, file: input, line: 1)
Expand Down
4 changes: 2 additions & 2 deletions lib/ex_doc/formatter/html/autolink.ex
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ defmodule ExDoc.Formatter.HTML.Autolink do
def project_doc(nil, _id, _compiled), do: nil

def project_doc(string, id, compiled) when is_binary(string) and is_map(compiled) do
config =
options =
compiled
|> Map.put(:id, id)
|> Map.put_new(:module_id, nil)
Expand All @@ -131,7 +131,7 @@ defmodule ExDoc.Formatter.HTML.Autolink do

string =
Enum.reduce(@regexes, string, fn {kind, language, link_type}, acc ->
link(acc, language, kind, link_type, config)
link(acc, language, kind, link_type, options)
end)

postprocess(string)
Expand Down