Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[macro] Display failing macro for "Build failure" errors #11635

Merged
merged 3 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/typing/typeloadFields.ml
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ let build_module_def ctx mt meta fvars fbuild =
let r = try ctx.g.do_macro ctx MBuild cpath meth el p with e -> ctx.c.get_build_infos <- old; raise e in
ctx.c.get_build_infos <- old;
(match r with
| MError | MMacroInMacro -> raise_typing_error "Build failure" p
| MError | MMacroInMacro -> raise_typing_error (Printf.sprintf "Build failure (%s.%s)" (s_type_path cpath) meth) p
| MSuccess e -> fbuild e)
) :: f_build
| _ ->
Expand Down
2 changes: 1 addition & 1 deletion tests/misc/projects/Issue11020/compile.hxml.stderr
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"file":"$$normPath(::cwd::/,true)Main.hx","diagnostics":[{"kind":2,"severity":3,"range":{"start":{"line":2,"character":1},"end":{"line":2,"character":19}},"args":"Context.info","code":null,"relatedInformation":[]},{"kind":2,"severity":2,"range":{"start":{"line":2,"character":1},"end":{"line":2,"character":19}},"args":"Context.warning","code":"WUser","relatedInformation":[]},{"kind":2,"severity":1,"range":{"start":{"line":2,"character":1},"end":{"line":2,"character":19}},"args":"Context.error","code":null,"relatedInformation":[]},{"kind":2,"severity":1,"range":{"start":{"line":0,"character":11},"end":{"line":0,"character":18}},"args":"Build failure","code":null,"relatedInformation":[]}]}]
[{"file":"$$normPath(::cwd::/,true)Main.hx","diagnostics":[{"kind":2,"severity":3,"range":{"start":{"line":2,"character":1},"end":{"line":2,"character":19}},"args":"Context.info","code":null,"relatedInformation":[]},{"kind":2,"severity":2,"range":{"start":{"line":2,"character":1},"end":{"line":2,"character":19}},"args":"Context.warning","code":"WUser","relatedInformation":[]},{"kind":2,"severity":1,"range":{"start":{"line":2,"character":1},"end":{"line":2,"character":19}},"args":"Context.error","code":null,"relatedInformation":[]},{"kind":2,"severity":1,"range":{"start":{"line":0,"character":11},"end":{"line":0,"character":18}},"args":"Build failure (Main.error)","code":null,"relatedInformation":[]}]}]
8 changes: 8 additions & 0 deletions tests/misc/projects/Issue11635/Macro.macro.hx
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
function build() {
// Whoops, not returning anything
}

function build2() {
haxe.macro.Context.error("Abort", haxe.macro.Context.currentPos());
return null;
}
2 changes: 2 additions & 0 deletions tests/misc/projects/Issue11635/Main.hx
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@:build(Macro.build())
class Main {}
2 changes: 2 additions & 0 deletions tests/misc/projects/Issue11635/Main2.hx
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@:build(Macro.build2())
class Main2 {}
1 change: 1 addition & 0 deletions tests/misc/projects/Issue11635/compile-fail.hxml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--main Main
2 changes: 2 additions & 0 deletions tests/misc/projects/Issue11635/compile-fail.hxml.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Macro.macro.hx:1: lines 1-3 : Void should be Array<haxe.macro.Field>
Main.hx:1: characters 1-8 : Build failure (Macro.build)
1 change: 1 addition & 0 deletions tests/misc/projects/Issue11635/compile2-fail.hxml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--main Main2
2 changes: 2 additions & 0 deletions tests/misc/projects/Issue11635/compile2-fail.hxml.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Main2.hx:1: characters 1-8 : Abort
Main2.hx:1: characters 1-8 : Build failure (Macro.build2)
Loading