Skip to content

Commit 7360891

Browse files
authored
Format files using DocumentFormat
1 parent 7ce05d8 commit 7360891

File tree

3 files changed

+71
-72
lines changed

3 files changed

+71
-72
lines changed

src/debugger_requests.jl

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function run_notification(conn, state::DebuggerState, params::NamedTuple{(:progr
55

66
state.debug_mode = :launch
77
filename_to_debug = isabspath(params.program) ? params.program : joinpath(pwd(), params.program)
8-
put!(state.next_cmd, (cmd = :run, program = filename_to_debug))
8+
put!(state.next_cmd, (cmd=:run, program=filename_to_debug))
99
end
1010

1111
function debug_notification(conn, state::DebuggerState, params::DebugArguments)
@@ -73,10 +73,10 @@ function exec_notification(conn, state::DebuggerState, params::ExecArguments)
7373
state.sources[0] = params.code
7474

7575
@debug "setting source_path" file = params.file
76-
put!(state.next_cmd, (cmd = :set_source_path, source_path = params.file))
76+
put!(state.next_cmd, (cmd=:set_source_path, source_path=params.file))
7777

78-
params.compiledModulesOrFunctions !== missing && set_compiled_items_request(conn, state, (compiledModulesOrFunctions = params.compiledModulesOrFunctions,))
79-
params.compiledMode !== missing && set_compiled_mode_request(conn, state, (compiledMode = params.compiledMode,))
78+
params.compiledModulesOrFunctions !== missing && set_compiled_items_request(conn, state, (compiledModulesOrFunctions=params.compiledModulesOrFunctions,))
79+
params.compiledMode !== missing && set_compiled_mode_request(conn, state, (compiledMode=params.compiledMode,))
8080

8181
ex = Meta.parse(params.code)
8282
state.expr_splitter = JuliaInterpreter.ExprSplitter(Main, ex) # TODO: line numbers ?
@@ -87,7 +87,7 @@ function exec_notification(conn, state::DebuggerState, params::ExecArguments)
8787
elseif JuliaInterpreter.shouldbreak(state.frame, state.frame.pc)
8888
JSONRPC.send(conn, stopped_notification_type, StoppedEventArguments("breakpoint", missing, 1, missing, missing, missing))
8989
else
90-
put!(state.next_cmd, (cmd = :continue,))
90+
put!(state.next_cmd, (cmd=:continue,))
9191
end
9292
end
9393

@@ -125,7 +125,7 @@ function set_compiled_functions_modules!(items::Vector{String})
125125
@debug "setting as compiled" items = items
126126

127127
# sort inputs once so that removed items are at the end
128-
sort!(items, lt = function (a, b)
128+
sort!(items, lt=function (a, b)
129129
am = startswith(a, '-')
130130
bm = startswith(b, '-')
131131

@@ -206,8 +206,8 @@ function set_compiled_functions_modules!(params)
206206
return []
207207
end
208208

209-
function toggle_mode_for_all_submodules(mod, compiled, seen = Set())
210-
for name in names(mod; all = true)
209+
function toggle_mode_for_all_submodules(mod, compiled, seen=Set())
210+
for name in names(mod; all=true)
211211
if isdefined(mod, name)
212212
obj = getfield(mod, name)
213213
if obj !== mod && obj isa Module && !(obj in seen)
@@ -223,7 +223,7 @@ function toggle_mode_for_all_submodules(mod, compiled, seen = Set())
223223
end
224224
end
225225

226-
function get_obj_by_accessor(accessor, super = nothing)
226+
function get_obj_by_accessor(accessor, super=nothing)
227227
parts = split(accessor, '.')
228228
@assert length(parts) > 0
229229
top = popfirst!(parts)
@@ -324,7 +324,7 @@ function set_function_break_points_request(conn, state::DebuggerState, params::S
324324
parsed_name = Meta.parse(decoded_name)
325325

326326
if parsed_name isa Symbol
327-
return (mod = Main, name = parsed_name, signature = nothing, condition = parsed_condition)
327+
return (mod=Main, name=parsed_name, signature=nothing, condition=parsed_condition)
328328
elseif parsed_name isa Expr
329329
if parsed_name.head == :.
330330
# TODO Support this case
@@ -339,16 +339,16 @@ function set_function_break_points_request(conn, state::DebuggerState, params::S
339339
end
340340
if all_args_are_legit
341341

342-
return (mod = Main, name = parsed_name.args[1], signature = map(j -> j.args[1], parsed_name.args[2:end]), condition = parsed_condition)
342+
return (mod=Main, name=parsed_name.args[1], signature=map(j -> j.args[1], parsed_name.args[2:end]), condition=parsed_condition)
343343
else
344-
return (mod = Main, name = parsed_name.args[1], signature = nothing, condition = parsed_condition)
344+
return (mod=Main, name=parsed_name.args[1], signature=nothing, condition=parsed_condition)
345345
end
346346
else
347-
return (mod = Main, name = parsed_name.args[1], signature = nothing, condition = parsed_condition)
347+
return (mod=Main, name=parsed_name.args[1], signature=nothing, condition=parsed_condition)
348348
end
349349
else
350350
return nothing
351-
end
351+
end
352352
else
353353
return nothing
354354
end
@@ -473,7 +473,7 @@ function stack_trace_request(conn, state::DebuggerState, params::StackTraceArgum
473473
else
474474
src = copy(src)
475475
end
476-
JuliaInterpreter.replace_coretypes!(src; rev = true)
476+
JuliaInterpreter.replace_coretypes!(src; rev=true)
477477
code = Base.invokelatest(JuliaInterpreter.framecode_lines, src)
478478

479479
state.sources[state.next_source_id] = join(code, '\n')
@@ -509,29 +509,29 @@ function stack_trace_request(conn, state::DebuggerState, params::StackTraceArgum
509509
# for code that is passed via the @enter or @run macros,
510510
# and that code we have stored as source with id 0
511511
push!(
512-
frames,
513-
StackFrame(
514-
id,
515-
meth_or_mod_name,
516-
Source(
517-
"REPL",
518-
missing,
519-
0,
520-
missing,
521-
missing,
522-
missing,
523-
missing,
524-
missing
525-
),
526-
lineno,
512+
frames,
513+
StackFrame(
514+
id,
515+
meth_or_mod_name,
516+
Source(
517+
"REPL",
518+
missing,
527519
0,
528520
missing,
529521
missing,
530522
missing,
531523
missing,
532524
missing
533-
)
525+
),
526+
lineno,
527+
0,
528+
missing,
529+
missing,
530+
missing,
531+
missing,
532+
missing
534533
)
534+
)
535535
end
536536

537537
id += 1
@@ -569,17 +569,17 @@ function scopes_request(conn, state::DebuggerState, params::ScopesArguments)
569569
scopes = []
570570

571571
if isfile(file_name) && code_range !== nothing
572-
push!(scopes, Scope(name = "Local", variablesReference = local_var_ref_id, expensive = false, source = Source(name = basename(file_name), path = file_name), line = code_range.start, endLine = code_range.stop))
573-
push!(scopes, Scope(name = "Global", variablesReference = global_var_ref_id, expensive = false, source = Source(name = basename(file_name), path = file_name), line = code_range.start, endLine = code_range.stop))
572+
push!(scopes, Scope(name="Local", variablesReference=local_var_ref_id, expensive=false, source=Source(name=basename(file_name), path=file_name), line=code_range.start, endLine=code_range.stop))
573+
push!(scopes, Scope(name="Global", variablesReference=global_var_ref_id, expensive=false, source=Source(name=basename(file_name), path=file_name), line=code_range.start, endLine=code_range.stop))
574574
else
575-
push!(scopes, Scope(name = "Local", variablesReference = local_var_ref_id, expensive = false))
576-
push!(scopes, Scope(name = "Global", variablesReference = global_var_ref_id, expensive = false))
575+
push!(scopes, Scope(name="Local", variablesReference=local_var_ref_id, expensive=false))
576+
push!(scopes, Scope(name="Global", variablesReference=global_var_ref_id, expensive=false))
577577
end
578578

579579
curr_mod = JuliaInterpreter.moduleof(curr_fr)
580580
push!(state.varrefs, VariableReference(:module, curr_mod))
581581

582-
push!(scopes, Scope(name = "Global ($(curr_mod))", variablesReference = length(state.varrefs), expensive = true))
582+
push!(scopes, Scope(name="Global ($(curr_mod))", variablesReference=length(state.varrefs), expensive=true))
583583

584584
return ScopesResponseArguments(scopes)
585585
end
@@ -597,7 +597,7 @@ function construct_return_msg_for_var(state::DebuggerState, name, value)
597597
v_value_as_string = try
598598
Base.invokelatest(sprintlimited, value)
599599
catch err
600-
@debug "error showing value" exception=(err, catch_backtrace())
600+
@debug "error showing value" exception = (err, catch_backtrace())
601601
"Error while showing this value."
602602
end
603603

@@ -609,7 +609,7 @@ function construct_return_msg_for_var(state::DebuggerState, name, value)
609609
0
610610
elseif value isa AbstractArray || value isa AbstractDict
611611
fieldcount(v_type) > 0 ? 1 : 0
612-
else
612+
else
613613
fieldcount(v_type)
614614
end
615615

@@ -623,22 +623,22 @@ function construct_return_msg_for_var(state::DebuggerState, name, value)
623623
end
624624

625625
return Variable(
626-
name = name,
627-
value = v_value_as_string,
628-
type = string(v_type),
629-
variablesReference = new_var_id,
630-
namedVariables = named_count,
631-
indexedVariables = indexed_count
626+
name=name,
627+
value=v_value_as_string,
628+
type=string(v_type),
629+
variablesReference=new_var_id,
630+
namedVariables=named_count,
631+
indexedVariables=indexed_count
632632
)
633633
else
634-
return Variable(name = name, value = v_value_as_string, type = string(v_type), variablesReference = 0)
634+
return Variable(name=name, value=v_value_as_string, type=string(v_type), variablesReference=0)
635635
end
636636
end
637637

638638
function construct_return_msg_for_var_with_undef_value(state::DebuggerState, name)
639639
v_type_as_string = ""
640640

641-
return Variable(name = name, type = v_type_as_string, value = "#undef", variablesReference = 0)
641+
return Variable(name=name, type=v_type_as_string, value="#undef", variablesReference=0)
642642
end
643643

644644
function get_keys_with_drop_take(value, skip_count, take_count)
@@ -657,7 +657,7 @@ function collect_global_refs(frame::JuliaInterpreter.Frame)
657657
func = frame.framedata.locals[1].value
658658
args = (Base.unwrap_unionall(m.sig).parameters[2:end]...,)
659659

660-
ci = code_typed(func, args, optimize = false)[1][1]
660+
ci = code_typed(func, args, optimize=false)[1][1]
661661

662662
return collect_global_refs(ci)
663663
catch err
@@ -666,14 +666,14 @@ function collect_global_refs(frame::JuliaInterpreter.Frame)
666666
end
667667
end
668668

669-
function collect_global_refs(ci::Core.CodeInfo, refs = Set([]))
669+
function collect_global_refs(ci::Core.CodeInfo, refs=Set([]))
670670
for expr in ci.code
671671
collect_global_refs(expr, refs)
672672
end
673673
refs
674674
end
675675

676-
function collect_global_refs(expr::Expr, refs = Set([]))
676+
function collect_global_refs(expr::Expr, refs=Set([]))
677677
args = Meta.isexpr(expr, :call) ? expr.args[2:end] : expr.args
678678
for arg in args
679679
collect_global_refs(arg, refs)
@@ -686,12 +686,12 @@ collect_global_refs(expr, refs) = nothing
686686
collect_global_refs(expr::GlobalRef, refs) = push!(refs, expr)
687687

688688
function push_module_names!(variables, state, mod)
689-
for n in names(mod, all = true)
689+
for n in names(mod, all=true)
690690
!isdefined(mod, n) && continue
691691
Base.isdeprecated(mod, n) && continue
692692

693693
x = getfield(mod, n)
694-
x === Main && continue
694+
x === Main && continue
695695

696696
s = string(n)
697697
startswith(s, "#") && continue
@@ -746,7 +746,7 @@ function variables_request(conn, state::DebuggerState, params::VariablesArgument
746746

747747
if filter_type == "" || filter_type == "named"
748748
if (var_ref.value isa AbstractArray || var_ref.value isa AbstractDict) && !(var_ref.value isa Array) &&
749-
fieldcount(container_type) > 0
749+
fieldcount(container_type) > 0
750750
push!(state.varrefs, VariableReference(:fields, var_ref.value))
751751
new_var_id = length(state.varrefs)
752752
named_count = fieldcount(container_type)
@@ -788,7 +788,7 @@ function variables_request(conn, state::DebuggerState, params::VariablesArgument
788788
val = Base.invokelatest(getindex, var_ref.value, i)
789789
s = construct_return_msg_for_var(state, join(string.(i.I), ','), val)
790790
catch err
791-
s = Variable(name = join(string.(i.I), ','), type = "", value = "#error", variablesReference = 0)
791+
s = Variable(name=join(string.(i.I), ','), type="", value="#error", variablesReference=0)
792792
end
793793
push!(variables, s)
794794
end
@@ -871,7 +871,7 @@ function set_variable_request(conn, state::DebuggerState, params::SetVariableArg
871871

872872
if var_ref.kind == :scope
873873
try
874-
ret = JuliaInterpreter.eval_code(var_ref.value, "$var_name = $var_value");
874+
ret = JuliaInterpreter.eval_code(var_ref.value, "$var_name = $var_value")
875875

876876
s = construct_return_msg_for_var(state::DebuggerState, "", ret)
877877

@@ -950,7 +950,7 @@ function restart_frame_request(conn, state::DebuggerState, params::RestartFrameA
950950

951951
curr_fr = JuliaInterpreter.leaf(state.frame)
952952

953-
i = 1
953+
i = 1
954954

955955
while frame_id > i
956956
curr_fr = curr_fr.caller
@@ -969,7 +969,7 @@ function restart_frame_request(conn, state::DebuggerState, params::RestartFrameA
969969
state.frame = curr_fr
970970
end
971971

972-
put!(state.next_cmd, (cmd = :continue,))
972+
put!(state.next_cmd, (cmd=:continue,))
973973

974974
return RestartFrameResponseResponseArguments()
975975
end
@@ -1007,31 +1007,31 @@ function evaluate_request(conn, state::DebuggerState, params::EvaluateArguments)
10071007

10081008
return EvaluateResponseArguments(Base.invokelatest(sprintlimited, ret_val), missing, missing, 0, missing, missing, missing)
10091009
catch err
1010-
@debug "error showing value" exception=(err, catch_backtrace())
1010+
@debug "error showing value" exception = (err, catch_backtrace())
10111011
return EvaluateResponseArguments(string("Internal Error: ", sprint(showerror, err)), missing, missing, 0, missing, missing, missing)
10121012
end
10131013
end
10141014

1015-
function continue_request(conn, state::DebuggerState, params::ContinueArguments)
1015+
function continue_request(conn, state::DebuggerState, params::ContinueArguments)
10161016
@debug "continue_request"
10171017

1018-
put!(state.next_cmd, (cmd = :continue,))
1018+
put!(state.next_cmd, (cmd=:continue,))
10191019

10201020
return ContinueResponseArguments(true)
10211021
end
10221022

10231023
function next_request(conn, state::DebuggerState, params::NextArguments)
10241024
@debug "next_request"
10251025

1026-
put!(state.next_cmd, (cmd = :next,))
1026+
put!(state.next_cmd, (cmd=:next,))
10271027

10281028
return NextResponseArguments()
10291029
end
10301030

10311031
function setp_in_request(conn, state::DebuggerState, params::StepInArguments)
10321032
@debug "stepin_request"
10331033

1034-
put!(state.next_cmd, (cmd = :stepIn, targetId = params.targetId))
1034+
put!(state.next_cmd, (cmd=:stepIn, targetId=params.targetId))
10351035

10361036
return StepInResponseArguments()
10371037
end
@@ -1049,15 +1049,15 @@ end
10491049
function setp_out_request(conn, state::DebuggerState, params::StepOutArguments)
10501050
@debug "stepout_request"
10511051

1052-
put!(state.next_cmd, (cmd = :stepOut,))
1052+
put!(state.next_cmd, (cmd=:stepOut,))
10531053

10541054
return StepOutResponseArguments()
10551055
end
10561056

10571057
function disconnect_request(conn, state::DebuggerState, params::DisconnectArguments)
10581058
@debug "disconnect_request"
10591059

1060-
put!(state.next_cmd, (cmd = :stop,))
1060+
put!(state.next_cmd, (cmd=:stop,))
10611061

10621062
return DisconnectResponseArguments()
10631063
end
@@ -1066,13 +1066,13 @@ function terminate_request(conn, state::DebuggerState, params::TerminateArgument
10661066
@debug "terminate_request"
10671067

10681068
JSONRPC.send(conn, finished_notification_type, nothing)
1069-
put!(state.next_cmd, (cmd = :stop,))
1069+
put!(state.next_cmd, (cmd=:stop,))
10701070

10711071
return TerminateResponseArguments()
10721072
end
10731073

10741074
function threads_request(conn, state::DebuggerState, params::Nothing)
1075-
return ThreadsResponseArguments([Thread(id = 1, name = "Main Thread")])
1075+
return ThreadsResponseArguments([Thread(id=1, name="Main Thread")])
10761076
end
10771077

10781078
function breakpointlocations_request(conn, state::DebuggerState, params::BreakpointLocationsArguments)

0 commit comments

Comments
 (0)