AttributedCharSequence.columnSubSequence does not handle UTF-16 surro…

…gate pairs, fixes #314
jline · Jan 28, 2019 · 1e6e9a6 · 1e6e9a6
1 parent 8de0b68
commit 1e6e9a6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/terminal/src/main/java/org/jline/utils/AttributedCharSequence.java b/terminal/src/main/java/org/jline/utils/AttributedCharSequence.java
@@ -293,7 +293,7 @@ public AttributedString columnSubSequence(int start, int stop) {
             if (col + w > start) {
                 break;
             }
-            begin++;
+            begin += Character.charCount(cp);
             col += w;
         }
         int end = begin;
@@ -305,7 +305,7 @@ public AttributedString columnSubSequence(int start, int stop) {
             if (col + w > stop) {
                 break;
             }
-            end++;
+            end += Character.charCount(cp);
             col += w;
         }
         return subSequence(begin, end);

diff --git a/terminal/src/test/java/org/jline/utils/AttributedStringTest.java b/terminal/src/test/java/org/jline/utils/AttributedStringTest.java
@@ -135,4 +135,14 @@ public void testColors() {
                 .toAnsi();
         assertEquals("This i\u001B[34ms\u001B[33m a\u001B[31m Test.\u001B[0m", ansiStr);
     }
+
+    @Test
+    public void testColumns() {
+        AttributedString message = new AttributedString("👍");
+        int messageLength = message.columnLength();
+        assertEquals(1, messageLength);
+        AttributedString messageAgain = message.columnSubSequence(0, messageLength);
+        assertEquals("👍", messageAgain.toString());
+    }
+
 }