Merge pull request #61183 from CyrusNajmabadi/pasteOrder

Ensure we do string-copy-paste before format-on-paste
dotnet · May 9, 2022 · f124c09 · f124c09
2 parents 321b4d6 + 1d69a3f
commit f124c09
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -23,6 +23,7 @@
 using Microsoft.VisualStudio.Text.Editor.Commanding.Commands;
 using Microsoft.VisualStudio.Text.Editor.OptionsExtensionMethods;
 using Microsoft.VisualStudio.Text.Operations;
+using Microsoft.VisualStudio.Utilities;
 using Roslyn.Utilities;
 using VSUtilities = Microsoft.VisualStudio.Utilities;
 
@@ -43,8 +44,9 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
     /// doesn't want the change we made, they can always undo to get the prior paste behavior.
     /// </remarks>
     [Export(typeof(ICommandHandler))]
-    [VSUtilities.ContentType(ContentTypeNames.CSharpContentType)]
-    [VSUtilities.Name(nameof(StringCopyPasteCommandHandler))]
+    [ContentType(ContentTypeNames.CSharpContentType)]
+    [Name(PredefinedCommandHandlerNames.StringCopyPaste)]
+    [Order(After = PredefinedCommandHandlerNames.FormatDocument)]
     internal partial class StringCopyPasteCommandHandler :
         IChainedCommandHandler<CutCommandArgs>,
         IChainedCommandHandler<CopyCommandArgs>,

diff --git a/src/EditorFeatures/Core/Extensibility/Commands/PredefinedCommandHandlerNames.cs b/src/EditorFeatures/Core/Extensibility/Commands/PredefinedCommandHandlerNames.cs
@@ -147,6 +147,11 @@ internal static class PredefinedCommandHandlerNames
         /// </summary>
         public const string SignatureHelpAfterCompletion = "Signature Help After Completion Command Handler";
 
+        /// <summary>
+        /// Command handler name for String Copy Paste.
+        /// </summary>
+        public const string StringCopyPaste = "String Copy Paste";
+
         /// <summary>
         /// Command handler name for Toggle Block Comments.
         /// </summary>

diff --git a/src/EditorFeatures/Core/Formatting/FormatCommandHandler.cs b/src/EditorFeatures/Core/Formatting/FormatCommandHandler.cs
@@ -33,6 +33,7 @@ namespace Microsoft.CodeAnalysis.Formatting
     [ContentType(ContentTypeNames.RoslynContentType)]
     [Name(PredefinedCommandHandlerNames.FormatDocument)]
     [Order(After = PredefinedCommandHandlerNames.Rename)]
+    [Order(Before = PredefinedCommandHandlerNames.StringCopyPaste)]
     [Order(Before = PredefinedCompletionNames.CompletionCommandHandler)]
     internal partial class FormatCommandHandler :
         ICommandHandler<FormatDocumentCommandArgs>,