Improve coverage heuristic in function_body_lines

TODO: describe what's going on

Author: fingolfin

src/Coverage.jl

@@ -175,7 +175,7 @@ module Coverage
             linestart = minimum(searchsorted(linepos, pos - 1))
             ast, pos = Meta.parse(content, pos)
             isa(ast, Expr) || continue
-            flines = function_body_lines(ast)
+            flines = function_body_lines(ast, coverage, linestart - 1)
             if !isempty(flines)
                 flines .+= linestart-1
                 for l in flines

src/parser.jl

@@ -10,16 +10,19 @@ isfuncexpr(ex::Expr) =
     ex.head == :function || (ex.head == :(=) && typeof(ex.args[1]) == Expr && ex.args[1].head == :call)
 isfuncexpr(arg) = false
 
-function_body_lines(ast) = function_body_lines!(Int[], ast, false)
-function_body_lines!(flines, arg, infunction) = flines
-function function_body_lines!(flines, node::LineNumberNode, infunction)
+function_body_lines(ast, coverage, lineoffset) = function_body_lines!(Int[], ast, coverage, lineoffset, false)
+
+function_body_lines!(flines, arg, coverage, lineoffset, infunction) = flines
+
+function function_body_lines!(flines, node::LineNumberNode, coverage, lineoffset, infunction)
     line = node.line
     if infunction
         push!(flines, line)
     end
     flines
 end
-function function_body_lines!(flines, ast::Expr, infunction)
+
+function function_body_lines!(flines, ast::Expr, coverage::Vector{CovCount}, lineoffset, infunction)
     if ast.head == :line
         line = ast.args[1]
         if infunction
@@ -50,12 +53,20 @@ function function_body_lines!(flines, ast::Expr, infunction)
         # and we don't want those lines to be identified as runnable code.
         # In this context, ast.args[1] is the function signature and
         # ast.args[2] is the method body
-        for arg in ast.args[2].args
-            flines = function_body_lines!(flines, arg, true)
+        args = ast.args[2].args
+        infunction = true
+        flines_new = Int[]
+        for arg in args
+            function_body_lines!(flines_new, arg, coverage, lineoffset, infunction)
+        end
+        # if any of the lines in flines_new already has coverage, we should
+        # *not* apply our heuristic
+        if all(l -> coverage[l+lineoffset] === nothing, flines_new)
+            append!(flines, flines_new)
         end
     else
         for arg in args
-            flines = function_body_lines!(flines, arg, infunction)
+            function_body_lines!(flines, arg, coverage, lineoffset, infunction)
         end
     end