================ @@ -75,22 +75,31 @@ ScopesRequestHandler::Run(const ScopesArguments &args) const { frame.GetThread().GetProcess().SetSelectedThread(frame.GetThread()); frame.GetThread().SetSelectedFrame(frame.GetFrameID()); } - dap.variables.locals = frame.GetVariables(/*arguments=*/true, - /*locals=*/true, - /*statics=*/false, - /*in_scope_only=*/true); - dap.variables.globals = frame.GetVariables(/*arguments=*/false, - /*locals=*/false, - /*statics=*/true, - /*in_scope_only=*/true); - dap.variables.registers = frame.GetRegisters(); - - std::vector scopes = {CreateScope("Locals", VARREF_LOCALS, - dap.variables.locals.GetSize(), false), - CreateScope("Globals", VARREF_GLOBALS, - dap.variables.globals.GetSize(), false), - CreateScope("Registers", VARREF_REGS, - dap.variables.registers.GetSize(), false)}; + + uint32_t frame_id = frame.GetFrameID(); + + dap.variables.ReadyFrame(frame_id, frame); + dap.variables.SwitchFrame(frame_id); + + std::vector<Scope> scopes = {}; + + int64_t variable_reference = dap.variables.GetNewVariableReference(false); + scopes.push_back(CreateScope("Locals", variable_reference, + dap.variables.locals.GetSize(), false)); + + dap.variables.AddScopeKind(variable_reference, ScopeKind::Locals, frame_id); ---------------- Anthony-Eid wrote:
I changed the code to pass in a ScopeKind variant instead and generate the name and presentation hints from that. Is that an antiquate fix? https://github.com/llvm/llvm-project/pull/124232 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits