improve function argument parsing (#130)

* fix issue 129

* strengthen test

* add test

* missing import

* add test for #120 too

* Revert "add test for #120 too"

This reverts commit f204cd3.

Author: ericphanson

Project.toml

@@ -1,7 +1,7 @@
 name = "ExplicitImports"
 uuid = "7d51a73a-1435-4ff3-83d9-f097790105c7"
 authors = ["Eric P. Hanson"]
-version = "1.13"
+version = "1.13.1"
 
 [deps]
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"

src/get_names_used.jl

@@ -196,8 +196,6 @@ end
 # check if `leaf` is a function argument (or kwarg), but not a default value etc,
 # which is part of a function definition (not just any function call)
 function is_non_anonymous_function_definition_arg(leaf)
-    # a call who is a child of `function` or `=` is a function def
-    # (I think!)
     if parents_match(leaf, (K"call",)) && call_is_func_def(parent(leaf))
         # We are a function arg if we're a child of `call` who is not the function name itself
         return child_index(leaf) != 1
@@ -241,7 +239,8 @@ function call_is_func_def(node)
     p === nothing && return false
     # note: macros only support full-form function definitions
     # (not inline)
-    kind(p) in (K"function", K"macro") && return true
+    # must be first child of function/macro to qualify
+    kind(p) in (K"function", K"macro") && child_index(node) == 1 && return true
     return false
 end
 

test/issue_129.jl

@@ -0,0 +1,12 @@
+module Foo129
+foo() = 3
+h(f) = 4
+h(f, f2) = 4
+module Bar
+using ..Foo129: foo, h
+bar() = h(foo)
+
+# we will test that the LHS foo is a function arg and the RHS ones are not
+bar2(x, foo) = h(foo, foo)
+end # Bar
+end # Foo129

test/runtests.jl

@@ -77,6 +77,7 @@ include("test_explicit_imports.jl")
 include("main.jl")
 include("Test_Mod_Underscores.jl")
 include("module_alias.jl")
+include("issue_129.jl")
 
 @testset "ExplicitImports" begin
     @testset "deprecations" begin
@@ -680,6 +681,12 @@ include("module_alias.jl")
         non_function_args = filter(!is_function_definition_arg, leaves)
         missed = filter(x -> get_val(x) === :a, non_function_args)
         @test isempty(missed)
+
+        # https://github.com/JuliaTesting/ExplicitImports.jl/issues/129
+        df = DataFrame(get_names_used("issue_129.jl").per_usage_info)
+        foos = subset(df, :name => ByRow(==(:foo)))
+        @test only(subset(foos, :function_arg).location) == "issue_129.jl:10:9"
+        check_no_stale_explicit_imports(Foo129, "issue_129.jl")
     end
 
     @testset "has_ancestor" begin