Always show watch entries after watch commands. (#131)

Author: fredrikekre

src/commands.jl

@@ -101,27 +101,29 @@ end
 function execute_command(state::DebuggerState, ::Val{:w}, cmd::AbstractString)
     # TODO show some info messages?
     cmds = split(cmd)
+    success_and_show = false
     if length(cmds) == 1
-        io = Base.pipe_writer(state.terminal)
-        show_watch_list(io, state)
-        return false
+        success_and_show = true
     elseif length(cmds) >= 2
         if cmds[2] == "rm"
             if length(cmds) == 2
                 clear_watch_list!(state)
-                return false
+                success_and_show = true
             elseif length(cmds) == 3
                 i = parse(Int, cmds[3])
                 clear_watch_list!(state, i)
-                return false
+                success_and_show = true
             end
         end
         if cmds[2] == "add"
-            if add_watch_entry!(state, join(cmds[3:end]))
-            end
-            return false
+            success_and_show = add_watch_entry!(state, join(cmds[3:end]))
         end
     end
+    if success_and_show
+        io = Base.pipe_writer(state.terminal)
+        show_watch_list(io, state)
+        return false
+    end
     # Error
     return execute_command(state, Val(:_), cmd)
 end

test/ui.jl

@@ -86,7 +86,7 @@ end
         UP_ARROW = "\e[A"
 
         run_terminal_test(@make_frame(my_gcd(10, 20)),
-                          ["n\n","`", "my_gc\t\n", "a\n", UP_ARROW, UP_ARROW, UP_ARROW, CTRL_C, 
+                          ["n\n","`", "my_gc\t\n", "a\n", UP_ARROW, UP_ARROW, UP_ARROW, CTRL_C,
                            "w add a\n", "w add sin(a)\n", "w add b\n", "w\n", "w rm 1\n", "w\n",
                            "s\n", "fr 1\n", "fr 2\n", "f 2\n", "f 1\n",
                            "bt\n", "st\n", "C", "c\n", "C", "c\n"],
@@ -99,7 +99,7 @@ end
         run_terminal_test(@make_frame(f_end(2)),
                           ["n\n", "n\n", "n\n"],
                           "ui/history_floor.multiout")
-        
+
         if v"1.1">= VERSION < v"1.2"
             run_terminal_test(@make_frame(my_gcd_noinfo(10, 20)),
                             ["n\n","`", "a\n", UP_ARROW, UP_ARROW, CTRL_C, EOT],