File ex_doc-0.23.0-git.patch of Package ex_doc

Overview Repositories Revisions Requests Users Attributes Meta

File ex_doc-0.23.0-git.patch of Package ex_doc (Revision 2f00c02f40f56313e0972319c413c879)

Currently displaying revision 2f00c02f40f56313e0972319c413c879 , Show latest

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 58a934e6..8454da99 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,8 +19,8 @@ jobs:
             elixir: 1.10.3
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.1
-      - uses: actions/setup-elixir@v1.3.0
+      - uses: actions/checkout@v2.3.3
+      - uses: actions/setup-elixir@v1.4.2
         with:
           otp-version: '${{matrix.otp}}'
           elixir-version: '${{matrix.elixir}}'
@@ -43,9 +43,9 @@ jobs:
     name: Check JS
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.1
+      - uses: actions/checkout@v2.3.3
       - name: Set up Node.js 10.x
-        uses: actions/setup-node@v1.4.2
+        uses: actions/setup-node@v1.4.4
         with:
           node-version: 10.10.0
       - run: npm install --prefix assets
diff --git a/README.md b/README.md
index 40a19f8f..f398ac89 100644
--- a/README.md
+++ b/README.md
@@ -32,17 +32,27 @@ ExDoc ships with many features:
 
 To use ExDoc in your Mix projects, first add ExDoc as a dependency.
 
-If you are using Elixir v1.7 and later:
+If you are using Elixir v1.10, or later:
 
 ```elixir
 def deps do
   [
-    {:ex_doc, "~> 0.22", only: :dev, runtime: false},
+    {:ex_doc, "~> 0.23", only: :dev, runtime: false},
   ]
 end
 ```
 
-If you are using Elixir v1.6 and earlier:
+If you are using Elixir v1.7, v1.8, or v1.9:
+
+```elixir
+def deps do
+  [
+    {:ex_doc, "~> 0.22.0", only: :dev, runtime: false},
+  ]
+end
+```
+
+If you are using Elixir v1.6, or earlier:
 
 ```elixir
 def deps do
diff --git a/lib/ex_doc/autolink.ex b/lib/ex_doc/autolink.ex
index 04701727..2b9c81c7 100644
--- a/lib/ex_doc/autolink.ex
+++ b/lib/ex_doc/autolink.ex
@@ -105,6 +105,7 @@ defmodule ExDoc.Autolink do
 
   defp build_extra_link(link, config) do
     with uri <- URI.parse(link),
+         nil <- uri.scheme,
          nil <- uri.host,
          true <- is_binary(uri.path),
          false <- uri.path =~ @ref_regex,
@@ -448,7 +449,7 @@ defmodule ExDoc.Autolink do
   end
 
   defp app_module_url(:ex_doc, module, config) do
-    ex_doc_app_url(module, config) <> inspect(module) <> config.ext
+    ex_doc_app_url(module, config, inspect(module), config.ext, "")
   end
 
   defp app_module_url(:otp, module, _config) do
@@ -459,12 +460,12 @@ defmodule ExDoc.Autolink do
 
   defp local_url(:type, name, arity, config, _original_text, _options)
        when {name, arity} in @basic_types do
-    ex_doc_app_url(Kernel, config) <> "typespecs" <> config.ext <> "#basic-types"
+    ex_doc_app_url(Kernel, config, "typespecs", config.ext, "#basic-types")
   end
 
   defp local_url(:type, name, arity, config, _original_text, _options)
        when {name, arity} in @built_in_types do
-    ex_doc_app_url(Kernel, config) <> "typespecs" <> config.ext <> "#built-in-types"
+    ex_doc_app_url(Kernel, config, "typespecs", config.ext, "#built-in-types")
   end
 
   defp local_url(kind, name, arity, config, original_text, options) do
@@ -532,17 +533,18 @@ defmodule ExDoc.Autolink do
     end
   end
 
-  defp ex_doc_app_url(module, config) do
+  defp ex_doc_app_url(module, config, path, ext, suffix) do
     case :application.get_application(module) do
       {:ok, app} ->
         if app in config.apps do
-          ""
+          path <> ext <> suffix
         else
-          Keyword.get_lazy(config.deps, app, fn -> @hexdocs <> "#{app}/" end)
+          Keyword.get_lazy(config.deps, app, fn -> @hexdocs <> "#{app}/" end) <>
+            path <> ".html" <> suffix
         end
 
       _ ->
-        ""
+        path <> ext <> suffix
     end
   end
 
diff --git a/test/ex_doc/autolink_test.exs b/test/ex_doc/autolink_test.exs
index 3773f170..64aa28c1 100644
--- a/test/ex_doc/autolink_test.exs
+++ b/test/ex_doc/autolink_test.exs
@@ -197,6 +197,10 @@ defmodule ExDoc.AutolinkTest do
       assert autolink("EarmarkParser.as_ast/2", deps: [earmark_parser: "https://example.com/"]) ==
                ~m"[`EarmarkParser.as_ast/2`](https://example.com/EarmarkParser.html#as_ast/2)"
 
+      # exrtensions are ignored as they are external links
+      assert autolink("EarmarkParser.as_ast/2", ext: ".xhtml") ==
+               ~m"[`EarmarkParser.as_ast/2`](https://hexdocs.pm/earmark_parser/EarmarkParser.html#as_ast/2)"
+
       assert_unchanged(":test_module.foo/0")
     end
 
@@ -425,6 +429,8 @@ defmodule ExDoc.AutolinkTest do
              "documentation references module \"Unknown\" but it is undefined"
 
     assert_unchanged(~m"`Unknown`")
+
+    assert_unchanged(~m"[Blank](about:blank)")
   end
 
   ## Helpers

Places

File ex_doc-0.23.0-git.patch of Package ex_doc (Revision 2f00c02f40f56313e0972319c413c879)

Places