Skip to content

Reinstate debugging API lost in #10338 #10808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adityapatwardhan merged 5 commits into from
Oct 30, 2019
Merged

Reinstate debugging API lost in #10338 #10808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
06466a5
Reinstate debugging API lost in #10338
Oct 16, 2019
c948057
Address feedback
Oct 16, 2019
d21a130
Change other breakpoint parts
Oct 16, 2019
af70d02
Remove blank line
Oct 16, 2019
4c983d5
Fix code factor issue
Oct 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions src/System.Management.Automation/engine/debugger/debugger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,13 @@ public virtual IEnumerable<CallStackFrame> GetCallStack()
public virtual Breakpoint GetBreakpoint(int id) =>
Copy link
Collaborator

@PoshChan PoshChan Oct 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rjmholt, your last commit had 1 failures in PowerShell-CI-static-analysis
Verify Markdown Links.Verify links in /home/vsts/work/1/s/docs/building/internals.md.https://cmake.org/download/ should work

retry of URL failed with error: Response status code does not indicate success: 500 (Internal Server Error).
at <ScriptBlock>, /home/vsts/work/1/s/test/common/markdown/markdown-link.tests.ps1: line 117
117:                                     throw "retry of URL failed with error: $($_.Exception.Message)"

Copy link
Collaborator

@PoshChan PoshChan Oct 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rjmholt, your last commit had 1 failures in PowerShell-CI-windows
TestAppDomainProcessExitEvenHandlerNotLeaking

Assert.DoesNotContain() Failure
Found:    (filter expression)
In value: Delegate[] [EventHandler { Method = Void DisposeOnShutdown(System.Object, System.EventArgs), Target = null }, EventHandler { Method = Void CurrentDomain_ProcessExit(System.Object, System.EventArgs), Target = null }]
   at PSTests.Sequential.RunspaceTests.TestAppDomainProcessExitEvenHandlerNotLeaking() in D:\a\1\s\test\xUnit\csharp\test_Runspace.cs:line 127

Copy link
Collaborator

@PoshChan PoshChan Oct 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rjmholt, your last commit had 1 failures in PowerShell-CI-windows
TestAppDomainProcessExitEvenHandlerNotLeaking

Assert.DoesNotContain() Failure
Found:    (filter expression)
In value: Delegate[] [EventHandler { Method = Void DisposeOnShutdown(System.Object, System.EventArgs), Target = null }, EventHandler { Method = Void CurrentDomain_ProcessExit(System.Object, System.EventArgs), Target = null }]
   at PSTests.Sequential.RunspaceTests.TestAppDomainProcessExitEvenHandlerNotLeaking() in D:\a\1\s\test\xUnit\csharp\test_Runspace.cs:line 127

Copy link
Collaborator

@PoshChan PoshChan Oct 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rjmholt, your last commit had 1 failures in PowerShell-CI-windows
TestAppDomainProcessExitEvenHandlerNotLeaking

Assert.DoesNotContain() Failure
Found:    (filter expression)
In value: Delegate[] [EventHandler { Method = Void DisposeOnShutdown(System.Object, System.EventArgs), Target = null }, EventHandler { Method = Void CurrentDomain_ProcessExit(System.Object, System.EventArgs), Target = null }]
   at PSTests.Sequential.RunspaceTests.TestAppDomainProcessExitEvenHandlerNotLeaking() in D:\a\1\s\test\xUnit\csharp\test_Runspace.cs:line 127

throw new PSNotImplementedException();

/// <summary>
/// Adds the provided set of breakpoints to the debugger.
/// </summary>
/// <param name="breakpoints">Breakpoints.</param>
public virtual void SetBreakpoints(IEnumerable<Breakpoint> breakpoints) =>
throw new PSNotImplementedException();

/// <summary>
/// Returns breakpoints primarily for the Get-PSBreakpoint cmdlet.
/// </summary>
Expand Down Expand Up @@ -2580,6 +2587,31 @@ internal override UnhandledBreakpointProcessingMode UnhandledBreakpointMode

#region Breakpoints

/// <summary>
/// Adds the provided set of breakpoints to the debugger.
/// </summary>
/// <param name="breakpoints"></param>
public override void SetBreakpoints(IEnumerable<Breakpoint> breakpoints)
{
foreach (Breakpoint bp in breakpoints)
{
switch (bp)
{
case CommandBreakpoint commandBreakpoint:
AddCommandBreakpoint(commandBreakpoint);
continue;

case LineBreakpoint lineBreakpoint:
AddLineBreakpoint(lineBreakpoint);
continue;

case VariableBreakpoint variableBreakpoint:
AddVariableBreakpoint(variableBreakpoint);
continue;
}
}
}

/// <summary>
/// Get a breakpoint by id, primarily for Enable/Disable/Remove-PSBreakpoint cmdlets.
/// </summary>
Expand Down Expand Up @@ -4048,6 +4080,13 @@ public NestedRunspaceDebugger(

#region Overrides

/// <summary>
/// Adds the provided set of breakpoints to the debugger.
/// </summary>
/// <param name="breakpoints">Breakpoints.</param>
public override void SetBreakpoints(IEnumerable<Breakpoint> breakpoints) =>
_wrappedDebugger.SetBreakpoints(breakpoints);

/// <summary>
/// Process debugger or PowerShell command/script.
/// </summary>
Expand Down
7 changes: 7 additions & 0 deletions src/System.Management.Automation/engine/hostifaces/PSTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,6 +1087,13 @@ public override DebuggerCommandResults ProcessCommand(
return _wrappedDebugger.ProcessCommand(command, output);
}

/// <summary>
/// Adds the provided set of breakpoints to the debugger.
/// </summary>
/// <param name="breakpoints">List of breakpoints.</param>
public override void SetBreakpoints(IEnumerable<Breakpoint> breakpoints) =>
_wrappedDebugger.SetBreakpoints(breakpoints);

/// <summary>
/// Sets the debugger resume action.
/// </summary>
Expand Down
7 changes: 7 additions & 0 deletions src/System.Management.Automation/engine/remoting/client/Job.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3909,6 +3909,13 @@ public override DebuggerCommandResults ProcessCommand(PSCommand command, PSDataC
return _wrappedDebugger.ProcessCommand(command, output);
}

/// <summary>
/// Adds the provided set of breakpoints to the debugger.
/// </summary>
/// <param name="breakpoints">Breakpoints.</param>
public override void SetBreakpoints(IEnumerable<Breakpoint> breakpoints) =>
_wrappedDebugger.SetBreakpoints(breakpoints);

public override Breakpoint GetBreakpoint(int id) =>
_wrappedDebugger.GetBreakpoint(id);

Expand Down
7 changes: 7 additions & 0 deletions src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2006,6 +2006,13 @@ public override void StopProcessCommand()
}
}

/// <summary>
/// Adds the provided set of breakpoints to the debugger.
/// </summary>
/// <param name="breakpoints">Breakpoints.</param>
public override void SetBreakpoints(IEnumerable<Breakpoint> breakpoints) =>
_runspace.Debugger?.SetBreakpoints(breakpoints);

/// <summary>
/// Get a breakpoint by id, primarily for Enable/Disable/Remove-PSBreakpoint cmdlets.
/// </summary>
Expand Down
7 changes: 7 additions & 0 deletions src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1842,6 +1842,13 @@ public override bool InBreakpoint
get { return _inDebugMode; }
}

/// <summary>
/// Adds the provided set of breakpoints to the debugger.
/// </summary>
/// <param name="breakpoints">List of breakpoints.</param>
public override void SetBreakpoints(IEnumerable<Breakpoint> breakpoints) =>
_wrappedDebugger.Value.SetBreakpoints(breakpoints);

public override Breakpoint GetBreakpoint(int id) =>
_wrappedDebugger.Value.GetBreakpoint(id);

Expand Down