Fix PumpReader support for supplementary code points, fixes #658 (#716)

jline · Oct 14, 2021 · deb7469 · deb7469
1 parent 0a35dc7
commit deb7469
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/terminal/src/main/java/org/jline/utils/PumpReader.java b/terminal/src/main/java/org/jline/utils/PumpReader.java
@@ -334,7 +334,7 @@ private InputStream(PumpReader reader, Charset charset) {
             this.encoder = charset.newEncoder()
                     .onUnmappableCharacter(CodingErrorAction.REPLACE)
                     .onMalformedInput(CodingErrorAction.REPLACE);
-            this.buffer = ByteBuffer.allocate((int) Math.ceil(encoder.maxBytesPerChar()));
+            this.buffer = ByteBuffer.allocate((int) Math.ceil(encoder.maxBytesPerChar() * 2));
 
             // No input available after initialization
             buffer.limit(0);

diff --git a/terminal/src/test/java/org/jline/utils/PumpReaderTest.java b/terminal/src/test/java/org/jline/utils/PumpReaderTest.java
@@ -25,7 +25,7 @@ private PumpReader writeInput() {
 
         // Write some input
         writer.println("Hello world!");
-        writer.println("㐀");
+        writer.println("\uD83D\uDE0A㐀");
 
         return pump;
     }
@@ -37,7 +37,7 @@ public void testReader() throws IOException {
         // Read it again
         BufferedReader reader = new BufferedReader(pump);
         assertEquals("Hello world!", reader.readLine());
-        assertEquals("㐀", reader.readLine());
+        assertEquals("\uD83D\uDE0A㐀", reader.readLine());
     }
 
     @Test
@@ -47,7 +47,7 @@ public void testInputStream() throws IOException {
         // Read it using an input stream
         BufferedReader reader = new BufferedReader(new InputStreamReader(pump.createInputStream(StandardCharsets.UTF_8), StandardCharsets.UTF_8));
         assertEquals("Hello world!", reader.readLine());
-        assertEquals("㐀", reader.readLine());
+        assertEquals("\uD83D\uDE0A㐀", reader.readLine());
     }
 
 }