Revert "Add Move Static Member To Existing Type (#61519)"

This reverts commit 74c3abe.
dotnet · Jun 8, 2022 · 6e46737 · 6e46737
1 parent eec626d
commit 6e46737
Show file tree

Hide file tree

Showing 13 changed files with 151 additions and 1,576 deletions.
diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
diff --git a/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
@@ -4,11 +4,8 @@
 
 using System.Collections.Immutable;
 using System.Composition;
-using System.Linq;
-using System.Threading;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.MoveStaticMembers;
-using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.Test.Utilities.MoveStaticMembers
 {
@@ -23,31 +20,23 @@ public TestMoveStaticMembersService()
         {
         }
 
-        public string? DestinationName { get; set; }
+        public string? DestinationType { get; set; }
 
         public ImmutableArray<string> SelectedMembers { get; set; }
 
         public string? Filename { get; set; }
 
-        public bool CreateNew { get; set; } = true;
-
         public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol)
         {
             var selectedMembers = selectedType.GetMembers().WhereAsArray(symbol => SelectedMembers.Contains(symbol.Name));
-            if (CreateNew)
-            {
-                var namespaceDisplay = selectedType.ContainingNamespace.IsGlobalNamespace
-                    ? string.Empty
-                    : selectedType.ContainingNamespace.ToDisplayString();
-                // just return all the selected members
-                return new MoveStaticMembersOptions(
-                    Filename!,
-                    string.Join(".", namespaceDisplay, DestinationName!),
-                    selectedMembers);
-            }
-
-            var destination = selectedType.ContainingNamespace.GetAllTypes(CancellationToken.None).First(t => t.ToDisplayString() == DestinationName);
-            return new MoveStaticMembersOptions(destination, selectedMembers);
+            var namespaceDisplay = selectedType.ContainingNamespace.IsGlobalNamespace
+                ? string.Empty
+                : selectedType.ContainingNamespace.ToDisplayString();
+            // just return all the selected members
+            return new MoveStaticMembersOptions(
+                Filename!,
+                string.Join(".", namespaceDisplay, DestinationType!),
+                selectedMembers);
         }
     }
 }