Skip to content

Remove code which delete GUID from Progress, Verbose, Debug and Warning messages #18871

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
daxian-dbw merged 6 commits into from
Mar 13, 2023
Merged

Remove code which delete GUID from Progress, Verbose, Debug and Warning messages #18871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8a17a2b
Fast return if progress message does not start with GUID
iSazonov Dec 31, 2022
6987334
Fix indexes
iSazonov Jan 2, 2023
c957eb5
Fast return if other messages don't start with GUID
iSazonov Jan 5, 2023
5b5ec55
Remove unused out parameter
iSazonov Jan 7, 2023
9b442c0
Remove unused out parameter 2
iSazonov Jan 7, 2023
b9bcacd
Remove RemoveGuidFromMessage and RemoveIdentifierInfoFromMessage
iSazonov Feb 28, 2023
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
16 changes: 0 additions & 16 deletions src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,9 +1206,6 @@ internal string WrapToCurrentWindowWidth(string text)
/// </exception>
public override void WriteDebugLine(string message)
{
// don't lock here as WriteLine is already protected.
message = HostUtilities.RemoveGuidFromMessage(message, out _);

// We should write debug to error stream only if debug is redirected.)
if (_parent.ErrorFormat == Serialization.DataFormat.XML)
{
Expand Down Expand Up @@ -1266,9 +1263,6 @@ public override void WriteInformation(InformationRecord record)
/// </exception>
public override void WriteVerboseLine(string message)
{
// don't lock here as WriteLine is already protected.
message = HostUtilities.RemoveGuidFromMessage(message, out _);

// NTRAID#Windows OS Bugs-1061752-2004/12/15-sburns should read a skin setting here...)
if (_parent.ErrorFormat == Serialization.DataFormat.XML)
{
Expand Down Expand Up @@ -1309,9 +1303,6 @@ public override void WriteVerboseLine(string message)
/// </exception>
public override void WriteWarningLine(string message)
{
// don't lock here as WriteLine is already protected.
message = HostUtilities.RemoveGuidFromMessage(message, out _);

// NTRAID#Windows OS Bugs-1061752-2004/12/15-sburns should read a skin setting here...)
if (_parent.ErrorFormat == Serialization.DataFormat.XML)
{
Expand Down Expand Up @@ -1346,13 +1337,6 @@ public override void WriteProgress(long sourceId, ProgressRecord record)
return;
}

bool matchPattern;
string currentOperation = HostUtilities.RemoveIdentifierInfoFromMessage(record.CurrentOperation, out matchPattern);
if (matchPattern)
{
record = new ProgressRecord(record) { CurrentOperation = currentOperation };
}

// We allow only one thread at a time to update the progress state.)
if (_parent.ErrorFormat == Serialization.DataFormat.XML)
{
Expand Down
42 changes: 0 additions & 42 deletions src/System.Management.Automation/engine/hostifaces/HostUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,48 +495,6 @@ internal static List<string> GetSuggestion(HistoryInfo lastHistory, object lastE
return returnSuggestions;
}

/// <summary>
/// Remove the GUID from the message if the message is in the pre-defined format.
/// </summary>
/// <param name="message"></param>
/// <param name="matchPattern"></param>
/// <returns></returns>
internal static string RemoveGuidFromMessage(string message, out bool matchPattern)
{
matchPattern = false;
if (string.IsNullOrEmpty(message))
return message;

const string pattern = @"^([\d\w]{8}\-[\d\w]{4}\-[\d\w]{4}\-[\d\w]{4}\-[\d\w]{12}:).*";
Match matchResult = Regex.Match(message, pattern);
if (matchResult.Success)
{
string partToRemove = matchResult.Groups[1].Captures[0].Value;
message = message.Remove(0, partToRemove.Length);
matchPattern = true;
}

return message;
}

internal static string RemoveIdentifierInfoFromMessage(string message, out bool matchPattern)
{
matchPattern = false;
if (string.IsNullOrEmpty(message))
return message;

const string pattern = @"^([\d\w]{8}\-[\d\w]{4}\-[\d\w]{4}\-[\d\w]{4}\-[\d\w]{12}:\[.*\]:).*";
Match matchResult = Regex.Match(message, pattern);
if (matchResult.Success)
{
string partToRemove = matchResult.Groups[1].Captures[0].Value;
message = message.Remove(0, partToRemove.Length);
matchPattern = true;
}

return message;
}

/// <summary>
/// Create suggestion with string rule and scriptblock suggestion.
/// </summary>
Expand Down