Merge pull request #56108 from dotnet/merges/main-to-main-vs-deps

Merge main to main-vs-deps

Author: dotnet-bot

src/EditorFeatures/Core.Wpf/InlineRename/CommandHandlers/RenameCommandHandler.cs

@@ -9,6 +9,9 @@
 using Microsoft.VisualStudio.Commanding;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Utilities;
+using Microsoft.CodeAnalysis.Notification;
+using Microsoft.CodeAnalysis.ErrorReporting;
+using Microsoft.CodeAnalysis.Extensions;
 
 #if !COCOA
 using System.Linq;
@@ -85,6 +88,38 @@ protected override void SetDashboardFocusToPreviousElement(ITextView textView)
                 return null;
             }
         }
+
+        protected override void Commit(InlineRenameSession activeSession, ITextView textView)
+        {
+            try
+            {
+                base.Commit(activeSession, textView);
+            }
+            catch (NotSupportedException ex)
+            {
+                // Session.Commit can throw if it can't commit
+                // rename operation.
+                // handle that case gracefully
+                var notificationService = activeSession.Workspace.Services.GetService<INotificationService>();
+                notificationService?.SendNotification(ex.Message, title: EditorFeaturesResources.Rename, severity: NotificationSeverity.Error);
+            }
+            catch (Exception ex) when (FatalError.ReportAndCatch(ex))
+            {
+                // Show a nice error to the user via an info bar
+                var errorReportingService = activeSession.Workspace.Services.GetService<IErrorReportingService>();
+                if (errorReportingService is null)
+                {
+                    return;
+                }
+
+                errorReportingService.ShowGlobalErrorInfo(
+                    string.Format(EditorFeaturesWpfResources.Error_performing_rename_0, ex.Message),
+                    new InfoBarUI(
+                        WorkspacesResources.Show_Stack_Trace,
+                        InfoBarUI.UIKind.HyperLink,
+                        () => errorReportingService.ShowDetailedErrorInfo(ex), closeAfterAction: true));
+            }
+        }
 #else
         protected override bool DashboardShouldReceiveKeyboardNavigation(ITextView textView)
             => false;

src/EditorFeatures/Core/Implementation/InlineRename/CommandHandlers/AbstractRenameCommandHandler_ReturnHandler.cs

@@ -2,7 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Diagnostics;
 using Microsoft.VisualStudio.Commanding;
+using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Editor.Commanding.Commands;
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
@@ -20,12 +22,17 @@ public bool ExecuteCommand(ReturnKeyCommandArgs args, CommandExecutionContext co
                 // InlineRenameSession will call IUIThreadOperationExecutor to sets up our own IUIThreadOperationContext
                 context.OperationContext.TakeOwnership();
 
-                _renameService.ActiveSession.Commit();
-                SetFocusToTextView(args.TextView);
+                Commit(_renameService.ActiveSession, args.TextView);
                 return true;
             }
 
             return false;
         }
+
+        protected virtual void Commit(InlineRenameSession activeSession, ITextView textView)
+        {
+            activeSession.Commit();
+            SetFocusToTextView(textView);
+        }
     }
 }

src/VisualStudio/Core/Def/Implementation/Preview/PreviewEngine.cs

@@ -264,6 +264,9 @@ private static void UpdateTextViewOptions(IWpfTextView textView)
 
             // Do not show LineEndingMargin, which determines EOL and EOF settings.
             textView.Options.SetOptionValue(DefaultTextViewHostOptions.LineEndingMarginOptionId, false);
+
+            // Do not show the "no issues found" health indicator for previews. 
+            textView.Options.SetOptionValue(DefaultTextViewHostOptions.EnableFileHealthIndicatorOptionId, false);
         }
 
         // When the dialog is first instantiated, the IVsTextView it contains may