search

mono / monodevelop

MonoDevelop is a cross platform .NET IDE
http://www.monodevelop.com
2.84k stars 1.02k forks source link

[VsCodeDebugger] Log errors for GetAllLocals #9513

Closed jstedfast closed 4 years ago

jstedfast commented 4 years ago

Needed for https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1042237/ Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1023874/ Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1032065/ Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1042217/

jstedfast commented 4 years ago

@monojenkins backport release-8.4

monojenkins commented 4 years ago

@jstedfast backporting to release-8.4 failed, the patch results in conflicts:

Applying: [VsCodeDebugger] Log errors for GetAllLocals
Applying: [VsCodeDebugger] Added more logging and simplified code
Applying: [VsCodeDebugger] code refactoring & performance improvements
Using index info to reconstruct a base tree...
M   main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/VSCodeDebuggerSession.cs
Falling back to patching base and 3-way merge...
Auto-merging main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/VSCodeDebuggerSession.cs
Applying: [VsCodeDebugger] Use PresentationHint to get ObjectValueFlags
Using index info to reconstruct a base tree...
M   main/external/debugger-libs
Falling back to patching base and 3-way merge...
warning: Failed to merge submodule main/external/debugger-libs (not checked out)
Auto-merging main/external/debugger-libs
CONFLICT (submodule): Merge conflict in main/external/debugger-libs
error: Failed to merge in the changes.
Patch failed at 0004 [VsCodeDebugger] Use PresentationHint to get ObjectValueFlags

Please backport manually!