Set line info for @client macro as call site (#981)

Author: nickrobinson251

Project.toml

@@ -33,9 +33,10 @@ julia = "1.6"
 BufferedStreams = "e1450e63-4bb3-523b-b2a4-4ffa8c0fd77d"
 Deno_jll = "04572ae6-984a-583e-9378-9577a1c2574d"
 Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
+InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
 [targets]
-test = ["BufferedStreams", "Deno_jll", "Distributed", "JSON", "Test", "Unitful"]
+test = ["BufferedStreams", "Deno_jll", "Distributed", "InteractiveUtils", "JSON", "Test", "Unitful"]

src/HTTP.jl

@@ -422,6 +422,10 @@ function request(stack::Base.Callable, method, url, h=Header[], b=nobody, q=noth
     return stack(string(method), request_uri(url, query), mkheaders(headers), body; kw...)
 end
 
+macro remove_linenums!(expr)
+    return esc(Base.remove_linenums!(expr))
+end
+
 """
     HTTP.@client requestlayers
     HTTP.@client requestlayers streamlayers
@@ -456,16 +460,18 @@ hard-codes the value of the `retry` and `redirect` keyword arguments. When we pa
 effectively over-writing the default and any user-provided keyword arguments for `retry` or `redirect`.
 """
 macro client(requestlayers, streamlayers=[])
-    esc(quote
-        get(a...; kw...) = request("GET", a...; kw...)
-        put(a...; kw...) = request("PUT", a...; kw...)
-        post(a...; kw...) = request("POST", a...; kw...)
-        patch(a...; kw...) = request("PATCH", a...; kw...)
-        head(a...; kw...) = request("HEAD", a...; kw...)
-        delete(a...; kw...) = request("DELETE", a...; kw...)
-        open(f, a...; kw...) = request(a...; iofunction=f, kw...)
-        request(method, url, h=HTTP.Header[], b=HTTP.nobody; headers=h, body=b, query=nothing, kw...)::HTTP.Response =
+    return @remove_linenums! esc(quote
+        get(a...; kw...) = ($__source__; request("GET", a...; kw...))
+        put(a...; kw...) = ($__source__; request("PUT", a...; kw...))
+        post(a...; kw...) = ($__source__; request("POST", a...; kw...))
+        patch(a...; kw...) = ($__source__; request("PATCH", a...; kw...))
+        head(a...; kw...) = ($__source__; request("HEAD", a...; kw...))
+        delete(a...; kw...) = ($__source__; request("DELETE", a...; kw...))
+        open(f, a...; kw...) = ($__source__; request(a...; iofunction=f, kw...))
+        function request(method, url, h=HTTP.Header[], b=HTTP.nobody; headers=h, body=b, query=nothing, kw...)::HTTP.Response
+            $__source__
             HTTP.request(HTTP.stack($requestlayers, $streamlayers), method, url, headers, body, query; kw...)
+        end
     end)
 end
 

test/client.jl

@@ -9,10 +9,22 @@ using Sockets
 using JSON
 using Test
 using URIs
+using InteractiveUtils: @which
 
 # test we can adjust default_connection_limit
 HTTP.set_default_connection_limit!(12)
 
+@testset "@client macro" begin
+    @eval module MyClient
+        using HTTP
+        HTTP.@client () ()
+    end
+    # Test the `@client` sets the location info to the definition site, i.e. this file.
+    meth = @which MyClient.get()
+    file = String(meth.file)
+    @test file == @__FILE__
+end
+
 @testset "Custom HTTP Stack" begin
    @testset "Low-level Request" begin
         wasincluded = Ref(false)