Skip to content

Commit e0d3930

Browse files
committed
Fix #12 include tag kind in error message
1 parent f5904eb commit e0d3930

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/main/java/io/github/misode/packtest/mixin/TagLoaderMixin.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,15 @@ public class TagLoaderMixin {
2020
@Final
2121
private static Logger LOGGER;
2222

23+
@Shadow
24+
@Final
25+
private String directory;
26+
2327
@WrapOperation(method = "load", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;[Ljava/lang/Object;)V", remap = false))
2428
private void catchTagError(Logger logger, String message, Object[] args, Operation<Void> original) {
29+
String identifier = ((Identifier)args[0]).toString();
2530
String error = ((Exception)args[3]).getMessage().replaceFirst("^[A-Za-z0-9.]+Exception: ", "");
26-
String type = ((Identifier)args[1]).getPath().replaceFirst("tags/", "").replaceFirst("s?/.*", "");
27-
LoadDiagnostics.error(LOGGER, type + " tag", ((Identifier)args[0]).toString(), error);
31+
LoadDiagnostics.error(LOGGER, this.directory, identifier, error);
2832
}
2933

3034
@WrapOperation(method = "method_33175", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false))

0 commit comments

Comments
 (0)