Fix attributed string adding underline in ConEMU, #236

jline · Mar 7, 2018 · 1ee156d · 1ee156d
1 parent cf0f501
commit 1ee156d
Show file tree

Hide file tree

Showing 2 changed files with 8 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
@@ -112,9 +112,9 @@ public String toAnsi(int colors, boolean force256colors) {
                     if (background != bg) {
                         if (bg >= 0) {
                             int rounded = Colors.roundColor(bg, colors);
-                            if (rounded < 8) {
+                            if (rounded < 8 && !force256colors) {
                                 first = attr(sb, "4" + Integer.toString(rounded), first);
-                            } else if (rounded < 16) {
+                            } else if (rounded < 16 && !force256colors) {
                                 first = attr(sb, "10" + Integer.toString(rounded - 8), first);
                             } else {
                                 first = attr(sb, "48;5;" + Integer.toString(rounded), first);

diff --git a/terminal/src/test/java/org/jline/utils/AttributedCharSequenceTest.java b/terminal/src/test/java/org/jline/utils/AttributedCharSequenceTest.java
@@ -21,6 +21,12 @@
 
 public class AttributedCharSequenceTest {
 
+    @Test
+    public void testUnderline() throws IOException {
+        AttributedString as = AttributedString.fromAnsi("\33[38;5;0m\33[48;5;15mtest\33[0m");
+        assertEquals("\33[38;5;0;48;5;15mtest\33[0m", as.toAnsi(256, true));
+    }
+
     @Test
     public void testBoldOnWindows() throws IOException {
         String HIC = "\33[36;1m";