#50: Improve handling of the prompt in PreserveStateAddon

Author: Jorik De Waen

src/main/java/com/flowingcode/vaadin/addons/xterm/PreserveStateAddon.java

@@ -87,10 +87,13 @@ public PreserveStateAddon(XTerm xterm) {
             if (wasDetachedOnce) {
                 optionsMemoizer.apply();
                 xterm.write(scrollbackBuffer.toString());
+                xterm.writePrompt();
             }
         });
         xterm.addDetachListener(e -> wasDetachedOnce = true);
         xterm.addLineListener(e -> {
+            // add the prompt to the scrollback buffer
+            scrollbackBuffer.append(xterm.getPrompt());
             // also make sure that any user input ends up in the scrollback buffer.
             scrollbackBuffer.append(e.getLine());
             scrollbackBuffer.append('\n');
@@ -218,7 +221,6 @@ public String getPrompt() {
 
     public void writePrompt() {
         xterm.writePrompt();
-        scrollbackBuffer.append(xterm.getPrompt());
     }
 
     public String getScrollbackBuffer() {

src/test/java/com/flowingcode/vaadin/addons/xterm/PreserveStateAddonTest.java

@@ -1,5 +1,7 @@
 package com.flowingcode.vaadin.addons.xterm;
 
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.ComponentUtil;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -20,14 +22,23 @@ public void writeGoesToScrollbackBuffer() {
     }
 
     @Test
-    public void promptGoesToScrollbackBuffer() {
-        final PreserveStateAddon addon = new PreserveStateAddon(new XTerm());
+    public void promptGoesToScrollbackBufferAfterSubmit() {
+        XTerm xterm = new XTerm();
+        final PreserveStateAddon addon = new PreserveStateAddon(xterm);
+        Component component = xterm.getElement().getComponent().get();
+
         addon.setPrompt("a> ");
         addon.writePrompt();
-        addon.writeln("bar");
+        ComponentUtil.fireEvent(component, new ITerminalConsole.LineEvent(xterm, true, "bar"));
+
         addon.setPrompt("b> ");
         addon.writePrompt();
-        addon.writeln("baz");
+        ComponentUtil.fireEvent(component, new ITerminalConsole.LineEvent(xterm, true, "baz"));
+
+        addon.setPrompt("c> ");
+        addon.writePrompt();
+        // Does not get added to buffer
+
         assertEquals("a> bar\nb> baz\n", addon.getScrollbackBuffer());
     }