Minor tweak to default diagnostics handler.
R=christofferqa@google.com
Change-Id: I6bcb3af4fec081e37cbac117b7d480ca0d604c9f
diff --git a/src/main/java/com/android/tools/r8/DiagnosticsHandler.java b/src/main/java/com/android/tools/r8/DiagnosticsHandler.java
index 74a9a96..666e358 100644
--- a/src/main/java/com/android/tools/r8/DiagnosticsHandler.java
+++ b/src/main/java/com/android/tools/r8/DiagnosticsHandler.java
@@ -4,6 +4,7 @@
package com.android.tools.r8;
import com.android.tools.r8.origin.Origin;
+import com.android.tools.r8.position.Position;
/**
* A DiagnosticsHandler can be provided to customize handling of diagnostics information.
@@ -20,7 +21,11 @@
*/
default void error(Diagnostic error) {
if (error.getOrigin() != Origin.unknown()) {
- System.err.print("Error in " + error.getOrigin() + ":\n ");
+ System.err.print("Error in " + error.getOrigin());
+ if (error.getPosition() != Position.UNKNOWN) {
+ System.err.print(" at " + error.getPosition().getDescription());
+ }
+ System.err.println(":");
} else {
System.err.print("Error: ");
}
diff --git a/src/main/java/com/android/tools/r8/position/TextPosition.java b/src/main/java/com/android/tools/r8/position/TextPosition.java
index 0dd4090..08d13bc 100644
--- a/src/main/java/com/android/tools/r8/position/TextPosition.java
+++ b/src/main/java/com/android/tools/r8/position/TextPosition.java
@@ -54,12 +54,12 @@
@Override
public String toString() {
- return "Offset: " + offset + ", Line: " + line + ", column: " + column;
+ return "offset: " + offset + ", line: " + line + ", column: " + column;
}
@Override
public String getDescription() {
- return "Line: " + line + (column != UNKNOWN_COLUMN ? ", column: " + column: "");
+ return "line " + line + (column != UNKNOWN_COLUMN ? (", column " + column) : "");
}
@Override
