nano: now manages tabs correctly also in wrapped lines

jline · Oct 5, 2019 · 54dfee6 · 54dfee6
1 parent 4abce45
commit 54dfee6
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/builtins/src/main/java/org/jline/builtins/Nano.java b/builtins/src/main/java/org/jline/builtins/Nano.java
@@ -404,7 +404,8 @@ void computeAllOffsets() {
             }
         }
 
-        LinkedList<Integer> computeOffsets(String text) {
+        LinkedList<Integer> computeOffsets(String line) {
+            String text = new AttributedStringBuilder().tabs(tabs).append(line).toString();
             int width = size.getColumns() - (printLineNumbers ? 8 : 0);
             LinkedList<Integer> offsets = new LinkedList<>();
             offsets.add(0);
@@ -661,7 +662,7 @@ private void cursorDown(int lines) {
                     column = Math.min(wantedColumn, next - offsetInLine);
                 }
             }
-            moveToChar(column);
+            moveToChar(offsetInLine + column);
         }
 
         private void cursorUp(int lines) {
@@ -690,7 +691,7 @@ private void cursorUp(int lines) {
                     }
                 }
             }
-            moveToChar(column);
+            moveToChar(offsetInLine + column);
         }
 
         void ensureCursorVisible() {