From f57878b7848bcb663a83bc00754771f07ae04e51 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 25 Sep 2023 10:49:57 -0700
Subject: [PATCH] [release/v7.4.0-preview.6] Remove the comment trigger from
 feedback provider (#20136) (#20346)

---
 .../Subsystem/FeedbackSubsystem/FeedbackHub.cs      |  7 +++----
 .../FeedbackSubsystem/IFeedbackProvider.cs          | 13 ++++---------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/FeedbackHub.cs b/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/FeedbackHub.cs
index 7dfe79a2cd9..588cf086d42 100644
--- a/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/FeedbackHub.cs
+++ b/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/FeedbackHub.cs
@@ -183,12 +183,10 @@ public static class FeedbackHub
 
         private static bool CanSkip(IEnumerable<IFeedbackProvider> providers)
         {
-            const FeedbackTrigger possibleTriggerOnSuccess = FeedbackTrigger.Success | FeedbackTrigger.Comment;
-
             bool canSkip = true;
             foreach (IFeedbackProvider provider in providers)
             {
-                if ((provider.Trigger & possibleTriggerOnSuccess) != 0)
+                if (provider.Trigger.HasFlag(FeedbackTrigger.Success))
                 {
                     canSkip = false;
                     break;
@@ -249,7 +247,8 @@ private static bool TryGetFeedbackContext(
 
             if (IsPureComment(tokens))
             {
-                trigger = FeedbackTrigger.Comment;
+                // Don't trigger anything in this case.
+                return false;
             }
             else if (questionMarkValue)
             {
diff --git a/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/IFeedbackProvider.cs b/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/IFeedbackProvider.cs
index d028e5baa62..1446983f791 100644
--- a/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/IFeedbackProvider.cs
+++ b/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/IFeedbackProvider.cs
@@ -18,32 +18,27 @@ namespace System.Management.Automation.Subsystem.Feedback
     [Flags]
     public enum FeedbackTrigger
     {
-        /// <summary>
-        /// The last command line is comment only.
-        /// </summary>
-        Comment = 0x0001,
-
         /// <summary>
         /// The last command line executed successfully.
         /// </summary>
-        Success = 0x0002,
+        Success = 0x0001,
 
         /// <summary>
         /// The last command line failed due to a command-not-found error.
         /// This is a special case of <see cref="Error"/>.
         /// </summary>
-        CommandNotFound = 0x0004,
+        CommandNotFound = 0x0002,
 
         /// <summary>
         /// The last command line failed with an error record.
         /// This includes the case of command-not-found error.
         /// </summary>
-        Error = CommandNotFound | 0x0008,
+        Error = CommandNotFound | 0x0004,
 
         /// <summary>
         /// All possible triggers.
         /// </summary>
-        All = Comment | Success | Error
+        All = Success | Error
     }
 
     /// <summary>