Force creation of a dumb terminal if TERM starts with dumb

jline · Oct 23, 2023 · 84bd81f · 84bd81f
1 parent 91e29d0
commit 84bd81f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java b/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java
@@ -29,6 +29,7 @@
 
 import org.jline.terminal.impl.AbstractPosixTerminal;
 import org.jline.terminal.impl.AbstractTerminal;
+import org.jline.terminal.impl.DumbTerminal;
 import org.jline.terminal.impl.DumbTerminalProvider;
 import org.jline.terminal.spi.SystemStream;
 import org.jline.terminal.spi.TerminalProvider;
@@ -367,6 +368,8 @@ private Terminal doBuild() throws IOException {
         Charset encoding = computeEncoding();
         String type = computeType();
 
+        boolean forceDumb =
+                (DumbTerminal.TYPE_DUMB.equals(type) || type != null && type.startsWith(DumbTerminal.TYPE_DUMB_COLOR));
         Boolean dumb = this.dumb;
         if (dumb == null) {
             dumb = getBoolean(PROP_DUMB, null);
@@ -389,7 +392,7 @@ private Terminal doBuild() throws IOException {
                             stream -> stream, stream -> providers.stream().anyMatch(p -> p.isSystemStream(stream))));
             SystemStream systemStream = select(system, systemOutput);
 
-            if (system.get(SystemStream.Input) && systemStream != null) {
+            if (!forceDumb && system.get(SystemStream.Input) && systemStream != null) {
                 if (attributes != null || size != null) {
                     Log.warn("Attributes and size fields are ignored when creating a system terminal");
                 }
@@ -437,8 +440,8 @@ private Terminal doBuild() throws IOException {
                     terminal = null;
                 }
             }
-            if (terminal == null && (dumb == null || dumb)) {
-                if (dumb == null) {
+            if (terminal == null && (forceDumb || dumb == null || dumb)) {
+                if (!forceDumb && dumb == null) {
                     if (Log.isDebugEnabled()) {
                         Log.warn("input is tty: {}", system.get(SystemStream.Input));
                         Log.warn("output is tty: {}", system.get(SystemStream.Output));

diff --git a/terminal/src/main/java/org/jline/utils/Status.java b/terminal/src/main/java/org/jline/utils/Status.java
@@ -193,7 +193,6 @@ public int size() {
 
     @Override
     public String toString() {
-        return "Status[" + "supported="
-                + supported + ']';
+        return "Status[" + "supported=" + supported + ']';
     }
 }