Show evaluated arguments for most function calls

Author: omus

stdlib/Test/src/Test.jl

@@ -30,18 +30,6 @@ using InteractiveUtils: gen_call_with_extracted_types
 using Base: typesplit, remove_linenums!
 using Serialization: Serialization
 
-# Whitelist boolean functions which show their evaluated arguments when the test fails
-const DISPLAY_FAILED = (
-    :isequal,
-    :isapprox,
-    :≈,
-    :occursin,
-    :startswith,
-    :endswith,
-    :isempty,
-    :contains
-)
-
 const FAIL_FAST = Ref{Bool}(false)
 
 #-----------------------------------------------------------------------
@@ -584,35 +572,14 @@ macro test_skip(ex, kws...)
     return :(record(get_testset(), $testres))
 end
 
-function _is_simple_call(@nospecialize ex)
+function _can_escape_call(@nospecialize ex)
     ex.head === :call || return false
 
     # Broadcasted functions are not currently supported
     first(string(ex.args[1])) != '.' || return false
 
-    num_pargs = 0
-    for x in ex.args[2:end]
-        if isa(x, Expr) && x.head === :parameters
-            return false
-        elseif isa(x, Expr) && x.head === :kw
-            return false
-        elseif isa(x, Expr) && x.head === :...
-            return false  # Unable to determine number of arguments
-        else
-            num_pargs += 1
-        end
-    end
-
-    return 1 <= num_pargs <= 2
-end
-
-function _function_name(@nospecialize ex)
-    ex.head === :call || throw(ArgumentError("$ex is not a call expression"))
-    if isa(ex.args[1], Expr) && ex.args[1].head === :.
-        ex.args[1].args[2].value
-    else
-        ex.args[1]
-    end
+    # At least one positional argument or keyword
+    return length(ex.args) > 1
 end
 
 # An internal function, called by the code generated by the @test
@@ -651,8 +618,7 @@ function get_test_result(ex, source)
             $(QuoteNode(source)),
             $negate,
         ))
-    elseif isa(ex, Expr) && ex.head === :call &&
-        (_is_simple_call(ex) || _function_name(ex) in DISPLAY_FAILED)
+    elseif isa(ex, Expr) && _can_escape_call(ex)
         escaped_func = esc(ex.args[1])
         quoted_func = QuoteNode(ex.args[1])
 

stdlib/Test/test/runtests.jl

@@ -1,7 +1,7 @@
 # This file is a part of Julia. License is MIT: https://julialang.org/license
 
 using Test, Random
-using Test: guardseed, _is_simple_call, _function_name
+using Test: guardseed, _can_escape_call
 using Serialization
 using Distributed: RemoteException
 
@@ -212,7 +212,7 @@ let fails = @testset NoThrowTestSet begin
 
     let str = sprint(show, fails[8])
         @test occursin("Expression: (==)(1:2...)", str)
-        @test !occursin("Evaluated", str)
+        @test occursin("Evaluated: 1 == 2", str)
     end
 
     let str = sprint(show, fails[9])
@@ -286,7 +286,6 @@ let fails = @testset NoThrowTestSet begin
     end
 
     let str = sprint(show, fails[23])
-        @test !(:issetequal in Test.DISPLAY_FAILED)
         @test occursin("Expression: issetequal(a, b)", str)
         @test occursin("Evaluated: issetequal([1, 2], [1, 3])", str)
     end
@@ -1794,30 +1793,13 @@ end
     end
 end
 
-@testset "_is_simple_function" begin
-    @test !_is_simple_call(:(f()))
-    @test _is_simple_call(:(f(x)))
-    @test _is_simple_call(:(f(x, y)))
-    @test !_is_simple_call(:(f(x, y, z)))
-
-    @test !_is_simple_call(:(f(; x)))
-    @test !_is_simple_call(:(f(; x, y)))
-    @test !_is_simple_call(:(f(x=1)))
-    @test !_is_simple_call(:(f(x=1, y=2)))
-
-    @test !_is_simple_call(:(f(x, y=1)))
-    @test !_is_simple_call(:(f(x; y=1)))
-
-    @test !_is_simple_call(:(f(x...)))
-    @test !_is_simple_call(:(f(x, y...)))
-    @test !_is_simple_call(:(f(x; y...)))
-
-    @test _is_simple_call(:(x == y))
-    @test !_is_simple_call(:(x .== y))
-end
+@testset "_can_escape_call" begin
+    @test !_can_escape_call(:(f()))
+    @test _can_escape_call(:(f(x)))
+    @test _can_escape_call(:(f(; x)))
+    @test _can_escape_call(:(f(x=1)))
 
-@testset "_function_name" begin
-    @test _function_name(:(isequal(x, y))) === :isequal
-    @test _function_name(:(Base.isequal(x.y))) === :isequal
-    @test _function_name(:(Base.Meta.isexpr(ex))) === :isexpr
+    @test _can_escape_call(:(x == y))
+    @test !_can_escape_call(:(x .== y))
+    @test !_can_escape_call(:((==).(x, y)))
 end