Fix Utilities.submodules for module aliases (#852)

Fix #851, module aliases confuse Utilities.submodules. (cherry picked from commit fdddf00)
JuliaDocs · Oct 14, 2018 · f75cf92 · f75cf92
1 parent af989ce
commit f75cf92
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Utilities/Utilities.jl b/src/Utilities/Utilities.jl
@@ -178,7 +178,7 @@ function submodules(root::Module, seen = Set{Module}())
  for name in Compat.names(root, all=true)
  if Base.isidentifier(name) && isdefined(root, name) && !isdeprecated(root, name)
  object = getfield(root, name)
- if isa(object, Module) && !(object in seen)
+ if isa(object, Module) && !(object in seen) && parentmodule(object::Module) == root
  submodules(object, seen)
  end
  end

diff --git a/test/utilities.jl b/test/utilities.jl
@@ -38,6 +38,17 @@ export OuterModule
 end
 end
 
+module ExternalModule end
+module ModuleWithAliases
+using ..ExternalModule
+Y = ExternalModule
+module A
+ module B
+ const X = Main
+ end
+end
+end
+
 @testset "Utilities" begin
  let doc = @doc(length)
  a = Documenter.Utilities.filterdocs(doc, Set{Module}())
@@ -69,6 +80,7 @@ end
  @test OuterModule in Documenter.Utilities.submodules(OuterModule)
  @test OuterModule.InnerModule in Documenter.Utilities.submodules(OuterModule)
  @test length(Documenter.Utilities.submodules(OuterModule)) == 2
+ @test Documenter.Utilities.submodules(ModuleWithAliases) == Set([ModuleWithAliases, ModuleWithAliases.A, ModuleWithAliases.A.B])
 
  @test Documenter.Utilities.isabsurl("file.md") === false
  @test Documenter.Utilities.isabsurl("../file.md") === false