Pass file name in Core hook for Expr creation

Author: c42f

src/hooks.jl

@@ -35,10 +35,10 @@ function core_parser_hook(code, filename, lineno, offset, options)
         end
 
         if any_error(stream)
-            e = Expr(:error, ParseError(SourceFile(code), stream.diagnostics))
+            e = Expr(:error, ParseError(SourceFile(code, filename=filename), stream.diagnostics))
             ex = options === :all ? Expr(:toplevel, e) : e
         else
-            ex = build_tree(Expr, stream, wrap_toplevel_as_kind=K"None")
+            ex = build_tree(Expr, stream, filename=filename, wrap_toplevel_as_kind=K"None")
             if Meta.isexpr(ex, :None)
                 # The None wrapping is only to give somewhere for trivia to be
                 # attached; unwrap!

src/source_files.jl

@@ -1,5 +1,5 @@
 """
-    SourceFile(code [, filename])
+    SourceFile(code [; filename=nothing])
 
 A UTF-8 source code string with associated file name and indexing structures.
 """

test/hooks.jl

@@ -1,18 +1,26 @@
 @testset "Hooks for Core integration" begin
-    JuliaSyntax.enable_in_core!()
+    @testset "filename is used" begin
+        ex = JuliaSyntax.core_parser_hook("@a", "somefile", 0, :statement)[1]
+        @test Meta.isexpr(ex, :macrocall)
+        @test ex.args[2] == LineNumberNode(1, "somefile")
+    end
 
-    @test Meta.parse("x + 1") == :(x + 1)
-    @test Meta.parse("x + 1", 1) == (:(x + 1), 6)
+    @testset "enable_in_core!" begin
+        JuliaSyntax.enable_in_core!()
 
-    # Test that parsing statements incrementally works and stops after
-    # whitespace / comment trivia
-    @test Meta.parse("x + 1\n(y)\n", 1) == (:(x + 1), 7)
-    @test Meta.parse("x + 1\n(y)\n", 7) == (:y, 11)
-    @test Meta.parse(" x#==#", 1) == (:x, 7)
+        @test Meta.parse("x + 1") == :(x + 1)
+        @test Meta.parse("x + 1", 1) == (:(x + 1), 6)
 
-    # Check that Meta.parse throws the JuliaSyntax.ParseError rather than
-    # Meta.ParseError when Core integration is enabled.
-    @test_throws JuliaSyntax.ParseError Meta.parse("[x")
+        # Test that parsing statements incrementally works and stops after
+        # whitespace / comment trivia
+        @test Meta.parse("x + 1\n(y)\n", 1) == (:(x + 1), 7)
+        @test Meta.parse("x + 1\n(y)\n", 7) == (:y, 11)
+        @test Meta.parse(" x#==#", 1) == (:x, 7)
 
-    JuliaSyntax.enable_in_core!(false)
+        # Check that Meta.parse throws the JuliaSyntax.ParseError rather than
+        # Meta.ParseError when Core integration is enabled.
+        @test_throws JuliaSyntax.ParseError Meta.parse("[x")
+
+        JuliaSyntax.enable_in_core!(false)
+    end
 end