[~breaking] Fix issue where explicitly imported macros aren't detected as imported (#159)

* Fix issue where explicitly imported macros aren't detected as imported

* tweak test running to show errors better

Author: ericphanson

integration/runtest.jl

@@ -14,7 +14,7 @@ end
     for dir in selected_dirs
         isfile(joinpath(dir, "check.jl")) || continue
         @info "Running integration tests for $(basename(dir))"
-        @test success(`$(Base.julia_cmd()) --project=$dir -e 'using Pkg; Pkg.instantiate()'`)
-        @test success(`$(Base.julia_cmd()) --project=$dir $dir/check.jl`)
+        run(`$(Base.julia_cmd()) --project=$dir -e 'using Pkg; Pkg.instantiate()'`)
+        run(`$(Base.julia_cmd()) --project=$dir $dir/check.jl`)
     end
 end

src/get_names_used.jl

@@ -119,7 +119,7 @@ end
 # figure out if `leaf` is part of an import or using statement
 # this seems to trigger for both `X` and `y` in `using X: y`, but that seems alright.
 function analyze_import_type(leaf)
-    kind(leaf) == K"Identifier" || return :not_import
+    kind(leaf) in (K"Identifier", K"MacroName", K"StringMacroName") || return :not_import
     has_parent(leaf) || return :not_import
     is_import = parents_match(leaf, (K"importpath",))
     is_import || return :not_import

test/issue_97.jl

@@ -0,0 +1,22 @@
+# https://github.com/JuliaTesting/ExplicitImports.jl/issues/97
+module ArgCheck
+
+export @argcheck
+
+macro argcheck(ex)
+    return esc(ex)
+end
+
+end # module
+
+module Issue97
+
+using ..ArgCheck
+using ..ArgCheck: ArgCheck, @argcheck
+
+function positive(x)
+    @argcheck x > 0
+    return x
+end
+
+end # module

test/issue_97_test.jl

@@ -0,0 +1,17 @@
+issue_path = joinpath(@__DIR__, "issue_97.jl")
+include(issue_path)
+
+@testset "Issue #97: macro explicit imports" begin
+    # Issue97 does `using ..ArgCheck` plus `using ..ArgCheck: ArgCheck, @argcheck`.
+    # The macro is explicitly imported, so check_no_implicit_imports should pass.
+    @test check_no_implicit_imports(Issue97, issue_path) === nothing
+    @test check_no_stale_explicit_imports(Issue97, issue_path) === nothing
+
+    analysis = ExplicitImports.get_names_used(issue_path).per_usage_info
+    argcheck_usages = filter(analysis) do nt
+        nt.name == Symbol("@argcheck") && nt.module_path == [:Issue97]
+    end
+
+    @test getfield.(argcheck_usages, :analysis_code) ==
+          [ExplicitImports.IgnoredImportRHS, ExplicitImports.External]
+end

test/runtests.jl

@@ -109,6 +109,10 @@ include("issue_140.jl")
         include("issue_111_test.jl")
     end
 
+    @testset "Macro explicit imports (#97)" begin
+        include("issue_97_test.jl")
+    end
+
     @testset "module aliases (#106)" begin
         # https://github.com/JuliaTesting/ExplicitImports.jl/issues/106
         ret = Dict(improper_explicit_imports(ModAlias, "module_alias.jl"))