Handle escaped assignee from macroexpand output (#29)

Author: fonsp

src/explore.jl

@@ -173,6 +173,8 @@ function get_assignees(ex::Expr)::Vector{Symbol}
         # Handles splat assignments. e.g. _, y... = 1:5
         args = ex.args
         mapfoldl(get_assignees, union!, args; init=Symbol[])
+    elseif Meta.isexpr(ex, :escape, 1)
+        get_assignees(ex.args[1])
     else
         @warn "unknown use of `=`. Assignee is unrecognised." ex
         Symbol[]
@@ -1001,6 +1003,8 @@ function explore_funcdef!(ex::Expr, scopestate::ScopeState)::Tuple{FunctionName,
 
     elseif ex.head === :(...)
         return explore_funcdef!(ex.args[1], scopestate)
+    elseif ex.head === :escape
+        return explore_funcdef!(ex.args[1], scopestate)
     else
         return FunctionName(), explore!(ex, scopestate)
     end

test/ExpressionExplorer.jl

@@ -134,7 +134,19 @@ end
     @test testee(:(abstract type a{T,S} end), [], [:a], [], [:a => ([], [], [], [])])
     @test testee(:(abstract type a{T} <: b end), [], [:a], [], [:a => ([:b], [], [], [])])
     @test testee(:(abstract type a{T} <: b{T} end), [], [:a], [], [:a => ([:b], [], [], [])])
-    testee(macroexpand(Main, :(@enum a b c)), [], [], [], []; verbose=false)
+    
+    # testee(macroexpand(Main, :(@enum NewType1 xx yy)), [], [], [], []; verbose=false) # test that it runs without error
+    let result = ExpressionExplorer.compute_reactive_node(
+        macroexpand(Main, :(@enum NewType2 xx yy))
+    )
+        
+        @test :NewType2 ∉ result.references
+        @test :xx ∉ result.references
+
+        @test :NewType2 ∈ result.definitions ∪ result.funcdefs_without_signatures
+        @test :xx ∈ result.definitions
+        @test :yy ∈ result.definitions
+    end
 
     e = :(struct a end) # needs to be on its own line to create LineNumberNode
     @test testee(e, [], [:a], [], [:a => ([], [], [], [])])
@@ -346,6 +358,9 @@ end
     @test testee(:(function (A::MyType)(x; y=x) y + x end), [], [], [], [
         :MyType => ([], [], [:+], [])
     ])
+    @test testee(:(function $(esc(:g))() r = 2; r end), [], [], [], [
+        :g => ([], [], [], [])
+    ])
     @test testee(:(f(x, y=a + 1) = x * y * z), [], [], [], [
         :f => ([:z, :a], [], [:*, :+], [])
     ])