Merge branch 'master' into indentation

jline · Oct 11, 2019 · d88c1c7 · d88c1c7
2 parents f669f8b + 95b6a65
commit d88c1c7
Show file tree

Hide file tree

Showing 8 changed files with 1,441 additions and 210 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() {
@@ -2898,8 +2899,8 @@ void searchAndReplace() {
                 found = buffer.nextSearch();
                 if (found) {
                     int[] re = buffer.highlightStart();
-                    int col = searchBackwards ? buffer.getLine(re[0]).length() - re[1] : re[1];
-                    int match = re[0]*100000 + col;
+                    int col = searchBackwards ? buffer.length(buffer.getLine(re[0])) - re[1] : re[1];
+                    int match = re[0]*10000 + col;
                     if (matches.contains(match)) {
                         found = false;
                         break;