Bug fix: nano breaks if status enabled

jline · Jun 7, 2019 · 31d7d9d · 31d7d9d
1 parent f1dce10
commit 31d7d9d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/builtins/src/main/java/org/jline/builtins/Less.java b/builtins/src/main/java/org/jline/builtins/Less.java
@@ -123,9 +123,12 @@ public void run(List<Source> sources) throws IOException, InterruptedException {
 
         sourceIdx = 0;
         openSource();
+        Status status = Status.getStatus(terminal, false);
 
         try {
-        	Status.getStatus(terminal).suspend();
+            if (status != null) {
+                status.suspend();
+            }
             size.copy(terminal.getSize());
 
             if (quitIfOneScreen && sources.size() == 1) {
@@ -408,7 +411,9 @@ else if (buffer.length() > 0 && (buffer.charAt(0) == '/' || buffer.charAt(0) ==
             }
         } finally {
             reader.close();
-            Status.getStatus(terminal).restore();
+            if (status != null) {
+                status.restore();
+            }
         }
     }
 

diff --git a/builtins/src/main/java/org/jline/builtins/Nano.java b/builtins/src/main/java/org/jline/builtins/Nano.java
@@ -53,6 +53,7 @@
 import org.jline.utils.AttributedStringBuilder;
 import org.jline.utils.AttributedStyle;
 import org.jline.utils.Display;
+import org.jline.utils.Status;
 import org.jline.utils.InfoCmp.Capability;
 import org.mozilla.universalchardet.UniversalDetector;
 
@@ -994,7 +995,11 @@ public void run() throws IOException {
         this.shortcuts = standardShortcuts();
 
         SignalHandler prevHandler = null;
+        Status status = Status.getStatus(terminal, false);
         try {
+            if (status != null) {
+                status.suspend();
+            }
             buffer.open();
             if (buffer.file != null) {
                 setMessage("Read " + buffer.lines.size() + " lines");
@@ -1139,7 +1144,10 @@ public void run() throws IOException {
             terminal.flush();
             terminal.setAttributes(attributes);
             terminal.handle(Signal.WINCH, prevHandler);
-        }
+            if (status != null) {
+                status.restore();
+            }
+       }
     }
 
     boolean write() throws IOException {

diff --git a/terminal/src/main/java/org/jline/utils/AttributedString.java b/terminal/src/main/java/org/jline/utils/AttributedString.java
@@ -112,7 +112,6 @@ public static AttributedString fromAnsi(String ansi, List<Integer> tabs) {
                 .toAttributedString();
     }
 
-
     public static String stripAnsi(String ansi) {
         if (ansi == null) {
             return null;