Fix so that fun() in Erlang does not try to generate any link (#2079)

elixir-lang · Jan 28, 2025 · c46b012 · c46b012
1 parent 344026c
commit c46b012
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -81,9 +81,11 @@ jobs:
           # Test Erlang without -doc attribute support
           - elixir: "1.16"
             otp: "26"
-          # Test Erlang with -doc attribute support
+          # Test with initial Erlang doc attribute support
           - elixir: "1.17"
             otp: "27"
+          - elixir: "1.18"
+            otp: "27"
             lint: true
     steps:
       - uses: actions/checkout@v3

diff --git a/lib/ex_doc/language/elixir.ex b/lib/ex_doc/language/elixir.ex
@@ -289,7 +289,7 @@ defmodule ExDoc.Language.Elixir do
         {:local, :..}
 
       ["//", "", ""] ->
-        {:local, :"..//"}
+        {:local, :..//}
 
       ["", ""] ->
         {:local, :.}

diff --git a/lib/ex_doc/language/erlang.ex b/lib/ex_doc/language/erlang.ex
@@ -571,7 +571,7 @@ defmodule ExDoc.Language.Erlang do
                 name == :record and acc != [] ->
                   {ast, acc}
 
-                name in [:"::", :when, :%{}, :{}, :|, :->, :...] ->
+                name in [:"::", :when, :%{}, :{}, :|, :->, :..., :fun] ->
                   {ast, acc}
 
                 # %{required(...) => ..., optional(...) => ...}

diff --git a/test/ex_doc/language/erlang_test.exs b/test/ex_doc/language/erlang_test.exs
@@ -814,6 +814,14 @@ defmodule ExDoc.Language.ErlangTest do
       end
     end
 
+    test "function - specific arity", c do
+      assert autolink_spec(~s"-spec foo() -> fun((t()) -> t()) | erlang_bar:t().", c) ==
+               ~s[foo() -> fun((<a href="#t:t/0">t</a>()) -> <a href="#t:t/0">t</a>()) | <a href="erlang_bar.html#t:t/0">erlang_bar:t</a>().]
+
+      assert autolink_spec(~s"-spec foo() -> fun((t(), t()) -> t()) | erlang_bar:t().", c) ==
+               ~s[foo() -> fun((<a href="#t:t/0">t</a>(), <a href="#t:t/0">t</a>()) -> <a href="#t:t/0">t</a>()) | <a href="erlang_bar.html#t:t/0">erlang_bar:t</a>().]
+    end
+
     test "local type", c do
       assert autolink_spec(~S"-spec foo() -> t().", c) ==
                ~s|foo() -> <a href="#t:t/0">t</a>().|