update to test on 1.6 (#285)

Author: KristofferC

.travis.yml

@@ -8,6 +8,7 @@ os:
 julia:
   - 1.0
   - 1
+  - 1.6
   - nightly
 
 branches:
@@ -17,14 +18,6 @@ branches:
 notifications:
   email: false
 
-script:
-  - julia --project --color=yes -e 'using Pkg;
-                        Pkg.instantiate();
-                        Pkg.add([PackageSpec(name = "TerminalRegressionTests", rev = "master"),
-                                 PackageSpec(name = "VT100", rev = "master")]);
-                        Pkg.build();
-                        Pkg.test(coverage=true)'
-
 after_success:
   # push coverage results to Codecov
 - julia -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'

src/printing.jl

@@ -97,6 +97,17 @@ function print_next_expr(io::IO, frame::Frame)
             expr.args[i] = maybe_quote(val)
         end
     end
+    if isdefined(Core, :ReturnNode)
+        if expr isa Core.ReturnNode
+            val = try
+                @lookup(frame, expr.val)
+            catch err
+                err isa UndefVarError || rethrow(err)
+                expr.val
+            end
+            expr = Expr(:return, maybe_quote(val))
+        end
+    end
     expr = pattern_match_kw_call(expr)
     expr = pattern_match_apply_call(expr, frame)
     limit_expr = repr_limited(expr, MAX_BYTES_REPR[], print)

src/repl.jl

@@ -108,7 +108,7 @@ function RunDebugger(frame, repl = nothing, terminal = nothing; initial_continue
             if isempty(s) || position(LineEdit.buffer(s)) == 0
                 toggle_mode(state)
                 write(state.terminal, '\r')
-                LineEdit.write_prompt(state.terminal, panel)
+                write_prompt(state.terminal, panel)
             else
                 LineEdit.edit_insert(s, "C")
             end

test/misc.jl

@@ -57,7 +57,7 @@ frame = Debugger.@make_frame f()
 state = dummy_state(frame)
 execute_command(state, Val{:n}(), "n")
 defline, current_line, body = Debugger.locinfo(state.frame)
-@test occursin("handle_message(logger, level, msg", body)
+@test occursin("handle_message(logger, level", body)
 
 f_unicode() = √
 

test/ui.jl

@@ -101,7 +101,7 @@ end
 
 
 @testset "UI" begin
-    if Sys.isunix() && (v"1.5.0-A" <= VERSION < v"1.6.0-A")
+    if Sys.isunix() && (v"1.6.0-A" <= VERSION < v"1.7.0-A")
         Debugger._print_full_path[] = false
         using TerminalRegressionTests
 

test/ui/big_repr_ui.multiout

@@ -38,8 +38,8 @@
 | 17, 18, 19, 20, 21, 22, 23, 24, 25,...>
 |1|debug> bt
 |[1] mysum(x) at ui.jl:96
-|  | x::Array{Int64,1} = <[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-| 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 2...>
+|  | x::Vector{Int64} = <[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 
+|17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 2...>
 |  | s::Int64 = 0
 |1|debug> 
 --------------------------------------------------
@@ -57,6 +57,6 @@
 |CCCCCCCCCAA
 |AAAAAAAAAAAAAAAAAAAAAAAA
 |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 |AAAAAAAAAAAAAAAA
 |CCCCCCCCC

test/ui/history_break_error.multiout

@@ -19,7 +19,8 @@
 |Breaking for error:
 |ERROR: foo
 |Stacktrace:
-| [1] error(::String) at error.jl:33
+| [1] error(s::String)
+|   @ Base error.jl:33
 |
 |In error(s) at error.jl:33
 |>33  error(s::AbstractString) = throw(ErrorException(s))
@@ -33,9 +34,10 @@
 |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 |CCCCCCCCCA
 |AAAAAAAAAAAAAAAAAAA
-|DDDDDDDDDD
-|EEEEEEEEEEE
-|EEEEEEEEEEEAAAAAAAAEAAAAEEEEEEEEEEE
+|DDDDDDDAAA
+|AAAAAAAAAAA
+|AAAAAEEEEEEFEEAAAAAAE
+|FFFFFGGGGEHHHHHHHHHHH
 |
 |AAAAAAAAAAAAAAAAAAAAAAAAAA
 |BBBBBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -51,7 +53,8 @@
 |Breaking for error:
 |ERROR: foo
 |Stacktrace:
-| [1] error(::String) at error.jl:33
+| [1] error(s::String)
+|   @ Base error.jl:33
 |
 |In error(s) at error.jl:33
 |>33  error(s::AbstractString) = throw(ErrorException(s))
@@ -68,9 +71,10 @@
 |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 |CCCCCCCCCA
 |AAAAAAAAAAAAAAAAAAA
-|DDDDDDDDDD
-|EEEEEEEEEEE
-|EEEEEEEEEEEAAAAAAAAEAAAAEEEEEEEEEEE
+|DDDDDDDAAA
+|AAAAAAAAAAA
+|AAAAAEEEEEEFEEAAAAAAE
+|FFFFFGGGGEHHHHHHHHHHH
 |
 |AAAAAAAAAAAAAAAAAAAAAAAAAA
 |BBBBBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA