Tweaks to the lint CLI offsets

Change-Id: I20592372d41235b36227a0d36014d77c23c7fc58

1 files changed, 17 insertions, 1 deletions

diff --git a/lint/cli/src/com/android/tools/lint/Main.java b/lint/cli/src/com/android/tools/lint/Main.java
index 18a2da0..24c7cda 100644
--- a/lint/cli/src/com/android/tools/lint/Main.java
+++ b/lint/cli/src/com/android/tools/lint/Main.java
@@ -1008,7 +1008,23 @@ public class Main extends LintClient {
                             for (int i = 0; i < column; i++) {
                                 sb.append(' ');
                             }
-                            sb.append('^');
+
+                            boolean displayCaret = true;
+                            Position endPosition = location.getEnd();
+                            if (endPosition != null) {
+                                int endLine = endPosition.getLine();
+                                int endColumn = endPosition.getColumn();
+                                if (endLine == line && endColumn > column) {
+                                    for (int i = column; i < endColumn; i++) {
+                                        sb.append("~");
+                                    }
+                                    displayCaret = false;
+                                }
+                            }
+
+                            if (displayCaret) {
+                                sb.append('^');
+                            }
                             sb.append('\n');
                             warning.errorLine = sb.toString();
                         }