maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Test if a command is 'Out-Default' more thoroughly for transcribing scenarios (#15653)

Browse source
This commit is contained in:
Dongbo Wang 2021-06-28 11:26:14 -07:00 committed by GitHub
parent 1ad1c26401
commit 14f25c92e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/System.Management.Automation/engine/hostifaces/LocalPipeline.cs
View file

@ -12,9 +12,6 @@ using System.Security.Principal;
#endif
using System.Threading;
using Microsoft.PowerShell.Commands;
using Microsoft.Win32;
using Dbg = System.Management.Automation.Diagnostics;
namespace System.Management.Automation.Runspaces
{
@ -279,54 +276,53 @@ namespace System.Management.Automation.Runspaces
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);
}
// 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)
{
needToAddOutDefault = false;
Runspace.GetExecutionContext.EngineHostInterface.UI.TranscribeCommand(command.CommandText, invocation: null);
}
}
if (this.Runspace.GetExecutionContext.EngineHostInterface.UI.IsTranscribing)
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 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 (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));

2
src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
View file

@ -438,7 +438,7 @@ namespace System.Management.Automation.Host
{
if (TranscriptionData.SystemTranscript == null)
{
TranscriptionData.SystemTranscript = PSHostUserInterface.GetSystemTranscriptOption(TranscriptionData.SystemTranscript);
TranscriptionData.SystemTranscript = GetSystemTranscriptOption(TranscriptionData.SystemTranscript);
if (TranscriptionData.SystemTranscript != null)
{
LogTranscriptHeader(null, TranscriptionData.SystemTranscript);