Dape compatibility

src/DAPRPC/interface_def.jl

@@ -60,6 +60,10 @@
         end
         ) : nothing)
 
+        function $tname(_::Nothing)
+            $tname(Dict())
+        end
+
         function $tname(dict::Dict)
         end
     end
@@ -69,17 +73,29 @@
         if !(field isa LineNumberNode)
             fieldname = string(field.args[1])
             fieldtype = field_type(field, string(tname))
+            val = :(dict[$fieldname])
+
             if fieldtype isa Expr && fieldtype.head == :curly && fieldtype.args[1] == :Dict
-                f = :($fieldtype(dict[$fieldname]))
+                f = :($fieldtype($val))
             elseif fieldtype isa Expr && fieldtype.head == :curly && fieldtype.args[2] != :Any
-                f = :($(fieldtype.args[2]).(dict[$fieldname]))
+                f = :($(fieldtype.args[2]).($val))
             elseif fieldtype != :Any
-                f = :($(fieldtype)(dict[$fieldname]))
+                f = :($(fieldtype)($val))
             else
-                f = :(dict[$fieldname])
+                f = val
             end
+
             if field_allows_missing(field)
-                f = :(haskey(dict, $fieldname) ? $f : missing)
+                f = :(if haskey(dict, $fieldname)
+                          # We can still get a null value here, so we need to check for that.
+                          if !isnothing($val)
+                              $f
+                          else
+                              missing
+                          end
+                      else
+                          missing
+                      end)
             end
             push!(fex.args, f)
         end

src/DAPRPC/typed.jl

@@ -65,25 +65,27 @@
         else
             error()
         end
+        arg_key = request_type == :request ? "arguments" : "body"
+        arg = if haskey(msg, arg_key)
+            msg[arg_key]
+        end
         handler = get(dispatcher._handlers, method_name, nothing)
         if handler !== nothing
             param_type = get_param_type(handler.message_type)
             params = if param_type === Nothing
                 nothing
             elseif param_type isa Union
                 if param_type.a === Nothing || param_type.b === Nothing
-                    if !haskey(msg, request_type == :request ? "arguments" : "body")
-                        nothing
-                    else
-                        param_type(msg[request_type == :request ? "arguments" : "body"])
+                    if !isnothing(arg)
+                        param_type(arg)
                     end
                 else
-                    param_type(msg[request_type == :request ? "arguments" : "body"])
+                    param_type(arg)
                 end
             elseif param_type <: NamedTuple
-                convert(param_type,(;(Symbol(i[1])=>i[2] for i in msg[request_type == :request ? "arguments" : "body"])...))
+                convert(param_type,(;(Symbol(i[1])=>i[2] for i in arg)...))
             else
-                param_type(msg[request_type == :request ? "arguments" : "body"])
+                param_type(arg)
             end
 
             res = handler.func(params)

src/debugger_requests.jl

@@ -1,37 +1,7 @@
 # Request handlers
 
 function initialize_request(debug_session::DebugSession, params::InitializeRequestArguments)
-    return Capabilities(
-        true, # supportsConfigurationDoneRequest::Union{Missing,Bool}
-        true, # supportsFunctionBreakpoints::Union{Missing,Bool}
-        true, #supportsConditionalBreakpoints::Union{Missing,Bool}
-        false, # supportsHitConditionalBreakpoints::Union{Missing,Bool}
-        true, # supportsEvaluateForHovers::Union{Missing,Bool}
-        ExceptionBreakpointsFilter[ExceptionBreakpointsFilter("error", "Uncaught Exceptions", true), ExceptionBreakpointsFilter("throw", "All Exceptions", false)], # exceptionBreakpointFilters::Vector{ExceptionBreakpointsFilter}
-        false, # supportsStepBack::Union{Missing,Bool}
-        true, # supportsSetVariable::Union{Missing,Bool}
-        true, # supportsRestartFrame::Union{Missing,Bool}
-        missing, # supportsGotoTargetsRequest::Union{Missing,Bool}
-        true, # supportsStepInTargetsRequest::Union{Missing,Bool}
-        false, # supportsCompletionsRequest::Union{Missing,Bool}
-        missing, # supportsModulesRequest::Union{Missing,Bool}
-        ColumnDescriptor[], #additionalModuleColumns::Vector{ColumnDescriptor}
-        ChecksumAlgorithm[], # supportedChecksumAlgorithms::Vector{ChecksumAlgorithm}
-        missing, # supportsRestartRequest::Union{Missing,Bool}
-        missing, # supportsExceptionOptions::Union{Missing,Bool}
-        missing, #supportsValueFormattingOptions::Union{Missing,Bool}
-        true, # supportsExceptionInfoRequest::Union{Missing,Bool}
-        missing, # supportTerminateDebuggee::Union{Missing,Bool}
-        missing, # supportsDelayedStackTraceLoading::Union{Missing,Bool}
-        missing, # supportsLoadedSourcesRequest::Union{Missing,Bool}
-        false, # supportsLogPoints::Union{Missing,Bool}
-        missing, # supportsTerminateThreadsRequest::Union{Missing,Bool}
-        missing, #supportsSetExpression::Union{Missing,Bool}
-        true, # supportsTerminateRequest::Union{Missing,Bool}
-        false, # supportsDataBreakpoints::Union{Missing,Bool}
-        missing, # supportsReadMemoryRequest::Union{Missing,Bool}
-        missing # supportsDisassembleRequest::Union{Missing,Bool}
-    )
+    debug_session.capabilities
 
         # response.body.supportsCancelRequest = false
 

src/packagedef.jl

@@ -20,6 +20,40 @@
     value
 end
 
+function capabilities()
+    Capabilities(
+        true, # supportsConfigurationDoneRequest::Union{Missing,Bool}
+        true, # supportsFunctionBreakpoints::Union{Missing,Bool}
+        true, #supportsConditionalBreakpoints::Union{Missing,Bool}
+        false, # supportsHitConditionalBreakpoints::Union{Missing,Bool}
+        true, # supportsEvaluateForHovers::Union{Missing,Bool}
+        ExceptionBreakpointsFilter[ExceptionBreakpointsFilter("error", "Uncaught Exceptions", true), ExceptionBreakpointsFilter("throw", "All Exceptions", false)], # exceptionBreakpointFilters::Vector{ExceptionBreakpointsFilter}
+        false, # supportsStepBack::Union{Missing,Bool}
+        true, # supportsSetVariable::Union{Missing,Bool}
+        true, # supportsRestartFrame::Union{Missing,Bool}
+        missing, # supportsGotoTargetsRequest::Union{Missing,Bool}
+        true, # supportsStepInTargetsRequest::Union{Missing,Bool}
+        false, # supportsCompletionsRequest::Union{Missing,Bool}
+        missing, # supportsModulesRequest::Union{Missing,Bool}
+        ColumnDescriptor[], #additionalModuleColumns::Vector{ColumnDescriptor}
+        ChecksumAlgorithm[], # supportedChecksumAlgorithms::Vector{ChecksumAlgorithm}
+        missing, # supportsRestartRequest::Union{Missing,Bool}
+        missing, # supportsExceptionOptions::Union{Missing,Bool}
+        missing, #supportsValueFormattingOptions::Union{Missing,Bool}
+        true, # supportsExceptionInfoRequest::Union{Missing,Bool}
+        missing, # supportTerminateDebuggee::Union{Missing,Bool}
+        missing, # supportsDelayedStackTraceLoading::Union{Missing,Bool}
+        missing, # supportsLoadedSourcesRequest::Union{Missing,Bool}
+        false, # supportsLogPoints::Union{Missing,Bool}
+        missing, # supportsTerminateThreadsRequest::Union{Missing,Bool}
+        missing, #supportsSetExpression::Union{Missing,Bool}
+        true, # supportsTerminateRequest::Union{Missing,Bool}
+        false, # supportsDataBreakpoints::Union{Missing,Bool}
+        missing, # supportsReadMemoryRequest::Union{Missing,Bool}
+        missing # supportsDisassembleRequest::Union{Missing,Bool}
+    )
+end
+
 mutable struct DebugSession
     conn
     endpoint::Union{Nothing,DAPRPC.DAPEndpoint}
@@ -37,6 +71,7 @@
     compiled_modules_or_functions::Vector{String}
     compiled_mode::Bool
     stop_on_entry::Bool
+    capabilities::Capabilities
 
     function DebugSession(conn)
         return new(
@@ -51,7 +86,8 @@
             [],
             String[],
             false,
-            false
+            false,
+            capabilities()
         )
     end
 end

src/protocol/types.jl

@@ -14,7 +14,7 @@ end
     width::Union{Missing,Int}
 end
 
-@dict_readable struct Capabilities <: Outbound
+@dict_readable mutable struct Capabilities <: Outbound
     supportsConfigurationDoneRequest::Union{Missing,Bool}
     supportsFunctionBreakpoints::Union{Missing,Bool}
     supportsConditionalBreakpoints::Union{Missing,Bool}