PowerShell · daxian-dbw · Feb 5, 2021 · Dec 13, 2020 · Dec 14, 2020 · Dec 14, 2020
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs
@@ -516,7 +516,11 @@ internal override
             Visit(ProgressNode node, ArrayList unused, int unusedToo)
             {
                 node.Age = Math.Min(node.Age + 1, Int32.MaxValue - 1);
-                node.Style = ProgressNode.RenderStyle.FullPlus;
+
+                node.Style = ProgressNode.IsMinimalProgressRenderingEnabled()
+                    ? ProgressNode.RenderStyle.Ansi
+                    : node.Style = ProgressNode.RenderStyle.FullPlus;
+
                 return true;
             }
         }
@@ -582,6 +586,13 @@ internal override
             }
 
             ArrayList result = new ArrayList();
+
+            if (ProgressNode.IsMinimalProgressRenderingEnabled())
+            {
+                RenderHelper(result, _topLevelNodes, indentation: 0, maxWidth, rawUI);
+                return (string[])result.ToArray(typeof(string));
+            }
+
             string border = StringUtil.Padding(maxWidth);
 
             result.Add(border);

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressNode.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressNode.cs
@@ -6,6 +6,9 @@
 using System.Management.Automation;
 using System.Management.Automation.Host;
 using System.Management.Automation.Internal;
+using System.Text;
+
+using Microsoft.PowerShell.Commands.Internal.Format;
 
 using Dbg = System.Management.Automation.Diagnostics;
 
@@ -20,7 +23,7 @@ namespace Microso
8000
ft.PowerShell
     ProgressNode : ProgressRecord
     {
         /// <summary>
-        /// Indicates the various layouts for rendering a particular node.  Each style is progressively less terse.
+        /// Indicates the various layouts for rendering a particular node.
         /// </summary>
         internal
         enum
@@ -40,6 +43,11 @@ namespace Microsoft.PowerShell
             /// The node will be displayed the same as Full, plus, the whole StatusDescription and CurrentOperation will be displayed (in multiple lines if needed).
             /// </summary>
             FullPlus = 4,
+
+            /// <summary>
+            /// The node will be displayed using ANSI escape sequences.
+            /// </summary>
+            Ansi = 5,
         }
 
         /// <summary>
@@ -56,7 +64,11 @@ namespace Microsoft.PowerShell
             this.PercentComplete = Math.Min(record.PercentComplete, 100);
             this.SecondsRemaining = record.SecondsRemaining;
             this.RecordType = record.RecordType;
-            this.Style = RenderStyle.FullPlus;
+
+            this.Style = IsMinimalProgressRenderingEnabled()
+                ? RenderStyle.Ansi
+                : this.Style = RenderStyle.FullPlus;
+
             this.SourceId = sourceId;
         }
 
@@ -98,6 +110,9 @@ namespace Microsoft.PowerShell
                 case RenderStyle.Minimal:
                     RenderMinimal(strCollection, indentation, maxWidth, rawUI);
                     break;
+                case RenderStyle.Ansi:
+                    RenderAnsi(strCollection, indentation, maxWidth);
+                    break;
                 case RenderStyle.Invisible:
                     // do nothing
                     break;
@@ -336,6 +351,88 @@ private static void RenderFullDescription(string description, string indent, int
                     maxWidth));
         }
 
+        internal static bool IsMinimalProgressRenderingEnabled()
+        {
+            return ExperimentalFeature.IsEnabled(ExperimentalFeature.PSAnsiProgressFeatureName) && PSStyle.Instance.Progress.View == ProgressView.Minimal;
+        }
+
+        /// <summary>
+        /// Renders a node in the "ANSI" style.
+        /// </summary>
+        /// <param name="strCollection">
+        /// List of strings to which the node's rendering will be appended.
+        /// </param>
+        /// <param name="indentation">
+        /// The indentation level in chars at which the node should be rendered.
+        /// </param>
+        /// <param name="maxWidth">
+        /// The maximum number of chars that the rendering is allowed to consume.
+        /// </param>
+        private
+        void
+        RenderAnsi(ArrayList strCollection, int indentation, int maxWidth)
+        {
+            string indent = StringUtil.Padding(indentation);
+            string secRemain = string.Empty;
+            if (SecondsRemaining >= 0)
+            {
+                secRemain = SecondsRemaining.ToString() + "s";
+            }
+
+            int secRemainLength = secRemain.Length + 1;
+
+            // limit progress bar to 120 chars as no need to render full width
+            if (PSStyle.Instance.Progress.MaxWidth > 0 && maxWidth > PSStyle.Instance.Progress.MaxWidth)
+            {
+                maxWidth = PSStyle.Instance.Progress.MaxWidth;
+            }
+
+            // 4 is for the extra space and square brackets below and one extra space
+            int barWidth = maxWidth - Activity.Length - indentation - 4;
+
+            var sb = new StringBuilder();
+            int padding = maxWidth + PSStyle.Instance.Progress.Style.Length + PSStyle.Instance.Reverse.Length + PSStyle.Instance.ReverseOff.Length;
+            sb.Append(PSStyle.Instance.Reverse);
+
+            if (StatusDescription.Length > barWidth - secRemainLength)
+            {
+                sb.Append(StatusDescription.Substring(0, barWidth - secRemainLength - 1));
+                sb.Append(PSObjectHelper.Ellipsis);
+            }
+            else
+            {
+                sb.Append(StatusDescription);
+            }
+
+            sb.Append(string.Empty.PadRight(barWidth + PSStyle.Instance.Reverse.Length - sb.Length - secRemainLength));
+            sb.Append(secRemain);
+
+            if (PercentComplete > 0 && PercentComplete < 100)
+            {
+                int barLength = PercentComplete * barWidth / 100;
+                if (barLength >= barWidth)
+                {
+                    barLength = barWidth - 1;
+                }
+
+                sb.Insert(barLength + PSStyle.Instance.Reverse.Length, PSStyle.Instance.ReverseOff);
+            }
+            else
+            {
+                sb.Append(PSStyle.Instance.ReverseOff);
+            }
+
+            strCollection.Add(
+                StringUtil.Format(
+                    "{0}{1}{2} [{3}]{4}",
+                    indent,
+                    PSStyle.Instance.Progress.Style,
+                    Activity,
+                    sb.ToString(),
+                    PSStyle.Instance.Reset)
+                .PadRight(padding));
+        }
+
         /// <summary>
         /// The nodes that have this node as their parent.
         /// </summary>
@@ -396,6 +493,9 @@ internal int LinesRequiredMethod(PSHostRawUserInterface rawUi, int maxWidth)
                 case RenderStyle.Invisible:
                     return 0;
 
+                case RenderStyle.Ansi:
+                    return 1;
+
                 default:
                     Dbg.Assert(false, "Unknown RenderStyle value");
                     break;