From 95bec91b48ce44bbfe8dacd5a92e115641230333 Mon Sep 17 00:00:00 2001
From: Jameson Nash <vtjnash@gmail.com>
Date: Mon, 28 Mar 2022 18:07:43 -0400
Subject: [PATCH] [REPL] try macroexpand alone before lowering

Calling macroexpand alone might lead to something simple that we can
handle, while lowering makes it more complicated and usually requires
inference to interpret it.
---
 stdlib/REPL/src/REPLCompletions.jl | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/stdlib/REPL/src/REPLCompletions.jl b/stdlib/REPL/src/REPLCompletions.jl
index 162d1184d18c39..76482e96dd2999 100644
--- a/stdlib/REPL/src/REPLCompletions.jl
+++ b/stdlib/REPL/src/REPLCompletions.jl
@@ -479,6 +479,11 @@ function try_get_type(sym::Expr, fn::Module)
         return try_get_type(Expr(:call, GlobalRef(Base, :getindex), sym.args...), fn)
     elseif sym.head === :. && sym.args[2] isa QuoteNode # second check catches broadcasting
         return try_get_type(Expr(:call, GlobalRef(Core, :getfield), sym.args...), fn)
+    elseif sym.head === :toplevel || sym.head === :block
+        isempty(sym.args) && return (nothing, true)
+        return try_get_type(sym.args[end], fn)
+    elseif sym.head === :escape || sym.head === :var"hygienic-scope"
+        return try_get_type(sym.args[1], fn)
     end
     return (Any, false)
 end
@@ -495,15 +500,22 @@ function get_type(sym::Expr, fn::Module)
         found || return Any, false
     end
     newsym = try
-        Meta.lower(fn, sym)
+        macroexpand(fn, sym; recursive=false)
     catch e
-        e isa LoadError && return Any, false
-        # If e is not a LoadError then Meta.lower crashed in an unexpected way.
-        # Since this is not a specific to the user code but an internal error,
-        # rethrow the error to allow reporting it.
-        rethrow()
+        # user code failed in macroexpand (ignore it)
+        return Any, false
+    end
+    val, found = try_get_type(newsym, fn)
+    if !found
+        newsym = try
+            Meta.lower(fn, sym)
+        catch e
+            # user code failed in lowering (ignore it)
+            return Any, false
+        end
+        val, found = try_get_type(newsym, fn)
     end
-    return try_get_type(newsym, fn)
+    return val, found
 end
 
 function get_type(sym, fn::Module)