.

Author: Drvi

Project.toml

@@ -15,7 +15,7 @@ TestEnv = "1e6cf692-eddd-4d53-88a5-2d735e33781b"
 
 [compat]
 Dates = "1"
-JuliaSyntax = "1"
+JuliaSyntax = "0.4, 1"
 Logging = "1"
 Pkg = "1"
 Profile = "1"

src/ReTestItems.jl

@@ -866,7 +866,7 @@ end
 
 # Parses and evals files found by the `walkdir_task`. During macro expansion of `@testitem`
 # test items are push!d onto the FileNode stored in task local storage as `:__RE_TEST_ITEMS__`.
-function include_task(walkdir_channel, setup_channel, project_root, ti_filter)
+function include_task(walkdir_channel, setup_channel, project_root, ti_filter::TestItemFilter)
     try
         testitem_names = Set{String}() # to enforce that names in the same file are unique
         task_local_storage(:__RE_TEST_RUNNING__, true) do

src/include_test_file.jl

@@ -1,7 +1,7 @@
 using JuliaSyntax: ParseStream, @K_str, build_tree, bump_trivia, kind, parse!, peek_full_token, peek_token
 using StringViews
 
-function include_test_file(ti_filter, path::String)
+function include_test_file(ti_filter::TestItemFilter, path::String)
     bytes = read(path)
     stream = ParseStream(bytes)
     tls = task_local_storage()
@@ -43,22 +43,22 @@ function _eval_from_stream(stream, path)
 end
 
 # test_rel -> apply ti_filter on the parsed ast
-function _eval_from_stream(stream, path, ti_filter)
+function _eval_from_stream(stream, path, ti_filter::TestItemFilter)
     parse!(stream; rule=:statement)
     ast = build_tree(Expr, stream; filename=path)
-    filtered = ti_filter(ast)
-    filtered === nothing || Core.eval(Main, filtered)
+    filtered = ti_filter(ast)::Union{Nothing, Expr}
+    filtered === nothing || Core.eval(Main, filtered::Expr)
     return nothing
 end
 
 # like above, but tries to avoid parsing the ast if it sees from the name identifier token
 # it won't pass the filter
-function _eval_from_stream(stream, path, ti_filter, bytes)
+function _eval_from_stream(stream, path, ti_filter::TestItemFilter, bytes)
     if ti_filter.name isa Nothing
         parse!(stream; rule=:statement)
         ast = build_tree(Expr, stream; filename=path)
-        filtered = ti_filter(ast)
-        filtered === nothing || Core.eval(Main, filtered)
+        filtered = ti_filter(ast)::Union{Nothing, Expr}
+        filtered === nothing || Core.eval(Main, filtered::Expr)
         return nothing
     end
 
@@ -67,8 +67,8 @@ function _eval_from_stream(stream, path, ti_filter, bytes)
     parse!(stream; rule=:statement)
     if _contains(name, ti_filter.name)
         ast = build_tree(Expr, stream; filename=path)
-        filtered = ti_filter(ast)
-        filtered === nothing || Core.eval(Main, filtered)
+        filtered = ti_filter(ast)::Union{Nothing, Expr}
+        filtered === nothing || Core.eval(Main, filtered::Expr)
     end
     return nothing
 end