don't skip source modules (#51)

ericphanson · May 25, 2024 · ff24993 · ff24993 · ericphanson · May 25, 2024
1 parent d46bc8e
commit ff24993
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "ExplicitImports"
 uuid = "7d51a73a-1435-4ff3-83d9-f097790105c7"
 authors = ["Eric P. Hanson"]
-version = "1.4.4"
+version = "1.4.5"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
@@ -16,9 +16,10 @@ JuliaSyntax = "0.4.8"
 LinearAlgebra = "<0.0.1, 1"
 Logging = "<0.0.1, 1"
 Markdown = "<0.0.1, 1"
+Pkg = "<0.0.1, 1"
+UUIDs = "<0.0.1, 1"
 TOML = "<0.0.1, 1"
 Test = "<0.0.1, 1"
-Pkg = "<0.0.1, 1"
 julia = "1.7"
 
 [extras]
@@ -28,7 +29,8 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Aqua", "DataFrames", "LinearAlgebra", "Logging", "Markdown", "Pkg", "Test"]
+test = ["Aqua", "DataFrames", "LinearAlgebra", "Logging", "Markdown", "Pkg", "UUIDs", "Test"]
diff --git a/src/ExplicitImports.jl b/src/ExplicitImports.jl
@@ -246,7 +246,6 @@ function explicit_imports_nonrecursive(mod::Module, file=pathof(mod);
     needed_names = Set(nt.name for nt in needs_explicit_import)
     filter!(all_implicit_imports) do (k, v)
         k in needed_names || return false
-        should_skip(v.source; skip) && return false
         any(mod -> should_skip(mod; skip), v.exporters) && return false
         return true
     end

diff --git a/test/examples.jl b/test/examples.jl
@@ -50,3 +50,10 @@ using ..Exporter2
 
 exported_a
 end
+
+# https://github.com/ericphanson/ExplicitImports.jl/issues/29
+module Mod29
+using UUIDs
+
+v = UUID[]
+end
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -8,7 +8,7 @@ using ExplicitImports: analyze_all_names, has_ancestor, should_skip,
 using Test
 using DataFrames
 using Aqua
-using Logging
+using Logging, UUIDs
 using AbstractTrees
 using ExplicitImports: is_function_definition_arg, SyntaxNodeWrapper, get_val
 using ExplicitImports: is_struct_type_param, is_struct_field_name, is_for_arg,
@@ -200,6 +200,17 @@ end
     @test contains(str, "- qr")
 end
 
+@testset "Don't skip source modules (#29)" begin
+    # In this case `UUID` is defined in Base but exported in UUIDs
+    ret = ExplicitImports.find_implicit_imports(Mod29)[:UUID]
+    @test ret.source == Base
+    @test ret.exporters == [UUIDs]
+    # We should NOT skip it, even though `skip` includes `Base`, since the exporters
+    # are not skipped.
+    statements = using_statement.(explicit_imports_nonrecursive(Mod29, "examples.jl"))
+    @test statements == ["using UUIDs: UUIDs", "using UUIDs: UUID"]
+end
+
 @testset "Exported module (#24)" begin
     statements = using_statement.(explicit_imports_nonrecursive(Mod24, "examples.jl"))
     # The key thing here is we do not have `using .Exporter: exported_a`,