Skip to content

Test if a command is 'Out-Default' more thoroughly #15653

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
Jun 28, 2021
Merged

Test if a command is 'Out-Default' more thoroughly #15653

Show file tree
Hide file tree
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
54 changes: 25 additions & 29 deletions src/System.Management.Automation/engine/hostifaces/LocalPipeline.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
#endif
using System.Threading;
using Microsoft.PowerShell.Commands;
using Microsoft.Win32;

using Dbg = System.Management.Automation.Diagnostics;

namespace System.Management.Automation.Runspaces
{
Expand Down Expand Up @@ -279,54 +276,53 @@ private void SetupInvokeThread(Thread invokeThread, bool changeName)
private FlowControlException InvokeHelper()
{
FlowControlException flowControlException = null;

PipelineProcessor pipelineProcessor = null;

try
{
#if TRANSACTIONS_SUPPORTED
// 2004/11/08-JeffJon
// Transactions will not be supported for the Exchange release

// Add the transaction to this thread
System.Transactions.Transaction.Current = this.LocalRunspace.ExecutionContext.CurrentTransaction;
#endif
// Raise the event for Pipeline.Running
RaisePipelineStateEvents();

// Add this pipeline to history
RecordPipelineStartTime();

// Add automatic transcription, but don't transcribe nested commands
if (this.AddToHistory || !IsNested)
// Add automatic transcription when it's NOT a pulse pipeline, but don't transcribe nested commands.
if (!IsPulsePipeline && (AddToHistory || !IsNested))
{
bool needToAddOutDefault = true;
CommandInfo outDefaultCommandInfo = new CmdletInfo("Out-Default", typeof(Microsoft.PowerShell.Commands.OutDefaultCommand), null, null, null);

foreach (Command command in this.Commands)
foreach (Command command in Commands)
{
if (command.IsScript && (!this.IsPulsePipeline))
if (command.IsScript)
{
// Transcribe scripts, unless they are the pulse pipeline.
this.Runspace.GetExecutionContext.EngineHostInterface.UI.TranscribeCommand(command.CommandText, null);
Runspace.GetExecutionContext.EngineHostInterface.UI.TranscribeCommand(command.CommandText, invocation: null);
}
}

if (Runspace.GetExecutionContext.EngineHostInterface.UI.IsTranscribing)
{
bool needToAddOutDefault = true;
Command lastCommand = Commands[Commands.Count - 1];

// Don't need to add Out-Default if the pipeline already has it, or we've got a pipeline evaluating
// the PSConsoleHostReadLine command.
if (
string.Equals(outDefaultCommandInfo.Name, command.CommandText, StringComparison.OrdinalIgnoreCase) ||
string.Equals("PSConsoleHostReadLine", command.CommandText, StringComparison.OrdinalIgnoreCase) ||
string.Equals("TabExpansion2", command.CommandText, StringComparison.OrdinalIgnoreCase) ||
this.IsPulsePipeline)
// the PSConsoleHostReadLine or the TabExpansion2 commands.
if (string.Equals("Out-Default", lastCommand.CommandText, StringComparison.OrdinalIgnoreCase) ||
string.Equals("PSConsoleHostReadLine", lastCommand.CommandText, StringComparison.OrdinalIgnoreCase) ||
string.Equals("TabExpansion2", lastCommand.CommandText, StringComparison.OrdinalIgnoreCase) ||
(lastCommand.CommandInfo is CmdletInfo cmdlet && cmdlet.ImplementingType == typeof(OutDefaultCommand)))
{
needToAddOutDefault = false;
}
}

if (this.Runspace.GetExecutionContext.EngineHostInterface.UI.IsTranscribing)
{
if (needToAddOutDefault)
{
Command outDefaultCommand = new Command(outDefaultCommandInfo);
var outDefaultCommand = new Command(
new CmdletInfo(
"Out-Default",
typeof(OutDefaultCommand),
helpFile: null,
PSSnapin: null,
context: null));

outDefaultCommand.Parameters.Add(new CommandParameter("Transcript", true));
outDefaultCommand.Parameters.Add(new CommandParameter("OutVariable", null));

Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ private void CheckSystemTranscript()
{
if (TranscriptionData.SystemTranscript == null)
{
TranscriptionData.SystemTranscript = PSHostUserInterface.GetSystemTranscriptOption(TranscriptionData.SystemTranscript);
TranscriptionData.SystemTranscript = GetSystemTranscriptOption(TranscriptionData.SystemTranscript);
if (TranscriptionData.SystemTranscript != null)
{
LogTranscriptHeader(null, TranscriptionData.SystemTranscript);
Expand Down