Remove unused GUID detection code from console host (#18871)

iSazonov · web-flow · commit 9dd932256f2c · 2023-03-13T14:19:03.000-07:00
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
@@ -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)
             {
@@ -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)
             {
@@ -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)
             {
@@ -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)
             {
diff --git a/src/System.Management.Automation/engine/hostifaces/HostUtilities.cs b/src/System.Management.Automation/engine/hostifaces/HostUtilities.cs
@@ -519,48 +519,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>

Original file line number	Diff line number	Diff line change
`@@ -1206,9 +1206,6 @@ internal string WrapToCurrentWindowWidth(string text)`
`1206`	`1206`	`/// </exception>`
`1207`	`1207`	`public override void WriteDebugLine(string message)`
`1208`	`1208`	`{`
`1209`		`- // don't lock here as WriteLine is already protected.`
`1210`		`- message = HostUtilities.RemoveGuidFromMessage(message, out _);`
`1211`		`-`
`1212`	`1209`	`// We should write debug to error stream only if debug is redirected.)`
`1213`	`1210`	`if (_parent.ErrorFormat == Serialization.DataFormat.XML)`
`1214`	`1211`	`{`
`@@ -1266,9 +1263,6 @@ public override void WriteInformation(InformationRecord record)`
`1266`	`1263`	`/// </exception>`
`1267`	`1264`	`public override void WriteVerboseLine(string message)`
`1268`	`1265`	`{`
`1269`		`- // don't lock here as WriteLine is already protected.`
`1270`		`- message = HostUtilities.RemoveGuidFromMessage(message, out _);`
`1271`		`-`
`1272`	`1266`	`// NTRAID#Windows OS Bugs-1061752-2004/12/15-sburns should read a skin setting here...)`
`1273`	`1267`	`if (_parent.ErrorFormat == Serialization.DataFormat.XML)`
`1274`	`1268`	`{`
`@@ -1309,9 +1303,6 @@ public override void WriteVerboseLine(string message)`
`1309`	`1303`	`/// </exception>`
`1310`	`1304`	`public override void WriteWarningLine(string message)`
`1311`	`1305`	`{`
`1312`		`- // don't lock here as WriteLine is already protected.`
`1313`		`- message = HostUtilities.RemoveGuidFromMessage(message, out _);`
`1314`		`-`
`1315`	`1306`	`// NTRAID#Windows OS Bugs-1061752-2004/12/15-sburns should read a skin setting here...)`
`1316`	`1307`	`if (_parent.ErrorFormat == Serialization.DataFormat.XML)`
`1317`	`1308`	`{`
`@@ -1346,13 +1337,6 @@ public override void WriteProgress(long sourceId, ProgressRecord record)`
`1346`	`1337`	`return;`
`1347`	`1338`	`}`
`1348`	`1339`
`1349`		`- bool matchPattern;`
`1350`		`- string currentOperation = HostUtilities.RemoveIdentifierInfoFromMessage(record.CurrentOperation, out matchPattern);`
`1351`		`- if (matchPattern)`
`1352`		`- {`
`1353`		`- record = new ProgressRecord(record) { CurrentOperation = currentOperation };`
`1354`		`- }`
`1355`		`-`
`1356`	`1340`	`// We allow only one thread at a time to update the progress state.)`
`1357`	`1341`	`if (_parent.ErrorFormat == Serialization.DataFormat.XML)`
`1358`	`1342`	`{`