diff --git a/checkstyle.xml b/checkstyle.xml
index 538b210c..b10493a1 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -24,7 +24,7 @@
-
+
diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java
index 4eaf37b9..caf310c0 100644
--- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java
+++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java
@@ -722,17 +722,17 @@ public class MixinEnvironment implements ITokenProvider {
if (this.getOption(Option.DEBUG_VERBOSE)) {
PrettyPrinter printer = new PrettyPrinter(32);
printer.add("SpongePowered MIXIN (Verbose debugging enabled)").centre().hr();
- printer.add("%28s : %s", "Code source", codeSource);
- printer.add("%28s : %s", "Internal Version", version);
- printer.add("%28s : %s", "Java 8 Supported", CompatibilityLevel.JAVA_8.isSupported()).hr();
+ printer.kv("Code source", codeSource);
+ printer.kv("Internal Version", version);
+ printer.kv("Java 8 Supported", CompatibilityLevel.JAVA_8.isSupported()).hr();
for (Option option : Option.values()) {
StringBuilder indent = new StringBuilder();
for (int i = 0; i < option.depth; i++) {
indent.append("- ");
}
- printer.add("%28s : %s<%s>", option.property, indent, option);
+ printer.kv(option.property, "%s<%s>", indent, option);
}
- printer.hr().add("%28s : %s", "Detected Side", side);
+ printer.hr().kv("Detected Side", side);
printer.print(System.err);
}
}
diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java
index ff0f77f1..7dc861c0 100644
--- a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java
+++ b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java
@@ -477,12 +477,12 @@ public class CallbackInjector extends Injector {
handlerSig.setModifiers(this.methodNode);
PrettyPrinter printer = new PrettyPrinter();
- printer.add("%20s : %s", "Target Class", this.classNode.name.replace('/', '.'));
- printer.add("%20s : %s", "Target Method", methodSig);
- printer.add("%20s : %d", "Target Max LOCALS", callback.target.getMaxLocals());
- printer.add("%20s : %d", "Initial Frame Size", callback.frameSize);
- printer.add("%20s : %s", "Callback Name", this.methodNode.name);
- printer.add("%20s : %s %s", "Instruction", callback.node.getClass().getSimpleName(), ASMHelper.getOpcodeName(callback.node.getOpcode()));
+ printer.kv("Target Class", this.classNode.name.replace('/', '.'));
+ printer.kv("Target Method", methodSig);
+ printer.kv("Target Max LOCALS", callback.target.getMaxLocals());
+ printer.kv("Initial Frame Size", callback.frameSize);
+ printer.kv("Callback Name", this.methodNode.name);
+ printer.kv("Instruction", "%s %s", callback.node.getClass().getSimpleName(), ASMHelper.getOpcodeName(callback.node.getOpcode()));
printer.hr();
if (callback.locals.length > callback.frameSize) {
printer.add(" %s %20s %s", "LOCAL", "TYPE", "NAME");
diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java b/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java
index 50ad557a..48d68c61 100644
--- a/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java
+++ b/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java
@@ -169,7 +169,7 @@ public class LocalVariableDiscriminator {
@Override
public void print(PrettyPrinter printer) {
- printer.add("%5s %7s %20s %-50s %s", "INDEX", "ORDINAL", "TYPE", "NAME", "CANDIDATE");
+ printer.add("%5s %7s %30s %-50s %s", "INDEX", "ORDINAL", "TYPE", "NAME", "CANDIDATE");
for (int l = this.baseArgIndex; l < this.locals.length; l++) {
Local local = this.locals[l];
if (local != null) {
@@ -177,11 +177,11 @@ public class LocalVariableDiscriminator {
String localName = local.name;
int ordinal = local.ord;
String candidate = this.returnType.equals(localType) ? "YES" : "-";
- printer.add("[%3d] [%3d] %20s %-50s %s", l, ordinal, SignaturePrinter.getTypeName(localType, false), localName, candidate);
+ printer.add("[%3d] [%3d] %30s %-50s %s", l, ordinal, SignaturePrinter.getTypeName(localType, false), localName, candidate);
} else if (l > 0) {
Local prevLocal = this.locals[l - 1];
boolean isTop = prevLocal != null && prevLocal.type != null && prevLocal.type.getSize() > 1;
- printer.add("[%3d] %20s", l, isTop ? "" : "-");
+ printer.add("[%3d] %30s", l, isTop ? "" : "-");
}
}
}
diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/modify/ModifyVariableInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/modify/ModifyVariableInjector.java
index 743c98fe..c0f70853 100644
--- a/src/main/java/org/spongepowered/asm/mixin/injection/modify/ModifyVariableInjector.java
+++ b/src/main/java/org/spongepowered/asm/mixin/injection/modify/ModifyVariableInjector.java
@@ -174,19 +174,20 @@ public class ModifyVariableInjector extends Injector {
SignaturePrinter handlerSig = new SignaturePrinter(this.methodNode.name, this.returnType, this.methodArgs, new String[] { "var" });
handlerSig.setModifiers(this.methodNode);
- PrettyPrinter printer = new PrettyPrinter();
- printer.add("%20s : %s", "Target Class", this.classNode.name.replace('/', '.'));
- printer.add("%20s : %s", "Target Method", context.target.method.name);
- printer.add("%20s : %s", "Callback Name", this.methodNode.name);
- printer.add("%20s : %s", "Capture Type", SignaturePrinter.getTypeName(this.returnType, false));
- printer.add("%20s : %s %s", "Instruction", context.node.getClass().getSimpleName(), ASMHelper.getOpcodeName(context.node.getOpcode())).hr();
- printer.add("%20s : %s", "Match mode", this.discriminator.isImplicit(context) ? "IMPLICIT (match single)" : "EXPLICIT (match by criteria)");
- printer.add("%20s : %s", "Match ordinal", this.discriminator.getOrdinal() < 0 ? "any" : this.discriminator.getOrdinal());
- printer.add("%20s : %s", "Match index", this.discriminator.getIndex() < context.baseArgIndex ? "any" : this.discriminator.getIndex());
- printer.add("%20s : %s", "Match name(s)", this.discriminator.hasNames() ? this.discriminator.getNames() : "any");
- printer.add("%20s : %s", "Args only", this.discriminator.isArgsOnly()).hr();
- printer.add(context);
- printer.print(System.err);
+ new PrettyPrinter()
+ .kvWidth(20)
+ .kv("Target Class", this.classNode.name.replace('/', '.'))
+ .kv("Target Method", context.target.method.name)
+ .kv("Callback Name", this.methodNode.name)
+ .kv("Capture Type", SignaturePrinter.getTypeName(this.returnType, false))
+ .kv("Instruction", "%s %s", context.node.getClass().getSimpleName(), ASMHelper.getOpcodeName(context.node.getOpcode())).hr()
+ .kv("Match mode", this.discriminator.isImplicit(context) ? "IMPLICIT (match single)" : "EXPLICIT (match by criteria)")
+ .kv("Match ordinal", this.discriminator.getOrdinal() < 0 ? "any" : this.discriminator.getOrdinal())
+ .kv("Match index", this.discriminator.getIndex() < context.baseArgIndex ? "any" : this.discriminator.getIndex())
+ .kv("Match name(s)", this.discriminator.hasNames() ? this.discriminator.getNames() : "any")
+ .kv("Args only", this.discriminator.isArgsOnly()).hr()
+ .add(context)
+ .print(System.err);
}
/**
diff --git a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java
index 67f08ac0..0516af5c 100644
--- a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java
+++ b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java
@@ -55,29 +55,109 @@ public class PrettyPrinter {
}
/**
- * "Horizontal rule" marker
+ * Interface for objects which need their width calculated prior to printing
*/
- private static final char HR = '\253';
+ interface IVariableWidthEntry {
+
+ public abstract int getWidth();
+
+ }
+
+ /**
+ * Interface for objects which control their own output format
+ */
+ interface ISpecialEntry {
+
+ }
+
+ /**
+ * A key/value pair for convenient printing
+ */
+ class KeyValue implements PrettyPrinter.IVariableWidthEntry {
+
+ private final String key;
+
+ private final Object value;
+
+ public KeyValue(String key, Object value) {
+ this.key = key;
+ this.value = value;
+ }
+
+ @Override
+ public String toString() {
+ return String.format(PrettyPrinter.this.kvFormat, this.key, this.value);
+ }
+
+ @Override
+ public int getWidth() {
+ return this.toString().length();
+ }
+
+ }
+
+ /**
+ * Horizontal rule
+ */
+ class HorizontalRule implements PrettyPrinter.ISpecialEntry {
+
+ private final char[] hrChars;
+
+ public HorizontalRule(char... hrChars) {
+ this.hrChars = hrChars;
+ }
+
+ @Override
+ public String toString() {
+ return Strings.repeat(new String(this.hrChars), PrettyPrinter.this.width + 2);
+ }
+
+ }
+
+ /**
+ * Centred text
+ */
+ class CentredText {
+
+ private final Object centred;
+
+ public CentredText(Object centred) {
+ this.centred = centred;
+ }
+
+ @Override
+ public String toString() {
+ String text = this.centred.toString();
+ return String.format("%" + (((PrettyPrinter.this.width - (text.length())) / 2) + text.length()) + "s", text);
+ }
+
+ }
+
+ private final HorizontalRule horizontalRule = new HorizontalRule('*');
/**
- * If specified as the first character on a line, centres the line
+ * Content lines
*/
- private static final char CENTRE = '\252';
+ private final List