Skip to content

if running noninteractively then do not break into debugger on ctrl +… #4283

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 1 commit into from
Aug 1, 2017
Merged

if running noninteractively then do not break into debugger on ctrl +… #4283

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 24 additions & 8 deletions src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,11 +304,19 @@ private static void MyBreakHandler(object sender, ConsoleCancelEventArgs args)
switch (args.SpecialKey)
{
case ConsoleSpecialKey.ControlC:
SpinUpBreakHandlerThread(false);
SpinUpBreakHandlerThread(shouldEndSession: false);
return;
case ConsoleSpecialKey.ControlBreak:
// Break into script debugger.
BreakIntoDebugger();
if (s_cpp.NonInteractive)
{
//ControlBreak mimics ControlC in Noninteractive shells
SpinUpBreakHandlerThread(shouldEndSession: true);
}
else
{
// Break into script debugger.
BreakIntoDebugger();
}
return;
}
}
Expand All @@ -325,13 +333,21 @@ private static bool MyBreakHandler(ConsoleControl.ConsoleBreakSignal signal)
switch (signal)
{
case ConsoleControl.ConsoleBreakSignal.CtrlBreak:
// Break into script debugger.
BreakIntoDebugger();
if (s_cpp.NonInteractive)
{
//ControlBreak mimics ControlC in Noninteractive shells
SpinUpBreakHandlerThread(shouldEndSession: true);
}
else
{
// Break into script debugger.
BreakIntoDebugger();
}
return true;

// Run the break handler...
case ConsoleControl.ConsoleBreakSignal.CtrlC:
SpinUpBreakHandlerThread(false);
SpinUpBreakHandlerThread(shouldEndSession: false);
return true;

case ConsoleControl.ConsoleBreakSignal.Logoff:
Expand All @@ -343,12 +359,12 @@ private static bool MyBreakHandler(ConsoleControl.ConsoleBreakSignal signal)

case ConsoleControl.ConsoleBreakSignal.Close:
case ConsoleControl.ConsoleBreakSignal.Shutdown:
SpinUpBreakHandlerThread(true);
SpinUpBreakHandlerThread(shouldEndSession: true);
return false;

default:
// Log as much sqm data as possible before we exit.
SpinUpBreakHandlerThread(true);
SpinUpBreakHandlerThread(shouldEndSession: true);
return false;
}
}
Expand Down