Skip to content

Commit 54515bf

Browse files
committed
Distinguish source_anno from doc_anno, see #14595
1 parent 9d4c91b commit 54515bf

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

lib/elixir/src/elixir_erl.erl

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -593,15 +593,12 @@ get_moduledoc_meta(Set) ->
593593

594594
get_docs(Set, Module, Definitions, Kind) ->
595595
[{Key,
596-
maybe_generated(erl_anno:new(Line), Ctx),
596+
erl_anno:new(Line),
597597
[signature_to_binary(Module, Name, Signature)],
598598
doc_value(Doc, Name),
599599
Meta#{source_annos => [?ann(DefinitionMeta)]}
600600
} || {{Name, Arity}, DefinitionMeta} <- Definitions,
601-
{Key, Ctx, Line, Signature, Doc, Meta} <- ets:lookup(Set, {Kind, Name, Arity})].
602-
603-
maybe_generated(Ann, nil) -> Ann;
604-
maybe_generated(Ann, _Ctx) -> erl_anno:set_generated(true, Ann).
601+
{Key, _Ctx, Line, Signature, Doc, Meta} <- ets:lookup(Set, {Kind, Name, Arity})].
605602

606603
get_callback_docs(Set, Callbacks) ->
607604
[{Key,

lib/elixir/test/elixir/kernel/docs_test.exs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ defmodule Kernel.DocsTest do
430430
write_beam(
431431
defmodule ToBeUsed do
432432
defmacro __using__(_) do
433-
quote do
433+
quote generated: true do
434434
@doc "Hello"
435435
def foo, do: :bar
436436
end
@@ -446,11 +446,12 @@ defmodule Kernel.DocsTest do
446446

447447
{:docs_v1, _, _, _, _, _, docs} = Code.fetch_docs(WillBeUsing)
448448

449-
location = :erl_anno.new(line + 15)
449+
doc_anno = :erl_anno.new(line + 15)
450+
source_anno = :erl_anno.set_generated(true, :erl_anno.new(line + 15))
450451

451452
assert [
452-
{{:function, :foo, 0}, [generated: true, location: ^location], ["foo()"],
453-
%{"en" => "Hello"}, %{}}
453+
{{:function, :foo, 0}, ^doc_anno, ["foo()"], %{"en" => "Hello"},
454+
%{source_annos: [^source_anno]}}
454455
] = docs
455456
end
456457
end

0 commit comments

Comments
 (0)