Fix tests and latent bug around public symbols vs base exports (#96)

* add failing test

* fix test

* Update test/runtests.jl

* fix

* bugfix

Project.toml

@@ -1,7 +1,7 @@
 name = "ExplicitImports"
 uuid = "7d51a73a-1435-4ff3-83d9-f097790105c7"
 authors = ["Eric P. Hanson"]
-version = "1.10.1"
+version = "1.10.2"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

src/find_implicit_imports.jl

@@ -67,7 +67,15 @@ function find_implicit_imports(mod::Module; skip=(mod, Base, Core))
                     push!(es, e)
                 end
             end
-            mod_lookup[name] = (; source, exporters=es)
+            # if there are no matches (empty `es`), we will skip it
+            # This seemed to happen for `tryparse` in `Pkg.Types` which resolves to `Base.tryparse`
+            # and does not match `TOML.tryparse` which was the only candidate to compare to
+            # (since we want to skip `Base.tryparse` as `Base` is in `skip`)
+            # If there are no matches, such as in this case, we don't want to count it
+            # as an implicit import, since it is probably only from a module in `skip`.
+            if !isempty(es)
+                mod_lookup[name] = (; source, exporters=es)
+            end
         end
     end
     return mod_lookup

test/examples.jl

@@ -57,3 +57,19 @@ using UUIDs
 
 v = UUID[]
 end
+
+module ModWithTryparse
+using Main: @public
+
+@public tryparse
+function tryparse()
+    return 1
+end
+end
+# https://github.com/ericphanson/ExplicitImports.jl/issues/88
+module Mod88
+
+using ..ModWithTryparse
+
+tryparse
+end

test/public_compat.jl

@@ -4,8 +4,16 @@
     macro public_or_export(symbol::Symbol)
         return esc(Expr(:public, symbol))
     end
+    macro public(symbol::Symbol)
+        return esc(Expr(:public, symbol))
+    end
+
 else
     macro public_or_export(symbol::Symbol)
         return esc(Expr(:export, symbol))
     end
+    macro public(symbol::Symbol)
+        return nothing
+    end
+
 end

test/runtests.jl

@@ -601,6 +601,11 @@ end
     @test contains(str, "• qr")
 end
 
+@testset "Handle public symbols with same name as exported Base symbols (#88)" begin
+    statements = using_statement.(explicit_imports_nonrecursive(Mod88, "examples.jl"))
+    @test statements ==  ["using .ModWithTryparse: ModWithTryparse"]
+
+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]