From 952d4351ae2cd218e73cf590cec896e8d0b573f9 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Wed, 14 Jul 2021 11:19:40 -0700
Subject: [PATCH 01/64] WIP Dialog work

---
 .../MoveMembersToTypeDialog.xaml              | 131 ++++++++++++++++++
 .../MoveMembersToTypeDialog.xaml.cs           |  64 +++++++++
 .../MoveMembersToTypeDialogViewModel.cs       |  18 +++
 ...osoft.VisualStudio.LanguageServices.csproj |   5 +
 4 files changed, 218 insertions(+)
 create mode 100644 src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml
 create mode 100644 src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs
 create mode 100644 src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs

diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml
new file mode 100644
index 0000000000000..77278c334d6cf
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml
@@ -0,0 +1,131 @@
+<vs:DialogWindow
+    xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+    xmlns:self="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.PullMemberUp.MainDialog"
+    xmlns:Imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging" xmlns:Imaging1="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
+    x:Uid="MoveMembersToTypeDialog"
+    x:Name="dialog"
+    x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType.MoveMembersToTypeDialog"
+    x:ClassModifier="internal"
+    mc:Ignorable="d"
+    WindowStartupLocation="CenterOwner"
+    Height="598"
+    Width="500"
+    MinHeight="598"
+    MinWidth="510"
+    HasDialogFrame="True"
+    ShowInTaskbar="False"
+    ResizeMode="CanResizeWithGrip"
+    Title="{Binding MoveMembersToTypeDialogTitle, ElementName=dialog}">
+    <vs:DialogWindow.Resources>
+        <Thickness x:Key="ButtonPadding">9, 2, 9, 2</Thickness>
+        <sys:Double x:Key="ButtonWidth">73</sys:Double>
+        <sys:Double x:Key="ButtonHeight">21</sys:Double>
+        <Style x:Key="TreeViewItemStyle" TargetType="{x:Type TreeViewItem}">
+            <Style.Resources>
+                <Style TargetType="{x:Type Border}">
+                    <Setter Property="Grid.ColumnSpan" Value="2"/>
+                </Style>
+            </Style.Resources>
+            <Setter Property="IsSelected" Value="{Binding IsChecked, Mode=TwoWay}"/>
+            <Setter Property="FontWeight" Value="Normal" />
+            <Setter Property="AutomationProperties.Name" Value="{Binding SymbolAutomationText}"/>
+            <Setter Property="AutomationProperties.AutomationId" Value="{Binding SymbolName}"/>
+            <Setter Property="IsExpanded" Value="True"/>
+            <Style.Triggers>
+                <Trigger Property="IsSelected" Value="True">
+                    <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
+                    <Setter Property="FontWeight" Value="Bold"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+    </vs:DialogWindow.Resources>
+    <Grid Margin="12">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="25*"/>
+            <ColumnDefinition Width="218*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="40*"/>
+            <RowDefinition Height="60*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <!--Label
+            Grid.Row="0"
+            x:Uid="TitleDescription"
+            x:Name="TitleDescription"
+            Margin="0,0,0,12"
+            Content="{Binding Description, ElementName=dialog}"/-->
+        <ComboBox x:Uid="NamespaceBox"
+                          Name="NamespaceBox"
+                          IsEditable="True"
+                          IsReadOnly="False"
+                          AutomationProperties.LabeledBy="{Binding ElementName=NamespaceLabel}"
+                          Text="{Binding NamespaceName, Mode=TwoWay, ValidatesOnDataErrors=True}"
+                          ItemsSource="{Binding AvailableNamespaces, Mode=OneTime}"
+                          BorderThickness="0" 
+                          Margin="0,0,20,200"
+                          MaxDropDownHeight="200" Grid.ColumnSpan="2" Grid.RowSpan="2">
+            <ComboBox.ItemTemplate>
+                <DataTemplate DataType="Microsoft.VisualStudio.LanguageServices.Implementation.MoveToNamespace.NamespaceItem">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <!--imaging:CrispImage 
+                                Grid.Column="0" 
+                                Visibility="{Binding IsFromHistory, Converter={StaticResource BooleanToVisibilityConverter}}" 
+                                Margin="0 0 5 0" 
+                                 Moniker="{x:Static imagecatalog:KnownMonikers.History}" /-->
+
+                        <TextBlock Grid.Column="1" Text="{Binding Namespace}" />
+                    </Grid>
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
+        <GroupBox
+            x:Uid="MemberSelectionLabel"
+            Header="{Binding SelectMembers, ElementName=dialog}"
+            Grid.Row="2"
+            MinHeight="200"
+            MinWidth="250"
+            BorderThickness="0" Grid.ColumnSpan="2">
+
+            <ContentControl Content="{Binding MemberSelectionControl, ElementName=dialog}" />
+        </GroupBox>
+        <StackPanel
+            Grid.Row="3"
+            Margin="0, 5, 8, 0"
+            HorizontalAlignment="Right"
+            Orientation="Horizontal" Grid.Column="1">
+            <Button
+                x:Name="OKButton"
+                x:Uid="OKButton"
+                Click="OKButton_Click"
+                IsDefault="True"
+                Margin="0"
+                IsEnabled="{Binding OkButtonEnabled, UpdateSourceTrigger=PropertyChanged}"
+                Padding="{StaticResource ResourceKey=ButtonPadding}"
+                Content="{Binding OK, ElementName=dialog}"
+                MinWidth="{StaticResource ResourceKey=ButtonWidth}"
+                MinHeight="{StaticResource ResourceKey=ButtonHeight}"/>
+            <Button
+                x:Name="CancelButton"
+                x:Uid="CancelButton"
+                Click="CancelButton_Click"
+                IsCancel="True"
+                Padding="{StaticResource ResourceKey=ButtonPadding}"
+                Margin="7, 0, 0, 0"
+                Content="{Binding Cancel, ElementName=dialog}"
+                MinWidth="{StaticResource ResourceKey=ButtonWidth}"
+                MinHeight="{StaticResource ResourceKey=ButtonHeight}"/>
+        </StackPanel>
+    </Grid>
+</vs:DialogWindow>
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs
new file mode 100644
index 0000000000000..aa6d40e3c42ab
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs
@@ -0,0 +1,64 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#nullable disable
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using Microsoft.VisualStudio.PlatformUI;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
+{
+    /// <summary>
+    /// Interaction logic for MoveMembersToTypeDialog.xaml
+    /// </summary>
+    internal partial class MoveMembersToTypeDialog : DialogWindow
+    {
+        private readonly MoveMembersToTypeDialogViewModel _viewModel;
+
+        public string MoveMembersToTypeDialogTitle => ServicesVSResources.Move_members_to_type;
+        public string NamespaceLabelText => ServicesVSResources.Type_Name;
+        public string OK => ServicesVSResources.OK;
+        public string Cancel => ServicesVSResources.Cancel;
+
+        internal MoveMembersToTypeDialog(MoveMembersToTypeDialogViewModel viewModel)
+            : base()
+        {
+            _viewModel = viewModel;
+
+            // Set focus to first tab control when the window is loaded
+            Loaded += (s, e) => MoveFocus(new TraversalRequest(FocusNavigationDirection.Next));
+
+            InitializeComponent();
+            DataContext = viewModel;
+        }
+
+        private void Cancel_Click(object sender, RoutedEventArgs e)
+            => DialogResult = false;
+
+        internal TestAccessor GetTestAccessor() => new(this);
+
+        private void OK_Click(object sender, RoutedEventArgs e)
+        {
+            if (_viewModel.CanSubmit)
+            {
+                DialogResult = true;
+            }
+        }
+
+        internal readonly struct TestAccessor
+        {
+            private readonly MoveToNamespaceDialog _dialog;
+            public TestAccessor(MoveToNamespaceDialog dialog)
+                => _dialog = dialog;
+
+            public Button OKButton => _dialog.OKButton;
+            public Button CancelButton => _dialog.CancelButton;
+            public ComboBox NamespaceBox => _dialog.NamespaceBox;
+
+        }
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs
new file mode 100644
index 0000000000000..0502626f44fc6
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs
@@ -0,0 +1,18 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
+{
+    internal class MoveMembersToTypeDialogViewModel : AbstractNotifyPropertyChanged
+    {
+
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
index c61ad491ee904..606ed2ae451fa 100644
--- a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
+++ b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
@@ -199,6 +199,11 @@
       <SubType>Designer</SubType>
     </VSCTCompile>
   </ItemGroup>
+  <ItemGroup>
+    <Page Update="Implementation\MoveMembersToType\MoveMembersToTypeDialog.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+  </ItemGroup>
   <Import Project="$(RepositoryEngineeringDir)targets\Vsdconfig.targets" />
 
   <Target Name="GeneratePkgDefServiceRegistrations" BeforeTargets="GeneratePkgDef">

From 3eb8edb95430cb5dbec1ae652c8b12ec9d56a440 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Wed, 14 Jul 2021 13:25:01 -0700
Subject: [PATCH 02/64] Rename + refactor

---
 .../MoveMembersToType/MoveMembersToTypeDialog.xaml.cs         | 4 ++--
 ...ToTypeDialogViewModel.cs => MoveMembersToTypeViewModel.cs} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename src/VisualStudio/Core/Def/Implementation/MoveMembersToType/{MoveMembersToTypeDialogViewModel.cs => MoveMembersToTypeViewModel.cs} (85%)

diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs
index aa6d40e3c42ab..bd6b2527e78b2 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs
@@ -17,14 +17,14 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToTy
     /// </summary>
     internal partial class MoveMembersToTypeDialog : DialogWindow
     {
-        private readonly MoveMembersToTypeDialogViewModel _viewModel;
+        private readonly MoveMembersToTypeViewModel _viewModel;
 
         public string MoveMembersToTypeDialogTitle => ServicesVSResources.Move_members_to_type;
         public string NamespaceLabelText => ServicesVSResources.Type_Name;
         public string OK => ServicesVSResources.OK;
         public string Cancel => ServicesVSResources.Cancel;
 
-        internal MoveMembersToTypeDialog(MoveMembersToTypeDialogViewModel viewModel)
+        internal MoveMembersToTypeDialog(MoveMembersToTypeViewModel viewModel)
             : base()
         {
             _viewModel = viewModel;
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeViewModel.cs
similarity index 85%
rename from src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs
rename to src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeViewModel.cs
index 0502626f44fc6..25fda52bae2b6 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeViewModel.cs
@@ -11,7 +11,7 @@
 
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
 {
-    internal class MoveMembersToTypeDialogViewModel : AbstractNotifyPropertyChanged
+    internal class MoveMembersToTypeViewModel : AbstractNotifyPropertyChanged
     {
 
     }

From 44c49b6abfd9e5cdaa424f365ea2b7743ed9110d Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Fri, 16 Jul 2021 13:46:13 -0700
Subject: [PATCH 03/64] WIP rename, add xaml elements

---
 .../MoveMembersToTypeDialog.xaml              |  63 ++-----
 .../MoveMembersToTypeDialog.xaml.cs           |  20 +-
 .../MoveMembersToTypeDialogViewModel.cs       |  40 ++++
 .../MoveMembersToTypeViewModel.cs             |  18 --
 .../MainDialog/PullMemberUpDialog.xaml        | 178 +++++++++++++-----
 5 files changed, 201 insertions(+), 118 deletions(-)
 create mode 100644 src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs
 delete mode 100644 src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeViewModel.cs

diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml
index 77278c334d6cf..e1bccedf71265 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml
@@ -7,6 +7,8 @@
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:self="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.PullMemberUp.MainDialog"
     xmlns:Imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging" xmlns:Imaging1="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
+    xmlns:imagecatalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
+    xmlns:CommonControls="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.CommonControls" xmlns:u="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.Utilities"
     x:Uid="MoveMembersToTypeDialog"
     x:Name="dialog"
     x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType.MoveMembersToTypeDialog"
@@ -44,67 +46,35 @@
             </Style.Triggers>
         </Style>
     </vs:DialogWindow.Resources>
-    <Grid Margin="12">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="25*"/>
-            <ColumnDefinition Width="218*"/>
-        </Grid.ColumnDefinitions>
+    <Grid Margin="0,10,0,10">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
+            <RowDefinition Height="10*"/>
+            <RowDefinition Height="20*"/>
             <RowDefinition Height="40*"/>
-            <RowDefinition Height="60*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <!--Label
+        <vs:SearchTextBox
+            MinHeight="30"
+            MinWidth="250"
+            Margin="0,10,0,0"
             Grid.Row="0"
-            x:Uid="TitleDescription"
-            x:Name="TitleDescription"
-            Margin="0,0,0,12"
-            Content="{Binding Description, ElementName=dialog}"/-->
-        <ComboBox x:Uid="NamespaceBox"
-                          Name="NamespaceBox"
-                          IsEditable="True"
-                          IsReadOnly="False"
-                          AutomationProperties.LabeledBy="{Binding ElementName=NamespaceLabel}"
-                          Text="{Binding NamespaceName, Mode=TwoWay, ValidatesOnDataErrors=True}"
-                          ItemsSource="{Binding AvailableNamespaces, Mode=OneTime}"
-                          BorderThickness="0" 
-                          Margin="0,0,20,200"
-                          MaxDropDownHeight="200" Grid.ColumnSpan="2" Grid.RowSpan="2">
-            <ComboBox.ItemTemplate>
-                <DataTemplate DataType="Microsoft.VisualStudio.LanguageServices.Implementation.MoveToNamespace.NamespaceItem">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <!--imaging:CrispImage 
-                                Grid.Column="0" 
-                                Visibility="{Binding IsFromHistory, Converter={StaticResource BooleanToVisibilityConverter}}" 
-                                Margin="0 0 5 0" 
-                                 Moniker="{x:Static imagecatalog:KnownMonikers.History}" /-->
-
-                        <TextBlock Grid.Column="1" Text="{Binding Namespace}" />
-                    </Grid>
-                </DataTemplate>
-            </ComboBox.ItemTemplate>
-        </ComboBox>
+            Text="{Binding DestinationType, UpdateSourceTrigger=PropertyChanged}"
+        />
         <GroupBox
             x:Uid="MemberSelectionLabel"
-            Header="{Binding SelectMembers, ElementName=dialog}"
-            Grid.Row="2"
+            Header="{Binding ElementName=dialog, Path=SelectMembers}"
             MinHeight="200"
             MinWidth="250"
-            BorderThickness="0" Grid.ColumnSpan="2">
+            Grid.Row="3">
 
-            <ContentControl Content="{Binding MemberSelectionControl, ElementName=dialog}" />
+            <ContentControl Content="{Binding ElementName=dialog, Path=MemberSelectionControl}" />
         </GroupBox>
         <StackPanel
-            Grid.Row="3"
+            Grid.Row="4"
             Margin="0, 5, 8, 0"
             HorizontalAlignment="Right"
-            Orientation="Horizontal" Grid.Column="1">
+            Orientation="Horizontal">
             <Button
                 x:Name="OKButton"
                 x:Uid="OKButton"
@@ -127,5 +97,6 @@
                 MinWidth="{StaticResource ResourceKey=ButtonWidth}"
                 MinHeight="{StaticResource ResourceKey=ButtonHeight}"/>
         </StackPanel>
+        
     </Grid>
 </vs:DialogWindow>
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs
index bd6b2527e78b2..6253f4a7f77c2 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs
@@ -8,6 +8,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using Microsoft.VisualStudio.LanguageServices.Implementation.CommonControls;
 using Microsoft.VisualStudio.PlatformUI;
 
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
@@ -17,14 +18,17 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToTy
     /// </summary>
     internal partial class MoveMembersToTypeDialog : DialogWindow
     {
-        private readonly MoveMembersToTypeViewModel _viewModel;
+        private readonly MoveMembersToTypeDialogViewModel _viewModel;
 
-        public string MoveMembersToTypeDialogTitle => ServicesVSResources.Move_members_to_type;
+        public string MoveMembersToTypeDialogTitle => "Test";
         public string NamespaceLabelText => ServicesVSResources.Type_Name;
         public string OK => ServicesVSResources.OK;
         public string Cancel => ServicesVSResources.Cancel;
+        public string SelectMembers => ServicesVSResources.Select_members_colon;
 
-        internal MoveMembersToTypeDialog(MoveMembersToTypeViewModel viewModel)
+        MemberSelection MemberSelectionControl { get; }
+
+        internal MoveMembersToTypeDialog(MoveMembersToTypeDialogViewModel viewModel)
             : base()
         {
             _viewModel = viewModel;
@@ -51,13 +55,13 @@ private void OK_Click(object sender, RoutedEventArgs e)
 
         internal readonly struct TestAccessor
         {
-            private readonly MoveToNamespaceDialog _dialog;
-            public TestAccessor(MoveToNamespaceDialog dialog)
+            private readonly MoveMembersToTypeDialog _dialog;
+            public TestAccessor(MoveMembersToTypeDialog dialog)
                 => _dialog = dialog;
 
-            public Button OKButton => _dialog.OKButton;
-            public Button CancelButton => _dialog.CancelButton;
-            public ComboBox NamespaceBox => _dialog.NamespaceBox;
+            //public Button OKButton => _dialog.OKButton;
+            //public Button CancelButton => _dialog.CancelButton;
+            //public ComboBox NamespaceBox => _dialog.NamespaceBox;
 
         }
     }
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs
new file mode 100644
index 0000000000000..5b52c3c9a7c7d
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs
@@ -0,0 +1,40 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
+using Microsoft.VisualStudio.Utilities;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
+{
+    internal class MoveMembersToTypeDialogViewModel : AbstractNotifyPropertyChanged
+    {
+
+        private bool _selectAllCheckBoxThreeStateEnable;
+        public bool SelectAllCheckBoxThreeStateEnable { get => _selectAllCheckBoxThreeStateEnable; set => SetProperty(ref _selectAllCheckBoxThreeStateEnable, value, nameof(SelectAllCheckBoxThreeStateEnable)); }
+
+        private bool? _selectAllCheckBoxState;
+        public bool? SelectAllCheckBoxState { get => _selectAllCheckBoxState; set => SetProperty(ref _selectAllCheckBoxState, value, nameof(SelectAllCheckBoxState)); }
+
+        private readonly IUIThreadOperationExecutor _uiThreadOperationExecutor;
+        private readonly ImmutableDictionary<ISymbol, Task<ImmutableArray<ISymbol>>> _symbolToDependentsMap;
+
+        private bool _canSubmit = true;
+        public bool CanSubmit { get => _canSubmit; private set => SetProperty(ref _canSubmit, value); }
+
+        public MoveMembersToTypeDialogViewModel(
+            IUIThreadOperationExecutor uiThreadOperationExecutor,
+            ImmutableDictionary<ISymbol, Task<ImmutableArray<ISymbol>>> dependentsMap)
+        {
+            _uiThreadOperationExecutor = uiThreadOperationExecutor;
+            _symbolToDependentsMap = dependentsMap;
+        }
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeViewModel.cs
deleted file mode 100644
index 25fda52bae2b6..0000000000000
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeViewModel.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// 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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
-
-namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
-{
-    internal class MoveMembersToTypeViewModel : AbstractNotifyPropertyChanged
-    {
-
-    }
-}
diff --git a/src/VisualStudio/Core/Def/Implementation/PullMemberUp/MainDialog/PullMemberUpDialog.xaml b/src/VisualStudio/Core/Def/Implementation/PullMemberUp/MainDialog/PullMemberUpDialog.xaml
index 160dc72a65f77..21c77c4156b18 100644
--- a/src/VisualStudio/Core/Def/Implementation/PullMemberUp/MainDialog/PullMemberUpDialog.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/PullMemberUp/MainDialog/PullMemberUpDialog.xaml
@@ -56,53 +56,139 @@
             x:Name="TitleDescription"
             Margin="0,0,0,12"
             Content="{Binding ElementName=dialog, Path=Description}"/>
-        <GroupBox
-            x:Uid="DestinationSelectionGroupBox"
-            x:Name="DestinationSelectionGroupBox"
-            Grid.Row="1"
-            BorderThickness="0"
-            MinHeight="130"
-            Header="{Binding ElementName=dialog, Path=SelectDestination}">
-            <TreeView
-                x:Uid="DestinationTreeView"
-                x:Name="DestinationTreeView"
-                MinHeight="100"
-                MinWidth="360"
-                Margin="0, 5, 0, 0"
-                AutomationProperties.Name="{Binding DestinationTreeViewAutomationText}"
-                ScrollViewer.VerticalScrollBarVisibility="Auto"
-                ItemsSource="{Binding DestinationTreeNodeViewModel.BaseTypeNodes}"
-                ItemContainerStyle="{StaticResource TreeViewItemStyle}"
-                SelectedItemChanged="Destination_SelectedItemChanged">
-                <TreeView.ItemTemplate>
-                    <HierarchicalDataTemplate
-                        ItemsSource="{Binding BaseTypeNodes}"
-                        DataType="{x:Type self:BaseTypeTreeNodeViewModel}">
-                        <StackPanel
-                            Orientation="Horizontal"
-                            HorizontalAlignment="Stretch"
-                            Focusable="False"
-                            VerticalAlignment="Stretch">
-                            <Image Source="{Binding Glyph}" Margin="0, 0, 5, 0" />
-                            <TextBlock
-                                x:Uid="DestinationTextBlock"
-                                Text="{Binding SymbolName}"
-                                ToolTip="{Binding Namespace}"/>
-                        </StackPanel>
-                    </HierarchicalDataTemplate>
-                </TreeView.ItemTemplate>
-            </TreeView>
-        </GroupBox>
-        <GroupBox
-            x:Uid="MemberSelectionLabel"
-            Header="{Binding ElementName=dialog, Path=SelectMembers}"
-            Grid.Row="2"
-            MinHeight="200"
-            MinWidth="250"
-            BorderThickness="0">
-
-            <ContentControl Content="{Binding ElementName=dialog, Path=MemberSelectionControl}" />
+        <GroupBox>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <DataGrid
+                    x:Uid="MemberSelectionGrid"
+                    x:Name="MemberSelectionGrid"
+                    Grid.Column="0"
+                    Margin="2, 5, 12, 2"
+                    SelectionMode="Extended"
+                    AutoGenerateColumns="False"
+                    HeadersVisibility="Column"
+                    HorizontalContentAlignment="Stretch"
+                    VerticalContentAlignment="Stretch"
+                    CanUserResizeColumns="False"
+                    CanUserResizeRows="False"
+                    IsReadOnly="True"
+                    CanUserAddRows="False"
+                    CanUserDeleteRows="False"
+                    CanUserSortColumns="False"
+                    GridLinesVisibility="None"
+                    ScrollViewer.VerticalScrollBarVisibility="Auto"
+                    CanUserReorderColumns="False"
+                    Focusable="True"
+                    MinWidth="334"
+                    Height="Auto"
+                    Background="White"
+                    AutomationProperties.Name="{Binding SelectMemberListViewAutomationText}"
+                    ItemsSource="{Binding Members, UpdateSourceTrigger=PropertyChanged, NotifyOnSourceUpdated=True, Mode=TwoWay}">
+                    <DataGrid.CellStyle>
+                        <Style TargetType="DataGridCell">
+                            <Setter Property="BorderThickness" Value="0"/>
+                            <Setter Property="Focusable" Value="False"/>
+                            <Setter Property="AutomationProperties.Name" Value="{Binding SymbolName}" />
+                        </Style>
+                    </DataGrid.CellStyle>
+                    <DataGrid.RowStyle>
+                        <Style TargetType="DataGridRow">
+                            <Setter Property="AutomationProperties.Name" Value="{Binding RowSelectionAutomationText}"/>
+                        </Style>
+                    </DataGrid.RowStyle>
+                    <DataGrid.Columns>
+                        <DataGridTemplateColumn Width="Auto">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <CheckBox
+                                                AutomationProperties.Name="{Binding SymbolAutomationText}"
+                                                AutomationProperties.AutomationId="{Binding SymbolName}"
+                                                IsChecked="{Binding IsChecked, UpdateSourceTrigger=PropertyChanged}"
+                                                Width="Auto"
+                                                IsEnabled="{Binding IsCheckable, UpdateSourceTrigger=PropertyChanged}"
+                                                Focusable="True"
+                                                ToolTipService.ShowOnDisabled="True"
+                                                ToolTipService.IsEnabled="{Binding IsCheckable, Converter={StaticResource BooleanReverseConverter}, UpdateSourceTrigger=PropertyChanged}"
+                                                ToolTipService.ToolTip="{Binding HelpText}"/>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <DataGridTemplateColumn Width="*">
+                            <DataGridTemplateColumn.Header>
+                                <TextBlock Text="{Binding ElementName=MemberSelectionControl, Path=MembersHeader}"/>
+                            </DataGridTemplateColumn.Header>
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <StackPanel
+                                            Orientation="Horizontal"
+                                            HorizontalAlignment="Left"
+                                            MinWidth="186"
+                                            Width="Auto"
+                                            Margin="5, 2, 0, 2">
+                                        <Image 
+                                                x:Name="GlyphOfMember"
+                                                Margin="8, 0, 5, 0"
+                                                Source="{Binding Glyph}"/>
+                                        <TextBlock
+                                                x:Name="MemberName"
+                                                Text="{Binding SymbolName}"
+                                                Margin="0, 0, 5, 0"
+                                                ToolTip="{Binding Accessibility}"/>
+                                    </StackPanel>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                    </DataGrid.Columns>
+                </DataGrid>
+            </Grid>
         </GroupBox>
+        <StackPanel
+                    Grid.Column="1"
+                    Orientation="Vertical"
+                    VerticalAlignment="Top"
+                    HorizontalAlignment="Center"
+                    Margin="0, 4, 0, 0"
+                    Width="Auto">
+            <Button
+                    x:Name="SelectAllButton"
+                    x:Uid="SelectAllButton"
+                    Padding="{StaticResource ResourceKey=ButtonControlsPadding}"
+                    Content="{Binding ElementName=MemberSelectionControl, Path=SelectAll}"
+                    Click="SelectAllButton_Click"
+                    Margin="2, 2, 2, 7"
+                    Width="Auto"
+                    Height="Auto" />
+            <Button
+                    x:Name="DeselectAllButton"
+                    x:Uid="DeselectAllButton"
+                    Padding="{StaticResource ResourceKey=ButtonControlsPadding}"
+                    Content="{Binding ElementName=MemberSelectionControl, Path=DeselectAll}"
+                    Click="DeselectAllButton_Click"
+                    Margin="2, 2, 2, 7"
+                    Width="Auto"
+                    Height="Auto" />
+            <Button
+                    x:Name="SelecDependentsButton"
+                    x:Uid="SelecDependentsButton"
+                    Padding="{StaticResource ResourceKey=ButtonControlsPadding}"
+                    Content="{Binding ElementName=MemberSelectionControl, Path=SelectDependents}"
+                    Click="SelectDependentsButton_Click"
+                    Margin="2, 2, 2, 7"
+                    Width="Auto"
+                    Height="Auto"/>
+            <Button
+                    x:Name="SelectPublicButton"
+                    x:Uid="SelectPublicButton"
+                    Content="{Binding ElementName=MemberSelectionControl, Path=SelectPublic}"
+                    Margin="2, 0, 2, 0"
+                    Click="SelectPublic_Click"
+                    Padding="{StaticResource ResourceKey=ButtonControlsPadding}"
+                    Width="Auto"
+                    Height="Auto"/>
+        </StackPanel>
         <StackPanel
             Grid.Row="3"
             Margin="0, 5, 8, 0"

From a36baf890d6c45163b1bedaee4b4b94a932470fe Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Tue, 20 Jul 2021 14:12:22 -0700
Subject: [PATCH 04/64] WIP dialog/VM work

---
 .../MoveMembersToTypeDialog.xaml              | 37 ++++++-------------
 .../MoveMembersToTypeDialog.xaml.cs           |  9 ++---
 .../MoveMembersToTypeDialogViewModel.cs       |  4 ++
 3 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml
index e1bccedf71265..f1c38c3fa6995 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml
@@ -4,20 +4,16 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-    xmlns:self="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.PullMemberUp.MainDialog"
-    xmlns:Imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging" xmlns:Imaging1="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
-    xmlns:imagecatalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
-    xmlns:CommonControls="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.CommonControls" xmlns:u="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.Utilities"
+    xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:controls="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.CommonControls"
     x:Uid="MoveMembersToTypeDialog"
     x:Name="dialog"
     x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType.MoveMembersToTypeDialog"
     x:ClassModifier="internal"
     mc:Ignorable="d"
     WindowStartupLocation="CenterOwner"
-    Height="598"
+    Height="498"
     Width="500"
-    MinHeight="598"
+    MinHeight="498"
     MinWidth="510"
     HasDialogFrame="True"
     ShowInTaskbar="False"
@@ -49,29 +45,20 @@
     <Grid Margin="0,10,0,10">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
-            <RowDefinition Height="10*"/>
-            <RowDefinition Height="20*"/>
-            <RowDefinition Height="40*"/>
+            <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <vs:SearchTextBox
-            MinHeight="30"
-            MinWidth="250"
-            Margin="0,10,0,0"
-            Grid.Row="0"
-            Text="{Binding DestinationType, UpdateSourceTrigger=PropertyChanged}"
-        />
-        <GroupBox
-            x:Uid="MemberSelectionLabel"
-            Header="{Binding ElementName=dialog, Path=SelectMembers}"
-            MinHeight="200"
-            MinWidth="250"
-            Grid.Row="3">
+        <controls:NewTypeDestinationSelection Grid.Row="0" ViewModel="{Binding ElementName=dialog, Path=ViewModel.DestinationViewModel}" />
 
-            <ContentControl Content="{Binding ElementName=dialog, Path=MemberSelectionControl}" />
+        <GroupBox x:Uid="MemberSelectionGroupBox"
+                  x:Name="MemberSelectionGroupBox"
+                  Margin="0, 9, 0, 0"
+                  Grid.Row="1"
+                  Header="{Binding ElementName=dialog, Path=SelectMembers}">
+            <ContentPresenter Content="{Binding ElementName=dialog, Path=MemberSelectionControl}" />
         </GroupBox>
         <StackPanel
-            Grid.Row="4"
+            Grid.Row="2"
             Margin="0, 5, 8, 0"
             HorizontalAlignment="Right"
             Orientation="Horizontal">
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs
index 6253f4a7f77c2..0cba50eeade74 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs
@@ -18,20 +18,19 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToTy
     /// </summary>
     internal partial class MoveMembersToTypeDialog : DialogWindow
     {
-        private readonly MoveMembersToTypeDialogViewModel _viewModel;
-
         public string MoveMembersToTypeDialogTitle => "Test";
         public string NamespaceLabelText => ServicesVSResources.Type_Name;
         public string OK => ServicesVSResources.OK;
         public string Cancel => ServicesVSResources.Cancel;
         public string SelectMembers => ServicesVSResources.Select_members_colon;
 
-        MemberSelection MemberSelectionControl { get; }
+        public MoveMembersToTypeDialogViewModel ViewModel { get; }
+        public MemberSelection MemberSelectionControl { get; }
 
         internal MoveMembersToTypeDialog(MoveMembersToTypeDialogViewModel viewModel)
             : base()
         {
-            _viewModel = viewModel;
+            ViewModel = viewModel;
 
             // Set focus to first tab control when the window is loaded
             Loaded += (s, e) => MoveFocus(new TraversalRequest(FocusNavigationDirection.Next));
@@ -47,7 +46,7 @@ private void Cancel_Click(object sender, RoutedEventArgs e)
 
         private void OK_Click(object sender, RoutedEventArgs e)
         {
-            if (_viewModel.CanSubmit)
+            if (ViewModel.CanSubmit)
             {
                 DialogResult = true;
             }
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs
index 5b52c3c9a7c7d..4073b45c5261f 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs
@@ -9,6 +9,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
+using Microsoft.VisualStudio.LanguageServices.Implementation.CommonControls;
 using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
 using Microsoft.VisualStudio.Utilities;
 
@@ -29,6 +30,9 @@ internal class MoveMembersToTypeDialogViewModel : AbstractNotifyPropertyChanged
         private bool _canSubmit = true;
         public bool CanSubmit { get => _canSubmit; private set => SetProperty(ref _canSubmit, value); }
 
+        public NewTypeDestinationSelectionViewModel DestinationViewModel { get; }
+        public MemberSelectionViewModel _memberSelectionViewModel { get; }
+
         public MoveMembersToTypeDialogViewModel(
             IUIThreadOperationExecutor uiThreadOperationExecutor,
             ImmutableDictionary<ISymbol, Task<ImmutableArray<ISymbol>>> dependentsMap)

From ddfbb1300ffa514c2535f976b6cee6c1397d60a6 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Fri, 23 Jul 2021 16:48:26 -0700
Subject: [PATCH 05/64] WIP, Reverted Pull Member up change, updated
 destination selection, not working bc of a few bugs

---
 ...oveMembersToTypeCodeRefactoringProvider.cs |  35 ++++
 ...actMoveMembersToTypeRefactoringProvider.cs |  50 +++++
 .../IMoveMembersToTypeOptionsService.cs       |  13 ++
 .../MoveMembersToTypeOptions.cs               |  14 ++
 .../MoveMembersToTypeWithDialogCodeAction.cs  |  51 +++++
 .../MoveMembersToTypeDialog.xaml              | 130 +++++++++----
 .../MoveMembersToTypeDialog.xaml.cs           |  13 +-
 .../MoveMembersToTypeDialogViewModel.cs       | 129 +++++++++++--
 .../StaticMemberSelection.xaml                |  87 +++++++++
 .../StaticMemberSelection.xaml.cs             |  40 ++++
 .../StaticMemberSelectionViewModel.cs         | 112 +++++++++++
 .../MoveMembersToType/TypeNameItem.cs         |  20 ++
 ...alStudioMoveMembersToTypeOptionsService.cs |  96 ++++++++++
 .../MainDialog/PullMemberUpDialog.xaml        | 179 +++++-------------
 14 files changed, 775 insertions(+), 194 deletions(-)
 create mode 100644 src/Features/CSharp/Portable/CodeRefactorings/MoveMembersToType/CSharpMoveMembersToTypeCodeRefactoringProvider.cs
 create mode 100644 src/Features/Core/Portable/MoveMembersToType/AbstractMoveMembersToTypeRefactoringProvider.cs
 create mode 100644 src/Features/Core/Portable/MoveMembersToType/IMoveMembersToTypeOptionsService.cs
 create mode 100644 src/Features/Core/Portable/MoveMembersToType/MoveMembersToTypeOptions.cs
 create mode 100644 src/Features/Core/Portable/MoveMembersToType/MoveMembersToTypeWithDialogCodeAction.cs
 create mode 100644 src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelection.xaml
 create mode 100644 src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelection.xaml.cs
 create mode 100644 src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelectionViewModel.cs
 create mode 100644 src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs
 create mode 100644 src/VisualStudio/Core/Def/Implementation/MoveMembersToType/VisualStudioMoveMembersToTypeOptionsService.cs

diff --git a/src/Features/CSharp/Portable/CodeRefactorings/MoveMembersToType/CSharpMoveMembersToTypeCodeRefactoringProvider.cs b/src/Features/CSharp/Portable/CodeRefactorings/MoveMembersToType/CSharpMoveMembersToTypeCodeRefactoringProvider.cs
new file mode 100644
index 0000000000000..f95835edb9d28
--- /dev/null
+++ b/src/Features/CSharp/Portable/CodeRefactorings/MoveMembersToType/CSharpMoveMembersToTypeCodeRefactoringProvider.cs
@@ -0,0 +1,35 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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;
+using System.Composition;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.MoveMembersToType;
+
+namespace Microsoft.CodeAnalysis.CSharp.CodeRefactorings.MoveMembersToType
+{
+    [ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = "[WIP] Move Members To Type"), Shared]
+    internal class CSharpMoveMembersToTypeCodeRefactoringProvider : AbstractMoveMembersToTypeRefactoringProvider
+    {
+        /// <summary>
+        /// Test purpose only.
+        /// </summary>
+        [SuppressMessage("RoslynDiagnosticsReliability", "RS0034:Exported parts should have [ImportingConstructor]", Justification = "Used incorrectly by tests")]
+        public CSharpMoveMembersToTypeCodeRefactoringProvider(IMoveMembersToTypeOptionsService service) : base(service)
+        {
+        }
+
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public CSharpMoveMembersToTypeCodeRefactoringProvider() : this(service: null)
+        {
+        }
+
+        protected override Task<SyntaxNode> GetSelectedNodeAsync(CodeRefactoringContext context)
+            => NodeSelectionHelpers.GetSelectedDeclarationOrVariableAsync(context);
+    }
+}
diff --git a/src/Features/Core/Portable/MoveMembersToType/AbstractMoveMembersToTypeRefactoringProvider.cs b/src/Features/Core/Portable/MoveMembersToType/AbstractMoveMembersToTypeRefactoringProvider.cs
new file mode 100644
index 0000000000000..fb53f2781b6aa
--- /dev/null
+++ b/src/Features/Core/Portable/MoveMembersToType/AbstractMoveMembersToTypeRefactoringProvider.cs
@@ -0,0 +1,50 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+
+namespace Microsoft.CodeAnalysis.MoveMembersToType
+{
+    internal abstract class AbstractMoveMembersToTypeRefactoringProvider : CodeRefactoringProvider
+    {
+        private readonly IMoveMembersToTypeOptionsService _service;
+
+        protected abstract Task<SyntaxNode> GetSelectedNodeAsync(CodeRefactoringContext context);
+
+        /// <summary>
+        /// Test purpose only
+        /// </summary>
+        protected AbstractMoveMembersToTypeRefactoringProvider(IMoveMembersToTypeOptionsService service)
+            => _service = service;
+
+        public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
+        {
+            var (document, span, cancellationToken) = context;
+
+            var selectedMemberNode = await GetSelectedNodeAsync(context).ConfigureAwait(false);
+            if (selectedMemberNode == null)
+            {
+                return;
+            }
+
+            var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+            var selectedMember = semanticModel.GetDeclaredSymbol(selectedMemberNode);
+            if (selectedMember == null || selectedMember.ContainingType == null || !selectedMember.IsStatic)
+            {
+                return;
+            }
+
+            var syntaxFacts = document.GetRequiredLanguageService<ISyntaxFactsService>();
+            var selectedType = selectedMember.ContainingType;
+            var selectedTypeDeclaration = selectedMemberNode.FirstAncestorOrSelf<SyntaxNode>(syntaxFacts.IsTypeDeclaration);
+
+            var action = new MoveMembersToTypeWithDialogCodeAction(document, span, _service, selectedType, selectedTypeDeclaration!, selectedMember: selectedMember);
+
+            context.RegisterRefactoring(action, selectedMemberNode.Span);
+        }
+    }
+}
diff --git a/src/Features/Core/Portable/MoveMembersToType/IMoveMembersToTypeOptionsService.cs b/src/Features/Core/Portable/MoveMembersToType/IMoveMembersToTypeOptionsService.cs
new file mode 100644
index 0000000000000..7199662829232
--- /dev/null
+++ b/src/Features/Core/Portable/MoveMembersToType/IMoveMembersToTypeOptionsService.cs
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CodeAnalysis.Host;
+
+namespace Microsoft.CodeAnalysis.MoveMembersToType
+{
+    internal interface IMoveMembersToTypeOptionsService : IWorkspaceService
+    {
+        MoveMembersToTypeOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol);
+    }
+}
diff --git a/src/Features/Core/Portable/MoveMembersToType/MoveMembersToTypeOptions.cs b/src/Features/Core/Portable/MoveMembersToType/MoveMembersToTypeOptions.cs
new file mode 100644
index 0000000000000..58bb186bb73d6
--- /dev/null
+++ b/src/Features/Core/Portable/MoveMembersToType/MoveMembersToTypeOptions.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.CodeAnalysis.MoveMembersToType
+{
+    class MoveMembersToTypeOptions
+    {
+    }
+}
diff --git a/src/Features/Core/Portable/MoveMembersToType/MoveMembersToTypeWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveMembersToType/MoveMembersToTypeWithDialogCodeAction.cs
new file mode 100644
index 0000000000000..a4857277fee70
--- /dev/null
+++ b/src/Features/Core/Portable/MoveMembersToType/MoveMembersToTypeWithDialogCodeAction.cs
@@ -0,0 +1,51 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.MoveMembersToType
+{
+    internal class MoveMembersToTypeWithDialogCodeAction : CodeActionWithOptions
+    {
+        private readonly Document _document;
+        private readonly ISymbol? _selectedMember;
+        private readonly INamedTypeSymbol _selectedType;
+        private readonly SyntaxNode _selectedTypeDeclarationNode;
+        private readonly IMoveMembersToTypeOptionsService _service;
+
+        public TextSpan Span { get; }
+        public override string Title => "[WIP] Move Members to Type...";
+
+        public MoveMembersToTypeWithDialogCodeAction(
+            Document document,
+            TextSpan span,
+            IMoveMembersToTypeOptionsService service,
+            INamedTypeSymbol selectedType,
+            SyntaxNode selectedTypeDeclarationNode,
+            ISymbol? selectedMember = null)
+        {
+            _document = document;
+            _service = service;
+            _selectedType = selectedType;
+            _selectedTypeDeclarationNode = selectedTypeDeclarationNode;
+            _selectedMember = selectedMember;
+            Span = span;
+        }
+
+        public override object? GetOptions(CancellationToken cancellationToken)
+        {
+            var optionsService = _service ?? _document.Project.Solution.Workspace.Services.GetRequiredService<IMoveMembersToTypeOptionsService>();
+            return optionsService.GetMoveMembersToTypeOptions(_document, _selectedType, _selectedMember);
+        }
+
+        protected override Task<IEnumerable<CodeActionOperation>> ComputeOperationsAsync(object options, CancellationToken cancellationToken)
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml
index f1c38c3fa6995..418671a0d181b 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml
@@ -4,7 +4,12 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:controls="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.CommonControls"
+    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+    xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
+    xmlns:imagecatalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog" 
+    xmlns:movememberstotype="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType" 
+    d:DataContext="{d:DesignInstance Type=movememberstotype:MoveMembersToTypeDialogViewModel}"
+    vs:ThemedDialogStyleLoader.UseDefaultThemedDialogStyles="True"
     x:Uid="MoveMembersToTypeDialog"
     x:Name="dialog"
     x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType.MoveMembersToTypeDialog"
@@ -13,12 +18,13 @@
     WindowStartupLocation="CenterOwner"
     Height="498"
     Width="500"
-    MinHeight="498"
-    MinWidth="510"
+    MinHeight="298"
+    MinWidth="210"
     HasDialogFrame="True"
     ShowInTaskbar="False"
-    ResizeMode="CanResizeWithGrip"
-    Title="{Binding MoveMembersToTypeDialogTitle, ElementName=dialog}">
+    ResizeMode="CanResize"
+    Title="{Binding MoveMembersToTypeDialogTitle, ElementName=dialog}"
+    Background="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}">
     <vs:DialogWindow.Resources>
         <Thickness x:Key="ButtonPadding">9, 2, 9, 2</Thickness>
         <sys:Double x:Key="ButtonWidth">73</sys:Double>
@@ -41,49 +47,101 @@
                 </Trigger>
             </Style.Triggers>
         </Style>
+        <Thickness x:Key="verticalLabelMargin">0, 0, 0, 5</Thickness>
+        <Thickness x:Key="messageMargin">0, 9, 0, 0</Thickness>
+        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     </vs:DialogWindow.Resources>
-    <Grid Margin="0,10,0,10">
+    <Grid Margin="11,6,11,11">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
+            <RowDefinition Height="25"/>
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <controls:NewTypeDestinationSelection Grid.Row="0" ViewModel="{Binding ElementName=dialog, Path=ViewModel.DestinationViewModel}" />
+        <StackPanel Orientation="Vertical" Grid.Row="0">
+            <Label x:Uid="DestinationLabel" 
+                       x:Name="DestinationLabel"
+                       Margin="{StaticResource verticalLabelMargin}"
+                       Content="{Binding ElementName=dialog, Path=DestinationLabelText}"
+                       Target="{Binding ElementName=DestinationTextBox}" />
+            <ComboBox x:Uid="DestinationBox"
+                          Name="DestinationBox"
+                          IsEditable="True"
+                          IsReadOnly="False"
+                          AutomationProperties.LabeledBy="{Binding ElementName=DestinationLabel}"
+                          Text="{Binding DestinationName, Mode=TwoWay, ValidatesOnDataErrors=True}"
+                          ItemsSource="{Binding AvailableTypes, Mode=OneTime}"
+                          BorderThickness="0" 
+                          Margin="0 0 20 0"
+                          MaxDropDownHeight="150">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate DataType="Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType.TypeNameItem">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+
+                            <imaging:CrispImage 
+                                Grid.Column="0" 
+                                Visibility="{Binding IsFromHistory, Converter={StaticResource BooleanToVisibilityConverter}}" 
+                                Margin="0 0 5 0" 
+                                 Moniker="{x:Static imagecatalog:KnownMonikers.History}" />
+
+                            <TextBlock Grid.Column="1" Text="{Binding TypeName}" />
+                        </Grid>
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+
+        </StackPanel>
+
+        <StackPanel Grid.Row="1">
+            <StackPanel Orientation="Horizontal"  
+                        Visibility="{Binding ShowMessage, Converter={StaticResource BooleanToVisibilityConverter}}"
+                        Margin="{StaticResource messageMargin}">
+                <imaging:CrispImage Name="MessageIcon"
+                                    Moniker="{Binding Icon}" 
+                                    Height="16"
+                                    Width="16"
+                                    VerticalAlignment="Top" />
+
+                <vs:LiveTextBlock x:Name="MessageText"
+                           Text="{Binding Message}"
+                           Margin="7, 0, 0, 0"
+                           Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
+            </StackPanel>
+        </StackPanel>
 
         <GroupBox x:Uid="MemberSelectionGroupBox"
                   x:Name="MemberSelectionGroupBox"
-                  Margin="0, 9, 0, 0"
-                  Grid.Row="1"
+                  Margin="0, 150, 0, 0"
+                  Grid.Row="2"
                   Header="{Binding ElementName=dialog, Path=SelectMembers}">
             <ContentPresenter Content="{Binding ElementName=dialog, Path=MemberSelectionControl}" />
         </GroupBox>
-        <StackPanel
-            Grid.Row="2"
-            Margin="0, 5, 8, 0"
-            HorizontalAlignment="Right"
-            Orientation="Horizontal">
-            <Button
-                x:Name="OKButton"
-                x:Uid="OKButton"
-                Click="OKButton_Click"
-                IsDefault="True"
-                Margin="0"
-                IsEnabled="{Binding OkButtonEnabled, UpdateSourceTrigger=PropertyChanged}"
-                Padding="{StaticResource ResourceKey=ButtonPadding}"
-                Content="{Binding OK, ElementName=dialog}"
-                MinWidth="{StaticResource ResourceKey=ButtonWidth}"
-                MinHeight="{StaticResource ResourceKey=ButtonHeight}"/>
-            <Button
-                x:Name="CancelButton"
-                x:Uid="CancelButton"
-                Click="CancelButton_Click"
-                IsCancel="True"
-                Padding="{StaticResource ResourceKey=ButtonPadding}"
-                Margin="7, 0, 0, 0"
-                Content="{Binding Cancel, ElementName=dialog}"
-                MinWidth="{StaticResource ResourceKey=ButtonWidth}"
-                MinHeight="{StaticResource ResourceKey=ButtonHeight}"/>
+        <StackPanel Grid.Row="3"
+                    HorizontalAlignment="Right" 
+                    Margin="0, 11, 0, 0"
+                    Orientation="Horizontal">
+            <Button x:Uid="OkButton" 
+                    Name="OKButton"
+                    Content="{Binding ElementName=dialog, Path=OK}" 
+                    Margin="0, 0, 0, 0" 
+                    Padding="{StaticResource ResourceKey=ButtonPadding}"
+                    Click="OK_Click" 
+                    IsDefault="True"
+                    MinWidth="73"
+                    MinHeight="21"/>
+            <Button x:Uid="CancelButton" 
+                    Name="CancelButton"
+                    Content="{Binding ElementName=dialog, Path=Cancel}"
+                    Margin="7, 0, 0, 0" 
+                    Padding="{StaticResource ResourceKey=ButtonPadding}"
+                    Click="Cancel_Click"
+                    IsCancel="True"
+                    MinWidth="73"
+                    MinHeight="21"/>
         </StackPanel>
-        
     </Grid>
 </vs:DialogWindow>
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs
index 0cba50eeade74..d7fa273347e05 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs
@@ -19,24 +19,26 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToTy
     internal partial class MoveMembersToTypeDialog : DialogWindow
     {
         public string MoveMembersToTypeDialogTitle => "Test";
-        public string NamespaceLabelText => ServicesVSResources.Type_Name;
+        public string DestinationLabelText => ServicesVSResources.Type_Name;
         public string OK => ServicesVSResources.OK;
         public string Cancel => ServicesVSResources.Cancel;
         public string SelectMembers => ServicesVSResources.Select_members_colon;
 
         public MoveMembersToTypeDialogViewModel ViewModel { get; }
-        public MemberSelection MemberSelectionControl { get; }
+        public StaticMemberSelection MemberSelectionControl { get; }
 
         internal MoveMembersToTypeDialog(MoveMembersToTypeDialogViewModel viewModel)
             : base()
         {
             ViewModel = viewModel;
+            DataContext = viewModel;
+
+            MemberSelectionControl = new StaticMemberSelection(ViewModel.MemberSelectionViewModel);
 
             // Set focus to first tab control when the window is loaded
             Loaded += (s, e) => MoveFocus(new TraversalRequest(FocusNavigationDirection.Next));
 
             InitializeComponent();
-            DataContext = viewModel;
         }
 
         private void Cancel_Click(object sender, RoutedEventArgs e)
@@ -58,9 +60,8 @@ internal readonly struct TestAccessor
             public TestAccessor(MoveMembersToTypeDialog dialog)
                 => _dialog = dialog;
 
-            //public Button OKButton => _dialog.OKButton;
-            //public Button CancelButton => _dialog.CancelButton;
-            //public ComboBox NamespaceBox => _dialog.NamespaceBox;
+            public Button OKButton => _dialog.OKButton;
+            public Button CancelButton => _dialog.CancelButton;
 
         }
     }
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs
index 4073b45c5261f..c4b035b004e4c 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs
@@ -3,42 +3,131 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.ComponentModel;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.VisualStudio.Imaging;
+using Microsoft.VisualStudio.Imaging.Interop;
 using Microsoft.VisualStudio.LanguageServices.Implementation.CommonControls;
+using Microsoft.VisualStudio.LanguageServices.Implementation.PullMemberUp.MainDialog;
 using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
-using Microsoft.VisualStudio.Utilities;
 
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
 {
     internal class MoveMembersToTypeDialogViewModel : AbstractNotifyPropertyChanged
     {
 
-        private bool _selectAllCheckBoxThreeStateEnable;
-        public bool SelectAllCheckBoxThreeStateEnable { get => _selectAllCheckBoxThreeStateEnable; set => SetProperty(ref _selectAllCheckBoxThreeStateEnable, value, nameof(SelectAllCheckBoxThreeStateEnable)); }
+        public StaticMemberSelectionViewModel MemberSelectionViewModel { get; }
 
-        private bool? _selectAllCheckBoxState;
-        public bool? SelectAllCheckBoxState { get => _selectAllCheckBoxState; set => SetProperty(ref _selectAllCheckBoxState, value, nameof(SelectAllCheckBoxState)); }
+        private ISyntaxFacts _syntaxFacts;
 
-        private readonly IUIThreadOperationExecutor _uiThreadOperationExecutor;
-        private readonly ImmutableDictionary<ISymbol, Task<ImmutableArray<ISymbol>>> _symbolToDependentsMap;
 
-        private bool _canSubmit = true;
-        public bool CanSubmit { get => _canSubmit; private set => SetProperty(ref _canSubmit, value); }
+        public MoveMembersToTypeDialogViewModel(
+            StaticMemberSelectionViewModel memberSelectionViewModel,
+            string defaultType,
+            ImmutableArray<string> availableTypes,
+            ISyntaxFacts syntaxFacts,
+            ImmutableArray<string> typeHistory)
+        {
+            MemberSelectionViewModel = memberSelectionViewModel;
+            _syntaxFacts = syntaxFacts ?? throw new ArgumentNullException(nameof(syntaxFacts));
+            _destinationName = defaultType;
+            AvailableTypes = typeHistory.Select(n => new TypeNameItem(true, n))
+                .Concat(availableTypes.Except(typeHistory).Select(n => new TypeNameItem(false, n)))
+                .ToImmutableArray();
 
-        public NewTypeDestinationSelectionViewModel DestinationViewModel { get; }
-        public MemberSelectionViewModel _memberSelectionViewModel { get; }
+            PropertyChanged += MoveMembersToTypeDialogViewModel_PropertyChanged;
+        }
 
-        public MoveMembersToTypeDialogViewModel(
-            IUIThreadOperationExecutor uiThreadOperationExecutor,
-            ImmutableDictionary<ISymbol, Task<ImmutableArray<ISymbol>>> dependentsMap)
+        private void MoveMembersToTypeDialogViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            switch (e.PropertyName)
+            {
+                case nameof(DestinationName):
+                    OnDestinationUpdated();
+                    break;
+            }
+        }
+
+        public void OnDestinationUpdated()
+        {
+            var isNewType = !AvailableTypes.Any(i => i.TypeName == DestinationName);
+            _isValidName = !isNewType || IsValidType(DestinationName);
+
+            if (isNewType && _isValidName)
+            {
+                Icon = KnownMonikers.StatusInformation;
+                Message = "[WIP] A new type will be created";
+                ShowMessage = true;
+            }
+            else if (!_isValidName)
+            {
+                Icon = KnownMonikers.StatusInvalid;
+                Message = "[WIP] Invalid Type Name";
+                ShowMessage = true;
+            }
+            else
+            {
+                ShowMessage = false;
+            }
+        }
+
+        private bool IsValidType(string typeName)
         {
-            _uiThreadOperationExecutor = uiThreadOperationExecutor;
-            _symbolToDependentsMap = dependentsMap;
+            if (string.IsNullOrEmpty(typeName))
+            {
+                return false;
+            }
+
+            foreach (var identifier in typeName.Split('.'))
+            {
+                if (_syntaxFacts.IsValidIdentifier(identifier))
+                {
+                    continue;
+                }
+
+                return false;
+            }
+
+            return true;
         }
+
+        private string _destinationName;
+        public string DestinationName
+        {
+            get => _destinationName;
+            set => SetProperty(ref _destinationName, value);
+        }
+
+        public ImmutableArray<TypeNameItem> AvailableTypes { get; }
+
+        private ImageMoniker _icon;
+        public ImageMoniker Icon
+        {
+            get => _icon;
+            private set => SetProperty(ref _icon, value);
+        }
+
+        private string? _message;
+        public string? Message
+        {
+            get => _message;
+            private set => SetProperty(ref _message, value);
+        }
+
+        private bool _showMessage = false;
+        public bool ShowMessage
+        {
+            get => _showMessage;
+            private set => SetProperty(ref _showMessage, value);
+        }
+
+        private bool _isValidName = true;
+        public bool CanSubmit
+        {
+            get => _isValidName && MemberSelectionViewModel.CheckedMembers.Length > 0;
+        }
+
     }
 }
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelection.xaml b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelection.xaml
new file mode 100644
index 0000000000000..bd7098784cf7c
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelection.xaml
@@ -0,0 +1,87 @@
+<UserControl x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType.StaticMemberSelection"
+             x:ClassModifier="internal"
+             x:Name="MemberSelectionControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:utilities="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.Utilities"
+             xmlns:commoncontrols="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.CommonControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <Thickness x:Key="ButtonControlsPadding">2, 4, 4, 2</Thickness>
+        <utilities:BooleanReverseConverter x:Key="BooleanReverseConverter"/>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="Auto"/>
+        </Grid.ColumnDefinitions>
+        <ListBox
+            x:Uid="MemberSelectionGrid"
+            x:Name="MemberSelectionGrid"
+            Grid.Column="0"
+            Margin="2, 5, 12, 2"
+            SelectionMode="Multiple"
+            ItemsSource="{Binding Members}">
+            <Style TargetType="{x:Type ListBoxItem}">
+                <Setter Property="IsSelected" Value="{Binding IsChecked, Mode=TwoWay}" />
+            </Style>
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel
+                        Orientation="Horizontal"
+                        HorizontalAlignment="Left"
+                        MinWidth="186"
+                        Width="Auto"
+                        Margin="5, 2, 0, 2">
+                        <Image 
+                            x:Name="GlyphOfMember"
+                            Margin="8, 0, 5, 0"
+                            Source="{Binding Glyph}"/>
+                        <TextBlock
+                            x:Name="MemberName"
+                            Text="{Binding SymbolName}"
+                            Margin="0, 0, 5, 0"/>
+                    </StackPanel>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+        <StackPanel
+            Grid.Column="1"
+            Orientation="Vertical"
+            VerticalAlignment="Top"
+            HorizontalAlignment="Center"
+            Margin="0, 4, 0, 0"
+            Width="Auto">
+            <Button
+                x:Name="SelectAllButton"
+                x:Uid="SelectAllButton"
+                Padding="{StaticResource ResourceKey=ButtonControlsPadding}"
+                Content="{Binding ElementName=MemberSelectionControl, Path=SelectAll}"
+                Click="SelectAllButton_Click"
+                Margin="2, 2, 2, 7"
+                Width="Auto"
+                Height="Auto" />
+            <Button
+                x:Name="DeselectAllButton"
+                x:Uid="DeselectAllButton"
+                Padding="{StaticResource ResourceKey=ButtonControlsPadding}"
+                Content="{Binding ElementName=MemberSelectionControl, Path=DeselectAll}"
+                Click="DeselectAllButton_Click"
+                Margin="2, 2, 2, 7"
+                Width="Auto"
+                Height="Auto" />
+            <Button
+                x:Name="SelecDependentsButton"
+                x:Uid="SelecDependentsButton"
+                Padding="{StaticResource ResourceKey=ButtonControlsPadding}"
+                Content="{Binding ElementName=MemberSelectionControl, Path=SelectDependents}"
+                Click="SelectDependentsButton_Click"
+                Margin="2, 2, 2, 7"
+                Width="Auto"
+                Height="Auto"/>
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelection.xaml.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelection.xaml.cs
new file mode 100644
index 0000000000000..fbac556bce248
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelection.xaml.cs
@@ -0,0 +1,40 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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.Windows;
+using System.Windows.Controls;
+using Microsoft.VisualStudio.LanguageServices.Implementation.CommonControls;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
+{
+    /// <summary>
+    /// Interaction logic for StaticMemberSelection.xaml
+    /// </summary>
+    internal partial class StaticMemberSelection : UserControl
+    {
+
+        public string SelectDependents => ServicesVSResources.Select_Dependents;
+        public string MembersHeader => ServicesVSResources.Members;
+        public string SelectAll => ServicesVSResources.Select_All;
+        public string DeselectAll => ServicesVSResources.Deselect_All;
+
+        internal StaticMemberSelectionViewModel ViewModel { get; }
+
+        internal StaticMemberSelection(StaticMemberSelectionViewModel viewModel)
+        {
+            ViewModel = viewModel;
+            DataContext = ViewModel;
+            InitializeComponent();
+        }
+
+        private void SelectDependentsButton_Click(object sender, RoutedEventArgs e)
+            => ViewModel.SelectDependents();
+
+        private void SelectAllButton_Click(object sender, RoutedEventArgs e)
+            => ViewModel.SelectAll();
+
+        private void DeselectAllButton_Click(object sender, RoutedEventArgs e)
+            => ViewModel.DeselectAll();
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelectionViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelectionViewModel.cs
new file mode 100644
index 0000000000000..f5abeb284ebbc
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelectionViewModel.cs
@@ -0,0 +1,112 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using Microsoft.CodeAnalysis;
+using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
+using Microsoft.VisualStudio.Utilities;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
+{
+
+    internal class StaticMemberSelectionViewModel : AbstractNotifyPropertyChanged
+    {
+
+        private readonly IUIThreadOperationExecutor _uiThreadOperationExecutor;
+        private readonly ImmutableDictionary<ISymbol, Task<ImmutableArray<ISymbol>>> _symbolToDependentsMap;
+        private readonly ImmutableDictionary<ISymbol, SymbolViewModel<ISymbol>> _symbolToMemberViewMap;
+
+        public StaticMemberSelectionViewModel(
+            IUIThreadOperationExecutor uiThreadOperationExecutor,
+            ImmutableArray<SymbolViewModel<ISymbol>> members,
+            ImmutableDictionary<ISymbol, Task<ImmutableArray<ISymbol>>> dependentsMap)
+        {
+            _uiThreadOperationExecutor = uiThreadOperationExecutor;
+            _symbolToDependentsMap = dependentsMap;
+            _symbolToMemberViewMap = members.ToImmutableDictionary(memberViewModel => memberViewModel.Symbol);
+
+        }
+
+        private ImmutableArray<SymbolViewModel<ISymbol>> _members;
+        public ImmutableArray<SymbolViewModel<ISymbol>> Members
+        {
+            get => _members;
+            set => SetProperty(ref _members, value);
+        }
+
+        public void SelectAll()
+            => SelectMembers(Members);
+
+        internal void DeselectAll()
+            => SelectMembers(Members, isChecked: false);
+
+        public void SelectDependents()
+        {
+            var checkedMembers = Members
+              .WhereAsArray(member => member.IsChecked);
+
+            var result = _uiThreadOperationExecutor.Execute(
+                    title: ServicesVSResources.Pull_Members_Up,
+                    defaultDescription: ServicesVSResources.Calculating_dependents,
+                    allowCancellation: true,
+                    showProgress: true,
+                    context =>
+                    {
+                        foreach (var member in Members)
+                        {
+                            _symbolToDependentsMap[member.Symbol].Wait(context.UserCancellationToken);
+                        }
+                    });
+
+            if (result == UIThreadOperationStatus.Completed)
+            {
+                foreach (var member in checkedMembers)
+                {
+                    var membersToSelected = FindDependentsRecursively(member.Symbol).SelectAsArray(symbol => _symbolToMemberViewMap[symbol]);
+                    SelectMembers(membersToSelected);
+                }
+            }
+        }
+
+        private void SelectMembers(ImmutableArray<SymbolViewModel<ISymbol>> members, bool isChecked = true)
+        {
+            foreach (var member in members)
+            {
+                member.IsChecked = isChecked;
+            }
+        }
+
+        private ImmutableHashSet<ISymbol> FindDependentsRecursively(ISymbol member)
+        {
+            var queue = new Queue<ISymbol>();
+            // Under situation like two methods call each other, this hashset is used to 
+            // prevent the infinity loop.
+            var visited = new HashSet<ISymbol>();
+            var result = new HashSet<ISymbol>();
+            queue.Enqueue(member);
+            visited.Add(member);
+            while (!queue.IsEmpty())
+            {
+                var currentMember = queue.Dequeue();
+                result.Add(currentMember);
+                visited.Add(currentMember);
+                foreach (var dependent in _symbolToDependentsMap[currentMember].Result)
+                {
+                    if (!visited.Contains(dependent))
+                    {
+                        queue.Enqueue(dependent);
+                    }
+                }
+            }
+
+            return result.ToImmutableHashSet();
+        }
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs
new file mode 100644
index 0000000000000..b54136794c711
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs
@@ -0,0 +1,20 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
+{
+    internal class TypeNameItem
+    {
+        public string TypeName { get; }
+        public bool IsFromHistory { get; }
+
+        public TypeNameItem(bool isFromHistory, string @typeName)
+        {
+            IsFromHistory = isFromHistory;
+            TypeName = @typeName;
+        }
+
+        public override string ToString() => TypeName;
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/VisualStudioMoveMembersToTypeOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/VisualStudioMoveMembersToTypeOptionsService.cs
new file mode 100644
index 0000000000000..cdba214fbfa1b
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/VisualStudioMoveMembersToTypeOptionsService.cs
@@ -0,0 +1,96 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.MoveMembersToType;
+using Microsoft.CodeAnalysis.PullMemberUp;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Microsoft.VisualStudio.Language.Intellisense;
+using Microsoft.VisualStudio.LanguageServices.Implementation.CommonControls;
+using Microsoft.VisualStudio.LanguageServices.Implementation.PullMemberUp;
+using Microsoft.VisualStudio.LanguageServices.Implementation.PullMemberUp.MainDialog;
+using Microsoft.VisualStudio.Utilities;
+using Roslyn.Utilities;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
+{
+    [ExportWorkspaceService(typeof(IMoveMembersToTypeOptionsService), ServiceLayer.Host), Shared]
+    internal class VisualStudioMoveMembersToTypeOptionsService : IMoveMembersToTypeOptionsService
+    {
+
+        private readonly IGlyphService _glyphService;
+        private readonly IUIThreadOperationExecutor _uiThreadOperationExecutor;
+
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public VisualStudioMoveMembersToTypeOptionsService(
+            IGlyphService glyphService,
+            IUIThreadOperationExecutor uiThreadOperationExecutor)
+        {
+            _glyphService = glyphService;
+            _uiThreadOperationExecutor = uiThreadOperationExecutor;
+        }
+
+        public MoveMembersToTypeOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol)
+        {
+            var membersInType = selectedType.GetMembers().
+               WhereAsArray(member => MemberAndDestinationValidator.IsMemberValid(member) && member.IsStatic);
+
+            var memberViewModels = membersInType
+                .SelectAsArray(member =>
+                    new PullMemberUpSymbolViewModel(member, _glyphService)
+                    {
+                        // The member user selected will be checked at the beginning.
+                        // members are static, so cannot be abstract
+                        IsChecked = SymbolEquivalenceComparer.Instance.Equals(selectedNodeSymbol, member),
+                        MakeAbstract = false,
+                        IsMakeAbstractCheckable = false,
+                        IsCheckable = true
+                    });
+
+            using var cancellationTokenSource = new CancellationTokenSource();
+            var memberToDependentsMap = SymbolDependentsBuilder.FindMemberToDependentsMap(membersInType, document.Project, cancellationTokenSource.Token);
+
+            var existingTypeNames = selectedType.ContainingNamespace.GetAllTypes(cancellationTokenSource.Token).SelectAsArray(t => t.Name);
+            var candidateName = selectedType.Name + "Helpers";
+            var defaultTypeName = NameGenerator.GenerateUniqueName(candidateName, name => !existingTypeNames.Contains(name));
+
+            var containingNamespaceDisplay = selectedType.ContainingNamespace.IsGlobalNamespace
+                ? string.Empty
+                : selectedType.ContainingNamespace.ToDisplayString();
+
+            var generatedNameTypeParameterSuffix = ExtractTypeHelpers.GetTypeParameterSuffix(document, selectedType, membersInType);
+
+            var selectMembersViewModel = new MemberSelectionViewModel(
+                _uiThreadOperationExecutor,
+                memberViewModels,
+                memberToDependentsMap);
+
+            var viewModel = new MoveMembersToTypeDialogViewModel(selectMembersViewModel,
+                defaultTypeName,
+                existingTypeNames,
+                document.GetRequiredLanguageService<ISyntaxFactsService>(),
+                Array.Empty<string>().AsImmutable());
+
+            var dialog = new MoveMembersToTypeDialog(viewModel);
+
+            var result = dialog.ShowModal();
+
+            if (result.GetValueOrDefault())
+            {
+                // TODO: Get Options
+                return null;
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Implementation/PullMemberUp/MainDialog/PullMemberUpDialog.xaml b/src/VisualStudio/Core/Def/Implementation/PullMemberUp/MainDialog/PullMemberUpDialog.xaml
index 21c77c4156b18..0560b36add827 100644
--- a/src/VisualStudio/Core/Def/Implementation/PullMemberUp/MainDialog/PullMemberUpDialog.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/PullMemberUp/MainDialog/PullMemberUpDialog.xaml
@@ -56,139 +56,53 @@
             x:Name="TitleDescription"
             Margin="0,0,0,12"
             Content="{Binding ElementName=dialog, Path=Description}"/>
-        <GroupBox>
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-                <DataGrid
-                    x:Uid="MemberSelectionGrid"
-                    x:Name="MemberSelectionGrid"
-                    Grid.Column="0"
-                    Margin="2, 5, 12, 2"
-                    SelectionMode="Extended"
-                    AutoGenerateColumns="False"
-                    HeadersVisibility="Column"
-                    HorizontalContentAlignment="Stretch"
-                    VerticalContentAlignment="Stretch"
-                    CanUserResizeColumns="False"
-                    CanUserResizeRows="False"
-                    IsReadOnly="True"
-                    CanUserAddRows="False"
-                    CanUserDeleteRows="False"
-                    CanUserSortColumns="False"
-                    GridLinesVisibility="None"
-                    ScrollViewer.VerticalScrollBarVisibility="Auto"
-                    CanUserReorderColumns="False"
-                    Focusable="True"
-                    MinWidth="334"
-                    Height="Auto"
-                    Background="White"
-                    AutomationProperties.Name="{Binding SelectMemberListViewAutomationText}"
-                    ItemsSource="{Binding Members, UpdateSourceTrigger=PropertyChanged, NotifyOnSourceUpdated=True, Mode=TwoWay}">
-                    <DataGrid.CellStyle>
-                        <Style TargetType="DataGridCell">
-                            <Setter Property="BorderThickness" Value="0"/>
-                            <Setter Property="Focusable" Value="False"/>
-                            <Setter Property="AutomationProperties.Name" Value="{Binding SymbolName}" />
-                        </Style>
-                    </DataGrid.CellStyle>
-                    <DataGrid.RowStyle>
-                        <Style TargetType="DataGridRow">
-                            <Setter Property="AutomationProperties.Name" Value="{Binding RowSelectionAutomationText}"/>
-                        </Style>
-                    </DataGrid.RowStyle>
-                    <DataGrid.Columns>
-                        <DataGridTemplateColumn Width="Auto">
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <CheckBox
-                                                AutomationProperties.Name="{Binding SymbolAutomationText}"
-                                                AutomationProperties.AutomationId="{Binding SymbolName}"
-                                                IsChecked="{Binding IsChecked, UpdateSourceTrigger=PropertyChanged}"
-                                                Width="Auto"
-                                                IsEnabled="{Binding IsCheckable, UpdateSourceTrigger=PropertyChanged}"
-                                                Focusable="True"
-                                                ToolTipService.ShowOnDisabled="True"
-                                                ToolTipService.IsEnabled="{Binding IsCheckable, Converter={StaticResource BooleanReverseConverter}, UpdateSourceTrigger=PropertyChanged}"
-                                                ToolTipService.ToolTip="{Binding HelpText}"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="*">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="{Binding ElementName=MemberSelectionControl, Path=MembersHeader}"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <StackPanel
-                                            Orientation="Horizontal"
-                                            HorizontalAlignment="Left"
-                                            MinWidth="186"
-                                            Width="Auto"
-                                            Margin="5, 2, 0, 2">
-                                        <Image 
-                                                x:Name="GlyphOfMember"
-                                                Margin="8, 0, 5, 0"
-                                                Source="{Binding Glyph}"/>
-                                        <TextBlock
-                                                x:Name="MemberName"
-                                                Text="{Binding SymbolName}"
-                                                Margin="0, 0, 5, 0"
-                                                ToolTip="{Binding Accessibility}"/>
-                                    </StackPanel>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                    </DataGrid.Columns>
-                </DataGrid>
-            </Grid>
+        <GroupBox
+            x:Uid="DestinationSelectionGroupBox"
+            x:Name="DestinationSelectionGroupBox"
+            Grid.Row="1"
+            BorderThickness="0"
+            MinHeight="130"
+            Header="{Binding ElementName=dialog, Path=SelectDestination}">
+            <TreeView
+                x:Uid="DestinationTreeView"
+                x:Name="DestinationTreeView"
+                MinHeight="100"
+                MinWidth="360"
+                Margin="0, 5, 0, 0"
+                AutomationProperties.Name="{Binding DestinationTreeViewAutomationText}"
+                ScrollViewer.VerticalScrollBarVisibility="Auto"
+                ItemsSource="{Binding DestinationTreeNodeViewModel.BaseTypeNodes}"
+                ItemContainerStyle="{StaticResource TreeViewItemStyle}"
+                SelectedItemChanged="Destination_SelectedItemChanged">
+                <TreeView.ItemTemplate>
+                    <HierarchicalDataTemplate
+                        ItemsSource="{Binding BaseTypeNodes}"
+                        DataType="{x:Type self:BaseTypeTreeNodeViewModel}">
+                        <StackPanel
+                            Orientation="Horizontal"
+                            HorizontalAlignment="Stretch"
+                            Focusable="False"
+                            VerticalAlignment="Stretch">
+                            <Image Source="{Binding Glyph}" Margin="0, 0, 5, 0" />
+                            <TextBlock
+                                x:Uid="DestinationTextBlock"
+                                Text="{Binding SymbolName}"
+                                ToolTip="{Binding Namespace}"/>
+                        </StackPanel>
+                    </HierarchicalDataTemplate>
+                </TreeView.ItemTemplate>
+            </TreeView>
+        </GroupBox>
+        <GroupBox
+            x:Uid="MemberSelectionLabel"
+            Header="{Binding ElementName=dialog, Path=SelectMembers}"
+            Grid.Row="2"
+            MinHeight="200"
+            MinWidth="250"
+            BorderThickness="0">
+
+            <ContentControl Content="{Binding ElementName=dialog, Path=MemberSelectionControl}" />
         </GroupBox>
-        <StackPanel
-                    Grid.Column="1"
-                    Orientation="Vertical"
-                    VerticalAlignment="Top"
-                    HorizontalAlignment="Center"
-                    Margin="0, 4, 0, 0"
-                    Width="Auto">
-            <Button
-                    x:Name="SelectAllButton"
-                    x:Uid="SelectAllButton"
-                    Padding="{StaticResource ResourceKey=ButtonControlsPadding}"
-                    Content="{Binding ElementName=MemberSelectionControl, Path=SelectAll}"
-                    Click="SelectAllButton_Click"
-                    Margin="2, 2, 2, 7"
-                    Width="Auto"
-                    Height="Auto" />
-            <Button
-                    x:Name="DeselectAllButton"
-                    x:Uid="DeselectAllButton"
-                    Padding="{StaticResource ResourceKey=ButtonControlsPadding}"
-                    Content="{Binding ElementName=MemberSelectionControl, Path=DeselectAll}"
-                    Click="DeselectAllButton_Click"
-                    Margin="2, 2, 2, 7"
-                    Width="Auto"
-                    Height="Auto" />
-            <Button
-                    x:Name="SelecDependentsButton"
-                    x:Uid="SelecDependentsButton"
-                    Padding="{StaticResource ResourceKey=ButtonControlsPadding}"
-                    Content="{Binding ElementName=MemberSelectionControl, Path=SelectDependents}"
-                    Click="SelectDependentsButton_Click"
-                    Margin="2, 2, 2, 7"
-                    Width="Auto"
-                    Height="Auto"/>
-            <Button
-                    x:Name="SelectPublicButton"
-                    x:Uid="SelectPublicButton"
-                    Content="{Binding ElementName=MemberSelectionControl, Path=SelectPublic}"
-                    Margin="2, 0, 2, 0"
-                    Click="SelectPublic_Click"
-                    Padding="{StaticResource ResourceKey=ButtonControlsPadding}"
-                    Width="Auto"
-                    Height="Auto"/>
-        </StackPanel>
         <StackPanel
             Grid.Row="3"
             Margin="0, 5, 8, 0"
@@ -218,3 +132,4 @@
         </StackPanel>
     </Grid>
 </vs:DialogWindow>
+

From 1cb6b2ffe1ee4b9b77c5a630ef6a55f699433f7d Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Mon, 26 Jul 2021 17:01:31 -0700
Subject: [PATCH 06/64] Refactoring provider now shows up and launches dialog

No behavior created after dialog exited
Still working on destination type/filename selection formatting
---
 .../MoveMembersToTypeDialog.xaml              | 43 ++++++-------------
 .../MoveMembersToTypeDialogViewModel.cs       | 14 +++---
 .../StaticMemberSelection.xaml                | 16 ++++---
 .../StaticMemberSelectionViewModel.cs         | 11 +++--
 .../MoveMembersToType/TypeNameItem.cs         |  6 ++-
 ...alStudioMoveMembersToTypeOptionsService.cs | 35 +++++++++------
 6 files changed, 61 insertions(+), 64 deletions(-)

diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml
index 418671a0d181b..230f722bc3a72 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml
@@ -29,24 +29,6 @@
         <Thickness x:Key="ButtonPadding">9, 2, 9, 2</Thickness>
         <sys:Double x:Key="ButtonWidth">73</sys:Double>
         <sys:Double x:Key="ButtonHeight">21</sys:Double>
-        <Style x:Key="TreeViewItemStyle" TargetType="{x:Type TreeViewItem}">
-            <Style.Resources>
-                <Style TargetType="{x:Type Border}">
-                    <Setter Property="Grid.ColumnSpan" Value="2"/>
-                </Style>
-            </Style.Resources>
-            <Setter Property="IsSelected" Value="{Binding IsChecked, Mode=TwoWay}"/>
-            <Setter Property="FontWeight" Value="Normal" />
-            <Setter Property="AutomationProperties.Name" Value="{Binding SymbolAutomationText}"/>
-            <Setter Property="AutomationProperties.AutomationId" Value="{Binding SymbolName}"/>
-            <Setter Property="IsExpanded" Value="True"/>
-            <Style.Triggers>
-                <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
-                    <Setter Property="FontWeight" Value="Bold"/>
-                </Trigger>
-            </Style.Triggers>
-        </Style>
         <Thickness x:Key="verticalLabelMargin">0, 0, 0, 5</Thickness>
         <Thickness x:Key="messageMargin">0, 9, 0, 0</Thickness>
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
@@ -76,20 +58,19 @@
                           MaxDropDownHeight="150">
                 <ComboBox.ItemTemplate>
                     <DataTemplate DataType="Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType.TypeNameItem">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-
-                            <imaging:CrispImage 
-                                Grid.Column="0" 
+                        <StackPanel
+                            Orientation="Horizontal"
+                            Width="Auto">
+                            <imaging:CrispImage  
                                 Visibility="{Binding IsFromHistory, Converter={StaticResource BooleanToVisibilityConverter}}" 
                                 Margin="0 0 5 0" 
-                                 Moniker="{x:Static imagecatalog:KnownMonikers.History}" />
-
-                            <TextBlock Grid.Column="1" Text="{Binding TypeName}" />
-                        </Grid>
+                                Moniker="{x:Static imagecatalog:KnownMonikers.History}" />
+                            <TextBlock
+                                Text="{Binding TypeName}"/>
+                            <TextBlock
+                                Text="{Binding DeclarationFile}"
+                                Margin="50 0 0 0"/>
+                        </StackPanel>
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
             </ComboBox>
@@ -115,7 +96,7 @@
 
         <GroupBox x:Uid="MemberSelectionGroupBox"
                   x:Name="MemberSelectionGroupBox"
-                  Margin="0, 150, 0, 0"
+                  Margin="0, 130, 0, 0"
                   Grid.Row="2"
                   Header="{Binding ElementName=dialog, Path=SelectMembers}">
             <ContentPresenter Content="{Binding ElementName=dialog, Path=MemberSelectionControl}" />
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs
index c4b035b004e4c..77aa90e23c4d1 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs
@@ -17,27 +17,24 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToTy
 {
     internal class MoveMembersToTypeDialogViewModel : AbstractNotifyPropertyChanged
     {
-
         public StaticMemberSelectionViewModel MemberSelectionViewModel { get; }
 
-        private ISyntaxFacts _syntaxFacts;
-
+        private readonly ISyntaxFacts _syntaxFacts;
 
         public MoveMembersToTypeDialogViewModel(
             StaticMemberSelectionViewModel memberSelectionViewModel,
             string defaultType,
-            ImmutableArray<string> availableTypes,
+            ImmutableArray<TypeNameItem> availableTypes,
             ISyntaxFacts syntaxFacts,
-            ImmutableArray<string> typeHistory)
+            ImmutableArray<TypeNameItem> typeHistory)
         {
             MemberSelectionViewModel = memberSelectionViewModel;
             _syntaxFacts = syntaxFacts ?? throw new ArgumentNullException(nameof(syntaxFacts));
             _destinationName = defaultType;
-            AvailableTypes = typeHistory.Select(n => new TypeNameItem(true, n))
-                .Concat(availableTypes.Except(typeHistory).Select(n => new TypeNameItem(false, n)))
-                .ToImmutableArray();
+            AvailableTypes = typeHistory.Concat(availableTypes).ToImmutableArray();
 
             PropertyChanged += MoveMembersToTypeDialogViewModel_PropertyChanged;
+            OnDestinationUpdated();
         }
 
         private void MoveMembersToTypeDialogViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -128,6 +125,5 @@ public bool CanSubmit
         {
             get => _isValidName && MemberSelectionViewModel.CheckedMembers.Length > 0;
         }
-
     }
 }
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelection.xaml b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelection.xaml
index bd7098784cf7c..54c6a15e981cf 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelection.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelection.xaml
@@ -5,8 +5,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:utilities="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.Utilities"
-             xmlns:commoncontrols="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.CommonControls"
+             xmlns:u="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.Utilities"
+             xmlns:utilities="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.Utilities" xmlns:movememberstotype="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType" d:DataContext="{d:DesignInstance Type=movememberstotype:StaticMemberSelectionViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
@@ -25,9 +25,11 @@
             Margin="2, 5, 12, 2"
             SelectionMode="Multiple"
             ItemsSource="{Binding Members}">
-            <Style TargetType="{x:Type ListBoxItem}">
-                <Setter Property="IsSelected" Value="{Binding IsChecked, Mode=TwoWay}" />
-            </Style>
+            <ListBox.Resources>
+                <Style TargetType="{x:Type ListBoxItem}">
+                    <Setter Property="IsSelected" Value="{Binding IsChecked, Mode=TwoWay}" />
+                </Style>
+            </ListBox.Resources>
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <StackPanel
@@ -36,6 +38,10 @@
                         MinWidth="186"
                         Width="Auto"
                         Margin="5, 2, 0, 2">
+                        <CheckBox
+                            x:Name="MemberSelected"
+                            Margin="0, 0, 5, 0"
+                            IsChecked="{Binding IsChecked, Mode=TwoWay}"/>
                         <Image 
                             x:Name="GlyphOfMember"
                             Margin="8, 0, 5, 0"
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelectionViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelectionViewModel.cs
index f5abeb284ebbc..6bb2081abbbf1 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelectionViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelectionViewModel.cs
@@ -2,23 +2,20 @@
 // 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;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Controls;
+using System.Windows.Input;
 using Microsoft.CodeAnalysis;
 using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
 using Microsoft.VisualStudio.Utilities;
+using Roslyn.Utilities;
 
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
 {
-
     internal class StaticMemberSelectionViewModel : AbstractNotifyPropertyChanged
     {
-
         private readonly IUIThreadOperationExecutor _uiThreadOperationExecutor;
         private readonly ImmutableDictionary<ISymbol, Task<ImmutableArray<ISymbol>>> _symbolToDependentsMap;
         private readonly ImmutableDictionary<ISymbol, SymbolViewModel<ISymbol>> _symbolToMemberViewMap;
@@ -29,11 +26,13 @@ public StaticMemberSelectionViewModel(
             ImmutableDictionary<ISymbol, Task<ImmutableArray<ISymbol>>> dependentsMap)
         {
             _uiThreadOperationExecutor = uiThreadOperationExecutor;
+            _members = members;
             _symbolToDependentsMap = dependentsMap;
             _symbolToMemberViewMap = members.ToImmutableDictionary(memberViewModel => memberViewModel.Symbol);
-
         }
 
+        public ImmutableArray<SymbolViewModel<ISymbol>> CheckedMembers => Members.WhereAsArray(m => m.IsChecked);
+
         private ImmutableArray<SymbolViewModel<ISymbol>> _members;
         public ImmutableArray<SymbolViewModel<ISymbol>> Members
         {
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs
index b54136794c711..7d1573691cd34 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs
@@ -2,17 +2,21 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using Microsoft.CodeAnalysis;
+
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
 {
     internal class TypeNameItem
     {
         public string TypeName { get; }
+        public string DeclarationFile { get; }
         public bool IsFromHistory { get; }
 
-        public TypeNameItem(bool isFromHistory, string @typeName)
+        public TypeNameItem(bool isFromHistory, string declarationFile, string @typeName)
         {
             IsFromHistory = isFromHistory;
             TypeName = @typeName;
+            DeclarationFile = declarationFile;
         }
 
         public override string ToString() => TypeName;
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/VisualStudioMoveMembersToTypeOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/VisualStudioMoveMembersToTypeOptionsService.cs
index cdba214fbfa1b..ea46f42ff2acd 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/VisualStudioMoveMembersToTypeOptionsService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/VisualStudioMoveMembersToTypeOptionsService.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.Composition;
 using System.Linq;
 using System.Threading;
@@ -14,9 +15,8 @@
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Shared.Utilities;
 using Microsoft.VisualStudio.Language.Intellisense;
-using Microsoft.VisualStudio.LanguageServices.Implementation.CommonControls;
 using Microsoft.VisualStudio.LanguageServices.Implementation.PullMemberUp;
-using Microsoft.VisualStudio.LanguageServices.Implementation.PullMemberUp.MainDialog;
+using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
 using Microsoft.VisualStudio.Utilities;
 using Roslyn.Utilities;
 
@@ -25,10 +25,13 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToTy
     [ExportWorkspaceService(typeof(IMoveMembersToTypeOptionsService), ServiceLayer.Host), Shared]
     internal class VisualStudioMoveMembersToTypeOptionsService : IMoveMembersToTypeOptionsService
     {
-
         private readonly IGlyphService _glyphService;
         private readonly IUIThreadOperationExecutor _uiThreadOperationExecutor;
 
+        private const int HistorySize = 3;
+
+        public readonly LinkedList<TypeNameItem> History = new();
+
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
         public VisualStudioMoveMembersToTypeOptionsService(
@@ -46,22 +49,28 @@ public MoveMembersToTypeOptions GetMoveMembersToTypeOptions(Document document, I
 
             var memberViewModels = membersInType
                 .SelectAsArray(member =>
-                    new PullMemberUpSymbolViewModel(member, _glyphService)
+                    new SymbolViewModel<ISymbol>(member, _glyphService)
                     {
                         // The member user selected will be checked at the beginning.
-                        // members are static, so cannot be abstract
                         IsChecked = SymbolEquivalenceComparer.Instance.Equals(selectedNodeSymbol, member),
-                        MakeAbstract = false,
-                        IsMakeAbstractCheckable = false,
-                        IsCheckable = true
                     });
 
             using var cancellationTokenSource = new CancellationTokenSource();
             var memberToDependentsMap = SymbolDependentsBuilder.FindMemberToDependentsMap(membersInType, document.Project, cancellationTokenSource.Token);
 
-            var existingTypeNames = selectedType.ContainingNamespace.GetAllTypes(cancellationTokenSource.Token).SelectAsArray(t => t.Name);
+            var existingTypeNames = selectedType.ContainingNamespace.GetAllTypes(cancellationTokenSource.Token)
+                .SelectMany(t =>
+                {
+                    // for partially declared classes, we may want multiple entries for a single type.
+                    // filter to those actually in a real file, and that are not already in our History list.
+                    return t.Locations
+                        .Where(l => l.IsInSource &&
+                            !History.Any(h => GetFile(l) == h.DeclarationFile && t.Name == h.TypeName))
+                        .Select(l => new TypeNameItem(false, GetFile(l), t.Name));
+                })
+                .ToImmutableArrayOrEmpty();
             var candidateName = selectedType.Name + "Helpers";
-            var defaultTypeName = NameGenerator.GenerateUniqueName(candidateName, name => !existingTypeNames.Contains(name));
+            var defaultTypeName = NameGenerator.GenerateUniqueName(candidateName, name => !existingTypeNames.Any(t => t.TypeName == name));
 
             var containingNamespaceDisplay = selectedType.ContainingNamespace.IsGlobalNamespace
                 ? string.Empty
@@ -69,7 +78,7 @@ public MoveMembersToTypeOptions GetMoveMembersToTypeOptions(Document document, I
 
             var generatedNameTypeParameterSuffix = ExtractTypeHelpers.GetTypeParameterSuffix(document, selectedType, membersInType);
 
-            var selectMembersViewModel = new MemberSelectionViewModel(
+            var selectMembersViewModel = new StaticMemberSelectionViewModel(
                 _uiThreadOperationExecutor,
                 memberViewModels,
                 memberToDependentsMap);
@@ -78,7 +87,7 @@ public MoveMembersToTypeOptions GetMoveMembersToTypeOptions(Document document, I
                 defaultTypeName,
                 existingTypeNames,
                 document.GetRequiredLanguageService<ISyntaxFactsService>(),
-                Array.Empty<string>().AsImmutable());
+                History.ToImmutableArrayOrEmpty());
 
             var dialog = new MoveMembersToTypeDialog(viewModel);
 
@@ -92,5 +101,7 @@ public MoveMembersToTypeOptions GetMoveMembersToTypeOptions(Document document, I
 
             return null;
         }
+
+        private static string GetFile(Location loc) => PathUtilities.GetFileName(loc.SourceTree!.FilePath);
     }
 }

From 5b188e6843b9910fd98fe98eb262486c4bacc524 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Wed, 28 Jul 2021 16:42:07 -0700
Subject: [PATCH 07/64] Rename/Refactor name to MoveStaticMembers. Feature
 working with textbox, assuming new class (c# only, no automated tests yet)

---
 ...veStaticMembersCodeRefactoringProvider.cs} |  10 +-
 .../MoveMembersToTypeOptions.cs               |  14 ---
 .../MoveMembersToTypeWithDialogCodeAction.cs  |  51 ---------
 ...ctMoveStaticMembersRefactoringProvider.cs} |  10 +-
 .../IMoveStaticMembersOptionsService.cs}      |   6 +-
 .../MoveStaticMembersOptions.cs               |  49 ++++++++
 .../MoveStaticMembersWithDialogCodeAction.cs  | 108 ++++++++++++++++++
 .../MoveMembersToType/TypeNameItem.cs         |  24 ----
 .../MoveStaticMembersDialog.xaml}             |  43 ++-----
 .../MoveStaticMembersDialog.xaml.cs}          |  21 ++--
 .../MoveStaticMembersDialogViewModel.cs}      |  27 ++---
 .../StaticMemberSelection.xaml                |   9 +-
 .../StaticMemberSelection.xaml.cs             |   3 +-
 .../StaticMemberSelectionViewModel.cs         |   2 +-
 ...lStudioMoveStaticMembersOptionsService.cs} |  48 +++-----
 ...osoft.VisualStudio.LanguageServices.csproj |   5 -
 16 files changed, 224 insertions(+), 206 deletions(-)
 rename src/Features/CSharp/Portable/CodeRefactorings/{MoveMembersToType/CSharpMoveMembersToTypeCodeRefactoringProvider.cs => MoveStaticMembers/CSharpMoveStaticMembersCodeRefactoringProvider.cs} (72%)
 delete mode 100644 src/Features/Core/Portable/MoveMembersToType/MoveMembersToTypeOptions.cs
 delete mode 100644 src/Features/Core/Portable/MoveMembersToType/MoveMembersToTypeWithDialogCodeAction.cs
 rename src/Features/Core/Portable/{MoveMembersToType/AbstractMoveMembersToTypeRefactoringProvider.cs => MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs} (79%)
 rename src/Features/Core/Portable/{MoveMembersToType/IMoveMembersToTypeOptionsService.cs => MoveStaticMembers/IMoveStaticMembersOptionsService.cs} (66%)
 create mode 100644 src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
 create mode 100644 src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
 delete mode 100644 src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs
 rename src/VisualStudio/Core/Def/Implementation/{MoveMembersToType/MoveMembersToTypeDialog.xaml => MoveStaticMembers/MoveStaticMembersDialog.xaml} (69%)
 rename src/VisualStudio/Core/Def/Implementation/{MoveMembersToType/MoveMembersToTypeDialog.xaml.cs => MoveStaticMembers/MoveStaticMembersDialog.xaml.cs} (75%)
 rename src/VisualStudio/Core/Def/Implementation/{MoveMembersToType/MoveMembersToTypeDialogViewModel.cs => MoveStaticMembers/MoveStaticMembersDialogViewModel.cs} (80%)
 rename src/VisualStudio/Core/Def/Implementation/{MoveMembersToType => MoveStaticMembers}/StaticMemberSelection.xaml (90%)
 rename src/VisualStudio/Core/Def/Implementation/{MoveMembersToType => MoveStaticMembers}/StaticMemberSelection.xaml.cs (93%)
 rename src/VisualStudio/Core/Def/Implementation/{MoveMembersToType => MoveStaticMembers}/StaticMemberSelectionViewModel.cs (99%)
 rename src/VisualStudio/Core/Def/Implementation/{MoveMembersToType/VisualStudioMoveMembersToTypeOptionsService.cs => MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs} (67%)

diff --git a/src/Features/CSharp/Portable/CodeRefactorings/MoveMembersToType/CSharpMoveMembersToTypeCodeRefactoringProvider.cs b/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersCodeRefactoringProvider.cs
similarity index 72%
rename from src/Features/CSharp/Portable/CodeRefactorings/MoveMembersToType/CSharpMoveMembersToTypeCodeRefactoringProvider.cs
rename to src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersCodeRefactoringProvider.cs
index f95835edb9d28..9bf1b11b933ed 100644
--- a/src/Features/CSharp/Portable/CodeRefactorings/MoveMembersToType/CSharpMoveMembersToTypeCodeRefactoringProvider.cs
+++ b/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersCodeRefactoringProvider.cs
@@ -8,24 +8,24 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeRefactorings;
 using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.MoveMembersToType;
+using Microsoft.CodeAnalysis.MoveStaticMembers;
 
-namespace Microsoft.CodeAnalysis.CSharp.CodeRefactorings.MoveMembersToType
+namespace Microsoft.CodeAnalysis.CSharp.CodeRefactorings.MoveStaticMembers
 {
     [ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = "[WIP] Move Members To Type"), Shared]
-    internal class CSharpMoveMembersToTypeCodeRefactoringProvider : AbstractMoveMembersToTypeRefactoringProvider
+    internal class CSharpMoveStaticMembersCodeRefactoringProvider : AbstractMoveStaticMembersRefactoringProvider
     {
         /// <summary>
         /// Test purpose only.
         /// </summary>
         [SuppressMessage("RoslynDiagnosticsReliability", "RS0034:Exported parts should have [ImportingConstructor]", Justification = "Used incorrectly by tests")]
-        public CSharpMoveMembersToTypeCodeRefactoringProvider(IMoveMembersToTypeOptionsService service) : base(service)
+        public CSharpMoveStaticMembersCodeRefactoringProvider(IMoveStaticMembersOptionsService service) : base(service)
         {
         }
 
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-        public CSharpMoveMembersToTypeCodeRefactoringProvider() : this(service: null)
+        public CSharpMoveStaticMembersCodeRefactoringProvider() : this(service: null)
         {
         }
 
diff --git a/src/Features/Core/Portable/MoveMembersToType/MoveMembersToTypeOptions.cs b/src/Features/Core/Portable/MoveMembersToType/MoveMembersToTypeOptions.cs
deleted file mode 100644
index 58bb186bb73d6..0000000000000
--- a/src/Features/Core/Portable/MoveMembersToType/MoveMembersToTypeOptions.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// 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;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Microsoft.CodeAnalysis.MoveMembersToType
-{
-    class MoveMembersToTypeOptions
-    {
-    }
-}
diff --git a/src/Features/Core/Portable/MoveMembersToType/MoveMembersToTypeWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveMembersToType/MoveMembersToTypeWithDialogCodeAction.cs
deleted file mode 100644
index a4857277fee70..0000000000000
--- a/src/Features/Core/Portable/MoveMembersToType/MoveMembersToTypeWithDialogCodeAction.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// 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.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CodeActions;
-using Microsoft.CodeAnalysis.Text;
-
-namespace Microsoft.CodeAnalysis.MoveMembersToType
-{
-    internal class MoveMembersToTypeWithDialogCodeAction : CodeActionWithOptions
-    {
-        private readonly Document _document;
-        private readonly ISymbol? _selectedMember;
-        private readonly INamedTypeSymbol _selectedType;
-        private readonly SyntaxNode _selectedTypeDeclarationNode;
-        private readonly IMoveMembersToTypeOptionsService _service;
-
-        public TextSpan Span { get; }
-        public override string Title => "[WIP] Move Members to Type...";
-
-        public MoveMembersToTypeWithDialogCodeAction(
-            Document document,
-            TextSpan span,
-            IMoveMembersToTypeOptionsService service,
-            INamedTypeSymbol selectedType,
-            SyntaxNode selectedTypeDeclarationNode,
-            ISymbol? selectedMember = null)
-        {
-            _document = document;
-            _service = service;
-            _selectedType = selectedType;
-            _selectedTypeDeclarationNode = selectedTypeDeclarationNode;
-            _selectedMember = selectedMember;
-            Span = span;
-        }
-
-        public override object? GetOptions(CancellationToken cancellationToken)
-        {
-            var optionsService = _service ?? _document.Project.Solution.Workspace.Services.GetRequiredService<IMoveMembersToTypeOptionsService>();
-            return optionsService.GetMoveMembersToTypeOptions(_document, _selectedType, _selectedMember);
-        }
-
-        protected override Task<IEnumerable<CodeActionOperation>> ComputeOperationsAsync(object options, CancellationToken cancellationToken)
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}
diff --git a/src/Features/Core/Portable/MoveMembersToType/AbstractMoveMembersToTypeRefactoringProvider.cs b/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
similarity index 79%
rename from src/Features/Core/Portable/MoveMembersToType/AbstractMoveMembersToTypeRefactoringProvider.cs
rename to src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
index fb53f2781b6aa..0be2b0d4d73d6 100644
--- a/src/Features/Core/Portable/MoveMembersToType/AbstractMoveMembersToTypeRefactoringProvider.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
@@ -7,18 +7,18 @@
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 
-namespace Microsoft.CodeAnalysis.MoveMembersToType
+namespace Microsoft.CodeAnalysis.MoveStaticMembers
 {
-    internal abstract class AbstractMoveMembersToTypeRefactoringProvider : CodeRefactoringProvider
+    internal abstract class AbstractMoveStaticMembersRefactoringProvider : CodeRefactoringProvider
     {
-        private readonly IMoveMembersToTypeOptionsService _service;
+        private readonly IMoveStaticMembersOptionsService _service;
 
         protected abstract Task<SyntaxNode> GetSelectedNodeAsync(CodeRefactoringContext context);
 
         /// <summary>
         /// Test purpose only
         /// </summary>
-        protected AbstractMoveMembersToTypeRefactoringProvider(IMoveMembersToTypeOptionsService service)
+        protected AbstractMoveStaticMembersRefactoringProvider(IMoveStaticMembersOptionsService service)
             => _service = service;
 
         public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
@@ -42,7 +42,7 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
             var selectedType = selectedMember.ContainingType;
             var selectedTypeDeclaration = selectedMemberNode.FirstAncestorOrSelf<SyntaxNode>(syntaxFacts.IsTypeDeclaration);
 
-            var action = new MoveMembersToTypeWithDialogCodeAction(document, span, _service, selectedType, selectedTypeDeclaration!, selectedMember: selectedMember);
+            var action = new MoveStaticMembersWithDialogCodeAction(document, span, _service, selectedType, selectedMember: selectedMember);
 
             context.RegisterRefactoring(action, selectedMemberNode.Span);
         }
diff --git a/src/Features/Core/Portable/MoveMembersToType/IMoveMembersToTypeOptionsService.cs b/src/Features/Core/Portable/MoveStaticMembers/IMoveStaticMembersOptionsService.cs
similarity index 66%
rename from src/Features/Core/Portable/MoveMembersToType/IMoveMembersToTypeOptionsService.cs
rename to src/Features/Core/Portable/MoveStaticMembers/IMoveStaticMembersOptionsService.cs
index 7199662829232..fa6cee14dfc15 100644
--- a/src/Features/Core/Portable/MoveMembersToType/IMoveMembersToTypeOptionsService.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/IMoveStaticMembersOptionsService.cs
@@ -4,10 +4,10 @@
 
 using Microsoft.CodeAnalysis.Host;
 
-namespace Microsoft.CodeAnalysis.MoveMembersToType
+namespace Microsoft.CodeAnalysis.MoveStaticMembers
 {
-    internal interface IMoveMembersToTypeOptionsService : IWorkspaceService
+    internal interface IMoveStaticMembersOptionsService : IWorkspaceService
     {
-        MoveMembersToTypeOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol);
+        MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol);
     }
 }
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
new file mode 100644
index 0000000000000..1c1aad8243cd2
--- /dev/null
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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.Collections.Immutable;
+using System.Linq;
+
+namespace Microsoft.CodeAnalysis.MoveStaticMembers
+{
+    internal class MoveStaticMembersOptions
+    {
+        public bool IsCancelled { get; }
+
+        public string FileName { get; }
+
+        public string TypeName { get; }
+
+        public string NamespaceDisplay { get; }
+
+        public ImmutableArray<ISymbol> SelectedMembers { get; }
+
+        public static MoveStaticMembersOptions Cancelled = new();
+
+        /// <summary>
+        /// default constructor corresponds to a cancelled operation
+        /// </summary>
+        public MoveStaticMembersOptions()
+        {
+            IsCancelled = true;
+            FileName = string.Empty;
+            TypeName = string.Empty;
+            NamespaceDisplay = string.Empty;
+            SelectedMembers = ImmutableArray<ISymbol>.Empty;
+        }
+
+        public MoveStaticMembersOptions(
+            string fileName,
+            string fullTypeName,
+            ImmutableArray<ISymbol> selectedMembers)
+        {
+            IsCancelled = false;
+            FileName = fileName;
+            var namespacesAndType = fullTypeName.Split(separator: '.');
+            TypeName = namespacesAndType.Last();
+            NamespaceDisplay = string.Join(separator: ".", namespacesAndType.Take(namespacesAndType.Length - 1));
+            SelectedMembers = selectedMembers;
+        }
+    }
+}
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
new file mode 100644
index 0000000000000..c6a47391d80b1
--- /dev/null
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -0,0 +1,108 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.CodeRefactorings.PullMemberUp;
+using Microsoft.CodeAnalysis.ExtractInterface;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.MoveStaticMembers
+{
+    internal class MoveStaticMembersWithDialogCodeAction : CodeActionWithOptions
+    {
+        private readonly Document _document;
+        private readonly ISymbol? _selectedMember;
+        private readonly INamedTypeSymbol _selectedType;
+        private readonly IMoveStaticMembersOptionsService _service;
+
+        public TextSpan Span { get; }
+        public override string Title => "[WIP] Move Members to Type...";
+
+        public MoveStaticMembersWithDialogCodeAction(
+            Document document,
+            TextSpan span,
+            IMoveStaticMembersOptionsService service,
+            INamedTypeSymbol selectedType,
+            ISymbol? selectedMember = null)
+        {
+            _document = document;
+            _service = service;
+            _selectedType = selectedType;
+            _selectedMember = selectedMember;
+            Span = span;
+        }
+
+        public override object? GetOptions(CancellationToken cancellationToken)
+        {
+            var optionsService = _service ?? _document.Project.Solution.Workspace.Services.GetRequiredService<IMoveStaticMembersOptionsService>();
+            return optionsService.GetMoveMembersToTypeOptions(_document, _selectedType, _selectedMember);
+        }
+
+        protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperationsAsync(object options, CancellationToken cancellationToken)
+        {
+            if (options is not MoveStaticMembersOptions moveOptions || moveOptions.IsCancelled)
+            {
+                return SpecializedCollections.EmptyEnumerable<CodeActionOperation>();
+            }
+
+            // Find the original type
+            var syntaxFacts = _document.GetRequiredLanguageService<ISyntaxFactsService>();
+            var root = await _document.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var fileBanner = syntaxFacts.GetFileBanner(root);
+
+            // add annotations to the symbols that we selected so we can find them later to pull up
+            var memberNodes = moveOptions.SelectedMembers.SelectAsArray(symbol => symbol.Locations.Single().FindNode(cancellationToken));
+            root = root.TrackNodes(memberNodes);
+            var sourceDoc = _document.WithSyntaxRoot(root);
+
+            var typeParameters = ExtractTypeHelpers.GetRequiredTypeParametersForMembers(_selectedType, moveOptions.SelectedMembers);
+            // even though we can move members here, we will move them by calling PullMembersUp
+            var newType = CodeGenerationSymbolFactory.CreateNamedTypeSymbol(
+                ImmutableArray.Create<AttributeData>(),
+                Accessibility.NotApplicable,
+                Editing.DeclarationModifiers.Static,
+                TypeKind.Class,
+                moveOptions.TypeName,
+                typeParameters: typeParameters);
+
+            var (newDoc, annotation) = await ExtractTypeHelpers.AddTypeToNewFileAsync(
+                sourceDoc.Project.Solution,
+                moveOptions.NamespaceDisplay,
+                moveOptions.FileName,
+                _document.Project.Id,
+                _document.Folders,
+                newType,
+                fileBanner,
+                cancellationToken).ConfigureAwait(false);
+
+            // Get back symbols using annotations
+            sourceDoc = newDoc.Project.Solution.GetRequiredDocument(sourceDoc.Id);
+            root = await sourceDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var semanticModel = await sourceDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+            var members = memberNodes
+                .Select(node => root.GetCurrentNode(node))
+                .Where(node => node != null)
+                .SelectAsArray(node => (semanticModel.GetDeclaredSymbol(node!, cancellationToken), false));
+
+            // get back type declaration in the newly created file
+            var destRoot = await newDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var destSemanticModel = await newDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+            newType = destSemanticModel.GetDeclaredSymbol(destRoot.GetAnnotatedNodes(annotation).Single(), cancellationToken) as INamedTypeSymbol;
+
+            var pullMembersUpOptions = PullMembersUpOptionsBuilder.BuildPullMembersUpOptions(newType, members);
+            var finalSolution = await MembersPuller.PullMembersUpAsync(sourceDoc, pullMembersUpOptions, cancellationToken).ConfigureAwait(false);
+            return new CodeActionOperation[] { new ApplyChangesOperation(finalSolution) };
+        }
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs
deleted file mode 100644
index 7d1573691cd34..0000000000000
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.CodeAnalysis;
-
-namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
-{
-    internal class TypeNameItem
-    {
-        public string TypeName { get; }
-        public string DeclarationFile { get; }
-        public bool IsFromHistory { get; }
-
-        public TypeNameItem(bool isFromHistory, string declarationFile, string @typeName)
-        {
-            IsFromHistory = isFromHistory;
-            TypeName = @typeName;
-            DeclarationFile = declarationFile;
-        }
-
-        public override string ToString() => TypeName;
-    }
-}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
similarity index 69%
rename from src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml
rename to src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
index 230f722bc3a72..d5c819289e2cd 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
@@ -7,12 +7,12 @@
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
     xmlns:imagecatalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog" 
-    xmlns:movememberstotype="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType" 
-    d:DataContext="{d:DesignInstance Type=movememberstotype:MoveMembersToTypeDialogViewModel}"
+    xmlns:movestaticmembers="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers" 
+    d:DataContext="{d:DesignInstance Type=movestaticmembers:MoveStaticMembersDialogViewModel}"
     vs:ThemedDialogStyleLoader.UseDefaultThemedDialogStyles="True"
-    x:Uid="MoveMembersToTypeDialog"
+    x:Uid="MoveStaticMembersDialog"
     x:Name="dialog"
-    x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType.MoveMembersToTypeDialog"
+    x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers.MoveStaticMembersDialog"
     x:ClassModifier="internal"
     mc:Ignorable="d"
     WindowStartupLocation="CenterOwner"
@@ -23,7 +23,7 @@
     HasDialogFrame="True"
     ShowInTaskbar="False"
     ResizeMode="CanResize"
-    Title="{Binding MoveMembersToTypeDialogTitle, ElementName=dialog}"
+    Title="{Binding MoveStaticMembersDialogTitle, ElementName=dialog}"
     Background="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}">
     <vs:DialogWindow.Resources>
         <Thickness x:Key="ButtonPadding">9, 2, 9, 2</Thickness>
@@ -46,34 +46,11 @@
                        Margin="{StaticResource verticalLabelMargin}"
                        Content="{Binding ElementName=dialog, Path=DestinationLabelText}"
                        Target="{Binding ElementName=DestinationTextBox}" />
-            <ComboBox x:Uid="DestinationBox"
-                          Name="DestinationBox"
-                          IsEditable="True"
-                          IsReadOnly="False"
-                          AutomationProperties.LabeledBy="{Binding ElementName=DestinationLabel}"
-                          Text="{Binding DestinationName, Mode=TwoWay, ValidatesOnDataErrors=True}"
-                          ItemsSource="{Binding AvailableTypes, Mode=OneTime}"
-                          BorderThickness="0" 
-                          Margin="0 0 20 0"
-                          MaxDropDownHeight="150">
-                <ComboBox.ItemTemplate>
-                    <DataTemplate DataType="Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType.TypeNameItem">
-                        <StackPanel
-                            Orientation="Horizontal"
-                            Width="Auto">
-                            <imaging:CrispImage  
-                                Visibility="{Binding IsFromHistory, Converter={StaticResource BooleanToVisibilityConverter}}" 
-                                Margin="0 0 5 0" 
-                                Moniker="{x:Static imagecatalog:KnownMonikers.History}" />
-                            <TextBlock
-                                Text="{Binding TypeName}"/>
-                            <TextBlock
-                                Text="{Binding DeclarationFile}"
-                                Margin="50 0 0 0"/>
-                        </StackPanel>
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>
+            <TextBox 
+                x:Uid="DestinationBox"
+                Name="DestinationBox"
+                Text="{Binding DestinationName, UpdateSourceTrigger=PropertyChanged}"
+                Margin="0 0 20 0"/>
 
         </StackPanel>
 
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs
similarity index 75%
rename from src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs
rename to src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs
index d7fa273347e05..990d8d99c55d0 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialog.xaml.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs
@@ -4,30 +4,28 @@
 
 #nullable disable
 
-using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using Microsoft.VisualStudio.LanguageServices.Implementation.CommonControls;
 using Microsoft.VisualStudio.PlatformUI;
 
-namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
 {
     /// <summary>
     /// Interaction logic for MoveMembersToTypeDialog.xaml
     /// </summary>
-    internal partial class MoveMembersToTypeDialog : DialogWindow
+    internal partial class MoveStaticMembersDialog : DialogWindow
     {
-        public string MoveMembersToTypeDialogTitle => "Test";
+        public string MoveStaticMembersDialogTitle => "[WIP] Move Static Members";
         public string DestinationLabelText => ServicesVSResources.Type_Name;
         public string OK => ServicesVSResources.OK;
         public string Cancel => ServicesVSResources.Cancel;
         public string SelectMembers => ServicesVSResources.Select_members_colon;
 
-        public MoveMembersToTypeDialogViewModel ViewModel { get; }
+        public MoveStaticMembersDialogViewModel ViewModel { get; }
         public StaticMemberSelection MemberSelectionControl { get; }
 
-        internal MoveMembersToTypeDialog(MoveMembersToTypeDialogViewModel viewModel)
+        internal MoveStaticMembersDialog(MoveStaticMembersDialogViewModel viewModel)
             : base()
         {
             ViewModel = viewModel;
@@ -48,16 +46,13 @@ private void Cancel_Click(object sender, RoutedEventArgs e)
 
         private void OK_Click(object sender, RoutedEventArgs e)
         {
-            if (ViewModel.CanSubmit)
-            {
-                DialogResult = true;
-            }
+            DialogResult = ViewModel.CanSubmit;
         }
 
         internal readonly struct TestAccessor
         {
-            private readonly MoveMembersToTypeDialog _dialog;
-            public TestAccessor(MoveMembersToTypeDialog dialog)
+            private readonly MoveStaticMembersDialog _dialog;
+            public TestAccessor(MoveStaticMembersDialog dialog)
                 => _dialog = dialog;
 
             public Button OKButton => _dialog.OKButton;
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
similarity index 80%
rename from src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs
rename to src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
index 77aa90e23c4d1..9ed9ea9dd9465 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/MoveMembersToTypeDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
@@ -5,33 +5,31 @@
 using System;
 using System.Collections.Immutable;
 using System.ComponentModel;
-using System.Linq;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.VisualStudio.Imaging;
 using Microsoft.VisualStudio.Imaging.Interop;
-using Microsoft.VisualStudio.LanguageServices.Implementation.CommonControls;
-using Microsoft.VisualStudio.LanguageServices.Implementation.PullMemberUp.MainDialog;
 using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
 
-namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
 {
-    internal class MoveMembersToTypeDialogViewModel : AbstractNotifyPropertyChanged
+    internal class MoveStaticMembersDialogViewModel : AbstractNotifyPropertyChanged
     {
         public StaticMemberSelectionViewModel MemberSelectionViewModel { get; }
 
         private readonly ISyntaxFacts _syntaxFacts;
 
-        public MoveMembersToTypeDialogViewModel(
+        private readonly ImmutableArray<string> _existingNames;
+
+        public MoveStaticMembersDialogViewModel(
             StaticMemberSelectionViewModel memberSelectionViewModel,
             string defaultType,
-            ImmutableArray<TypeNameItem> availableTypes,
-            ISyntaxFacts syntaxFacts,
-            ImmutableArray<TypeNameItem> typeHistory)
+            ImmutableArray<string> existingNames,
+            ISyntaxFacts syntaxFacts)
         {
             MemberSelectionViewModel = memberSelectionViewModel;
             _syntaxFacts = syntaxFacts ?? throw new ArgumentNullException(nameof(syntaxFacts));
             _destinationName = defaultType;
-            AvailableTypes = typeHistory.Concat(availableTypes).ToImmutableArray();
+            _existingNames = existingNames;
 
             PropertyChanged += MoveMembersToTypeDialogViewModel_PropertyChanged;
             OnDestinationUpdated();
@@ -49,8 +47,9 @@ private void MoveMembersToTypeDialogViewModel_PropertyChanged(object sender, Pro
 
         public void OnDestinationUpdated()
         {
-            var isNewType = !AvailableTypes.Any(i => i.TypeName == DestinationName);
-            _isValidName = !isNewType || IsValidType(DestinationName);
+            // TODO change once we allow movement to existing types
+            var isNewType = !_existingNames.Contains(DestinationName);
+            _isValidName = IsValidType(DestinationName);
 
             if (isNewType && _isValidName)
             {
@@ -58,7 +57,7 @@ public void OnDestinationUpdated()
                 Message = "[WIP] A new type will be created";
                 ShowMessage = true;
             }
-            else if (!_isValidName)
+            else if (!_isValidName || !isNewType)
             {
                 Icon = KnownMonikers.StatusInvalid;
                 Message = "[WIP] Invalid Type Name";
@@ -97,8 +96,6 @@ public string DestinationName
             set => SetProperty(ref _destinationName, value);
         }
 
-        public ImmutableArray<TypeNameItem> AvailableTypes { get; }
-
         private ImageMoniker _icon;
         public ImageMoniker Icon
         {
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelection.xaml b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml
similarity index 90%
rename from src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelection.xaml
rename to src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml
index 54c6a15e981cf..8c6129333aa0d 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelection.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml
@@ -1,12 +1,13 @@
-<UserControl x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType.StaticMemberSelection"
+<UserControl x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers.StaticMemberSelection"
              x:ClassModifier="internal"
              x:Name="MemberSelectionControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:u="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.Utilities"
-             xmlns:utilities="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.Utilities" xmlns:movememberstotype="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType" d:DataContext="{d:DesignInstance Type=movememberstotype:StaticMemberSelectionViewModel}"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:utilities="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.Utilities"
+             xmlns:movestaticmembers="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers"
+             d:DataContext="{d:DesignInstance Type=movestaticmembers:StaticMemberSelectionViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelection.xaml.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml.cs
similarity index 93%
rename from src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelection.xaml.cs
rename to src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml.cs
index fbac556bce248..5049ee920643e 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelection.xaml.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml.cs
@@ -4,9 +4,8 @@
 
 using System.Windows;
 using System.Windows.Controls;
-using Microsoft.VisualStudio.LanguageServices.Implementation.CommonControls;
 
-namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
 {
     /// <summary>
     /// Interaction logic for StaticMemberSelection.xaml
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelectionViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs
similarity index 99%
rename from src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelectionViewModel.cs
rename to src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs
index 6bb2081abbbf1..beeaf5233a5b0 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/StaticMemberSelectionViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs
@@ -12,7 +12,7 @@
 using Microsoft.VisualStudio.Utilities;
 using Roslyn.Utilities;
 
-namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
 {
     internal class StaticMemberSelectionViewModel : AbstractNotifyPropertyChanged
     {
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/VisualStudioMoveMembersToTypeOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
similarity index 67%
rename from src/VisualStudio/Core/Def/Implementation/MoveMembersToType/VisualStudioMoveMembersToTypeOptionsService.cs
rename to src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index ea46f42ff2acd..086cb36cbb5b9 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/VisualStudioMoveMembersToTypeOptionsService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -10,7 +10,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.LanguageServices;
-using Microsoft.CodeAnalysis.MoveMembersToType;
+using Microsoft.CodeAnalysis.MoveStaticMembers;
 using Microsoft.CodeAnalysis.PullMemberUp;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Shared.Utilities;
@@ -20,21 +20,17 @@
 using Microsoft.VisualStudio.Utilities;
 using Roslyn.Utilities;
 
-namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
 {
-    [ExportWorkspaceService(typeof(IMoveMembersToTypeOptionsService), ServiceLayer.Host), Shared]
-    internal class VisualStudioMoveMembersToTypeOptionsService : IMoveMembersToTypeOptionsService
+    [ExportWorkspaceService(typeof(IMoveStaticMembersOptionsService), ServiceLayer.Host), Shared]
+    internal class VisualStudioMoveStaticMembersOptionsService : IMoveStaticMembersOptionsService
     {
         private readonly IGlyphService _glyphService;
         private readonly IUIThreadOperationExecutor _uiThreadOperationExecutor;
 
-        private const int HistorySize = 3;
-
-        public readonly LinkedList<TypeNameItem> History = new();
-
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-        public VisualStudioMoveMembersToTypeOptionsService(
+        public VisualStudioMoveStaticMembersOptionsService(
             IGlyphService glyphService,
             IUIThreadOperationExecutor uiThreadOperationExecutor)
         {
@@ -42,7 +38,7 @@ public VisualStudioMoveMembersToTypeOptionsService(
             _uiThreadOperationExecutor = uiThreadOperationExecutor;
         }
 
-        public MoveMembersToTypeOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol)
+        public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol)
         {
             var membersInType = selectedType.GetMembers().
                WhereAsArray(member => MemberAndDestinationValidator.IsMemberValid(member) && member.IsStatic);
@@ -58,19 +54,9 @@ public MoveMembersToTypeOptions GetMoveMembersToTypeOptions(Document document, I
             using var cancellationTokenSource = new CancellationTokenSource();
             var memberToDependentsMap = SymbolDependentsBuilder.FindMemberToDependentsMap(membersInType, document.Project, cancellationTokenSource.Token);
 
-            var existingTypeNames = selectedType.ContainingNamespace.GetAllTypes(cancellationTokenSource.Token)
-                .SelectMany(t =>
-                {
-                    // for partially declared classes, we may want multiple entries for a single type.
-                    // filter to those actually in a real file, and that are not already in our History list.
-                    return t.Locations
-                        .Where(l => l.IsInSource &&
-                            !History.Any(h => GetFile(l) == h.DeclarationFile && t.Name == h.TypeName))
-                        .Select(l => new TypeNameItem(false, GetFile(l), t.Name));
-                })
-                .ToImmutableArrayOrEmpty();
+            var existingTypeNames = selectedType.ContainingNamespace.GetAllTypes(cancellationTokenSource.Token).SelectAsArray(t => t.Name);
             var candidateName = selectedType.Name + "Helpers";
-            var defaultTypeName = NameGenerator.GenerateUniqueName(candidateName, name => !existingTypeNames.Any(t => t.TypeName == name));
+            var defaultTypeName = NameGenerator.GenerateUniqueName(candidateName, name => !existingTypeNames.Contains(name));
 
             var containingNamespaceDisplay = selectedType.ContainingNamespace.IsGlobalNamespace
                 ? string.Empty
@@ -83,25 +69,25 @@ public MoveMembersToTypeOptions GetMoveMembersToTypeOptions(Document document, I
                 memberViewModels,
                 memberToDependentsMap);
 
-            var viewModel = new MoveMembersToTypeDialogViewModel(selectMembersViewModel,
+            var viewModel = new MoveStaticMembersDialogViewModel(selectMembersViewModel,
                 defaultTypeName,
                 existingTypeNames,
-                document.GetRequiredLanguageService<ISyntaxFactsService>(),
-                History.ToImmutableArrayOrEmpty());
+                document.GetRequiredLanguageService<ISyntaxFactsService>());
 
-            var dialog = new MoveMembersToTypeDialog(viewModel);
+            var dialog = new MoveStaticMembersDialog(viewModel);
 
             var result = dialog.ShowModal();
 
             if (result.GetValueOrDefault())
             {
-                // TODO: Get Options
-                return null;
+                var typeName = viewModel.DestinationName;
+                return new MoveStaticMembersOptions(
+                    typeName + (document.Project.Language == LanguageNames.CSharp ? ".cs" : ".vb"),
+                    typeName,
+                    selectMembersViewModel.CheckedMembers.SelectAsArray(vm => vm.Symbol));
             }
 
-            return null;
+            return MoveStaticMembersOptions.Cancelled;
         }
-
-        private static string GetFile(Location loc) => PathUtilities.GetFileName(loc.SourceTree!.FilePath);
     }
 }
diff --git a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
index 606ed2ae451fa..c61ad491ee904 100644
--- a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
+++ b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
@@ -199,11 +199,6 @@
       <SubType>Designer</SubType>
     </VSCTCompile>
   </ItemGroup>
-  <ItemGroup>
-    <Page Update="Implementation\MoveMembersToType\MoveMembersToTypeDialog.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
-  </ItemGroup>
   <Import Project="$(RepositoryEngineeringDir)targets\Vsdconfig.targets" />
 
   <Target Name="GeneratePkgDefServiceRegistrations" BeforeTargets="GeneratePkgDef">

From b87c6712a9293e4602b3f8b03e5d4b8ae76a7b64 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Thu, 29 Jul 2021 12:25:30 -0700
Subject: [PATCH 08/64] Accessibility, theming, resources, and sizing retweaks

---
 .../Core/Portable/FeaturesResources.resx      |  3 ++
 .../MoveStaticMembersWithDialogCodeAction.cs  | 10 ++--
 .../Portable/xlf/FeaturesResources.cs.xlf     |  5 ++
 .../Portable/xlf/FeaturesResources.de.xlf     |  5 ++
 .../Portable/xlf/FeaturesResources.es.xlf     |  5 ++
 .../Portable/xlf/FeaturesResources.fr.xlf     |  5 ++
 .../Portable/xlf/FeaturesResources.it.xlf     |  5 ++
 .../Portable/xlf/FeaturesResources.ja.xlf     |  5 ++
 .../Portable/xlf/FeaturesResources.ko.xlf     |  5 ++
 .../Portable/xlf/FeaturesResources.pl.xlf     |  5 ++
 .../Portable/xlf/FeaturesResources.pt-BR.xlf  |  5 ++
 .../Portable/xlf/FeaturesResources.ru.xlf     |  5 ++
 .../Portable/xlf/FeaturesResources.tr.xlf     |  5 ++
 .../xlf/FeaturesResources.zh-Hans.xlf         |  5 ++
 .../xlf/FeaturesResources.zh-Hant.xlf         |  5 ++
 .../MoveStaticMembersDialog.xaml              | 49 +++++++++++--------
 .../MoveStaticMembersDialog.xaml.cs           |  2 +-
 .../MoveStaticMembersDialogViewModel.cs       |  4 +-
 .../StaticMemberSelection.xaml                | 10 ++--
 .../StaticMemberSelectionViewModel.cs         | 26 +++++-----
 .../MainDialog/PullMemberUpDialog.xaml        |  1 -
 .../Core/Def/ServicesVSResources.resx         |  9 ++++
 .../Core/Def/xlf/ServicesVSResources.cs.xlf   | 15 ++++++
 .../Core/Def/xlf/ServicesVSResources.de.xlf   | 15 ++++++
 .../Core/Def/xlf/ServicesVSResources.es.xlf   | 15 ++++++
 .../Core/Def/xlf/ServicesVSResources.fr.xlf   | 15 ++++++
 .../Core/Def/xlf/ServicesVSResources.it.xlf   | 15 ++++++
 .../Core/Def/xlf/ServicesVSResources.ja.xlf   | 15 ++++++
 .../Core/Def/xlf/ServicesVSResources.ko.xlf   | 15 ++++++
 .../Core/Def/xlf/ServicesVSResources.pl.xlf   | 15 ++++++
 .../Def/xlf/ServicesVSResources.pt-BR.xlf     | 15 ++++++
 .../Core/Def/xlf/ServicesVSResources.ru.xlf   | 15 ++++++
 .../Core/Def/xlf/ServicesVSResources.tr.xlf   | 15 ++++++
 .../Def/xlf/ServicesVSResources.zh-Hans.xlf   | 15 ++++++
 .../Def/xlf/ServicesVSResources.zh-Hant.xlf   | 15 ++++++
 35 files changed, 328 insertions(+), 46 deletions(-)

diff --git a/src/Features/Core/Portable/FeaturesResources.resx b/src/Features/Core/Portable/FeaturesResources.resx
index a1e7d9653e735..9ef042494ed31 100644
--- a/src/Features/Core/Portable/FeaturesResources.resx
+++ b/src/Features/Core/Portable/FeaturesResources.resx
@@ -2888,4 +2888,7 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
   <data name="Updating_the_attributes_of_0_is_not_supported_by_the_runtime" xml:space="preserve">
     <value>Updating the attributes of '{0}' is not supported by the runtime.</value>
   </data>
+  <data name="Move_static_members_to_another_type" xml:space="preserve">
+    <value>Move static members to another type...</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index c6a47391d80b1..9ed0959d5c282 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -24,10 +24,10 @@ internal class MoveStaticMembersWithDialogCodeAction : CodeActionWithOptions
         private readonly Document _document;
         private readonly ISymbol? _selectedMember;
         private readonly INamedTypeSymbol _selectedType;
-        private readonly IMoveStaticMembersOptionsService _service;
+        private IMoveStaticMembersOptionsService _service;
 
         public TextSpan Span { get; }
-        public override string Title => "[WIP] Move Members to Type...";
+        public override string Title => FeaturesResources.Move_static_members_to_another_type;
 
         public MoveStaticMembersWithDialogCodeAction(
             Document document,
@@ -45,8 +45,8 @@ public MoveStaticMembersWithDialogCodeAction(
 
         public override object? GetOptions(CancellationToken cancellationToken)
         {
-            var optionsService = _service ?? _document.Project.Solution.Workspace.Services.GetRequiredService<IMoveStaticMembersOptionsService>();
-            return optionsService.GetMoveMembersToTypeOptions(_document, _selectedType, _selectedMember);
+            _service ??= _document.Project.Solution.Workspace.Services.GetRequiredService<IMoveStaticMembersOptionsService>();
+            return _service.GetMoveMembersToTypeOptions(_document, _selectedType, _selectedMember);
         }
 
         protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperationsAsync(object options, CancellationToken cancellationToken)
@@ -92,7 +92,7 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
             var semanticModel = await sourceDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
             var members = memberNodes
                 .Select(node => root.GetCurrentNode(node))
-                .Where(node => node != null)
+                .WhereNotNull()
                 .SelectAsArray(node => (semanticModel.GetDeclaredSymbol(node!, cancellationToken), false));
 
             // get back type declaration in the newly created file
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
index 1df883b850441..ade51428ee481 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
@@ -715,6 +715,11 @@ Ujistěte se, že specifikátor tt použijete pro jazyky, pro které je nezbytn
         <target state="translated">Přesunout soubor do kořenové složky projektu</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">Přesunout do oboru názvů...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
index fb78e23e5bce2..d097c9880e8a3 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
@@ -715,6 +715,11 @@ Stellen Sie sicher, dass Sie den Bezeichner "tt" für Sprachen verwenden, für d
         <target state="translated">Datei in den Stammordner des Projekts verschieben</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">In Namespace verschieben...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
index 50a5fd50630e5..66575284d2508 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
@@ -715,6 +715,11 @@ Asegúrese de usar el especificador "tt" para los idiomas para los que es necesa
         <target state="translated">Mover el archivo a la carpeta raíz del proyecto</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">Mover a espacio de nombres...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
index f88bebc705fb0..dfa6326b24d85 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
@@ -715,6 +715,11 @@ Veillez à utiliser le spécificateur "tt" pour les langues où il est nécessai
         <target state="translated">Déplacer le fichier dans le dossier racine du projet</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">Déplacer vers un espace de noms...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
index b3debbd02411a..86872948c49bd 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
@@ -715,6 +715,11 @@ Assicurarsi di usare l'identificatore "tt" per le lingue per le quali è necessa
         <target state="translated">Sposta il file nella cartella radice del progetto</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">Sposta nello spazio dei nomi...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
index 670e4fa05740a..944ce0495f938 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
@@ -715,6 +715,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">ファイルをプロジェクト ルート フォルダーに移動します</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">名前空間に移動します...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
index 66b63e7857464..7bee145facece 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
@@ -715,6 +715,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">파일을 프로젝트 루트 폴더로 이동</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">네임스페이스로 이동...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
index 53e1ce23a705a..ac3085ad7e2cc 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
@@ -715,6 +715,11 @@ Pamiętaj, aby nie używać specyfikatora „tt” dla wszystkich języków, w k
         <target state="translated">Przenieś plik do folderu głównego projektu</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">Przenieś do przestrzeni nazw...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
index 379852007521a..bde3e58f69ba6 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
@@ -715,6 +715,11 @@ Verifique se o especificador "tt" foi usado para idiomas para os quais é necess
         <target state="translated">Mover o arquivo para a pasta raiz do projeto</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">Mover para o namespace...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
index 7692686a359ca..eb8438954d756 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
@@ -715,6 +715,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">Переместить файл в корневую папку проекта</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">Переместить в пространство имен...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
index 77600d5869695..be93caad74864 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
@@ -715,6 +715,11 @@ AM ve PM arasındaki farkın korunmasının gerekli olduğu diller için "tt" be
         <target state="translated">Dosyayı proje kök klasörüne taşı</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">Ad alanına taşı...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
index cfefe8521ca2e..43c5c23a812a6 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
@@ -715,6 +715,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">将文件移动到项目根文件夹</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">移动到命名空间...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
index 01fba5962147e..21c6204384b00 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
@@ -715,6 +715,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">將檔案移到專案根資料夾</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">移到命名空間...</target>
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
index d5c819289e2cd..a468fcf617ed3 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
@@ -5,8 +5,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
-    xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
-    xmlns:imagecatalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog" 
+    xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging" 
     xmlns:movestaticmembers="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers" 
     d:DataContext="{d:DesignInstance Type=movestaticmembers:MoveStaticMembersDialogViewModel}"
     vs:ThemedDialogStyleLoader.UseDefaultThemedDialogStyles="True"
@@ -16,7 +15,7 @@
     x:ClassModifier="internal"
     mc:Ignorable="d"
     WindowStartupLocation="CenterOwner"
-    Height="498"
+    Height="398"
     Width="500"
     MinHeight="298"
     MinWidth="210"
@@ -41,41 +40,51 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <StackPanel Orientation="Vertical" Grid.Row="0">
-            <Label x:Uid="DestinationLabel" 
-                       x:Name="DestinationLabel"
-                       Margin="{StaticResource verticalLabelMargin}"
-                       Content="{Binding ElementName=dialog, Path=DestinationLabelText}"
-                       Target="{Binding ElementName=DestinationTextBox}" />
+            <Label 
+                x:Uid="DestinationLabel" 
+                x:Name="DestinationLabel"
+                Margin="{StaticResource verticalLabelMargin}"
+                Content="{Binding ElementName=dialog, Path=DestinationLabelText}"
+                Target="{Binding ElementName=DestinationTextBox}" />
             <TextBox 
                 x:Uid="DestinationBox"
                 Name="DestinationBox"
+                AutomationProperties.Name="DestinationName"
                 Text="{Binding DestinationName, UpdateSourceTrigger=PropertyChanged}"
                 Margin="0 0 20 0"/>
 
         </StackPanel>
 
-        <StackPanel Grid.Row="1">
-            <StackPanel Orientation="Horizontal"  
-                        Visibility="{Binding ShowMessage, Converter={StaticResource BooleanToVisibilityConverter}}"
-                        Margin="{StaticResource messageMargin}">
-                <imaging:CrispImage Name="MessageIcon"
+        <StackPanel 
+            Grid.Row="1"
+            Orientation="Horizontal"  
+            Visibility="{Binding ShowMessage, Converter={StaticResource BooleanToVisibilityConverter}}"
+            Margin="{StaticResource messageMargin}">
+            <imaging:CrispImage Name="MessageIcon"
                                     Moniker="{Binding Icon}" 
                                     Height="16"
                                     Width="16"
                                     VerticalAlignment="Top" />
 
-                <vs:LiveTextBlock x:Name="MessageText"
+            <vs:LiveTextBlock x:Name="MessageText"
                            Text="{Binding Message}"
                            Margin="7, 0, 0, 0"
                            Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
-            </StackPanel>
         </StackPanel>
 
-        <GroupBox x:Uid="MemberSelectionGroupBox"
-                  x:Name="MemberSelectionGroupBox"
-                  Margin="0, 130, 0, 0"
-                  Grid.Row="2"
-                  Header="{Binding ElementName=dialog, Path=SelectMembers}">
+        <GroupBox 
+            x:Uid="MemberSelectionGroupBox"
+            x:Name="MemberSelectionGroupBox"
+            Margin="0, 20, 0, 0"
+            Grid.Row="2"
+            Header="{Binding ElementName=dialog, Path=SelectMembers}"
+            BorderThickness="1">
+            <GroupBox.Style>
+                <Style TargetType="GroupBox">
+                    <Setter Property="Foreground" Value="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
+                </Style>
+            </GroupBox.Style>
+
             <ContentPresenter Content="{Binding ElementName=dialog, Path=MemberSelectionControl}" />
         </GroupBox>
         <StackPanel Grid.Row="3"
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs
index 990d8d99c55d0..933ab7a049ac3 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs
@@ -16,7 +16,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembe
     /// </summary>
     internal partial class MoveStaticMembersDialog : DialogWindow
     {
-        public string MoveStaticMembersDialogTitle => "[WIP] Move Static Members";
+        public string MoveStaticMembersDialogTitle => ServicesVSResources.Move_static_members_to_another_type_colon;
         public string DestinationLabelText => ServicesVSResources.Type_Name;
         public string OK => ServicesVSResources.OK;
         public string Cancel => ServicesVSResources.Cancel;
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
index 9ed9ea9dd9465..758675c1768f9 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
@@ -54,13 +54,13 @@ public void OnDestinationUpdated()
             if (isNewType && _isValidName)
             {
                 Icon = KnownMonikers.StatusInformation;
-                Message = "[WIP] A new type will be created";
+                Message = ServicesVSResources.A_new_type_will_be_created;
                 ShowMessage = true;
             }
             else if (!_isValidName || !isNewType)
             {
                 Icon = KnownMonikers.StatusInvalid;
-                Message = "[WIP] Invalid Type Name";
+                Message = ServicesVSResources.Invalid_type_name;
                 ShowMessage = true;
             }
             else
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml
index 8c6129333aa0d..fb93072343c9f 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml
@@ -20,11 +20,12 @@
             <ColumnDefinition Width="Auto"/>
         </Grid.ColumnDefinitions>
         <ListBox
-            x:Uid="MemberSelectionGrid"
-            x:Name="MemberSelectionGrid"
+            x:Uid="MemberSelectionList"
+            x:Name="MemberSelectionList"
             Grid.Column="0"
             Margin="2, 5, 12, 2"
             SelectionMode="Multiple"
+            AutomationProperties.Name="SelectMembersList"
             ItemsSource="{Binding Members}">
             <ListBox.Resources>
                 <Style TargetType="{x:Type ListBoxItem}">
@@ -41,6 +42,7 @@
                         Margin="5, 2, 0, 2">
                         <CheckBox
                             x:Name="MemberSelected"
+                            AutomationProperties.Name="IsSelected"
                             Margin="0, 0, 5, 0"
                             IsChecked="{Binding IsChecked, Mode=TwoWay}"/>
                         <Image 
@@ -81,8 +83,8 @@
                 Width="Auto"
                 Height="Auto" />
             <Button
-                x:Name="SelecDependentsButton"
-                x:Uid="SelecDependentsButton"
+                x:Name="SelectDependentsButton"
+                x:Uid="SelectDependentsButton"
                 Padding="{StaticResource ResourceKey=ButtonControlsPadding}"
                 Content="{Binding ElementName=MemberSelectionControl, Path=SelectDependents}"
                 Click="SelectDependentsButton_Click"
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs
index beeaf5233a5b0..d4bd51770d456 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs
@@ -49,26 +49,26 @@ internal void DeselectAll()
         public void SelectDependents()
         {
             var checkedMembers = Members
-              .WhereAsArray(member => member.IsChecked);
+                .WhereAsArray(member => member.IsChecked);
 
             var result = _uiThreadOperationExecutor.Execute(
-                    title: ServicesVSResources.Pull_Members_Up,
-                    defaultDescription: ServicesVSResources.Calculating_dependents,
-                    allowCancellation: true,
-                    showProgress: true,
-                    context =>
+                title: ServicesVSResources.Pull_Members_Up,
+                defaultDescription: ServicesVSResources.Calculating_dependents,
+                allowCancellation: true,
+                showProgress: true,
+                context =>
+                {
+                    foreach (var member in Members)
                     {
-                        foreach (var member in Members)
-                        {
-                            _symbolToDependentsMap[member.Symbol].Wait(context.UserCancellationToken);
-                        }
-                    });
+                        _symbolToDependentsMap[member.Symbol].Wait(context.UserCancellationToken);
+                    }
+                });
 
             if (result == UIThreadOperationStatus.Completed)
             {
                 foreach (var member in checkedMembers)
                 {
-                    var membersToSelected = FindDependentsRecursively(member.Symbol).SelectAsArray(symbol => _symbolToMemberViewMap[symbol]);
+                    var membersToSelected = FindDependents(member.Symbol).SelectAsArray(symbol => _symbolToMemberViewMap[symbol]);
                     SelectMembers(membersToSelected);
                 }
             }
@@ -82,7 +82,7 @@ private void SelectMembers(ImmutableArray<SymbolViewModel<ISymbol>> members, boo
             }
         }
 
-        private ImmutableHashSet<ISymbol> FindDependentsRecursively(ISymbol member)
+        private ImmutableHashSet<ISymbol> FindDependents(ISymbol member)
         {
             var queue = new Queue<ISymbol>();
             // Under situation like two methods call each other, this hashset is used to 
diff --git a/src/VisualStudio/Core/Def/Implementation/PullMemberUp/MainDialog/PullMemberUpDialog.xaml b/src/VisualStudio/Core/Def/Implementation/PullMemberUp/MainDialog/PullMemberUpDialog.xaml
index 0560b36add827..160dc72a65f77 100644
--- a/src/VisualStudio/Core/Def/Implementation/PullMemberUp/MainDialog/PullMemberUpDialog.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/PullMemberUp/MainDialog/PullMemberUpDialog.xaml
@@ -132,4 +132,3 @@
         </StackPanel>
     </Grid>
 </vs:DialogWindow>
-
diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.resx b/src/VisualStudio/Core/Def/ServicesVSResources.resx
index c3f8f43aa25bc..e3ff82a9c955b 100644
--- a/src/VisualStudio/Core/Def/ServicesVSResources.resx
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.resx
@@ -1767,4 +1767,13 @@ I agree to all of the foregoing:</value>
   <data name="Inherited_interfaces" xml:space="preserve">
     <value>Inherited interfaces</value>
   </data>
+  <data name="A_new_type_will_be_created" xml:space="preserve">
+    <value>A new type will be created</value>
+  </data>
+  <data name="Invalid_type_name" xml:space="preserve">
+    <value>Invalid type name</value>
+  </data>
+  <data name="Move_static_members_to_another_type_colon" xml:space="preserve">
+    <value>Move Static Members to Another Type:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
index 8a539a3928efa..e3f44457d567a 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Vytvoří se nový obor názvů.</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Typ a název se musí poskytnout.</target>
@@ -467,6 +472,11 @@
         <target state="translated">Zaveďte nedefinované proměnné TODO.</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">Původ položky</target>
@@ -532,6 +542,11 @@
         <target state="translated">Předvolby modifikátorů:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">Přesunout do oboru názvů</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
index 9155c61d10622..ee148031eea2a 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Ein neuer Namespace wird erstellt.</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Typ und Name müssen angegeben werden.</target>
@@ -467,6 +472,11 @@
         <target state="translated">Nicht definierte TODO-Variablen einführen</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">Elementursprung</target>
@@ -532,6 +542,11 @@
         <target state="translated">Einstellungen für Modifizierer:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">In Namespace verschieben</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
index 9a66bbe1258d6..10c33511fda11 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Se creará un espacio de nombres</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Se debe proporcionar un tipo y un nombre.</target>
@@ -467,6 +472,11 @@
         <target state="translated">Introducir variables TODO sin definir</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">Origen del elemento</target>
@@ -532,6 +542,11 @@
         <target state="translated">Preferencias de modificador:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">Mover a espacio de nombres</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
index d73bf890fe2c6..c974fed38bd4d 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Un espace de noms va être créé</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Vous devez fournir un type et un nom.</target>
@@ -467,6 +472,11 @@
         <target state="translated">Introduire des variables TODO non définies</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">Origine de l'élément</target>
@@ -532,6 +542,11 @@
         <target state="translated">Préférences de modificateur :</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">Déplacer vers un espace de noms</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
index ab726fda3c093..09e7ffbaac452 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Verrà creato un nuovo spazio dei nomi</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">È necessario specificare un tipo e un nome.</target>
@@ -467,6 +472,11 @@
         <target state="translated">Introduci variabili TODO non definite</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">Origine dell'elemento</target>
@@ -532,6 +542,11 @@
         <target state="translated">Preferenze per modificatore:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">Sposta nello spazio dei nomi</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
index 0afa2c97f464d..b1daeafc4801c 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
@@ -12,6 +12,11 @@
         <target state="translated">新しい名前空間が作成されます</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">種類と名前を指定する必要があります。</target>
@@ -467,6 +472,11 @@
         <target state="translated">未定義の TODO 変数の導入</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">項目の送信元</target>
@@ -532,6 +542,11 @@
         <target state="translated">修飾子設定:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">名前空間に移動します</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
index 3d0c1496bb9df..ed59af5909385 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
@@ -12,6 +12,11 @@
         <target state="translated">새 네임스페이스가 만들어집니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">형식과 이름을 지정해야 합니다.</target>
@@ -467,6 +472,11 @@
         <target state="translated">정의되지 않은 TODO 변수 소개</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">항목 원본</target>
@@ -532,6 +542,11 @@
         <target state="translated">한정자 기본 설정:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">네임스페이스로 이동</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
index 822719529090b..c32afc994c484 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Zostanie utworzona nowa przestrzeń nazw</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Konieczne jest podanie typu i nazwy.</target>
@@ -467,6 +472,11 @@
         <target state="translated">Wprowadź niezdefiniowane zmienne TODO</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">Źródło elementu</target>
@@ -532,6 +542,11 @@
         <target state="translated">Preferencje modyfikatora:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">Przenieś do przestrzeni nazw</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
index a08ce77d9f14f..8fb4ab7ef04d7 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Um namespace será criado</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Um tipo e um nome precisam ser fornecidos.</target>
@@ -467,6 +472,11 @@
         <target state="translated">Introduzir variáveis de TODO indefinidas</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">Origem do item</target>
@@ -532,6 +542,11 @@
         <target state="translated">Preferências do modificador:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">Mover para o Namespace</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
index 8abce005be969..d5cc2bfcad9d8 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Будет создано пространство имен</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Следует указать тип и имя.</target>
@@ -467,6 +472,11 @@
         <target state="translated">Ввести неопределенные переменные TODO</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">Источник элемента</target>
@@ -532,6 +542,11 @@
         <target state="translated">Предпочтения модификатора:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">Переместить в пространство имен</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
index d74a65a4080c1..6d320089a04a5 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Yeni bir ad alanı oluşturulacak</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Bir tür ve ad verilmesi gerekiyor.</target>
@@ -467,6 +472,11 @@
         <target state="translated">Tanımsız TODO değişkenlerini tanıtın</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">Öğe çıkış noktası</target>
@@ -532,6 +542,11 @@
         <target state="translated">Değiştirici tercihleri:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">Ad Alanına Taşı</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
index 41b9b5de19f57..d3c6f586b52d9 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
@@ -12,6 +12,11 @@
         <target state="translated">将创建一个新的命名空间</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">必须提供类型和名称。</target>
@@ -467,6 +472,11 @@
         <target state="translated">引入未定义的 TODO 变量</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">项来源</target>
@@ -532,6 +542,11 @@
         <target state="translated">修饰符首选项:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">移动到命名空间</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
index 4e0adacdb9067..3fb687440588a 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
@@ -12,6 +12,11 @@
         <target state="translated">將會建立新的命名空間</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">必須提供類型與名稱。</target>
@@ -467,6 +472,11 @@
         <target state="translated">引入未定義的 TODO 變數</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">項目原點</target>
@@ -532,6 +542,11 @@
         <target state="translated">修飾元喜好設定:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">移到命名空間</target>

From f215befc31b7402abd60f6e46896474dce7c07c5 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Fri, 30 Jul 2021 11:26:52 -0700
Subject: [PATCH 09/64] Added VB refactoring provider. Currently does not
 trigger on fields, as the semantic model cannot get the symbol for VB
 declared fields from the node. Fields are added as part of the dialog box
 however.

---
 ...oveStaticMembersCodeRefactoringProvider.cs |  2 +-
 .../PredefinedCodeRefactoringProviderNames.cs |  1 +
 ...sicMoveStaticMembersRefactoringProvider.vb | 25 +++++++++++++++++++
 .../CodeRefactorings/NodeSelectionHelpers.vb  | 21 ++++++++++++++++
 4 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb
 create mode 100644 src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb

diff --git a/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersCodeRefactoringProvider.cs b/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersCodeRefactoringProvider.cs
index 9bf1b11b933ed..afde49e677d8c 100644
--- a/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersCodeRefactoringProvider.cs
+++ b/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersCodeRefactoringProvider.cs
@@ -12,7 +12,7 @@
 
 namespace Microsoft.CodeAnalysis.CSharp.CodeRefactorings.MoveStaticMembers
 {
-    [ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = "[WIP] Move Members To Type"), Shared]
+    [ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = PredefinedCodeRefactoringProviderNames.MoveStaticMembers), Shared]
     internal class CSharpMoveStaticMembersCodeRefactoringProvider : AbstractMoveStaticMembersRefactoringProvider
     {
         /// <summary>
diff --git a/src/Features/Core/Portable/CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs b/src/Features/Core/Portable/CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs
index 8b785e7a95c59..7b0ebccac0ad6 100644
--- a/src/Features/Core/Portable/CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs
+++ b/src/Features/Core/Portable/CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs
@@ -35,6 +35,7 @@ internal static class PredefinedCodeRefactoringProviderNames
         public const string MergeConsecutiveIfStatements = "Merge Consecutive If Statements Code Action Provider";
         public const string MergeNestedIfStatements = "Merge Nested If Statements Code Action Provider";
         public const string MoveDeclarationNearReference = "Move Declaration Near Reference Code Action Provider";
+        public const string MoveStaticMembers = "Move Static Members to Another Type Code Action Provider";
         public const string MoveToNamespace = "Move To Namespace Code Action Provider";
         public const string MoveTypeToFile = "Move Type To File Code Action Provider";
         public const string PullMemberUp = "Pull Member Up Code Action Provider";
diff --git a/src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb b/src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb
new file mode 100644
index 0000000000000..1813a0b6ad584
--- /dev/null
+++ b/src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb
@@ -0,0 +1,25 @@
+' Licensed to the .NET Foundation under one or more agreements.
+' The .NET Foundation licenses this file to you under the MIT license.
+' See the LICENSE file in the project root for more information.
+
+Imports System.Composition
+Imports System.Diagnostics.CodeAnalysis
+Imports Microsoft.CodeAnalysis.CodeRefactorings
+Imports Microsoft.CodeAnalysis.MoveStaticMembers
+
+Namespace Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings.MoveStaticMembers
+    <ExportCodeRefactoringProvider(LanguageNames.VisualBasic, Name:=PredefinedCodeRefactoringProviderNames.MoveStaticMembers), [Shared]>
+    Friend Class VisualBasicMoveStaticMembersRefactoringProvider
+        Inherits AbstractMoveStaticMembersRefactoringProvider
+
+        <SuppressMessage("RoslynDiagnosticsReliability", "RS0033:Importing constructor should be [Obsolete]", Justification:="Used in test code: https://github.com/dotnet/roslyn/issues/42814")>
+        <ImportingConstructor>
+        Public Sub New()
+            MyBase.New(Nothing)
+        End Sub
+
+        Protected Overrides Async Function GetSelectedNodeAsync(context As CodeRefactoringContext) As Task(Of SyntaxNode)
+            Return Await GetSelectedMemberDeclarationAsync(context).ConfigureAwait(False)
+        End Function
+    End Class
+End Namespace
diff --git a/src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb b/src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb
new file mode 100644
index 0000000000000..b500ae8dbaeaf
--- /dev/null
+++ b/src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb
@@ -0,0 +1,21 @@
+' Licensed to the .NET Foundation under one or more agreements.
+' The .NET Foundation licenses this file to you under the MIT license.
+' See the LICENSE file in the project root for more information.
+
+Imports Microsoft.CodeAnalysis.CodeRefactorings
+Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
+
+Namespace Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings
+    Friend Module NodeSelectionHelpers
+        Friend Async Function GetSelectedMemberDeclarationAsync(context As CodeRefactoringContext) As Task(Of SyntaxNode)
+            Dim methodMember = Await context.TryGetRelevantNodeAsync(Of MethodBaseSyntax)().ConfigureAwait(False)
+            If methodMember IsNot Nothing Then
+                Return methodMember
+            Else
+                ' Gets field members, which are not methods
+                Return Await context.TryGetRelevantNodeAsync(Of VariableDeclaratorSyntax).ConfigureAwait(False)
+            End If
+        End Function
+    End Module
+End Namespace
+

From dfe55f5cf5fd644c882d6cc2cdadd65a0e00baf0 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Fri, 30 Jul 2021 12:55:55 -0700
Subject: [PATCH 10/64] Addressing some of the feedback

---
 .../MoveStaticMembersOptions.cs               | 25 +++++++------------
 .../MoveStaticMembersWithDialogCodeAction.cs  |  7 +++++-
 ...alStudioMoveStaticMembersOptionsService.cs |  1 +
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
index 1c1aad8243cd2..a9d08e971892f 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
@@ -7,7 +7,7 @@
 
 namespace Microsoft.CodeAnalysis.MoveStaticMembers
 {
-    internal class MoveStaticMembersOptions
+    internal readonly struct MoveStaticMembersOptions
     {
         public bool IsCancelled { get; }
 
@@ -19,26 +19,19 @@ internal class MoveStaticMembersOptions
 
         public ImmutableArray<ISymbol> SelectedMembers { get; }
 
-        public static MoveStaticMembersOptions Cancelled = new();
-
-        /// <summary>
-        /// default constructor corresponds to a cancelled operation
-        /// </summary>
-        public MoveStaticMembersOptions()
-        {
-            IsCancelled = true;
-            FileName = string.Empty;
-            TypeName = string.Empty;
-            NamespaceDisplay = string.Empty;
-            SelectedMembers = ImmutableArray<ISymbol>.Empty;
-        }
+        public static MoveStaticMembersOptions Cancelled = new(
+            string.Empty,
+            string.Empty,
+            ImmutableArray<ISymbol>.Empty,
+            isCancelled: true);
 
         public MoveStaticMembersOptions(
             string fileName,
             string fullTypeName,
-            ImmutableArray<ISymbol> selectedMembers)
+            ImmutableArray<ISymbol> selectedMembers,
+            bool isCancelled = false)
         {
-            IsCancelled = false;
+            IsCancelled = isCancelled;
             FileName = fileName;
             var namespacesAndType = fullTypeName.Split(separator: '.');
             TypeName = namespacesAndType.Last();
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 9ed0959d5c282..9a67b2d285d07 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -62,7 +62,12 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
             var fileBanner = syntaxFacts.GetFileBanner(root);
 
             // add annotations to the symbols that we selected so we can find them later to pull up
-            var memberNodes = moveOptions.SelectedMembers.SelectAsArray(symbol => symbol.Locations.Single().FindNode(cancellationToken));
+            // These symbols should all have (singular) definitions, but in the case that we can't find
+            // any location, we just won't move that particular symbol
+            var memberNodes = moveOptions.SelectedMembers
+                .Select(symbol => symbol.Locations.FirstOrDefault())
+                .WhereNotNull()
+                .SelectAsArray(loc => loc.FindNode(cancellationToken));
             root = root.TrackNodes(memberNodes);
             var sourceDoc = _document.WithSyntaxRoot(root);
 
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index 086cb36cbb5b9..cf0d5bb2edbe4 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -82,6 +82,7 @@ public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, I
             {
                 var typeName = viewModel.DestinationName;
                 return new MoveStaticMembersOptions(
+                    // TODO: generate unique file name based off of existing folder documents
                     typeName + (document.Project.Language == LanguageNames.CSharp ? ".cs" : ".vb"),
                     typeName,
                     selectMembersViewModel.CheckedMembers.SelectAsArray(vm => vm.Symbol));

From 50ff662d940c40824665d0c199635e947852327c Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Fri, 30 Jul 2021 16:00:47 -0700
Subject: [PATCH 11/64] Fixed fields not being able to trigger dialog in VB

---
 ...actMoveStaticMembersRefactoringProvider.cs | 31 ++++++++++++++-----
 .../CodeRefactorings/NodeSelectionHelpers.vb  |  2 +-
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs b/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
index 0be2b0d4d73d6..cd52fc0cbb7ca 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
@@ -2,9 +2,12 @@
 // 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.Linq;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis.Features.RQName.Nodes;
 using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.PullMemberUp;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.MoveStaticMembers
@@ -25,26 +28,38 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
         {
             var (document, span, cancellationToken) = context;
 
-            var selectedMemberNode = await GetSelectedNodeAsync(context).ConfigureAwait(false);
-            if (selectedMemberNode == null)
+            var memberDeclaration = await GetSelectedNodeAsync(context).ConfigureAwait(false);
+            if (memberDeclaration == null)
             {
                 return;
             }
 
             var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
-            var selectedMember = semanticModel.GetDeclaredSymbol(selectedMemberNode);
-            if (selectedMember == null || selectedMember.ContainingType == null || !selectedMember.IsStatic)
+            if (semanticModel == null)
+            {
+                return;
+            }
+
+            var selectedType = semanticModel.GetEnclosingNamedType(span.Start, cancellationToken);
+            if (selectedType == null)
+            {
+                return;
+            }
+
+            var selectedMembers = selectedType.GetMembers()
+                .WhereAsArray(m => m.IsStatic &&
+                    MemberAndDestinationValidator.IsMemberValid(m) &&
+                    m.DeclaringSyntaxReferences.Any(sr => memberDeclaration.FullSpan.Contains(sr.Span)));
+            if (selectedMembers.IsEmpty)
             {
                 return;
             }
 
             var syntaxFacts = document.GetRequiredLanguageService<ISyntaxFactsService>();
-            var selectedType = selectedMember.ContainingType;
-            var selectedTypeDeclaration = selectedMemberNode.FirstAncestorOrSelf<SyntaxNode>(syntaxFacts.IsTypeDeclaration);
 
-            var action = new MoveStaticMembersWithDialogCodeAction(document, span, _service, selectedType, selectedMember: selectedMember);
+            var action = new MoveStaticMembersWithDialogCodeAction(document, span, _service, selectedType, selectedMember: selectedMembers[0]);
 
-            context.RegisterRefactoring(action, selectedMemberNode.Span);
+            context.RegisterRefactoring(action, selectedMembers[0].DeclaringSyntaxReferences[0].Span);
         }
     }
 }
diff --git a/src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb b/src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb
index b500ae8dbaeaf..02946380cb198 100644
--- a/src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb
+++ b/src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb
@@ -13,7 +13,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings
                 Return methodMember
             Else
                 ' Gets field members, which are not methods
-                Return Await context.TryGetRelevantNodeAsync(Of VariableDeclaratorSyntax).ConfigureAwait(False)
+                Return Await context.TryGetRelevantNodeAsync(Of FieldDeclarationSyntax).ConfigureAwait(False)
             End If
         End Function
     End Module

From 59446403a4210f6e368b62896dee32656f967b23 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Fri, 30 Jul 2021 16:33:39 -0700
Subject: [PATCH 12/64] Remove unnecessary usings

---
 .../AbstractMoveStaticMembersRefactoringProvider.cs           | 1 -
 .../MoveStaticMembersWithDialogCodeAction.cs                  | 1 -
 .../MoveStaticMembers/StaticMemberSelectionViewModel.cs       | 4 +---
 .../VisualStudioMoveStaticMembersOptionsService.cs            | 2 --
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs b/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
index cd52fc0cbb7ca..61b4f7d8b46fe 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
@@ -5,7 +5,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeRefactorings;
-using Microsoft.CodeAnalysis.Features.RQName.Nodes;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.PullMemberUp;
 using Microsoft.CodeAnalysis.Shared.Extensions;
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 9a67b2d285d07..72d4d7e20c361 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -10,7 +10,6 @@
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeGeneration;
 using Microsoft.CodeAnalysis.CodeRefactorings.PullMemberUp;
-using Microsoft.CodeAnalysis.ExtractInterface;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Shared.Utilities;
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs
index d4bd51770d456..69a10d6865c97 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs
@@ -4,9 +4,7 @@
 
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
 using System.Threading.Tasks;
-using System.Windows.Input;
 using Microsoft.CodeAnalysis;
 using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
 using Microsoft.VisualStudio.Utilities;
@@ -52,7 +50,7 @@ public void SelectDependents()
                 .WhereAsArray(member => member.IsChecked);
 
             var result = _uiThreadOperationExecutor.Execute(
-                title: ServicesVSResources.Pull_Members_Up,
+                title: ServicesVSResources.Move_static_members_to_another_type_colon,
                 defaultDescription: ServicesVSResources.Calculating_dependents,
                 allowCancellation: true,
                 showProgress: true,
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index cf0d5bb2edbe4..e2bc765cc7008 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -3,9 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
 using System.Composition;
-using System.Linq;
 using System.Threading;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Host.Mef;

From 9af7a12d68a398fc86d5a840d0553590a9fc2559 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Fri, 30 Jul 2021 17:00:10 -0700
Subject: [PATCH 13/64] Fixed nullable error

---
 .../CSharpMoveStaticMembersCodeRefactoringProvider.cs         | 2 +-
 .../AbstractMoveStaticMembersRefactoringProvider.cs           | 4 ++--
 .../MoveStaticMembersWithDialogCodeAction.cs                  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersCodeRefactoringProvider.cs b/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersCodeRefactoringProvider.cs
index afde49e677d8c..586ab1095b00a 100644
--- a/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersCodeRefactoringProvider.cs
+++ b/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersCodeRefactoringProvider.cs
@@ -19,7 +19,7 @@ internal class CSharpMoveStaticMembersCodeRefactoringProvider : AbstractMoveStat
         /// Test purpose only.
         /// </summary>
         [SuppressMessage("RoslynDiagnosticsReliability", "RS0034:Exported parts should have [ImportingConstructor]", Justification = "Used incorrectly by tests")]
-        public CSharpMoveStaticMembersCodeRefactoringProvider(IMoveStaticMembersOptionsService service) : base(service)
+        public CSharpMoveStaticMembersCodeRefactoringProvider(IMoveStaticMembersOptionsService? service) : base(service)
         {
         }
 
diff --git a/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs b/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
index 61b4f7d8b46fe..69215560d2855 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
@@ -13,14 +13,14 @@ namespace Microsoft.CodeAnalysis.MoveStaticMembers
 {
     internal abstract class AbstractMoveStaticMembersRefactoringProvider : CodeRefactoringProvider
     {
-        private readonly IMoveStaticMembersOptionsService _service;
+        private readonly IMoveStaticMembersOptionsService? _service;
 
         protected abstract Task<SyntaxNode> GetSelectedNodeAsync(CodeRefactoringContext context);
 
         /// <summary>
         /// Test purpose only
         /// </summary>
-        protected AbstractMoveStaticMembersRefactoringProvider(IMoveStaticMembersOptionsService service)
+        protected AbstractMoveStaticMembersRefactoringProvider(IMoveStaticMembersOptionsService? service)
             => _service = service;
 
         public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 72d4d7e20c361..54ec058f71703 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -23,7 +23,7 @@ internal class MoveStaticMembersWithDialogCodeAction : CodeActionWithOptions
         private readonly Document _document;
         private readonly ISymbol? _selectedMember;
         private readonly INamedTypeSymbol _selectedType;
-        private IMoveStaticMembersOptionsService _service;
+        private IMoveStaticMembersOptionsService? _service;
 
         public TextSpan Span { get; }
         public override string Title => FeaturesResources.Move_static_members_to_another_type;
@@ -31,7 +31,7 @@ internal class MoveStaticMembersWithDialogCodeAction : CodeActionWithOptions
         public MoveStaticMembersWithDialogCodeAction(
             Document document,
             TextSpan span,
-            IMoveStaticMembersOptionsService service,
+            IMoveStaticMembersOptionsService? service,
             INamedTypeSymbol selectedType,
             ISymbol? selectedMember = null)
         {

From 75cd384b5420782ee17d357a8107fa1302c3d67d Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Tue, 3 Aug 2021 16:53:09 -0700
Subject: [PATCH 14/64] Added test classes for view model and C# impl, made VB
 able to get dependents

---
 src/Compilers/Test/Core/Traits/Traits.cs      |   1 +
 .../CSharpMoveStaticMembersTests.cs           | 636 ++++++++++++++++++
 .../TestMoveStaticMembersService.cs           |  35 +
 .../MoveStaticMembersWithDialogCodeAction.cs  |   6 +-
 .../MoveStaticMembersDialogViewModel.cs       |  10 +-
 ...alStudioMoveStaticMembersOptionsService.cs |   5 +-
 .../PullMemberUp/SymbolDependentsBuilder.cs   |   5 +-
 .../MoveStaticMembersViewModelTest.vb         | 444 ++++++++++++
 8 files changed, 1128 insertions(+), 14 deletions(-)
 create mode 100644 src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
 create mode 100644 src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
 create mode 100644 src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb

diff --git a/src/Compilers/Test/Core/Traits/Traits.cs b/src/Compilers/Test/Core/Traits/Traits.cs
index 18553a1efba64..9c610bbc52e65 100644
--- a/src/Compilers/Test/Core/Traits/Traits.cs
+++ b/src/Compilers/Test/Core/Traits/Traits.cs
@@ -129,6 +129,7 @@ public static class Features
             public const string CodeActionsMergeConsecutiveIfStatements = "CodeActions.MergeConsecutiveIfStatements";
             public const string CodeActionsMergeNestedIfStatements = "CodeActions.MergeNestedIfStatements";
             public const string CodeActionsMoveDeclarationNearReference = "CodeActions.MoveDeclarationNearReference";
+            public const string CodeActionsMoveStaticMembers = "CodeActions.MoveStaticMembers";
             public const string CodeActionsMoveToNamespace = nameof(CodeActionsMoveToNamespace);
             public const string CodeActionsMoveToTopOfFile = "CodeActions.MoveToTopOfFile";
             public const string CodeActionsMoveType = "CodeActions.MoveType";
diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
new file mode 100644
index 0000000000000..9927a5a3c93ea
--- /dev/null
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -0,0 +1,636 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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.Collections.Generic;
+using System.Collections.Immutable;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis.CSharp.CodeRefactorings.MoveStaticMembers;
+using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeRefactorings;
+using Microsoft.CodeAnalysis.MoveStaticMembers;
+using Microsoft.CodeAnalysis.Test.Utilities;
+using Microsoft.CodeAnalysis.Test.Utilities.MoveStaticMembers;
+using Microsoft.CodeAnalysis.Test.Utilities.PullMemberUp;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.MoveStaticMembers
+{
+    public class CSharpMoveStaticMembersTests : AbstractCSharpCodeActionTest
+    {
+        protected override CodeRefactoringProvider CreateCodeRefactoringProvider(Workspace workspace, TestParameters parameters)
+        {
+            return new CSharpMoveStaticMembersCodeRefactoringProvider((IMoveStaticMembersOptionsService)parameters.fixProviderData);
+        }
+
+        protected override ImmutableArray<CodeAction> MassageActions(ImmutableArray<CodeAction> actions) => FlattenActions(actions);
+
+        private async Task TestNoRefactoringProvidedAsync(
+            string initialMarkup,
+            TestParameters parameters = default)
+        {
+            using var workspace = CreateWorkspaceFromOptions(initialMarkup, parameters);
+            var (actions, _) = await GetCodeActionsAsync(workspace, parameters).ConfigureAwait(false);
+            // no actions should be provided
+            Assert.Equal(0, actions.Length);
+        }
+
+        internal Task TestWithDialogAsync(
+            string initialMarkUp,
+            string expectedResult,
+            string destinationType,
+            ImmutableArray<string> selection,
+            string destinationName = "a.cs",
+            TestParameters parameters = default)
+        {
+            var service = new TestMoveStaticMembersService(destinationType, destinationName, selection.AsImmutable());
+
+            return TestInRegularAndScript1Async(
+                initialMarkUp,
+                expectedResult,
+                parameters.WithFixProviderData(service));
+        }
+
+        #region Perform Actions From Dialog
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveField()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Field = 1;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestWithDialogAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveProperty()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Property { get; set; }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestProperty");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestProperty { get; set; }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestWithDialogAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveEvent()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+using System;
+
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static event EventHandler Test[||]Event;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestEvent");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+using System;
+
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">using System;
+
+namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static event EventHandler TestEvent;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestWithDialogAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethod()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestWithDialogAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+        #endregion
+
+        #region Selections and caret position
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectInMethodParens()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestMethod([||])
+        {
+            return 0;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestWithDialogAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectWholeFieldDeclaration()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        [|public static int TestField = 1;|]
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestWithDialogAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectBeforeKeywordOfDeclaration()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        [||]public static int TestField = 1;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestWithDialogAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectInKeyWordOfDeclaration1()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        pub[||]lic static int TestField = 1;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestWithDialogAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectInKeyWordOfDeclaration2()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public st[||]atic int TestField = 1;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestWithDialogAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectInTypeIdentifierOfDeclaration_NoAction()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static i[||]nt TestField = 1;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectInFieldInitializerEquals_NoAction()
+        {
+            // The initializer isn't a member declaration
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestField =[||] 1;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectInFieldInitializerAfterSemicolon()
+        {
+            // However, a semicolon after the initializer is still considered a declaration
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestField = 1;[||]
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestWithDialogAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectMethodBody_NoAction()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestMethod()
+        {
+            retu[||]rn 0;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            await TestNoRefactoringProvidedAsync(initialMarkup);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectMethodBracket_NoAction()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestMethod()
+        [|{|]
+            return 0;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            await TestNoRefactoringProvidedAsync(initialMarkup);
+        }
+        #endregion
+    }
+}
diff --git a/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
new file mode 100644
index 0000000000000..32fc87d676c70
--- /dev/null
+++ b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
@@ -0,0 +1,35 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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.Collections.Immutable;
+using Microsoft.CodeAnalysis.MoveStaticMembers;
+
+namespace Microsoft.CodeAnalysis.Test.Utilities.MoveStaticMembers
+{
+    internal class TestMoveStaticMembersService : IMoveStaticMembersOptionsService
+    {
+        private readonly string _destinationType;
+
+        private readonly ImmutableArray<string> _selectedMembers;
+
+        private readonly string _filename;
+
+        public TestMoveStaticMembersService(string destinationType, string fileName, ImmutableArray<string> members)
+        {
+            _destinationType = destinationType;
+            _filename = fileName;
+            _selectedMembers = members;
+        }
+
+        public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol)
+        {
+            var selectedMembers = selectedType.GetMembers().WhereAsArray(symbol => _selectedMembers.Contains(symbol.Name));
+            // just return all the selected members
+            return new MoveStaticMembersOptions(
+                _filename,
+                string.Join(".", selectedType.ContainingNamespace.ToDisplayString(), _destinationType),
+                selectedMembers);
+        }
+    }
+}
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 54ec058f71703..6c75302193aa7 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -55,7 +55,7 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
                 return SpecializedCollections.EmptyEnumerable<CodeActionOperation>();
             }
 
-            // Find the original type
+            // Find the original doc root
             var syntaxFacts = _document.GetRequiredLanguageService<ISyntaxFactsService>();
             var root = await _document.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
             var fileBanner = syntaxFacts.GetFileBanner(root);
@@ -105,8 +105,8 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
             newType = destSemanticModel.GetDeclaredSymbol(destRoot.GetAnnotatedNodes(annotation).Single(), cancellationToken) as INamedTypeSymbol;
 
             var pullMembersUpOptions = PullMembersUpOptionsBuilder.BuildPullMembersUpOptions(newType, members);
-            var finalSolution = await MembersPuller.PullMembersUpAsync(sourceDoc, pullMembersUpOptions, cancellationToken).ConfigureAwait(false);
-            return new CodeActionOperation[] { new ApplyChangesOperation(finalSolution) };
+            var movedSolution = await MembersPuller.PullMembersUpAsync(sourceDoc, pullMembersUpOptions, cancellationToken).ConfigureAwait(false);
+            return new CodeActionOperation[] { new ApplyChangesOperation(movedSolution) };
         }
     }
 }
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
index 758675c1768f9..3f4b616a92e0a 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
@@ -49,24 +49,20 @@ public void OnDestinationUpdated()
         {
             // TODO change once we allow movement to existing types
             var isNewType = !_existingNames.Contains(DestinationName);
-            _isValidName = IsValidType(DestinationName);
+            _isValidName = isNewType && IsValidType(DestinationName);
 
-            if (isNewType && _isValidName)
+            if (_isValidName)
             {
                 Icon = KnownMonikers.StatusInformation;
                 Message = ServicesVSResources.A_new_type_will_be_created;
                 ShowMessage = true;
             }
-            else if (!_isValidName || !isNewType)
+            else
             {
                 Icon = KnownMonikers.StatusInvalid;
                 Message = ServicesVSResources.Invalid_type_name;
                 ShowMessage = true;
             }
-            else
-            {
-                ShowMessage = false;
-            }
         }
 
         private bool IsValidType(string typeName)
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index e2bc765cc7008..49741a2f0dad0 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -78,11 +78,10 @@ public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, I
 
             if (result.GetValueOrDefault())
             {
-                var typeName = viewModel.DestinationName;
                 return new MoveStaticMembersOptions(
                     // TODO: generate unique file name based off of existing folder documents
-                    typeName + (document.Project.Language == LanguageNames.CSharp ? ".cs" : ".vb"),
-                    typeName,
+                    viewModel.DestinationName + (document.Project.Language == LanguageNames.CSharp ? ".cs" : ".vb"),
+                    selectedType.ContainingNamespace.ToDisplayString() + "." + viewModel.DestinationName,
                     selectMembersViewModel.CheckedMembers.SelectAsArray(vm => vm.Symbol));
             }
 
diff --git a/src/VisualStudio/Core/Def/Implementation/PullMemberUp/SymbolDependentsBuilder.cs b/src/VisualStudio/Core/Def/Implementation/PullMemberUp/SymbolDependentsBuilder.cs
index 4f093297de31d..feee10f047b3f 100644
--- a/src/VisualStudio/Core/Def/Implementation/PullMemberUp/SymbolDependentsBuilder.cs
+++ b/src/VisualStudio/Core/Def/Implementation/PullMemberUp/SymbolDependentsBuilder.cs
@@ -10,6 +10,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Operations;
 
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.PullMemberUp
@@ -34,6 +35,7 @@ private class SymbolWalker : OperationWalker
         {
             private readonly ImmutableHashSet<ISymbol> _membersInType;
             private readonly Project _project;
+            private readonly ISymbolDeclarationService _declarationService;
             private readonly HashSet<ISymbol> _dependents;
             private readonly ISymbol _member;
             private readonly CancellationToken _cancellationToken;
@@ -45,6 +47,7 @@ public SymbolWalker(
                 CancellationToken cancellationToken)
             {
                 _project = project;
+                _declarationService = project.LanguageServices.GetRequiredService<ISymbolDeclarationService>();
                 _membersInType = membersInType.ToImmutableHashSet();
                 _dependents = new HashSet<ISymbol>();
                 _member = member;
@@ -53,7 +56,7 @@ public SymbolWalker(
 
             public async Task<ImmutableArray<ISymbol>> FindMemberDependentsAsync()
             {
-                var tasks = _member.DeclaringSyntaxReferences.Select(@ref => @ref.GetSyntaxAsync(_cancellationToken));
+                var tasks = _declarationService.GetDeclarations(_member).Select(@ref => @ref.GetSyntaxAsync(_cancellationToken));
                 var syntaxes = await Task.WhenAll(tasks).ConfigureAwait(false);
                 var compilation = await _project.GetCompilationAsync(_cancellationToken).ConfigureAwait(false);
                 foreach (var syntax in syntaxes)
diff --git a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
new file mode 100644
index 0000000000000..2e68e20062d36
--- /dev/null
+++ b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
@@ -0,0 +1,444 @@
+' Licensed to the .NET Foundation under one or more agreements.
+' The .NET Foundation licenses this file to you under the MIT license.
+' See the LICENSE file in the project root for more information.
+
+Imports System.Collections.Immutable
+Imports System.Threading
+Imports Microsoft.CodeAnalysis
+Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
+Imports Microsoft.CodeAnalysis.LanguageServices
+Imports Microsoft.CodeAnalysis.PullMemberUp
+Imports Microsoft.CodeAnalysis.Shared.Extensions
+Imports Microsoft.CodeAnalysis.Test.Utilities
+Imports Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
+Imports Microsoft.VisualStudio.LanguageServices.Implementation.PullMemberUp
+Imports Microsoft.VisualStudio.LanguageServices.Implementation.Utilities
+Imports Microsoft.VisualStudio.Utilities
+
+Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
+    <UseExportProvider>
+    Public Class MoveStaticMembersViewModelTest
+        Private Async Function GetViewModelAsync(xmlElement As XElement) As Task(Of MoveStaticMembersDialogViewModel)
+            Dim workspaceXml = xmlElement.Value
+            Using workspace = TestWorkspace.Create(workspaceXml)
+                Dim doc = workspace.Documents.ElementAt(0)
+                Dim workspaceDoc = workspace.CurrentSolution.GetDocument(doc.Id)
+                If Not doc.CursorPosition.HasValue Then
+                    Throw New ArgumentException("Missing caret location in document.")
+                End If
+
+                Dim tree = Await workspaceDoc.GetSyntaxTreeAsync().ConfigureAwait(False)
+                Dim syntaxFacts = workspaceDoc.Project.LanguageServices.GetService(Of ISyntaxFactsService)()
+                Dim token = Await tree.GetTouchingWordAsync(doc.CursorPosition.Value, syntaxFacts, CancellationToken.None).ConfigureAwait(False)
+                Dim memberSymbol = (Await workspaceDoc.GetRequiredSemanticModelAsync(CancellationToken.None)).GetDeclaredSymbol(token.Parent)
+                Dim existingNames = memberSymbol.ContainingNamespace.GetAllTypes(CancellationToken.None).Select(Function(type) type.Name).ToImmutableArray()
+                Dim membersInType = memberSymbol.ContainingType.GetMembers().WhereAsArray(Function(member) MemberAndDestinationValidator.IsMemberValid(member))
+                Dim membersViewModel = membersInType.SelectAsArray(
+                    Function(member) New SymbolViewModel(Of ISymbol)(member, glyphService:=Nothing) With {.IsChecked = member.Equals(memberSymbol)})
+                Dim memberToDependents = SymbolDependentsBuilder.FindMemberToDependentsMap(membersInType, workspaceDoc.Project, CancellationToken.None)
+                Dim memberSelectionViewModel = New StaticMemberSelectionViewModel(
+                    workspace.GetService(Of IUIThreadOperationExecutor),
+                    membersViewModel,
+                    memberToDependents)
+                Return New MoveStaticMembersDialogViewModel(
+                    memberSelectionViewModel,
+                    "TestDefaultType",
+                    existingNames,
+                    syntaxFacts)
+            End Using
+        End Function
+
+        Private Function FindMemberByName(name As String, memberArray As ImmutableArray(Of SymbolViewModel(Of ISymbol))) As SymbolViewModel(Of ISymbol)
+            Dim member = memberArray.FirstOrDefault(Function(memberViewModel) memberViewModel.Symbol.Name.Equals(name))
+            Assert.NotNull(member)
+            Return member
+        End Function
+
+        Private Sub SelectMember(name As String, viewModel As StaticMemberSelectionViewModel)
+            Dim member = FindMemberByName(name, viewModel.Members)
+            member.IsChecked = True
+            viewModel.Members.Replace(FindMemberByName(name, viewModel.Members), member)
+            Assert.True(FindMemberByName(name, viewModel.Members).IsChecked)
+        End Sub
+
+        Private Sub DeselectMember(name As String, viewModel As StaticMemberSelectionViewModel)
+            Dim member = FindMemberByName(name, viewModel.Members)
+            member.IsChecked = False
+            viewModel.Members.Replace(FindMemberByName(name, viewModel.Members), member)
+            Assert.False(FindMemberByName(name, viewModel.Members).IsChecked)
+        End Sub
+
+#Region "C#"
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function CSTestNameConflicts() As Task
+            Dim markUp = <Text><![CDATA[
+<Workspace>
+    <Project Language="C#" AssemblyName="CSAssembly1" CommonReferences="true">
+        <Document>
+            namespace TestNs
+            {
+                public class TestClass
+                {
+                    public static int Bar$$bar()
+                    {
+                        return 12345;
+                    }
+                }
+            }
+        </Document>
+        <Document>
+            public class NoNsClass
+            {
+            }
+        </Document>
+        <Document>
+            namespace TestNs
+            {
+                public interface ITestInterface
+                {
+                }
+            }
+        </Document>
+        <Document>
+            namespace TestNs 
+            {
+                public class ConflictingClassName
+                {
+                }
+            }
+        </Document>
+        <Document>
+            namespace TestNs2 
+            {
+                public class ConflictingClassName2
+                {
+                }
+            }
+        </Document>
+    </Project>
+    <Project Language="C#" AssemblyName="CSAssembly2" CommonReferences="true">
+        <Document>
+            namespace TestNs 
+            {
+                public class ConflictingClassName3
+                {
+                }
+            }
+        </Document>
+    </Project>
+</Workspace>]]></Text>
+            Dim viewModel = Await GetViewModelAsync(markUp)
+
+            Assert.Equal(viewModel.DestinationName, "TestDefaultType")
+
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
+            Assert.True(viewModel.CanSubmit)
+
+            viewModel.DestinationName = "ConflictingClassName"
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+
+            viewModel.DestinationName = "ValidName"
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            ' spaces are not allowed as types
+            viewModel.DestinationName = "asd "
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+
+            ' different project
+            viewModel.DestinationName = "ConflictingClassName3"
+            Assert.True(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            viewModel.DestinationName = "ITestInterface"
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+
+            viewModel.DestinationName = "NoNsClass"
+            Assert.True(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            ' different namespace
+            viewModel.DestinationName = "ConflictingClassName2"
+            Assert.True(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            viewModel.DestinationName = "TestClass"
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function CSTestMemberSelection() As Task
+            Dim markUp = <Text><![CDATA[
+<Workspace>
+    <Project Language="C#" AssemblyName="VBAssembly1" CommonReferences="true">
+        <Document>
+            namespace TestNs 
+            {
+                public class TestClass
+                {
+                    public static int Bar$$bar()
+                    {
+                        return 12345;
+                    }
+
+                    public static int TestField;
+
+                    public static int TestField2 = 0;
+
+                    public static void DoSomething()
+                    {
+                    }
+
+                    public static int TestProperty { get; set; }
+
+                    private static int _private = 0
+
+                    public static bool Dependent()
+                    {
+                        return Barbar() == 0;
+                    }
+                }
+            }
+        </Document>
+    </Project>
+</Workspace>]]></Text>
+            Dim viewModel = Await GetViewModelAsync(markUp)
+
+            Dim selectionVm = viewModel.MemberSelectionViewModel
+
+            Assert.True(FindMemberByName("Barbar", selectionVm.Members).IsChecked)
+            For Each member In selectionVm.Members
+                If member.Symbol.Name <> "Barbar" Then
+                    Assert.False(member.IsChecked)
+                End If
+            Next
+
+            SelectMember("TestField", selectionVm)
+            SelectMember("TestField2", selectionVm)
+            SelectMember("DoSomething", selectionVm)
+            SelectMember("TestProperty", selectionVm)
+            SelectMember("_private", selectionVm)
+            SelectMember("Dependent", selectionVm)
+
+            Assert.Equal(7, selectionVm.CheckedMembers.Length)
+            Assert.True(viewModel.CanSubmit)
+
+            DeselectMember("Barbar", selectionVm)
+            DeselectMember("TestField", selectionVm)
+            DeselectMember("TestField2", selectionVm)
+            DeselectMember("DoSomething", selectionVm)
+            DeselectMember("TestProperty", selectionVm)
+            DeselectMember("_private", selectionVm)
+            DeselectMember("Dependent", selectionVm)
+
+            Assert.True(selectionVm.CheckedMembers.IsEmpty)
+            Assert.False(viewModel.CanSubmit)
+
+            selectionVm.SelectAll()
+            Assert.Equal(7, selectionVm.CheckedMembers.Length)
+            Assert.True(viewModel.CanSubmit)
+
+            selectionVm.DeselectAll()
+            Assert.True(selectionVm.CheckedMembers.IsEmpty)
+            Assert.False(viewModel.CanSubmit)
+
+            SelectMember("Dependent", selectionVm)
+            selectionVm.SelectDependents()
+            Assert.True(FindMemberByName("Barbar", selectionVm.Members).IsChecked)
+            Assert.Equal(2, selectionVm.CheckedMembers.Length)
+            Assert.True(viewModel.CanSubmit)
+        End Function
+#End Region
+
+#Region "VB"
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function VBTestNameConflicts() As Task
+            Dim markUp = <Text><![CDATA[
+<Workspace>
+    <Project Language="Visual Basic" AssemblyName="VBAssembly1" CommonReferences="true">
+        <Document>
+            Namespace TestNs
+                Public Class TestClass
+                    Public Shared Function Bar$$bar() As Integer
+                        Return 12345;
+                    End Function
+                End Class
+            End Namespace
+        </Document>
+        <Document>
+            Public Class NoNsClass
+            End Class
+        </Document>
+        <Document>
+            Namespace TestNs
+                Public Interface ITestInterface
+                End Interface
+            End Namespace
+        </Document>
+        <Document>
+            Namespace TestNs
+                Public Class ConflictingClassName
+                End Class
+            End Namespace
+        </Document>
+        <Document>
+            Namespace TestNs2
+                Public Class ConflictingClassName2
+                End Class
+            End Namespace
+        </Document>
+    </Project>
+    <Project Language="C#" AssemblyName="CSAssembly2" CommonReferences="true">
+        <Document>
+            Namespace TestNs
+                Public Class ConflictingClassName3
+                End Class
+            End Namespace
+        </Document>
+    </Project>
+</Workspace>]]></Text>
+            Dim viewModel = Await GetViewModelAsync(markUp)
+
+            Assert.Equal(viewModel.DestinationName, "TestDefaultType")
+
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
+            Assert.True(viewModel.CanSubmit)
+
+            viewModel.DestinationName = "ConflictingClassName"
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+
+            viewModel.DestinationName = "asd "
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+
+            viewModel.DestinationName = "ValidName"
+            Assert.True(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            viewModel.DestinationName = "ConflictingClassName3"
+            Assert.True(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            viewModel.DestinationName = "ITestInterface"
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+
+            viewModel.DestinationName = "NoNsClass"
+            Assert.True(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            viewModel.DestinationName = "ConflictingClassName2"
+            Assert.True(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            viewModel.DestinationName = "TestClass"
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function VBTestMemberSelection() As Task
+            Dim markUp = <Text><![CDATA[
+<Workspace>
+    <Project Language="Visual Basic" AssemblyName="VBAssembly1" CommonReferences="true">
+        <Document>
+            Namespace TestNs
+                Public Class TestClass
+                    Public Shared Function Bar$$bar() As Integer
+                        Return 12345
+                    End Function
+
+                    Public Shared TestField As Integer
+
+                    Public Shared TestField2 As Integer = 0
+
+                    Public Shared Sub DoSomething()
+                    End Sub
+
+                    Public Shared Property TestProperty As Integer
+
+                    Private Shared _private As Integer = 0
+
+                    Public Shared Function Dependent() As Boolean
+                        Return Barbar() = 0
+                    End Function
+                End Class
+            End Namespace
+        </Document>
+    </Project>
+</Workspace>]]></Text>
+            Dim viewModel = Await GetViewModelAsync(markUp)
+
+            Dim selectionVm = viewModel.MemberSelectionViewModel
+
+            Assert.True(FindMemberByName("Barbar", selectionVm.Members).IsChecked)
+            For Each member In selectionVm.Members
+                If member.Symbol.Name <> "Barbar" Then
+                    Assert.False(member.IsChecked)
+                End If
+            Next
+
+            SelectMember("TestField", selectionVm)
+            SelectMember("TestField2", selectionVm)
+            SelectMember("DoSomething", selectionVm)
+            SelectMember("TestProperty", selectionVm)
+            SelectMember("_private", selectionVm)
+            SelectMember("Dependent", selectionVm)
+
+            Assert.Equal(7, selectionVm.CheckedMembers.Length)
+            Assert.True(viewModel.CanSubmit)
+
+            DeselectMember("Barbar", selectionVm)
+            DeselectMember("TestField", selectionVm)
+            DeselectMember("TestField2", selectionVm)
+            DeselectMember("DoSomething", selectionVm)
+            DeselectMember("TestProperty", selectionVm)
+            DeselectMember("_private", selectionVm)
+            DeselectMember("Dependent", selectionVm)
+
+            Assert.True(selectionVm.CheckedMembers.IsEmpty)
+            Assert.False(viewModel.CanSubmit)
+
+            selectionVm.SelectAll()
+            Assert.Equal(7, selectionVm.CheckedMembers.Length)
+            Assert.True(viewModel.CanSubmit)
+
+            selectionVm.DeselectAll()
+            Assert.True(selectionVm.CheckedMembers.IsEmpty)
+            Assert.False(viewModel.CanSubmit)
+
+            SelectMember("Dependent", selectionVm)
+            selectionVm.SelectDependents()
+            Assert.True(FindMemberByName("Barbar", selectionVm.Members).IsChecked)
+            Assert.Equal(2, selectionVm.CheckedMembers.Length)
+            Assert.True(viewModel.CanSubmit)
+        End Function
+#End Region
+    End Class
+End Namespace

From 4f6c03fef41ccc81690e7938b509b8e2e10238f7 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Wed, 4 Aug 2021 17:18:03 -0700
Subject: [PATCH 15/64] Finished Writing impl tests for C# and VB. VB tests are
 currently failing due to the way AddMembers reuses syntax. Fixed a few bugs

---
 .../CSharpMoveStaticMembersTests.cs           |  839 +++++++++++-
 .../TestMoveStaticMembersService.cs           |    4 +-
 .../VisualBasicMoveStaticMembersTests.vb      | 1145 +++++++++++++++++
 ...rpMoveStaticMembersRefactoringProvider.cs} |    6 +-
 ...sicMoveStaticMembersRefactoringProvider.vb |   10 +-
 .../CodeRefactorings/NodeSelectionHelpers.vb  |   11 +-
 ...alStudioMoveStaticMembersOptionsService.cs |    2 +-
 7 files changed, 1989 insertions(+), 28 deletions(-)
 create mode 100644 src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
 rename src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/{CSharpMoveStaticMembersCodeRefactoringProvider.cs => CSharpMoveStaticMembersRefactoringProvider.cs} (79%)

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index 9927a5a3c93ea..db51b2348a641 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -2,7 +2,6 @@
 // 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.Collections.Generic;
 using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeActions;
@@ -12,7 +11,6 @@
 using Microsoft.CodeAnalysis.MoveStaticMembers;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Microsoft.CodeAnalysis.Test.Utilities.MoveStaticMembers;
-using Microsoft.CodeAnalysis.Test.Utilities.PullMemberUp;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.MoveStaticMembers
@@ -21,7 +19,7 @@ public class CSharpMoveStaticMembersTests : AbstractCSharpCodeActionTest
     {
         protected override CodeRefactoringProvider CreateCodeRefactoringProvider(Workspace workspace, TestParameters parameters)
         {
-            return new CSharpMoveStaticMembersCodeRefactoringProvider((IMoveStaticMembersOptionsService)parameters.fixProviderData);
+            return new CSharpMoveStaticMembersRefactoringProvider((IMoveStaticMembersOptionsService)parameters.fixProviderData);
         }
 
         protected override ImmutableArray<CodeAction> MassageActions(ImmutableArray<CodeAction> actions) => FlattenActions(actions);
@@ -36,7 +34,7 @@ private async Task TestNoRefactoringProvidedAsync(
             Assert.Equal(0, actions.Length);
         }
 
-        internal Task TestWithDialogAsync(
+        internal Task TestMovementAsync(
             string initialMarkUp,
             string expectedResult,
             string destinationType,
@@ -52,7 +50,7 @@ internal Task TestWithDialogAsync(
                 parameters.WithFixProviderData(service));
         }
 
-        #region Perform Actions From Dialog
+        #region Perform Actions From Options
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestMoveField()
         {
@@ -93,7 +91,7 @@ static class Class1Helpers
 }</Document>
     </Project>
 </Workspace>";
-            await TestWithDialogAsync(initialMarkup,
+            await TestMovementAsync(initialMarkup,
                 expectedResult,
                 selectedDestinationName,
                 selectedMembers,
@@ -140,7 +138,7 @@ static class Class1Helpers
 }</Document>
     </Project>
 </Workspace>";
-            await TestWithDialogAsync(initialMarkup,
+            await TestMovementAsync(initialMarkup,
                 expectedResult,
                 selectedDestinationName,
                 selectedMembers,
@@ -193,7 +191,7 @@ static class Class1Helpers
 }</Document>
     </Project>
 </Workspace>";
-            await TestWithDialogAsync(initialMarkup,
+            await TestMovementAsync(initialMarkup,
                 expectedResult,
                 selectedDestinationName,
                 selectedMembers,
@@ -246,7 +244,719 @@ public static int TestMethod()
 }</Document>
     </Project>
 </Workspace>";
-            await TestWithDialogAsync(initialMarkup,
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveConstField()
+        {
+            // const is static so we should work here
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public const int Test[||]Field = 1;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public const int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMultipleMethods()
+        {
+            // Bug where PullMembersUp doesn't apply formatting annotation
+            // When the destination ends up with more than one member:
+            // https://github.com/dotnet/roslyn/issues/54847
+            // so we keep the weird formatting for now
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]MethodInt()
+        {
+            return 0;
+        }
+
+        public static bool TestMethodBool()
+        {
+            return false;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethodInt", "TestMethodBool");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+
+        public static bool TestMethodBool()
+        {
+            return false;
+        }
+        public static int TestMethodInt()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveSingleMethodFromMultiple()
+        {
+            // move the method that this was not triggered on
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]MethodInt()
+        {
+            return 0;
+        }
+
+        public static bool TestMethodBool()
+        {
+            return false;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethodBool");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestMethodInt()
+        {
+            return 0;
+        }
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+
+        public static bool TestMethodBool()
+        {
+            return false;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveOneOfEach()
+        {
+            // Bug where PullMembersUp doesn't apply formatting annotation
+            // When the destination ends up with more than one member:
+            // https://github.com/dotnet/roslyn/issues/54847
+            // so we keep the weird formatting for now
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+using System;
+
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+
+        public static bool TestProperty { get; set; }
+
+        public static int TestField;
+
+        public static event EventHandler TestEvent;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create(
+                "TestMethod",
+                "TestField",
+                "TestProperty",
+                "TestEvent");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+using System;
+
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">using System;
+
+namespace TestNs1
+{
+    static class Class1Helpers
+    {
+
+        public static int TestField;
+
+        public static bool TestProperty { get; set; }
+
+        public static event EventHandler TestEvent;
+
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestInNestedClass()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public class NestedClass1
+        {
+            public static int Test[||]Field = 1;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public class NestedClass1
+        {
+        }
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestInNestedNamespace()
+        {
+            // collapse the namespaces
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    namespace InnerNs
+    {
+        public class Class1
+        {
+            public static int Test[||]Field = 1;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    namespace InnerNs
+    {
+        public class Class1
+        {
+        }
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1.InnerNs
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveFieldNoNamespace()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+public class Class1
+{
+    public static int Test[||]Field = 1;
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+public class Class1
+{
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">static class Class1Helpers
+{
+    public static int TestField = 1;
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveFieldNewNamespace()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+public class Class1
+{
+    public static int Test[||]Field = 1;
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "NewNs.Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+public class Class1
+{
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace NewNs
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodWithNamespacedSelectedDestination()
+        {
+            // in the case that we have an extra namespace in the destination name
+            // we append it on to the old type's namespace
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "ExtraNs.Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1.ExtraNs
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodFileScopedNamespace()
+        {
+            // We still keep normal namespacing rules in the new file regardless
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1;
+
+public class Class1
+{
+    public static int Test[||]Method()
+    {
+        return 0;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1;
+
+public class Class1
+{
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodWithFolders()
+        {
+            // We should just put the new file in the same folder
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document Folders=""Folder1"" FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document Folders=""Folder1"" FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document Folders=""Folder1"" FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveGenericMethod()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static T Test[||]Method&lt;T&gt;(T item)
+        {
+            return item;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static T TestMethod&lt;T&gt;(T item)
+        {
+            return item;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveGenericClassWithMethod()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1&lt;T&gt;
+    {
+        public static T Test[||]Method(T item)
+        {
+            return item;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1&lt;T&gt;
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers&lt;T&gt;
+    {
+        public static T Test[||]Method(T item)
+        {
+            return item;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
                 expectedResult,
                 selectedDestinationName,
                 selectedMembers,
@@ -302,7 +1012,7 @@ public static int TestMethod()
 }</Document>
     </Project>
 </Workspace>";
-            await TestWithDialogAsync(initialMarkup,
+            await TestMovementAsync(initialMarkup,
                 expectedResult,
                 selectedDestinationName,
                 selectedMembers,
@@ -349,7 +1059,7 @@ static class Class1Helpers
 }</Document>
     </Project>
 </Workspace>";
-            await TestWithDialogAsync(initialMarkup,
+            await TestMovementAsync(initialMarkup,
                 expectedResult,
                 selectedDestinationName,
                 selectedMembers,
@@ -396,7 +1106,7 @@ static class Class1Helpers
 }</Document>
     </Project>
 </Workspace>";
-            await TestWithDialogAsync(initialMarkup,
+            await TestMovementAsync(initialMarkup,
                 expectedResult,
                 selectedDestinationName,
                 selectedMembers,
@@ -443,7 +1153,7 @@ static class Class1Helpers
 }</Document>
     </Project>
 </Workspace>";
-            await TestWithDialogAsync(initialMarkup,
+            await TestMovementAsync(initialMarkup,
                 expectedResult,
                 selectedDestinationName,
                 selectedMembers,
@@ -490,7 +1200,60 @@ static class Class1Helpers
 }</Document>
     </Project>
 </Workspace>";
-            await TestWithDialogAsync(initialMarkup,
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectInTypeIdentifierMethodDeclaration()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static i[||]nt TestMethod()
+        {
+            return 0;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
                 expectedResult,
                 selectedDestinationName,
                 selectedMembers,
@@ -498,7 +1261,7 @@ await TestWithDialogAsync(initialMarkup,
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
-        public async Task TestSelectInTypeIdentifierOfDeclaration_NoAction()
+        public async Task TestSelectInTypeIdentifierOfFieldDeclaration_NoAction()
         {
             var initialMarkup = @"
 <Workspace>
@@ -579,7 +1342,7 @@ static class Class1Helpers
 }</Document>
     </Project>
 </Workspace>";
-            await TestWithDialogAsync(initialMarkup,
+            await TestMovementAsync(initialMarkup,
                 expectedResult,
                 selectedDestinationName,
                 selectedMembers,
@@ -606,7 +1369,7 @@ public static int TestMethod()
         </Document>
     </Project>
 </Workspace>";
-            await TestNoRefactoringProvidedAsync(initialMarkup);
+            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -629,7 +1392,47 @@ public static int TestMethod()
         </Document>
     </Project>
 </Workspace>";
-            await TestNoRefactoringProvidedAsync(initialMarkup);
+            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectPropertyBody_NoAction()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestProperty { get; [||]set; }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectNonStaticProperty_NoAction()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public int Test[||]Property { get; set; }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
         }
         #endregion
     }
diff --git a/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
index 32fc87d676c70..2e3f4b1467d53 100644
--- a/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
+++ b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
@@ -25,10 +25,12 @@ public TestMoveStaticMembersService(string destinationType, string fileName, Imm
         public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol)
         {
             var selectedMembers = selectedType.GetMembers().WhereAsArray(symbol => _selectedMembers.Contains(symbol.Name));
+            var namespaceDisplay = selectedType.ContainingNamespace.IsGlobalNamespace ?
+                string.Empty : selectedType.ContainingNamespace.ToDisplayString();
             // just return all the selected members
             return new MoveStaticMembersOptions(
                 _filename,
-                string.Join(".", selectedType.ContainingNamespace.ToDisplayString(), _destinationType),
+                string.Join(".", namespaceDisplay, _destinationType),
                 selectedMembers);
         }
     }
diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
new file mode 100644
index 0000000000000..d87bc5e7f367b
--- /dev/null
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -0,0 +1,1145 @@
+' Licensed to the .NET Foundation under one or more agreements.
+' The .NET Foundation licenses this file to you under the MIT license.
+' See the LICENSE file in the project root for more information.
+
+Imports System.Collections.Immutable
+Imports Microsoft.CodeAnalysis.CodeActions
+Imports Microsoft.CodeAnalysis.CodeRefactorings
+Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings
+Imports Microsoft.CodeAnalysis.MoveStaticMembers
+Imports Microsoft.CodeAnalysis.Test.Utilities.MoveStaticMembers
+Imports Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings.MoveStaticMembers
+
+Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.MoveStaticMembers
+    Public Class VisualBasicMoveStaticMembersTests
+        Inherits AbstractVisualBasicCodeActionTest
+
+        Protected Overrides Function CreateCodeRefactoringProvider(workspace As Workspace, parameters As TestParameters) As CodeRefactoringProvider
+            Return New VisualBasicMoveStaticMembersRefactoringProvider(DirectCast(parameters.fixProviderData, IMoveStaticMembersOptionsService))
+        End Function
+
+        Protected Overrides Function MassageActions(actions As ImmutableArray(Of CodeAction)) As ImmutableArray(Of CodeAction)
+            Return FlattenActions(actions)
+        End Function
+
+        Private Async Function TestNoRefactoringProvidedAsync(initialMarkup As String) As Task
+            Dim parameters = New TestParameters()
+            Dim workspace = CreateWorkspaceFromOptions(initialMarkup, parameters)
+            Dim tuple = Await GetCodeActionsAsync(workspace, parameters).ConfigureAwait(False)
+            Dim actions = tuple.Item1
+            ' No actions should be provided
+            Assert.Equal(0, actions.Length)
+        End Function
+
+        Private Function TestMovementAsync(
+            initialMarkup As String,
+            expectedResult As String,
+            destinationType As String,
+            selection As ImmutableArray(Of String),
+            Optional destinationName As String = "a.vb",
+            Optional parameters As TestParameters = Nothing) As Task
+            If IsNothing(parameters) Then
+                parameters = New TestParameters()
+            End If
+
+            Dim service = New TestMoveStaticMembersService(destinationType, destinationName, selection.AsImmutable())
+            Return TestInRegularAndScript1Async(initialMarkup, expectedResult, parameters.WithFixProviderData(service))
+        End Function
+
+#Region "Perform Actions From Options"
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveField() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Test[||]Field As Integer = 0
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveProperty() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Property Test[||]Property As Integer
+            Get
+                Return 0
+            End Get
+        End Property
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestProperty")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Property TestProperty As Integer
+            Get
+                Return 0
+            End Get
+        End Property
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveEvent() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Event Test[||]Event As EventHandler
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestEvent")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Event TestEvent As EventHandler
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunction() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveSub() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Sub Test[||]Sub()
+        End Sub
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Sub TestSub()
+        End Sub
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveConst() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Const Test[||]Const As Integer = 0
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestConst")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Const TestConst As Integer = 0
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestInNestedClass() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Class InnerClass
+            Public Shared Function Test[||]Func() As Integer
+                Return 0
+            End Function
+        End Class
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Class InnerClass
+        End Class
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestInNestedNamespace() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Namespace InnerNs
+        Public Class Class1
+            Public Shared Function Tes[||]tFunc() As Integer
+                Return 0
+            End Function
+        End Class
+    End Namespace
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Namespace InnerNs
+        Public Class Class1
+        End Class
+    End Namespace
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs.InnerNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFieldNoNamespace() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Public Class Class1
+    Public Shared Test[||]Field As Integer = 0
+End Class
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Public Class Class1
+End Class
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Class Class1Helpers
+    Public Shared TestField As Integer = 0
+End Class
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFieldNewNamespace() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Public Class Class1
+    Public Shared Test[||]Field As Integer = 0
+End Class
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "TestNs.Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Public Class Class1
+End Class
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFieldAddNamespace() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Test[||]Field As Integer = 0
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "InnerNs.Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs.InnerNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveGenericFunction() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func(Of T)(item As T) As T
+            Return item
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc(Of T)(item As T) As T
+            Return item
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionWithGenericClass() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1(Of T)
+        Public Shared Function Test[||]Func(item As T) As T
+            Return item
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1(Of T)
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers(Of T)
+        Public Shared Function TestFunc(item As T) As T
+            Return item
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionWithFolders() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document Folders=""Folder1"" FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document Folders=""Folder1"" FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document Folders=""Folder1"" FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveMultipleFunctions() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func1() As Integer
+            Return 0
+        End Function
+
+        Public Shared Function TestFunc2() As Boolean
+            Return False
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc1", "TestFunc2")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc1() As Integer
+            Return 0
+        End Function
+
+        Public Shared Function TestFunc2() As Boolean
+            Return False
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveOneOfMultipleFuncs() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func1() As Integer
+            Return 0
+        End Function
+
+        Public Shared Function TestFunc2() As Boolean
+            Return False
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc2")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function TestFunc1() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+
+        Public Shared Function TestFunc2() As Boolean
+            Return False
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveOneOfEach() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Test[||]Field As Integer = 0
+
+        Public Shared Property TestProperty As Integer
+            Get
+                Return 0
+            End Get
+        End Property
+
+        Public Shared Event TestEvent As EventHandler
+
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+
+        Public Shared Sub TestSub()
+        End Sub
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create(
+                "TestField",
+                "TestProperty",
+                "TestFunc",
+                "TestEvent",
+                "TestSub")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+
+        Public Shared Property TestProperty As Integer
+            Get
+                Return 0
+            End Get
+        End Property
+
+        Public Shared Event TestEvent As EventHandler
+
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+
+        Public Shared Sub TestSub()
+        End Sub
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+#End Region
+#Region "SelectionTests"
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectBeforeDeclarationKeyword() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        [||]Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectWholeFieldDeclaration() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        [|Public Shared TestField As Integer = 0|]
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInFieldInitializerEquals_NoAction() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared TestField As Integer =[||] 0
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInDeclarationKeyword1() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Pub[||]lic Shared TestField As Integer = 0
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInDeclarationKeyword2() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shar[||]ed TestField As Integer = 0
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInMethodParens() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function TestFunc([||]) As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInTypeIdentifierMethodDeclaration() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function TestFunc() As Inte[||]ger
+            Return 0
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInFieldTypeIdentifier_NoAction() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared TestField As Int[||]eger = 0
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInMethodBody_NoAction() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function TestFunc() As Integer
+            Retu[||]rn 0
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInMethodClose_NoAction() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Func[||]tion
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectNonSharedProperty_NoAction() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Property Test[||]Property As Integer
+            Get
+                Return 0
+            End Get
+        End Property
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectPropertyGetter_NoAction() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Property TestProperty As Integer
+            Get[||]
+                Return 0
+            End Get
+        End Property
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+        End Function
+#End Region
+    End Class
+End Namespace
diff --git a/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersCodeRefactoringProvider.cs b/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersRefactoringProvider.cs
similarity index 79%
rename from src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersCodeRefactoringProvider.cs
rename to src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersRefactoringProvider.cs
index 586ab1095b00a..40d3c13b4732c 100644
--- a/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersCodeRefactoringProvider.cs
+++ b/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersRefactoringProvider.cs
@@ -13,19 +13,19 @@
 namespace Microsoft.CodeAnalysis.CSharp.CodeRefactorings.MoveStaticMembers
 {
     [ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = PredefinedCodeRefactoringProviderNames.MoveStaticMembers), Shared]
-    internal class CSharpMoveStaticMembersCodeRefactoringProvider : AbstractMoveStaticMembersRefactoringProvider
+    internal class CSharpMoveStaticMembersRefactoringProvider : AbstractMoveStaticMembersRefactoringProvider
     {
         /// <summary>
         /// Test purpose only.
         /// </summary>
         [SuppressMessage("RoslynDiagnosticsReliability", "RS0034:Exported parts should have [ImportingConstructor]", Justification = "Used incorrectly by tests")]
-        public CSharpMoveStaticMembersCodeRefactoringProvider(IMoveStaticMembersOptionsService? service) : base(service)
+        public CSharpMoveStaticMembersRefactoringProvider(IMoveStaticMembersOptionsService? service) : base(service)
         {
         }
 
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-        public CSharpMoveStaticMembersCodeRefactoringProvider() : this(service: null)
+        public CSharpMoveStaticMembersRefactoringProvider() : this(service: null)
         {
         }
 
diff --git a/src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb b/src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb
index 1813a0b6ad584..dfce7857f0bdf 100644
--- a/src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb
+++ b/src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb
@@ -5,6 +5,7 @@
 Imports System.Composition
 Imports System.Diagnostics.CodeAnalysis
 Imports Microsoft.CodeAnalysis.CodeRefactorings
+Imports Microsoft.CodeAnalysis.Host.Mef
 Imports Microsoft.CodeAnalysis.MoveStaticMembers
 
 Namespace Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings.MoveStaticMembers
@@ -12,10 +13,15 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings.MoveStaticMembers
     Friend Class VisualBasicMoveStaticMembersRefactoringProvider
         Inherits AbstractMoveStaticMembersRefactoringProvider
 
-        <SuppressMessage("RoslynDiagnosticsReliability", "RS0033:Importing constructor should be [Obsolete]", Justification:="Used in test code: https://github.com/dotnet/roslyn/issues/42814")>
         <ImportingConstructor>
+        <Obsolete(MefConstruction.ImportingConstructorMessage, True)>
         Public Sub New()
-            MyBase.New(Nothing)
+            Me.New(Nothing)
+        End Sub
+
+        <SuppressMessage("RoslynDiagnosticsReliability", "RS0034:Exported parts should have [ImportingConstructor]", Justification:="Used incorrectly by tests")>
+        Public Sub New(service As IMoveStaticMembersOptionsService)
+            MyBase.New(service)
         End Sub
 
         Protected Overrides Async Function GetSelectedNodeAsync(context As CodeRefactoringContext) As Task(Of SyntaxNode)
diff --git a/src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb b/src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb
index 02946380cb198..c0f814988ce61 100644
--- a/src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb
+++ b/src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb
@@ -11,10 +11,15 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings
             Dim methodMember = Await context.TryGetRelevantNodeAsync(Of MethodBaseSyntax)().ConfigureAwait(False)
             If methodMember IsNot Nothing Then
                 Return methodMember
-            Else
-                ' Gets field members, which are not methods
-                Return Await context.TryGetRelevantNodeAsync(Of FieldDeclarationSyntax).ConfigureAwait(False)
             End If
+            ' Gets field variable declarations (with not including the keywords), which are not methods
+            Dim fieldDeclaration = Await context.TryGetRelevantNodeAsync(Of FieldDeclarationSyntax).ConfigureAwait(False)
+            If fieldDeclaration IsNot Nothing Then
+                Return fieldDeclaration
+            End If
+            ' Gets the identifier + type of the field itself, since it is nested in the variable declaration
+            ' And so the token's parent is not a variable declaration
+            Return Await context.TryGetRelevantNodeAsync(Of ModifiedIdentifierSyntax).ConfigureAwait(False)
         End Function
     End Module
 End Namespace
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index 49741a2f0dad0..6e5e2a9e8d5bf 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -81,7 +81,7 @@ public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, I
                 return new MoveStaticMembersOptions(
                     // TODO: generate unique file name based off of existing folder documents
                     viewModel.DestinationName + (document.Project.Language == LanguageNames.CSharp ? ".cs" : ".vb"),
-                    selectedType.ContainingNamespace.ToDisplayString() + "." + viewModel.DestinationName,
+                    string.Join(".", containingNamespaceDisplay, viewModel.DestinationName),
                     selectMembersViewModel.CheckedMembers.SelectAsArray(vm => vm.Symbol));
             }
 

From dc1edd49a5e09cbeb8bf354941630ecea6db2563 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Thu, 5 Aug 2021 11:10:17 -0700
Subject: [PATCH 16/64] Fixed resources and removed nullable disable annotation

---
 .../MoveStaticMembers/MoveStaticMembersDialog.xaml.cs           | 2 --
 src/VisualStudio/Core/Def/ServicesVSResources.resx              | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs
index 933ab7a049ac3..bbe06370f070c 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.resx b/src/VisualStudio/Core/Def/ServicesVSResources.resx
index 10eae15028a2c..3fb3a87122997 100644
--- a/src/VisualStudio/Core/Def/ServicesVSResources.resx
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.resx
@@ -1758,6 +1758,7 @@ Additional information: {1}</value>
   </data>
   <data name="Move_static_members_to_another_type_colon" xml:space="preserve">
     <value>Move Static Members to Another Type:</value>
+  </data>
   <data name="Select_an_appropriate_symbol_to_start_value_tracking" xml:space="preserve">
     <value>Select an appropriate symbol to start value tracking</value>
   </data>

From 08ca13ccbf1bb6273219fba1336ed47657a8b395 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Thu, 5 Aug 2021 11:28:44 -0700
Subject: [PATCH 17/64] Adress small feedback points

---
 .../MoveStaticMembers/TestMoveStaticMembersService.cs        | 5 +++--
 .../Portable/CodeRefactorings/NodeSelectionHelpers.vb        | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
index 2e3f4b1467d53..69cd955a824ec 100644
--- a/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
+++ b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
@@ -25,8 +25,9 @@ public TestMoveStaticMembersService(string destinationType, string fileName, Imm
         public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol)
         {
             var selectedMembers = selectedType.GetMembers().WhereAsArray(symbol => _selectedMembers.Contains(symbol.Name));
-            var namespaceDisplay = selectedType.ContainingNamespace.IsGlobalNamespace ?
-                string.Empty : selectedType.ContainingNamespace.ToDisplayString();
+            var namespaceDisplay = selectedType.ContainingNamespace.IsGlobalNamespace
+                ? string.Empty
+                : selectedType.ContainingNamespace.ToDisplayString();
             // just return all the selected members
             return new MoveStaticMembersOptions(
                 _filename,
diff --git a/src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb b/src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb
index c0f814988ce61..e82b062351c20 100644
--- a/src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb
+++ b/src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb
@@ -12,12 +12,12 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings
             If methodMember IsNot Nothing Then
                 Return methodMember
             End If
-            ' Gets field variable declarations (with not including the keywords), which are not methods
+            ' Gets field variable declarations (not including the keywords like Public/Shared, etc), which are not methods
             Dim fieldDeclaration = Await context.TryGetRelevantNodeAsync(Of FieldDeclarationSyntax).ConfigureAwait(False)
             If fieldDeclaration IsNot Nothing Then
                 Return fieldDeclaration
             End If
-            ' Gets the identifier + type of the field itself, since it is nested in the variable declaration
+            ' Gets the identifier + type of the field itself (ex. TestField As Integer), since it is nested in the variable declaration
             ' And so the token's parent is not a variable declaration
             Return Await context.TryGetRelevantNodeAsync(Of ModifiedIdentifierSyntax).ConfigureAwait(False)
         End Function

From 40dedaf24d950e09e0ae0a4911f12800300639aa Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Thu, 5 Aug 2021 14:48:49 -0700
Subject: [PATCH 18/64] Small test fix. Works with generator changes (sepearate
 PR)

---
 .../VisualBasicMoveStaticMembersTests.vb      | 66 +++++++++++++++++--
 1 file changed, 62 insertions(+), 4 deletions(-)

diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index d87bc5e7f367b..55d3083fdc856 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -169,6 +169,64 @@ End Namespace
             Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
         End Function
 
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveComplexEvent() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Custom Event Cl[||]ick As EventHandler
+            AddHandler(ByVal value As EventHandler)
+                Events.AddHandler(""ClickEvent"", value)
+            End AddHandler
+            RemoveHandler(ByVal value As EventHandler)
+                Events.RemoveHandler(""ClickEvent"", value)
+            End RemoveHandler
+            RaiseEvent(ByVal sender As Object, ByVal e As EventArgs)
+                CType(Events(""ClickEvent""), EventHandler).Invoke(sender, e)
+            End RaiseEvent
+        End Event
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("Click")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Custom Event Click As EventHandler
+            AddHandler(ByVal value As EventHandler)
+                Events.AddHandler(""ClickEvent"", value)
+            End AddHandler
+            RemoveHandler(ByVal value As EventHandler)
+                Events.RemoveHandler(""ClickEvent"", value)
+            End RemoveHandler
+            RaiseEvent(ByVal sender As Object, ByVal e As EventArgs)
+                CType(Events(""ClickEvent""), EventHandler).Invoke(sender, e)
+            End RaiseEvent
+        End Event
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveFunction() As Task
             Dim initialMarkup = "
@@ -229,7 +287,7 @@ End Namespace
 "
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
-            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim selection = ImmutableArray.Create("TestSub")
             Dim expectedText = "
 <Workspace>
     <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
@@ -770,12 +828,12 @@ End Namespace
 
         Public Shared Event TestEvent As EventHandler
 
+        Public Shared Sub TestSub()
+        End Sub
+
         Public Shared Function TestFunc() As Integer
             Return 0
         End Function
-
-        Public Shared Sub TestSub()
-        End Sub
     End Class
 End Namespace
 </Document>

From 10c0ec4417a40320acd662bfb5b022d4aaa71d98 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Mon, 9 Aug 2021 10:28:27 -0700
Subject: [PATCH 19/64] WIP untested, refactoring references to moved members

---
 .../MoveStaticMembersWithDialogCodeAction.cs  | 101 +++++++++++++++++-
 1 file changed, 98 insertions(+), 3 deletions(-)

diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 6c75302193aa7..64c72f0c7fc75 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -2,14 +2,18 @@
 // 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;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.AddImports;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeGeneration;
 using Microsoft.CodeAnalysis.CodeRefactorings.PullMemberUp;
+using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.FindSymbols;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Shared.Utilities;
@@ -75,7 +79,7 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
             var newType = CodeGenerationSymbolFactory.CreateNamedTypeSymbol(
                 ImmutableArray.Create<AttributeData>(),
                 Accessibility.NotApplicable,
-                Editing.DeclarationModifiers.Static,
+                DeclarationModifiers.Static,
                 TypeKind.Class,
                 moveOptions.TypeName,
                 typeParameters: typeParameters);
@@ -90,8 +94,12 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
                 fileBanner,
                 cancellationToken).ConfigureAwait(false);
 
+            var memberReferenceLocations = await FindMemberReferencesAsync(moveOptions.SelectedMembers, newDoc.Project.Solution, cancellationToken).ConfigureAwait(false);
+            var locationsToDoc = memberReferenceLocations.ToLookup(loc => loc.location.Document.Id);
+            var reReferencedSolution = await RefactorReferencesAsync(locationsToDoc, newDoc.Project.Solution, newType, cancellationToken).ConfigureAwait(false);
+
             // Get back symbols using annotations
-            sourceDoc = newDoc.Project.Solution.GetRequiredDocument(sourceDoc.Id);
+            sourceDoc = reReferencedSolution.GetRequiredDocument(sourceDoc.Id);
             root = await sourceDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
             var semanticModel = await sourceDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
             var members = memberNodes
@@ -100,13 +108,100 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
                 .SelectAsArray(node => (semanticModel.GetDeclaredSymbol(node!, cancellationToken), false));
 
             // get back type declaration in the newly created file
+            newDoc = reReferencedSolution.GetRequiredDocument(newDoc.Id);
             var destRoot = await newDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
             var destSemanticModel = await newDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
-            newType = destSemanticModel.GetDeclaredSymbol(destRoot.GetAnnotatedNodes(annotation).Single(), cancellationToken) as INamedTypeSymbol;
+            newType = destSemanticModel.GetRequiredDeclaredSymbol(destRoot.GetAnnotatedNodes(annotation).Single(), cancellationToken) as INamedTypeSymbol;
 
             var pullMembersUpOptions = PullMembersUpOptionsBuilder.BuildPullMembersUpOptions(newType, members);
             var movedSolution = await MembersPuller.PullMembersUpAsync(sourceDoc, pullMembersUpOptions, cancellationToken).ConfigureAwait(false);
+
             return new CodeActionOperation[] { new ApplyChangesOperation(movedSolution) };
         }
+
+        private static async Task<Solution> RefactorReferencesAsync(
+            ILookup<DocumentId, (ReferenceLocation location, bool isExtension)> locationsToDoc,
+            Solution solution,
+            INamedTypeSymbol newType,
+            CancellationToken cancellationToken)
+        {
+            var solutionEditor = new SolutionEditor(solution);
+            foreach (var docGroup in locationsToDoc)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                var docEditor = await solutionEditor.GetDocumentEditorAsync(docGroup.Key, cancellationToken).ConfigureAwait(false);
+                await FixReferencesSingleDocumentAsync(docGroup.AsImmutable(), docEditor, newType, cancellationToken).ConfigureAwait(false);
+            }
+
+            return solutionEditor.GetChangedSolution();
+        }
+
+        private static async Task FixReferencesSingleDocumentAsync(
+            ImmutableArray<(ReferenceLocation location, bool isExtension)> referenceLocations,
+            DocumentEditor docEditor,
+            INamedTypeSymbol newType,
+            CancellationToken cancellationToken)
+        {
+            foreach (var (refLoc, isExtension) in referenceLocations)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                // All of these references are not easily fixable and possibly incorrect, so we are ok with ignoring these, even if it produces an error
+                if (refLoc.IsCandidateLocation || refLoc.IsImplicit || refLoc.Alias != null)
+                {
+                    continue;
+                }
+
+                var doc = docEditor.OriginalDocument;
+
+                var syntaxFacts = doc.GetRequiredLanguageService<ISyntaxFactsService>();
+                var refNode = docEditor.OriginalRoot.FindNode(refLoc.Location.SourceSpan, findInsideTrivia: true, getInnermostNodeForTie: true);
+
+                // add imports for each reference as there may be multiple locations that we need to add to
+                // if the import is already there, we shouldn't add it again
+                var addImports = doc.GetRequiredLanguageService<IAddImportsService>();
+                var compilation = await doc.Project.GetRequiredCompilationAsync(cancellationToken).ConfigureAwait(false);
+                docEditor.ReplaceNode(docEditor.OriginalRoot, (node, generator) => addImports.AddImport(
+                    compilation,
+                    node,
+                    refNode,
+                    generator.NamespaceImportDeclaration(
+                        newType.ContainingNamespace.ToDisplayString(SymbolDisplayFormats.NameFormat))
+                        .WithAdditionalAnnotations(Simplification.Simplifier.Annotation, Formatting.Formatter.Annotation),
+                    generator,
+                    true,
+                    doc.CanAddImportsInHiddenRegions(),
+                    cancellationToken));
+
+                // now change the actual references to use the new type name
+                // extension methods do not need to be changed as we do not reference the class name
+                if (isExtension)
+                {
+                    continue;
+                }
+
+                if (syntaxFacts.IsNameOfSimpleMemberAccessExpression(refNode))
+                {
+                    var expression = syntaxFacts.GetExpressionOfMemberAccessExpression(refNode.Parent);
+                    if (expression != null)
+                    {
+                        docEditor.ReplaceNode(expression, (node, generator) => generator.TypeExpression(newType).WithTriviaFrom(node));
+                    }
+                }
+            }
+        }
+
+        private static async Task<ImmutableArray<(ReferenceLocation location, bool isExtension)>> FindMemberReferencesAsync(
+            ImmutableArray<ISymbol> members,
+            Solution solution,
+            CancellationToken cancellationToken)
+        {
+            var tasks = members.Select(symbol => SymbolFinder.FindReferencesAsync(symbol, solution, cancellationToken));
+            var symbolRefs = await Task.WhenAll(tasks).ConfigureAwait(false);
+            return symbolRefs
+                .Flatten()
+                .SelectMany(refSymbol => refSymbol.Locations.Select(loc => (loc, refSymbol.Definition.IsExtensionMethod())))
+                .ToImmutableArray();
+        }
     }
 }

From bf2c490377916473d12eb80cf8c782a5088622a9 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Mon, 9 Aug 2021 17:20:04 -0700
Subject: [PATCH 20/64] Added tests for refactoring and extensions for C#. Will
 add tests for refactoring in VB, but unsure about extensions since we do not
 generate a module.

---
 .../CSharpMoveStaticMembersTests.cs           | 487 +++++++++++++++++-
 .../MoveStaticMembersWithDialogCodeAction.cs  |  25 +-
 2 files changed, 499 insertions(+), 13 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index db51b2348a641..449eb8e69e676 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -251,6 +251,77 @@ await TestMovementAsync(initialMarkup,
                 newFileName).ConfigureAwait(false);
         }
 
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveExtensionMethod()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public static class Class1
+    {
+        public static int Test[||]Method(this Other other)
+        {
+            return other.OtherInt + 2;
+        }
+    }
+
+    public class Other
+    {
+        public int OtherInt;
+        public Other()
+        {
+            OtherInt = 5;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public static class Class1
+    {
+    }
+
+    public class Other
+    {
+        public int OtherInt;
+        public Other()
+        {
+            OtherInt = 5;
+        }
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod(this Other other)
+        {
+            return other.OtherInt + 2;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestMoveConstField()
         {
@@ -911,7 +982,7 @@ await TestMovementAsync(initialMarkup,
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
-        public async Task TestMoveGenericClassWithMethod()
+        public async Task TestMoveMethodWithGenericClass()
         {
             var initialMarkup = @"
 <Workspace>
@@ -962,6 +1033,420 @@ await TestMovementAsync(initialMarkup,
                 selectedMembers,
                 newFileName).ConfigureAwait(false);
         }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorUsage()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+
+    public class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1.TestMethod();
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+
+    public class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestMethod();
+        }
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorUsageDifferentNamespace()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1;
+
+    public class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1.TestMethod();
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1;
+
+    public class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestMethod();
+        }
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorUsageNewNamespace()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+
+    public class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1.TestMethod();
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "ExtraNs.Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+using TestNs1.ExtraNs;
+
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+
+    public class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestMethod();
+        }
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1.ExtraNs
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveExtensionMethodDontRefactor()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public static class Class1
+    {
+        public static int Test[||]Method(this Other other)
+        {
+            return other.OtherInt + 2;
+        }
+    }
+
+    public class Class2
+    {
+        public int GetOtherInt()
+        {
+            var other = new Other();
+            return other.TestMethod();
+        }
+    }
+
+    public class Other
+    {
+        public int OtherInt;
+        public Other()
+        {
+            OtherInt = 5;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public static class Class1
+    {
+    }
+
+    public class Class2
+    {
+        public int GetOtherInt()
+        {
+            var other = new Other();
+            return other.TestMethod();
+        }
+    }
+
+    public class Other
+    {
+        public int OtherInt;
+        public Other()
+        {
+            OtherInt = 5;
+        }
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod(this Other other)
+        {
+            return other.OtherInt + 2;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveExtensionMethodRefactorImports()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    using TestNs2;
+
+    public static class Class1
+    {
+        public static int Test[||]Method(this Other other)
+        {
+            return other.OtherInt + 2;
+        }
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1;
+
+    public class Class2
+    {
+        public int GetOtherInt()
+        {
+            var other = new Other();
+            return other.TestMethod();
+        }
+    }
+
+    public class Other
+    {
+        public int OtherInt;
+        public Other()
+        {
+            OtherInt = 5;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "ExtraNs.Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    using TestNs2;
+
+    public static class Class1
+    {
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1;
+    using TestNs1.ExtraNs;
+
+    public class Class2
+    {
+        public int GetOtherInt()
+        {
+            var other = new Other();
+            return other.TestMethod();
+        }
+    }
+
+    public class Other
+    {
+        public int OtherInt;
+        public Other()
+        {
+            OtherInt = 5;
+        }
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">using TestNs2;
+
+namespace TestNs1.ExtraNs
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod(this Other other)
+        {
+            return other.OtherInt + 2;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
         #endregion
 
         #region Selections and caret position
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 64c72f0c7fc75..d261d1f04c584 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -94,9 +94,15 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
                 fileBanner,
                 cancellationToken).ConfigureAwait(false);
 
+            // get back type declaration in the newly created file
+            var destRoot = await newDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var destSemanticModel = await newDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+            newType = destSemanticModel.GetRequiredDeclaredSymbol(destRoot.GetAnnotatedNodes(annotation).Single(), cancellationToken) as INamedTypeSymbol;
+
+            // refactor member access references in other files
             var memberReferenceLocations = await FindMemberReferencesAsync(moveOptions.SelectedMembers, newDoc.Project.Solution, cancellationToken).ConfigureAwait(false);
             var locationsToDoc = memberReferenceLocations.ToLookup(loc => loc.location.Document.Id);
-            var reReferencedSolution = await RefactorReferencesAsync(locationsToDoc, newDoc.Project.Solution, newType, cancellationToken).ConfigureAwait(false);
+            var reReferencedSolution = await RefactorReferencesAsync(locationsToDoc, newDoc.Project.Solution, newType!, cancellationToken).ConfigureAwait(false);
 
             // Get back symbols using annotations
             sourceDoc = reReferencedSolution.GetRequiredDocument(sourceDoc.Id);
@@ -107,12 +113,6 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
                 .WhereNotNull()
                 .SelectAsArray(node => (semanticModel.GetDeclaredSymbol(node!, cancellationToken), false));
 
-            // get back type declaration in the newly created file
-            newDoc = reReferencedSolution.GetRequiredDocument(newDoc.Id);
-            var destRoot = await newDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
-            var destSemanticModel = await newDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
-            newType = destSemanticModel.GetRequiredDeclaredSymbol(destRoot.GetAnnotatedNodes(annotation).Single(), cancellationToken) as INamedTypeSymbol;
-
             var pullMembersUpOptions = PullMembersUpOptionsBuilder.BuildPullMembersUpOptions(newType, members);
             var movedSolution = await MembersPuller.PullMembersUpAsync(sourceDoc, pullMembersUpOptions, cancellationToken).ConfigureAwait(false);
 
@@ -155,16 +155,17 @@ private static async Task FixReferencesSingleDocumentAsync(
                 var doc = docEditor.OriginalDocument;
 
                 var syntaxFacts = doc.GetRequiredLanguageService<ISyntaxFactsService>();
-                var refNode = docEditor.OriginalRoot.FindNode(refLoc.Location.SourceSpan, findInsideTrivia: true, getInnermostNodeForTie: true);
+                var refNode = docEditor.GetChangedRoot().FindNode(refLoc.Location.SourceSpan, findInsideTrivia: true, getInnermostNodeForTie: true);
+                // track this node in case the doc has changed
+                docEditor.ReplaceNode(refNode, refNode.TrackNodes(refNode));
 
                 // add imports for each reference as there may be multiple locations that we need to add to
                 // if the import is already there, we shouldn't add it again
                 var addImports = doc.GetRequiredLanguageService<IAddImportsService>();
-                var compilation = await doc.Project.GetRequiredCompilationAsync(cancellationToken).ConfigureAwait(false);
                 docEditor.ReplaceNode(docEditor.OriginalRoot, (node, generator) => addImports.AddImport(
-                    compilation,
+                    docEditor.SemanticModel.Compilation,
                     node,
-                    refNode,
+                    node.GetCurrentNode(refNode)!,
                     generator.NamespaceImportDeclaration(
                         newType.ContainingNamespace.ToDisplayString(SymbolDisplayFormats.NameFormat))
                         .WithAdditionalAnnotations(Simplification.Simplifier.Annotation, Formatting.Formatter.Annotation),
@@ -180,7 +181,7 @@ private static async Task FixReferencesSingleDocumentAsync(
                     continue;
                 }
 
-                if (syntaxFacts.IsNameOfSimpleMemberAccessExpression(refNode))
+                if (syntaxFacts.IsNameOfAnyMemberAccessExpression(refNode))
                 {
                     var expression = syntaxFacts.GetExpressionOfMemberAccessExpression(refNode.Parent);
                     if (expression != null)

From 6fbd75308f88b26c57a5abae3f4f587ea98d5b85 Mon Sep 17 00:00:00 2001
From: Soren Dahl <43689321+Soreloser2@users.noreply.github.com>
Date: Tue, 10 Aug 2021 10:40:07 -0700
Subject: [PATCH 21/64] Move static members to a New Type (#55204)

* WIP Dialog work

* Rename + refactor

* WIP rename, add xaml elements

* WIP dialog/VM work

* WIP, Reverted Pull Member up change, updated destination selection, not working bc of a few bugs

* Refactoring provider now shows up and launches dialog

No behavior created after dialog exited
Still working on destination type/filename selection formatting

* Rename/Refactor name to MoveStaticMembers. Feature working with textbox, assuming new class (c# only, no automated tests yet)

* Accessibility, theming, resources, and sizing retweaks

* Added VB refactoring provider. Currently does not trigger on fields, as the semantic model cannot get the symbol for VB declared fields from the node. Fields are added as part of the dialog box however.

* Addressing some of the feedback

* Fixed fields not being able to trigger dialog in VB

* Remove unnecessary usings

* Fixed nullable error

* Added test classes for view model and C# impl, made VB able to get dependents

* Finished Writing impl tests for C# and VB. VB tests are currently failing due to the way AddMembers reuses syntax. Fixed a few bugs

* Fixed resources and removed nullable disable annotation

* Adress small feedback points

* Small test fix. Works with generator changes (sepearate PR)

Co-authored-by: msftbot[bot] <48340428+msftbot[bot]@users.noreply.github.com>
---
 src/Compilers/Test/Core/Traits/Traits.cs      |    1 +
 .../CSharpMoveStaticMembersTests.cs           | 1439 +++++++++++++++++
 .../TestMoveStaticMembersService.cs           |   38 +
 .../VisualBasicMoveStaticMembersTests.vb      | 1203 ++++++++++++++
 ...arpMoveStaticMembersRefactoringProvider.cs |   35 +
 .../PredefinedCodeRefactoringProviderNames.cs |    1 +
 .../Core/Portable/FeaturesResources.resx      |    3 +
 ...actMoveStaticMembersRefactoringProvider.cs |   64 +
 .../IMoveStaticMembersOptionsService.cs       |   13 +
 .../MoveStaticMembersOptions.cs               |   42 +
 .../MoveStaticMembersWithDialogCodeAction.cs  |  112 ++
 .../Portable/xlf/FeaturesResources.cs.xlf     |    5 +
 .../Portable/xlf/FeaturesResources.de.xlf     |    5 +
 .../Portable/xlf/FeaturesResources.es.xlf     |    5 +
 .../Portable/xlf/FeaturesResources.fr.xlf     |    5 +
 .../Portable/xlf/FeaturesResources.it.xlf     |    5 +
 .../Portable/xlf/FeaturesResources.ja.xlf     |    5 +
 .../Portable/xlf/FeaturesResources.ko.xlf     |    5 +
 .../Portable/xlf/FeaturesResources.pl.xlf     |    5 +
 .../Portable/xlf/FeaturesResources.pt-BR.xlf  |    5 +
 .../Portable/xlf/FeaturesResources.ru.xlf     |    5 +
 .../Portable/xlf/FeaturesResources.tr.xlf     |    5 +
 .../xlf/FeaturesResources.zh-Hans.xlf         |    5 +
 .../xlf/FeaturesResources.zh-Hant.xlf         |    5 +
 ...sicMoveStaticMembersRefactoringProvider.vb |   31 +
 .../CodeRefactorings/NodeSelectionHelpers.vb  |   26 +
 .../MoveStaticMembersDialog.xaml              |  114 ++
 .../MoveStaticMembersDialog.xaml.cs           |   61 +
 .../MoveStaticMembersDialogViewModel.cs       |  122 ++
 .../StaticMemberSelection.xaml                |   96 ++
 .../StaticMemberSelection.xaml.cs             |   39 +
 .../StaticMemberSelectionViewModel.cs         |  109 ++
 ...alStudioMoveStaticMembersOptionsService.cs |   91 ++
 .../PullMemberUp/SymbolDependentsBuilder.cs   |    5 +-
 .../Core/Def/ServicesVSResources.resx         |    9 +
 .../Core/Def/xlf/ServicesVSResources.cs.xlf   |   15 +
 .../Core/Def/xlf/ServicesVSResources.de.xlf   |   15 +
 .../Core/Def/xlf/ServicesVSResources.es.xlf   |   15 +
 .../Core/Def/xlf/ServicesVSResources.fr.xlf   |   15 +
 .../Core/Def/xlf/ServicesVSResources.it.xlf   |   15 +
 .../Core/Def/xlf/ServicesVSResources.ja.xlf   |   15 +
 .../Core/Def/xlf/ServicesVSResources.ko.xlf   |   15 +
 .../Core/Def/xlf/ServicesVSResources.pl.xlf   |   15 +
 .../Def/xlf/ServicesVSResources.pt-BR.xlf     |   15 +
 .../Core/Def/xlf/ServicesVSResources.ru.xlf   |   15 +
 .../Core/Def/xlf/ServicesVSResources.tr.xlf   |   15 +
 .../Def/xlf/ServicesVSResources.zh-Hans.xlf   |   15 +
 .../Def/xlf/ServicesVSResources.zh-Hant.xlf   |   15 +
 .../MoveStaticMembersViewModelTest.vb         |  444 +++++
 49 files changed, 4357 insertions(+), 1 deletion(-)
 create mode 100644 src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
 create mode 100644 src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
 create mode 100644 src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
 create mode 100644 src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersRefactoringProvider.cs
 create mode 100644 src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
 create mode 100644 src/Features/Core/Portable/MoveStaticMembers/IMoveStaticMembersOptionsService.cs
 create mode 100644 src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
 create mode 100644 src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
 create mode 100644 src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb
 create mode 100644 src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb
 create mode 100644 src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
 create mode 100644 src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs
 create mode 100644 src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
 create mode 100644 src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml
 create mode 100644 src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml.cs
 create mode 100644 src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs
 create mode 100644 src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
 create mode 100644 src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb

diff --git a/src/Compilers/Test/Core/Traits/Traits.cs b/src/Compilers/Test/Core/Traits/Traits.cs
index 39c48103e30c2..1e4a16db0f182 100644
--- a/src/Compilers/Test/Core/Traits/Traits.cs
+++ b/src/Compilers/Test/Core/Traits/Traits.cs
@@ -129,6 +129,7 @@ public static class Features
             public const string CodeActionsMergeConsecutiveIfStatements = "CodeActions.MergeConsecutiveIfStatements";
             public const string CodeActionsMergeNestedIfStatements = "CodeActions.MergeNestedIfStatements";
             public const string CodeActionsMoveDeclarationNearReference = "CodeActions.MoveDeclarationNearReference";
+            public const string CodeActionsMoveStaticMembers = "CodeActions.MoveStaticMembers";
             public const string CodeActionsMoveToNamespace = nameof(CodeActionsMoveToNamespace);
             public const string CodeActionsMoveToTopOfFile = "CodeActions.MoveToTopOfFile";
             public const string CodeActionsMoveType = "CodeActions.MoveType";
diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
new file mode 100644
index 0000000000000..db51b2348a641
--- /dev/null
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -0,0 +1,1439 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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.Collections.Immutable;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis.CSharp.CodeRefactorings.MoveStaticMembers;
+using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeRefactorings;
+using Microsoft.CodeAnalysis.MoveStaticMembers;
+using Microsoft.CodeAnalysis.Test.Utilities;
+using Microsoft.CodeAnalysis.Test.Utilities.MoveStaticMembers;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.MoveStaticMembers
+{
+    public class CSharpMoveStaticMembersTests : AbstractCSharpCodeActionTest
+    {
+        protected override CodeRefactoringProvider CreateCodeRefactoringProvider(Workspace workspace, TestParameters parameters)
+        {
+            return new CSharpMoveStaticMembersRefactoringProvider((IMoveStaticMembersOptionsService)parameters.fixProviderData);
+        }
+
+        protected override ImmutableArray<CodeAction> MassageActions(ImmutableArray<CodeAction> actions) => FlattenActions(actions);
+
+        private async Task TestNoRefactoringProvidedAsync(
+            string initialMarkup,
+            TestParameters parameters = default)
+        {
+            using var workspace = CreateWorkspaceFromOptions(initialMarkup, parameters);
+            var (actions, _) = await GetCodeActionsAsync(workspace, parameters).ConfigureAwait(false);
+            // no actions should be provided
+            Assert.Equal(0, actions.Length);
+        }
+
+        internal Task TestMovementAsync(
+            string initialMarkUp,
+            string expectedResult,
+            string destinationType,
+            ImmutableArray<string> selection,
+            string destinationName = "a.cs",
+            TestParameters parameters = default)
+        {
+            var service = new TestMoveStaticMembersService(destinationType, destinationName, selection.AsImmutable());
+
+            return TestInRegularAndScript1Async(
+                initialMarkUp,
+                expectedResult,
+                parameters.WithFixProviderData(service));
+        }
+
+        #region Perform Actions From Options
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveField()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Field = 1;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveProperty()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Property { get; set; }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestProperty");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestProperty { get; set; }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveEvent()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+using System;
+
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static event EventHandler Test[||]Event;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestEvent");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+using System;
+
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">using System;
+
+namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static event EventHandler TestEvent;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethod()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveConstField()
+        {
+            // const is static so we should work here
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public const int Test[||]Field = 1;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public const int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMultipleMethods()
+        {
+            // Bug where PullMembersUp doesn't apply formatting annotation
+            // When the destination ends up with more than one member:
+            // https://github.com/dotnet/roslyn/issues/54847
+            // so we keep the weird formatting for now
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]MethodInt()
+        {
+            return 0;
+        }
+
+        public static bool TestMethodBool()
+        {
+            return false;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethodInt", "TestMethodBool");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+
+        public static bool TestMethodBool()
+        {
+            return false;
+        }
+        public static int TestMethodInt()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveSingleMethodFromMultiple()
+        {
+            // move the method that this was not triggered on
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]MethodInt()
+        {
+            return 0;
+        }
+
+        public static bool TestMethodBool()
+        {
+            return false;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethodBool");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestMethodInt()
+        {
+            return 0;
+        }
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+
+        public static bool TestMethodBool()
+        {
+            return false;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveOneOfEach()
+        {
+            // Bug where PullMembersUp doesn't apply formatting annotation
+            // When the destination ends up with more than one member:
+            // https://github.com/dotnet/roslyn/issues/54847
+            // so we keep the weird formatting for now
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+using System;
+
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+
+        public static bool TestProperty { get; set; }
+
+        public static int TestField;
+
+        public static event EventHandler TestEvent;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create(
+                "TestMethod",
+                "TestField",
+                "TestProperty",
+                "TestEvent");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+using System;
+
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">using System;
+
+namespace TestNs1
+{
+    static class Class1Helpers
+    {
+
+        public static int TestField;
+
+        public static bool TestProperty { get; set; }
+
+        public static event EventHandler TestEvent;
+
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestInNestedClass()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public class NestedClass1
+        {
+            public static int Test[||]Field = 1;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public class NestedClass1
+        {
+        }
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestInNestedNamespace()
+        {
+            // collapse the namespaces
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    namespace InnerNs
+    {
+        public class Class1
+        {
+            public static int Test[||]Field = 1;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    namespace InnerNs
+    {
+        public class Class1
+        {
+        }
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1.InnerNs
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveFieldNoNamespace()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+public class Class1
+{
+    public static int Test[||]Field = 1;
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+public class Class1
+{
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">static class Class1Helpers
+{
+    public static int TestField = 1;
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveFieldNewNamespace()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+public class Class1
+{
+    public static int Test[||]Field = 1;
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "NewNs.Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+public class Class1
+{
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace NewNs
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodWithNamespacedSelectedDestination()
+        {
+            // in the case that we have an extra namespace in the destination name
+            // we append it on to the old type's namespace
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "ExtraNs.Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1.ExtraNs
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodFileScopedNamespace()
+        {
+            // We still keep normal namespacing rules in the new file regardless
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1;
+
+public class Class1
+{
+    public static int Test[||]Method()
+    {
+        return 0;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1;
+
+public class Class1
+{
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodWithFolders()
+        {
+            // We should just put the new file in the same folder
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document Folders=""Folder1"" FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document Folders=""Folder1"" FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document Folders=""Folder1"" FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveGenericMethod()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static T Test[||]Method&lt;T&gt;(T item)
+        {
+            return item;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static T TestMethod&lt;T&gt;(T item)
+        {
+            return item;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveGenericClassWithMethod()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1&lt;T&gt;
+    {
+        public static T Test[||]Method(T item)
+        {
+            return item;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1&lt;T&gt;
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers&lt;T&gt;
+    {
+        public static T Test[||]Method(T item)
+        {
+            return item;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+        #endregion
+
+        #region Selections and caret position
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectInMethodParens()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestMethod([||])
+        {
+            return 0;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectWholeFieldDeclaration()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        [|public static int TestField = 1;|]
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectBeforeKeywordOfDeclaration()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        [||]public static int TestField = 1;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectInKeyWordOfDeclaration1()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        pub[||]lic static int TestField = 1;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectInKeyWordOfDeclaration2()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public st[||]atic int TestField = 1;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectInTypeIdentifierMethodDeclaration()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static i[||]nt TestMethod()
+        {
+            return 0;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectInTypeIdentifierOfFieldDeclaration_NoAction()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static i[||]nt TestField = 1;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectInFieldInitializerEquals_NoAction()
+        {
+            // The initializer isn't a member declaration
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestField =[||] 1;
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectInFieldInitializerAfterSemicolon()
+        {
+            // However, a semicolon after the initializer is still considered a declaration
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestField = 1;[||]
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectMethodBody_NoAction()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestMethod()
+        {
+            retu[||]rn 0;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectMethodBracket_NoAction()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestMethod()
+        [|{|]
+            return 0;
+        }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectPropertyBody_NoAction()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestProperty { get; [||]set; }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectNonStaticProperty_NoAction()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public int Test[||]Property { get; set; }
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+        }
+        #endregion
+    }
+}
diff --git a/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
new file mode 100644
index 0000000000000..69cd955a824ec
--- /dev/null
+++ b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
@@ -0,0 +1,38 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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.Collections.Immutable;
+using Microsoft.CodeAnalysis.MoveStaticMembers;
+
+namespace Microsoft.CodeAnalysis.Test.Utilities.MoveStaticMembers
+{
+    internal class TestMoveStaticMembersService : IMoveStaticMembersOptionsService
+    {
+        private readonly string _destinationType;
+
+        private readonly ImmutableArray<string> _selectedMembers;
+
+        private readonly string _filename;
+
+        public TestMoveStaticMembersService(string destinationType, string fileName, ImmutableArray<string> members)
+        {
+            _destinationType = destinationType;
+            _filename = fileName;
+            _selectedMembers = members;
+        }
+
+        public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol)
+        {
+            var selectedMembers = selectedType.GetMembers().WhereAsArray(symbol => _selectedMembers.Contains(symbol.Name));
+            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);
+        }
+    }
+}
diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
new file mode 100644
index 0000000000000..55d3083fdc856
--- /dev/null
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -0,0 +1,1203 @@
+' Licensed to the .NET Foundation under one or more agreements.
+' The .NET Foundation licenses this file to you under the MIT license.
+' See the LICENSE file in the project root for more information.
+
+Imports System.Collections.Immutable
+Imports Microsoft.CodeAnalysis.CodeActions
+Imports Microsoft.CodeAnalysis.CodeRefactorings
+Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings
+Imports Microsoft.CodeAnalysis.MoveStaticMembers
+Imports Microsoft.CodeAnalysis.Test.Utilities.MoveStaticMembers
+Imports Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings.MoveStaticMembers
+
+Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.MoveStaticMembers
+    Public Class VisualBasicMoveStaticMembersTests
+        Inherits AbstractVisualBasicCodeActionTest
+
+        Protected Overrides Function CreateCodeRefactoringProvider(workspace As Workspace, parameters As TestParameters) As CodeRefactoringProvider
+            Return New VisualBasicMoveStaticMembersRefactoringProvider(DirectCast(parameters.fixProviderData, IMoveStaticMembersOptionsService))
+        End Function
+
+        Protected Overrides Function MassageActions(actions As ImmutableArray(Of CodeAction)) As ImmutableArray(Of CodeAction)
+            Return FlattenActions(actions)
+        End Function
+
+        Private Async Function TestNoRefactoringProvidedAsync(initialMarkup As String) As Task
+            Dim parameters = New TestParameters()
+            Dim workspace = CreateWorkspaceFromOptions(initialMarkup, parameters)
+            Dim tuple = Await GetCodeActionsAsync(workspace, parameters).ConfigureAwait(False)
+            Dim actions = tuple.Item1
+            ' No actions should be provided
+            Assert.Equal(0, actions.Length)
+        End Function
+
+        Private Function TestMovementAsync(
+            initialMarkup As String,
+            expectedResult As String,
+            destinationType As String,
+            selection As ImmutableArray(Of String),
+            Optional destinationName As String = "a.vb",
+            Optional parameters As TestParameters = Nothing) As Task
+            If IsNothing(parameters) Then
+                parameters = New TestParameters()
+            End If
+
+            Dim service = New TestMoveStaticMembersService(destinationType, destinationName, selection.AsImmutable())
+            Return TestInRegularAndScript1Async(initialMarkup, expectedResult, parameters.WithFixProviderData(service))
+        End Function
+
+#Region "Perform Actions From Options"
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveField() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Test[||]Field As Integer = 0
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveProperty() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Property Test[||]Property As Integer
+            Get
+                Return 0
+            End Get
+        End Property
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestProperty")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Property TestProperty As Integer
+            Get
+                Return 0
+            End Get
+        End Property
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveEvent() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Event Test[||]Event As EventHandler
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestEvent")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Event TestEvent As EventHandler
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveComplexEvent() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Custom Event Cl[||]ick As EventHandler
+            AddHandler(ByVal value As EventHandler)
+                Events.AddHandler(""ClickEvent"", value)
+            End AddHandler
+            RemoveHandler(ByVal value As EventHandler)
+                Events.RemoveHandler(""ClickEvent"", value)
+            End RemoveHandler
+            RaiseEvent(ByVal sender As Object, ByVal e As EventArgs)
+                CType(Events(""ClickEvent""), EventHandler).Invoke(sender, e)
+            End RaiseEvent
+        End Event
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("Click")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Custom Event Click As EventHandler
+            AddHandler(ByVal value As EventHandler)
+                Events.AddHandler(""ClickEvent"", value)
+            End AddHandler
+            RemoveHandler(ByVal value As EventHandler)
+                Events.RemoveHandler(""ClickEvent"", value)
+            End RemoveHandler
+            RaiseEvent(ByVal sender As Object, ByVal e As EventArgs)
+                CType(Events(""ClickEvent""), EventHandler).Invoke(sender, e)
+            End RaiseEvent
+        End Event
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunction() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveSub() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Sub Test[||]Sub()
+        End Sub
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestSub")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Sub TestSub()
+        End Sub
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveConst() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Const Test[||]Const As Integer = 0
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestConst")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Const TestConst As Integer = 0
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestInNestedClass() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Class InnerClass
+            Public Shared Function Test[||]Func() As Integer
+                Return 0
+            End Function
+        End Class
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Class InnerClass
+        End Class
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestInNestedNamespace() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Namespace InnerNs
+        Public Class Class1
+            Public Shared Function Tes[||]tFunc() As Integer
+                Return 0
+            End Function
+        End Class
+    End Namespace
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Namespace InnerNs
+        Public Class Class1
+        End Class
+    End Namespace
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs.InnerNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFieldNoNamespace() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Public Class Class1
+    Public Shared Test[||]Field As Integer = 0
+End Class
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Public Class Class1
+End Class
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Class Class1Helpers
+    Public Shared TestField As Integer = 0
+End Class
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFieldNewNamespace() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Public Class Class1
+    Public Shared Test[||]Field As Integer = 0
+End Class
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "TestNs.Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Public Class Class1
+End Class
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFieldAddNamespace() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Test[||]Field As Integer = 0
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "InnerNs.Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs.InnerNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveGenericFunction() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func(Of T)(item As T) As T
+            Return item
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc(Of T)(item As T) As T
+            Return item
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionWithGenericClass() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1(Of T)
+        Public Shared Function Test[||]Func(item As T) As T
+            Return item
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1(Of T)
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers(Of T)
+        Public Shared Function TestFunc(item As T) As T
+            Return item
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionWithFolders() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document Folders=""Folder1"" FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document Folders=""Folder1"" FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document Folders=""Folder1"" FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveMultipleFunctions() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func1() As Integer
+            Return 0
+        End Function
+
+        Public Shared Function TestFunc2() As Boolean
+            Return False
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc1", "TestFunc2")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc1() As Integer
+            Return 0
+        End Function
+
+        Public Shared Function TestFunc2() As Boolean
+            Return False
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveOneOfMultipleFuncs() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func1() As Integer
+            Return 0
+        End Function
+
+        Public Shared Function TestFunc2() As Boolean
+            Return False
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc2")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function TestFunc1() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+
+        Public Shared Function TestFunc2() As Boolean
+            Return False
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveOneOfEach() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Test[||]Field As Integer = 0
+
+        Public Shared Property TestProperty As Integer
+            Get
+                Return 0
+            End Get
+        End Property
+
+        Public Shared Event TestEvent As EventHandler
+
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+
+        Public Shared Sub TestSub()
+        End Sub
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create(
+                "TestField",
+                "TestProperty",
+                "TestFunc",
+                "TestEvent",
+                "TestSub")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+
+        Public Shared Property TestProperty As Integer
+            Get
+                Return 0
+            End Get
+        End Property
+
+        Public Shared Event TestEvent As EventHandler
+
+        Public Shared Sub TestSub()
+        End Sub
+
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+#End Region
+#Region "SelectionTests"
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectBeforeDeclarationKeyword() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        [||]Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectWholeFieldDeclaration() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        [|Public Shared TestField As Integer = 0|]
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInFieldInitializerEquals_NoAction() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared TestField As Integer =[||] 0
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInDeclarationKeyword1() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Pub[||]lic Shared TestField As Integer = 0
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInDeclarationKeyword2() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shar[||]ed TestField As Integer = 0
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInMethodParens() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function TestFunc([||]) As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInTypeIdentifierMethodDeclaration() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function TestFunc() As Inte[||]ger
+            Return 0
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInFieldTypeIdentifier_NoAction() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared TestField As Int[||]eger = 0
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInMethodBody_NoAction() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function TestFunc() As Integer
+            Retu[||]rn 0
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInMethodClose_NoAction() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Func[||]tion
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectNonSharedProperty_NoAction() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Property Test[||]Property As Integer
+            Get
+                Return 0
+            End Get
+        End Property
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectPropertyGetter_NoAction() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Property TestProperty As Integer
+            Get[||]
+                Return 0
+            End Get
+        End Property
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+        End Function
+#End Region
+    End Class
+End Namespace
diff --git a/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersRefactoringProvider.cs b/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersRefactoringProvider.cs
new file mode 100644
index 0000000000000..40d3c13b4732c
--- /dev/null
+++ b/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersRefactoringProvider.cs
@@ -0,0 +1,35 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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;
+using System.Composition;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.MoveStaticMembers;
+
+namespace Microsoft.CodeAnalysis.CSharp.CodeRefactorings.MoveStaticMembers
+{
+    [ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = PredefinedCodeRefactoringProviderNames.MoveStaticMembers), Shared]
+    internal class CSharpMoveStaticMembersRefactoringProvider : AbstractMoveStaticMembersRefactoringProvider
+    {
+        /// <summary>
+        /// Test purpose only.
+        /// </summary>
+        [SuppressMessage("RoslynDiagnosticsReliability", "RS0034:Exported parts should have [ImportingConstructor]", Justification = "Used incorrectly by tests")]
+        public CSharpMoveStaticMembersRefactoringProvider(IMoveStaticMembersOptionsService? service) : base(service)
+        {
+        }
+
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public CSharpMoveStaticMembersRefactoringProvider() : this(service: null)
+        {
+        }
+
+        protected override Task<SyntaxNode> GetSelectedNodeAsync(CodeRefactoringContext context)
+            => NodeSelectionHelpers.GetSelectedDeclarationOrVariableAsync(context);
+    }
+}
diff --git a/src/Features/Core/Portable/CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs b/src/Features/Core/Portable/CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs
index a6dcc9516df70..bb4a6ff8d3991 100644
--- a/src/Features/Core/Portable/CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs
+++ b/src/Features/Core/Portable/CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs
@@ -36,6 +36,7 @@ internal static class PredefinedCodeRefactoringProviderNames
         public const string MergeConsecutiveIfStatements = "Merge Consecutive If Statements Code Action Provider";
         public const string MergeNestedIfStatements = "Merge Nested If Statements Code Action Provider";
         public const string MoveDeclarationNearReference = "Move Declaration Near Reference Code Action Provider";
+        public const string MoveStaticMembers = "Move Static Members to Another Type Code Action Provider";
         public const string MoveToNamespace = "Move To Namespace Code Action Provider";
         public const string MoveTypeToFile = "Move Type To File Code Action Provider";
         public const string PullMemberUp = "Pull Member Up Code Action Provider";
diff --git a/src/Features/Core/Portable/FeaturesResources.resx b/src/Features/Core/Portable/FeaturesResources.resx
index d87c3270a535e..dfcfbde8a1912 100644
--- a/src/Features/Core/Portable/FeaturesResources.resx
+++ b/src/Features/Core/Portable/FeaturesResources.resx
@@ -2914,4 +2914,7 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
   <data name="Selection_not_contained_inside_a_type" xml:space="preserve">
     <value>Selection not contained inside a type.</value>
   </data>
+  <data name="Move_static_members_to_another_type" xml:space="preserve">
+    <value>Move static members to another type...</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs b/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
new file mode 100644
index 0000000000000..69215560d2855
--- /dev/null
+++ b/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
@@ -0,0 +1,64 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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.Linq;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.PullMemberUp;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+
+namespace Microsoft.CodeAnalysis.MoveStaticMembers
+{
+    internal abstract class AbstractMoveStaticMembersRefactoringProvider : CodeRefactoringProvider
+    {
+        private readonly IMoveStaticMembersOptionsService? _service;
+
+        protected abstract Task<SyntaxNode> GetSelectedNodeAsync(CodeRefactoringContext context);
+
+        /// <summary>
+        /// Test purpose only
+        /// </summary>
+        protected AbstractMoveStaticMembersRefactoringProvider(IMoveStaticMembersOptionsService? service)
+            => _service = service;
+
+        public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
+        {
+            var (document, span, cancellationToken) = context;
+
+            var memberDeclaration = await GetSelectedNodeAsync(context).ConfigureAwait(false);
+            if (memberDeclaration == null)
+            {
+                return;
+            }
+
+            var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+            if (semanticModel == null)
+            {
+                return;
+            }
+
+            var selectedType = semanticModel.GetEnclosingNamedType(span.Start, cancellationToken);
+            if (selectedType == null)
+            {
+                return;
+            }
+
+            var selectedMembers = selectedType.GetMembers()
+                .WhereAsArray(m => m.IsStatic &&
+                    MemberAndDestinationValidator.IsMemberValid(m) &&
+                    m.DeclaringSyntaxReferences.Any(sr => memberDeclaration.FullSpan.Contains(sr.Span)));
+            if (selectedMembers.IsEmpty)
+            {
+                return;
+            }
+
+            var syntaxFacts = document.GetRequiredLanguageService<ISyntaxFactsService>();
+
+            var action = new MoveStaticMembersWithDialogCodeAction(document, span, _service, selectedType, selectedMember: selectedMembers[0]);
+
+            context.RegisterRefactoring(action, selectedMembers[0].DeclaringSyntaxReferences[0].Span);
+        }
+    }
+}
diff --git a/src/Features/Core/Portable/MoveStaticMembers/IMoveStaticMembersOptionsService.cs b/src/Features/Core/Portable/MoveStaticMembers/IMoveStaticMembersOptionsService.cs
new file mode 100644
index 0000000000000..fa6cee14dfc15
--- /dev/null
+++ b/src/Features/Core/Portable/MoveStaticMembers/IMoveStaticMembersOptionsService.cs
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CodeAnalysis.Host;
+
+namespace Microsoft.CodeAnalysis.MoveStaticMembers
+{
+    internal interface IMoveStaticMembersOptionsService : IWorkspaceService
+    {
+        MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol);
+    }
+}
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
new file mode 100644
index 0000000000000..a9d08e971892f
--- /dev/null
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
@@ -0,0 +1,42 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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.Collections.Immutable;
+using System.Linq;
+
+namespace Microsoft.CodeAnalysis.MoveStaticMembers
+{
+    internal readonly struct MoveStaticMembersOptions
+    {
+        public bool IsCancelled { get; }
+
+        public string FileName { get; }
+
+        public string TypeName { get; }
+
+        public string NamespaceDisplay { get; }
+
+        public ImmutableArray<ISymbol> SelectedMembers { get; }
+
+        public static MoveStaticMembersOptions Cancelled = new(
+            string.Empty,
+            string.Empty,
+            ImmutableArray<ISymbol>.Empty,
+            isCancelled: true);
+
+        public MoveStaticMembersOptions(
+            string fileName,
+            string fullTypeName,
+            ImmutableArray<ISymbol> selectedMembers,
+            bool isCancelled = false)
+        {
+            IsCancelled = isCancelled;
+            FileName = fileName;
+            var namespacesAndType = fullTypeName.Split(separator: '.');
+            TypeName = namespacesAndType.Last();
+            NamespaceDisplay = string.Join(separator: ".", namespacesAndType.Take(namespacesAndType.Length - 1));
+            SelectedMembers = selectedMembers;
+        }
+    }
+}
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
new file mode 100644
index 0000000000000..6c75302193aa7
--- /dev/null
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -0,0 +1,112 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.CodeRefactorings.PullMemberUp;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.MoveStaticMembers
+{
+    internal class MoveStaticMembersWithDialogCodeAction : CodeActionWithOptions
+    {
+        private readonly Document _document;
+        private readonly ISymbol? _selectedMember;
+        private readonly INamedTypeSymbol _selectedType;
+        private IMoveStaticMembersOptionsService? _service;
+
+        public TextSpan Span { get; }
+        public override string Title => FeaturesResources.Move_static_members_to_another_type;
+
+        public MoveStaticMembersWithDialogCodeAction(
+            Document document,
+            TextSpan span,
+            IMoveStaticMembersOptionsService? service,
+            INamedTypeSymbol selectedType,
+            ISymbol? selectedMember = null)
+        {
+            _document = document;
+            _service = service;
+            _selectedType = selectedType;
+            _selectedMember = selectedMember;
+            Span = span;
+        }
+
+        public override object? GetOptions(CancellationToken cancellationToken)
+        {
+            _service ??= _document.Project.Solution.Workspace.Services.GetRequiredService<IMoveStaticMembersOptionsService>();
+            return _service.GetMoveMembersToTypeOptions(_document, _selectedType, _selectedMember);
+        }
+
+        protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperationsAsync(object options, CancellationToken cancellationToken)
+        {
+            if (options is not MoveStaticMembersOptions moveOptions || moveOptions.IsCancelled)
+            {
+                return SpecializedCollections.EmptyEnumerable<CodeActionOperation>();
+            }
+
+            // Find the original doc root
+            var syntaxFacts = _document.GetRequiredLanguageService<ISyntaxFactsService>();
+            var root = await _document.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var fileBanner = syntaxFacts.GetFileBanner(root);
+
+            // add annotations to the symbols that we selected so we can find them later to pull up
+            // These symbols should all have (singular) definitions, but in the case that we can't find
+            // any location, we just won't move that particular symbol
+            var memberNodes = moveOptions.SelectedMembers
+                .Select(symbol => symbol.Locations.FirstOrDefault())
+                .WhereNotNull()
+                .SelectAsArray(loc => loc.FindNode(cancellationToken));
+            root = root.TrackNodes(memberNodes);
+            var sourceDoc = _document.WithSyntaxRoot(root);
+
+            var typeParameters = ExtractTypeHelpers.GetRequiredTypeParametersForMembers(_selectedType, moveOptions.SelectedMembers);
+            // even though we can move members here, we will move them by calling PullMembersUp
+            var newType = CodeGenerationSymbolFactory.CreateNamedTypeSymbol(
+                ImmutableArray.Create<AttributeData>(),
+                Accessibility.NotApplicable,
+                Editing.DeclarationModifiers.Static,
+                TypeKind.Class,
+                moveOptions.TypeName,
+                typeParameters: typeParameters);
+
+            var (newDoc, annotation) = await ExtractTypeHelpers.AddTypeToNewFileAsync(
+                sourceDoc.Project.Solution,
+                moveOptions.NamespaceDisplay,
+                moveOptions.FileName,
+                _document.Project.Id,
+                _document.Folders,
+                newType,
+                fileBanner,
+                cancellationToken).ConfigureAwait(false);
+
+            // Get back symbols using annotations
+            sourceDoc = newDoc.Project.Solution.GetRequiredDocument(sourceDoc.Id);
+            root = await sourceDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var semanticModel = await sourceDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+            var members = memberNodes
+                .Select(node => root.GetCurrentNode(node))
+                .WhereNotNull()
+                .SelectAsArray(node => (semanticModel.GetDeclaredSymbol(node!, cancellationToken), false));
+
+            // get back type declaration in the newly created file
+            var destRoot = await newDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var destSemanticModel = await newDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+            newType = destSemanticModel.GetDeclaredSymbol(destRoot.GetAnnotatedNodes(annotation).Single(), cancellationToken) as INamedTypeSymbol;
+
+            var pullMembersUpOptions = PullMembersUpOptionsBuilder.BuildPullMembersUpOptions(newType, members);
+            var movedSolution = await MembersPuller.PullMembersUpAsync(sourceDoc, pullMembersUpOptions, cancellationToken).ConfigureAwait(false);
+            return new CodeActionOperation[] { new ApplyChangesOperation(movedSolution) };
+        }
+    }
+}
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
index bb5b816afbc9d..9a4af80773bf4 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
@@ -935,6 +935,11 @@ Ujistěte se, že specifikátor tt použijete pro jazyky, pro které je nezbytn
         <target state="translated">Přesunout soubor do kořenové složky projektu</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">Přesunout do oboru názvů...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
index 067de42276bf3..d0137b988e152 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
@@ -935,6 +935,11 @@ Stellen Sie sicher, dass Sie den Bezeichner "tt" für Sprachen verwenden, für d
         <target state="translated">Datei in den Stammordner des Projekts verschieben</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">In Namespace verschieben...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
index 34461f733c450..6ba52b8317952 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
@@ -935,6 +935,11 @@ Asegúrese de usar el especificador "tt" para los idiomas para los que es necesa
         <target state="translated">Mover el archivo a la carpeta raíz del proyecto</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">Mover a espacio de nombres...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
index a8a177af0c2ff..38e3fcb37f617 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
@@ -935,6 +935,11 @@ Veillez à utiliser le spécificateur "tt" pour les langues où il est nécessai
         <target state="translated">Déplacer le fichier dans le dossier racine du projet</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">Déplacer vers un espace de noms...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
index 58080feda2ab2..c0b5c460f6b2d 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
@@ -935,6 +935,11 @@ Assicurarsi di usare l'identificatore "tt" per le lingue per le quali è necessa
         <target state="translated">Sposta il file nella cartella radice del progetto</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">Sposta nello spazio dei nomi...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
index be629234c23bc..db11ab55a7bf6 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
@@ -935,6 +935,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">ファイルをプロジェクト ルート フォルダーに移動します</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">名前空間に移動します...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
index 0209c50ff7bbd..2979a2c74368e 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
@@ -935,6 +935,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">파일을 프로젝트 루트 폴더로 이동</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">네임스페이스로 이동...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
index 0a67e7239d193..17e5eef71abe7 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
@@ -935,6 +935,11 @@ Pamiętaj, aby nie używać specyfikatora „tt” dla wszystkich języków, w k
         <target state="translated">Przenieś plik do folderu głównego projektu</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">Przenieś do przestrzeni nazw...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
index 6c8568fdd26f2..a7058913193fa 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
@@ -935,6 +935,11 @@ Verifique se o especificador "tt" foi usado para idiomas para os quais é necess
         <target state="translated">Mover o arquivo para a pasta raiz do projeto</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">Mover para o namespace...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
index 293b945ecaf3c..047281fef582c 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
@@ -935,6 +935,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">Переместить файл в корневую папку проекта</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">Переместить в пространство имен...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
index f65f419019066..224735f535ecb 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
@@ -935,6 +935,11 @@ AM ve PM arasındaki farkın korunmasının gerekli olduğu diller için "tt" be
         <target state="translated">Dosyayı proje kök klasörüne taşı</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">Ad alanına taşı...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
index 489b56be5ad06..d418fae3f4a90 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
@@ -935,6 +935,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">将文件移动到项目根文件夹</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">移动到命名空间...</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
index d1ef9cc3b207d..43ec70ac86396 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
@@ -935,6 +935,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">將檔案移到專案根資料夾</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type">
+        <source>Move static members to another type...</source>
+        <target state="new">Move static members to another type...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to namespace...</source>
         <target state="translated">移到命名空間...</target>
diff --git a/src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb b/src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb
new file mode 100644
index 0000000000000..dfce7857f0bdf
--- /dev/null
+++ b/src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb
@@ -0,0 +1,31 @@
+' Licensed to the .NET Foundation under one or more agreements.
+' The .NET Foundation licenses this file to you under the MIT license.
+' See the LICENSE file in the project root for more information.
+
+Imports System.Composition
+Imports System.Diagnostics.CodeAnalysis
+Imports Microsoft.CodeAnalysis.CodeRefactorings
+Imports Microsoft.CodeAnalysis.Host.Mef
+Imports Microsoft.CodeAnalysis.MoveStaticMembers
+
+Namespace Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings.MoveStaticMembers
+    <ExportCodeRefactoringProvider(LanguageNames.VisualBasic, Name:=PredefinedCodeRefactoringProviderNames.MoveStaticMembers), [Shared]>
+    Friend Class VisualBasicMoveStaticMembersRefactoringProvider
+        Inherits AbstractMoveStaticMembersRefactoringProvider
+
+        <ImportingConstructor>
+        <Obsolete(MefConstruction.ImportingConstructorMessage, True)>
+        Public Sub New()
+            Me.New(Nothing)
+        End Sub
+
+        <SuppressMessage("RoslynDiagnosticsReliability", "RS0034:Exported parts should have [ImportingConstructor]", Justification:="Used incorrectly by tests")>
+        Public Sub New(service As IMoveStaticMembersOptionsService)
+            MyBase.New(service)
+        End Sub
+
+        Protected Overrides Async Function GetSelectedNodeAsync(context As CodeRefactoringContext) As Task(Of SyntaxNode)
+            Return Await GetSelectedMemberDeclarationAsync(context).ConfigureAwait(False)
+        End Function
+    End Class
+End Namespace
diff --git a/src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb b/src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb
new file mode 100644
index 0000000000000..e82b062351c20
--- /dev/null
+++ b/src/Features/VisualBasic/Portable/CodeRefactorings/NodeSelectionHelpers.vb
@@ -0,0 +1,26 @@
+' Licensed to the .NET Foundation under one or more agreements.
+' The .NET Foundation licenses this file to you under the MIT license.
+' See the LICENSE file in the project root for more information.
+
+Imports Microsoft.CodeAnalysis.CodeRefactorings
+Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
+
+Namespace Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings
+    Friend Module NodeSelectionHelpers
+        Friend Async Function GetSelectedMemberDeclarationAsync(context As CodeRefactoringContext) As Task(Of SyntaxNode)
+            Dim methodMember = Await context.TryGetRelevantNodeAsync(Of MethodBaseSyntax)().ConfigureAwait(False)
+            If methodMember IsNot Nothing Then
+                Return methodMember
+            End If
+            ' Gets field variable declarations (not including the keywords like Public/Shared, etc), which are not methods
+            Dim fieldDeclaration = Await context.TryGetRelevantNodeAsync(Of FieldDeclarationSyntax).ConfigureAwait(False)
+            If fieldDeclaration IsNot Nothing Then
+                Return fieldDeclaration
+            End If
+            ' Gets the identifier + type of the field itself (ex. TestField As Integer), since it is nested in the variable declaration
+            ' And so the token's parent is not a variable declaration
+            Return Await context.TryGetRelevantNodeAsync(Of ModifiedIdentifierSyntax).ConfigureAwait(False)
+        End Function
+    End Module
+End Namespace
+
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
new file mode 100644
index 0000000000000..a468fcf617ed3
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
@@ -0,0 +1,114 @@
+<vs:DialogWindow
+    xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+    xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging" 
+    xmlns:movestaticmembers="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers" 
+    d:DataContext="{d:DesignInstance Type=movestaticmembers:MoveStaticMembersDialogViewModel}"
+    vs:ThemedDialogStyleLoader.UseDefaultThemedDialogStyles="True"
+    x:Uid="MoveStaticMembersDialog"
+    x:Name="dialog"
+    x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers.MoveStaticMembersDialog"
+    x:ClassModifier="internal"
+    mc:Ignorable="d"
+    WindowStartupLocation="CenterOwner"
+    Height="398"
+    Width="500"
+    MinHeight="298"
+    MinWidth="210"
+    HasDialogFrame="True"
+    ShowInTaskbar="False"
+    ResizeMode="CanResize"
+    Title="{Binding MoveStaticMembersDialogTitle, ElementName=dialog}"
+    Background="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}">
+    <vs:DialogWindow.Resources>
+        <Thickness x:Key="ButtonPadding">9, 2, 9, 2</Thickness>
+        <sys:Double x:Key="ButtonWidth">73</sys:Double>
+        <sys:Double x:Key="ButtonHeight">21</sys:Double>
+        <Thickness x:Key="verticalLabelMargin">0, 0, 0, 5</Thickness>
+        <Thickness x:Key="messageMargin">0, 9, 0, 0</Thickness>
+        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+    </vs:DialogWindow.Resources>
+    <Grid Margin="11,6,11,11">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="25"/>
+            <RowDefinition/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <StackPanel Orientation="Vertical" Grid.Row="0">
+            <Label 
+                x:Uid="DestinationLabel" 
+                x:Name="DestinationLabel"
+                Margin="{StaticResource verticalLabelMargin}"
+                Content="{Binding ElementName=dialog, Path=DestinationLabelText}"
+                Target="{Binding ElementName=DestinationTextBox}" />
+            <TextBox 
+                x:Uid="DestinationBox"
+                Name="DestinationBox"
+                AutomationProperties.Name="DestinationName"
+                Text="{Binding DestinationName, UpdateSourceTrigger=PropertyChanged}"
+                Margin="0 0 20 0"/>
+
+        </StackPanel>
+
+        <StackPanel 
+            Grid.Row="1"
+            Orientation="Horizontal"  
+            Visibility="{Binding ShowMessage, Converter={StaticResource BooleanToVisibilityConverter}}"
+            Margin="{StaticResource messageMargin}">
+            <imaging:CrispImage Name="MessageIcon"
+                                    Moniker="{Binding Icon}" 
+                                    Height="16"
+                                    Width="16"
+                                    VerticalAlignment="Top" />
+
+            <vs:LiveTextBlock x:Name="MessageText"
+                           Text="{Binding Message}"
+                           Margin="7, 0, 0, 0"
+                           Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
+        </StackPanel>
+
+        <GroupBox 
+            x:Uid="MemberSelectionGroupBox"
+            x:Name="MemberSelectionGroupBox"
+            Margin="0, 20, 0, 0"
+            Grid.Row="2"
+            Header="{Binding ElementName=dialog, Path=SelectMembers}"
+            BorderThickness="1">
+            <GroupBox.Style>
+                <Style TargetType="GroupBox">
+                    <Setter Property="Foreground" Value="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
+                </Style>
+            </GroupBox.Style>
+
+            <ContentPresenter Content="{Binding ElementName=dialog, Path=MemberSelectionControl}" />
+        </GroupBox>
+        <StackPanel Grid.Row="3"
+                    HorizontalAlignment="Right" 
+                    Margin="0, 11, 0, 0"
+                    Orientation="Horizontal">
+            <Button x:Uid="OkButton" 
+                    Name="OKButton"
+                    Content="{Binding ElementName=dialog, Path=OK}" 
+                    Margin="0, 0, 0, 0" 
+                    Padding="{StaticResource ResourceKey=ButtonPadding}"
+                    Click="OK_Click" 
+                    IsDefault="True"
+                    MinWidth="73"
+                    MinHeight="21"/>
+            <Button x:Uid="CancelButton" 
+                    Name="CancelButton"
+                    Content="{Binding ElementName=dialog, Path=Cancel}"
+                    Margin="7, 0, 0, 0" 
+                    Padding="{StaticResource ResourceKey=ButtonPadding}"
+                    Click="Cancel_Click"
+                    IsCancel="True"
+                    MinWidth="73"
+                    MinHeight="21"/>
+        </StackPanel>
+    </Grid>
+</vs:DialogWindow>
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs
new file mode 100644
index 0000000000000..bbe06370f070c
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs
@@ -0,0 +1,61 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using Microsoft.VisualStudio.PlatformUI;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
+{
+    /// <summary>
+    /// Interaction logic for MoveMembersToTypeDialog.xaml
+    /// </summary>
+    internal partial class MoveStaticMembersDialog : DialogWindow
+    {
+        public string MoveStaticMembersDialogTitle => ServicesVSResources.Move_static_members_to_another_type_colon;
+        public string DestinationLabelText => ServicesVSResources.Type_Name;
+        public string OK => ServicesVSResources.OK;
+        public string Cancel => ServicesVSResources.Cancel;
+        public string SelectMembers => ServicesVSResources.Select_members_colon;
+
+        public MoveStaticMembersDialogViewModel ViewModel { get; }
+        public StaticMemberSelection MemberSelectionControl { get; }
+
+        internal MoveStaticMembersDialog(MoveStaticMembersDialogViewModel viewModel)
+            : base()
+        {
+            ViewModel = viewModel;
+            DataContext = viewModel;
+
+            MemberSelectionControl = new StaticMemberSelection(ViewModel.MemberSelectionViewModel);
+
+            // Set focus to first tab control when the window is loaded
+            Loaded += (s, e) => MoveFocus(new TraversalRequest(FocusNavigationDirection.Next));
+
+            InitializeComponent();
+        }
+
+        private void Cancel_Click(object sender, RoutedEventArgs e)
+            => DialogResult = false;
+
+        internal TestAccessor GetTestAccessor() => new(this);
+
+        private void OK_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = ViewModel.CanSubmit;
+        }
+
+        internal readonly struct TestAccessor
+        {
+            private readonly MoveStaticMembersDialog _dialog;
+            public TestAccessor(MoveStaticMembersDialog dialog)
+                => _dialog = dialog;
+
+            public Button OKButton => _dialog.OKButton;
+            public Button CancelButton => _dialog.CancelButton;
+
+        }
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
new file mode 100644
index 0000000000000..3f4b616a92e0a
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
@@ -0,0 +1,122 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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;
+using System.Collections.Immutable;
+using System.ComponentModel;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.VisualStudio.Imaging;
+using Microsoft.VisualStudio.Imaging.Interop;
+using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
+{
+    internal class MoveStaticMembersDialogViewModel : AbstractNotifyPropertyChanged
+    {
+        public StaticMemberSelectionViewModel MemberSelectionViewModel { get; }
+
+        private readonly ISyntaxFacts _syntaxFacts;
+
+        private readonly ImmutableArray<string> _existingNames;
+
+        public MoveStaticMembersDialogViewModel(
+            StaticMemberSelectionViewModel memberSelectionViewModel,
+            string defaultType,
+            ImmutableArray<string> existingNames,
+            ISyntaxFacts syntaxFacts)
+        {
+            MemberSelectionViewModel = memberSelectionViewModel;
+            _syntaxFacts = syntaxFacts ?? throw new ArgumentNullException(nameof(syntaxFacts));
+            _destinationName = defaultType;
+            _existingNames = existingNames;
+
+            PropertyChanged += MoveMembersToTypeDialogViewModel_PropertyChanged;
+            OnDestinationUpdated();
+        }
+
+        private void MoveMembersToTypeDialogViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            switch (e.PropertyName)
+            {
+                case nameof(DestinationName):
+                    OnDestinationUpdated();
+                    break;
+            }
+        }
+
+        public void OnDestinationUpdated()
+        {
+            // TODO change once we allow movement to existing types
+            var isNewType = !_existingNames.Contains(DestinationName);
+            _isValidName = isNewType && IsValidType(DestinationName);
+
+            if (_isValidName)
+            {
+                Icon = KnownMonikers.StatusInformation;
+                Message = ServicesVSResources.A_new_type_will_be_created;
+                ShowMessage = true;
+            }
+            else
+            {
+                Icon = KnownMonikers.StatusInvalid;
+                Message = ServicesVSResources.Invalid_type_name;
+                ShowMessage = true;
+            }
+        }
+
+        private bool IsValidType(string typeName)
+        {
+            if (string.IsNullOrEmpty(typeName))
+            {
+                return false;
+            }
+
+            foreach (var identifier in typeName.Split('.'))
+            {
+                if (_syntaxFacts.IsValidIdentifier(identifier))
+                {
+                    continue;
+                }
+
+                return false;
+            }
+
+            return true;
+        }
+
+        private string _destinationName;
+        public string DestinationName
+        {
+            get => _destinationName;
+            set => SetProperty(ref _destinationName, value);
+        }
+
+        private ImageMoniker _icon;
+        public ImageMoniker Icon
+        {
+            get => _icon;
+            private set => SetProperty(ref _icon, value);
+        }
+
+        private string? _message;
+        public string? Message
+        {
+            get => _message;
+            private set => SetProperty(ref _message, value);
+        }
+
+        private bool _showMessage = false;
+        public bool ShowMessage
+        {
+            get => _showMessage;
+            private set => SetProperty(ref _showMessage, value);
+        }
+
+        private bool _isValidName = true;
+        public bool CanSubmit
+        {
+            get => _isValidName && MemberSelectionViewModel.CheckedMembers.Length > 0;
+        }
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml
new file mode 100644
index 0000000000000..fb93072343c9f
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml
@@ -0,0 +1,96 @@
+<UserControl x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers.StaticMemberSelection"
+             x:ClassModifier="internal"
+             x:Name="MemberSelectionControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:utilities="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.Utilities"
+             xmlns:movestaticmembers="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers"
+             d:DataContext="{d:DesignInstance Type=movestaticmembers:StaticMemberSelectionViewModel}"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <Thickness x:Key="ButtonControlsPadding">2, 4, 4, 2</Thickness>
+        <utilities:BooleanReverseConverter x:Key="BooleanReverseConverter"/>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="Auto"/>
+        </Grid.ColumnDefinitions>
+        <ListBox
+            x:Uid="MemberSelectionList"
+            x:Name="MemberSelectionList"
+            Grid.Column="0"
+            Margin="2, 5, 12, 2"
+            SelectionMode="Multiple"
+            AutomationProperties.Name="SelectMembersList"
+            ItemsSource="{Binding Members}">
+            <ListBox.Resources>
+                <Style TargetType="{x:Type ListBoxItem}">
+                    <Setter Property="IsSelected" Value="{Binding IsChecked, Mode=TwoWay}" />
+                </Style>
+            </ListBox.Resources>
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel
+                        Orientation="Horizontal"
+                        HorizontalAlignment="Left"
+                        MinWidth="186"
+                        Width="Auto"
+                        Margin="5, 2, 0, 2">
+                        <CheckBox
+                            x:Name="MemberSelected"
+                            AutomationProperties.Name="IsSelected"
+                            Margin="0, 0, 5, 0"
+                            IsChecked="{Binding IsChecked, Mode=TwoWay}"/>
+                        <Image 
+                            x:Name="GlyphOfMember"
+                            Margin="8, 0, 5, 0"
+                            Source="{Binding Glyph}"/>
+                        <TextBlock
+                            x:Name="MemberName"
+                            Text="{Binding SymbolName}"
+                            Margin="0, 0, 5, 0"/>
+                    </StackPanel>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+        <StackPanel
+            Grid.Column="1"
+            Orientation="Vertical"
+            VerticalAlignment="Top"
+            HorizontalAlignment="Center"
+            Margin="0, 4, 0, 0"
+            Width="Auto">
+            <Button
+                x:Name="SelectAllButton"
+                x:Uid="SelectAllButton"
+                Padding="{StaticResource ResourceKey=ButtonControlsPadding}"
+                Content="{Binding ElementName=MemberSelectionControl, Path=SelectAll}"
+                Click="SelectAllButton_Click"
+                Margin="2, 2, 2, 7"
+                Width="Auto"
+                Height="Auto" />
+            <Button
+                x:Name="DeselectAllButton"
+                x:Uid="DeselectAllButton"
+                Padding="{StaticResource ResourceKey=ButtonControlsPadding}"
+                Content="{Binding ElementName=MemberSelectionControl, Path=DeselectAll}"
+                Click="DeselectAllButton_Click"
+                Margin="2, 2, 2, 7"
+                Width="Auto"
+                Height="Auto" />
+            <Button
+                x:Name="SelectDependentsButton"
+                x:Uid="SelectDependentsButton"
+                Padding="{StaticResource ResourceKey=ButtonControlsPadding}"
+                Content="{Binding ElementName=MemberSelectionControl, Path=SelectDependents}"
+                Click="SelectDependentsButton_Click"
+                Margin="2, 2, 2, 7"
+                Width="Auto"
+                Height="Auto"/>
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml.cs
new file mode 100644
index 0000000000000..5049ee920643e
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml.cs
@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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.Windows;
+using System.Windows.Controls;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
+{
+    /// <summary>
+    /// Interaction logic for StaticMemberSelection.xaml
+    /// </summary>
+    internal partial class StaticMemberSelection : UserControl
+    {
+
+        public string SelectDependents => ServicesVSResources.Select_Dependents;
+        public string MembersHeader => ServicesVSResources.Members;
+        public string SelectAll => ServicesVSResources.Select_All;
+        public string DeselectAll => ServicesVSResources.Deselect_All;
+
+        internal StaticMemberSelectionViewModel ViewModel { get; }
+
+        internal StaticMemberSelection(StaticMemberSelectionViewModel viewModel)
+        {
+            ViewModel = viewModel;
+            DataContext = ViewModel;
+            InitializeComponent();
+        }
+
+        private void SelectDependentsButton_Click(object sender, RoutedEventArgs e)
+            => ViewModel.SelectDependents();
+
+        private void SelectAllButton_Click(object sender, RoutedEventArgs e)
+            => ViewModel.SelectAll();
+
+        private void DeselectAllButton_Click(object sender, RoutedEventArgs e)
+            => ViewModel.DeselectAll();
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs
new file mode 100644
index 0000000000000..69a10d6865c97
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs
@@ -0,0 +1,109 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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.Collections.Generic;
+using System.Collections.Immutable;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
+using Microsoft.VisualStudio.Utilities;
+using Roslyn.Utilities;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
+{
+    internal class StaticMemberSelectionViewModel : AbstractNotifyPropertyChanged
+    {
+        private readonly IUIThreadOperationExecutor _uiThreadOperationExecutor;
+        private readonly ImmutableDictionary<ISymbol, Task<ImmutableArray<ISymbol>>> _symbolToDependentsMap;
+        private readonly ImmutableDictionary<ISymbol, SymbolViewModel<ISymbol>> _symbolToMemberViewMap;
+
+        public StaticMemberSelectionViewModel(
+            IUIThreadOperationExecutor uiThreadOperationExecutor,
+            ImmutableArray<SymbolViewModel<ISymbol>> members,
+            ImmutableDictionary<ISymbol, Task<ImmutableArray<ISymbol>>> dependentsMap)
+        {
+            _uiThreadOperationExecutor = uiThreadOperationExecutor;
+            _members = members;
+            _symbolToDependentsMap = dependentsMap;
+            _symbolToMemberViewMap = members.ToImmutableDictionary(memberViewModel => memberViewModel.Symbol);
+        }
+
+        public ImmutableArray<SymbolViewModel<ISymbol>> CheckedMembers => Members.WhereAsArray(m => m.IsChecked);
+
+        private ImmutableArray<SymbolViewModel<ISymbol>> _members;
+        public ImmutableArray<SymbolViewModel<ISymbol>> Members
+        {
+            get => _members;
+            set => SetProperty(ref _members, value);
+        }
+
+        public void SelectAll()
+            => SelectMembers(Members);
+
+        internal void DeselectAll()
+            => SelectMembers(Members, isChecked: false);
+
+        public void SelectDependents()
+        {
+            var checkedMembers = Members
+                .WhereAsArray(member => member.IsChecked);
+
+            var result = _uiThreadOperationExecutor.Execute(
+                title: ServicesVSResources.Move_static_members_to_another_type_colon,
+                defaultDescription: ServicesVSResources.Calculating_dependents,
+                allowCancellation: true,
+                showProgress: true,
+                context =>
+                {
+                    foreach (var member in Members)
+                    {
+                        _symbolToDependentsMap[member.Symbol].Wait(context.UserCancellationToken);
+                    }
+                });
+
+            if (result == UIThreadOperationStatus.Completed)
+            {
+                foreach (var member in checkedMembers)
+                {
+                    var membersToSelected = FindDependents(member.Symbol).SelectAsArray(symbol => _symbolToMemberViewMap[symbol]);
+                    SelectMembers(membersToSelected);
+                }
+            }
+        }
+
+        private void SelectMembers(ImmutableArray<SymbolViewModel<ISymbol>> members, bool isChecked = true)
+        {
+            foreach (var member in members)
+            {
+                member.IsChecked = isChecked;
+            }
+        }
+
+        private ImmutableHashSet<ISymbol> FindDependents(ISymbol member)
+        {
+            var queue = new Queue<ISymbol>();
+            // Under situation like two methods call each other, this hashset is used to 
+            // prevent the infinity loop.
+            var visited = new HashSet<ISymbol>();
+            var result = new HashSet<ISymbol>();
+            queue.Enqueue(member);
+            visited.Add(member);
+            while (!queue.IsEmpty())
+            {
+                var currentMember = queue.Dequeue();
+                result.Add(currentMember);
+                visited.Add(currentMember);
+                foreach (var dependent in _symbolToDependentsMap[currentMember].Result)
+                {
+                    if (!visited.Contains(dependent))
+                    {
+                        queue.Enqueue(dependent);
+                    }
+                }
+            }
+
+            return result.ToImmutableHashSet();
+        }
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
new file mode 100644
index 0000000000000..6e5e2a9e8d5bf
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -0,0 +1,91 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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;
+using System.Composition;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.MoveStaticMembers;
+using Microsoft.CodeAnalysis.PullMemberUp;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Microsoft.VisualStudio.Language.Intellisense;
+using Microsoft.VisualStudio.LanguageServices.Implementation.PullMemberUp;
+using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
+using Microsoft.VisualStudio.Utilities;
+using Roslyn.Utilities;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
+{
+    [ExportWorkspaceService(typeof(IMoveStaticMembersOptionsService), ServiceLayer.Host), Shared]
+    internal class VisualStudioMoveStaticMembersOptionsService : IMoveStaticMembersOptionsService
+    {
+        private readonly IGlyphService _glyphService;
+        private readonly IUIThreadOperationExecutor _uiThreadOperationExecutor;
+
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public VisualStudioMoveStaticMembersOptionsService(
+            IGlyphService glyphService,
+            IUIThreadOperationExecutor uiThreadOperationExecutor)
+        {
+            _glyphService = glyphService;
+            _uiThreadOperationExecutor = uiThreadOperationExecutor;
+        }
+
+        public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol)
+        {
+            var membersInType = selectedType.GetMembers().
+               WhereAsArray(member => MemberAndDestinationValidator.IsMemberValid(member) && member.IsStatic);
+
+            var memberViewModels = membersInType
+                .SelectAsArray(member =>
+                    new SymbolViewModel<ISymbol>(member, _glyphService)
+                    {
+                        // The member user selected will be checked at the beginning.
+                        IsChecked = SymbolEquivalenceComparer.Instance.Equals(selectedNodeSymbol, member),
+                    });
+
+            using var cancellationTokenSource = new CancellationTokenSource();
+            var memberToDependentsMap = SymbolDependentsBuilder.FindMemberToDependentsMap(membersInType, document.Project, cancellationTokenSource.Token);
+
+            var existingTypeNames = selectedType.ContainingNamespace.GetAllTypes(cancellationTokenSource.Token).SelectAsArray(t => t.Name);
+            var candidateName = selectedType.Name + "Helpers";
+            var defaultTypeName = NameGenerator.GenerateUniqueName(candidateName, name => !existingTypeNames.Contains(name));
+
+            var containingNamespaceDisplay = selectedType.ContainingNamespace.IsGlobalNamespace
+                ? string.Empty
+                : selectedType.ContainingNamespace.ToDisplayString();
+
+            var generatedNameTypeParameterSuffix = ExtractTypeHelpers.GetTypeParameterSuffix(document, selectedType, membersInType);
+
+            var selectMembersViewModel = new StaticMemberSelectionViewModel(
+                _uiThreadOperationExecutor,
+                memberViewModels,
+                memberToDependentsMap);
+
+            var viewModel = new MoveStaticMembersDialogViewModel(selectMembersViewModel,
+                defaultTypeName,
+                existingTypeNames,
+                document.GetRequiredLanguageService<ISyntaxFactsService>());
+
+            var dialog = new MoveStaticMembersDialog(viewModel);
+
+            var result = dialog.ShowModal();
+
+            if (result.GetValueOrDefault())
+            {
+                return new MoveStaticMembersOptions(
+                    // TODO: generate unique file name based off of existing folder documents
+                    viewModel.DestinationName + (document.Project.Language == LanguageNames.CSharp ? ".cs" : ".vb"),
+                    string.Join(".", containingNamespaceDisplay, viewModel.DestinationName),
+                    selectMembersViewModel.CheckedMembers.SelectAsArray(vm => vm.Symbol));
+            }
+
+            return MoveStaticMembersOptions.Cancelled;
+        }
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Implementation/PullMemberUp/SymbolDependentsBuilder.cs b/src/VisualStudio/Core/Def/Implementation/PullMemberUp/SymbolDependentsBuilder.cs
index 4f093297de31d..feee10f047b3f 100644
--- a/src/VisualStudio/Core/Def/Implementation/PullMemberUp/SymbolDependentsBuilder.cs
+++ b/src/VisualStudio/Core/Def/Implementation/PullMemberUp/SymbolDependentsBuilder.cs
@@ -10,6 +10,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Operations;
 
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.PullMemberUp
@@ -34,6 +35,7 @@ private class SymbolWalker : OperationWalker
         {
             private readonly ImmutableHashSet<ISymbol> _membersInType;
             private readonly Project _project;
+            private readonly ISymbolDeclarationService _declarationService;
             private readonly HashSet<ISymbol> _dependents;
             private readonly ISymbol _member;
             private readonly CancellationToken _cancellationToken;
@@ -45,6 +47,7 @@ public SymbolWalker(
                 CancellationToken cancellationToken)
             {
                 _project = project;
+                _declarationService = project.LanguageServices.GetRequiredService<ISymbolDeclarationService>();
                 _membersInType = membersInType.ToImmutableHashSet();
                 _dependents = new HashSet<ISymbol>();
                 _member = member;
@@ -53,7 +56,7 @@ public SymbolWalker(
 
             public async Task<ImmutableArray<ISymbol>> FindMemberDependentsAsync()
             {
-                var tasks = _member.DeclaringSyntaxReferences.Select(@ref => @ref.GetSyntaxAsync(_cancellationToken));
+                var tasks = _declarationService.GetDeclarations(_member).Select(@ref => @ref.GetSyntaxAsync(_cancellationToken));
                 var syntaxes = await Task.WhenAll(tasks).ConfigureAwait(false);
                 var compilation = await _project.GetCompilationAsync(_cancellationToken).ConfigureAwait(false);
                 foreach (var syntax in syntaxes)
diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.resx b/src/VisualStudio/Core/Def/ServicesVSResources.resx
index 68a0baf7cfb6f..3fb3a87122997 100644
--- a/src/VisualStudio/Core/Def/ServicesVSResources.resx
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.resx
@@ -1750,6 +1750,15 @@ Additional information: {1}</value>
   <data name="Inherited_interfaces" xml:space="preserve">
     <value>Inherited interfaces</value>
   </data>
+  <data name="A_new_type_will_be_created" xml:space="preserve">
+    <value>A new type will be created</value>
+  </data>
+  <data name="Invalid_type_name" xml:space="preserve">
+    <value>Invalid type name</value>
+  </data>
+  <data name="Move_static_members_to_another_type_colon" xml:space="preserve">
+    <value>Move Static Members to Another Type:</value>
+  </data>
   <data name="Select_an_appropriate_symbol_to_start_value_tracking" xml:space="preserve">
     <value>Select an appropriate symbol to start value tracking</value>
   </data>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
index 0753af220e702..3c009876a0ea5 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Vytvoří se nový obor názvů.</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Typ a název se musí poskytnout.</target>
@@ -467,6 +472,11 @@
         <target state="translated">Zaveďte nedefinované proměnné TODO.</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">Původ položky</target>
@@ -537,6 +547,11 @@
         <target state="translated">Předvolby modifikátorů:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">Přesunout do oboru názvů</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
index c5ab2f2cf642f..182300bea083e 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Ein neuer Namespace wird erstellt.</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Typ und Name müssen angegeben werden.</target>
@@ -467,6 +472,11 @@
         <target state="translated">Nicht definierte TODO-Variablen einführen</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">Elementursprung</target>
@@ -537,6 +547,11 @@
         <target state="translated">Einstellungen für Modifizierer:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">In Namespace verschieben</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
index 54a42ef87611c..1ff3f02f49699 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Se creará un espacio de nombres</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Se debe proporcionar un tipo y un nombre.</target>
@@ -467,6 +472,11 @@
         <target state="translated">Introducir variables TODO sin definir</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">Origen del elemento</target>
@@ -537,6 +547,11 @@
         <target state="translated">Preferencias de modificador:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">Mover a espacio de nombres</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
index df29501c66e5d..d170253605ba3 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Un espace de noms va être créé</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Vous devez fournir un type et un nom.</target>
@@ -467,6 +472,11 @@
         <target state="translated">Introduire des variables TODO non définies</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">Origine de l'élément</target>
@@ -537,6 +547,11 @@
         <target state="translated">Préférences de modificateur :</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">Déplacer vers un espace de noms</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
index 5f5e7d11b2a9c..a0e56e95d8473 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Verrà creato un nuovo spazio dei nomi</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">È necessario specificare un tipo e un nome.</target>
@@ -467,6 +472,11 @@
         <target state="translated">Introduci variabili TODO non definite</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">Origine dell'elemento</target>
@@ -537,6 +547,11 @@
         <target state="translated">Preferenze per modificatore:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">Sposta nello spazio dei nomi</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
index ee914b6f1be69..a85711172d639 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
@@ -12,6 +12,11 @@
         <target state="translated">新しい名前空間が作成されます</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">種類と名前を指定する必要があります。</target>
@@ -467,6 +472,11 @@
         <target state="translated">未定義の TODO 変数の導入</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">項目の送信元</target>
@@ -537,6 +547,11 @@
         <target state="translated">修飾子設定:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">名前空間に移動します</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
index 384b87b646521..0508ff84abfed 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
@@ -12,6 +12,11 @@
         <target state="translated">새 네임스페이스가 만들어집니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">형식과 이름을 지정해야 합니다.</target>
@@ -467,6 +472,11 @@
         <target state="translated">정의되지 않은 TODO 변수 소개</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">항목 원본</target>
@@ -537,6 +547,11 @@
         <target state="translated">한정자 기본 설정:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">네임스페이스로 이동</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
index 181a1f2b850f3..d983f05084af6 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Zostanie utworzona nowa przestrzeń nazw</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Konieczne jest podanie typu i nazwy.</target>
@@ -467,6 +472,11 @@
         <target state="translated">Wprowadź niezdefiniowane zmienne TODO</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">Źródło elementu</target>
@@ -537,6 +547,11 @@
         <target state="translated">Preferencje modyfikatora:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">Przenieś do przestrzeni nazw</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
index 5af4445989851..f56a11c84fc77 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Um namespace será criado</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Um tipo e um nome precisam ser fornecidos.</target>
@@ -467,6 +472,11 @@
         <target state="translated">Introduzir variáveis de TODO indefinidas</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">Origem do item</target>
@@ -537,6 +547,11 @@
         <target state="translated">Preferências do modificador:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">Mover para o Namespace</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
index 2c41a61642a7d..63929be790f57 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Будет создано пространство имен</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Следует указать тип и имя.</target>
@@ -467,6 +472,11 @@
         <target state="translated">Ввести неопределенные переменные TODO</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">Источник элемента</target>
@@ -537,6 +547,11 @@
         <target state="translated">Предпочтения модификатора:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">Переместить в пространство имен</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
index 8df895d27f9cf..4fd8d3d913f19 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Yeni bir ad alanı oluşturulacak</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Bir tür ve ad verilmesi gerekiyor.</target>
@@ -467,6 +472,11 @@
         <target state="translated">Tanımsız TODO değişkenlerini tanıtın</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">Öğe çıkış noktası</target>
@@ -537,6 +547,11 @@
         <target state="translated">Değiştirici tercihleri:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">Ad Alanına Taşı</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
index f6f47afa52544..e9a8624797c95 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
@@ -12,6 +12,11 @@
         <target state="translated">将创建一个新的命名空间</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">必须提供类型和名称。</target>
@@ -467,6 +472,11 @@
         <target state="translated">引入未定义的 TODO 变量</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">项来源</target>
@@ -537,6 +547,11 @@
         <target state="translated">修饰符首选项:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">移动到命名空间</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
index a55cabb29af39..87f860b9d5582 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
@@ -12,6 +12,11 @@
         <target state="translated">將會建立新的命名空間</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_new_type_will_be_created">
+        <source>A new type will be created</source>
+        <target state="new">A new type will be created</target>
+        <note />
+      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">必須提供類型與名稱。</target>
@@ -467,6 +472,11 @@
         <target state="translated">引入未定義的 TODO 變數</target>
         <note>"TODO" is an indicator that more work should be done at the location where the TODO is inserted</note>
       </trans-unit>
+      <trans-unit id="Invalid_type_name">
+        <source>Invalid type name</source>
+        <target state="new">Invalid type name</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Item_origin">
         <source>Item origin</source>
         <target state="translated">項目原點</target>
@@ -537,6 +547,11 @@
         <target state="translated">修飾元喜好設定:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_static_members_to_another_type_colon">
+        <source>Move Static Members to Another Type:</source>
+        <target state="new">Move Static Members to Another Type:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Move_to_namespace">
         <source>Move to Namespace</source>
         <target state="translated">移到命名空間</target>
diff --git a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
new file mode 100644
index 0000000000000..2e68e20062d36
--- /dev/null
+++ b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
@@ -0,0 +1,444 @@
+' Licensed to the .NET Foundation under one or more agreements.
+' The .NET Foundation licenses this file to you under the MIT license.
+' See the LICENSE file in the project root for more information.
+
+Imports System.Collections.Immutable
+Imports System.Threading
+Imports Microsoft.CodeAnalysis
+Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
+Imports Microsoft.CodeAnalysis.LanguageServices
+Imports Microsoft.CodeAnalysis.PullMemberUp
+Imports Microsoft.CodeAnalysis.Shared.Extensions
+Imports Microsoft.CodeAnalysis.Test.Utilities
+Imports Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
+Imports Microsoft.VisualStudio.LanguageServices.Implementation.PullMemberUp
+Imports Microsoft.VisualStudio.LanguageServices.Implementation.Utilities
+Imports Microsoft.VisualStudio.Utilities
+
+Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
+    <UseExportProvider>
+    Public Class MoveStaticMembersViewModelTest
+        Private Async Function GetViewModelAsync(xmlElement As XElement) As Task(Of MoveStaticMembersDialogViewModel)
+            Dim workspaceXml = xmlElement.Value
+            Using workspace = TestWorkspace.Create(workspaceXml)
+                Dim doc = workspace.Documents.ElementAt(0)
+                Dim workspaceDoc = workspace.CurrentSolution.GetDocument(doc.Id)
+                If Not doc.CursorPosition.HasValue Then
+                    Throw New ArgumentException("Missing caret location in document.")
+                End If
+
+                Dim tree = Await workspaceDoc.GetSyntaxTreeAsync().ConfigureAwait(False)
+                Dim syntaxFacts = workspaceDoc.Project.LanguageServices.GetService(Of ISyntaxFactsService)()
+                Dim token = Await tree.GetTouchingWordAsync(doc.CursorPosition.Value, syntaxFacts, CancellationToken.None).ConfigureAwait(False)
+                Dim memberSymbol = (Await workspaceDoc.GetRequiredSemanticModelAsync(CancellationToken.None)).GetDeclaredSymbol(token.Parent)
+                Dim existingNames = memberSymbol.ContainingNamespace.GetAllTypes(CancellationToken.None).Select(Function(type) type.Name).ToImmutableArray()
+                Dim membersInType = memberSymbol.ContainingType.GetMembers().WhereAsArray(Function(member) MemberAndDestinationValidator.IsMemberValid(member))
+                Dim membersViewModel = membersInType.SelectAsArray(
+                    Function(member) New SymbolViewModel(Of ISymbol)(member, glyphService:=Nothing) With {.IsChecked = member.Equals(memberSymbol)})
+                Dim memberToDependents = SymbolDependentsBuilder.FindMemberToDependentsMap(membersInType, workspaceDoc.Project, CancellationToken.None)
+                Dim memberSelectionViewModel = New StaticMemberSelectionViewModel(
+                    workspace.GetService(Of IUIThreadOperationExecutor),
+                    membersViewModel,
+                    memberToDependents)
+                Return New MoveStaticMembersDialogViewModel(
+                    memberSelectionViewModel,
+                    "TestDefaultType",
+                    existingNames,
+                    syntaxFacts)
+            End Using
+        End Function
+
+        Private Function FindMemberByName(name As String, memberArray As ImmutableArray(Of SymbolViewModel(Of ISymbol))) As SymbolViewModel(Of ISymbol)
+            Dim member = memberArray.FirstOrDefault(Function(memberViewModel) memberViewModel.Symbol.Name.Equals(name))
+            Assert.NotNull(member)
+            Return member
+        End Function
+
+        Private Sub SelectMember(name As String, viewModel As StaticMemberSelectionViewModel)
+            Dim member = FindMemberByName(name, viewModel.Members)
+            member.IsChecked = True
+            viewModel.Members.Replace(FindMemberByName(name, viewModel.Members), member)
+            Assert.True(FindMemberByName(name, viewModel.Members).IsChecked)
+        End Sub
+
+        Private Sub DeselectMember(name As String, viewModel As StaticMemberSelectionViewModel)
+            Dim member = FindMemberByName(name, viewModel.Members)
+            member.IsChecked = False
+            viewModel.Members.Replace(FindMemberByName(name, viewModel.Members), member)
+            Assert.False(FindMemberByName(name, viewModel.Members).IsChecked)
+        End Sub
+
+#Region "C#"
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function CSTestNameConflicts() As Task
+            Dim markUp = <Text><![CDATA[
+<Workspace>
+    <Project Language="C#" AssemblyName="CSAssembly1" CommonReferences="true">
+        <Document>
+            namespace TestNs
+            {
+                public class TestClass
+                {
+                    public static int Bar$$bar()
+                    {
+                        return 12345;
+                    }
+                }
+            }
+        </Document>
+        <Document>
+            public class NoNsClass
+            {
+            }
+        </Document>
+        <Document>
+            namespace TestNs
+            {
+                public interface ITestInterface
+                {
+                }
+            }
+        </Document>
+        <Document>
+            namespace TestNs 
+            {
+                public class ConflictingClassName
+                {
+                }
+            }
+        </Document>
+        <Document>
+            namespace TestNs2 
+            {
+                public class ConflictingClassName2
+                {
+                }
+            }
+        </Document>
+    </Project>
+    <Project Language="C#" AssemblyName="CSAssembly2" CommonReferences="true">
+        <Document>
+            namespace TestNs 
+            {
+                public class ConflictingClassName3
+                {
+                }
+            }
+        </Document>
+    </Project>
+</Workspace>]]></Text>
+            Dim viewModel = Await GetViewModelAsync(markUp)
+
+            Assert.Equal(viewModel.DestinationName, "TestDefaultType")
+
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
+            Assert.True(viewModel.CanSubmit)
+
+            viewModel.DestinationName = "ConflictingClassName"
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+
+            viewModel.DestinationName = "ValidName"
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            ' spaces are not allowed as types
+            viewModel.DestinationName = "asd "
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+
+            ' different project
+            viewModel.DestinationName = "ConflictingClassName3"
+            Assert.True(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            viewModel.DestinationName = "ITestInterface"
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+
+            viewModel.DestinationName = "NoNsClass"
+            Assert.True(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            ' different namespace
+            viewModel.DestinationName = "ConflictingClassName2"
+            Assert.True(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            viewModel.DestinationName = "TestClass"
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function CSTestMemberSelection() As Task
+            Dim markUp = <Text><![CDATA[
+<Workspace>
+    <Project Language="C#" AssemblyName="VBAssembly1" CommonReferences="true">
+        <Document>
+            namespace TestNs 
+            {
+                public class TestClass
+                {
+                    public static int Bar$$bar()
+                    {
+                        return 12345;
+                    }
+
+                    public static int TestField;
+
+                    public static int TestField2 = 0;
+
+                    public static void DoSomething()
+                    {
+                    }
+
+                    public static int TestProperty { get; set; }
+
+                    private static int _private = 0
+
+                    public static bool Dependent()
+                    {
+                        return Barbar() == 0;
+                    }
+                }
+            }
+        </Document>
+    </Project>
+</Workspace>]]></Text>
+            Dim viewModel = Await GetViewModelAsync(markUp)
+
+            Dim selectionVm = viewModel.MemberSelectionViewModel
+
+            Assert.True(FindMemberByName("Barbar", selectionVm.Members).IsChecked)
+            For Each member In selectionVm.Members
+                If member.Symbol.Name <> "Barbar" Then
+                    Assert.False(member.IsChecked)
+                End If
+            Next
+
+            SelectMember("TestField", selectionVm)
+            SelectMember("TestField2", selectionVm)
+            SelectMember("DoSomething", selectionVm)
+            SelectMember("TestProperty", selectionVm)
+            SelectMember("_private", selectionVm)
+            SelectMember("Dependent", selectionVm)
+
+            Assert.Equal(7, selectionVm.CheckedMembers.Length)
+            Assert.True(viewModel.CanSubmit)
+
+            DeselectMember("Barbar", selectionVm)
+            DeselectMember("TestField", selectionVm)
+            DeselectMember("TestField2", selectionVm)
+            DeselectMember("DoSomething", selectionVm)
+            DeselectMember("TestProperty", selectionVm)
+            DeselectMember("_private", selectionVm)
+            DeselectMember("Dependent", selectionVm)
+
+            Assert.True(selectionVm.CheckedMembers.IsEmpty)
+            Assert.False(viewModel.CanSubmit)
+
+            selectionVm.SelectAll()
+            Assert.Equal(7, selectionVm.CheckedMembers.Length)
+            Assert.True(viewModel.CanSubmit)
+
+            selectionVm.DeselectAll()
+            Assert.True(selectionVm.CheckedMembers.IsEmpty)
+            Assert.False(viewModel.CanSubmit)
+
+            SelectMember("Dependent", selectionVm)
+            selectionVm.SelectDependents()
+            Assert.True(FindMemberByName("Barbar", selectionVm.Members).IsChecked)
+            Assert.Equal(2, selectionVm.CheckedMembers.Length)
+            Assert.True(viewModel.CanSubmit)
+        End Function
+#End Region
+
+#Region "VB"
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function VBTestNameConflicts() As Task
+            Dim markUp = <Text><![CDATA[
+<Workspace>
+    <Project Language="Visual Basic" AssemblyName="VBAssembly1" CommonReferences="true">
+        <Document>
+            Namespace TestNs
+                Public Class TestClass
+                    Public Shared Function Bar$$bar() As Integer
+                        Return 12345;
+                    End Function
+                End Class
+            End Namespace
+        </Document>
+        <Document>
+            Public Class NoNsClass
+            End Class
+        </Document>
+        <Document>
+            Namespace TestNs
+                Public Interface ITestInterface
+                End Interface
+            End Namespace
+        </Document>
+        <Document>
+            Namespace TestNs
+                Public Class ConflictingClassName
+                End Class
+            End Namespace
+        </Document>
+        <Document>
+            Namespace TestNs2
+                Public Class ConflictingClassName2
+                End Class
+            End Namespace
+        </Document>
+    </Project>
+    <Project Language="C#" AssemblyName="CSAssembly2" CommonReferences="true">
+        <Document>
+            Namespace TestNs
+                Public Class ConflictingClassName3
+                End Class
+            End Namespace
+        </Document>
+    </Project>
+</Workspace>]]></Text>
+            Dim viewModel = Await GetViewModelAsync(markUp)
+
+            Assert.Equal(viewModel.DestinationName, "TestDefaultType")
+
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
+            Assert.True(viewModel.CanSubmit)
+
+            viewModel.DestinationName = "ConflictingClassName"
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+
+            viewModel.DestinationName = "asd "
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+
+            viewModel.DestinationName = "ValidName"
+            Assert.True(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            viewModel.DestinationName = "ConflictingClassName3"
+            Assert.True(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            viewModel.DestinationName = "ITestInterface"
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+
+            viewModel.DestinationName = "NoNsClass"
+            Assert.True(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            viewModel.DestinationName = "ConflictingClassName2"
+            Assert.True(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+
+            viewModel.DestinationName = "TestClass"
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function VBTestMemberSelection() As Task
+            Dim markUp = <Text><![CDATA[
+<Workspace>
+    <Project Language="Visual Basic" AssemblyName="VBAssembly1" CommonReferences="true">
+        <Document>
+            Namespace TestNs
+                Public Class TestClass
+                    Public Shared Function Bar$$bar() As Integer
+                        Return 12345
+                    End Function
+
+                    Public Shared TestField As Integer
+
+                    Public Shared TestField2 As Integer = 0
+
+                    Public Shared Sub DoSomething()
+                    End Sub
+
+                    Public Shared Property TestProperty As Integer
+
+                    Private Shared _private As Integer = 0
+
+                    Public Shared Function Dependent() As Boolean
+                        Return Barbar() = 0
+                    End Function
+                End Class
+            End Namespace
+        </Document>
+    </Project>
+</Workspace>]]></Text>
+            Dim viewModel = Await GetViewModelAsync(markUp)
+
+            Dim selectionVm = viewModel.MemberSelectionViewModel
+
+            Assert.True(FindMemberByName("Barbar", selectionVm.Members).IsChecked)
+            For Each member In selectionVm.Members
+                If member.Symbol.Name <> "Barbar" Then
+                    Assert.False(member.IsChecked)
+                End If
+            Next
+
+            SelectMember("TestField", selectionVm)
+            SelectMember("TestField2", selectionVm)
+            SelectMember("DoSomething", selectionVm)
+            SelectMember("TestProperty", selectionVm)
+            SelectMember("_private", selectionVm)
+            SelectMember("Dependent", selectionVm)
+
+            Assert.Equal(7, selectionVm.CheckedMembers.Length)
+            Assert.True(viewModel.CanSubmit)
+
+            DeselectMember("Barbar", selectionVm)
+            DeselectMember("TestField", selectionVm)
+            DeselectMember("TestField2", selectionVm)
+            DeselectMember("DoSomething", selectionVm)
+            DeselectMember("TestProperty", selectionVm)
+            DeselectMember("_private", selectionVm)
+            DeselectMember("Dependent", selectionVm)
+
+            Assert.True(selectionVm.CheckedMembers.IsEmpty)
+            Assert.False(viewModel.CanSubmit)
+
+            selectionVm.SelectAll()
+            Assert.Equal(7, selectionVm.CheckedMembers.Length)
+            Assert.True(viewModel.CanSubmit)
+
+            selectionVm.DeselectAll()
+            Assert.True(selectionVm.CheckedMembers.IsEmpty)
+            Assert.False(viewModel.CanSubmit)
+
+            SelectMember("Dependent", selectionVm)
+            selectionVm.SelectDependents()
+            Assert.True(FindMemberByName("Barbar", selectionVm.Members).IsChecked)
+            Assert.Equal(2, selectionVm.CheckedMembers.Length)
+            Assert.True(viewModel.CanSubmit)
+        End Function
+#End Region
+    End Class
+End Namespace

From 8a43f2ad740d5408ab9620aea8f9a44b25b8529a Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Tue, 10 Aug 2021 11:00:21 -0700
Subject: [PATCH 22/64] Make module now for VB, add refactor tests

---
 .../CSharpMoveStaticMembersTests.cs           |  75 ++++
 .../VisualBasicMoveStaticMembersTests.vb      | 327 +++++++++++++++---
 .../MoveStaticMembersWithDialogCodeAction.cs  |   2 +-
 .../Portable/PullMemberUp/MembersPuller.cs    |  17 +-
 4 files changed, 362 insertions(+), 59 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index 449eb8e69e676..61d97482123f5 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -1253,6 +1253,81 @@ await TestMovementAsync(initialMarkup,
                 newFileName).ConfigureAwait(false);
         }
 
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorUsageSeparateFile()
+        {
+            var initialMarkup = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}
+        </Document>
+        <Document FilePath=""Class2.cs"">
+using TestNs1;
+
+public class Class2
+{
+    public static int TestMethod2()
+    {
+        return Class1.TestMethod();
+    }
+}
+        </Document>
+    </Project>
+</Workspace>";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult = @"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.cs"">
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Class2.cs"">
+using TestNs1;
+
+public class Class2
+{
+    public static int TestMethod2()
+    {
+        return Class1Helpers.TestMethod();
+    }
+}
+        </Document>
+        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}</Document>
+    </Project>
+</Workspace>";
+            await TestMovementAsync(initialMarkup,
+                expectedResult,
+                selectedDestinationName,
+                selectedMembers,
+                newFileName).ConfigureAwait(false);
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestMoveExtensionMethodDontRefactor()
         {
diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index 55d3083fdc856..2699a8b80ae37 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -75,9 +75,9 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared TestField As Integer = 0
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -117,13 +117,13 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared Property TestProperty As Integer
             Get
                 Return 0
             End Get
         End Property
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -159,9 +159,9 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared Event TestEvent As EventHandler
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -207,7 +207,7 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared Custom Event Click As EventHandler
             AddHandler(ByVal value As EventHandler)
                 Events.AddHandler(""ClickEvent"", value)
@@ -219,7 +219,7 @@ End Namespace
                 CType(Events(""ClickEvent""), EventHandler).Invoke(sender, e)
             End RaiseEvent
         End Event
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -257,11 +257,11 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared Function TestFunc() As Integer
             Return 0
         End Function
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -298,10 +298,10 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared Sub TestSub()
         End Sub
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -337,9 +337,9 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared Const TestConst As Integer = 0
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -381,11 +381,11 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared Function TestFunc() As Integer
             Return 0
         End Function
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -427,11 +427,11 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs.InnerNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared Function TestFunc() As Integer
             Return 0
         End Function
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -462,9 +462,9 @@ End Class
 Public Class Class1
 End Class
         </Document>
-        <Document FilePath=""Class1Helpers.vb"">Class Class1Helpers
+        <Document FilePath=""Class1Helpers.vb"">Module Class1Helpers
     Public Shared TestField As Integer = 0
-End Class
+End Module
 </Document>
     </Project>
 </Workspace>"
@@ -495,9 +495,9 @@ Public Class Class1
 End Class
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared TestField As Integer = 0
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -533,9 +533,9 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs.InnerNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared TestField As Integer = 0
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -573,11 +573,11 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared Function TestFunc(Of T)(item As T) As T
             Return item
         End Function
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -615,11 +615,11 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers(Of T)
+    Module Class1Helpers(Of T)
         Public Shared Function TestFunc(item As T) As T
             Return item
         End Function
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -657,11 +657,11 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document Folders=""Folder1"" FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared Function TestFunc() As Integer
             Return 0
         End Function
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -703,7 +703,7 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared Function TestFunc1() As Integer
             Return 0
         End Function
@@ -711,7 +711,7 @@ End Namespace
         Public Shared Function TestFunc2() As Boolean
             Return False
         End Function
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -756,12 +756,12 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
 
         Public Shared Function TestFunc2() As Boolean
             Return False
         End Function
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -817,7 +817,7 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared TestField As Integer = 0
 
         Public Shared Property TestProperty As Integer
@@ -834,13 +834,246 @@ End Namespace
         Public Shared Function TestFunc() As Integer
             Return 0
         End Function
+    End Module
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionAndRefactorUsage() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+
+    Public Class Class2
+        Public Shared Function TestFunc2() As Integer
+            Return Class1.TestFunc() + 1
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+
+    Public Class Class2
+        Public Shared Function TestFunc2() As Integer
+            Return Class1Helpers.TestFunc() + 1
+        End Function
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Module Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Module
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionAndRefactorUsageDifferentNamespace() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Imports TestNs
+
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+
+Namespace TestNs2
+    Public Class Class2
+        Public Shared Function TestFunc2() As Integer
+            Return Class1.TestFunc() + 1
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Imports TestNs
+
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+
+Namespace TestNs2
+    Public Class Class2
+        Public Shared Function TestFunc2() As Integer
+            Return Class1Helpers.TestFunc() + 1
+        End Function
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Module Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Module
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionAndRefactorUsageNewNamespace() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+
+    Public Class Class2
+        Public Shared Function TestFunc2() As Integer
+            Return Class1.TestFunc() + 1
+        End Function
+    End Class
+End Namespace
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "ExtraNs.Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Imports TestNs.ExtraNs
+
+Namespace TestNs
+    Public Class Class1
+    End Class
+
+    Public Class Class2
+        Public Shared Function TestFunc2() As Integer
+            Return Class1Helpers.TestFunc() + 1
+        End Function
     End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs.ExtraNs
+    Module Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Module
 End Namespace
 </Document>
     </Project>
 </Workspace>"
             Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
         End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionAndRefactorUsageSeparateFile() As Task
+            Dim initialMarkup = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class2.vb"">
+Imports TestNs
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return Class1.TestFunc() + 1
+    End Function
+End Class
+        </Document>
+    </Project>
+</Workspace>
+"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText = "
+<Workspace>
+    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
+        <Document FilePath=""Class1.vb"">
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+        </Document>
+        <Document FilePath=""Class2.vb"">
+Imports TestNs
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return Class1Helpers.TestFunc() + 1
+    End Function
+End Class
+        </Document>
+        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+    Module Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Module
+End Namespace
+</Document>
+    </Project>
+</Workspace>"
+            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+        End Function
+
 #End Region
 #Region "SelectionTests"
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -871,9 +1104,9 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared TestField As Integer = 0
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -909,9 +1142,9 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared TestField As Integer = 0
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -965,9 +1198,9 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared TestField As Integer = 0
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -1003,9 +1236,9 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared TestField As Integer = 0
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -1043,11 +1276,11 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared Function TestFunc() As Integer
             Return 0
         End Function
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
@@ -1085,11 +1318,11 @@ Namespace TestNs
 End Namespace
         </Document>
         <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+    Module Class1Helpers
         Public Shared Function TestFunc() As Integer
             Return 0
         End Function
-    End Class
+    End Module
 End Namespace
 </Document>
     </Project>
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index d261d1f04c584..26db4c6912659 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -80,7 +80,7 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
                 ImmutableArray.Create<AttributeData>(),
                 Accessibility.NotApplicable,
                 DeclarationModifiers.Static,
-                TypeKind.Class,
+                TypeKind.Module,
                 moveOptions.TypeName,
                 typeParameters: typeParameters);
 
diff --git a/src/Features/Core/Portable/PullMemberUp/MembersPuller.cs b/src/Features/Core/Portable/PullMemberUp/MembersPuller.cs
index ca7833aaf94d4..ff108fe9bf512 100644
--- a/src/Features/Core/Portable/PullMemberUp/MembersPuller.cs
+++ b/src/Features/Core/Portable/PullMemberUp/MembersPuller.cs
@@ -57,18 +57,13 @@ public static Task<Solution> PullMembersUpAsync(
             PullMembersUpOptions pullMembersUpOptions,
             CancellationToken cancellationToken)
         {
-            if (pullMembersUpOptions.Destination.TypeKind == TypeKind.Interface)
+            return pullMembersUpOptions.Destination.TypeKind switch
             {
-                return PullMembersIntoInterfaceAsync(document, pullMembersUpOptions, document.Project.Solution, cancellationToken);
-            }
-            else if (pullMembersUpOptions.Destination.TypeKind == TypeKind.Class)
-            {
-                return PullMembersIntoClassAsync(document, pullMembersUpOptions, document.Project.Solution, cancellationToken);
-            }
-            else
-            {
-                throw ExceptionUtilities.UnexpectedValue(pullMembersUpOptions.Destination);
-            }
+                TypeKind.Interface => PullMembersIntoInterfaceAsync(document, pullMembersUpOptions, document.Project.Solution, cancellationToken),
+                // We can treat VB modules as a static class
+                TypeKind.Class or TypeKind.Module => PullMembersIntoClassAsync(document, pullMembersUpOptions, document.Project.Solution, cancellationToken),
+                _ => throw ExceptionUtilities.UnexpectedValue(pullMembersUpOptions.Destination),
+            };
         }
 
         private static IMethodSymbol FilterOutNonPublicAccessor(IMethodSymbol getterOrSetter)

From 226b83fb88c834773974edb64ff444b736ecab50 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Tue, 10 Aug 2021 16:19:48 -0700
Subject: [PATCH 23/64] Updated C# tests to a new framework. May need to
 rewrite VB test file in C# to set some readonly properties

---
 .../CSharpMoveStaticMembersTests.cs           | 1457 ++++++++---------
 .../TestMoveStaticMembersService.cs           |   24 +-
 ...arpMoveStaticMembersRefactoringProvider.cs |   10 +-
 ...actMoveStaticMembersRefactoringProvider.cs |   12 +-
 .../MoveStaticMembersWithDialogCodeAction.cs  |    9 +-
 ...sicMoveStaticMembersRefactoringProvider.vb |    7 +-
 6 files changed, 686 insertions(+), 833 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index 61d97482123f5..8c5b6e592e438 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -4,154 +4,112 @@
 
 using System.Collections.Immutable;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CodeActions;
-using Microsoft.CodeAnalysis.CodeRefactorings;
-using Microsoft.CodeAnalysis.CSharp.CodeRefactorings.MoveStaticMembers;
-using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeRefactorings;
 using Microsoft.CodeAnalysis.MoveStaticMembers;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Microsoft.CodeAnalysis.Test.Utilities.MoveStaticMembers;
 using Xunit;
+using VerifyCS = Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions.CSharpCodeRefactoringVerifier<
+    Microsoft.CodeAnalysis.CSharp.CodeRefactorings.MoveStaticMembers.CSharpMoveStaticMembersRefactoringProvider>;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.MoveStaticMembers
 {
-    public class CSharpMoveStaticMembersTests : AbstractCSharpCodeActionTest
+    public class CSharpMoveStaticMembersTests
     {
-        protected override CodeRefactoringProvider CreateCodeRefactoringProvider(Workspace workspace, TestParameters parameters)
-        {
-            return new CSharpMoveStaticMembersRefactoringProvider((IMoveStaticMembersOptionsService)parameters.fixProviderData);
-        }
-
-        protected override ImmutableArray<CodeAction> MassageActions(ImmutableArray<CodeAction> actions) => FlattenActions(actions);
-
-        private async Task TestNoRefactoringProvidedAsync(
-            string initialMarkup,
-            TestParameters parameters = default)
-        {
-            using var workspace = CreateWorkspaceFromOptions(initialMarkup, parameters);
-            var (actions, _) = await GetCodeActionsAsync(workspace, parameters).ConfigureAwait(false);
-            // no actions should be provided
-            Assert.Equal(0, actions.Length);
-        }
-
-        internal Task TestMovementAsync(
-            string initialMarkUp,
-            string expectedResult,
-            string destinationType,
-            ImmutableArray<string> selection,
-            string destinationName = "a.cs",
-            TestParameters parameters = default)
-        {
-            var service = new TestMoveStaticMembersService(destinationType, destinationName, selection.AsImmutable());
-
-            return TestInRegularAndScript1Async(
-                initialMarkUp,
-                expectedResult,
-                parameters.WithFixProviderData(service));
-        }
+        private static readonly TestComposition s_testServices = FeaturesTestCompositions.Features.AddParts(typeof(TestMoveStaticMembersService));
 
         #region Perform Actions From Options
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveField()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         public static int Test[||]Field = 1;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
         public static int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveProperty()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         public static int Test[||]Property { get; set; }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestProperty");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
         public static int TestProperty { get; set; }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveEvent()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 using System;
 
 namespace TestNs1
@@ -160,17 +118,11 @@ public class Class1
     {
         public static event EventHandler Test[||]Event;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestEvent");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 using System;
 
 namespace TestNs1
@@ -178,9 +130,8 @@ namespace TestNs1
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">using System;
+}";
+            var expectedResult2 = @"using System;
 
 namespace TestNs1
 {
@@ -188,23 +139,26 @@ static class Class1Helpers
     {
         public static event EventHandler TestEvent;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveMethod()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -214,25 +168,18 @@ public class Class1
             return 0;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
@@ -241,23 +188,26 @@ public static int TestMethod()
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveExtensionMethod()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public static class Class1
@@ -276,17 +226,11 @@ public Other()
             OtherInt = 5;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public static class Class1
@@ -301,9 +245,8 @@ public Other()
             OtherInt = 5;
         }
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
@@ -312,75 +255,70 @@ public static int TestMethod(this Other other)
             return other.OtherInt + 2;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveConstField()
         {
             // const is static so we should work here
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         public const int Test[||]Field = 1;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
         public const int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveMultipleMethods()
         {
-            // Bug where PullMembersUp doesn't apply formatting annotation
-            // When the destination ends up with more than one member:
-            // https://github.com/dotnet/roslyn/issues/54847
-            // so we keep the weird formatting for now
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -395,56 +333,52 @@ public static bool TestMethodBool()
             return false;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethodInt", "TestMethodBool");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
-
         public static bool TestMethodBool()
         {
             return false;
         }
+
         public static int TestMethodInt()
         {
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveSingleMethodFromMultiple()
         {
             // move the method that this was not triggered on
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -459,17 +393,11 @@ public static bool TestMethodBool()
             return false;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethodBool");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
@@ -479,9 +407,8 @@ public static int TestMethodInt()
             return 0;
         }
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
@@ -491,27 +418,26 @@ public static bool TestMethodBool()
             return false;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveOneOfEach()
         {
-            // Bug where PullMembersUp doesn't apply formatting annotation
-            // When the destination ends up with more than one member:
-            // https://github.com/dotnet/roslyn/issues/54847
-            // so we keep the weird formatting for now
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 using System;
 
 namespace TestNs1
@@ -529,10 +455,7 @@ public class Class1
 
         public static event EventHandler TestEvent;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create(
@@ -540,10 +463,7 @@ public class Class1
                 "TestField",
                 "TestProperty",
                 "TestEvent");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 using System;
 
 namespace TestNs1
@@ -551,15 +471,13 @@ namespace TestNs1
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">using System;
+}";
+            var expectedResult2 = @"using System;
 
 namespace TestNs1
 {
     static class Class1Helpers
     {
-
         public static int TestField;
 
         public static bool TestProperty { get; set; }
@@ -571,23 +489,26 @@ static class Class1Helpers
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestInNestedClass()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -597,17 +518,11 @@ public class NestedClass1
             public static int Test[||]Field = 1;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
@@ -616,32 +531,34 @@ public class NestedClass1
         {
         }
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
         public static int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestInNestedNamespace()
         {
-            // collapse the namespaces
+            // collapse the namespaces in the new file
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     namespace InnerNs
@@ -651,17 +568,11 @@ public class Class1
             public static int Test[||]Field = 1;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     namespace InnerNs
@@ -670,112 +581,106 @@ public class Class1
         {
         }
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1.InnerNs
+}";
+            var expectedResult2 = @"namespace TestNs1.InnerNs
 {
     static class Class1Helpers
     {
         public static int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveFieldNoNamespace()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 public class Class1
 {
     public static int Test[||]Field = 1;
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 public class Class1
 {
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">static class Class1Helpers
+}";
+            var expectedResult2 = @"static class Class1Helpers
 {
     public static int TestField = 1;
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveFieldNewNamespace()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 public class Class1
 {
     public static int Test[||]Field = 1;
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "NewNs.Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 public class Class1
 {
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace NewNs
+}";
+            var expectedResult2 = @"namespace NewNs
 {
     static class Class1Helpers
     {
         public static int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveMethodWithNamespacedSelectedDestination()
         {
             // in the case that we have an extra namespace in the destination name
             // we append it on to the old type's namespace
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -785,25 +690,18 @@ public class Class1
             return 0;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "ExtraNs.Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1.ExtraNs
+}";
+            var expectedResult2 = @"namespace TestNs1.ExtraNs
 {
     static class Class1Helpers
     {
@@ -812,24 +710,27 @@ public static int TestMethod()
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveMethodFileScopedNamespace()
         {
-            // We still keep normal namespacing rules in the new file regardless
+            // We still keep normal namespacing rules in the new file
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1;
 
 public class Class1
@@ -838,24 +739,17 @@ public class Class1
     {
         return 0;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1;
 
 public class Class1
 {
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
@@ -864,24 +758,28 @@ public static int TestMethod()
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+                LanguageVersion = CodeAnalysis.CSharp.LanguageVersion.CSharp10
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveMethodWithFolders()
         {
-            // We should just put the new file in the same folder
+            // We should just put the new file in the same folder as source
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document Folders=""Folder1"" FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -891,25 +789,18 @@ public class Class1
             return 0;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document Folders=""Folder1"" FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document Folders=""Folder1"" FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
@@ -918,129 +809,129 @@ public static int TestMethod()
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestState = {
+                    Sources =
+                    {
+                        ("someFolder/Class1.cs", initialMarkup)
+                    }
+                },
+                FixedState =
+                {
+                    Sources =
+                    {
+                        ("someFolder/Class1.cs", expectedResult1),
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveGenericMethod()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
-        public static T Test[||]Method&lt;T&gt;(T item)
+        public static T Test[||]Method<T>(T item)
         {
             return item;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
-        public static T TestMethod&lt;T&gt;(T item)
+        public static T TestMethod<T>(T item)
         {
             return item;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveMethodWithGenericClass()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
-    public class Class1&lt;T&gt;
+    public class Class1<T>
     {
         public static T Test[||]Method(T item)
         {
             return item;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
-    public class Class1&lt;T&gt;
+    public class Class1<T>
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers&lt;T&gt;
+    static class Class1Helpers<T>
     {
         public static T Test[||]Method(T item)
         {
             return item;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveMethodAndRefactorUsage()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -1058,17 +949,11 @@ public static int TestMethod2()
             return Class1.TestMethod();
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
@@ -1082,9 +967,8 @@ public static int TestMethod2()
             return Class1Helpers.TestMethod();
         }
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
@@ -1093,23 +977,26 @@ public static int TestMethod()
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveMethodAndRefactorUsageDifferentNamespace()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -1132,17 +1019,11 @@ public static int TestMethod2()
             return Class1.TestMethod();
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
@@ -1161,9 +1042,8 @@ public static int TestMethod2()
             return Class1Helpers.TestMethod();
         }
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
@@ -1172,23 +1052,26 @@ public static int TestMethod()
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveMethodAndRefactorUsageNewNamespace()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -1206,17 +1089,11 @@ public static int TestMethod2()
             return Class1.TestMethod();
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "ExtraNs.Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 using TestNs1.ExtraNs;
 
 namespace TestNs1
@@ -1232,9 +1109,8 @@ public static int TestMethod2()
             return Class1Helpers.TestMethod();
         }
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1.ExtraNs
+}";
+            var expectedResult2 = @"namespace TestNs1.ExtraNs
 {
     static class Class1Helpers
     {
@@ -1243,23 +1119,26 @@ public static int TestMethod()
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveMethodAndRefactorUsageSeparateFile()
         {
-            var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var initialMarkup1 = @"
 namespace TestNs1
 {
     public class Class1
@@ -1269,9 +1148,8 @@ public class Class1
             return 0;
         }
     }
-}
-        </Document>
-        <Document FilePath=""Class2.cs"">
+}";
+            var initialMarkup2 = @"
 using TestNs1;
 
 public class Class2
@@ -1280,25 +1158,18 @@ public static int TestMethod2()
     {
         return Class1.TestMethod();
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class2.cs"">
+}";
+            var expectedResult3 = @"
 using TestNs1;
 
 public class Class2
@@ -1307,9 +1178,8 @@ public static int TestMethod2()
     {
         return Class1Helpers.TestMethod();
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
@@ -1318,23 +1188,34 @@ public static int TestMethod()
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestState =
+                {
+                    Sources =
+                    {
+                        initialMarkup1,
+                        initialMarkup2
+                    }
+                },
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        expectedResult3,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveExtensionMethodDontRefactor()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public static class Class1
@@ -1362,17 +1243,11 @@ public Other()
             OtherInt = 5;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public static class Class1
@@ -1396,9 +1271,8 @@ public Other()
             OtherInt = 5;
         }
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
@@ -1407,23 +1281,26 @@ public static int TestMethod(this Other other)
             return other.OtherInt + 2;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestMoveExtensionMethodRefactorImports()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     using TestNs2;
@@ -1458,17 +1335,11 @@ public Other()
             OtherInt = 5;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "ExtraNs.Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     using TestNs2;
@@ -1500,9 +1371,8 @@ public Other()
             OtherInt = 5;
         }
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">using TestNs2;
+}";
+            var expectedResult2 = @"using TestNs2;
 
 namespace TestNs1.ExtraNs
 {
@@ -1513,26 +1383,29 @@ public static int TestMethod(this Other other)
             return other.OtherInt + 2;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
         #endregion
 
         #region Selections and caret position
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestSelectInMethodParens()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -1542,25 +1415,18 @@ public static int TestMethod([||])
             return 0;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
@@ -1569,211 +1435,198 @@ public static int TestMethod()
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestSelectWholeFieldDeclaration()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         [|public static int TestField = 1;|]
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
         public static int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestSelectBeforeKeywordOfDeclaration()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         [||]public static int TestField = 1;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
         public static int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestSelectInKeyWordOfDeclaration1()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         pub[||]lic static int TestField = 1;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
         public static int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestSelectInKeyWordOfDeclaration2()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         public st[||]atic int TestField = 1;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
         public static int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestSelectInTypeIdentifierMethodDeclaration()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -1783,25 +1636,18 @@ public class Class1
             return 0;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
@@ -1810,112 +1656,109 @@ public static int TestMethod()
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestSelectInTypeIdentifierOfFieldDeclaration_NoAction()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         public static i[||]nt TestField = 1;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
-            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+}";
+            await new Test("", ImmutableArray<string>.Empty)
+            {
+                TestCode = initialMarkup,
+                FixedCode = initialMarkup
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestSelectInFieldInitializerEquals_NoAction()
         {
             // The initializer isn't a member declaration
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         public static int TestField =[||] 1;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
-            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+}";
+            await new Test("", ImmutableArray<string>.Empty)
+            {
+                TestCode = initialMarkup,
+                FixedCode = initialMarkup
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestSelectInFieldInitializerAfterSemicolon()
         {
             // However, a semicolon after the initializer is still considered a declaration
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         public static int TestField = 1;[||]
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
         public static int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestSelectMethodBody_NoAction()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -1925,20 +1768,19 @@ public static int TestMethod()
             retu[||]rn 0;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
-            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+}";
+            await new Test("", ImmutableArray<string>.Empty)
+            {
+                TestCode = initialMarkup,
+                FixedCode = initialMarkup
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestSelectMethodBracket_NoAction()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -1948,52 +1790,83 @@ public static int TestMethod()
             return 0;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
-            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+}";
+            await new Test("", ImmutableArray<string>.Empty)
+            {
+                TestCode = initialMarkup,
+                FixedCode = initialMarkup
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestSelectPropertyBody_NoAction()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         public static int TestProperty { get; [||]set; }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
-            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+}";
+            await new Test("", ImmutableArray<string>.Empty)
+            {
+                TestCode = initialMarkup,
+                FixedCode = initialMarkup
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
         public async Task TestSelectNonStaticProperty_NoAction()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         public int Test[||]Property { get; set; }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
-            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+}";
+            await new Test("", ImmutableArray<string>.Empty)
+            {
+                TestCode = initialMarkup,
+                FixedCode = initialMarkup
+            }.RunAsync().ConfigureAwait(false);
         }
         #endregion
+
+        private class Test : VerifyCS.Test
+        {
+            public Test(
+                string destinationType,
+                ImmutableArray<string> selection,
+                string destinationName = "a.cs")
+            {
+                _destinationType = destinationType;
+                _selection = selection;
+                _destinationName = destinationName;
+            }
+
+            private readonly string _destinationType;
+
+            private readonly ImmutableArray<string> _selection;
+
+            private readonly string _destinationName;
+
+            protected override Workspace CreateWorkspaceImpl()
+            {
+                var hostServices = s_testServices.GetHostServices();
+
+                var workspace = new AdhocWorkspace(hostServices);
+                var testOptionsService = (TestMoveStaticMembersService)workspace.Services.GetRequiredService<IMoveStaticMembersOptionsService>();
+                testOptionsService.DestinationType = _destinationType;
+                testOptionsService.SelectedMembers = _selection;
+                testOptionsService.Filename = _destinationName;
+
+                return workspace;
+            }
+        }
     }
 }
diff --git a/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
index 69cd955a824ec..40046459884fc 100644
--- a/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
+++ b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
@@ -3,35 +3,35 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Immutable;
+using System.Composition;
+using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.MoveStaticMembers;
 
 namespace Microsoft.CodeAnalysis.Test.Utilities.MoveStaticMembers
 {
+    [ExportWorkspaceService(typeof(IMoveStaticMembersOptionsService))]
+    [Shared]
+    [PartNotDiscoverable]
     internal class TestMoveStaticMembersService : IMoveStaticMembersOptionsService
     {
-        private readonly string _destinationType;
+        public string DestinationType { get; set; }
 
-        private readonly ImmutableArray<string> _selectedMembers;
+        public ImmutableArray<string> SelectedMembers { get; set; }
+
+        public string Filename { get; set; }
 
-        private readonly string _filename;
 
-        public TestMoveStaticMembersService(string destinationType, string fileName, ImmutableArray<string> members)
-        {
-            _destinationType = destinationType;
-            _filename = fileName;
-            _selectedMembers = members;
-        }
 
         public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol)
         {
-            var selectedMembers = selectedType.GetMembers().WhereAsArray(symbol => _selectedMembers.Contains(symbol.Name));
+            var selectedMembers = selectedType.GetMembers().WhereAsArray(symbol => SelectedMembers.Contains(symbol.Name));
             var namespaceDisplay = selectedType.ContainingNamespace.IsGlobalNamespace
                 ? string.Empty
                 : selectedType.ContainingNamespace.ToDisplayString();
             // just return all the selected members
             return new MoveStaticMembersOptions(
-                _filename,
-                string.Join(".", namespaceDisplay, _destinationType),
+                Filename,
+                string.Join(".", namespaceDisplay, DestinationType),
                 selectedMembers);
         }
     }
diff --git a/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersRefactoringProvider.cs b/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersRefactoringProvider.cs
index 40d3c13b4732c..6f6b5deb25ede 100644
--- a/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersRefactoringProvider.cs
+++ b/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersRefactoringProvider.cs
@@ -15,17 +15,9 @@ namespace Microsoft.CodeAnalysis.CSharp.CodeRefactorings.MoveStaticMembers
     [ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = PredefinedCodeRefactoringProviderNames.MoveStaticMembers), Shared]
     internal class CSharpMoveStaticMembersRefactoringProvider : AbstractMoveStaticMembersRefactoringProvider
     {
-        /// <summary>
-        /// Test purpose only.
-        /// </summary>
-        [SuppressMessage("RoslynDiagnosticsReliability", "RS0034:Exported parts should have [ImportingConstructor]", Justification = "Used incorrectly by tests")]
-        public CSharpMoveStaticMembersRefactoringProvider(IMoveStaticMembersOptionsService? service) : base(service)
-        {
-        }
-
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-        public CSharpMoveStaticMembersRefactoringProvider() : this(service: null)
+        public CSharpMoveStaticMembersRefactoringProvider() : base()
         {
         }
 
diff --git a/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs b/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
index 69215560d2855..a1f869d251ec8 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
@@ -13,16 +13,8 @@ namespace Microsoft.CodeAnalysis.MoveStaticMembers
 {
     internal abstract class AbstractMoveStaticMembersRefactoringProvider : CodeRefactoringProvider
     {
-        private readonly IMoveStaticMembersOptionsService? _service;
-
         protected abstract Task<SyntaxNode> GetSelectedNodeAsync(CodeRefactoringContext context);
 
-        /// <summary>
-        /// Test purpose only
-        /// </summary>
-        protected AbstractMoveStaticMembersRefactoringProvider(IMoveStaticMembersOptionsService? service)
-            => _service = service;
-
         public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
         {
             var (document, span, cancellationToken) = context;
@@ -56,7 +48,9 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
 
             var syntaxFacts = document.GetRequiredLanguageService<ISyntaxFactsService>();
 
-            var action = new MoveStaticMembersWithDialogCodeAction(document, span, _service, selectedType, selectedMember: selectedMembers[0]);
+            var service = document.Project.Solution.Workspace.Services.GetRequiredService<IMoveStaticMembersOptionsService>();
+
+            var action = new MoveStaticMembersWithDialogCodeAction(document, span, service, selectedType, selectedMember: selectedMembers[0]);
 
             context.RegisterRefactoring(action, selectedMembers[0].DeclaringSyntaxReferences[0].Span);
         }
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 26db4c6912659..9633beee0d285 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -27,7 +27,7 @@ internal class MoveStaticMembersWithDialogCodeAction : CodeActionWithOptions
         private readonly Document _document;
         private readonly ISymbol? _selectedMember;
         private readonly INamedTypeSymbol _selectedType;
-        private IMoveStaticMembersOptionsService? _service;
+        private IMoveStaticMembersOptionsService _service;
 
         public TextSpan Span { get; }
         public override string Title => FeaturesResources.Move_static_members_to_another_type;
@@ -35,7 +35,7 @@ internal class MoveStaticMembersWithDialogCodeAction : CodeActionWithOptions
         public MoveStaticMembersWithDialogCodeAction(
             Document document,
             TextSpan span,
-            IMoveStaticMembersOptionsService? service,
+            IMoveStaticMembersOptionsService service,
             INamedTypeSymbol selectedType,
             ISymbol? selectedMember = null)
         {
@@ -48,7 +48,6 @@ public MoveStaticMembersWithDialogCodeAction(
 
         public override object? GetOptions(CancellationToken cancellationToken)
         {
-            _service ??= _document.Project.Solution.Workspace.Services.GetRequiredService<IMoveStaticMembersOptionsService>();
             return _service.GetMoveMembersToTypeOptions(_document, _selectedType, _selectedMember);
         }
 
@@ -130,13 +129,13 @@ private static async Task<Solution> RefactorReferencesAsync(
             {
                 cancellationToken.ThrowIfCancellationRequested();
                 var docEditor = await solutionEditor.GetDocumentEditorAsync(docGroup.Key, cancellationToken).ConfigureAwait(false);
-                await FixReferencesSingleDocumentAsync(docGroup.AsImmutable(), docEditor, newType, cancellationToken).ConfigureAwait(false);
+                FixReferencesSingleDocument(docGroup.AsImmutable(), docEditor, newType, cancellationToken);
             }
 
             return solutionEditor.GetChangedSolution();
         }
 
-        private static async Task FixReferencesSingleDocumentAsync(
+        private static void FixReferencesSingleDocument(
             ImmutableArray<(ReferenceLocation location, bool isExtension)> referenceLocations,
             DocumentEditor docEditor,
             INamedTypeSymbol newType,
diff --git a/src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb b/src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb
index dfce7857f0bdf..2d218ca6a1608 100644
--- a/src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb
+++ b/src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb
@@ -16,12 +16,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings.MoveStaticMembers
         <ImportingConstructor>
         <Obsolete(MefConstruction.ImportingConstructorMessage, True)>
         Public Sub New()
-            Me.New(Nothing)
-        End Sub
-
-        <SuppressMessage("RoslynDiagnosticsReliability", "RS0034:Exported parts should have [ImportingConstructor]", Justification:="Used incorrectly by tests")>
-        Public Sub New(service As IMoveStaticMembersOptionsService)
-            MyBase.New(service)
+            MyBase.New()
         End Sub
 
         Protected Overrides Async Function GetSelectedNodeAsync(context As CodeRefactoringContext) As Task(Of SyntaxNode)

From 2943f7fdd527ed86c7f42e9d85a33794abfebc55 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Wed, 11 Aug 2021 10:46:02 -0700
Subject: [PATCH 24/64] Changed VB tests to new Framework. Revealed an error in
 the way vb members are moved

---
 .../VisualBasicMoveStaticMembersTests.vb      | 1195 ++++++++---------
 1 file changed, 524 insertions(+), 671 deletions(-)

diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index 2699a8b80ae37..8177696adc5f3 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -3,94 +3,54 @@
 ' See the LICENSE file in the project root for more information.
 
 Imports System.Collections.Immutable
-Imports Microsoft.CodeAnalysis.CodeActions
-Imports Microsoft.CodeAnalysis.CodeRefactorings
-Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings
 Imports Microsoft.CodeAnalysis.MoveStaticMembers
 Imports Microsoft.CodeAnalysis.Test.Utilities.MoveStaticMembers
-Imports Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings.MoveStaticMembers
+Imports VerifyVB = Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions.VisualBasicCodeRefactoringVerifier(Of
+    Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings.MoveStaticMembers.VisualBasicMoveStaticMembersRefactoringProvider)
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.MoveStaticMembers
     Public Class VisualBasicMoveStaticMembersTests
-        Inherits AbstractVisualBasicCodeActionTest
 
-        Protected Overrides Function CreateCodeRefactoringProvider(workspace As Workspace, parameters As TestParameters) As CodeRefactoringProvider
-            Return New VisualBasicMoveStaticMembersRefactoringProvider(DirectCast(parameters.fixProviderData, IMoveStaticMembersOptionsService))
-        End Function
-
-        Protected Overrides Function MassageActions(actions As ImmutableArray(Of CodeAction)) As ImmutableArray(Of CodeAction)
-            Return FlattenActions(actions)
-        End Function
-
-        Private Async Function TestNoRefactoringProvidedAsync(initialMarkup As String) As Task
-            Dim parameters = New TestParameters()
-            Dim workspace = CreateWorkspaceFromOptions(initialMarkup, parameters)
-            Dim tuple = Await GetCodeActionsAsync(workspace, parameters).ConfigureAwait(False)
-            Dim actions = tuple.Item1
-            ' No actions should be provided
-            Assert.Equal(0, actions.Length)
-        End Function
-
-        Private Function TestMovementAsync(
-            initialMarkup As String,
-            expectedResult As String,
-            destinationType As String,
-            selection As ImmutableArray(Of String),
-            Optional destinationName As String = "a.vb",
-            Optional parameters As TestParameters = Nothing) As Task
-            If IsNothing(parameters) Then
-                parameters = New TestParameters()
-            End If
-
-            Dim service = New TestMoveStaticMembersService(destinationType, destinationName, selection.AsImmutable())
-            Return TestInRegularAndScript1Async(initialMarkup, expectedResult, parameters.WithFixProviderData(service))
-        End Function
+        Private Shared ReadOnly s_testServices As TestComposition = FeaturesTestCompositions.Features.AddParts(GetType(TestMoveStaticMembersService))
 
 #Region "Perform Actions From Options"
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveField() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Test[||]Field As Integer = 0
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestField")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared TestField As Integer = 0
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveProperty() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Property Test[||]Property As Integer
@@ -99,24 +59,16 @@ Namespace TestNs
             End Get
         End Property
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestProperty")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared Property TestProperty As Integer
             Get
@@ -124,57 +76,55 @@ End Namespace
             End Get
         End Property
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveEvent() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Event Test[||]Event As EventHandler
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestEvent")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared Event TestEvent As EventHandler
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveComplexEvent() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Custom Event Cl[||]ick As EventHandler
@@ -189,24 +139,16 @@ Namespace TestNs
             End RaiseEvent
         End Event
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("Click")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared Custom Event Click As EventHandler
             AddHandler(ByVal value As EventHandler)
@@ -220,139 +162,131 @@ End Namespace
             End RaiseEvent
         End Event
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveFunction() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
-Namespace TestNs
-    Public Class Class1
-        Public Shared Function Test[||]Func() As Integer
-            Return 0
-        End Function
-    End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+        Namespace TestNs
+            Public Class Class1
+                Public Shared Function Test[||]Func() As Integer
+                    Return 0
+                End Function
+            End Class
+        End Namespace
+                </Document>
+            </Project>
+        </Workspace>
+        "
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveSub() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Sub Test[||]Sub()
         End Sub
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestSub")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared Sub TestSub()
         End Sub
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveConst() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Const Test[||]Const As Integer = 0
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestConst")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared Const TestConst As Integer = 0
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestInNestedClass() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Class InnerClass
@@ -361,44 +295,39 @@ Namespace TestNs
             End Function
         End Class
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
         Public Class InnerClass
         End Class
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestInNestedNamespace() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Namespace InnerNs
         Public Class Class1
@@ -407,274 +336,239 @@ Namespace TestNs
             End Function
         End Class
     End Namespace
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Namespace InnerNs
         Public Class Class1
         End Class
     End Namespace
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs.InnerNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs.InnerNs
     Module Class1Helpers
         Public Shared Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveFieldNoNamespace() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Public Class Class1
     Public Shared Test[||]Field As Integer = 0
-End Class
-        </Document>
-    </Project>
-</Workspace>
-"
+End Class"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestField")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Public Class Class1
-End Class
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Module Class1Helpers
+End Class"
+            Dim expectedText2 = "Module Class1Helpers
     Public Shared TestField As Integer = 0
-End Module
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Module"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveFieldNewNamespace() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Public Class Class1
     Public Shared Test[||]Field As Integer = 0
-End Class
-        </Document>
-    </Project>
-</Workspace>
-"
+End Class"
             Dim newTypeName = "TestNs.Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestField")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
-Public Class Class1
-End Class
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Module Class1Helpers
-        Public Shared TestField As Integer = 0
-    End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+            Dim expectedText1 = "
+        Public Class Class1
+        End Class"
+            Dim expectedText2 = "Namespace TestNs
+            Module Class1Helpers
+                Public Shared TestField As Integer = 0
+            End Module
+        End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveFieldAddNamespace() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Test[||]Field As Integer = 0
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "InnerNs.Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestField")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs.InnerNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs.InnerNs
     Module Class1Helpers
         Public Shared TestField As Integer = 0
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveGenericFunction() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function Test[||]Func(Of T)(item As T) As T
             Return item
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared Function TestFunc(Of T)(item As T) As T
             Return item
         End Function
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveFunctionWithGenericClass() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1(Of T)
         Public Shared Function Test[||]Func(item As T) As T
             Return item
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1(Of T)
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers(Of T)
         Public Shared Function TestFunc(item As T) As T
             Return item
         End Function
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveFunctionWithFolders() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document Folders=""Folder1"" FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function Test[||]Func() As Integer
             Return 0
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document Folders=""Folder1"" FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document Folders=""Folder1"" FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveMultipleFunctions() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function Test[||]Func1() As Integer
@@ -685,24 +579,16 @@ Namespace TestNs
             Return False
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc1", "TestFunc2")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = " TestNs
     Module Class1Helpers
         Public Shared Function TestFunc1() As Integer
             Return 0
@@ -712,19 +598,22 @@ End Namespace
             Return False
         End Function
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveOneOfMultipleFuncs() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function Test[||]Func1() As Integer
@@ -735,46 +624,41 @@ Namespace TestNs
             Return False
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc2")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
         Public Shared Function TestFunc1() As Integer
             Return 0
         End Function
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
 
         Public Shared Function TestFunc2() As Boolean
             Return False
         End Function
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveOneOfEach() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Test[||]Field As Integer = 0
@@ -794,11 +678,7 @@ Namespace TestNs
         Public Shared Sub TestSub()
         End Sub
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create(
@@ -807,16 +687,12 @@ End Namespace
                 "TestFunc",
                 "TestEvent",
                 "TestSub")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared TestField As Integer = 0
 
@@ -835,19 +711,22 @@ End Namespace
             Return 0
         End Function
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveFunctionAndRefactorUsage() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function Test[||]Func() As Integer
@@ -860,18 +739,11 @@ Namespace TestNs
             Return Class1.TestFunc() + 1
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
@@ -881,27 +753,29 @@ Namespace TestNs
             Return Class1Helpers.TestFunc() + 1
         End Function
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveFunctionAndRefactorUsageDifferentNamespace() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Imports TestNs
 
 Namespace TestNs
@@ -918,18 +792,11 @@ Namespace TestNs2
             Return Class1.TestFunc() + 1
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Imports TestNs
 
 Namespace TestNs
@@ -943,27 +810,29 @@ Namespace TestNs2
             Return Class1Helpers.TestFunc() + 1
         End Function
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveFunctionAndRefactorUsageNewNamespace() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function Test[||]Func() As Integer
@@ -976,18 +845,11 @@ Namespace TestNs
             Return Class1.TestFunc() + 1
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "ExtraNs.Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Imports TestNs.ExtraNs
 
 Namespace TestNs
@@ -999,401 +861,362 @@ Namespace TestNs
             Return Class1Helpers.TestFunc() + 1
         End Function
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs.ExtraNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs.ExtraNs
     Module Class1Helpers
         Public Shared Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestMoveFunctionAndRefactorUsageSeparateFile() As Task
-            Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim initialMarkup1 = "
 Namespace TestNs
     Public Class Class1
         Public Shared Function Test[||]Func() As Integer
             Return 0
         End Function
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class2.vb"">
+End Namespace"
+            Dim initialMarkup2 = "
 Imports TestNs
 
 Public Class Class2
     Public Shared Function TestFunc2() As Integer
         Return Class1.TestFunc() + 1
     End Function
-End Class
-        </Document>
-    </Project>
-</Workspace>
-"
+End Class"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class2.vb"">
+End Namespace"
+            Dim expectedText3 = "
 Imports TestNs
 
 Public Class Class2
     Public Shared Function TestFunc2() As Integer
         Return Class1Helpers.TestFunc() + 1
     End Function
-End Class
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Class"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName)
+            test.TestState.Sources.Add(initialMarkup1)
+            test.TestState.Sources.Add(initialMarkup2)
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+            test.FixedState.Sources.Add(expectedText3)
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
 #End Region
 #Region "SelectionTests"
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestSelectBeforeDeclarationKeyword() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         [||]Public Shared TestField As Integer = 0
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestField")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared TestField As Integer = 0
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestSelectWholeFieldDeclaration() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
-Namespace TestNs
-    Public Class Class1
-        [|Public Shared TestField As Integer = 0|]
-    End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+        Namespace TestNs
+            Public Class Class1
+                [|Public Shared TestField As Integer = 0|]
+            End Class
+        End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestField")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared TestField As Integer = 0
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestSelectInFieldInitializerEquals_NoAction() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared TestField As Integer =[||] 0
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
-            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+End Namespace"
+
+            Await New Test("", ImmutableArray(Of String).Empty, "") With
+            {
+                .TestCode = initialMarkup,
+                .FixedCode = initialMarkup
+            }.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestSelectInDeclarationKeyword1() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Pub[||]lic Shared TestField As Integer = 0
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestField")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared TestField As Integer = 0
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestSelectInDeclarationKeyword2() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shar[||]ed TestField As Integer = 0
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestField")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared TestField As Integer = 0
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestSelectInMethodParens() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function TestFunc([||]) As Integer
             Return 0
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestSelectInTypeIdentifierMethodDeclaration() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function TestFunc() As Inte[||]ger
             Return 0
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public Shared Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Namespace"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestSelectInFieldTypeIdentifier_NoAction() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared TestField As Int[||]eger = 0
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
-            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+End Namespace"
+
+            Await New Test("", ImmutableArray(Of String).Empty, "") With
+            {
+                .TestCode = initialMarkup,
+                .FixedCode = initialMarkup
+            }.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestSelectInMethodBody_NoAction() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function TestFunc() As Integer
             Retu[||]rn 0
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
-            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+End Namespace"
+
+            Await New Test("", ImmutableArray(Of String).Empty, "") With
+            {
+                .TestCode = initialMarkup,
+                .FixedCode = initialMarkup
+            }.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestSelectInMethodClose_NoAction() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function TestFunc() As Integer
             Return 0
         End Func[||]tion
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
-            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+End Namespace"
+
+            Await New Test("", ImmutableArray(Of String).Empty, "") With
+            {
+                .TestCode = initialMarkup,
+                .FixedCode = initialMarkup
+            }.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestSelectNonSharedProperty_NoAction() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Property Test[||]Property As Integer
@@ -1402,20 +1225,19 @@ Namespace TestNs
             End Get
         End Property
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
-            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+End Namespace"
+
+            Await New Test("", ImmutableArray(Of String).Empty, "") With
+            {
+                .TestCode = initialMarkup,
+                .FixedCode = initialMarkup
+            }.RunAsync().ConfigureAwait(False)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
         Public Async Function TestSelectPropertyGetter_NoAction() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Property TestProperty As Integer
@@ -1424,13 +1246,44 @@ Namespace TestNs
             End Get
         End Property
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
-            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+End Namespace"
+
+            Await New Test("", ImmutableArray(Of String).Empty, "") With
+            {
+                .TestCode = initialMarkup,
+                .FixedCode = initialMarkup
+            }.RunAsync().ConfigureAwait(False)
         End Function
 #End Region
+
+        Private Class Test
+            Inherits VerifyVB.Test
+
+            Public Sub New(destinationType As String,
+                           members As ImmutableArray(Of String),
+                           newFileName As String)
+                _destinationType = destinationType
+                _members = members
+                _newFileName = newFileName
+            End Sub
+
+            Private ReadOnly _destinationType As String
+
+            Private ReadOnly _members As ImmutableArray(Of String)
+
+            Private ReadOnly _newFileName As String
+
+            Protected Overrides Function CreateWorkspaceImpl() As Workspace
+                Dim hostServices = s_testServices.GetHostServices()
+
+                Dim workspace = New AdhocWorkspace(hostServices)
+                Dim optionsService = DirectCast(workspace.Services.GetRequiredService(Of IMoveStaticMembersOptionsService)(), TestMoveStaticMembersService)
+                optionsService.DestinationType = _destinationType
+                optionsService.Filename = _newFileName
+                optionsService.SelectedMembers = _members
+
+                Return workspace
+            End Function
+        End Class
     End Class
 End Namespace

From 8d2b55fc3b73b2cbfafd37e92d699f7b1609bd7b Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Wed, 11 Aug 2021 15:02:41 -0700
Subject: [PATCH 25/64] Fixed VB tests by removing shared modifier when moving
 to a module

---
 .../VisualBasicMoveStaticMembersTests.vb      | 237 ++++++++++--------
 .../MoveStaticMembersWithDialogCodeAction.cs  |  34 ++-
 2 files changed, 170 insertions(+), 101 deletions(-)

diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index 8177696adc5f3..12bb42d5ab99b 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -33,9 +33,10 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-        Public Shared TestField As Integer = 0
+        Public TestField As Integer = 0
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -53,7 +54,7 @@ End Namespace"
             Dim initialMarkup = "
 Namespace TestNs
     Public Class Class1
-        Public Shared Property Test[||]Property As Integer
+        Public Shared ReadOnly Property Test[||]Property As Integer
             Get
                 Return 0
             End Get
@@ -70,13 +71,14 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-        Public Shared Property TestProperty As Integer
+        Public ReadOnly Property TestProperty As Integer
             Get
                 Return 0
             End Get
         End Property
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -92,6 +94,8 @@ End Namespace"
         <UseExportProvider>
         Public Async Function TestMoveEvent() As Task
             Dim initialMarkup = "
+Imports System
+
 Namespace TestNs
     Public Class Class1
         Public Shared Event Test[||]Event As EventHandler
@@ -101,15 +105,20 @@ End Namespace"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestEvent")
             Dim expectedText1 = "
+Imports System
+
 Namespace TestNs
     Public Class Class1
     End Class
 End Namespace"
-            Dim expectedText2 = "Namespace TestNs
+            Dim expectedText2 = "Imports System
+
+Namespace TestNs
     Module Class1Helpers
-        Public Shared Event TestEvent As EventHandler
+        Public Event TestEvent As EventHandler
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -125,17 +134,19 @@ End Namespace"
         <UseExportProvider>
         Public Async Function TestMoveComplexEvent() As Task
             Dim initialMarkup = "
+Imports System
+
 Namespace TestNs
     Public Class Class1
         Public Shared Custom Event Cl[||]ick As EventHandler
             AddHandler(ByVal value As EventHandler)
-                Events.AddHandler(""ClickEvent"", value)
+                Console.WriteLine(value.ToString())
             End AddHandler
             RemoveHandler(ByVal value As EventHandler)
-                Events.RemoveHandler(""ClickEvent"", value)
+                Console.WriteLine(value.ToString())
             End RemoveHandler
             RaiseEvent(ByVal sender As Object, ByVal e As EventArgs)
-                CType(Events(""ClickEvent""), EventHandler).Invoke(sender, e)
+                Console.WriteLine(sender.ToString())
             End RaiseEvent
         End Event
     End Class
@@ -144,25 +155,30 @@ End Namespace"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("Click")
             Dim expectedText1 = "
+Imports System
+
 Namespace TestNs
     Public Class Class1
     End Class
 End Namespace"
-            Dim expectedText2 = "Namespace TestNs
+            Dim expectedText2 = "Imports System
+
+Namespace TestNs
     Module Class1Helpers
-        Public Shared Custom Event Click As EventHandler
+        Public Custom Event Click As EventHandler
             AddHandler(ByVal value As EventHandler)
-                Events.AddHandler(""ClickEvent"", value)
+                Console.WriteLine(value.ToString())
             End AddHandler
             RemoveHandler(ByVal value As EventHandler)
-                Events.RemoveHandler(""ClickEvent"", value)
+                Console.WriteLine(value.ToString())
             End RemoveHandler
             RaiseEvent(ByVal sender As Object, ByVal e As EventArgs)
-                CType(Events(""ClickEvent""), EventHandler).Invoke(sender, e)
+                Console.WriteLine(sender.ToString())
             End RaiseEvent
         End Event
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -178,17 +194,13 @@ End Namespace"
         <UseExportProvider>
         Public Async Function TestMoveFunction() As Task
             Dim initialMarkup = "
-        Namespace TestNs
-            Public Class Class1
-                Public Shared Function Test[||]Func() As Integer
-                    Return 0
-                End Function
-            End Class
-        End Namespace
-                </Document>
-            </Project>
-        </Workspace>
-        "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
@@ -199,11 +211,12 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-        Public Shared Function TestFunc() As Integer
+        Public Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -235,10 +248,11 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-        Public Shared Sub TestSub()
+        Public Sub TestSub()
         End Sub
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -256,7 +270,7 @@ End Namespace"
             Dim initialMarkup = "
 Namespace TestNs
     Public Class Class1
-        Public Shared Const Test[||]Const As Integer = 0
+        Public Const Test[||]Const As Integer = 0
     End Class
 End Namespace"
             Dim newTypeName = "Class1Helpers"
@@ -269,9 +283,10 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-        Public Shared Const TestConst As Integer = 0
+        Public Const TestConst As Integer = 0
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -308,11 +323,12 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-        Public Shared Function TestFunc() As Integer
+        Public Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -349,11 +365,12 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs.InnerNs
     Module Class1Helpers
-        Public Shared Function TestFunc() As Integer
+        Public Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -379,8 +396,9 @@ End Class"
 Public Class Class1
 End Class"
             Dim expectedText2 = "Module Class1Helpers
-    Public Shared TestField As Integer = 0
-End Module"
+    Public TestField As Integer = 0
+End Module
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -403,13 +421,14 @@ End Class"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestField")
             Dim expectedText1 = "
-        Public Class Class1
-        End Class"
+Public Class Class1
+End Class"
             Dim expectedText2 = "Namespace TestNs
-            Module Class1Helpers
-                Public Shared TestField As Integer = 0
-            End Module
-        End Namespace"
+    Module Class1Helpers
+        Public TestField As Integer = 0
+    End Module
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -440,9 +459,10 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs.InnerNs
     Module Class1Helpers
-        Public Shared TestField As Integer = 0
+        Public TestField As Integer = 0
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -475,11 +495,12 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-        Public Shared Function TestFunc(Of T)(item As T) As T
+        Public Function TestFunc(Of T)(item As T) As T
             Return item
         End Function
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -512,11 +533,12 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers(Of T)
-        Public Shared Function TestFunc(item As T) As T
+        Public Function TestFunc(item As T) As T
             Return item
         End Function
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -549,11 +571,12 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-        Public Shared Function TestFunc() As Integer
+        Public Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -588,17 +611,18 @@ Namespace TestNs
     Public Class Class1
     End Class
 End Namespace"
-            Dim expectedText2 = " TestNs
+            Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-        Public Shared Function TestFunc1() As Integer
+        Public Function TestFunc1() As Integer
             Return 0
         End Function
 
-        Public Shared Function TestFunc2() As Boolean
+        Public Function TestFunc2() As Boolean
             Return False
         End Function
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -638,12 +662,12 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-
-        Public Shared Function TestFunc2() As Boolean
+        Public Function TestFunc2() As Boolean
             Return False
         End Function
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -659,11 +683,13 @@ End Namespace"
         <UseExportProvider>
         Public Async Function TestMoveOneOfEach() As Task
             Dim initialMarkup = "
+Imports System
+
 Namespace TestNs
     Public Class Class1
         Public Shared Test[||]Field As Integer = 0
 
-        Public Shared Property TestProperty As Integer
+        Public Shared ReadOnly Property TestProperty As Integer
             Get
                 Return 0
             End Get
@@ -688,30 +714,35 @@ End Namespace"
                 "TestEvent",
                 "TestSub")
             Dim expectedText1 = "
+Imports System
+
 Namespace TestNs
     Public Class Class1
     End Class
 End Namespace"
-            Dim expectedText2 = "Namespace TestNs
+            Dim expectedText2 = "Imports System
+
+Namespace TestNs
     Module Class1Helpers
-        Public Shared TestField As Integer = 0
+        Public TestField As Integer = 0
 
-        Public Shared Property TestProperty As Integer
+        Public ReadOnly Property TestProperty As Integer
             Get
                 Return 0
             End Get
         End Property
 
-        Public Shared Event TestEvent As EventHandler
+        Public Event TestEvent As EventHandler
 
-        Public Shared Sub TestSub()
+        Public Sub TestSub()
         End Sub
 
-        Public Shared Function TestFunc() As Integer
+        Public Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -756,11 +787,12 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-        Public Shared Function TestFunc() As Integer
+        Public Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -813,11 +845,12 @@ Namespace TestNs2
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-        Public Shared Function TestFunc() As Integer
+        Public Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -864,11 +897,12 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs.ExtraNs
     Module Class1Helpers
-        Public Shared Function TestFunc() As Integer
+        Public Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -917,18 +951,19 @@ Public Class Class2
 End Class"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-        Public Shared Function TestFunc() As Integer
+        Public Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName)
             test.TestState.Sources.Add(initialMarkup1)
             test.TestState.Sources.Add(initialMarkup2)
             test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
             test.FixedState.Sources.Add(expectedText3)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
 
             Await test.RunAsync().ConfigureAwait(False)
         End Function
@@ -954,9 +989,10 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-        Public Shared TestField As Integer = 0
+        Public TestField As Integer = 0
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -972,11 +1008,11 @@ End Namespace"
         <UseExportProvider>
         Public Async Function TestSelectWholeFieldDeclaration() As Task
             Dim initialMarkup = "
-        Namespace TestNs
-            Public Class Class1
-                [|Public Shared TestField As Integer = 0|]
-            End Class
-        End Namespace"
+Namespace TestNs
+    Public Class Class1
+        [|Public Shared TestField As Integer = 0|]
+    End Class
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestField")
@@ -987,9 +1023,10 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-        Public Shared TestField As Integer = 0
+        Public TestField As Integer = 0
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -1037,9 +1074,10 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-        Public Shared TestField As Integer = 0
+        Public TestField As Integer = 0
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -1070,9 +1108,10 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-        Public Shared TestField As Integer = 0
+        Public TestField As Integer = 0
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -1105,11 +1144,12 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-        Public Shared Function TestFunc() As Integer
+        Public Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -1142,11 +1182,12 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
-        Public Shared Function TestFunc() As Integer
+        Public Function TestFunc() As Integer
             Return 0
         End Function
     End Module
-End Namespace"
+End Namespace
+"
 
             Dim test = New Test(newTypeName, selection, newFileName) With
             {
@@ -1219,7 +1260,7 @@ End Namespace"
             Dim initialMarkup = "
 Namespace TestNs
     Public Class Class1
-        Public Property Test[||]Property As Integer
+        Public ReadOnly Property Test[||]Property As Integer
             Get
                 Return 0
             End Get
@@ -1240,7 +1281,7 @@ End Namespace"
             Dim initialMarkup = "
 Namespace TestNs
     Public Class Class1
-        Public Shared Property TestProperty As Integer
+        Public Shared ReadOnly Property TestProperty As Integer
             Get[||]
                 Return 0
             End Get
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 9633beee0d285..091b072a7caee 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -103,8 +103,10 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
             var locationsToDoc = memberReferenceLocations.ToLookup(loc => loc.location.Document.Id);
             var reReferencedSolution = await RefactorReferencesAsync(locationsToDoc, newDoc.Project.Solution, newType!, cancellationToken).ConfigureAwait(false);
 
-            // Get back symbols using annotations
-            sourceDoc = reReferencedSolution.GetRequiredDocument(sourceDoc.Id);
+            // Possibly convert members to non-static or static if we move to/from a module
+            sourceDoc = await CorrectStaticMembersAsync(reReferencedSolution.GetRequiredDocument(sourceDoc.Id), memberNodes, newType!, cancellationToken).ConfigureAwait(false);
+
+            // get back nodes from our changes
             root = await sourceDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
             var semanticModel = await sourceDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
             var members = memberNodes
@@ -112,12 +114,38 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
                 .WhereNotNull()
                 .SelectAsArray(node => (semanticModel.GetDeclaredSymbol(node!, cancellationToken), false));
 
-            var pullMembersUpOptions = PullMembersUpOptionsBuilder.BuildPullMembersUpOptions(newType, members);
+            var pullMembersUpOptions = PullMembersUpOptionsBuilder.BuildPullMembersUpOptions(newType!, members);
             var movedSolution = await MembersPuller.PullMembersUpAsync(sourceDoc, pullMembersUpOptions, cancellationToken).ConfigureAwait(false);
 
             return new CodeActionOperation[] { new ApplyChangesOperation(movedSolution) };
         }
 
+        private async Task<Document> CorrectStaticMembersAsync(
+            Document sourceDoc,
+            ImmutableArray<SyntaxNode> memberNodes,
+            INamedTypeSymbol newType,
+            CancellationToken cancellationToken)
+        {
+            // We have two cases:
+            // 1. Moving from a class to a module. We need to remove the shared modifier as it is implied
+            // 2. Moving from a module to a class. We need to add the shared modifier as it is no longer implied
+            // If neither of these apply (the movement types are both classes or both modules), we return early
+            if (newType.TypeKind == _selectedType.TypeKind)
+            {
+                return sourceDoc;
+            }
+
+            var docEditor = await DocumentEditor.CreateAsync(sourceDoc, cancellationToken).ConfigureAwait(false);
+            memberNodes = docEditor.OriginalRoot.GetCurrentNodes(memberNodes).ToImmutableArray();
+            // need to make members non-static if we're moving to a module, static if we're moving away from one
+            foreach (var node in memberNodes)
+            {
+                docEditor.ReplaceNode(node, (n, generator) => generator.WithModifiers(n, generator.GetModifiers(n).WithIsStatic(newType.TypeKind != TypeKind.Module)));
+            }
+
+            return docEditor.GetChangedDocument();
+        }
+
         private static async Task<Solution> RefactorReferencesAsync(
             ILookup<DocumentId, (ReferenceLocation location, bool isExtension)> locationsToDoc,
             Solution solution,

From ee54edd4faa38374f101d7d0aa69cdf7f45cc4b6 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Wed, 11 Aug 2021 17:24:07 -0700
Subject: [PATCH 26/64] Fixed more tests to account for member spacing
 innaccuracy

---
 .../CSharpMoveStaticMembersTests.cs           | 20 +++++++++----------
 .../VisualBasicMoveStaticMembersTests.vb      | 10 ++++++++++
 .../MoveStaticMembersWithDialogCodeAction.cs  |  1 -
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index 8c5b6e592e438..39681eb49fd73 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -323,14 +323,14 @@ namespace TestNs1
 {
     public class Class1
     {
-        public static int Test[||]MethodInt()
+        public static bool TestMethodBool()
         {
-            return 0;
+            return false;
         }
 
-        public static bool TestMethodBool()
+        public static int Test[||]MethodInt()
         {
-            return false;
+            return 0;
         }
     }
 }";
@@ -444,16 +444,16 @@ namespace TestNs1
 {
     public class Class1
     {
-        public static int Test[||]Method()
-        {
-            return 0;
-        }
+        public static int TestField;
 
         public static bool TestProperty { get; set; }
 
-        public static int TestField;
-
         public static event EventHandler TestEvent;
+
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
     }
 }";
             var selectedDestinationName = "Class1Helpers";
diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index 12bb42d5ab99b..0f74bfa590348 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -34,6 +34,7 @@ End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public TestField As Integer = 0
+
     End Module
 End Namespace
 "
@@ -397,6 +398,7 @@ Public Class Class1
 End Class"
             Dim expectedText2 = "Module Class1Helpers
     Public TestField As Integer = 0
+
 End Module
 "
 
@@ -426,6 +428,7 @@ End Class"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public TestField As Integer = 0
+
     End Module
 End Namespace
 "
@@ -460,6 +463,7 @@ End Namespace"
             Dim expectedText2 = "Namespace TestNs.InnerNs
     Module Class1Helpers
         Public TestField As Integer = 0
+
     End Module
 End Namespace
 "
@@ -662,6 +666,7 @@ Namespace TestNs
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
+
         Public Function TestFunc2() As Boolean
             Return False
         End Function
@@ -726,6 +731,7 @@ Namespace TestNs
     Module Class1Helpers
         Public TestField As Integer = 0
 
+
         Public ReadOnly Property TestProperty As Integer
             Get
                 Return 0
@@ -990,6 +996,7 @@ End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public TestField As Integer = 0
+
     End Module
 End Namespace
 "
@@ -1024,6 +1031,7 @@ End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public TestField As Integer = 0
+
     End Module
 End Namespace
 "
@@ -1075,6 +1083,7 @@ End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public TestField As Integer = 0
+
     End Module
 End Namespace
 "
@@ -1109,6 +1118,7 @@ End Namespace"
             Dim expectedText2 = "Namespace TestNs
     Module Class1Helpers
         Public TestField As Integer = 0
+
     End Module
 End Namespace
 "
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 091b072a7caee..9056985215160 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -2,7 +2,6 @@
 // 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;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;

From 5d0c195079ef9d3755d75c246db8e10d9742d4bb Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Thu, 12 Aug 2021 11:21:49 -0700
Subject: [PATCH 27/64] Refactored tests, added vb extension tests

---
 .../CSharpMoveStaticMembersTests.cs           | 537 +++---------------
 .../VisualBasicMoveStaticMembersTests.vb      | 480 +++++++---------
 .../MoveStaticMembersWithDialogCodeAction.cs  |  13 +-
 3 files changed, 322 insertions(+), 708 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index 39681eb49fd73..3cc1a66f89044 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -48,18 +48,7 @@ static class Class1Helpers
     }
 }";
 
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -91,18 +80,7 @@ static class Class1Helpers
         public static int TestProperty { get; set; }
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -140,18 +118,7 @@ static class Class1Helpers
         public static event EventHandler TestEvent;
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -189,18 +156,7 @@ public static int TestMethod()
         }
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -256,18 +212,7 @@ public static int TestMethod(this Other other)
         }
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -300,18 +245,7 @@ static class Class1Helpers
         public const int TestField = 1;
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -359,18 +293,7 @@ public static int TestMethodInt()
         }
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -419,18 +342,7 @@ public static bool TestMethodBool()
         }
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -490,18 +402,7 @@ static class Class1Helpers
         }
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -539,18 +440,7 @@ static class Class1Helpers
         public static int TestField = 1;
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -589,18 +479,7 @@ static class Class1Helpers
         public static int TestField = 1;
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -623,18 +502,7 @@ public class Class1
 {
     public static int TestField = 1;
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -660,18 +528,7 @@ static class Class1Helpers
         public static int TestField = 1;
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -711,18 +568,7 @@ public static int TestMethod()
         }
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -774,61 +620,6 @@ public static int TestMethod()
             }.RunAsync().ConfigureAwait(false);
         }
 
-        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
-        [UseExportProvider]
-        public async Task TestMoveMethodWithFolders()
-        {
-            // We should just put the new file in the same folder as source
-            var initialMarkup = @"
-namespace TestNs1
-{
-    public class Class1
-    {
-        public static int Test[||]Method()
-        {
-            return 0;
-        }
-    }
-}";
-            var selectedDestinationName = "Class1Helpers";
-            var newFileName = "Class1Helpers.cs";
-            var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult1 = @"
-namespace TestNs1
-{
-    public class Class1
-    {
-    }
-}";
-            var expectedResult2 = @"namespace TestNs1
-{
-    static class Class1Helpers
-    {
-        public static int TestMethod()
-        {
-            return 0;
-        }
-    }
-}";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestState = {
-                    Sources =
-                    {
-                        ("someFolder/Class1.cs", initialMarkup)
-                    }
-                },
-                FixedState =
-                {
-                    Sources =
-                    {
-                        ("someFolder/Class1.cs", expectedResult1),
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
-        }
-
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         [UseExportProvider]
         public async Task TestMoveGenericMethod()
@@ -864,18 +655,7 @@ public static T TestMethod<T>(T item)
         }
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -913,18 +693,7 @@ static class Class1Helpers<T>
         }
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -978,18 +747,7 @@ public static int TestMethod()
         }
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -1053,18 +811,7 @@ public static int TestMethod()
         }
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -1120,18 +867,7 @@ public static int TestMethod()
         }
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -1207,7 +943,7 @@ public static int TestMethod()
                         expectedResult3,
                         (newFileName, expectedResult2)
                     }
-                },
+                }
             }.RunAsync().ConfigureAwait(false);
         }
 
@@ -1282,18 +1018,7 @@ public static int TestMethod(this Other other)
         }
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -1384,18 +1109,7 @@ public static int TestMethod(this Other other)
         }
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
         #endregion
 
@@ -1436,18 +1150,7 @@ public static int TestMethod()
         }
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -1479,18 +1182,7 @@ static class Class1Helpers
         public static int TestField = 1;
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -1522,18 +1214,7 @@ static class Class1Helpers
         public static int TestField = 1;
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -1565,18 +1246,7 @@ static class Class1Helpers
         public static int TestField = 1;
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -1608,18 +1278,7 @@ static class Class1Helpers
         public static int TestField = 1;
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -1657,101 +1316,72 @@ public static int TestMethod()
         }
     }
 }";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         [UseExportProvider]
-        public async Task TestSelectInTypeIdentifierOfFieldDeclaration_NoAction()
+        public async Task TestSelectInFieldInitializerAfterSemicolon()
         {
+            // However, a semicolon after the initializer is still considered a declaration
             var initialMarkup = @"
 namespace TestNs1
 {
     public class Class1
     {
-        public static i[||]nt TestField = 1;
+        public static int TestField = 1;[||]
     }
 }";
-            await new Test("", ImmutableArray<string>.Empty)
-            {
-                TestCode = initialMarkup,
-                FixedCode = initialMarkup
-            }.RunAsync().ConfigureAwait(false);
-        }
-
-        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
-        [UseExportProvider]
-        public async Task TestSelectInFieldInitializerEquals_NoAction()
-        {
-            // The initializer isn't a member declaration
-            var initialMarkup = @"
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
-        public static int TestField =[||] 1;
     }
 }";
-            await new Test("", ImmutableArray<string>.Empty)
-            {
-                TestCode = initialMarkup,
-                FixedCode = initialMarkup
-            }.RunAsync().ConfigureAwait(false);
+            var expectedResult2 = @"namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}";
+
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         [UseExportProvider]
-        public async Task TestSelectInFieldInitializerAfterSemicolon()
+        public async Task TestSelectInTypeIdentifierOfFieldDeclaration_NoAction()
         {
-            // However, a semicolon after the initializer is still considered a declaration
             var initialMarkup = @"
 namespace TestNs1
 {
     public class Class1
     {
-        public static int TestField = 1;[||]
+        public static i[||]nt TestField = 1;
     }
 }";
-            var selectedDestinationName = "Class1Helpers";
-            var newFileName = "Class1Helpers.cs";
-            var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult1 = @"
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
+        public async Task TestSelectInFieldInitializerEquals_NoAction()
+        {
+            // The initializer isn't a member declaration
+            var initialMarkup = @"
 namespace TestNs1
 {
     public class Class1
     {
+        public static int TestField =[||] 1;
     }
 }";
-            var expectedResult2 = @"namespace TestNs1
-{
-    static class Class1Helpers
-    {
-        public static int TestField = 1;
-    }
-}";
-            await new Test(selectedDestinationName, selectedMembers, newFileName)
-            {
-                TestCode = initialMarkup,
-                FixedState =
-                {
-                    Sources =
-                    {
-                        expectedResult1,
-                        (newFileName, expectedResult2)
-                    }
-                },
-            }.RunAsync().ConfigureAwait(false);
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -1769,11 +1399,7 @@ public static int TestMethod()
         }
     }
 }";
-            await new Test("", ImmutableArray<string>.Empty)
-            {
-                TestCode = initialMarkup,
-                FixedCode = initialMarkup
-            }.RunAsync().ConfigureAwait(false);
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -1791,11 +1417,7 @@ public static int TestMethod()
         }
     }
 }";
-            await new Test("", ImmutableArray<string>.Empty)
-            {
-                TestCode = initialMarkup,
-                FixedCode = initialMarkup
-            }.RunAsync().ConfigureAwait(false);
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -1810,11 +1432,7 @@ public class Class1
         public static int TestProperty { get; [||]set; }
     }
 }";
-            await new Test("", ImmutableArray<string>.Empty)
-            {
-                TestCode = initialMarkup,
-                FixedCode = initialMarkup
-            }.RunAsync().ConfigureAwait(false);
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -1829,11 +1447,7 @@ public class Class1
         public int Test[||]Property { get; set; }
     }
 }";
-            await new Test("", ImmutableArray<string>.Empty)
-            {
-                TestCode = initialMarkup,
-                FixedCode = initialMarkup
-            }.RunAsync().ConfigureAwait(false);
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
         }
         #endregion
 
@@ -1868,5 +1482,34 @@ protected override Workspace CreateWorkspaceImpl()
                 return workspace;
             }
         }
+
+        private static async Task TestMovementNewFileAsync(
+            string initialMarkup,
+            string expectedSource,
+            string expectedNewFile,
+            string newFileName,
+            ImmutableArray<string> selectedMembers,
+            string newTypeName)
+            => await new Test(newTypeName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedSource,
+                        (newFileName, expectedNewFile)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
+
+        private static async Task TestNoRefactoringAsync(string initialMarkup)
+        {
+            await new Test("", ImmutableArray<string>.Empty)
+            {
+                TestCode = initialMarkup,
+                FixedCode = initialMarkup
+            }.RunAsync().ConfigureAwait(false);
+        }
     }
 }
diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index 0f74bfa590348..832d23728d1a9 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -39,14 +39,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -81,14 +74,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -121,14 +107,7 @@ Namespace TestNs
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -181,14 +160,7 @@ Namespace TestNs
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -219,14 +191,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -255,14 +220,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -289,14 +247,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -331,14 +282,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -373,14 +317,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -402,14 +339,7 @@ End Class"
 End Module
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -433,14 +363,7 @@ End Class"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -468,14 +391,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -506,14 +422,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -536,22 +445,15 @@ Namespace TestNs
     End Class
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers(Of T)
-        Public Function TestFunc(item As T) As T
+    Class Class1Helpers(Of T)
+        Public Shared Function TestFunc(item As T) As T
             Return item
         End Function
-    End Module
+    End Class
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -582,14 +484,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -628,14 +523,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -674,14 +562,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -750,14 +631,7 @@ Namespace TestNs
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -800,14 +674,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -858,14 +725,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -910,14 +770,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -974,6 +827,155 @@ End Namespace
             Await test.RunAsync().ConfigureAwait(False)
         End Function
 
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
+        Public Async Function TestMoveExtensionFunction() As Task
+            Dim initialMarkup = "
+Imports System.Runtime.CompilerServices
+
+Namespace TestNs
+    Public Module Class1
+        <Extension>
+        Public Function Test[||]Func(other As Other) As Integer
+            Return other.OtherInt + 2
+        End Function
+    End Module
+
+    Public Class Class2
+        Public Function GetOtherInt() As Integer
+            Dim other = New Other()
+            Return other.TestFunc()
+        End Function
+    End Class
+
+    Public Class Other
+        Public OtherInt As Integer
+
+        Public Sub New()
+            OtherInt = 5
+        End Sub
+    End Class
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Imports System.Runtime.CompilerServices
+Imports TestNs
+
+Namespace TestNs
+    Public Module Class1
+    End Module
+
+    Public Class Class2
+        Public Function GetOtherInt() As Integer
+            Dim other = New Other()
+            Return other.TestFunc()
+        End Function
+    End Class
+
+    Public Class Other
+        Public OtherInt As Integer
+
+        Public Sub New()
+            OtherInt = 5
+        End Sub
+    End Class
+End Namespace"
+            Dim expectedText2 = "Imports System.Runtime.CompilerServices
+
+Namespace TestNs
+    Module Class1Helpers
+        <Extension>
+        Public Function TestFunc(other As Other) As Integer
+            Return other.OtherInt + 2
+        End Function
+    End Module
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
+        Public Async Function TestMoveExtensionFunctionAddImports() As Task
+            Dim initialMarkup = "
+Imports System.Runtime.CompilerServices
+Imports TestNs1
+Imports TestNs2
+
+Namespace TestNs1
+    Public Module Class1
+        <Extension>
+        Public Function Test[||]Func(other As Other) As Integer
+            Return other.OtherInt + 2
+        End Function
+    End Module
+End Namespace
+
+Namespace TestNs2
+    Public Class Class2
+        Public Function GetOtherInt() As Integer
+            Dim other = New Other()
+            Return other.TestFunc()
+        End Function
+    End Class
+
+    Public Class Other
+        Public OtherInt As Integer
+
+        Public Sub New()
+            OtherInt = 5
+        End Sub
+    End Class
+End Namespace"
+            Dim newTypeName = "ExtraNs.Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Imports System.Runtime.CompilerServices
+Imports TestNs1
+Imports TestNs1.ExtraNs
+Imports TestNs2
+
+Namespace TestNs1
+    Public Module Class1
+    End Module
+End Namespace
+
+Namespace TestNs2
+    Public Class Class2
+        Public Function GetOtherInt() As Integer
+            Dim other = New Other()
+            Return other.TestFunc()
+        End Function
+    End Class
+
+    Public Class Other
+        Public OtherInt As Integer
+
+        Public Sub New()
+            OtherInt = 5
+        End Sub
+    End Class
+End Namespace"
+            Dim expectedText2 = "Imports System.Runtime.CompilerServices
+Imports TestNs2
+
+Namespace TestNs1.ExtraNs
+    Module Class1Helpers
+        <Extension>
+        Public Function TestFunc(other As Other) As Integer
+            Return other.OtherInt + 2
+        End Function
+    End Module
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
 #End Region
 #Region "SelectionTests"
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -1001,14 +1003,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -1036,31 +1031,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
-        End Function
-
-        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
-        <UseExportProvider>
-        Public Async Function TestSelectInFieldInitializerEquals_NoAction() As Task
-            Dim initialMarkup = "
-Namespace TestNs
-    Public Class Class1
-        Public Shared TestField As Integer =[||] 0
-    End Class
-End Namespace"
-
-            Await New Test("", ImmutableArray(Of String).Empty, "") With
-            {
-                .TestCode = initialMarkup,
-                .FixedCode = initialMarkup
-            }.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -1088,14 +1059,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -1123,14 +1087,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -1161,14 +1118,7 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
-
-            Await test.RunAsync().ConfigureAwait(False)
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -1199,14 +1149,20 @@ End Namespace"
 End Namespace
 "
 
-            Dim test = New Test(newTypeName, selection, newFileName) With
-            {
-                .TestCode = initialMarkup
-            }
-            test.FixedState.Sources.Add(expectedText1)
-            test.FixedState.Sources.Add((newFileName, expectedText2))
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
 
-            Await test.RunAsync().ConfigureAwait(False)
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
+        Public Async Function TestSelectInFieldInitializerEquals_NoAction() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared TestField As Integer =[||] 0
+    End Class
+End Namespace"
+
+            Await TestNoRefactoringAsync(initialMarkup)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -1219,11 +1175,7 @@ Namespace TestNs
     End Class
 End Namespace"
 
-            Await New Test("", ImmutableArray(Of String).Empty, "") With
-            {
-                .TestCode = initialMarkup,
-                .FixedCode = initialMarkup
-            }.RunAsync().ConfigureAwait(False)
+            Await TestNoRefactoringAsync(initialMarkup)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -1238,11 +1190,7 @@ Namespace TestNs
     End Class
 End Namespace"
 
-            Await New Test("", ImmutableArray(Of String).Empty, "") With
-            {
-                .TestCode = initialMarkup,
-                .FixedCode = initialMarkup
-            }.RunAsync().ConfigureAwait(False)
+            Await TestNoRefactoringAsync(initialMarkup)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -1257,11 +1205,7 @@ Namespace TestNs
     End Class
 End Namespace"
 
-            Await New Test("", ImmutableArray(Of String).Empty, "") With
-            {
-                .TestCode = initialMarkup,
-                .FixedCode = initialMarkup
-            }.RunAsync().ConfigureAwait(False)
+            Await TestNoRefactoringAsync(initialMarkup)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -1278,11 +1222,7 @@ Namespace TestNs
     End Class
 End Namespace"
 
-            Await New Test("", ImmutableArray(Of String).Empty, "") With
-            {
-                .TestCode = initialMarkup,
-                .FixedCode = initialMarkup
-            }.RunAsync().ConfigureAwait(False)
+            Await TestNoRefactoringAsync(initialMarkup)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -1299,11 +1239,7 @@ Namespace TestNs
     End Class
 End Namespace"
 
-            Await New Test("", ImmutableArray(Of String).Empty, "") With
-            {
-                .TestCode = initialMarkup,
-                .FixedCode = initialMarkup
-            }.RunAsync().ConfigureAwait(False)
+            Await TestNoRefactoringAsync(initialMarkup)
         End Function
 #End Region
 
@@ -1336,5 +1272,29 @@ End Namespace"
                 Return workspace
             End Function
         End Class
+
+        Private Shared Async Function TestMovementNewFileAsync(initialMarkup As String,
+                                                        expectedSource As String,
+                                                        expectedNewFile As String,
+                                                        newFileName As String,
+                                                        selectedMembers As ImmutableArray(Of String),
+                                                        newTypeName As String) As Task
+
+            Dim test = New Test(newTypeName, selectedMembers, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedSource)
+            test.FixedState.Sources.Add((newFileName, expectedNewFile))
+            Await test.RunAsync()
+        End Function
+
+        Private Shared Async Function TestNoRefactoringAsync(initialMarkup As String) As Task
+            Await New Test("", ImmutableArray(Of String).Empty, "") With
+            {
+                .TestCode = initialMarkup,
+                .FixedCode = initialMarkup
+            }.RunAsync().ConfigureAwait(False)
+        End Function
     End Class
 End Namespace
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 9056985215160..d46ad63c0b982 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -2,6 +2,7 @@
 // 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;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -78,7 +79,7 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
                 ImmutableArray.Create<AttributeData>(),
                 Accessibility.NotApplicable,
                 DeclarationModifiers.Static,
-                TypeKind.Module,
+                GetNewTypeKind(typeParameters),
                 moveOptions.TypeName,
                 typeParameters: typeParameters);
 
@@ -119,6 +120,16 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
             return new CodeActionOperation[] { new ApplyChangesOperation(movedSolution) };
         }
 
+        /// <summary>
+        /// What type kind we should make our new type be. Passing Module when our language is C# will still create a class.
+        /// Modules cannot be generic however, so for VB we choose class if there are generic type params.
+        /// This could be later extended to a language-service feature if there is more complex behavior.
+        /// </summary>
+        private static TypeKind GetNewTypeKind(ImmutableArray<ITypeParameterSymbol> typeParameters)
+        {
+            return typeParameters.IsEmpty ? TypeKind.Module : TypeKind.Class;
+        }
+
         private async Task<Document> CorrectStaticMembersAsync(
             Document sourceDoc,
             ImmutableArray<SyntaxNode> memberNodes,

From 59baf07d6e9c0f9b04b2ee72f53227ad79ea832d Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Thu, 12 Aug 2021 11:30:27 -0700
Subject: [PATCH 28/64] Added tests for file banner and moving from a static
 class/module

---
 .../CSharpMoveStaticMembersTests.cs           | 83 +++++++++++++++++++
 .../VisualBasicMoveStaticMembersTests.vb      | 69 +++++++++++++++
 2 files changed, 152 insertions(+)

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index 3cc1a66f89044..2a9506f4feb7f 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -1111,6 +1111,89 @@ public static int TestMethod(this Other other)
 }";
             await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
+        public async Task TestMoveMethodFromStaticClass()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public static class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public static class Class1
+    {
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
+        public async Task TestMoveMethodRetainFileBanner()
+        {
+            var initialMarkup = @"// Here is an example of a license or something
+// we would want to keep at the top of a file
+
+namespace TestNs1
+{
+    public static class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"// Here is an example of a license or something
+// we would want to keep at the top of a file
+
+namespace TestNs1
+{
+    public static class Class1
+    {
+    }
+}";
+            var expectedResult2 = @"// Here is an example of a license or something
+// we would want to keep at the top of a file
+
+namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
         #endregion
 
         #region Selections and caret position
diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index 832d23728d1a9..eb1a9624e5648 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -971,6 +971,75 @@ Namespace TestNs1.ExtraNs
         End Function
     End Module
 End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
+        Public Async Function TestMoveFunctionInModule() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Module Class1
+        Public Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Module
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Module Class1
+    End Module
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Module
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
+        Public Async Function TestMoveFunctionRetainFileBanner() As Task
+            Dim initialMarkup = "' Here is an example of a license or something
+' That we want to keep/copy over
+
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "' Here is an example of a license or something
+' That we want to keep/copy over
+
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim expectedText2 = "' Here is an example of a license or something
+' That we want to keep/copy over
+
+Namespace TestNs
+    Module Class1Helpers
+        Public Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Module
+End Namespace
 "
 
             Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)

From 61b2cf03e3bce388f6b085f4413687d2001f4b49 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Thu, 12 Aug 2021 13:41:44 -0700
Subject: [PATCH 29/64] Added tests to enure operator and static constructors
 are not able to be selected or trigger refactoring

---
 .../CSharpMoveStaticMembersTests.cs           | 54 ++++++++++++++++++-
 .../VisualBasicMoveStaticMembersTests.vb      | 43 +++++++++++++++
 .../MoveStaticMembersViewModelTest.vb         | 18 +++++++
 3 files changed, 114 insertions(+), 1 deletion(-)

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index 2a9506f4feb7f..2eb76455803f8 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -1532,6 +1532,58 @@ public class Class1
 }";
             await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
         }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
+        public async Task TestSelectStaticConstructor1_NoAction()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        [|static Class1()|]
+        {
+        }
+    }
+}";
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
+        public async Task TestSelectStaticConstructor2_NoAction()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        static Cl[||]ass1()
+        {
+        }
+    }
+}";
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        [UseExportProvider]
+        public async Task TestSelectOperator_NoAction()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        [|public static Class1 operator +(Class1 a, Class1 b)|]
+        {
+            return new Class1();
+        }
+    }
+}";
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
+        }
         #endregion
 
         private class Test : VerifyCS.Test
@@ -1591,7 +1643,7 @@ private static async Task TestNoRefactoringAsync(string initialMarkup)
             await new Test("", ImmutableArray<string>.Empty)
             {
                 TestCode = initialMarkup,
-                FixedCode = initialMarkup
+                FixedCode = initialMarkup,
             }.RunAsync().ConfigureAwait(false);
         }
     }
diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index eb1a9624e5648..55865fb1fd742 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -1310,6 +1310,49 @@ End Namespace"
 
             Await TestNoRefactoringAsync(initialMarkup)
         End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
+        Public Async Function TestSelectConstructor1_NoAction() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1
+        Shared Sub N[||]ew()
+        End Sub
+    End Class
+End Namespace"
+
+            Await TestNoRefactoringAsync(initialMarkup)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
+        Public Async Function TestSelectConstructor2_NoAction() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1
+        [|Shared Sub New()|]
+        End Sub
+    End Class
+End Namespace"
+
+            Await TestNoRefactoringAsync(initialMarkup)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        <UseExportProvider>
+        Public Async Function TestSelectOperator_NoAction() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1
+        [|Public Shared Operator +(a As Class1, b As Class1) As Class1|]
+            Return New Class1()
+        End Operator
+    End Class
+End Namespace"
+
+            Await TestNoRefactoringAsync(initialMarkup)
+        End Function
 #End Region
 
         Private Class Test
diff --git a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
index 2e68e20062d36..cb1e4381d5f33 100644
--- a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
+++ b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
@@ -211,6 +211,15 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
                     {
                         return Barbar() == 0;
                     }
+
+                    static TestClass()
+                    {
+                    }
+
+                    public static TestClass operator +(TestClass a, TestClass b)
+                    {
+                        return new TestClass()
+                    }
                 }
             }
         </Document>
@@ -249,6 +258,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.False(viewModel.CanSubmit)
 
             selectionVm.SelectAll()
+            ' If constructor and operators are able to be selected, this would be a higher number
             Assert.Equal(7, selectionVm.CheckedMembers.Length)
             Assert.True(viewModel.CanSubmit)
 
@@ -388,6 +398,13 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
                     Public Shared Function Dependent() As Boolean
                         Return Barbar() = 0
                     End Function
+
+                    Shared Sub New()
+                    End Sub
+
+                    Public Shared Operator +(a As TestClass, b As TestClass)
+                        Return New TestClass()
+                    End Operator
                 End Class
             End Namespace
         </Document>
@@ -426,6 +443,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.False(viewModel.CanSubmit)
 
             selectionVm.SelectAll()
+            ' If constructor and operators are able to be selected, this would be a higher number
             Assert.Equal(7, selectionVm.CheckedMembers.Length)
             Assert.True(viewModel.CanSubmit)
 

From 93d0bd7e3b3747d4c6856529121a00c4a8a8eda2 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Thu, 12 Aug 2021 14:32:36 -0700
Subject: [PATCH 30/64] Make service field readonly

---
 .../MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index d46ad63c0b982..6e642afc06b37 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -27,7 +27,7 @@ internal class MoveStaticMembersWithDialogCodeAction : CodeActionWithOptions
         private readonly Document _document;
         private readonly ISymbol? _selectedMember;
         private readonly INamedTypeSymbol _selectedType;
-        private IMoveStaticMembersOptionsService _service;
+        private readonly IMoveStaticMembersOptionsService _service;
 
         public TextSpan Span { get; }
         public override string Title => FeaturesResources.Move_static_members_to_another_type;

From 7b6c9cd1ae989f26ab509f90cb423a38cc930b0d Mon Sep 17 00:00:00 2001
From: Soren Dahl <43689321+Soreloser2@users.noreply.github.com>
Date: Thu, 12 Aug 2021 16:53:43 -0700
Subject: [PATCH 31/64] Test framework movement (#55586)

* WIP Dialog work

* Rename + refactor

* WIP rename, add xaml elements

* WIP dialog/VM work

* WIP, Reverted Pull Member up change, updated destination selection, not working bc of a few bugs

* Refactoring provider now shows up and launches dialog

No behavior created after dialog exited
Still working on destination type/filename selection formatting

* Rename/Refactor name to MoveStaticMembers. Feature working with textbox, assuming new class (c# only, no automated tests yet)

* Accessibility, theming, resources, and sizing retweaks

* Added VB refactoring provider. Currently does not trigger on fields, as the semantic model cannot get the symbol for VB declared fields from the node. Fields are added as part of the dialog box however.

* Addressing some of the feedback

* Fixed fields not being able to trigger dialog in VB

* Remove unnecessary usings

* Fixed nullable error

* Added test classes for view model and C# impl, made VB able to get dependents

* Finished Writing impl tests for C# and VB. VB tests are currently failing due to the way AddMembers reuses syntax. Fixed a few bugs

* Fixed resources and removed nullable disable annotation

* Adress small feedback points

* Small test fix. Works with generator changes (sepearate PR)

* WIP untested, refactoring references to moved members

* Added tests for refactoring and extensions for C#. Will add tests for refactoring in VB, but unsure about extensions since we do not generate a module.

* Make module now for VB, add refactor tests

* Updated C# tests to a new framework. May need to rewrite VB test file in C# to set some readonly properties

* Changed VB tests to new Framework. Revealed an error in the way vb members are moved

* Fixed VB tests by removing shared modifier when moving to a module

* Fixed more tests to account for member spacing innaccuracy

* Refactored tests, added vb extension tests

* Added tests for file banner and moving from a static class/module

* Added tests to enure operator and static constructors are not able to be selected or trigger refactoring

* Make service field readonly

* Fixed some code warnings and reverted to before member refactoring, removing a few tests in the process

Co-authored-by: msftbot[bot] <48340428+msftbot[bot]@users.noreply.github.com>
---
 .../CSharpMoveStaticMembersTests.cs           | 1186 +++++++----------
 .../TestMoveStaticMembersService.cs           |   28 +-
 .../VisualBasicMoveStaticMembersTests.vb      | 1171 ++++++++--------
 ...arpMoveStaticMembersRefactoringProvider.cs |   11 +-
 ...actMoveStaticMembersRefactoringProvider.cs |   12 +-
 .../MoveStaticMembersWithDialogCodeAction.cs  |   65 +-
 .../Portable/PullMemberUp/MembersPuller.cs    |   17 +-
 ...sicMoveStaticMembersRefactoringProvider.vb |    8 +-
 .../MoveStaticMembersViewModelTest.vb         |   18 +
 9 files changed, 1143 insertions(+), 1373 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index db51b2348a641..529b70ef9db60 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -4,154 +4,88 @@
 
 using System.Collections.Immutable;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CodeActions;
-using Microsoft.CodeAnalysis.CodeRefactorings;
-using Microsoft.CodeAnalysis.CSharp.CodeRefactorings.MoveStaticMembers;
-using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeRefactorings;
 using Microsoft.CodeAnalysis.MoveStaticMembers;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Microsoft.CodeAnalysis.Test.Utilities.MoveStaticMembers;
 using Xunit;
+using VerifyCS = Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions.CSharpCodeRefactoringVerifier<
+    Microsoft.CodeAnalysis.CSharp.CodeRefactorings.MoveStaticMembers.CSharpMoveStaticMembersRefactoringProvider>;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.MoveStaticMembers
 {
-    public class CSharpMoveStaticMembersTests : AbstractCSharpCodeActionTest
+    [UseExportProvider]
+    public class CSharpMoveStaticMembersTests
     {
-        protected override CodeRefactoringProvider CreateCodeRefactoringProvider(Workspace workspace, TestParameters parameters)
-        {
-            return new CSharpMoveStaticMembersRefactoringProvider((IMoveStaticMembersOptionsService)parameters.fixProviderData);
-        }
-
-        protected override ImmutableArray<CodeAction> MassageActions(ImmutableArray<CodeAction> actions) => FlattenActions(actions);
-
-        private async Task TestNoRefactoringProvidedAsync(
-            string initialMarkup,
-            TestParameters parameters = default)
-        {
-            using var workspace = CreateWorkspaceFromOptions(initialMarkup, parameters);
-            var (actions, _) = await GetCodeActionsAsync(workspace, parameters).ConfigureAwait(false);
-            // no actions should be provided
-            Assert.Equal(0, actions.Length);
-        }
-
-        internal Task TestMovementAsync(
-            string initialMarkUp,
-            string expectedResult,
-            string destinationType,
-            ImmutableArray<string> selection,
-            string destinationName = "a.cs",
-            TestParameters parameters = default)
-        {
-            var service = new TestMoveStaticMembersService(destinationType, destinationName, selection.AsImmutable());
-
-            return TestInRegularAndScript1Async(
-                initialMarkUp,
-                expectedResult,
-                parameters.WithFixProviderData(service));
-        }
+        private static readonly TestComposition s_testServices = FeaturesTestCompositions.Features.AddParts(typeof(TestMoveStaticMembersService));
 
         #region Perform Actions From Options
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestMoveField()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         public static int Test[||]Field = 1;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
         public static int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestMoveProperty()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         public static int Test[||]Property { get; set; }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestProperty");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
         public static int TestProperty { get; set; }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestMoveEvent()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 using System;
 
 namespace TestNs1
@@ -160,17 +94,11 @@ public class Class1
     {
         public static event EventHandler Test[||]Event;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestEvent");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 using System;
 
 namespace TestNs1
@@ -178,9 +106,8 @@ namespace TestNs1
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">using System;
+}";
+            var expectedResult2 = @"using System;
 
 namespace TestNs1
 {
@@ -188,23 +115,14 @@ static class Class1Helpers
     {
         public static event EventHandler TestEvent;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestMoveMethod()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -214,25 +132,18 @@ public class Class1
             return 0;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
@@ -241,14 +152,63 @@ public static int TestMethod()
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveExtensionMethod()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public static class Class1
+    {
+        public static int Test[||]Method(this Other other)
+        {
+            return other.OtherInt + 2;
+        }
+    }
+
+    public class Other
+    {
+        public int OtherInt;
+        public Other()
+        {
+            OtherInt = 5;
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public static class Class1
+    {
+    }
+
+    public class Other
+    {
+        public int OtherInt;
+        public Other()
+        {
+            OtherInt = 5;
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod(this Other other)
+        {
+            return other.OtherInt + 2;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -256,114 +216,78 @@ public async Task TestMoveConstField()
         {
             // const is static so we should work here
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         public const int Test[||]Field = 1;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
         public const int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestMoveMultipleMethods()
         {
-            // Bug where PullMembersUp doesn't apply formatting annotation
-            // When the destination ends up with more than one member:
-            // https://github.com/dotnet/roslyn/issues/54847
-            // so we keep the weird formatting for now
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
-        public static int Test[||]MethodInt()
+        public static bool TestMethodBool()
         {
-            return 0;
+            return false;
         }
 
-        public static bool TestMethodBool()
+        public static int Test[||]MethodInt()
         {
-            return false;
+            return 0;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethodInt", "TestMethodBool");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
-
         public static bool TestMethodBool()
         {
             return false;
         }
+
         public static int TestMethodInt()
         {
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -371,9 +295,6 @@ public async Task TestMoveSingleMethodFromMultiple()
         {
             // move the method that this was not triggered on
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -388,17 +309,11 @@ public static bool TestMethodBool()
             return false;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethodBool");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
@@ -408,9 +323,8 @@ public static int TestMethodInt()
             return 0;
         }
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
@@ -420,48 +334,32 @@ public static bool TestMethodBool()
             return false;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestMoveOneOfEach()
         {
-            // Bug where PullMembersUp doesn't apply formatting annotation
-            // When the destination ends up with more than one member:
-            // https://github.com/dotnet/roslyn/issues/54847
-            // so we keep the weird formatting for now
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 using System;
 
 namespace TestNs1
 {
     public class Class1
     {
-        public static int Test[||]Method()
-        {
-            return 0;
-        }
+        public static int TestField;
 
         public static bool TestProperty { get; set; }
 
-        public static int TestField;
-
         public static event EventHandler TestEvent;
+
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create(
@@ -469,10 +367,7 @@ public class Class1
                 "TestField",
                 "TestProperty",
                 "TestEvent");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 using System;
 
 namespace TestNs1
@@ -480,15 +375,13 @@ namespace TestNs1
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">using System;
+}";
+            var expectedResult2 = @"using System;
 
 namespace TestNs1
 {
     static class Class1Helpers
     {
-
         public static int TestField;
 
         public static bool TestProperty { get; set; }
@@ -500,23 +393,14 @@ static class Class1Helpers
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestInNestedClass()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -526,17 +410,11 @@ public class NestedClass1
             public static int Test[||]Field = 1;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
@@ -545,32 +423,22 @@ public class NestedClass1
         {
         }
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
         public static int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestInNestedNamespace()
         {
-            // collapse the namespaces
+            // collapse the namespaces in the new file
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     namespace InnerNs
@@ -580,17 +448,11 @@ public class Class1
             public static int Test[||]Field = 1;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     namespace InnerNs
@@ -599,101 +461,62 @@ public class Class1
         {
         }
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1.InnerNs
+}";
+            var expectedResult2 = @"namespace TestNs1.InnerNs
 {
     static class Class1Helpers
     {
         public static int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestMoveFieldNoNamespace()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 public class Class1
 {
     public static int Test[||]Field = 1;
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 public class Class1
 {
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">static class Class1Helpers
+}";
+            var expectedResult2 = @"static class Class1Helpers
 {
     public static int TestField = 1;
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestMoveFieldNewNamespace()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 public class Class1
 {
     public static int Test[||]Field = 1;
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "NewNs.Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 public class Class1
 {
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace NewNs
+}";
+            var expectedResult2 = @"namespace NewNs
 {
     static class Class1Helpers
     {
         public static int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -702,9 +525,6 @@ public async Task TestMoveMethodWithNamespacedSelectedDestination()
             // in the case that we have an extra namespace in the destination name
             // we append it on to the old type's namespace
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -714,25 +534,18 @@ public class Class1
             return 0;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "ExtraNs.Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1.ExtraNs
+}";
+            var expectedResult2 = @"namespace TestNs1.ExtraNs
 {
     static class Class1Helpers
     {
@@ -741,24 +554,15 @@ public static int TestMethod()
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestMoveMethodFileScopedNamespace()
         {
-            // We still keep normal namespacing rules in the new file regardless
+            // We still keep normal namespacing rules in the new file
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1;
 
 public class Class1
@@ -767,24 +571,17 @@ public class Class1
     {
         return 0;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1;
 
 public class Class1
 {
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
@@ -793,174 +590,248 @@ public static int TestMethod()
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+                LanguageVersion = CodeAnalysis.CSharp.LanguageVersion.CSharp10
+            }.RunAsync().ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
-        public async Task TestMoveMethodWithFolders()
+        public async Task TestMoveGenericMethod()
         {
-            // We should just put the new file in the same folder
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document Folders=""Folder1"" FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
-        public static int Test[||]Method()
+        public static T Test[||]Method<T>(T item)
         {
-            return 0;
+            return item;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document Folders=""Folder1"" FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document Folders=""Folder1"" FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
-        public static int TestMethod()
+        public static T TestMethod<T>(T item)
         {
-            return 0;
+            return item;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
-        public async Task TestMoveGenericMethod()
+        public async Task TestMoveMethodWithGenericClass()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
-    public class Class1
+    public class Class1<T>
     {
-        public static T Test[||]Method&lt;T&gt;(T item)
+        public static T Test[||]Method(T item)
         {
             return item;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
-    public class Class1
+    public class Class1<T>
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    static class Class1Helpers<T>
     {
-        public static T TestMethod&lt;T&gt;(T item)
+        public static T Test[||]Method(T item)
         {
             return item;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
-        public async Task TestMoveGenericClassWithMethod()
+        public async Task TestMoveExtensionMethodDontRefactor()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
-    public class Class1&lt;T&gt;
+    public static class Class1
     {
-        public static T Test[||]Method(T item)
+        public static int Test[||]Method(this Other other)
         {
-            return item;
+            return other.OtherInt + 2;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+
+    public class Class2
+    {
+        public int GetOtherInt()
+        {
+            var other = new Other();
+            return other.TestMethod();
+        }
+    }
+
+    public class Other
+    {
+        public int OtherInt;
+        public Other()
+        {
+            OtherInt = 5;
+        }
+    }
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
-    public class Class1&lt;T&gt;
+    public static class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+
+    public class Class2
+    {
+        public int GetOtherInt()
+        {
+            var other = new Other();
+            return other.TestMethod();
+        }
+    }
+
+    public class Other
+    {
+        public int OtherInt;
+        public Other()
+        {
+            OtherInt = 5;
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers&lt;T&gt;
+    static class Class1Helpers
     {
-        public static T Test[||]Method(T item)
+        public static int TestMethod(this Other other)
         {
-            return item;
+            return other.OtherInt + 2;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodFromStaticClass()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public static class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public static class Class1
+    {
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodRetainFileBanner()
+        {
+            var initialMarkup = @"// Here is an example of a license or something
+// we would want to keep at the top of a file
+
+namespace TestNs1
+{
+    public static class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"// Here is an example of a license or something
+// we would want to keep at the top of a file
+
+namespace TestNs1
+{
+    public static class Class1
+    {
+    }
+}";
+            var expectedResult2 = @"// Here is an example of a license or something
+// we would want to keep at the top of a file
+
+namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
         #endregion
 
@@ -970,9 +841,6 @@ await TestMovementAsync(initialMarkup,
         public async Task TestSelectInMethodParens()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -982,25 +850,18 @@ public static int TestMethod([||])
             return 0;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
@@ -1009,211 +870,138 @@ public static int TestMethod()
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestSelectWholeFieldDeclaration()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         [|public static int TestField = 1;|]
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
         public static int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestSelectBeforeKeywordOfDeclaration()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         [||]public static int TestField = 1;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
         public static int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestSelectInKeyWordOfDeclaration1()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         pub[||]lic static int TestField = 1;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
         public static int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestSelectInKeyWordOfDeclaration2()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         public st[||]atic int TestField = 1;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
         public static int TestField = 1;
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestSelectInTypeIdentifierMethodDeclaration()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -1223,25 +1011,18 @@ public class Class1
             return 0;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
+}";
             var selectedDestinationName = "Class1Helpers";
             var newFileName = "Class1Helpers.cs";
             var selectedMembers = ImmutableArray.Create("TestMethod");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
+}";
+            var expectedResult2 = @"namespace TestNs1
 {
     static class Class1Helpers
     {
@@ -1250,112 +1031,76 @@ public static int TestMethod()
             return 0;
         }
     }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
-        public async Task TestSelectInTypeIdentifierOfFieldDeclaration_NoAction()
+        public async Task TestSelectInFieldInitializerAfterSemicolon()
         {
+            // However, a semicolon after the initializer is still considered a declaration
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
-        public static i[||]nt TestField = 1;
+        public static int TestField = 1;[||]
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
-            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
-        }
-
-        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
-        public async Task TestSelectInFieldInitializerEquals_NoAction()
-        {
-            // The initializer isn't a member declaration
-            var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult1 = @"
 namespace TestNs1
 {
     public class Class1
     {
-        public static int TestField =[||] 1;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
-            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 1;
+    }
+}";
+
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
-        public async Task TestSelectInFieldInitializerAfterSemicolon()
+        public async Task TestSelectInTypeIdentifierOfFieldDeclaration_NoAction()
         {
-            // However, a semicolon after the initializer is still considered a declaration
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
-        public static int TestField = 1;[||]
+        public static i[||]nt TestField = 1;
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
-            var selectedDestinationName = "Class1Helpers";
-            var newFileName = "Class1Helpers.cs";
-            var selectedMembers = ImmutableArray.Create("TestField");
-            var expectedResult = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
+}";
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectInFieldInitializerEquals_NoAction()
+        {
+            // The initializer isn't a member declaration
+            var initialMarkup = @"
 namespace TestNs1
 {
     public class Class1
     {
+        public static int TestField =[||] 1;
     }
-}
-        </Document>
-        <Document FilePath=""Class1Helpers.cs"">namespace TestNs1
-{
-    static class Class1Helpers
-    {
-        public static int TestField = 1;
-    }
-}</Document>
-    </Project>
-</Workspace>";
-            await TestMovementAsync(initialMarkup,
-                expectedResult,
-                selectedDestinationName,
-                selectedMembers,
-                newFileName).ConfigureAwait(false);
+}";
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestSelectMethodBody_NoAction()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -1365,20 +1110,14 @@ public static int TestMethod()
             retu[||]rn 0;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
-            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+}";
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestSelectMethodBracket_NoAction()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
@@ -1388,52 +1127,147 @@ public static int TestMethod()
             return 0;
         }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
-            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+}";
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestSelectPropertyBody_NoAction()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         public static int TestProperty { get; [||]set; }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
-            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+}";
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestSelectNonStaticProperty_NoAction()
         {
             var initialMarkup = @"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""CSAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.cs"">
 namespace TestNs1
 {
     public class Class1
     {
         public int Test[||]Property { get; set; }
     }
-}
-        </Document>
-    </Project>
-</Workspace>";
-            await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(false);
+}";
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectStaticConstructor1_NoAction()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        [|static Class1()|]
+        {
+        }
+    }
+}";
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectStaticConstructor2_NoAction()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        static Cl[||]ass1()
+        {
+        }
+    }
+}";
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestSelectOperator_NoAction()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        [|public static Class1 operator +(Class1 a, Class1 b)|]
+        {
+            return new Class1();
+        }
+    }
+}";
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
         }
         #endregion
+
+        private class Test : VerifyCS.Test
+        {
+            public Test(
+                string destinationType,
+                ImmutableArray<string> selection,
+                string destinationName = "a.cs")
+            {
+                _destinationType = destinationType;
+                _selection = selection;
+                _destinationName = destinationName;
+            }
+
+            private readonly string _destinationType;
+
+            private readonly ImmutableArray<string> _selection;
+
+            private readonly string _destinationName;
+
+            protected override Workspace CreateWorkspaceImpl()
+            {
+                var hostServices = s_testServices.GetHostServices();
+
+                var workspace = new AdhocWorkspace(hostServices);
+                var testOptionsService = (TestMoveStaticMembersService)workspace.Services.GetRequiredService<IMoveStaticMembersOptionsService>();
+                testOptionsService.DestinationType = _destinationType;
+                testOptionsService.SelectedMembers = _selection;
+                testOptionsService.Filename = _destinationName;
+
+                return workspace;
+            }
+        }
+
+        private static async Task TestMovementNewFileAsync(
+            string initialMarkup,
+            string expectedSource,
+            string expectedNewFile,
+            string newFileName,
+            ImmutableArray<string> selectedMembers,
+            string newTypeName)
+            => await new Test(newTypeName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedSource,
+                        (newFileName, expectedNewFile)
+                    }
+                },
+            }.RunAsync().ConfigureAwait(false);
+
+        private static async Task TestNoRefactoringAsync(string initialMarkup)
+        {
+            await new Test("", ImmutableArray<string>.Empty)
+            {
+                TestCode = initialMarkup,
+                FixedCode = initialMarkup,
+            }.RunAsync().ConfigureAwait(false);
+        }
     }
 }
diff --git a/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
index 69cd955a824ec..bc02f360ee914 100644
--- a/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
+++ b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
@@ -3,35 +3,39 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Immutable;
+using System.Composition;
+using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.MoveStaticMembers;
 
 namespace Microsoft.CodeAnalysis.Test.Utilities.MoveStaticMembers
 {
+    [ExportWorkspaceService(typeof(IMoveStaticMembersOptionsService))]
+    [Shared]
+    [PartNotDiscoverable]
     internal class TestMoveStaticMembersService : IMoveStaticMembersOptionsService
     {
-        private readonly string _destinationType;
+        [ImportingConstructor]
+        [System.Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public TestMoveStaticMembersService()
+        {
+        }
 
-        private readonly ImmutableArray<string> _selectedMembers;
+        public string? DestinationType { get; set; }
 
-        private readonly string _filename;
+        public ImmutableArray<string> SelectedMembers { get; set; }
 
-        public TestMoveStaticMembersService(string destinationType, string fileName, ImmutableArray<string> members)
-        {
-            _destinationType = destinationType;
-            _filename = fileName;
-            _selectedMembers = members;
-        }
+        public string? Filename { get; set; }
 
         public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol)
         {
-            var selectedMembers = selectedType.GetMembers().WhereAsArray(symbol => _selectedMembers.Contains(symbol.Name));
+            var selectedMembers = selectedType.GetMembers().WhereAsArray(symbol => SelectedMembers.Contains(symbol.Name));
             var namespaceDisplay = selectedType.ContainingNamespace.IsGlobalNamespace
                 ? string.Empty
                 : selectedType.ContainingNamespace.ToDisplayString();
             // just return all the selected members
             return new MoveStaticMembersOptions(
-                _filename,
-                string.Join(".", namespaceDisplay, _destinationType),
+                Filename!,
+                string.Join(".", namespaceDisplay, DestinationType!),
                 selectedMembers);
         }
     }
diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index 55d3083fdc856..c49b75f5b8e71 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -3,356 +3,250 @@
 ' See the LICENSE file in the project root for more information.
 
 Imports System.Collections.Immutable
-Imports Microsoft.CodeAnalysis.CodeActions
-Imports Microsoft.CodeAnalysis.CodeRefactorings
-Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings
 Imports Microsoft.CodeAnalysis.MoveStaticMembers
 Imports Microsoft.CodeAnalysis.Test.Utilities.MoveStaticMembers
-Imports Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings.MoveStaticMembers
+Imports VerifyVB = Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions.VisualBasicCodeRefactoringVerifier(Of
+    Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings.MoveStaticMembers.VisualBasicMoveStaticMembersRefactoringProvider)
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.MoveStaticMembers
+    <UseExportProvider>
     Public Class VisualBasicMoveStaticMembersTests
-        Inherits AbstractVisualBasicCodeActionTest
 
-        Protected Overrides Function CreateCodeRefactoringProvider(workspace As Workspace, parameters As TestParameters) As CodeRefactoringProvider
-            Return New VisualBasicMoveStaticMembersRefactoringProvider(DirectCast(parameters.fixProviderData, IMoveStaticMembersOptionsService))
-        End Function
-
-        Protected Overrides Function MassageActions(actions As ImmutableArray(Of CodeAction)) As ImmutableArray(Of CodeAction)
-            Return FlattenActions(actions)
-        End Function
-
-        Private Async Function TestNoRefactoringProvidedAsync(initialMarkup As String) As Task
-            Dim parameters = New TestParameters()
-            Dim workspace = CreateWorkspaceFromOptions(initialMarkup, parameters)
-            Dim tuple = Await GetCodeActionsAsync(workspace, parameters).ConfigureAwait(False)
-            Dim actions = tuple.Item1
-            ' No actions should be provided
-            Assert.Equal(0, actions.Length)
-        End Function
-
-        Private Function TestMovementAsync(
-            initialMarkup As String,
-            expectedResult As String,
-            destinationType As String,
-            selection As ImmutableArray(Of String),
-            Optional destinationName As String = "a.vb",
-            Optional parameters As TestParameters = Nothing) As Task
-            If IsNothing(parameters) Then
-                parameters = New TestParameters()
-            End If
-
-            Dim service = New TestMoveStaticMembersService(destinationType, destinationName, selection.AsImmutable())
-            Return TestInRegularAndScript1Async(initialMarkup, expectedResult, parameters.WithFixProviderData(service))
-        End Function
+        Private Shared ReadOnly s_testServices As TestComposition = FeaturesTestCompositions.Features.AddParts(GetType(TestMoveStaticMembersService))
 
 #Region "Perform Actions From Options"
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveField() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Test[||]Field As Integer = 0
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestField")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public TestField As Integer = 0
+
+    End Module
 End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared TestField As Integer = 0
-    End Class
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveProperty() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
-        Public Shared Property Test[||]Property As Integer
+        Public Shared ReadOnly Property Test[||]Property As Integer
             Get
                 Return 0
             End Get
         End Property
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestProperty")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared Property TestProperty As Integer
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public ReadOnly Property TestProperty As Integer
             Get
                 Return 0
             End Get
         End Property
-    End Class
+    End Module
 End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveEvent() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+Imports System
+
 Namespace TestNs
     Public Class Class1
         Public Shared Event Test[||]Event As EventHandler
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestEvent")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
+Imports System
+
 Namespace TestNs
     Public Class Class1
     End Class
+End Namespace"
+            Dim expectedText2 = "Imports System
+
+Namespace TestNs
+    Module Class1Helpers
+        Public Event TestEvent As EventHandler
+    End Module
 End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared Event TestEvent As EventHandler
-    End Class
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveComplexEvent() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+Imports System
+
 Namespace TestNs
     Public Class Class1
         Public Shared Custom Event Cl[||]ick As EventHandler
             AddHandler(ByVal value As EventHandler)
-                Events.AddHandler(""ClickEvent"", value)
+                Console.WriteLine(value.ToString())
             End AddHandler
             RemoveHandler(ByVal value As EventHandler)
-                Events.RemoveHandler(""ClickEvent"", value)
+                Console.WriteLine(value.ToString())
             End RemoveHandler
             RaiseEvent(ByVal sender As Object, ByVal e As EventArgs)
-                CType(Events(""ClickEvent""), EventHandler).Invoke(sender, e)
+                Console.WriteLine(sender.ToString())
             End RaiseEvent
         End Event
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("Click")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
+Imports System
+
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared Custom Event Click As EventHandler
+End Namespace"
+            Dim expectedText2 = "Imports System
+
+Namespace TestNs
+    Module Class1Helpers
+        Public Custom Event Click As EventHandler
             AddHandler(ByVal value As EventHandler)
-                Events.AddHandler(""ClickEvent"", value)
+                Console.WriteLine(value.ToString())
             End AddHandler
             RemoveHandler(ByVal value As EventHandler)
-                Events.RemoveHandler(""ClickEvent"", value)
+                Console.WriteLine(value.ToString())
             End RemoveHandler
             RaiseEvent(ByVal sender As Object, ByVal e As EventArgs)
-                CType(Events(""ClickEvent""), EventHandler).Invoke(sender, e)
+                Console.WriteLine(sender.ToString())
             End RaiseEvent
         End Event
-    End Class
+    End Module
 End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveFunction() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function Test[||]Func() As Integer
             Return 0
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared Function TestFunc() As Integer
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public Function TestFunc() As Integer
             Return 0
         End Function
-    End Class
+    End Module
 End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveSub() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Sub Test[||]Sub()
         End Sub
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestSub")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared Sub TestSub()
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public Sub TestSub()
         End Sub
-    End Class
+    End Module
 End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveConst() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
-        Public Shared Const Test[||]Const As Integer = 0
+        Public Const Test[||]Const As Integer = 0
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestConst")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public Const TestConst As Integer = 0
+    End Module
 End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared Const TestConst As Integer = 0
-    End Class
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestInNestedClass() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Class InnerClass
@@ -361,44 +255,32 @@ Namespace TestNs
             End Function
         End Class
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
         Public Class InnerClass
         End Class
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared Function TestFunc() As Integer
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public Function TestFunc() As Integer
             Return 0
         End Function
-    End Class
+    End Module
 End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestInNestedNamespace() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Namespace InnerNs
         Public Class Class1
@@ -407,274 +289,193 @@ Namespace TestNs
             End Function
         End Class
     End Namespace
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Namespace InnerNs
         Public Class Class1
         End Class
     End Namespace
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs.InnerNs
-    Class Class1Helpers
-        Public Shared Function TestFunc() As Integer
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs.InnerNs
+    Module Class1Helpers
+        Public Function TestFunc() As Integer
             Return 0
         End Function
-    End Class
+    End Module
 End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveFieldNoNamespace() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Public Class Class1
     Public Shared Test[||]Field As Integer = 0
-End Class
-        </Document>
-    </Project>
-</Workspace>
-"
+End Class"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestField")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Public Class Class1
-End Class
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Class Class1Helpers
-    Public Shared TestField As Integer = 0
-End Class
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+End Class"
+            Dim expectedText2 = "Module Class1Helpers
+    Public TestField As Integer = 0
+
+End Module
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveFieldNewNamespace() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Public Class Class1
     Public Shared Test[||]Field As Integer = 0
-End Class
-        </Document>
-    </Project>
-</Workspace>
-"
+End Class"
             Dim newTypeName = "TestNs.Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestField")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Public Class Class1
-End Class
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared TestField As Integer = 0
-    End Class
+End Class"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public TestField As Integer = 0
+
+    End Module
 End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveFieldAddNamespace() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Test[||]Field As Integer = 0
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "InnerNs.Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestField")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs.InnerNs
+    Module Class1Helpers
+        Public TestField As Integer = 0
+
+    End Module
 End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs.InnerNs
-    Class Class1Helpers
-        Public Shared TestField As Integer = 0
-    End Class
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveGenericFunction() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function Test[||]Func(Of T)(item As T) As T
             Return item
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared Function TestFunc(Of T)(item As T) As T
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public Function TestFunc(Of T)(item As T) As T
             Return item
         End Function
-    End Class
+    End Module
 End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveFunctionWithGenericClass() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1(Of T)
         Public Shared Function Test[||]Func(item As T) As T
             Return item
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1(Of T)
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
     Class Class1Helpers(Of T)
         Public Shared Function TestFunc(item As T) As T
             Return item
         End Function
     End Class
 End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveFunctionWithFolders() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document Folders=""Folder1"" FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function Test[||]Func() As Integer
             Return 0
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document Folders=""Folder1"" FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document Folders=""Folder1"" FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared Function TestFunc() As Integer
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public Function TestFunc() As Integer
             Return 0
         End Function
-    End Class
+    End Module
 End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveMultipleFunctions() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function Test[||]Func1() As Integer
@@ -685,46 +486,34 @@ Namespace TestNs
             Return False
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc1", "TestFunc2")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared Function TestFunc1() As Integer
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public Function TestFunc1() As Integer
             Return 0
         End Function
 
-        Public Shared Function TestFunc2() As Boolean
+        Public Function TestFunc2() As Boolean
             Return False
         End Function
-    End Class
+    End Module
 End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveOneOfMultipleFuncs() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function Test[||]Func1() As Integer
@@ -735,51 +524,41 @@ Namespace TestNs
             Return False
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc2")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
         Public Shared Function TestFunc1() As Integer
             Return 0
         End Function
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
 
-        Public Shared Function TestFunc2() As Boolean
+        Public Function TestFunc2() As Boolean
             Return False
         End Function
-    End Class
+    End Module
 End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveOneOfEach() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+Imports System
+
 Namespace TestNs
     Public Class Class1
         Public Shared Test[||]Field As Integer = 0
 
-        Public Shared Property TestProperty As Integer
+        Public Shared ReadOnly Property TestProperty As Integer
             Get
                 Return 0
             End Get
@@ -794,11 +573,7 @@ Namespace TestNs
         Public Shared Sub TestSub()
         End Sub
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create(
@@ -807,397 +582,523 @@ End Namespace
                 "TestFunc",
                 "TestEvent",
                 "TestSub")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
+Imports System
+
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared TestField As Integer = 0
+End Namespace"
+            Dim expectedText2 = "Imports System
+
+Namespace TestNs
+    Module Class1Helpers
+        Public TestField As Integer = 0
 
-        Public Shared Property TestProperty As Integer
+
+        Public ReadOnly Property TestProperty As Integer
             Get
                 Return 0
             End Get
         End Property
 
-        Public Shared Event TestEvent As EventHandler
+        Public Event TestEvent As EventHandler
 
-        Public Shared Sub TestSub()
+        Public Sub TestSub()
         End Sub
 
-        Public Shared Function TestFunc() As Integer
+        Public Function TestFunc() As Integer
             Return 0
         End Function
-    End Class
+    End Module
 End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
-#End Region
-#Region "SelectionTests"
+
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
-        Public Async Function TestSelectBeforeDeclarationKeyword() As Task
+        Public Async Function TestMoveExtensionFunction() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+Imports System.Runtime.CompilerServices
+
 Namespace TestNs
-    Public Class Class1
-        [||]Public Shared TestField As Integer = 0
+    Public Module Class1
+        <Extension>
+        Public Function Test[||]Func(other As Other) As Integer
+            Return other.OtherInt + 2
+        End Function
+    End Module
+
+    Public Class Class2
+        Public Function GetOtherInt() As Integer
+            Dim other = New Other()
+            Return other.TestFunc()
+        End Function
+    End Class
+
+    Public Class Other
+        Public OtherInt As Integer
+
+        Public Sub New()
+            OtherInt = 5
+        End Sub
+    End Class
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Imports System.Runtime.CompilerServices
+
+Namespace TestNs
+    Public Module Class1
+    End Module
+
+    Public Class Class2
+        Public Function GetOtherInt() As Integer
+            Dim other = New Other()
+            Return other.TestFunc()
+        End Function
     End Class
+
+    Public Class Other
+        Public OtherInt As Integer
+
+        Public Sub New()
+            OtherInt = 5
+        End Sub
+    End Class
+End Namespace"
+            Dim expectedText2 = "Imports System.Runtime.CompilerServices
+
+Namespace TestNs
+    Module Class1Helpers
+        <Extension>
+        Public Function TestFunc(other As Other) As Integer
+            Return other.OtherInt + 2
+        End Function
+    End Module
 End Namespace
-        </Document>
-    </Project>
-</Workspace>
 "
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionInModule() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Module Class1
+        Public Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Module
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
-            Dim selection = ImmutableArray.Create("TestField")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Module Class1
+    End Module
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Module
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionRetainFileBanner() As Task
+            Dim initialMarkup = "' Here is an example of a license or something
+' That we want to keep/copy over
+
 Namespace TestNs
     Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared TestField As Integer = 0
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "' Here is an example of a license or something
+' That we want to keep/copy over
+
+Namespace TestNs
+    Public Class Class1
     End Class
+End Namespace"
+            Dim expectedText2 = "' Here is an example of a license or something
+' That we want to keep/copy over
+
+Namespace TestNs
+    Module Class1Helpers
+        Public Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Module
 End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
+#End Region
+#Region "SelectionTests"
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
-        Public Async Function TestSelectWholeFieldDeclaration() As Task
+        Public Async Function TestSelectBeforeDeclarationKeyword() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
-        [|Public Shared TestField As Integer = 0|]
+        [||]Public Shared TestField As Integer = 0
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestField")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public TestField As Integer = 0
+
+    End Module
 End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared TestField As Integer = 0
-    End Class
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
-        Public Async Function TestSelectInFieldInitializerEquals_NoAction() As Task
+        Public Async Function TestSelectWholeFieldDeclaration() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
-        Public Shared TestField As Integer =[||] 0
+        [|Public Shared TestField As Integer = 0|]
+    End Class
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
     End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public TestField As Integer = 0
+
+    End Module
 End Namespace
-        </Document>
-    </Project>
-</Workspace>
 "
-            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestSelectInDeclarationKeyword1() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Pub[||]lic Shared TestField As Integer = 0
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestField")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public TestField As Integer = 0
+
+    End Module
 End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared TestField As Integer = 0
-    End Class
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestSelectInDeclarationKeyword2() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shar[||]ed TestField As Integer = 0
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestField")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public TestField As Integer = 0
+
+    End Module
 End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared TestField As Integer = 0
-    End Class
-End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestSelectInMethodParens() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function TestFunc([||]) As Integer
             Return 0
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared Function TestFunc() As Integer
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public Function TestFunc() As Integer
             Return 0
         End Function
-    End Class
+    End Module
 End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestSelectInTypeIdentifierMethodDeclaration() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function TestFunc() As Inte[||]ger
             Return 0
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
-End Namespace
-        </Document>
-        <Document FilePath=""Class1Helpers.vb"">Namespace TestNs
-    Class Class1Helpers
-        Public Shared Function TestFunc() As Integer
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public Function TestFunc() As Integer
             Return 0
         End Function
-    End Class
+    End Module
 End Namespace
-</Document>
-    </Project>
-</Workspace>"
-            Await TestMovementAsync(initialMarkup, expectedText, newTypeName, selection, newFileName).ConfigureAwait(False)
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInFieldInitializerEquals_NoAction() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared TestField As Integer =[||] 0
+    End Class
+End Namespace"
+
+            Await TestNoRefactoringAsync(initialMarkup)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestSelectInFieldTypeIdentifier_NoAction() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared TestField As Int[||]eger = 0
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
-            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+End Namespace"
+
+            Await TestNoRefactoringAsync(initialMarkup)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestSelectInMethodBody_NoAction() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function TestFunc() As Integer
             Retu[||]rn 0
         End Function
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
-            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+End Namespace"
+
+            Await TestNoRefactoringAsync(initialMarkup)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestSelectInMethodClose_NoAction() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
         Public Shared Function TestFunc() As Integer
             Return 0
         End Func[||]tion
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
-            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+End Namespace"
+
+            Await TestNoRefactoringAsync(initialMarkup)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestSelectNonSharedProperty_NoAction() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
-        Public Property Test[||]Property As Integer
+        Public ReadOnly Property Test[||]Property As Integer
             Get
                 Return 0
             End Get
         End Property
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
-            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+End Namespace"
+
+            Await TestNoRefactoringAsync(initialMarkup)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestSelectPropertyGetter_NoAction() As Task
             Dim initialMarkup = "
-<Workspace>
-    <Project Language=""Visual Basic"" AssemblyName=""VBAssembly1"" CommonReferences=""true"">
-        <Document FilePath=""Class1.vb"">
 Namespace TestNs
     Public Class Class1
-        Public Shared Property TestProperty As Integer
+        Public Shared ReadOnly Property TestProperty As Integer
             Get[||]
                 Return 0
             End Get
         End Property
     End Class
-End Namespace
-        </Document>
-    </Project>
-</Workspace>
-"
-            Await TestNoRefactoringProvidedAsync(initialMarkup).ConfigureAwait(False)
+End Namespace"
+
+            Await TestNoRefactoringAsync(initialMarkup)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectConstructor1_NoAction() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1
+        Shared Sub N[||]ew()
+        End Sub
+    End Class
+End Namespace"
+
+            Await TestNoRefactoringAsync(initialMarkup)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectConstructor2_NoAction() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1
+        [|Shared Sub New()|]
+        End Sub
+    End Class
+End Namespace"
+
+            Await TestNoRefactoringAsync(initialMarkup)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectOperator_NoAction() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1
+        [|Public Shared Operator +(a As Class1, b As Class1) As Class1|]
+            Return New Class1()
+        End Operator
+    End Class
+End Namespace"
+
+            Await TestNoRefactoringAsync(initialMarkup)
         End Function
 #End Region
+
+        Private Class Test
+            Inherits VerifyVB.Test
+
+            Public Sub New(destinationType As String,
+                           members As ImmutableArray(Of String),
+                           newFileName As String)
+                _destinationType = destinationType
+                _members = members
+                _newFileName = newFileName
+            End Sub
+
+            Private ReadOnly _destinationType As String
+
+            Private ReadOnly _members As ImmutableArray(Of String)
+
+            Private ReadOnly _newFileName As String
+
+            Protected Overrides Function CreateWorkspaceImpl() As Workspace
+                Dim hostServices = s_testServices.GetHostServices()
+
+                Dim workspace = New AdhocWorkspace(hostServices)
+                Dim optionsService = DirectCast(workspace.Services.GetRequiredService(Of IMoveStaticMembersOptionsService)(), TestMoveStaticMembersService)
+                optionsService.DestinationType = _destinationType
+                optionsService.Filename = _newFileName
+                optionsService.SelectedMembers = _members
+
+                Return workspace
+            End Function
+        End Class
+
+        Private Shared Async Function TestMovementNewFileAsync(initialMarkup As String,
+                                                        expectedSource As String,
+                                                        expectedNewFile As String,
+                                                        newFileName As String,
+                                                        selectedMembers As ImmutableArray(Of String),
+                                                        newTypeName As String) As Task
+
+            Dim test = New Test(newTypeName, selectedMembers, newFileName) With
+            {
+                .TestCode = initialMarkup
+            }
+            test.FixedState.Sources.Add(expectedSource)
+            test.FixedState.Sources.Add((newFileName, expectedNewFile))
+            Await test.RunAsync()
+        End Function
+
+        Private Shared Async Function TestNoRefactoringAsync(initialMarkup As String) As Task
+            Await New Test("", ImmutableArray(Of String).Empty, "") With
+            {
+                .TestCode = initialMarkup,
+                .FixedCode = initialMarkup
+            }.RunAsync().ConfigureAwait(False)
+        End Function
     End Class
 End Namespace
diff --git a/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersRefactoringProvider.cs b/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersRefactoringProvider.cs
index 40d3c13b4732c..b90f4cf55611f 100644
--- a/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersRefactoringProvider.cs
+++ b/src/Features/CSharp/Portable/CodeRefactorings/MoveStaticMembers/CSharpMoveStaticMembersRefactoringProvider.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Composition;
-using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeRefactorings;
 using Microsoft.CodeAnalysis.Host.Mef;
@@ -15,17 +14,9 @@ namespace Microsoft.CodeAnalysis.CSharp.CodeRefactorings.MoveStaticMembers
     [ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = PredefinedCodeRefactoringProviderNames.MoveStaticMembers), Shared]
     internal class CSharpMoveStaticMembersRefactoringProvider : AbstractMoveStaticMembersRefactoringProvider
     {
-        /// <summary>
-        /// Test purpose only.
-        /// </summary>
-        [SuppressMessage("RoslynDiagnosticsReliability", "RS0034:Exported parts should have [ImportingConstructor]", Justification = "Used incorrectly by tests")]
-        public CSharpMoveStaticMembersRefactoringProvider(IMoveStaticMembersOptionsService? service) : base(service)
-        {
-        }
-
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-        public CSharpMoveStaticMembersRefactoringProvider() : this(service: null)
+        public CSharpMoveStaticMembersRefactoringProvider() : base()
         {
         }
 
diff --git a/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs b/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
index 69215560d2855..a1f869d251ec8 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/AbstractMoveStaticMembersRefactoringProvider.cs
@@ -13,16 +13,8 @@ namespace Microsoft.CodeAnalysis.MoveStaticMembers
 {
     internal abstract class AbstractMoveStaticMembersRefactoringProvider : CodeRefactoringProvider
     {
-        private readonly IMoveStaticMembersOptionsService? _service;
-
         protected abstract Task<SyntaxNode> GetSelectedNodeAsync(CodeRefactoringContext context);
 
-        /// <summary>
-        /// Test purpose only
-        /// </summary>
-        protected AbstractMoveStaticMembersRefactoringProvider(IMoveStaticMembersOptionsService? service)
-            => _service = service;
-
         public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
         {
             var (document, span, cancellationToken) = context;
@@ -56,7 +48,9 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
 
             var syntaxFacts = document.GetRequiredLanguageService<ISyntaxFactsService>();
 
-            var action = new MoveStaticMembersWithDialogCodeAction(document, span, _service, selectedType, selectedMember: selectedMembers[0]);
+            var service = document.Project.Solution.Workspace.Services.GetRequiredService<IMoveStaticMembersOptionsService>();
+
+            var action = new MoveStaticMembersWithDialogCodeAction(document, span, service, selectedType, selectedMember: selectedMembers[0]);
 
             context.RegisterRefactoring(action, selectedMembers[0].DeclaringSyntaxReferences[0].Span);
         }
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 6c75302193aa7..0b74603fb729b 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -10,6 +10,7 @@
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeGeneration;
 using Microsoft.CodeAnalysis.CodeRefactorings.PullMemberUp;
+using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Shared.Utilities;
@@ -23,7 +24,7 @@ internal class MoveStaticMembersWithDialogCodeAction : CodeActionWithOptions
         private readonly Document _document;
         private readonly ISymbol? _selectedMember;
         private readonly INamedTypeSymbol _selectedType;
-        private IMoveStaticMembersOptionsService? _service;
+        private readonly IMoveStaticMembersOptionsService _service;
 
         public TextSpan Span { get; }
         public override string Title => FeaturesResources.Move_static_members_to_another_type;
@@ -31,7 +32,7 @@ internal class MoveStaticMembersWithDialogCodeAction : CodeActionWithOptions
         public MoveStaticMembersWithDialogCodeAction(
             Document document,
             TextSpan span,
-            IMoveStaticMembersOptionsService? service,
+            IMoveStaticMembersOptionsService service,
             INamedTypeSymbol selectedType,
             ISymbol? selectedMember = null)
         {
@@ -44,7 +45,6 @@ public MoveStaticMembersWithDialogCodeAction(
 
         public override object? GetOptions(CancellationToken cancellationToken)
         {
-            _service ??= _document.Project.Solution.Workspace.Services.GetRequiredService<IMoveStaticMembersOptionsService>();
             return _service.GetMoveMembersToTypeOptions(_document, _selectedType, _selectedMember);
         }
 
@@ -75,8 +75,8 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
             var newType = CodeGenerationSymbolFactory.CreateNamedTypeSymbol(
                 ImmutableArray.Create<AttributeData>(),
                 Accessibility.NotApplicable,
-                Editing.DeclarationModifiers.Static,
-                TypeKind.Class,
+                DeclarationModifiers.Static,
+                GetNewTypeKind(typeParameters),
                 moveOptions.TypeName,
                 typeParameters: typeParameters);
 
@@ -90,8 +90,15 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
                 fileBanner,
                 cancellationToken).ConfigureAwait(false);
 
-            // Get back symbols using annotations
-            sourceDoc = newDoc.Project.Solution.GetRequiredDocument(sourceDoc.Id);
+            // get back type declaration in the newly created file
+            var destRoot = await newDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var destSemanticModel = await newDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+            newType = destSemanticModel.GetRequiredDeclaredSymbol(destRoot.GetAnnotatedNodes(annotation).Single(), cancellationToken) as INamedTypeSymbol;
+
+            // Possibly convert members to non-static or static if we move to/from a module
+            sourceDoc = await CorrectStaticMembersAsync(newDoc.Project.Solution.GetRequiredDocument(sourceDoc.Id), memberNodes, newType!, cancellationToken).ConfigureAwait(false);
+
+            // get back nodes from our changes
             root = await sourceDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
             var semanticModel = await sourceDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
             var members = memberNodes
@@ -99,14 +106,46 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
                 .WhereNotNull()
                 .SelectAsArray(node => (semanticModel.GetDeclaredSymbol(node!, cancellationToken), false));
 
-            // get back type declaration in the newly created file
-            var destRoot = await newDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
-            var destSemanticModel = await newDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
-            newType = destSemanticModel.GetDeclaredSymbol(destRoot.GetAnnotatedNodes(annotation).Single(), cancellationToken) as INamedTypeSymbol;
-
-            var pullMembersUpOptions = PullMembersUpOptionsBuilder.BuildPullMembersUpOptions(newType, members);
+            var pullMembersUpOptions = PullMembersUpOptionsBuilder.BuildPullMembersUpOptions(newType!, members);
             var movedSolution = await MembersPuller.PullMembersUpAsync(sourceDoc, pullMembersUpOptions, cancellationToken).ConfigureAwait(false);
+
             return new CodeActionOperation[] { new ApplyChangesOperation(movedSolution) };
         }
+
+        /// <summary>
+        /// What type kind we should make our new type be. Passing Module when our language is C# will still create a class.
+        /// Modules cannot be generic however, so for VB we choose class if there are generic type params.
+        /// This could be later extended to a language-service feature if there is more complex behavior.
+        /// </summary>
+        private static TypeKind GetNewTypeKind(ImmutableArray<ITypeParameterSymbol> typeParameters)
+        {
+            return typeParameters.IsEmpty ? TypeKind.Module : TypeKind.Class;
+        }
+
+        private async Task<Document> CorrectStaticMembersAsync(
+            Document sourceDoc,
+            ImmutableArray<SyntaxNode> memberNodes,
+            INamedTypeSymbol newType,
+            CancellationToken cancellationToken)
+        {
+            // We have two cases:
+            // 1. Moving from a class to a module. We need to remove the shared modifier as it is implied
+            // 2. Moving from a module to a class. We need to add the shared modifier as it is no longer implied
+            // If neither of these apply (the movement types are both classes or both modules), we return early
+            if (newType.TypeKind == _selectedType.TypeKind)
+            {
+                return sourceDoc;
+            }
+
+            var docEditor = await DocumentEditor.CreateAsync(sourceDoc, cancellationToken).ConfigureAwait(false);
+            memberNodes = docEditor.OriginalRoot.GetCurrentNodes(memberNodes).ToImmutableArray();
+            // need to make members non-static if we're moving to a module, static if we're moving away from one
+            foreach (var node in memberNodes)
+            {
+                docEditor.ReplaceNode(node, (n, generator) => generator.WithModifiers(n, generator.GetModifiers(n).WithIsStatic(newType.TypeKind != TypeKind.Module)));
+            }
+
+            return docEditor.GetChangedDocument();
+        }
     }
 }
diff --git a/src/Features/Core/Portable/PullMemberUp/MembersPuller.cs b/src/Features/Core/Portable/PullMemberUp/MembersPuller.cs
index ca7833aaf94d4..ff108fe9bf512 100644
--- a/src/Features/Core/Portable/PullMemberUp/MembersPuller.cs
+++ b/src/Features/Core/Portable/PullMemberUp/MembersPuller.cs
@@ -57,18 +57,13 @@ public static Task<Solution> PullMembersUpAsync(
             PullMembersUpOptions pullMembersUpOptions,
             CancellationToken cancellationToken)
         {
-            if (pullMembersUpOptions.Destination.TypeKind == TypeKind.Interface)
+            return pullMembersUpOptions.Destination.TypeKind switch
             {
-                return PullMembersIntoInterfaceAsync(document, pullMembersUpOptions, document.Project.Solution, cancellationToken);
-            }
-            else if (pullMembersUpOptions.Destination.TypeKind == TypeKind.Class)
-            {
-                return PullMembersIntoClassAsync(document, pullMembersUpOptions, document.Project.Solution, cancellationToken);
-            }
-            else
-            {
-                throw ExceptionUtilities.UnexpectedValue(pullMembersUpOptions.Destination);
-            }
+                TypeKind.Interface => PullMembersIntoInterfaceAsync(document, pullMembersUpOptions, document.Project.Solution, cancellationToken),
+                // We can treat VB modules as a static class
+                TypeKind.Class or TypeKind.Module => PullMembersIntoClassAsync(document, pullMembersUpOptions, document.Project.Solution, cancellationToken),
+                _ => throw ExceptionUtilities.UnexpectedValue(pullMembersUpOptions.Destination),
+            };
         }
 
         private static IMethodSymbol FilterOutNonPublicAccessor(IMethodSymbol getterOrSetter)
diff --git a/src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb b/src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb
index dfce7857f0bdf..042ddb09fc9cc 100644
--- a/src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb
+++ b/src/Features/VisualBasic/Portable/CodeRefactorings/MoveStaticMembers/VisualBasicMoveStaticMembersRefactoringProvider.vb
@@ -3,7 +3,6 @@
 ' See the LICENSE file in the project root for more information.
 
 Imports System.Composition
-Imports System.Diagnostics.CodeAnalysis
 Imports Microsoft.CodeAnalysis.CodeRefactorings
 Imports Microsoft.CodeAnalysis.Host.Mef
 Imports Microsoft.CodeAnalysis.MoveStaticMembers
@@ -16,12 +15,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings.MoveStaticMembers
         <ImportingConstructor>
         <Obsolete(MefConstruction.ImportingConstructorMessage, True)>
         Public Sub New()
-            Me.New(Nothing)
-        End Sub
-
-        <SuppressMessage("RoslynDiagnosticsReliability", "RS0034:Exported parts should have [ImportingConstructor]", Justification:="Used incorrectly by tests")>
-        Public Sub New(service As IMoveStaticMembersOptionsService)
-            MyBase.New(service)
+            MyBase.New()
         End Sub
 
         Protected Overrides Async Function GetSelectedNodeAsync(context As CodeRefactoringContext) As Task(Of SyntaxNode)
diff --git a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
index 2e68e20062d36..cb1e4381d5f33 100644
--- a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
+++ b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
@@ -211,6 +211,15 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
                     {
                         return Barbar() == 0;
                     }
+
+                    static TestClass()
+                    {
+                    }
+
+                    public static TestClass operator +(TestClass a, TestClass b)
+                    {
+                        return new TestClass()
+                    }
                 }
             }
         </Document>
@@ -249,6 +258,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.False(viewModel.CanSubmit)
 
             selectionVm.SelectAll()
+            ' If constructor and operators are able to be selected, this would be a higher number
             Assert.Equal(7, selectionVm.CheckedMembers.Length)
             Assert.True(viewModel.CanSubmit)
 
@@ -388,6 +398,13 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
                     Public Shared Function Dependent() As Boolean
                         Return Barbar() = 0
                     End Function
+
+                    Shared Sub New()
+                    End Sub
+
+                    Public Shared Operator +(a As TestClass, b As TestClass)
+                        Return New TestClass()
+                    End Operator
                 End Class
             End Namespace
         </Document>
@@ -426,6 +443,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.False(viewModel.CanSubmit)
 
             selectionVm.SelectAll()
+            ' If constructor and operators are able to be selected, this would be a higher number
             Assert.Equal(7, selectionVm.CheckedMembers.Length)
             Assert.True(viewModel.CanSubmit)
 

From f3cf97cbe4866b322f7ed463e9aca2498e063f2b Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Fri, 13 Aug 2021 10:49:30 -0700
Subject: [PATCH 32/64] Added support for alias refactoring + tests

---
 .../CSharpMoveStaticMembersTests.cs           | 192 ++++++++++++++++++
 .../VisualBasicMoveStaticMembersTests.vb      | 165 ++++++++++++++-
 .../MoveStaticMembersWithDialogCodeAction.cs  |  12 +-
 3 files changed, 363 insertions(+), 6 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index 52dab9a9edd77..12b389857b610 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -927,6 +927,198 @@ public static int TestMethod()
             }.RunAsync().ConfigureAwait(false);
         }
 
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorClassAlias()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}
+
+namespace TestNs2
+{
+    using C1 = TestNs1.Class1;
+
+    class Class2
+    {
+        public static int TestMethod2()
+        {
+            return C1.TestMethod();
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1;
+    using C1 = TestNs1.Class1;
+
+    class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestMethod();
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorNamespaceAlias()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}
+
+namespace TestNs2
+{
+    using C1 = TestNs1;
+
+    class Class2
+    {
+        public static int TestMethod2()
+        {
+            return C1.Class1.TestMethod();
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1;
+    using C1 = TestNs1;
+
+    class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestMethod();
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorNamespaceAliasWithExtraNamespace()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}
+
+namespace TestNs2
+{
+    using C1 = TestNs1;
+
+    class Class2
+    {
+        public static int TestMethod2()
+        {
+            return C1.Class1.TestMethod();
+        }
+    }
+}";
+            var selectedDestinationName = "ExtraNs.Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1.ExtraNs;
+    using C1 = TestNs1;
+
+    class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestMethod();
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1.ExtraNs
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestMoveExtensionMethodDontRefactor()
         {
diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index 9a8145751146b..eb8716930d82a 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -709,8 +709,6 @@ End Namespace
             Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
-#End Region
-#Region "SelectionTests"
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveFunctionAndRefactorUsageNewNamespace() As Task
             Dim initialMarkup = "
@@ -808,6 +806,168 @@ End Namespace
             Await test.RunAsync().ConfigureAwait(False)
         End Function
 
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionAndRefactorClassAlias() As Task
+            Dim initialMarkup1 = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim initialMarkup2 = "
+Imports C1 = TestNs.Class1
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return C1.TestFunc() + 1
+    End Function
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim expectedText3 = "
+Imports TestNs
+Imports C1 = TestNs.Class1
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return Class1Helpers.TestFunc() + 1
+    End Function
+End Class"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Module
+End Namespace
+"
+
+            Dim test = New Test(newTypeName, selection, newFileName)
+            test.TestState.Sources.Add(initialMarkup1)
+            test.TestState.Sources.Add(initialMarkup2)
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add(expectedText3)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionAndRefactorNamespaceAlias() As Task
+            Dim initialMarkup1 = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim initialMarkup2 = "
+Imports C1 = TestNs
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return C1.Class1.TestFunc() + 1
+    End Function
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim expectedText3 = "
+Imports TestNs
+Imports C1 = TestNs
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return Class1Helpers.TestFunc() + 1
+    End Function
+End Class"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Module
+End Namespace
+"
+
+            Dim test = New Test(newTypeName, selection, newFileName)
+            test.TestState.Sources.Add(initialMarkup1)
+            test.TestState.Sources.Add(initialMarkup2)
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add(expectedText3)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionAndRefactorNamespaceAliasNewNamespace() As Task
+            Dim initialMarkup1 = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim initialMarkup2 = "
+Imports C1 = TestNs
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return C1.Class1.TestFunc() + 1
+    End Function
+End Class"
+            Dim newTypeName = "ExtraNs.Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim expectedText3 = "
+Imports TestNs.ExtraNs
+Imports C1 = TestNs
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return Class1Helpers.TestFunc() + 1
+    End Function
+End Class"
+            Dim expectedText2 = "Namespace TestNs.ExtraNs
+    Module Class1Helpers
+        Public Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Module
+End Namespace
+"
+
+            Dim test = New Test(newTypeName, selection, newFileName)
+            test.TestState.Sources.Add(initialMarkup1)
+            test.TestState.Sources.Add(initialMarkup2)
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add(expectedText3)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
+        End Function
+
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveExtensionFunction() As Task
             Dim initialMarkup = "
@@ -1024,6 +1184,7 @@ End Namespace
 
 #End Region
 #Region "SelectionTests"
+
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestSelectBeforeDeclarationKeyword() As Task
             Dim initialMarkup = "
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 93222ba155a17..e59db68697cc8 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -182,8 +182,11 @@ private static void FixReferencesSingleDocument(
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
-                // All of these references are not easily fixable and possibly incorrect, so we are ok with ignoring these, even if it produces an error
-                if (refLoc.IsCandidateLocation || refLoc.IsImplicit || refLoc.Alias != null)
+                // Candidate locations represent a non-perfect match (like incorrect number of params),
+                // which means it likely isn't the member access we're looking for. It's either a reference to
+                // something else, like an overload, in which case we shouldn't change it, or it's an error
+                // by the user, meaning it's ok if we don't change it, as the user will have to fix it anyways
+                if (refLoc.IsCandidateLocation)
                 {
                     continue;
                 }
@@ -191,7 +194,7 @@ private static void FixReferencesSingleDocument(
                 var doc = docEditor.OriginalDocument;
 
                 var syntaxFacts = doc.GetRequiredLanguageService<ISyntaxFactsService>();
-                var refNode = docEditor.GetChangedRoot().FindNode(refLoc.Location.SourceSpan, findInsideTrivia: true, getInnermostNodeForTie: true);
+                var refNode = docEditor.OriginalRoot.FindNode(refLoc.Location.SourceSpan, findInsideTrivia: true, getInnermostNodeForTie: true);
                 // track this node in case the doc has changed
                 docEditor.ReplaceNode(refNode, refNode.TrackNodes(refNode));
 
@@ -217,7 +220,8 @@ private static void FixReferencesSingleDocument(
                     continue;
                 }
 
-                if (syntaxFacts.IsNameOfAnyMemberAccessExpression(refNode))
+                // static member access should never be pointer or conditional member access
+                if (syntaxFacts.IsNameOfSimpleMemberAccessExpression(refNode))
                 {
                     var expression = syntaxFacts.GetExpressionOfMemberAccessExpression(refNode.Parent);
                     if (expression != null)

From aac3b8a7f332a74f81d489c784182298fecf4e01 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Tue, 17 Aug 2021 15:13:30 -0700
Subject: [PATCH 33/64] Refactored references on source type. Added simplifier
 annotation to remove unnecessary qualifications.

---
 .../CSharpMoveStaticMembersTests.cs           | 208 ++++++++++++++++++
 .../VisualBasicMoveStaticMembersTests.vb      | 179 +++++++++++++++
 .../MoveStaticMembersWithDialogCodeAction.cs  |  15 +-
 3 files changed, 400 insertions(+), 2 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index 12b389857b610..4862b6f50551a 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -733,6 +733,150 @@ public static int TestMethod()
             await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorSourceUsage()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+
+        public static int TestMethod2()
+        {
+            return TestMethod();
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestMethod();
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveFieldAndRefactorSourceUsage()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Field = 0;
+
+        public static int TestMethod2()
+        {
+            return TestField;
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestField;
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestField = 0;
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMovePropertyAndRefactorSourceUsage()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        private static int _testProperty;
+
+        public static int Test[||]Property
+        {
+            get => _testProperty;
+            set
+            {
+                _testProperty = value;
+            }
+        }
+
+        public static int TestMethod2()
+        {
+            return TestProperty;
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestProperty", "_testProperty");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestProperty;
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        private static int _testProperty;
+
+        public static int Test[||]Property
+        {
+            get => _testProperty;
+            set
+            {
+                _testProperty = value;
+            }
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestMoveMethodAndRefactorUsageDifferentNamespace()
         {
@@ -1034,6 +1178,70 @@ namespace TestNs2
     using TestNs1;
     using C1 = TestNs1;
 
+    class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestMethod();
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorStaticUsing()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}
+
+namespace TestNs2
+{
+    using static TestNs1.Class1;
+
+    class Class2
+    {
+        public static int TestMethod2()
+        {
+            return TestMethod();
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1;
+    using static TestNs1.Class1;
+
     class Class2
     {
         public static int TestMethod2()
diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index eb8716930d82a..4fa740870c817 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -659,6 +659,131 @@ End Namespace
             Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionAndRefactorSourceUsage() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+
+        Public Shared Function TestFunc2() As Integer
+            Return TestFunc() + 1
+        End Function
+    End Class
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function TestFunc2() As Integer
+            Return TestFunc() + 1
+        End Function
+    End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Module
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFieldAndRefactorSourceUsage() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Test[||]Field As Integer = 0
+
+        Public Shared Function TestFunc2() As Integer
+            Return TestField + 1
+        End Function
+    End Class
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function TestFunc2() As Integer
+            Return TestField + 1
+        End Function
+    End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public TestField As Integer = 0
+
+    End Module
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMovePropertyAndRefactorSourceUsage() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1
+        Private Shared _testProperty As Integer
+
+        Public Shared Property Test[||]Property As Integer
+            Get
+                Return _testProperty
+            End Get
+            Set
+                _testProperty = value
+            End Set
+        End Property
+
+        Public Shared Function TestFunc2() As Integer
+            Return TestProperty + 1
+        End Function
+    End Class
+End Namespace"
+            Dim newTypeName = "ExtraNs.Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("_testProperty", "TestProperty")
+            Dim expectedText1 = "
+Imports TestNs.ExtraNs
+
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function TestFunc2() As Integer
+            Return TestProperty + 1
+        End Function
+    End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs.ExtraNs
+    Module Class1Helpers
+        Private _testProperty As Integer
+
+
+        Public Property Test[||]Property As Integer
+            Get
+                Return _testProperty
+            End Get
+            Set
+                _testProperty = value
+            End Set
+        End Property
+    End Module
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveFunctionAndRefactorUsageDifferentNamespace() As Task
             Dim initialMarkup = "
@@ -860,6 +985,60 @@ End Namespace
             Await test.RunAsync().ConfigureAwait(False)
         End Function
 
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionAndRefactorClassImports() As Task
+            Dim initialMarkup1 = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim initialMarkup2 = "
+Imports TestNs.Class1
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return TestFunc() + 1
+    End Function
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim expectedText3 = "
+Imports TestNs
+Imports TestNs.Class1
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return TestFunc() + 1
+    End Function
+End Class"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Module
+End Namespace
+"
+
+            Dim test = New Test(newTypeName, selection, newFileName)
+            test.TestState.Sources.Add(initialMarkup1)
+            test.TestState.Sources.Add(initialMarkup2)
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add(expectedText3)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
+        End Function
+
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveFunctionAndRefactorNamespaceAlias() As Task
             Dim initialMarkup1 = "
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index e59db68697cc8..ed2beb6657c77 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -97,7 +97,7 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
             var destSemanticModel = await newDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
             newType = destSemanticModel.GetRequiredDeclaredSymbol(destRoot.GetAnnotatedNodes(annotation).Single(), cancellationToken) as INamedTypeSymbol;
 
-            // refactor member access references in other files
+            // refactor member access references from the source file and other files
             var memberReferenceLocations = await FindMemberReferencesAsync(moveOptions.SelectedMembers, newDoc.Project.Solution, cancellationToken).ConfigureAwait(false);
             var locationsToDoc = memberReferenceLocations.ToLookup(loc => loc.location.Document.Id);
             var reReferencedSolution = await RefactorReferencesAsync(locationsToDoc, newDoc.Project.Solution, newType!, cancellationToken).ConfigureAwait(false);
@@ -220,15 +220,26 @@ private static void FixReferencesSingleDocument(
                     continue;
                 }
 
+                // We add a simplifier annotation in both cases (second case is done within the method)
+                // Because sometimes the qualification is wholly or partly unneccessary
                 // static member access should never be pointer or conditional member access
                 if (syntaxFacts.IsNameOfSimpleMemberAccessExpression(refNode))
                 {
                     var expression = syntaxFacts.GetExpressionOfMemberAccessExpression(refNode.Parent);
                     if (expression != null)
                     {
-                        docEditor.ReplaceNode(expression, (node, generator) => generator.TypeExpression(newType).WithTriviaFrom(node));
+                        docEditor.ReplaceNode(expression, (node, generator) => generator.TypeExpression(newType)
+                            .WithTriviaFrom(node)
+                            .WithAdditionalAnnotations(Simplification.Simplifier.Annotation));
                     }
                 }
+                else if (syntaxFacts.IsIdentifierName(refNode))
+                {
+                    // We now are in an identifier name that isn't a member access expression
+                    // This could either be because of a static using, module usage in VB, or because we are in the original source type
+                    // either way, we want to change it to a member access expression for the type that is imported
+                    docEditor.ReplaceNode(refNode, (node, generator) => generator.MemberAccessExpression(generator.TypeExpression(newType), node).WithTriviaFrom(node));
+                }
             }
         }
 

From 81953f38136d4d178956817c70b3676b7ae11806 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Thu, 19 Aug 2021 11:18:06 -0700
Subject: [PATCH 34/64] Merged in destination selection dropdown

---
 .../MoveMembersToType/TypeNameItem.cs         | 59 ++++++++++++++++++
 .../MoveStaticMembersDialog.xaml              | 62 ++++++++++++++++---
 .../MoveStaticMembersDialogViewModel.cs       | 62 ++++++++++++++++---
 ...alStudioMoveStaticMembersOptionsService.cs | 61 +++++++++++++++++-
 4 files changed, 225 insertions(+), 19 deletions(-)
 create mode 100644 src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs

diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs
new file mode 100644
index 0000000000000..356fb733fd5ac
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs
@@ -0,0 +1,59 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
+{
+    internal class TypeNameItem
+    {
+        public string TypeName { get; }
+        public string DeclarationFile { get; }
+        public bool IsFromHistory { get; }
+        public bool IsNew { get; }
+
+        public TypeNameItem(bool isFromHistory, string declarationFile, string @typeName)
+        {
+            IsFromHistory = isFromHistory;
+            IsNew = false;
+            TypeName = @typeName;
+            DeclarationFile = declarationFile;
+        }
+
+        public TypeNameItem(string @typeName)
+        {
+            IsFromHistory = false;
+            IsNew = true;
+            TypeName = @typeName;
+            DeclarationFile = "[WIP] Auto-Generated File";
+        }
+
+        public override string ToString() => TypeName;
+
+        public static int CompareTo(TypeNameItem x, TypeNameItem y)
+        {
+            // sort so that history is first, then type name, then file name
+            if (x.IsFromHistory ^ y.IsFromHistory)
+            {
+                // one is from history and the other isn't
+                return x.IsFromHistory ? -1 : 1;
+            }
+            // compare by each namespace/finally type
+            var xnames = x.TypeName.Split('.');
+            var ynames = y.TypeName.Split('.');
+
+            for (var i = 0; i < Math.Min(xnames.Length, ynames.Length); i++)
+            {
+                var comp = xnames[i].CompareTo(ynames[i]);
+                if (comp != 0)
+                {
+                    return comp;
+                }
+            }
+
+            return x.DeclarationFile.CompareTo(y.DeclarationFile);
+        }
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
index a468fcf617ed3..989236cb0b801 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
@@ -40,18 +40,60 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <StackPanel Orientation="Vertical" Grid.Row="0">
-            <Label 
-                x:Uid="DestinationLabel" 
-                x:Name="DestinationLabel"
-                Margin="{StaticResource verticalLabelMargin}"
-                Content="{Binding ElementName=dialog, Path=DestinationLabelText}"
-                Target="{Binding ElementName=DestinationTextBox}" />
-            <TextBox 
+            <Label x:Uid="DestinationLabel" 
+                       x:Name="DestinationLabel"
+                       Margin="{StaticResource verticalLabelMargin}"
+                       Content="{Binding ElementName=dialog, Path=DestinationLabelText}"
+                       Target="{Binding ElementName=DestinationTextBox}" />
+            <ComboBox 
                 x:Uid="DestinationBox"
                 Name="DestinationBox"
-                AutomationProperties.Name="DestinationName"
-                Text="{Binding DestinationName, UpdateSourceTrigger=PropertyChanged}"
-                Margin="0 0 20 0"/>
+                IsEditable="True"
+                IsReadOnly="False"
+                AutomationProperties.LabeledBy="{Binding ElementName=DestinationLabel}"
+                SelectedItem="{Binding DestinationName, Mode=TwoWay}"
+                Text="{Binding SearchText, Mode=TwoWay}"
+                ItemsSource="{Binding ShownTypes, Mode=OneWay}"
+                BorderThickness="0" 
+                Margin="0 0 20 0"
+                MaxDropDownHeight="150"
+                HorizontalContentAlignment="Stretch">
+                <ComboBox.ItemContainerStyle>
+                    <Style TargetType="{x:Type ComboBoxItem}">
+                        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+                    </Style>
+                </ComboBox.ItemContainerStyle>
+                <ComboBox.ItemTemplate>
+                    <DataTemplate DataType="Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType.TypeNameItem">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="20"/>
+                                <ColumnDefinition Width="20"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <imaging:CrispImage
+                                Grid.Column="0"
+                                Visibility="{Binding IsFromHistory, Converter={StaticResource BooleanToVisibilityConverter}}" 
+                                Margin="0 0 5 0" 
+                                Moniker="{x:Static imagecatalog:KnownMonikers.History}" />
+                            <imaging:CrispImage
+                                Grid.Column="1"
+                                Visibility="{Binding IsNew, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                Margin="0 0 5 0"
+                                Moniker="{x:Static imagecatalog:KnownMonikers.Add}"/>
+                            <TextBlock
+                                Grid.Column="3"
+                                HorizontalAlignment="Stretch"
+                                Text="{Binding TypeName}"/>
+                            <TextBlock
+                                Grid.Column="4"
+                                HorizontalAlignment="Right"
+                                Text="{Binding DeclarationFile}"/>
+                        </Grid>
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
 
         </StackPanel>
 
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
index 3f4b616a92e0a..235233edf2fec 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
@@ -23,15 +23,17 @@ internal class MoveStaticMembersDialogViewModel : AbstractNotifyPropertyChanged
         public MoveStaticMembersDialogViewModel(
             StaticMemberSelectionViewModel memberSelectionViewModel,
             string defaultType,
-            ImmutableArray<string> existingNames,
+            ImmutableArray<TypeNameItem> availableTypes,
             ISyntaxFacts syntaxFacts)
         {
             MemberSelectionViewModel = memberSelectionViewModel;
             _syntaxFacts = syntaxFacts ?? throw new ArgumentNullException(nameof(syntaxFacts));
-            _destinationName = defaultType;
-            _existingNames = existingNames;
+            _searchText = defaultType;
+            AvailableTypes = availableTypes;
+            _destinationName = new TypeNameItem(defaultType);
 
             PropertyChanged += MoveMembersToTypeDialogViewModel_PropertyChanged;
+            // Set message and icon + shownTypes
             OnDestinationUpdated();
         }
 
@@ -42,26 +44,51 @@ private void MoveMembersToTypeDialogViewModel_PropertyChanged(object sender, Pro
                 case nameof(DestinationName):
                     OnDestinationUpdated();
                     break;
+                case nameof(SearchText):
+                    OnSearchTextUpdated();
+                    break;
             }
         }
 
+        public void OnSearchTextUpdated()
+        {
+            DestinationName = new TypeNameItem(SearchText);
+        }
+
         public void OnDestinationUpdated()
         {
-            // TODO change once we allow movement to existing types
-            var isNewType = !_existingNames.Contains(DestinationName);
-            _isValidName = isNewType && IsValidType(DestinationName);
+            // if they deselect an element, the destination will be set to null
+            // But it will be set again from searchText update
+            if (DestinationName is null)
+            {
+                return;
+            }
+            var isNewType = DestinationName.IsNew;
+            _isValidName = !isNewType || IsValidType(DestinationName!.TypeName);
 
             if (_isValidName)
             {
                 Icon = KnownMonikers.StatusInformation;
                 Message = ServicesVSResources.A_new_type_will_be_created;
                 ShowMessage = true;
+                ShownTypes = AvailableTypes
+                    .Insert(0, DestinationName!)
+                    .Where(t => t.TypeName.Contains(SearchText))
+                    .ToImmutableArray();
             }
             else
             {
                 Icon = KnownMonikers.StatusInvalid;
                 Message = ServicesVSResources.Invalid_type_name;
                 ShowMessage = true;
+                ShownTypes = ImmutableArray.Create<TypeNameItem>();
+            }
+            else
+            {
+                ShowMessage = false;
+                ShownTypes = AvailableTypes
+                    .Where(t => t.TypeName.Contains(DestinationName!.TypeName))
+                    .ToImmutableArray();
             }
         }
 
@@ -85,13 +112,32 @@ private bool IsValidType(string typeName)
             return true;
         }
 
-        private string _destinationName;
-        public string DestinationName
+        private TypeNameItem _destinationName;
+        public TypeNameItem DestinationName
         {
             get => _destinationName;
             set => SetProperty(ref _destinationName, value);
         }
 
+        private string _searchText;
+        public string SearchText
+        {
+            get => _searchText;
+            set => SetProperty(ref _searchText, value);
+        }
+
+        private ImmutableArray<TypeNameItem> _shownTypes;
+        public ImmutableArray<TypeNameItem> ShownTypes
+        {
+            get => _shownTypes;
+            private set
+            {
+                SetProperty(ref _shownTypes, value);
+            }
+        }
+
+        public ImmutableArray<TypeNameItem> AvailableTypes { get; }
+
         private ImageMoniker _icon;
         public ImageMoniker Icon
         {
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index 6e5e2a9e8d5bf..0b52c8e9b7106 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -3,6 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Composition;
 using System.Threading;
 using Microsoft.CodeAnalysis;
@@ -26,6 +28,10 @@ internal class VisualStudioMoveStaticMembersOptionsService : IMoveStaticMembersO
         private readonly IGlyphService _glyphService;
         private readonly IUIThreadOperationExecutor _uiThreadOperationExecutor;
 
+        private const int HistorySize = 3;
+
+        public readonly LinkedList<(string, string)> History = new();
+
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
         public VisualStudioMoveStaticMembersOptionsService(
@@ -52,7 +58,12 @@ public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, I
             using var cancellationTokenSource = new CancellationTokenSource();
             var memberToDependentsMap = SymbolDependentsBuilder.FindMemberToDependentsMap(membersInType, document.Project, cancellationTokenSource.Token);
 
-            var existingTypeNames = selectedType.ContainingNamespace.GetAllTypes(cancellationTokenSource.Token).SelectAsArray(t => t.Name);
+            var existingTypeNames = MakeTypeNameItems(
+                selectedType.ContainingNamespace,
+                selectedType,
+                document,
+                cancellationTokenSource.Token);
+
             var candidateName = selectedType.Name + "Helpers";
             var defaultTypeName = NameGenerator.GenerateUniqueName(candidateName, name => !existingTypeNames.Contains(name));
 
@@ -87,5 +98,53 @@ public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, I
 
             return MoveStaticMembersOptions.Cancelled;
         }
+
+        private static string GetFile(Location loc) => PathUtilities.GetFileName(loc.SourceTree!.FilePath);
+
+        /// <summary>
+        /// Construct all the type names declared in the project, 
+        /// </summary>
+        private ImmutableArray<TypeNameItem> MakeTypeNameItems(
+            INamespaceSymbol currentNamespace,
+            INamedTypeSymbol currentType,
+            Document currentDocument,
+            CancellationToken cancellationToken)
+        {
+            // find the top-level namespace
+            while (!currentNamespace.IsGlobalNamespace)
+            {
+                currentNamespace = currentNamespace.ContainingNamespace;
+            }
+
+            return currentNamespace.GetAllTypes(cancellationToken).SelectMany(t =>
+            {
+                var fullName = GetFullyQualifiedNamespace(t);
+
+                // for partially declared classes, we may want multiple entries for a single type.
+                // filter to those actually in a real file, and that is not our current location.
+                return t.Locations
+                    .Where(l => l.IsInSource &&
+                        (currentType.Name != t.Name || GetFile(l) != currentDocument.Name))
+                    .Select(l => new TypeNameItem(
+                        History.Contains((fullName, currentDocument.Name)),
+                        GetFile(l),
+                        fullName));
+            })
+            .ToImmutableArrayOrEmpty()
+            .Sort(comparison: TypeNameItem.CompareTo);
+        }
+
+        private static string GetFullyQualifiedNamespace(INamedTypeSymbol type)
+        {
+            // construct fully qualified type name
+            var displayName = type.Name;
+            var containingNamespace = type.ContainingNamespace;
+            while (!containingNamespace.IsGlobalNamespace)
+            {
+                displayName = containingNamespace.Name + "." + displayName;
+                containingNamespace = containingNamespace.ContainingNamespace;
+            }
+            return displayName;
+        }
     }
 }

From 82342c7f481f4ef2ad29feeeb1771d8569e24c00 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Fri, 20 Aug 2021 09:30:03 -0700
Subject: [PATCH 35/64] WIP, select existing destinations work

---
 .../MoveStaticMembersDialog.xaml              | 19 +++---
 .../MoveStaticMembersDialogViewModel.cs       | 68 +++++++++++++------
 .../TypeNameItem.cs                           | 11 +--
 ...alStudioMoveStaticMembersOptionsService.cs | 29 ++------
 4 files changed, 71 insertions(+), 56 deletions(-)
 rename src/VisualStudio/Core/Def/Implementation/{MoveMembersToType => MoveStaticMembers}/TypeNameItem.cs (86%)

diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
index 989236cb0b801..395a8cf57b730 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
@@ -5,7 +5,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
-    xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging" 
+    xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
+    xmlns:imagecatalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
     xmlns:movestaticmembers="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers" 
     d:DataContext="{d:DesignInstance Type=movestaticmembers:MoveStaticMembersDialogViewModel}"
     vs:ThemedDialogStyleLoader.UseDefaultThemedDialogStyles="True"
@@ -45,19 +46,18 @@
                        Margin="{StaticResource verticalLabelMargin}"
                        Content="{Binding ElementName=dialog, Path=DestinationLabelText}"
                        Target="{Binding ElementName=DestinationTextBox}" />
-            <ComboBox 
+            <ComboBox
                 x:Uid="DestinationBox"
                 Name="DestinationBox"
                 IsEditable="True"
                 IsReadOnly="False"
                 AutomationProperties.LabeledBy="{Binding ElementName=DestinationLabel}"
-                SelectedItem="{Binding DestinationName, Mode=TwoWay}"
                 Text="{Binding SearchText, Mode=TwoWay}"
+                SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}"
                 ItemsSource="{Binding ShownTypes, Mode=OneWay}"
                 BorderThickness="0" 
                 Margin="0 0 20 0"
-                MaxDropDownHeight="150"
-                HorizontalContentAlignment="Stretch">
+                MaxDropDownHeight="150">
                 <ComboBox.ItemContainerStyle>
                     <Style TargetType="{x:Type ComboBoxItem}">
                         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
@@ -67,10 +67,10 @@
                     <DataTemplate DataType="Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType.TypeNameItem">
                         <Grid>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="20"/>
-                                <ColumnDefinition Width="20"/>
-                                <ColumnDefinition Width="*"/>
                                 <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
                             </Grid.ColumnDefinitions>
                             <imaging:CrispImage
                                 Grid.Column="0"
@@ -84,7 +84,8 @@
                                 Moniker="{x:Static imagecatalog:KnownMonikers.Add}"/>
                             <TextBlock
                                 Grid.Column="3"
-                                HorizontalAlignment="Stretch"
+                                HorizontalAlignment="Left"
+                                TextTrimming="CharacterEllipsis"
                                 Text="{Binding TypeName}"/>
                             <TextBlock
                                 Grid.Column="4"
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
index 235233edf2fec..de2f4d63e16d4 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
@@ -5,9 +5,11 @@
 using System;
 using System.Collections.Immutable;
 using System.ComponentModel;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.VisualStudio.Imaging;
 using Microsoft.VisualStudio.Imaging.Interop;
+using Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers;
 using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
 
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
@@ -18,12 +20,13 @@ internal class MoveStaticMembersDialogViewModel : AbstractNotifyPropertyChanged
 
         private readonly ISyntaxFacts _syntaxFacts;
 
-        private readonly ImmutableArray<string> _existingNames;
+        private readonly string _sourceTypeName;
 
         public MoveStaticMembersDialogViewModel(
             StaticMemberSelectionViewModel memberSelectionViewModel,
             string defaultType,
             ImmutableArray<TypeNameItem> availableTypes,
+            string sourceTypeName,
             ISyntaxFacts syntaxFacts)
         {
             MemberSelectionViewModel = memberSelectionViewModel;
@@ -31,9 +34,11 @@ public MoveStaticMembersDialogViewModel(
             _searchText = defaultType;
             AvailableTypes = availableTypes;
             _destinationName = new TypeNameItem(defaultType);
+            _sourceTypeName = sourceTypeName;
 
             PropertyChanged += MoveMembersToTypeDialogViewModel_PropertyChanged;
             // Set message and icon + shownTypes
+            OnSearchTextUpdated();
             OnDestinationUpdated();
         }
 
@@ -47,54 +52,72 @@ private void MoveMembersToTypeDialogViewModel_PropertyChanged(object sender, Pro
                 case nameof(SearchText):
                     OnSearchTextUpdated();
                     break;
+                case nameof(SelectedIndex):
+                    OnSelectedIdnexUpdated();
+                    break;
             }
         }
 
-        public void OnSearchTextUpdated()
+        private void OnSelectedIdnexUpdated()
         {
-            DestinationName = new TypeNameItem(SearchText);
+            // User changed their selection in the dropdown
+            if (SelectedIndex == -1)
+            {
+                // removed selection, search text will handle the dropdown
+                // even if the text hasn't changed
+                OnSearchTextUpdated();
+            }
+            else
+            {
+                DestinationName = ShownTypes[SelectedIndex];
+            }
         }
 
-        public void OnDestinationUpdated()
+        private void OnSearchTextUpdated()
         {
-            // if they deselect an element, the destination will be set to null
-            // But it will be set again from searchText update
-            if (DestinationName is null)
+            if (SelectedIndex != -1 && SearchText == ShownTypes[SelectedIndex].TypeName)
+            {
+                DestinationName = ShownTypes[SelectedIndex];
+            }
+            else
             {
-                return;
+                // Search text is not selecting anything, create a destination for the
+                // contents of the text.
+                DestinationName = new TypeNameItem(SearchText);
+                ShownTypes = AvailableTypes.WhereAsArray(t => t.TypeName.Contains(SearchText));
+                if (_isValidName)
+                {
+                    ShownTypes = ShownTypes.Insert(0, DestinationName);
+                }
             }
+        }
+
+        private void OnDestinationUpdated()
+        {
             var isNewType = DestinationName.IsNew;
             _isValidName = !isNewType || IsValidType(DestinationName!.TypeName);
 
-            if (_isValidName)
+            if (_isValidName && isNewType)
             {
                 Icon = KnownMonikers.StatusInformation;
                 Message = ServicesVSResources.A_new_type_will_be_created;
                 ShowMessage = true;
-                ShownTypes = AvailableTypes
-                    .Insert(0, DestinationName!)
-                    .Where(t => t.TypeName.Contains(SearchText))
-                    .ToImmutableArray();
             }
-            else
+            else if (!_isValidName)
             {
                 Icon = KnownMonikers.StatusInvalid;
                 Message = ServicesVSResources.Invalid_type_name;
                 ShowMessage = true;
-                ShownTypes = ImmutableArray.Create<TypeNameItem>();
             }
             else
             {
                 ShowMessage = false;
-                ShownTypes = AvailableTypes
-                    .Where(t => t.TypeName.Contains(DestinationName!.TypeName))
-                    .ToImmutableArray();
             }
         }
 
         private bool IsValidType(string typeName)
         {
-            if (string.IsNullOrEmpty(typeName))
+            if (string.IsNullOrEmpty(typeName) ||typeName == _sourceTypeName)
             {
                 return false;
             }
@@ -119,6 +142,13 @@ public TypeNameItem DestinationName
             set => SetProperty(ref _destinationName, value);
         }
 
+        private int _selectedIndex = -1;
+        public int SelectedIndex
+        {
+            get => _selectedIndex;
+            set => SetProperty(ref _selectedIndex, value);
+        }
+
         private string _searchText;
         public string SearchText
         {
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/TypeNameItem.cs
similarity index 86%
rename from src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs
rename to src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/TypeNameItem.cs
index 356fb733fd5ac..abe663db9df32 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveMembersToType/TypeNameItem.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/TypeNameItem.cs
@@ -5,20 +5,22 @@
 using System;
 using Microsoft.CodeAnalysis;
 
-namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
 {
     internal class TypeNameItem
     {
         public string TypeName { get; }
+        public INamedTypeSymbol? NamedType { get; }
         public string DeclarationFile { get; }
         public bool IsFromHistory { get; }
         public bool IsNew { get; }
 
-        public TypeNameItem(bool isFromHistory, string declarationFile, string @typeName)
+        public TypeNameItem(bool isFromHistory, string declarationFile, INamedTypeSymbol type)
         {
             IsFromHistory = isFromHistory;
             IsNew = false;
-            TypeName = @typeName;
+            NamedType = type;
+            TypeName = type.ToDisplayString();
             DeclarationFile = declarationFile;
         }
 
@@ -27,7 +29,8 @@ public TypeNameItem(string @typeName)
             IsFromHistory = false;
             IsNew = true;
             TypeName = @typeName;
-            DeclarationFile = "[WIP] Auto-Generated File";
+            NamedType = null;
+            DeclarationFile = ServicesVSResources.Create_new_file;
         }
 
         public override string ToString() => TypeName;
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index 0b52c8e9b7106..652fc19b1586b 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Composition;
+using System.Linq;
 using System.Threading;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Host.Mef;
@@ -65,7 +66,7 @@ public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, I
                 cancellationTokenSource.Token);
 
             var candidateName = selectedType.Name + "Helpers";
-            var defaultTypeName = NameGenerator.GenerateUniqueName(candidateName, name => !existingTypeNames.Contains(name));
+            var defaultTypeName = NameGenerator.GenerateUniqueName(candidateName, name => !existingTypeNames.Contains(tName => tName.TypeName == name));
 
             var containingNamespaceDisplay = selectedType.ContainingNamespace.IsGlobalNamespace
                 ? string.Empty
@@ -81,6 +82,7 @@ public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, I
             var viewModel = new MoveStaticMembersDialogViewModel(selectMembersViewModel,
                 defaultTypeName,
                 existingTypeNames,
+                selectedType.Name,
                 document.GetRequiredLanguageService<ISyntaxFactsService>());
 
             var dialog = new MoveStaticMembersDialog(viewModel);
@@ -110,41 +112,20 @@ private ImmutableArray<TypeNameItem> MakeTypeNameItems(
             Document currentDocument,
             CancellationToken cancellationToken)
         {
-            // find the top-level namespace
-            while (!currentNamespace.IsGlobalNamespace)
-            {
-                currentNamespace = currentNamespace.ContainingNamespace;
-            }
-
             return currentNamespace.GetAllTypes(cancellationToken).SelectMany(t =>
             {
-                var fullName = GetFullyQualifiedNamespace(t);
-
                 // for partially declared classes, we may want multiple entries for a single type.
                 // filter to those actually in a real file, and that is not our current location.
                 return t.Locations
                     .Where(l => l.IsInSource &&
                         (currentType.Name != t.Name || GetFile(l) != currentDocument.Name))
                     .Select(l => new TypeNameItem(
-                        History.Contains((fullName, currentDocument.Name)),
+                        History.Contains((t.Name, currentDocument.Name)),
                         GetFile(l),
-                        fullName));
+                        t));
             })
             .ToImmutableArrayOrEmpty()
             .Sort(comparison: TypeNameItem.CompareTo);
         }
-
-        private static string GetFullyQualifiedNamespace(INamedTypeSymbol type)
-        {
-            // construct fully qualified type name
-            var displayName = type.Name;
-            var containingNamespace = type.ContainingNamespace;
-            while (!containingNamespace.IsGlobalNamespace)
-            {
-                displayName = containingNamespace.Name + "." + displayName;
-                containingNamespace = containingNamespace.ContainingNamespace;
-            }
-            return displayName;
-        }
     }
 }

From b2e5cffb28e1db69bff3ee7f7def34d78ea4a26f Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Tue, 24 Aug 2021 15:50:54 -0700
Subject: [PATCH 36/64] Fix api change

---
 .../MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 0b74603fb729b..6cddb90a4b068 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -58,7 +58,6 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
             // Find the original doc root
             var syntaxFacts = _document.GetRequiredLanguageService<ISyntaxFactsService>();
             var root = await _document.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
-            var fileBanner = syntaxFacts.GetFileBanner(root);
 
             // add annotations to the symbols that we selected so we can find them later to pull up
             // These symbols should all have (singular) definitions, but in the case that we can't find
@@ -87,7 +86,7 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
                 _document.Project.Id,
                 _document.Folders,
                 newType,
-                fileBanner,
+                _document,
                 cancellationToken).ConfigureAwait(false);
 
             // get back type declaration in the newly created file

From aa13ffdc433a3c0313ec85172d3d5f05327e7f05 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <jorobich@microsoft.com>
Date: Tue, 24 Aug 2021 16:25:01 -0700
Subject: [PATCH 37/64] Update FeatureResources xlf

---
 src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf      | 4 ++--
 src/Features/Core/Portable/xlf/FeaturesResources.de.xlf      | 4 ++--
 src/Features/Core/Portable/xlf/FeaturesResources.es.xlf      | 4 ++--
 src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf      | 4 ++--
 src/Features/Core/Portable/xlf/FeaturesResources.it.xlf      | 4 ++--
 src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf      | 4 ++--
 src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf      | 4 ++--
 src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf      | 4 ++--
 src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf   | 4 ++--
 src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf      | 4 ++--
 src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf      | 4 ++--
 src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf | 4 ++--
 src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf | 4 ++--
 13 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
index e1e05d590810b..a01ae4707dabb 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
@@ -1146,11 +1146,11 @@ Tato možnost se doporučuje, pokud víte, že zpětné vyhledávání nepovede
       </trans-unit>
       <trans-unit id="Regex_balancing_group_long">
         <source>A balancing group definition deletes the definition of a previously defined group and stores, in the current group, the interval between the previously defined group and the current group.
-    
+
 'name1' is the current group (optional), 'name2' is a previously defined group, and 'subexpression' is any valid regular expression pattern. The balancing group definition deletes the definition of name2 and stores the interval between name2 and name1 in name1. If no name2 group is defined, the match backtracks. Because deleting the last definition of name2 reveals the previous definition of name2, this construct lets you use the stack of captures for group name2 as a counter for keeping track of nested constructs such as parentheses or opening and closing brackets.
 
 The balancing group definition uses 'name2' as a stack. The beginning character of each nested construct is placed in the group and in its Group.Captures collection. When the closing character is matched, its corresponding opening character is removed from the group, and the Captures collection is decreased by one. After the opening and closing characters of all nested constructs have been matched, 'name1' is empty.</source>
-        <target state="translated">Definice vyrovnávací skupiny odstraní definici dříve definované skupiny a uloží interval mezi dříve definovanou skupinou a aktuální skupinou do aktuální skupiny.
+        <target state="needs-review-translation">Definice vyrovnávací skupiny odstraní definici dříve definované skupiny a uloží interval mezi dříve definovanou skupinou a aktuální skupinou do aktuální skupiny.
     
 Skupina name1 je aktuální skupina (volitelná), skupina name2 je dříve definovaná skupina a subexpression je libovolný platný vzor regulárního výrazu. Definice vyrovnávací skupiny odstraní definici skupiny name2 a uloží interval mezi skupinami name2 a name1 do skupiny name1. Pokud není definována žádná skupina name2, porovnávání se vrátí zpět. Vzhledem k tomu, že odstraněním poslední definice skupiny name2 se odkryje předchozí definice skupiny name2, umožňuje tento konstruktor použít zásobník zachycení pro skupinu name2 jako čítač pro uchování přehledu o vnořených konstruktorech, jako jsou kulaté nebo hranaté otevírací a uzavírací závorky.
 
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
index 194ad7cbe7f51..8019bb3b410fd 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
@@ -1146,11 +1146,11 @@ Diese Option empfiehlt sich, wenn Sie wissen, dass die Rückverfolgung nicht zum
       </trans-unit>
       <trans-unit id="Regex_balancing_group_long">
         <source>A balancing group definition deletes the definition of a previously defined group and stores, in the current group, the interval between the previously defined group and the current group.
-    
+
 'name1' is the current group (optional), 'name2' is a previously defined group, and 'subexpression' is any valid regular expression pattern. The balancing group definition deletes the definition of name2 and stores the interval between name2 and name1 in name1. If no name2 group is defined, the match backtracks. Because deleting the last definition of name2 reveals the previous definition of name2, this construct lets you use the stack of captures for group name2 as a counter for keeping track of nested constructs such as parentheses or opening and closing brackets.
 
 The balancing group definition uses 'name2' as a stack. The beginning character of each nested construct is placed in the group and in its Group.Captures collection. When the closing character is matched, its corresponding opening character is removed from the group, and the Captures collection is decreased by one. After the opening and closing characters of all nested constructs have been matched, 'name1' is empty.</source>
-        <target state="translated">Eine Ausgleichsgruppendefinition löscht die Definition einer zuvor definierten Gruppe und speichert in der aktuellen Gruppe das Intervall zwischen der zuvor definierten Gruppe und der aktuellen Gruppe.
+        <target state="needs-review-translation">Eine Ausgleichsgruppendefinition löscht die Definition einer zuvor definierten Gruppe und speichert in der aktuellen Gruppe das Intervall zwischen der zuvor definierten Gruppe und der aktuellen Gruppe.
     
 "name1" ist die aktuelle Gruppe (optional), "name2" ist eine zuvor definierte Gruppe, und "teilausdruck" ist ein beliebiges gültiges Muster für reguläre Ausdrücke. Die Ausgleichsgruppendefinition löscht die Definition von "name2" und speichert das Intervall zwischen "name2" und "name1" in "name1". Wenn keine Gruppe "name2" definiert ist, wird für die Übereinstimmung eine Rückverfolgung durchgeführt. Weil durch das Löschen der letzten Definition von "name2" die vorherige Definition von "name2" angezeigt wird, können Sie mithilfe dieses Konstrukts den Stapel von Erfassungen für die Gruppe "name2" als Zähler für die Nachverfolgung geschachtelter Konstrukte wie z. B. öffnende und schließende Klammern verwenden.
 
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
index 96c19dfaafb49..ad4eb4d6ff030 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
@@ -1146,11 +1146,11 @@ Se recomienda esta opción si sabe que la vuelta atrás no será correcta. Evita
       </trans-unit>
       <trans-unit id="Regex_balancing_group_long">
         <source>A balancing group definition deletes the definition of a previously defined group and stores, in the current group, the interval between the previously defined group and the current group.
-    
+
 'name1' is the current group (optional), 'name2' is a previously defined group, and 'subexpression' is any valid regular expression pattern. The balancing group definition deletes the definition of name2 and stores the interval between name2 and name1 in name1. If no name2 group is defined, the match backtracks. Because deleting the last definition of name2 reveals the previous definition of name2, this construct lets you use the stack of captures for group name2 as a counter for keeping track of nested constructs such as parentheses or opening and closing brackets.
 
 The balancing group definition uses 'name2' as a stack. The beginning character of each nested construct is placed in the group and in its Group.Captures collection. When the closing character is matched, its corresponding opening character is removed from the group, and the Captures collection is decreased by one. After the opening and closing characters of all nested constructs have been matched, 'name1' is empty.</source>
-        <target state="translated">Una definición de grupo de equilibrio elimina la definición de un grupo definido anteriormente y almacena, en el grupo actual, el intervalo entre el grupo definido anteriormente y el grupo actual.
+        <target state="needs-review-translation">Una definición de grupo de equilibrio elimina la definición de un grupo definido anteriormente y almacena, en el grupo actual, el intervalo entre el grupo definido anteriormente y el grupo actual.
     
 "name1" es el grupo actual (opcional), "name2" es un grupo definido anteriormente y "subexpression" es cualquier patrón de expresión regular válido. La definición del grupo de equilibrio elimina la definición de name2 y almacena el intervalo entre name2 y name1 en name1. Si no se define un grupo de name2, la coincidencia se busca con retroceso. Como la eliminación de la última definición de name2 revela la definición anterior de name2, esta construcción permite usar la pila de capturas para el grupo name2 como contador para realizar el seguimiento de las construcciones anidadas, como los paréntesis o los corchetes de apertura y cierre.
 
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
index 9c0246ffcbd28..9646999cf1e5e 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
@@ -1146,11 +1146,11 @@ Cette option est recommandée si vous savez que le retour sur trace va être un
       </trans-unit>
       <trans-unit id="Regex_balancing_group_long">
         <source>A balancing group definition deletes the definition of a previously defined group and stores, in the current group, the interval between the previously defined group and the current group.
-    
+
 'name1' is the current group (optional), 'name2' is a previously defined group, and 'subexpression' is any valid regular expression pattern. The balancing group definition deletes the definition of name2 and stores the interval between name2 and name1 in name1. If no name2 group is defined, the match backtracks. Because deleting the last definition of name2 reveals the previous definition of name2, this construct lets you use the stack of captures for group name2 as a counter for keeping track of nested constructs such as parentheses or opening and closing brackets.
 
 The balancing group definition uses 'name2' as a stack. The beginning character of each nested construct is placed in the group and in its Group.Captures collection. When the closing character is matched, its corresponding opening character is removed from the group, and the Captures collection is decreased by one. After the opening and closing characters of all nested constructs have been matched, 'name1' is empty.</source>
-        <target state="translated">Une définition de groupe d'équilibrage supprime la définition d'un groupe défini et stocke, dans le groupe actuel, l'intervalle entre le groupe défini et le groupe actuel.
+        <target state="needs-review-translation">Une définition de groupe d'équilibrage supprime la définition d'un groupe défini et stocke, dans le groupe actuel, l'intervalle entre le groupe défini et le groupe actuel.
     
 'nom1' est le groupe actuel facultatif, 'nom2' est un groupe défini et 'sous-expression' est un modèle d'expression régulière valide. La définition du groupe d'équilibrage supprime la définition de name2 et stocke l'intervalle entre name2 et name1 dans name1. Si aucun groupe name2 n'est défini, la correspondance fait l'objet d'une rétroaction. Dans la mesure où la suppression de la dernière définition de name2 révèle la définition précédente de name2, cette construction vous permet d'utiliser la pile de captures du groupe name2 en tant que compteur permettant d'effectuer le suivi des constructions imbriquées telles que les parenthèses ou les crochets d'ouverture et de fermeture.
 
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
index ddb0012d84828..048162f98d5df 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
@@ -1146,11 +1146,11 @@ Questa opzione è consigliata solo se si è certi che il backtracking avrà esit
       </trans-unit>
       <trans-unit id="Regex_balancing_group_long">
         <source>A balancing group definition deletes the definition of a previously defined group and stores, in the current group, the interval between the previously defined group and the current group.
-    
+
 'name1' is the current group (optional), 'name2' is a previously defined group, and 'subexpression' is any valid regular expression pattern. The balancing group definition deletes the definition of name2 and stores the interval between name2 and name1 in name1. If no name2 group is defined, the match backtracks. Because deleting the last definition of name2 reveals the previous definition of name2, this construct lets you use the stack of captures for group name2 as a counter for keeping track of nested constructs such as parentheses or opening and closing brackets.
 
 The balancing group definition uses 'name2' as a stack. The beginning character of each nested construct is placed in the group and in its Group.Captures collection. When the closing character is matched, its corresponding opening character is removed from the group, and the Captures collection is decreased by one. After the opening and closing characters of all nested constructs have been matched, 'name1' is empty.</source>
-        <target state="translated">Una definizione di gruppo di bilanciamento elimina la definizione di un gruppo precedentemente definito e archivia nel gruppo corrente l'intervallo tra il gruppo precedentemente definito e il gruppo corrente.
+        <target state="needs-review-translation">Una definizione di gruppo di bilanciamento elimina la definizione di un gruppo precedentemente definito e archivia nel gruppo corrente l'intervallo tra il gruppo precedentemente definito e il gruppo corrente.
     
 'name1' è il gruppo corrente (facoltativo), 'name2' è un gruppo precedentemente definito e 'subexpression' è qualsiasi criterio di ricerca di espressioni regolari valido. La definizione di gruppo di bilanciamento elimina la definizione di name2 e archivia l'intervallo tra name2 e name1 in name1. Se non è definito alcun gruppo name2, viene eseguito il backtracking della corrispondenza. Dal momento che l'eliminazione dell'ultima definizione di name2 rivela la definizione precedente di name2, questo costrutto consente di usare lo stack di acquisizioni per il gruppo name2 come contatore per tenere traccia dei costrutti annidati, come ad esempio le parentesi o le parentesi quadre di apertura e chiusura.
 
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
index 37ce04c4fd0f2..6243aa6fca1d1 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
@@ -1146,11 +1146,11 @@ This option is recommended if you know that backtracking will not succeed. Preve
       </trans-unit>
       <trans-unit id="Regex_balancing_group_long">
         <source>A balancing group definition deletes the definition of a previously defined group and stores, in the current group, the interval between the previously defined group and the current group.
-    
+
 'name1' is the current group (optional), 'name2' is a previously defined group, and 'subexpression' is any valid regular expression pattern. The balancing group definition deletes the definition of name2 and stores the interval between name2 and name1 in name1. If no name2 group is defined, the match backtracks. Because deleting the last definition of name2 reveals the previous definition of name2, this construct lets you use the stack of captures for group name2 as a counter for keeping track of nested constructs such as parentheses or opening and closing brackets.
 
 The balancing group definition uses 'name2' as a stack. The beginning character of each nested construct is placed in the group and in its Group.Captures collection. When the closing character is matched, its corresponding opening character is removed from the group, and the Captures collection is decreased by one. After the opening and closing characters of all nested constructs have been matched, 'name1' is empty.</source>
-        <target state="translated">グループ定義の均等化では、既に定義されていたグループの定義を削除し、既に定義されていたグループと現在のグループの間隔を現在のグループに格納します。
+        <target state="needs-review-translation">グループ定義の均等化では、既に定義されていたグループの定義を削除し、既に定義されていたグループと現在のグループの間隔を現在のグループに格納します。
     
 'name1' は現在のグループ (省略可能) で、'name2' は既に定義されていたグループで、'subexpression' は有効な正規表現パターンです。グループ定義の均等化では、name2 の定義を削除し、name2 と name1 の間隔を name1 に格納します。name2 グループが定義されていない場合、一致はバックトラックされます。name2 の最後の定義を削除すると、name2 の以前の定義がわかるため、このコンストラクトによって、かっこや左右の角かっこなど入れ子になったコンストラクトを追跡するカウンターとして name2 グループのキャプチャのスタックを使用できます。
 
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
index e885e04b83c49..874979dc352bf 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
@@ -1146,11 +1146,11 @@ This option is recommended if you know that backtracking will not succeed. Preve
       </trans-unit>
       <trans-unit id="Regex_balancing_group_long">
         <source>A balancing group definition deletes the definition of a previously defined group and stores, in the current group, the interval between the previously defined group and the current group.
-    
+
 'name1' is the current group (optional), 'name2' is a previously defined group, and 'subexpression' is any valid regular expression pattern. The balancing group definition deletes the definition of name2 and stores the interval between name2 and name1 in name1. If no name2 group is defined, the match backtracks. Because deleting the last definition of name2 reveals the previous definition of name2, this construct lets you use the stack of captures for group name2 as a counter for keeping track of nested constructs such as parentheses or opening and closing brackets.
 
 The balancing group definition uses 'name2' as a stack. The beginning character of each nested construct is placed in the group and in its Group.Captures collection. When the closing character is matched, its corresponding opening character is removed from the group, and the Captures collection is decreased by one. After the opening and closing characters of all nested constructs have been matched, 'name1' is empty.</source>
-        <target state="translated">균형 조정 그룹 정의는 이전에 정의된 그룹의 정의를 삭제하고, 이전에 정의된 그룹과 현재 그룹 사이의 간격을 현재 그룹에 저장합니다.
+        <target state="needs-review-translation">균형 조정 그룹 정의는 이전에 정의된 그룹의 정의를 삭제하고, 이전에 정의된 그룹과 현재 그룹 사이의 간격을 현재 그룹에 저장합니다.
     
 'name1'은 현재 그룹이고(선택 사항), 'name2'는 이전에 정의된 그룹이며, 'subexpression'은 유효한 정규식 패턴입니다. 균형 조정 그룹 정의는 name2의 정의를 삭제하고 name2와 name1 사이의 간격을 name1에 저장합니다. name2 그룹이 정의되어 있지 않으면 일치에서 역추적합니다. name2의 마지막 정의를 삭제하면 name2의 이전 정의가 표시되므로 이 구문을 통해 name2 그룹에 대한 캡처 스택을 괄호 또는 여는 대괄호 및 닫는 대괄호와 같은 중첩 구문을 추적하기 위한 카운터로 사용할 수 있습니다.
 
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
index 35cb0809b3997..9cd53b6c4d571 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
@@ -1146,11 +1146,11 @@ Ta opcja jest zalecana, jeśli wiesz, że cofanie się nie powiedzie się. Zapob
       </trans-unit>
       <trans-unit id="Regex_balancing_group_long">
         <source>A balancing group definition deletes the definition of a previously defined group and stores, in the current group, the interval between the previously defined group and the current group.
-    
+
 'name1' is the current group (optional), 'name2' is a previously defined group, and 'subexpression' is any valid regular expression pattern. The balancing group definition deletes the definition of name2 and stores the interval between name2 and name1 in name1. If no name2 group is defined, the match backtracks. Because deleting the last definition of name2 reveals the previous definition of name2, this construct lets you use the stack of captures for group name2 as a counter for keeping track of nested constructs such as parentheses or opening and closing brackets.
 
 The balancing group definition uses 'name2' as a stack. The beginning character of each nested construct is placed in the group and in its Group.Captures collection. When the closing character is matched, its corresponding opening character is removed from the group, and the Captures collection is decreased by one. After the opening and closing characters of all nested constructs have been matched, 'name1' is empty.</source>
-        <target state="translated">Definicja grupy dopasowywania usuwa definicję uprzednio zdefiniowanej grupy i zapisuje w bieżącej grupie interwał między poprzednio zdefiniowaną grupą a bieżącą grupą.
+        <target state="needs-review-translation">Definicja grupy dopasowywania usuwa definicję uprzednio zdefiniowanej grupy i zapisuje w bieżącej grupie interwał między poprzednio zdefiniowaną grupą a bieżącą grupą.
     
 „Nazwa1” to bieżąca grupa (opcjonalna), „nazwa2” to wcześniej zdefiniowana grupa, a element „podwyrażenie” to dowolny prawidłowy wzorzec wyrażenia regularnego. Definicja grupy dopasowywania usuwa definicję elementu nazwa2 i zapisuje interwał między elementami nazwa2 i nazwa1 w elemencie nazwa1. Jeśli nie zdefiniowano grupy nazwa2, następuje cofanie dopasowywania. Ponieważ usunięcie ostatniej definicji elementu nazwa2 ujawnia jego poprzednią definicję, ta konstrukcja umożliwia użycie stosu przechwyceń dla grupy nazwa2 jako licznika służącego do śledzenia zagnieżdżonych konstrukcji, takich jak nawiasy lub otwierające i zamykające nawiasy klamrowe.
 
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
index 6fb3c4ea26ba6..89dcfc674cb92 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
@@ -1146,11 +1146,11 @@ Essa opção é recomendada quando você sabe que o rastreamento inverso não se
       </trans-unit>
       <trans-unit id="Regex_balancing_group_long">
         <source>A balancing group definition deletes the definition of a previously defined group and stores, in the current group, the interval between the previously defined group and the current group.
-    
+
 'name1' is the current group (optional), 'name2' is a previously defined group, and 'subexpression' is any valid regular expression pattern. The balancing group definition deletes the definition of name2 and stores the interval between name2 and name1 in name1. If no name2 group is defined, the match backtracks. Because deleting the last definition of name2 reveals the previous definition of name2, this construct lets you use the stack of captures for group name2 as a counter for keeping track of nested constructs such as parentheses or opening and closing brackets.
 
 The balancing group definition uses 'name2' as a stack. The beginning character of each nested construct is placed in the group and in its Group.Captures collection. When the closing character is matched, its corresponding opening character is removed from the group, and the Captures collection is decreased by one. After the opening and closing characters of all nested constructs have been matched, 'name1' is empty.</source>
-        <target state="translated">Uma definição de grupo de balanceamento exclui a definição de um grupo definido anteriormente e armazena, no grupo atual, o intervalo entre o grupo definido anteriormente e o grupo atual.
+        <target state="needs-review-translation">Uma definição de grupo de balanceamento exclui a definição de um grupo definido anteriormente e armazena, no grupo atual, o intervalo entre o grupo definido anteriormente e o grupo atual.
     
 'name1' é o grupo atual (opcional), 'name2' é um grupo definido anteriormente e 'subexpression' é qualquer padrão de expressão regular válido. A definição de grupo de balanceamento exclui a definição de name2 e armazena o intervalo entre name2 e name1 no name1. Se não for definido nenhum name2, a correspondência retrocederá. Como a exclusão da última definição de name2 revela a definição anterior de name2, esse constructo permite o uso da pilha de capturas para o grupo name2 como um contador para manter o controle de constructos aninhados, como parênteses ou colchetes de abertura e fechamento.
 
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
index 5d5be65767830..0160457df09b5 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
@@ -1146,11 +1146,11 @@ This option is recommended if you know that backtracking will not succeed. Preve
       </trans-unit>
       <trans-unit id="Regex_balancing_group_long">
         <source>A balancing group definition deletes the definition of a previously defined group and stores, in the current group, the interval between the previously defined group and the current group.
-    
+
 'name1' is the current group (optional), 'name2' is a previously defined group, and 'subexpression' is any valid regular expression pattern. The balancing group definition deletes the definition of name2 and stores the interval between name2 and name1 in name1. If no name2 group is defined, the match backtracks. Because deleting the last definition of name2 reveals the previous definition of name2, this construct lets you use the stack of captures for group name2 as a counter for keeping track of nested constructs such as parentheses or opening and closing brackets.
 
 The balancing group definition uses 'name2' as a stack. The beginning character of each nested construct is placed in the group and in its Group.Captures collection. When the closing character is matched, its corresponding opening character is removed from the group, and the Captures collection is decreased by one. After the opening and closing characters of all nested constructs have been matched, 'name1' is empty.</source>
-        <target state="translated">Сбалансированное определение группы удаляет определение ранее определенной группы и сохраняет (в текущей группе) интервал между ранее определенной группой и текущей группой.
+        <target state="needs-review-translation">Сбалансированное определение группы удаляет определение ранее определенной группы и сохраняет (в текущей группе) интервал между ранее определенной группой и текущей группой.
     
 Значение "имя1" является текущей группой (необязательная), "имя2" является ранее определенной группой, а "часть выражения" является любым допустимым шаблоном регулярного выражения. Сбалансированное определение группы удаляет определение "имя2" и сохраняет интервал между "имя2" и "имя1" в "имя1". Если группа "имя2" не определена, соответствие определяется по обратному отслеживанию. Так как удаление последнего определения name2 приводит к раскрытию предыдущего определения "имя2", эта конструкция позволяет использовать стек записей для группы "имя2" в качестве счетчика для отслеживания вложенных конструкций, таких как круглые скобки или открывающие и закрывающие скобки.
 
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
index 45eeb54b97ac0..0a91c57d5902c 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
@@ -1146,11 +1146,11 @@ Bu seçenek, geri izlemenin başarısız olacağını biliyorsanız önerilir. N
       </trans-unit>
       <trans-unit id="Regex_balancing_group_long">
         <source>A balancing group definition deletes the definition of a previously defined group and stores, in the current group, the interval between the previously defined group and the current group.
-    
+
 'name1' is the current group (optional), 'name2' is a previously defined group, and 'subexpression' is any valid regular expression pattern. The balancing group definition deletes the definition of name2 and stores the interval between name2 and name1 in name1. If no name2 group is defined, the match backtracks. Because deleting the last definition of name2 reveals the previous definition of name2, this construct lets you use the stack of captures for group name2 as a counter for keeping track of nested constructs such as parentheses or opening and closing brackets.
 
 The balancing group definition uses 'name2' as a stack. The beginning character of each nested construct is placed in the group and in its Group.Captures collection. When the closing character is matched, its corresponding opening character is removed from the group, and the Captures collection is decreased by one. After the opening and closing characters of all nested constructs have been matched, 'name1' is empty.</source>
-        <target state="translated">Bir dengeleme grubu tanımı, geçerli grupta, önceden tanımlanmış grup ile geçerli grup arasındaki aralıkta, önceden tanımlanmış bir grubun ve depoların tanımını siler.
+        <target state="needs-review-translation">Bir dengeleme grubu tanımı, geçerli grupta, önceden tanımlanmış grup ile geçerli grup arasındaki aralıkta, önceden tanımlanmış bir grubun ve depoların tanımını siler.
     
 'name1' geçerli grup (isteğe bağlı), 'name2' önceden tanımlanmış bir grup ve 'subexpression' ise herhangi bir geçerli normal ifade desenidir. Dengeleme grubu tanımı name2'nin tanımını siler ve name2 ile name1 arasındaki aralığı name1'e depolar. Bir name2 grubu tanımlanmamışsa, eşleşme geri iz sürer. name2'nin son tanımını silmek, name2'nin önceki tanımını ortaya çıkardığından, bu yapı name2 grubu için yakalama yığınını, parantez veya açma ve kapama ayracı gibi iç içe yapıları izlemek için bir sayaç olarak kullanmanıza olanak sağlar.
 
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
index e81160999552d..7dfffbd6ef339 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
@@ -1146,11 +1146,11 @@ This option is recommended if you know that backtracking will not succeed. Preve
       </trans-unit>
       <trans-unit id="Regex_balancing_group_long">
         <source>A balancing group definition deletes the definition of a previously defined group and stores, in the current group, the interval between the previously defined group and the current group.
-    
+
 'name1' is the current group (optional), 'name2' is a previously defined group, and 'subexpression' is any valid regular expression pattern. The balancing group definition deletes the definition of name2 and stores the interval between name2 and name1 in name1. If no name2 group is defined, the match backtracks. Because deleting the last definition of name2 reveals the previous definition of name2, this construct lets you use the stack of captures for group name2 as a counter for keeping track of nested constructs such as parentheses or opening and closing brackets.
 
 The balancing group definition uses 'name2' as a stack. The beginning character of each nested construct is placed in the group and in its Group.Captures collection. When the closing character is matched, its corresponding opening character is removed from the group, and the Captures collection is decreased by one. After the opening and closing characters of all nested constructs have been matched, 'name1' is empty.</source>
-        <target state="translated">均衡组定义删除以前定义的组的定义，并在当前组中存储以前定义的组和当前组之间的时间间隔。
+        <target state="needs-review-translation">均衡组定义删除以前定义的组的定义，并在当前组中存储以前定义的组和当前组之间的时间间隔。
     
 "name1" 是当前组(可选)，"name2" 是以前定义的组，而 "subexpression" 是任何有效的正则表达式模式。均衡组定义将删除 name2 的定义，并在 name1 中存储 name2 和 name1 之间的间隔。如果未定义 name2 组，则匹配回溯。由于删除 name2 的最后一个定义会发现 name2 的上一个定义，此构造使你能够使用作为计数器的组的捕获堆栈来跟踪嵌套构造(如括号)或左括号和右括号。
 
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
index 199154ba8b026..ff775d5091636 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
@@ -1146,11 +1146,11 @@ This option is recommended if you know that backtracking will not succeed. Preve
       </trans-unit>
       <trans-unit id="Regex_balancing_group_long">
         <source>A balancing group definition deletes the definition of a previously defined group and stores, in the current group, the interval between the previously defined group and the current group.
-    
+
 'name1' is the current group (optional), 'name2' is a previously defined group, and 'subexpression' is any valid regular expression pattern. The balancing group definition deletes the definition of name2 and stores the interval between name2 and name1 in name1. If no name2 group is defined, the match backtracks. Because deleting the last definition of name2 reveals the previous definition of name2, this construct lets you use the stack of captures for group name2 as a counter for keeping track of nested constructs such as parentheses or opening and closing brackets.
 
 The balancing group definition uses 'name2' as a stack. The beginning character of each nested construct is placed in the group and in its Group.Captures collection. When the closing character is matched, its corresponding opening character is removed from the group, and the Captures collection is decreased by one. After the opening and closing characters of all nested constructs have been matched, 'name1' is empty.</source>
-        <target state="translated">平衡群組定義會刪除先前已定義群組的定義，並將先前定義的群組和目前群組間的間隔儲存在目前的群組內。
+        <target state="needs-review-translation">平衡群組定義會刪除先前已定義群組的定義，並將先前定義的群組和目前群組間的間隔儲存在目前的群組內。
     
 'name1' 是目前的群組 (選擇性)，'name2' 是先前定義的群組，'subexpression' 是任何有效的規則運算式模式。平衡群組定義會刪除 name2 的定義，並將 name2 與 name1 之間的間隔儲存在 name1 內。如果未指定 name2 群組，則比對會回溯。因為刪除 name2 的上一個定義會顯示 name2 先前的定義，所以此建構可讓您使用群組 name2 的擷取堆疊來作為計數器，用來追蹤括號或左右括弧等巢狀建構。
 

From 69421170eb373bc7d7f4cf489868d6dddd1bf718 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Wed, 25 Aug 2021 10:37:40 -0700
Subject: [PATCH 38/64] Changed tests to use new default accessibility modifier
 for new documents

---
 .../CSharpMoveStaticMembersTests.cs           | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index 529b70ef9db60..9524f6ef467f4 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -42,7 +42,7 @@ public class Class1
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestField = 1;
     }
@@ -74,7 +74,7 @@ public class Class1
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestProperty { get; set; }
     }
@@ -111,7 +111,7 @@ public class Class1
 
 namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static event EventHandler TestEvent;
     }
@@ -145,7 +145,7 @@ public class Class1
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestMethod()
         {
@@ -200,7 +200,7 @@ public Other()
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestMethod(this Other other)
         {
@@ -235,7 +235,7 @@ public class Class1
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public const int TestField = 1;
     }
@@ -274,7 +274,7 @@ public class Class1
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static bool TestMethodBool()
         {
@@ -326,7 +326,7 @@ public static int TestMethodInt()
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
 
         public static bool TestMethodBool()
@@ -380,7 +380,7 @@ public class Class1
 
 namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestField;
 
@@ -426,7 +426,7 @@ public class NestedClass1
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestField = 1;
     }
@@ -464,7 +464,7 @@ public class Class1
 }";
             var expectedResult2 = @"namespace TestNs1.InnerNs
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestField = 1;
     }
@@ -487,7 +487,7 @@ public class Class1
 public class Class1
 {
 }";
-            var expectedResult2 = @"static class Class1Helpers
+            var expectedResult2 = @"internal static class Class1Helpers
 {
     public static int TestField = 1;
 }";
@@ -511,7 +511,7 @@ public class Class1
 }";
             var expectedResult2 = @"namespace NewNs
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestField = 1;
     }
@@ -547,7 +547,7 @@ public class Class1
 }";
             var expectedResult2 = @"namespace TestNs1.ExtraNs
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestMethod()
         {
@@ -583,7 +583,7 @@ public class Class1
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestMethod()
         {
@@ -632,7 +632,7 @@ public class Class1
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static T TestMethod<T>(T item)
         {
@@ -669,7 +669,7 @@ public class Class1<T>
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers<T>
+    internal static class Class1Helpers<T>
     {
         public static T Test[||]Method(T item)
         {
@@ -742,7 +742,7 @@ public Other()
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestMethod(this Other other)
         {
@@ -779,7 +779,7 @@ public static class Class1
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestMethod()
         {
@@ -823,7 +823,7 @@ public static class Class1
 
 namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestMethod()
         {
@@ -863,7 +863,7 @@ public class Class1
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestMethod()
         {
@@ -897,7 +897,7 @@ public class Class1
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestField = 1;
     }
@@ -928,7 +928,7 @@ public class Class1
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestField = 1;
     }
@@ -959,7 +959,7 @@ public class Class1
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestField = 1;
     }
@@ -990,7 +990,7 @@ public class Class1
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestField = 1;
     }
@@ -1024,7 +1024,7 @@ public class Class1
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestMethod()
         {
@@ -1059,7 +1059,7 @@ public class Class1
 }";
             var expectedResult2 = @"namespace TestNs1
 {
-    static class Class1Helpers
+    internal static class Class1Helpers
     {
         public static int TestField = 1;
     }

From 0d93aae01d9ac1ddf1ea732ad88baa8a317a92df Mon Sep 17 00:00:00 2001
From: Soren Dahl <43689321+Soreloser2@users.noreply.github.com>
Date: Thu, 26 Aug 2021 13:00:34 -0700
Subject: [PATCH 39/64] Move Static Members: Refactor moved member references
 (#55581)

* WIP Dialog work

* Rename + refactor

* WIP rename, add xaml elements

* WIP dialog/VM work

* WIP, Reverted Pull Member up change, updated destination selection, not working bc of a few bugs

* Refactoring provider now shows up and launches dialog

No behavior created after dialog exited
Still working on destination type/filename selection formatting

* Rename/Refactor name to MoveStaticMembers. Feature working with textbox, assuming new class (c# only, no automated tests yet)

* Accessibility, theming, resources, and sizing retweaks

* Added VB refactoring provider. Currently does not trigger on fields, as the semantic model cannot get the symbol for VB declared fields from the node. Fields are added as part of the dialog box however.

* Addressing some of the feedback

* Fixed fields not being able to trigger dialog in VB

* Remove unnecessary usings

* Fixed nullable error

* Added test classes for view model and C# impl, made VB able to get dependents

* Finished Writing impl tests for C# and VB. VB tests are currently failing due to the way AddMembers reuses syntax. Fixed a few bugs

* Fixed resources and removed nullable disable annotation

* Adress small feedback points

* Small test fix. Works with generator changes (sepearate PR)

* WIP untested, refactoring references to moved members

* Added tests for refactoring and extensions for C#. Will add tests for refactoring in VB, but unsure about extensions since we do not generate a module.

* Make module now for VB, add refactor tests

* Updated C# tests to a new framework. May need to rewrite VB test file in C# to set some readonly properties

* Changed VB tests to new Framework. Revealed an error in the way vb members are moved

* Fixed VB tests by removing shared modifier when moving to a module

* Fixed more tests to account for member spacing innaccuracy

* Refactored tests, added vb extension tests

* Added tests for file banner and moving from a static class/module

* Added tests to enure operator and static constructors are not able to be selected or trigger refactoring

* Make service field readonly

* Added support for alias refactoring + tests

* Refactored references on source type. Added simplifier annotation to remove unnecessary qualifications.

* Now correctly refactors references using symbol annotations and expansions for extension methods, should address conflicting imports issues

* Fixed simplifier incorrectly simplifying references inside moved members

* Added more tests, generic class refactoring currently isn't working

* Added support for generic class member access, copying only the type arguments we moved from the methods

* Fixed tests by adding accesibility modifier

* Addressed feedback, fixed multiple extension method bug by using docEditor

* Changed new type to create the same kind (class/Module) as the source type, refactored tests

Co-authored-by: msftbot[bot] <48340428+msftbot[bot]@users.noreply.github.com>
---
 .../CSharpMoveStaticMembersTests.cs           | 1358 ++++++++++++++++-
 .../VisualBasicMoveStaticMembersTests.vb      | 1306 ++++++++++++++--
 .../MoveStaticMembersWithDialogCodeAction.cs  |  175 ++-
 .../Services/SyntaxFacts/CSharpSyntaxFacts.cs |    3 +
 .../Core/Services/SyntaxFacts/ISyntaxFacts.cs |    2 +
 .../SyntaxFacts/VisualBasicSyntaxFacts.vb     |    8 +
 6 files changed, 2649 insertions(+), 203 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index 9524f6ef467f4..d6f494db2a1ab 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -243,6 +243,47 @@ internal static class Class1Helpers
             await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodWithTrivia()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    // some comment we don't want to move
+    public class Class1
+    {
+        // some comment we want to move
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    // some comment we don't want to move
+    public class Class1
+    {
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    internal static class Class1Helpers
+    {
+        // some comment we want to move
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestMoveMultipleMethods()
         {
@@ -681,34 +722,78 @@ internal static class Class1Helpers<T>
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
-        public async Task TestMoveExtensionMethodDontRefactor()
+        public async Task TestMoveMethodAndRefactorUsage()
         {
             var initialMarkup = @"
 namespace TestNs1
 {
-    public static class Class1
+    public class Class1
     {
-        public static int Test[||]Method(this Other other)
+        public static int Test[||]Method()
         {
-            return other.OtherInt + 2;
+            return 0;
         }
     }
 
     public class Class2
     {
-        public int GetOtherInt()
+        public static int TestMethod2()
         {
-            var other = new Other();
-            return other.TestMethod();
+            return Class1.TestMethod();
         }
     }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
 
-    public class Other
+    public class Class2
     {
-        public int OtherInt;
-        public Other()
+        public static int TestMethod2()
         {
-            OtherInt = 5;
+            return Class1Helpers.TestMethod();
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    internal static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorUsageWithTrivia()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+
+    public class Class2
+    {
+        public static int TestMethod2()
+        {
+            // keep this comment, and the random spaces here
+            return Class1. TestMethod( );
         }
     }
 }";
@@ -718,29 +803,1264 @@ public Other()
             var expectedResult1 = @"
 namespace TestNs1
 {
-    public static class Class1
+    public class Class1
     {
     }
 
     public class Class2
     {
-        public int GetOtherInt()
+        public static int TestMethod2()
         {
-            var other = new Other();
-            return other.TestMethod();
+            // keep this comment, and the random spaces here
+            return Class1Helpers. TestMethod( );
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    internal static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
         }
     }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
 
-    public class Other
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorSourceUsage()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
     {
-        public int OtherInt;
-        public Other()
+        public static int Test[||]Method()
         {
-            OtherInt = 5;
+            return 0;
+        }
+
+        public static int TestMethod2()
+        {
+            return TestMethod();
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestMethod();
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    internal static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveFieldAndRefactorSourceUsage()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Field = 0;
+
+        public static int TestMethod2()
+        {
+            return TestField;
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestField;
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    internal static class Class1Helpers
+    {
+        public static int TestField = 0;
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMovePropertyAndRefactorSourceUsage()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        private static int _testProperty;
+
+        public static int Test[||]Property
+        {
+            get => _testProperty;
+            set
+            {
+                _testProperty = value;
+            }
+        }
+
+        public static int TestMethod2()
+        {
+            return TestProperty;
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestProperty", "_testProperty");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestProperty;
         }
     }
 }";
             var expectedResult2 = @"namespace TestNs1
+{
+    internal static class Class1Helpers
+    {
+        private static int _testProperty;
+
+        public static int Test[||]Property
+        {
+            get => _testProperty;
+            set
+            {
+                _testProperty = value;
+            }
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveGenericMethodAndRefactorImpliedUsage()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static T Test[||]Method<T>(T item)
+        {
+            return item;
+        }
+    }
+
+    public class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1.TestMethod(5);
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+
+    public class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestMethod(5);
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    internal static class Class1Helpers
+    {
+        public static T TestMethod<T>(T item)
+        {
+            return item;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveGenericMethodAndRefactorUsage()
+        {
+            var initialMarkup = @"
+using System;
+
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static Type Test[||]Method<T>()
+        {
+            return typeof(T);
+        }
+    }
+
+    public class Class2
+    {
+        public static Type TestMethod2()
+        {
+            return Class1.TestMethod<int>();
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+using System;
+
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+
+    public class Class2
+    {
+        public static Type TestMethod2()
+        {
+            return Class1Helpers.TestMethod<int>();
+        }
+    }
+}";
+            var expectedResult2 = @"using System;
+
+namespace TestNs1
+{
+    internal static class Class1Helpers
+    {
+        public static Type TestMethod<T>()
+        {
+            return typeof(T);
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodFromGenericClassAndRefactorUsage()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1<T>
+    {
+        public static T TestGeneric { get; set; }    
+
+        public static T Test[||]Method()
+        {
+            return TestGeneric;
+        }
+    }
+
+    public class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1<int>.TestMethod();
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod", "TestGeneric");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1<T>
+    {
+    }
+
+    public class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers<int>.TestMethod();
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    internal static class Class1Helpers<T>
+    {
+        public static T TestGeneric { get; set; }
+
+        public static T TestMethod()
+        {
+            return TestGeneric;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodFromGenericClassAndRefactorPartialTypeArgUsage()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1<T1, T2, T3>
+        where T1 : new()
+    {
+        public static T1 Test[||]Method()
+        {
+            return new T1();
+        }
+
+        public static T2 TestGeneric2 { get; set; } 
+
+        public T3 TestGeneric3 { get; set; }
+    }
+
+    public class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1<int, string, double>.TestMethod();
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1<T1, T2, T3>
+        where T1 : new()
+    {
+        public static T2 TestGeneric2 { get; set; } 
+
+        public T3 TestGeneric3 { get; set; }
+    }
+
+    public class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers<int>.TestMethod();
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    internal static class Class1Helpers<T1> where T1 : new()
+    {
+        public static T1 TestMethod()
+        {
+            return new T1();
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorUsageDifferentNamespace()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1;
+
+    public class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1.TestMethod();
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1;
+
+    public class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestMethod();
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    internal static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorUsageNewNamespace()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+
+    public class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1.TestMethod();
+        }
+    }
+}";
+            var selectedDestinationName = "ExtraNs.Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+using TestNs1.ExtraNs;
+
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+
+    public class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestMethod();
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1.ExtraNs
+{
+    internal static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorUsageSeparateFile()
+        {
+            var initialMarkup1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}";
+            var initialMarkup2 = @"
+using TestNs1;
+
+public class Class2
+{
+    public static int TestMethod2()
+    {
+        return Class1.TestMethod();
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}";
+            var expectedResult3 = @"
+using TestNs1;
+
+public class Class2
+{
+    public static int TestMethod2()
+    {
+        return Class1Helpers.TestMethod();
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    internal static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestState =
+                {
+                    Sources =
+                    {
+                        initialMarkup1,
+                        initialMarkup2
+                    }
+                },
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        expectedResult3,
+                        (newFileName, expectedResult2)
+                    }
+                }
+            }.RunAsync().ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorClassAlias()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}
+
+namespace TestNs2
+{
+    using C1 = TestNs1.Class1;
+
+    class Class2
+    {
+        public static int TestMethod2()
+        {
+            return C1.TestMethod();
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1;
+    using C1 = TestNs1.Class1;
+
+    class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestMethod();
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    internal static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorNamespaceAlias()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}
+
+namespace TestNs2
+{
+    using C1 = TestNs1;
+
+    class Class2
+    {
+        public static int TestMethod2()
+        {
+            return C1.Class1.TestMethod();
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1;
+    using C1 = TestNs1;
+
+    class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestMethod();
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    internal static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorConflictingName()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int F[||]oo()
+        {
+            return 0;
+        }
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1;
+
+    class Class2
+    {
+        class Class1Helpers
+        {
+            public static int Foo()
+            {
+                return 1;
+            }
+        }
+        
+        public static int TestMethod2()
+        {
+            return Class1.Foo() + Class1Helpers.Foo();
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("Foo");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1;
+
+    class Class2
+    {
+        class Class1Helpers
+        {
+            public static int Foo()
+            {
+                return 1;
+            }
+        }
+        
+        public static int TestMethod2()
+        {
+            return TestNs1.Class1Helpers.Foo() + Class1Helpers.Foo();
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    internal static class Class1Helpers
+    {
+        public static int Foo()
+        {
+            return 0;
+        }
+    }
+}";
+            await new Test(selectedDestinationName, selectedMembers, newFileName)
+            {
+                TestCode = initialMarkup,
+                FixedState =
+                {
+                    Sources =
+                    {
+                        expectedResult1,
+                        (newFileName, expectedResult2)
+                    }
+                },
+                // the test parser thinks "TestNs1.Class1Helpers" is a member access expression
+                // but we made a qualified name. The text should still be the same
+                CodeActionValidationMode = Testing.CodeActionValidationMode.None
+            }.RunAsync().ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorQualifiedName()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}
+
+namespace TestNs2
+{
+    class Class2
+    {
+        public static int TestMethod2()
+        {
+            return TestNs1.Class1.TestMethod();
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+using TestNs1;
+
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+
+namespace TestNs2
+{
+    class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestMethod();
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    internal static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorStaticUsing()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}
+
+namespace TestNs2
+{
+    using static TestNs1.Class1;
+
+    class Class2
+    {
+        public static int TestMethod2()
+        {
+            return TestMethod();
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1;
+    using static TestNs1.Class1;
+
+    class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestMethod();
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    internal static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodAndRefactorNamespaceAliasWithExtraNamespace()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}
+
+namespace TestNs2
+{
+    using C1 = TestNs1;
+
+    class Class2
+    {
+        public static int TestMethod2()
+        {
+            return C1.Class1.TestMethod();
+        }
+    }
+}";
+            var selectedDestinationName = "ExtraNs.Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1.ExtraNs;
+    using C1 = TestNs1;
+
+    class Class2
+    {
+        public static int TestMethod2()
+        {
+            return Class1Helpers.TestMethod();
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1.ExtraNs
+{
+    internal static class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveExtensionMethodDontRefactor()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public static class Class1
+    {
+        public static int Test[||]Method(this Other other)
+        {
+            return other.OtherInt + 2;
+        }
+    }
+
+    public class Class2
+    {
+        public int GetOtherInt()
+        {
+            var other = new Other();
+            return other.TestMethod();
+        }
+    }
+
+    public class Other
+    {
+        public int OtherInt;
+        public Other()
+        {
+            OtherInt = 5;
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public static class Class1
+    {
+    }
+
+    public class Class2
+    {
+        public int GetOtherInt()
+        {
+            var other = new Other();
+            return other.TestMethod();
+        }
+    }
+
+    public class Other
+    {
+        public int OtherInt;
+        public Other()
+        {
+            OtherInt = 5;
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    internal static class Class1Helpers
+    {
+        public static int TestMethod(this Other other)
+        {
+            return other.OtherInt + 2;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveExtensionMethodRefactorImports()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    using TestNs2;
+
+    public static class Class1
+    {
+        public static int Test[||]Method(this Other other)
+        {
+            return other.OtherInt + 2;
+        }
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1;
+
+    public class Class2
+    {
+        public int GetOtherInt()
+        {
+            var other = new Other();
+            return other.TestMethod();
+        }
+    }
+
+    public class Other
+    {
+        public int OtherInt;
+        public Other()
+        {
+            OtherInt = 5;
+        }
+    }
+}";
+            var selectedDestinationName = "ExtraNs.Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    using TestNs2;
+
+    public static class Class1
+    {
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1;
+    using TestNs1.ExtraNs;
+
+    public class Class2
+    {
+        public int GetOtherInt()
+        {
+            var other = new Other();
+            return other.TestMethod();
+        }
+    }
+
+    public class Other
+    {
+        public int OtherInt;
+        public Other()
+        {
+            OtherInt = 5;
+        }
+    }
+}";
+            var expectedResult2 = @"using TestNs2;
+
+namespace TestNs1.ExtraNs
+{
+    internal static class Class1Helpers
+    {
+        public static int TestMethod(this Other other)
+        {
+            return other.OtherInt + 2;
+        }
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveExtensionMethodRefactorMultipleImports()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    using TestNs2;
+
+    public static class Class1
+    {
+        public static int Test[||]Method(this Other other)
+        {
+            return other.OtherInt + 2;
+        }
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1;
+
+    public class Class2
+    {
+        public int GetOtherInt()
+        {
+            var other = new Other();
+            return other.TestMethod();
+        }
+
+        public int GetOtherInt2()
+        {
+            var other = new Other();
+            return other.TestMethod();
+        }
+    }
+
+    public class Other
+    {
+        public int OtherInt;
+        public Other()
+        {
+            OtherInt = 5;
+        }
+    }
+}";
+            var selectedDestinationName = "ExtraNs.Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    using TestNs2;
+
+    public static class Class1
+    {
+    }
+}
+
+namespace TestNs2
+{
+    using TestNs1;
+    using TestNs1.ExtraNs;
+
+    public class Class2
+    {
+        public int GetOtherInt()
+        {
+            var other = new Other();
+            return other.TestMethod();
+        }
+
+        public int GetOtherInt2()
+        {
+            var other = new Other();
+            return other.TestMethod();
+        }
+    }
+
+    public class Other
+    {
+        public int OtherInt;
+        public Other()
+        {
+            OtherInt = 5;
+        }
+    }
+}";
+            var expectedResult2 = @"using TestNs2;
+
+namespace TestNs1.ExtraNs
 {
     internal static class Class1Helpers
     {
diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index c49b75f5b8e71..ec5a438d88d93 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -32,10 +32,9 @@ Namespace TestNs
     End Class
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers
-        Public TestField As Integer = 0
-
-    End Module
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
 End Namespace
 "
 
@@ -63,13 +62,13 @@ Namespace TestNs
     End Class
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers
-        Public ReadOnly Property TestProperty As Integer
+    Class Class1Helpers
+        Public Shared ReadOnly Property TestProperty As Integer
             Get
                 Return 0
             End Get
         End Property
-    End Module
+    End Class
 End Namespace
 "
 
@@ -99,9 +98,9 @@ End Namespace"
             Dim expectedText2 = "Imports System
 
 Namespace TestNs
-    Module Class1Helpers
-        Public Event TestEvent As EventHandler
-    End Module
+    Class Class1Helpers
+        Public Shared Event TestEvent As EventHandler
+    End Class
 End Namespace
 "
 
@@ -141,8 +140,8 @@ End Namespace"
             Dim expectedText2 = "Imports System
 
 Namespace TestNs
-    Module Class1Helpers
-        Public Custom Event Click As EventHandler
+    Class Class1Helpers
+        Public Shared Custom Event Click As EventHandler
             AddHandler(ByVal value As EventHandler)
                 Console.WriteLine(value.ToString())
             End AddHandler
@@ -153,7 +152,7 @@ Namespace TestNs
                 Console.WriteLine(sender.ToString())
             End RaiseEvent
         End Event
-    End Module
+    End Class
 End Namespace
 "
 
@@ -179,11 +178,11 @@ Namespace TestNs
     End Class
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers
-        Public Function TestFunc() As Integer
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
             Return 0
         End Function
-    End Module
+    End Class
 End Namespace
 "
 
@@ -208,10 +207,10 @@ Namespace TestNs
     End Class
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers
-        Public Sub TestSub()
+    Class Class1Helpers
+        Public Shared Sub TestSub()
         End Sub
-    End Module
+    End Class
 End Namespace
 "
 
@@ -235,9 +234,43 @@ Namespace TestNs
     End Class
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers
+    Class Class1Helpers
         Public Const TestConst As Integer = 0
-    End Module
+    End Class
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionWithTrivia() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    ' Comment we don't want to move
+    Public Class Class1
+        'Comment we want to move
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    ' Comment we don't want to move
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Class Class1Helpers
+        'Comment we want to move
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
 End Namespace
 "
 
@@ -267,11 +300,11 @@ Namespace TestNs
     End Class
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers
-        Public Function TestFunc() As Integer
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
             Return 0
         End Function
-    End Module
+    End Class
 End Namespace
 "
 
@@ -301,11 +334,11 @@ Namespace TestNs
     End Namespace
 End Namespace"
             Dim expectedText2 = "Namespace TestNs.InnerNs
-    Module Class1Helpers
-        Public Function TestFunc() As Integer
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
             Return 0
         End Function
-    End Module
+    End Class
 End Namespace
 "
 
@@ -324,10 +357,9 @@ End Class"
             Dim expectedText1 = "
 Public Class Class1
 End Class"
-            Dim expectedText2 = "Module Class1Helpers
-    Public TestField As Integer = 0
-
-End Module
+            Dim expectedText2 = "Class Class1Helpers
+    Public Shared TestField As Integer = 0
+End Class
 "
 
             Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
@@ -346,10 +378,9 @@ End Class"
 Public Class Class1
 End Class"
             Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers
-        Public TestField As Integer = 0
-
-    End Module
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
 End Namespace
 "
 
@@ -373,10 +404,9 @@ Namespace TestNs
     End Class
 End Namespace"
             Dim expectedText2 = "Namespace TestNs.InnerNs
-    Module Class1Helpers
-        Public TestField As Integer = 0
-
-    End Module
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
 End Namespace
 "
 
@@ -402,11 +432,11 @@ Namespace TestNs
     End Class
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers
-        Public Function TestFunc(Of T)(item As T) As T
+    Class Class1Helpers
+        Public Shared Function TestFunc(Of T)(item As T) As T
             Return item
         End Function
-    End Module
+    End Class
 End Namespace
 "
 
@@ -462,11 +492,11 @@ Namespace TestNs
     End Class
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers
-        Public Function TestFunc() As Integer
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
             Return 0
         End Function
-    End Module
+    End Class
 End Namespace
 "
 
@@ -496,15 +526,15 @@ Namespace TestNs
     End Class
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers
-        Public Function TestFunc1() As Integer
+    Class Class1Helpers
+        Public Shared Function TestFunc1() As Integer
             Return 0
         End Function
 
-        Public Function TestFunc2() As Boolean
+        Public Shared Function TestFunc2() As Boolean
             Return False
         End Function
-    End Module
+    End Class
 End Namespace
 "
 
@@ -537,12 +567,12 @@ Namespace TestNs
     End Class
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers
+    Class Class1Helpers
 
-        Public Function TestFunc2() As Boolean
+        Public Shared Function TestFunc2() As Boolean
             Return False
         End Function
-    End Module
+    End Class
 End Namespace
 "
 
@@ -592,25 +622,24 @@ End Namespace"
             Dim expectedText2 = "Imports System
 
 Namespace TestNs
-    Module Class1Helpers
-        Public TestField As Integer = 0
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
 
-
-        Public ReadOnly Property TestProperty As Integer
+        Public Shared ReadOnly Property TestProperty As Integer
             Get
                 Return 0
             End Get
         End Property
 
-        Public Event TestEvent As EventHandler
+        Public Shared Event TestEvent As EventHandler
 
-        Public Sub TestSub()
+        Public Shared Sub TestSub()
         End Sub
 
-        Public Function TestFunc() As Integer
+        Public Shared Function TestFunc() As Integer
             Return 0
         End Function
-    End Module
+    End Class
 End Namespace
 "
 
@@ -618,67 +647,41 @@ End Namespace
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
-        Public Async Function TestMoveExtensionFunction() As Task
+        Public Async Function TestMoveFunctionAndRefactorUsage() As Task
             Dim initialMarkup = "
-Imports System.Runtime.CompilerServices
-
 Namespace TestNs
-    Public Module Class1
-        <Extension>
-        Public Function Test[||]Func(other As Other) As Integer
-            Return other.OtherInt + 2
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
         End Function
-    End Module
+    End Class
 
     Public Class Class2
-        Public Function GetOtherInt() As Integer
-            Dim other = New Other()
-            Return other.TestFunc()
+        Public Shared Function TestFunc2() As Integer
+            Return Class1.TestFunc() + 1
         End Function
     End Class
-
-    Public Class Other
-        Public OtherInt As Integer
-
-        Public Sub New()
-            OtherInt = 5
-        End Sub
-    End Class
 End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
             Dim expectedText1 = "
-Imports System.Runtime.CompilerServices
-
 Namespace TestNs
-    Public Module Class1
-    End Module
+    Public Class Class1
+    End Class
 
     Public Class Class2
-        Public Function GetOtherInt() As Integer
-            Dim other = New Other()
-            Return other.TestFunc()
+        Public Shared Function TestFunc2() As Integer
+            Return Class1Helpers.TestFunc() + 1
         End Function
     End Class
-
-    Public Class Other
-        Public OtherInt As Integer
-
-        Public Sub New()
-            OtherInt = 5
-        End Sub
-    End Class
 End Namespace"
-            Dim expectedText2 = "Imports System.Runtime.CompilerServices
-
-Namespace TestNs
-    Module Class1Helpers
-        <Extension>
-        Public Function TestFunc(other As Other) As Integer
-            Return other.OtherInt + 2
+            Dim expectedText2 = "Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
         End Function
-    End Module
+    End Class
 End Namespace
 "
 
@@ -686,29 +689,43 @@ End Namespace
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
-        Public Async Function TestMoveFunctionInModule() As Task
+        Public Async Function TestMoveFunctionAndRefactorUsageWithTrivia() As Task
             Dim initialMarkup = "
 Namespace TestNs
-    Public Module Class1
-        Public Function Test[||]Func() As Integer
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
             Return 0
         End Function
-    End Module
+    End Class
+
+    Public Class Class2
+        Public Shared Function TestFunc2() As Integer
+            ' Keep this comment and these random spaces
+            Return Class1. TestFunc( ) +  1
+        End Function
+    End Class
 End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
             Dim expectedText1 = "
 Namespace TestNs
-    Public Module Class1
-    End Module
+    Public Class Class1
+    End Class
+
+    Public Class Class2
+        Public Shared Function TestFunc2() As Integer
+            ' Keep this comment and these random spaces
+            Return Class1Helpers. TestFunc( ) +  1
+        End Function
+    End Class
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers
-        Public Function TestFunc() As Integer
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
             Return 0
         End Function
-    End Module
+    End Class
 End Namespace
 "
 
@@ -716,50 +733,52 @@ End Namespace
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
-        Public Async Function TestMoveFunctionRetainFileBanner() As Task
-            Dim initialMarkup = "' Here is an example of a license or something
-' That we want to keep/copy over
-
+        Public Async Function TestMoveFunctionAndRefactorSourceUsage() As Task
+            Dim initialMarkup = "
 Namespace TestNs
     Public Class Class1
         Public Shared Function Test[||]Func() As Integer
             Return 0
         End Function
+
+        Public Shared Function TestFunc2() As Integer
+            Return TestFunc() + 1
+        End Function
     End Class
 End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestFunc")
-            Dim expectedText1 = "' Here is an example of a license or something
-' That we want to keep/copy over
-
+            Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
+        Public Shared Function TestFunc2() As Integer
+            Return Class1Helpers.TestFunc() + 1
+        End Function
     End Class
 End Namespace"
-            Dim expectedText2 = "' Here is an example of a license or something
-' That we want to keep/copy over
-
-Namespace TestNs
-    Module Class1Helpers
-        Public Function TestFunc() As Integer
+            Dim expectedText2 = "Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
             Return 0
         End Function
-    End Module
+    End Class
 End Namespace
 "
 
             Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
-#End Region
-#Region "SelectionTests"
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
-        Public Async Function TestSelectBeforeDeclarationKeyword() As Task
+        Public Async Function TestMoveFieldAndRefactorSourceUsage() As Task
             Dim initialMarkup = "
 Namespace TestNs
     Public Class Class1
-        [||]Public Shared TestField As Integer = 0
+        Public Shared Test[||]Field As Integer = 0
+
+        Public Shared Function TestFunc2() As Integer
+            Return TestField + 1
+        End Function
     End Class
 End Namespace"
             Dim newTypeName = "Class1Helpers"
@@ -768,13 +787,15 @@ End Namespace"
             Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
+        Public Shared Function TestFunc2() As Integer
+            Return Class1Helpers.TestField + 1
+        End Function
     End Class
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers
-        Public TestField As Integer = 0
-
-    End Module
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
 End Namespace
 "
 
@@ -782,26 +803,52 @@ End Namespace
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
-        Public Async Function TestSelectWholeFieldDeclaration() As Task
+        Public Async Function TestMovePropertyAndRefactorSourceUsage() As Task
             Dim initialMarkup = "
 Namespace TestNs
     Public Class Class1
-        [|Public Shared TestField As Integer = 0|]
+        Private Shared _testProperty As Integer
+
+        Public Shared Property Test[||]Property As Integer
+            Get
+                Return _testProperty
+            End Get
+            Set
+                _testProperty = value
+            End Set
+        End Property
+
+        Public Shared Function TestFunc2() As Integer
+            Return TestProperty + 1
+        End Function
     End Class
 End Namespace"
-            Dim newTypeName = "Class1Helpers"
+            Dim newTypeName = "ExtraNs.Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
-            Dim selection = ImmutableArray.Create("TestField")
+            Dim selection = ImmutableArray.Create("_testProperty", "TestProperty")
             Dim expectedText1 = "
+Imports TestNs.ExtraNs
+
 Namespace TestNs
     Public Class Class1
+        Public Shared Function TestFunc2() As Integer
+            Return Class1Helpers.TestProperty + 1
+        End Function
     End Class
 End Namespace"
-            Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers
-        Public TestField As Integer = 0
+            Dim expectedText2 = "Namespace TestNs.ExtraNs
+    Class Class1Helpers
+        Private Shared _testProperty As Integer
 
-    End Module
+        Public Shared Property TestProperty As Integer
+            Get
+                Return _testProperty
+            End Get
+            Set
+                _testProperty = value
+            End Set
+        End Property
+    End Class
 End Namespace
 "
 
@@ -809,26 +856,41 @@ End Namespace
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
-        Public Async Function TestSelectInDeclarationKeyword1() As Task
+        Public Async Function TestMoveGenericFunctionAndRefactorImpliedUsage() As Task
             Dim initialMarkup = "
 Namespace TestNs
     Public Class Class1
-        Pub[||]lic Shared TestField As Integer = 0
+        Public Shared Function Test[||]Func(Of T)(item As T) As T
+            Return item
+        End Function
+    End Class
+
+    Public Class Class2
+        Public Shared Function TestFunc2 As Integer
+            Return Class1.TestFunc(5)
+        End Function
     End Class
 End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
-            Dim selection = ImmutableArray.Create("TestField")
+            Dim selection = ImmutableArray.Create("TestFunc")
             Dim expectedText1 = "
 Namespace TestNs
     Public Class Class1
     End Class
+
+    Public Class Class2
+        Public Shared Function TestFunc2 As Integer
+            Return Class1Helpers.TestFunc(5)
+        End Function
+    End Class
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers
-        Public TestField As Integer = 0
-
-    End Module
+    Class Class1Helpers
+        Public Shared Function TestFunc(Of T)(item As T) As T
+            Return item
+        End Function
+    End Class
 End Namespace
 "
 
@@ -836,13 +898,857 @@ End Namespace
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
-        Public Async Function TestSelectInDeclarationKeyword2() As Task
-            Dim initialMarkup = "
+        Public Async Function TestMoveGenericFunctionAndRefactorUsage() As Task
+            Dim initialMarkup = "Imports System
+
 Namespace TestNs
     Public Class Class1
-        Public Shar[||]ed TestField As Integer = 0
+        Public Shared Function Test[||]Func(Of T)() As Type
+            Return GetType(T)
+        End Function
     End Class
-End Namespace"
+
+    Public Class Class2
+        Public Shared Function TestFunc2 As Type
+            Return Class1.TestFunc(Of Integer)()
+        End Function
+    End Class
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "Imports System
+
+Namespace TestNs
+    Public Class Class1
+    End Class
+
+    Public Class Class2
+        Public Shared Function TestFunc2 As Type
+            Return Class1Helpers.TestFunc(Of Integer)()
+        End Function
+    End Class
+End Namespace"
+            Dim expectedText2 = "Imports System
+
+Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc(Of T)() As Type
+            Return GetType(T)
+        End Function
+    End Class
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionFromGenericClassAndRefactorUsage() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1(Of T As New)
+        Public Shared Function Test[||]Func() As T
+            Return New T()
+        End Function
+    End Class
+
+    Public Class Class2
+        Public Shared Function TestFunc2 As Integer
+            Return Class1(Of Integer).TestFunc()
+        End Function
+    End Class
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1(Of T As New)
+    End Class
+
+    Public Class Class2
+        Public Shared Function TestFunc2 As Integer
+            Return Class1Helpers(Of Integer).TestFunc()
+        End Function
+    End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Class Class1Helpers(Of T As New)
+        Public Shared Function TestFunc() As T
+            Return New T()
+        End Function
+    End Class
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionFromGenericClassAndRefactorPartialTypeArgUsage() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1(Of T1 As New, T2, T3)
+        Public Shared Function Test[||]Func() As T1
+            Return New T1()
+        End Function
+
+        Public Shared Function Foo(item As T2) As T2
+            Return item
+        End Function
+
+        Public Shared Function Bar(item As T3) As T3
+            Return item
+        End Function
+    End Class
+
+    Public Class Class2
+        Public Shared Function TestFunc2 As Integer
+            Return Class1(Of Integer, String, Double).TestFunc()
+        End Function
+    End Class
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1(Of T1 As New, T2, T3)
+        Public Shared Function Foo(item As T2) As T2
+            Return item
+        End Function
+
+        Public Shared Function Bar(item As T3) As T3
+            Return item
+        End Function
+    End Class
+
+    Public Class Class2
+        Public Shared Function TestFunc2 As Integer
+            Return Class1Helpers(Of Integer).TestFunc()
+        End Function
+    End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Class Class1Helpers(Of T1 As New)
+        Public Shared Function TestFunc() As T1
+            Return New T1()
+        End Function
+    End Class
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionAndRefactorUsageDifferentNamespace() As Task
+            Dim initialMarkup = "
+Imports TestNs
+
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+
+Namespace TestNs2
+    Public Class Class2
+        Public Shared Function TestFunc2() As Integer
+            Return Class1.TestFunc() + 1
+        End Function
+    End Class
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Imports TestNs
+
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace
+
+Namespace TestNs2
+    Public Class Class2
+        Public Shared Function TestFunc2() As Integer
+            Return Class1Helpers.TestFunc() + 1
+        End Function
+    End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionAndRefactorUsageNewNamespace() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+
+    Public Class Class2
+        Public Shared Function TestFunc2() As Integer
+            Return Class1.TestFunc() + 1
+        End Function
+    End Class
+End Namespace"
+            Dim newTypeName = "ExtraNs.Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Imports TestNs.ExtraNs
+
+Namespace TestNs
+    Public Class Class1
+    End Class
+
+    Public Class Class2
+        Public Shared Function TestFunc2() As Integer
+            Return Class1Helpers.TestFunc() + 1
+        End Function
+    End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs.ExtraNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionAndRefactorUsageSeparateFile() As Task
+            Dim initialMarkup1 = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim initialMarkup2 = "
+Imports TestNs
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return Class1.TestFunc() + 1
+    End Function
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim expectedText3 = "
+Imports TestNs
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return Class1Helpers.TestFunc() + 1
+    End Function
+End Class"
+            Dim expectedText2 = "Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+"
+
+            Dim test = New Test(newTypeName, selection, newFileName)
+            test.TestState.Sources.Add(initialMarkup1)
+            test.TestState.Sources.Add(initialMarkup2)
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add(expectedText3)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionAndRefactorClassAlias() As Task
+            Dim initialMarkup1 = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim initialMarkup2 = "
+Imports C1 = TestNs.Class1
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return C1.TestFunc() + 1
+    End Function
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim expectedText3 = "
+Imports TestNs
+Imports C1 = TestNs.Class1
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return Class1Helpers.TestFunc() + 1
+    End Function
+End Class"
+            Dim expectedText2 = "Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+"
+
+            Dim test = New Test(newTypeName, selection, newFileName)
+            test.TestState.Sources.Add(initialMarkup1)
+            test.TestState.Sources.Add(initialMarkup2)
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add(expectedText3)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionAndRefactorConflictingName() As Task
+            Dim initialMarkup1 = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim initialMarkup2 = "
+Imports TestNs
+
+Public Class Class2
+    Public Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 1
+        End Function
+    End Class
+
+    Public Shared Function TestFunc2() As Integer
+        Return Class1.TestFunc() + Class1Helpers.TestFunc()
+    End Function
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim expectedText3 = "
+Imports TestNs
+
+Public Class Class2
+    Public Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 1
+        End Function
+    End Class
+
+    Public Shared Function TestFunc2() As Integer
+        Return TestNs.Class1Helpers.TestFunc() + Class1Helpers.TestFunc()
+    End Function
+End Class"
+            Dim expectedText2 = "Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+"
+
+            Dim test = New Test(newTypeName, selection, newFileName)
+            test.TestState.Sources.Add(initialMarkup1)
+            test.TestState.Sources.Add(initialMarkup2)
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add(expectedText3)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+            ' In this case, the parse gives a MemberAccessExpression for 
+            ' "TestNs.Class1Helpers.TestFunc", but we give a QualifiedName
+            ' We can just ensure that the text output is the same here
+            test.CodeActionValidationMode = Testing.CodeActionValidationMode.None
+
+            Await test.RunAsync().ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionAndRefactorQualifiedName() As Task
+            Dim initialMarkup1 = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim initialMarkup2 = "
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return TestNs.Class1.TestFunc() + 1
+    End Function
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim expectedText3 = "
+Imports TestNs
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return Class1Helpers.TestFunc() + 1
+    End Function
+End Class"
+            Dim expectedText2 = "Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+"
+
+            Dim test = New Test(newTypeName, selection, newFileName)
+            test.TestState.Sources.Add(initialMarkup1)
+            test.TestState.Sources.Add(initialMarkup2)
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add(expectedText3)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionAndRefactorClassImports() As Task
+            Dim initialMarkup1 = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim initialMarkup2 = "
+Imports TestNs.Class1
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return TestFunc() + 1
+    End Function
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim expectedText3 = "
+Imports TestNs
+Imports TestNs.Class1
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return Class1Helpers.TestFunc() + 1
+    End Function
+End Class"
+            Dim expectedText2 = "Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+"
+
+            Dim test = New Test(newTypeName, selection, newFileName)
+            test.TestState.Sources.Add(initialMarkup1)
+            test.TestState.Sources.Add(initialMarkup2)
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add(expectedText3)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionAndRefactorNamespaceAlias() As Task
+            Dim initialMarkup1 = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim initialMarkup2 = "
+Imports C1 = TestNs
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return C1.Class1.TestFunc() + 1
+    End Function
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim expectedText3 = "
+Imports TestNs
+Imports C1 = TestNs
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return Class1Helpers.TestFunc() + 1
+    End Function
+End Class"
+            Dim expectedText2 = "Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+"
+
+            Dim test = New Test(newTypeName, selection, newFileName)
+            test.TestState.Sources.Add(initialMarkup1)
+            test.TestState.Sources.Add(initialMarkup2)
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add(expectedText3)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionAndRefactorNamespaceAliasNewNamespace() As Task
+            Dim initialMarkup1 = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim initialMarkup2 = "
+Imports C1 = TestNs
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return C1.Class1.TestFunc() + 1
+    End Function
+End Class"
+            Dim newTypeName = "ExtraNs.Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim expectedText3 = "
+Imports TestNs.ExtraNs
+Imports C1 = TestNs
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return Class1Helpers.TestFunc() + 1
+    End Function
+End Class"
+            Dim expectedText2 = "Namespace TestNs.ExtraNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+"
+
+            Dim test = New Test(newTypeName, selection, newFileName)
+            test.TestState.Sources.Add(initialMarkup1)
+            test.TestState.Sources.Add(initialMarkup2)
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add(expectedText3)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+
+            Await test.RunAsync().ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveExtensionFunction() As Task
+            Dim initialMarkup = "
+Imports System.Runtime.CompilerServices
+
+Namespace TestNs
+    Public Module Class1
+        <Extension>
+        Public Function Test[||]Func(other As Other) As Integer
+            Return other.OtherInt + 2
+        End Function
+    End Module
+
+    Public Class Class2
+        Public Function GetOtherInt() As Integer
+            Dim other = New Other()
+            Return other.TestFunc()
+        End Function
+    End Class
+
+    Public Class Other
+        Public OtherInt As Integer
+
+        Public Sub New()
+            OtherInt = 5
+        End Sub
+    End Class
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Imports System.Runtime.CompilerServices
+
+Namespace TestNs
+    Public Module Class1
+    End Module
+
+    Public Class Class2
+        Public Function GetOtherInt() As Integer
+            Dim other = New Other()
+            Return other.TestFunc()
+        End Function
+    End Class
+
+    Public Class Other
+        Public OtherInt As Integer
+
+        Public Sub New()
+            OtherInt = 5
+        End Sub
+    End Class
+End Namespace"
+            Dim expectedText2 = "Imports System.Runtime.CompilerServices
+
+Namespace TestNs
+    Module Class1Helpers
+        <Extension>
+        Public Function TestFunc(other As Other) As Integer
+            Return other.OtherInt + 2
+        End Function
+    End Module
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveExtensionFunctionAddImports() As Task
+            Dim initialMarkup = "
+Imports System.Runtime.CompilerServices
+Imports TestNs1
+Imports TestNs2
+
+Namespace TestNs1
+    Public Module Class1
+        <Extension>
+        Public Function Test[||]Func(other As Other) As Integer
+            Return other.OtherInt + 2
+        End Function
+    End Module
+End Namespace
+
+Namespace TestNs2
+    Public Class Class2
+        Public Function GetOtherInt() As Integer
+            Dim other = New Other()
+            Return other.TestFunc()
+        End Function
+    End Class
+
+    Public Class Other
+        Public OtherInt As Integer
+
+        Public Sub New()
+            OtherInt = 5
+        End Sub
+    End Class
+End Namespace"
+            Dim newTypeName = "ExtraNs.Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Imports System.Runtime.CompilerServices
+Imports TestNs1
+Imports TestNs1.ExtraNs
+Imports TestNs2
+
+Namespace TestNs1
+    Public Module Class1
+    End Module
+End Namespace
+
+Namespace TestNs2
+    Public Class Class2
+        Public Function GetOtherInt() As Integer
+            Dim other = New Other()
+            Return other.TestFunc()
+        End Function
+    End Class
+
+    Public Class Other
+        Public OtherInt As Integer
+
+        Public Sub New()
+            OtherInt = 5
+        End Sub
+    End Class
+End Namespace"
+            Dim expectedText2 = "Imports System.Runtime.CompilerServices
+Imports TestNs2
+
+Namespace TestNs1.ExtraNs
+    Module Class1Helpers
+        <Extension>
+        Public Function TestFunc(other As Other) As Integer
+            Return other.OtherInt + 2
+        End Function
+    End Module
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionInModule() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Module Class1
+        Public Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Module
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Module Class1
+    End Module
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Module Class1Helpers
+        Public Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Module
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionRetainFileBanner() As Task
+            Dim initialMarkup = "' Here is an example of a license or something
+' That we want to keep/copy over
+
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "' Here is an example of a license or something
+' That we want to keep/copy over
+
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim expectedText2 = "' Here is an example of a license or something
+' That we want to keep/copy over
+
+Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+#End Region
+#Region "SelectionTests"
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectBeforeDeclarationKeyword() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1
+        [||]Public Shared TestField As Integer = 0
+    End Class
+End Namespace"
             Dim newTypeName = "Class1Helpers"
             Dim newFileName = "Class1Helpers.vb"
             Dim selection = ImmutableArray.Create("TestField")
@@ -852,10 +1758,87 @@ Namespace TestNs
     End Class
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers
-        Public TestField As Integer = 0
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+"
 
-    End Module
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectWholeFieldDeclaration() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1
+        [|Public Shared TestField As Integer = 0|]
+    End Class
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInDeclarationKeyword1() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1
+        Pub[||]lic Shared TestField As Integer = 0
+    End Class
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestSelectInDeclarationKeyword2() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1
+        Public Shar[||]ed TestField As Integer = 0
+    End Class
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Class Class1Helpers
+        Public Shared TestField As Integer = 0
+    End Class
 End Namespace
 "
 
@@ -881,11 +1864,11 @@ Namespace TestNs
     End Class
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers
-        Public Function TestFunc() As Integer
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
             Return 0
         End Function
-    End Module
+    End Class
 End Namespace
 "
 
@@ -911,11 +1894,11 @@ Namespace TestNs
     End Class
 End Namespace"
             Dim expectedText2 = "Namespace TestNs
-    Module Class1Helpers
-        Public Function TestFunc() As Integer
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
             Return 0
         End Function
-    End Module
+    End Class
 End Namespace
 "
 
@@ -1045,6 +2028,7 @@ End Namespace"
 
             Await TestNoRefactoringAsync(initialMarkup)
         End Function
+
 #End Region
 
         Private Class Test
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 6cddb90a4b068..790294b6dd783 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -2,6 +2,7 @@
 // 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;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -11,9 +12,11 @@
 using Microsoft.CodeAnalysis.CodeGeneration;
 using Microsoft.CodeAnalysis.CodeRefactorings.PullMemberUp;
 using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.FindSymbols;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Shared.Utilities;
+using Microsoft.CodeAnalysis.Simplification;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 
@@ -70,12 +73,17 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
             var sourceDoc = _document.WithSyntaxRoot(root);
 
             var typeParameters = ExtractTypeHelpers.GetRequiredTypeParametersForMembers(_selectedType, moveOptions.SelectedMembers);
+            // which indices of the old type params should we keep for a new class reference, used for refactoring usages
+            var typeArgIndices = Enumerable.Range(0, _selectedType.TypeParameters.Length)
+                .Where(i => typeParameters.Contains(_selectedType.TypeParameters[i]))
+                .ToImmutableArrayOrEmpty();
+
             // even though we can move members here, we will move them by calling PullMembersUp
             var newType = CodeGenerationSymbolFactory.CreateNamedTypeSymbol(
                 ImmutableArray.Create<AttributeData>(),
                 Accessibility.NotApplicable,
                 DeclarationModifiers.Static,
-                GetNewTypeKind(typeParameters),
+                GetNewTypeKind(_selectedType),
                 moveOptions.TypeName,
                 typeParameters: typeParameters);
 
@@ -94,8 +102,12 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
             var destSemanticModel = await newDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
             newType = destSemanticModel.GetRequiredDeclaredSymbol(destRoot.GetAnnotatedNodes(annotation).Single(), cancellationToken) as INamedTypeSymbol;
 
-            // Possibly convert members to non-static or static if we move to/from a module
-            sourceDoc = await CorrectStaticMembersAsync(newDoc.Project.Solution.GetRequiredDocument(sourceDoc.Id), memberNodes, newType!, cancellationToken).ConfigureAwait(false);
+            // refactor references across the entire solution
+            var memberReferenceLocations = await FindMemberReferencesAsync(moveOptions.SelectedMembers, newDoc.Project.Solution, cancellationToken).ConfigureAwait(false);
+            var projectToLocations = memberReferenceLocations.ToLookup(loc => loc.location.Document.Project.Id);
+            var solutionWithFixedReferences = await RefactorReferencesAsync(projectToLocations, newDoc.Project.Solution, newType!, typeArgIndices, cancellationToken).ConfigureAwait(false);
+
+            sourceDoc = solutionWithFixedReferences.GetRequiredDocument(sourceDoc.Id);
 
             // get back nodes from our changes
             root = await sourceDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
@@ -112,39 +124,156 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
         }
 
         /// <summary>
-        /// What type kind we should make our new type be. Passing Module when our language is C# will still create a class.
-        /// Modules cannot be generic however, so for VB we choose class if there are generic type params.
-        /// This could be later extended to a language-service feature if there is more complex behavior.
+        /// Finds what type kind new type should be. Currently, we just select whatever type the source is.
+        /// This means always a class for C#, and a module for VB iff we moved from a module
+        /// This functionality can later be expanded or moved to language-specific implementations
         /// </summary>
-        private static TypeKind GetNewTypeKind(ImmutableArray<ITypeParameterSymbol> typeParameters)
+        private static TypeKind GetNewTypeKind(INamedTypeSymbol oldType)
         {
-            return typeParameters.IsEmpty ? TypeKind.Module : TypeKind.Class;
+            return oldType.TypeKind;
         }
 
-        private async Task<Document> CorrectStaticMembersAsync(
-            Document sourceDoc,
-            ImmutableArray<SyntaxNode> memberNodes,
+        private static async Task<Solution> RefactorReferencesAsync(
+            ILookup<ProjectId, (ReferenceLocation location, bool isExtensionMethod)> projectToLocations,
+            Solution solution,
             INamedTypeSymbol newType,
+            ImmutableArray<int> typeArgIndices,
             CancellationToken cancellationToken)
         {
-            // We have two cases:
-            // 1. Moving from a class to a module. We need to remove the shared modifier as it is implied
-            // 2. Moving from a module to a class. We need to add the shared modifier as it is no longer implied
-            // If neither of these apply (the movement types are both classes or both modules), we return early
-            if (newType.TypeKind == _selectedType.TypeKind)
+            // keep our new solution separate, since each change can be performed separately
+            var updatedSolution = solution;
+            foreach (var (projectId, referencesForProject) in projectToLocations)
             {
-                return sourceDoc;
+                // organize by project first, so we can solve one project at a time
+                var project = solution.GetRequiredProject(projectId);
+                var compilation = await project.GetCompilationAsync(cancellationToken).ConfigureAwait(false);
+                var documentToLocations = referencesForProject.ToLookup(reference => reference.location.Document.Id);
+                foreach (var (docId, referencesForDoc) in documentToLocations)
+                {
+                    var doc = project.GetRequiredDocument(docId);
+                    var updatedRoot = await FixReferencesSingleDocumentAsync(
+                        referencesForDoc.ToImmutableArray(),
+                        doc,
+                        newType,
+                        typeArgIndices,
+                        cancellationToken).ConfigureAwait(false);
+
+                    updatedSolution = updatedSolution.WithDocumentSyntaxRoot(docId, updatedRoot);
+                }
+
+                // We keep the compilation until we are done with the project
+                GC.KeepAlive(compilation);
             }
 
-            var docEditor = await DocumentEditor.CreateAsync(sourceDoc, cancellationToken).ConfigureAwait(false);
-            memberNodes = docEditor.OriginalRoot.GetCurrentNodes(memberNodes).ToImmutableArray();
-            // need to make members non-static if we're moving to a module, static if we're moving away from one
-            foreach (var node in memberNodes)
+            return updatedSolution;
+        }
+
+        private static async Task<SyntaxNode> FixReferencesSingleDocumentAsync(
+            ImmutableArray<(ReferenceLocation location, bool isExtensionMethod)> referenceLocations,
+            Document doc,
+            INamedTypeSymbol newType,
+            ImmutableArray<int> typeArgIndices,
+            CancellationToken cancellationToken)
+        {
+            var syntaxFacts = doc.GetRequiredLanguageService<ISyntaxFactsService>();
+
+            // keep extension method flag attached to node through dict
+            var trackNodesDict = referenceLocations
+                .ToImmutableDictionary(refLoc => refLoc.location.Location.FindNode(
+                    getInnermostNodeForTie: true,
+                    cancellationToken));
+
+            var docEditor = await DocumentEditor.CreateAsync(doc, cancellationToken).ConfigureAwait(false);
+            var generator = docEditor.Generator;
+
+            foreach (var refNode in trackNodesDict.Keys)
             {
-                docEditor.ReplaceNode(node, (n, generator) => generator.WithModifiers(n, generator.GetModifiers(n).WithIsStatic(newType.TypeKind != TypeKind.Module)));
+                var (_, isExtensionMethod) = trackNodesDict[refNode];
+
+                // now change the actual references to use the new type name, add a symbol annotation
+                // for every reference we move so that if an import is necessary/possible,
+                // we add it, and simplifiers so we don't over-qualify after import
+                if (isExtensionMethod)
+                {
+                    // extension methods should be changed into their static class versions with
+                    // full qualifications, then the qualification changed to the new type
+                    if (syntaxFacts.IsNameOfAnyMemberAccessExpression(refNode) &&
+                        syntaxFacts.IsAnyMemberAccessExpression(refNode?.Parent) &&
+                        syntaxFacts.IsInvocationExpression(refNode.Parent?.Parent))
+                    {
+                        // get the entire expression, guaranteed not null based on earlier checks
+                        var extensionMethodInvocation = refNode.GetRequiredParent().GetRequiredParent();
+                        // expand using our (possibly outdated) document/syntaxes
+                        var expandedExtensionInvocation = await Simplifier.ExpandAsync(
+                            extensionMethodInvocation,
+                            doc,
+                            cancellationToken: cancellationToken).ConfigureAwait(false);
+
+                        // should be an invocation of a simple member access expression with the expression as a type name
+                        var memberAccessExpression = syntaxFacts.GetExpressionOfInvocationExpression(expandedExtensionInvocation);
+                        var typeExpression = syntaxFacts.GetExpressionOfMemberAccessExpression(memberAccessExpression)!;
+                        expandedExtensionInvocation = expandedExtensionInvocation.ReplaceNode(typeExpression, generator.TypeExpression(newType)
+                            .WithTriviaFrom(refNode)
+                            .WithAdditionalAnnotations(Simplifier.Annotation, Simplifier.AddImportsAnnotation, SymbolAnnotation.Create(newType)));
+
+                        docEditor.ReplaceNode(extensionMethodInvocation, expandedExtensionInvocation);
+                    }
+                }
+                else if (syntaxFacts.IsNameOfSimpleMemberAccessExpression(refNode))
+                {
+                    // static member access should never be pointer or conditional member access,
+                    // so syntax in this block should be of the form 'Class.Member' or 'Class<TArg>.Member'
+                    var expression = syntaxFacts.GetExpressionOfMemberAccessExpression(refNode.Parent);
+                    if (expression != null)
+                    {
+                        SyntaxNode replacement;
+                        if (syntaxFacts.IsGenericName(expression))
+                        {
+                            // if the access uses a generic name, then we copy only the type args we need
+                            var typeArgs = syntaxFacts.GetTypeArgumentsOfGenericName(expression);
+                            var newTypeArgs = typeArgIndices.SelectAsArray(i => typeArgs[i]);
+                            replacement = generator.GenericName(newType.Name, newTypeArgs);
+                        }
+                        else
+                        {
+                            replacement = generator.TypeExpression(newType);
+                        }
+
+                        docEditor.ReplaceNode(expression, replacement
+                            .WithTriviaFrom(refNode)
+                            .WithAdditionalAnnotations(Simplifier.Annotation, Simplifier.AddImportsAnnotation, SymbolAnnotation.Create(newType)));
+                    }
+                }
+                else if (syntaxFacts.IsIdentifierName(refNode))
+                {
+                    // We now are in an identifier name that isn't a member access expression
+                    // This could either be because of a static using, module usage in VB, or because we are in the original source type
+                    // either way, we want to change it to a member access expression for the type that is imported
+                    docEditor.ReplaceNode(
+                        refNode,
+                        generator.MemberAccessExpression(
+                            generator.TypeExpression(newType)
+                                .WithAdditionalAnnotations(Simplifier.AddImportsAnnotation, SymbolAnnotation.Create(newType)),
+                            refNode));
+                }
             }
 
-            return docEditor.GetChangedDocument();
+            return docEditor.GetChangedRoot();
+        }
+
+        private static async Task<ImmutableArray<(ReferenceLocation location, bool isExtension)>> FindMemberReferencesAsync(
+            ImmutableArray<ISymbol> members,
+            Solution solution,
+            CancellationToken cancellationToken)
+        {
+            var tasks = members.Select(symbol => SymbolFinder.FindReferencesAsync(symbol, solution, cancellationToken));
+            var symbolRefs = await Task.WhenAll(tasks).ConfigureAwait(false);
+            return symbolRefs
+                .Flatten()
+                .SelectMany(refSymbol => refSymbol.Locations
+                    .Where(loc => !loc.IsCandidateLocation && !loc.IsImplicit)
+                    .Select(loc => (loc, refSymbol.Definition.IsExtensionMethod())))
+                .ToImmutableArrayOrEmpty();
         }
     }
 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Services/SyntaxFacts/CSharpSyntaxFacts.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Services/SyntaxFacts/CSharpSyntaxFacts.cs
index 58ed2edc80272..9385a2ef25612 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Services/SyntaxFacts/CSharpSyntaxFacts.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Services/SyntaxFacts/CSharpSyntaxFacts.cs
@@ -573,6 +573,9 @@ public bool LooksGeneric(SyntaxNode simpleName)
             => simpleName.IsKind(SyntaxKind.GenericName) ||
                simpleName.GetLastToken().GetNextToken().Kind() == SyntaxKind.LessThanToken;
 
+        public SeparatedSyntaxList<SyntaxNode> GetTypeArgumentsOfGenericName(SyntaxNode? genericName)
+            => (genericName as GenericNameSyntax)?.TypeArgumentList.Arguments ?? default;
+
         public SyntaxNode? GetTargetOfMemberBinding(SyntaxNode? node)
             => (node as MemberBindingExpressionSyntax).GetParentConditionalAccessExpression()?.Expression;
 
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Services/SyntaxFacts/ISyntaxFacts.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Services/SyntaxFacts/ISyntaxFacts.cs
index 9de977ac61dfe..2275cae4e3c7c 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Services/SyntaxFacts/ISyntaxFacts.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Services/SyntaxFacts/ISyntaxFacts.cs
@@ -274,6 +274,8 @@ void GetPartsOfInterpolationExpression(SyntaxNode node,
         void GetNameAndArityOfSimpleName(SyntaxNode? node, out string? name, out int arity);
         bool LooksGeneric(SyntaxNode simpleName);
 
+        SeparatedSyntaxList<SyntaxNode> GetTypeArgumentsOfGenericName(SyntaxNode? genericName);
+
         SyntaxList<SyntaxNode> GetContentsOfInterpolatedString(SyntaxNode interpolatedString);
 
         SeparatedSyntaxList<SyntaxNode> GetArgumentsOfInvocationExpression(SyntaxNode? node);
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Services/SyntaxFacts/VisualBasicSyntaxFacts.vb b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Services/SyntaxFacts/VisualBasicSyntaxFacts.vb
index e1c10b9167a8c..5fcb5b061aff6 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Services/SyntaxFacts/VisualBasicSyntaxFacts.vb
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Services/SyntaxFacts/VisualBasicSyntaxFacts.vb
@@ -552,6 +552,14 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.LanguageServices
             Return name.IsKind(SyntaxKind.GenericName)
         End Function
 
+        Public Function GetTypeArgumentsOfGenericName(genericName As SyntaxNode) As SeparatedSyntaxList(Of SyntaxNode) Implements ISyntaxFacts.GetTypeArgumentsOfGenericName
+            Dim castGenericName = TryCast(genericName, GenericNameSyntax)
+            If castGenericName IsNot Nothing Then
+                Return castGenericName.TypeArgumentList.Arguments
+            End If
+            Return Nothing
+        End Function
+
         Public Function GetExpressionOfMemberAccessExpression(node As SyntaxNode, Optional allowImplicitTarget As Boolean = False) As SyntaxNode Implements ISyntaxFacts.GetExpressionOfMemberAccessExpression
             Return TryCast(node, MemberAccessExpressionSyntax)?.GetExpressionOfMemberAccessExpression(allowImplicitTarget)
         End Function

From ec0193709ff43be1d5e8334d7377e441bf5f718e Mon Sep 17 00:00:00 2001
From: Soren Dahl <43689321+Soreloser2@users.noreply.github.com>
Date: Fri, 27 Aug 2021 10:01:02 -0700
Subject: [PATCH 40/64] Move Static Members: Show destination name (#55650)

* Now shows the fully qualified name when creating a new type.

Discovered an issue with duplicating a root namespace, not fixed here.

* Reformatted new type name message

* Write tests that utilize root namespace. One is failing as it depends on reference refactoring, and is not merged with the reference refactoring branch currently

* Changed way file names are generated so added namespaces aren't included, refactored options getting for tests

* Moved destination selection box a little bit to the right to align with message

* Changed tests to reflect module changes
---
 .../VisualBasicMoveStaticMembersTests.vb      |  99 +++++++++
 .../Shared/Utilities/ExtractTypeHelpers.cs    |  13 +-
 .../MoveStaticMembersDialog.xaml              |  72 ++++--
 .../MoveStaticMembersDialogViewModel.cs       |  11 +-
 ...alStudioMoveStaticMembersOptionsService.cs |  62 ++++--
 .../Core/Def/ServicesVSResources.resx         |   3 -
 .../Core/Def/xlf/ServicesVSResources.cs.xlf   |   5 -
 .../Core/Def/xlf/ServicesVSResources.de.xlf   |   5 -
 .../Core/Def/xlf/ServicesVSResources.es.xlf   |   5 -
 .../Core/Def/xlf/ServicesVSResources.fr.xlf   |   5 -
 .../Core/Def/xlf/ServicesVSResources.it.xlf   |   5 -
 .../Core/Def/xlf/ServicesVSResources.ja.xlf   |   5 -
 .../Core/Def/xlf/ServicesVSResources.ko.xlf   |   5 -
 .../Core/Def/xlf/ServicesVSResources.pl.xlf   |   5 -
 .../Def/xlf/ServicesVSResources.pt-BR.xlf     |   5 -
 .../Core/Def/xlf/ServicesVSResources.ru.xlf   |   5 -
 .../Core/Def/xlf/ServicesVSResources.tr.xlf   |   5 -
 .../Def/xlf/ServicesVSResources.zh-Hans.xlf   |   5 -
 .../Def/xlf/ServicesVSResources.zh-Hant.xlf   |   5 -
 .../MoveStaticMembersViewModelTest.vb         | 206 +++++++++++++++---
 20 files changed, 389 insertions(+), 142 deletions(-)

diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index ec5a438d88d93..e5de946cff64c 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -1738,6 +1738,105 @@ End Namespace
             Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionWithRootNamespace() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            ' if we cut out the root namespace, the returned namespace should still be the same
+            Dim expectedText2 = "Namespace TestNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With {.TestCode = initialMarkup}
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+            test.SolutionTransforms.Add(
+                Function(solution, projectId)
+                    Dim project = solution.GetProject(projectId)
+                    Dim compilationOptions = DirectCast(project.CompilationOptions, VisualBasicCompilationOptions)
+                    Return project.WithCompilationOptions(compilationOptions.WithRootNamespace("RootNs")).Solution
+                End Function)
+            Await test.RunAsync()
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionWithRootNamespaceRefactorReferences() As Task
+            Dim initialMarkup1 = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim initialMarkup2 = "
+Imports RootNs.TestNs
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return Class1.TestFunc()
+    End Function
+End Class"
+            Dim newTypeName = "ExtraNs.Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim expectedText3 = "
+Imports RootNs.TestNs
+Imports RootNs.TestNs.ExtraNs
+
+Public Class Class2
+    Public Shared Function TestFunc2() As Integer
+        Return Class1Helpers.TestFunc()
+    End Function
+End Class"
+            Dim expectedText2 = "Namespace TestNs.ExtraNs
+    Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace
+"
+
+            Dim test = New Test(newTypeName, selection, newFileName)
+            test.TestState.Sources.Add(initialMarkup1)
+            test.TestState.Sources.Add(initialMarkup2)
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add(expectedText3)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+            test.SolutionTransforms.Add(
+                Function(solution, projectId)
+                    Dim project = solution.GetProject(projectId)
+                    Dim compilationOptions = DirectCast(project.CompilationOptions, VisualBasicCompilationOptions)
+                    Return project.WithCompilationOptions(compilationOptions.WithRootNamespace("RootNs")).Solution
+                End Function)
+            Await test.RunAsync()
+        End Function
+
 #End Region
 #Region "SelectionTests"
 
diff --git a/src/Features/Core/Portable/Shared/Utilities/ExtractTypeHelpers.cs b/src/Features/Core/Portable/Shared/Utilities/ExtractTypeHelpers.cs
index 9f07fdef6d890..2e7d22710f381 100644
--- a/src/Features/Core/Portable/Shared/Utilities/ExtractTypeHelpers.cs
+++ b/src/Features/Core/Portable/Shared/Utilities/ExtractTypeHelpers.cs
@@ -13,6 +13,7 @@
 using Microsoft.CodeAnalysis.CodeGeneration;
 using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.GenerateType;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
@@ -65,7 +66,17 @@ internal static class ExtractTypeHelpers
                 generateMethodBodies: true,
                 options: await newDocument.GetOptionsAsync(cancellationToken).ConfigureAwait(false));
 
-            var namespaceParts = containingNamespaceDisplay.Split('.').Where(s => !string.IsNullOrEmpty(s));
+            // need to remove the root namespace from the containing namespace display because it is implied
+            // For C# this does nothing as there is no root namespace (root namespace is empty string)
+            var generateTypeService = newDocument.GetRequiredLanguageService<IGenerateTypeService>();
+            var rootNamespace = generateTypeService.GetRootNamespace(newDocument.Project.CompilationOptions);
+            var index = rootNamespace.IsEmpty() ? -1 : containingNamespaceDisplay.IndexOf(rootNamespace);
+            // if we did find the root namespace as the first element, then we remove it plus the "." character
+            var namespaceWithoutRoot = index == 0
+                ? containingNamespaceDisplay.Remove(index, rootNamespace.Length + 1)
+                : containingNamespaceDisplay;
+
+            var namespaceParts = namespaceWithoutRoot.Split('.').Where(s => !string.IsNullOrEmpty(s));
             var newTypeDocument = await CodeGenerator.AddNamespaceOrTypeDeclarationAsync(
                 newDocument.Project.Solution,
                 newSemanticModel.GetEnclosingNamespace(0, cancellationToken),
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
index a468fcf617ed3..5beb11ea8a638 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
@@ -35,7 +35,6 @@
     <Grid Margin="11,6,11,11">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
-            <RowDefinition Height="25"/>
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
@@ -51,32 +50,67 @@
                 Name="DestinationBox"
                 AutomationProperties.Name="DestinationName"
                 Text="{Binding DestinationName, UpdateSourceTrigger=PropertyChanged}"
-                Margin="0 0 20 0"/>
+                Margin="2 0 2 0"/>
 
-        </StackPanel>
 
-        <StackPanel 
-            Grid.Row="1"
-            Orientation="Horizontal"  
-            Visibility="{Binding ShowMessage, Converter={StaticResource BooleanToVisibilityConverter}}"
-            Margin="{StaticResource messageMargin}">
-            <imaging:CrispImage Name="MessageIcon"
-                                    Moniker="{Binding Icon}" 
-                                    Height="16"
-                                    Width="16"
-                                    VerticalAlignment="Top" />
+            <GroupBox>
+                <GroupBox.Style>
+                    <Style TargetType="GroupBox">
+                        <Setter Property="Foreground" Value="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
+                    </Style>
+                </GroupBox.Style>
+                <GroupBox.Header>
+                    <StackPanel 
+                    Orientation="Horizontal"  
+                    Visibility="{Binding ShowMessage, Converter={StaticResource BooleanToVisibilityConverter}}"
+                    Margin="{StaticResource messageMargin}">
+                        <imaging:CrispImage 
+                            Name="MessageIcon"
+                            Moniker="{Binding Icon}" 
+                            Height="16"
+                            Width="16"
+                            VerticalAlignment="Top" />
+
+                        <vs:LiveTextBlock 
+                            x:Name="MessageText"
+                            Text="{Binding Message}"
+                            Margin="7, 0, 0, 0"
+                            Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
+                    </StackPanel>
+                </GroupBox.Header>
 
-            <vs:LiveTextBlock x:Name="MessageText"
-                           Text="{Binding Message}"
-                           Margin="7, 0, 0, 0"
-                           Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
+                <Grid 
+                    Margin="{StaticResource messageMargin}"
+                    HorizontalAlignment="Left"
+                    Visibility="{Binding ShowMessage, Converter={StaticResource BooleanToVisibilityConverter}}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <vs:LiveTextBlock 
+                        Grid.Column="0"
+                        HorizontalAlignment="Right"
+                        x:Name="Namespace"
+                        Text="{Binding PrependedNamespace}"
+                        TextTrimming="CharacterEllipsis"
+                        Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
+
+                    <vs:LiveTextBlock 
+                        Grid.Column="1"
+                        x:Name="TypeName"
+                        Text="{Binding DestinationName}"
+                        Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
+                </Grid>
+            </GroupBox>
         </StackPanel>
 
+        
+
         <GroupBox 
             x:Uid="MemberSelectionGroupBox"
             x:Name="MemberSelectionGroupBox"
             Margin="0, 20, 0, 0"
-            Grid.Row="2"
+            Grid.Row="1"
             Header="{Binding ElementName=dialog, Path=SelectMembers}"
             BorderThickness="1">
             <GroupBox.Style>
@@ -87,7 +121,7 @@
 
             <ContentPresenter Content="{Binding ElementName=dialog, Path=MemberSelectionControl}" />
         </GroupBox>
-        <StackPanel Grid.Row="3"
+        <StackPanel Grid.Row="2"
                     HorizontalAlignment="Right" 
                     Margin="0, 11, 0, 0"
                     Orientation="Horizontal">
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
index 3f4b616a92e0a..97ef295e58597 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
@@ -24,12 +24,14 @@ public MoveStaticMembersDialogViewModel(
             StaticMemberSelectionViewModel memberSelectionViewModel,
             string defaultType,
             ImmutableArray<string> existingNames,
+            string prependedNamespace,
             ISyntaxFacts syntaxFacts)
         {
             MemberSelectionViewModel = memberSelectionViewModel;
             _syntaxFacts = syntaxFacts ?? throw new ArgumentNullException(nameof(syntaxFacts));
             _destinationName = defaultType;
             _existingNames = existingNames;
+            PrependedNamespace = string.IsNullOrEmpty(prependedNamespace) ? prependedNamespace : prependedNamespace + ".";
 
             PropertyChanged += MoveMembersToTypeDialogViewModel_PropertyChanged;
             OnDestinationUpdated();
@@ -48,13 +50,14 @@ private void MoveMembersToTypeDialogViewModel_PropertyChanged(object sender, Pro
         public void OnDestinationUpdated()
         {
             // TODO change once we allow movement to existing types
-            var isNewType = !_existingNames.Contains(DestinationName);
-            _isValidName = isNewType && IsValidType(DestinationName);
+            var fullyQualifiedTypeName = PrependedNamespace + DestinationName;
+            var isNewType = !_existingNames.Contains(fullyQualifiedTypeName);
+            _isValidName = isNewType && IsValidType(fullyQualifiedTypeName);
 
             if (_isValidName)
             {
                 Icon = KnownMonikers.StatusInformation;
-                Message = ServicesVSResources.A_new_type_will_be_created;
+                Message = ServicesVSResources.New_Type_Name_colon;
                 ShowMessage = true;
             }
             else
@@ -85,6 +88,8 @@ private bool IsValidType(string typeName)
             return true;
         }
 
+        public string PrependedNamespace { get; }
+
         private string _destinationName;
         public string DestinationName
         {
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index 6e5e2a9e8d5bf..4013ff86f1364 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -4,6 +4,8 @@
 
 using System;
 using System.Composition;
+using System.IO;
+using System.Linq;
 using System.Threading;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Host.Mef;
@@ -37,13 +39,47 @@ public VisualStudioMoveStaticMembersOptionsService(
         }
 
         public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol)
+        {
+            var viewModel = GetViewModel(document, selectedType, selectedNodeSymbol, _glyphService, _uiThreadOperationExecutor);
+
+            var dialog = new MoveStaticMembersDialog(viewModel);
+
+            var result = dialog.ShowModal();
+
+            return GenerateOptions(document.Project.Language, viewModel, result.GetValueOrDefault());
+        }
+
+        // internal for testing purposes
+        internal static MoveStaticMembersOptions GenerateOptions(string language, MoveStaticMembersDialogViewModel viewModel, bool dialogResult)
+        {
+            if (dialogResult)
+            {
+                // if the destination name contains extra namespaces, we want the last one as that is the real type name
+                var typeName = viewModel.DestinationName.Split('.').Last();
+                var newFileName = Path.ChangeExtension(typeName, language == LanguageNames.CSharp ? ".cs" : ".vb");
+                return new MoveStaticMembersOptions(
+                    newFileName,
+                    viewModel.PrependedNamespace + viewModel.DestinationName,
+                    viewModel.MemberSelectionViewModel.CheckedMembers.SelectAsArray(vm => vm.Symbol));
+            }
+
+            return MoveStaticMembersOptions.Cancelled;
+        }
+
+        // internal for testing purposes, get the view model
+        internal static MoveStaticMembersDialogViewModel GetViewModel(
+            Document document,
+            INamedTypeSymbol selectedType,
+            ISymbol? selectedNodeSymbol,
+            IGlyphService? glyphService,
+            IUIThreadOperationExecutor uiThreadOperationExecutor)
         {
             var membersInType = selectedType.GetMembers().
                WhereAsArray(member => MemberAndDestinationValidator.IsMemberValid(member) && member.IsStatic);
 
             var memberViewModels = membersInType
                 .SelectAsArray(member =>
-                    new SymbolViewModel<ISymbol>(member, _glyphService)
+                    new SymbolViewModel<ISymbol>(member, glyphService)
                     {
                         // The member user selected will be checked at the beginning.
                         IsChecked = SymbolEquivalenceComparer.Instance.Equals(selectedNodeSymbol, member),
@@ -52,7 +88,7 @@ public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, I
             using var cancellationTokenSource = new CancellationTokenSource();
             var memberToDependentsMap = SymbolDependentsBuilder.FindMemberToDependentsMap(membersInType, document.Project, cancellationTokenSource.Token);
 
-            var existingTypeNames = selectedType.ContainingNamespace.GetAllTypes(cancellationTokenSource.Token).SelectAsArray(t => t.Name);
+            var existingTypeNames = selectedType.ContainingNamespace.GetAllTypes(cancellationTokenSource.Token).SelectAsArray(t => t.ToDisplayString());
             var candidateName = selectedType.Name + "Helpers";
             var defaultTypeName = NameGenerator.GenerateUniqueName(candidateName, name => !existingTypeNames.Contains(name));
 
@@ -60,32 +96,16 @@ public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, I
                 ? string.Empty
                 : selectedType.ContainingNamespace.ToDisplayString();
 
-            var generatedNameTypeParameterSuffix = ExtractTypeHelpers.GetTypeParameterSuffix(document, selectedType, membersInType);
-
             var selectMembersViewModel = new StaticMemberSelectionViewModel(
-                _uiThreadOperationExecutor,
+                uiThreadOperationExecutor,
                 memberViewModels,
                 memberToDependentsMap);
 
-            var viewModel = new MoveStaticMembersDialogViewModel(selectMembersViewModel,
+            return new MoveStaticMembersDialogViewModel(selectMembersViewModel,
                 defaultTypeName,
                 existingTypeNames,
+                containingNamespaceDisplay,
                 document.GetRequiredLanguageService<ISyntaxFactsService>());
-
-            var dialog = new MoveStaticMembersDialog(viewModel);
-
-            var result = dialog.ShowModal();
-
-            if (result.GetValueOrDefault())
-            {
-                return new MoveStaticMembersOptions(
-                    // TODO: generate unique file name based off of existing folder documents
-                    viewModel.DestinationName + (document.Project.Language == LanguageNames.CSharp ? ".cs" : ".vb"),
-                    string.Join(".", containingNamespaceDisplay, viewModel.DestinationName),
-                    selectMembersViewModel.CheckedMembers.SelectAsArray(vm => vm.Symbol));
-            }
-
-            return MoveStaticMembersOptions.Cancelled;
         }
     }
 }
diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.resx b/src/VisualStudio/Core/Def/ServicesVSResources.resx
index 27f51c4041a82..ddad736315707 100644
--- a/src/VisualStudio/Core/Def/ServicesVSResources.resx
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.resx
@@ -1744,9 +1744,6 @@ Additional information: {1}</value>
   <data name="Inherited_interfaces" xml:space="preserve">
     <value>Inherited interfaces</value>
   </data>
-  <data name="A_new_type_will_be_created" xml:space="preserve">
-    <value>A new type will be created</value>
-  </data>
   <data name="Invalid_type_name" xml:space="preserve">
     <value>Invalid type name</value>
   </data>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
index d439fbec29a79..7eb9f2f228a66 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
@@ -7,11 +7,6 @@
         <target state="translated">Vytvoří se nový obor názvů.</target>
         <note />
       </trans-unit>
-      <trans-unit id="A_new_type_will_be_created">
-        <source>A new type will be created</source>
-        <target state="new">A new type will be created</target>
-        <note />
-      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Typ a název se musí poskytnout.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
index f4b9f927e336c..9188d220e7547 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
@@ -7,11 +7,6 @@
         <target state="translated">Ein neuer Namespace wird erstellt.</target>
         <note />
       </trans-unit>
-      <trans-unit id="A_new_type_will_be_created">
-        <source>A new type will be created</source>
-        <target state="new">A new type will be created</target>
-        <note />
-      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Typ und Name müssen angegeben werden.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
index 28fe9985f0f98..952dec59b4d78 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
@@ -7,11 +7,6 @@
         <target state="translated">Se creará un espacio de nombres</target>
         <note />
       </trans-unit>
-      <trans-unit id="A_new_type_will_be_created">
-        <source>A new type will be created</source>
-        <target state="new">A new type will be created</target>
-        <note />
-      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Se debe proporcionar un tipo y un nombre.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
index bd68a75bfbff1..ffeeba0494157 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
@@ -7,11 +7,6 @@
         <target state="translated">Un espace de noms va être créé</target>
         <note />
       </trans-unit>
-      <trans-unit id="A_new_type_will_be_created">
-        <source>A new type will be created</source>
-        <target state="new">A new type will be created</target>
-        <note />
-      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Vous devez fournir un type et un nom.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
index d17476eb6703d..20ddef4132337 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
@@ -7,11 +7,6 @@
         <target state="translated">Verrà creato un nuovo spazio dei nomi</target>
         <note />
       </trans-unit>
-      <trans-unit id="A_new_type_will_be_created">
-        <source>A new type will be created</source>
-        <target state="new">A new type will be created</target>
-        <note />
-      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">È necessario specificare un tipo e un nome.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
index 1bff50e6419d6..6aef6868a9874 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
@@ -7,11 +7,6 @@
         <target state="translated">新しい名前空間が作成されます</target>
         <note />
       </trans-unit>
-      <trans-unit id="A_new_type_will_be_created">
-        <source>A new type will be created</source>
-        <target state="new">A new type will be created</target>
-        <note />
-      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">種類と名前を指定する必要があります。</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
index e83bca9e1dc4b..2f543c7694743 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
@@ -7,11 +7,6 @@
         <target state="translated">새 네임스페이스가 만들어집니다.</target>
         <note />
       </trans-unit>
-      <trans-unit id="A_new_type_will_be_created">
-        <source>A new type will be created</source>
-        <target state="new">A new type will be created</target>
-        <note />
-      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">형식과 이름을 지정해야 합니다.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
index c246342ac064d..fbd24b5cf6991 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
@@ -7,11 +7,6 @@
         <target state="translated">Zostanie utworzona nowa przestrzeń nazw</target>
         <note />
       </trans-unit>
-      <trans-unit id="A_new_type_will_be_created">
-        <source>A new type will be created</source>
-        <target state="new">A new type will be created</target>
-        <note />
-      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Konieczne jest podanie typu i nazwy.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
index 15f76c2957bba..78606eb988f6c 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
@@ -7,11 +7,6 @@
         <target state="translated">Um namespace será criado</target>
         <note />
       </trans-unit>
-      <trans-unit id="A_new_type_will_be_created">
-        <source>A new type will be created</source>
-        <target state="new">A new type will be created</target>
-        <note />
-      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Um tipo e um nome precisam ser fornecidos.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
index 04d3720e0187d..4701cafb0d501 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
@@ -7,11 +7,6 @@
         <target state="translated">Будет создано пространство имен</target>
         <note />
       </trans-unit>
-      <trans-unit id="A_new_type_will_be_created">
-        <source>A new type will be created</source>
-        <target state="new">A new type will be created</target>
-        <note />
-      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Следует указать тип и имя.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
index bbf501126fde2..970dfe9dfb45b 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
@@ -7,11 +7,6 @@
         <target state="translated">Yeni bir ad alanı oluşturulacak</target>
         <note />
       </trans-unit>
-      <trans-unit id="A_new_type_will_be_created">
-        <source>A new type will be created</source>
-        <target state="new">A new type will be created</target>
-        <note />
-      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">Bir tür ve ad verilmesi gerekiyor.</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
index 9c1afd73349fc..4d7143b86e9f8 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
@@ -7,11 +7,6 @@
         <target state="translated">将创建一个新的命名空间</target>
         <note />
       </trans-unit>
-      <trans-unit id="A_new_type_will_be_created">
-        <source>A new type will be created</source>
-        <target state="new">A new type will be created</target>
-        <note />
-      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">必须提供类型和名称。</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
index a6fa9f05eb502..d146d2089095d 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
@@ -7,11 +7,6 @@
         <target state="translated">將會建立新的命名空間</target>
         <note />
       </trans-unit>
-      <trans-unit id="A_new_type_will_be_created">
-        <source>A new type will be created</source>
-        <target state="new">A new type will be created</target>
-        <note />
-      </trans-unit>
       <trans-unit id="A_type_and_name_must_be_provided">
         <source>A type and name must be provided.</source>
         <target state="translated">必須提供類型與名稱。</target>
diff --git a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
index cb1e4381d5f33..8089bc08d2590 100644
--- a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
+++ b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
@@ -31,20 +31,12 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
                 Dim syntaxFacts = workspaceDoc.Project.LanguageServices.GetService(Of ISyntaxFactsService)()
                 Dim token = Await tree.GetTouchingWordAsync(doc.CursorPosition.Value, syntaxFacts, CancellationToken.None).ConfigureAwait(False)
                 Dim memberSymbol = (Await workspaceDoc.GetRequiredSemanticModelAsync(CancellationToken.None)).GetDeclaredSymbol(token.Parent)
-                Dim existingNames = memberSymbol.ContainingNamespace.GetAllTypes(CancellationToken.None).Select(Function(type) type.Name).ToImmutableArray()
-                Dim membersInType = memberSymbol.ContainingType.GetMembers().WhereAsArray(Function(member) MemberAndDestinationValidator.IsMemberValid(member))
-                Dim membersViewModel = membersInType.SelectAsArray(
-                    Function(member) New SymbolViewModel(Of ISymbol)(member, glyphService:=Nothing) With {.IsChecked = member.Equals(memberSymbol)})
-                Dim memberToDependents = SymbolDependentsBuilder.FindMemberToDependentsMap(membersInType, workspaceDoc.Project, CancellationToken.None)
-                Dim memberSelectionViewModel = New StaticMemberSelectionViewModel(
-                    workspace.GetService(Of IUIThreadOperationExecutor),
-                    membersViewModel,
-                    memberToDependents)
-                Return New MoveStaticMembersDialogViewModel(
-                    memberSelectionViewModel,
-                    "TestDefaultType",
-                    existingNames,
-                    syntaxFacts)
+                Return VisualStudioMoveStaticMembersOptionsService.GetViewModel(
+                    workspaceDoc,
+                    memberSymbol.ContainingType,
+                    memberSymbol,
+                    Nothing,
+                    workspace.GetService(Of IUIThreadOperationExecutor))
             End Using
         End Function
 
@@ -69,6 +61,45 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
         End Sub
 
 #Region "C#"
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function CSTestBasicSubmit() As Task
+            Dim markUp = <Text><![CDATA[
+<Workspace>
+    <Project Language="C#" AssemblyName="CSAssembly1" CommonReferences="true">
+        <Document>
+            namespace TestNs
+            {
+                public class TestClass
+                {
+                    public static int Bar$$bar()
+                    {
+                        return 12345;
+                    }
+                }
+            }
+        </Document>
+    </Project>
+</Workspace>]]></Text>
+
+            ' We can call the method, but we need the document still to test submission
+            Dim viewModel = Await GetViewModelAsync(markUp).ConfigureAwait(False)
+
+            Assert.Equal("TestClassHelpers", viewModel.DestinationName)
+            viewModel.DestinationName = "ExtraNs.TestClassHelpers"
+            Assert.Equal("ExtraNs.TestClassHelpers", viewModel.DestinationName)
+            Assert.Equal("TestNs.", viewModel.PrependedNamespace)
+            Assert.True(viewModel.CanSubmit)
+
+            Dim cancelledOptions = VisualStudioMoveStaticMembersOptionsService.GenerateOptions(LanguageNames.CSharp, viewModel, False)
+            Assert.True(cancelledOptions.IsCancelled)
+
+            Dim options = VisualStudioMoveStaticMembersOptionsService.GenerateOptions(LanguageNames.CSharp, viewModel, True)
+            Assert.False(options.IsCancelled)
+            Assert.Equal("TestClassHelpers.cs", options.FileName)
+            Assert.Equal("TestClassHelpers", options.TypeName)
+            Assert.Equal("TestNs.ExtraNs", options.NamespaceDisplay)
+        End Function
+
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function CSTestNameConflicts() As Task
             Dim markUp = <Text><![CDATA[
@@ -115,6 +146,14 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
                 }
             }
         </Document>
+        <Document>
+            namespace TestNs.ExtraNs
+            {
+                public class ConflictingNsClassName
+                {
+                }
+            }
+        </Document>
     </Project>
     <Project Language="C#" AssemblyName="CSAssembly2" CommonReferences="true">
         <Document>
@@ -129,10 +168,11 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
 </Workspace>]]></Text>
             Dim viewModel = Await GetViewModelAsync(markUp)
 
-            Assert.Equal(viewModel.DestinationName, "TestDefaultType")
+            Assert.Equal(viewModel.DestinationName, "TestClassHelpers")
+            Assert.Equal("TestNs.", viewModel.PrependedNamespace)
 
             Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+            Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
             Assert.True(viewModel.CanSubmit)
@@ -144,7 +184,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
 
             viewModel.DestinationName = "ValidName"
             Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+            Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             ' spaces are not allowed as types
             viewModel.DestinationName = "asd "
@@ -156,7 +196,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             viewModel.DestinationName = "ConflictingClassName3"
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+            Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             viewModel.DestinationName = "ITestInterface"
             Assert.False(viewModel.CanSubmit)
@@ -166,18 +206,28 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             viewModel.DestinationName = "NoNsClass"
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+            Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             ' different namespace
             viewModel.DestinationName = "ConflictingClassName2"
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+            Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             viewModel.DestinationName = "TestClass"
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+
+            viewModel.DestinationName = "ExtraNamespace.ValidName"
+            Assert.True(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
+
+            viewModel.DestinationName = "ExtraNs.ConflictingNsClassName"
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -275,6 +325,42 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
 #End Region
 
 #Region "VB"
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function VBTestBasicSubmit() As Task
+            Dim markUp = <Text><![CDATA[
+<Workspace>
+    <Project Language="Visual Basic" AssemblyName="VBAssembly1" CommonReferences="true">
+        <Document>
+            Namespace TestNs
+                Public Class TestClass
+                    Public Shared Function Bar$$bar() As Integer
+                        Return 12345;
+                    End Function
+                End Class
+            End Namespace
+        </Document>
+    </Project>
+</Workspace>]]></Text>
+
+            ' We can call the method, but we need the document still to test submission
+            Dim viewModel = Await GetViewModelAsync(markUp).ConfigureAwait(False)
+
+            Assert.Equal("TestClassHelpers", viewModel.DestinationName)
+            viewModel.DestinationName = "ExtraNs.TestClassHelpers"
+            Assert.Equal("ExtraNs.TestClassHelpers", viewModel.DestinationName)
+            Assert.Equal("TestNs.", viewModel.PrependedNamespace)
+            Assert.True(viewModel.CanSubmit)
+
+            Dim cancelledOptions = VisualStudioMoveStaticMembersOptionsService.GenerateOptions(LanguageNames.VisualBasic, viewModel, False)
+            Assert.True(cancelledOptions.IsCancelled)
+
+            Dim options = VisualStudioMoveStaticMembersOptionsService.GenerateOptions(LanguageNames.VisualBasic, viewModel, True)
+            Assert.False(options.IsCancelled)
+            Assert.Equal("TestClassHelpers.vb", options.FileName)
+            Assert.Equal("TestClassHelpers", options.TypeName)
+            Assert.Equal("TestNs.ExtraNs", options.NamespaceDisplay)
+        End Function
+
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function VBTestNameConflicts() As Task
             Dim markUp = <Text><![CDATA[
@@ -311,6 +397,12 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
                 End Class
             End Namespace
         </Document>
+        <Document>
+            Namespace TestNs.ExtraNs
+                Public Class ConflictingNsClassName
+                End Class
+            End Namespace
+        </Document>
     </Project>
     <Project Language="C#" AssemblyName="CSAssembly2" CommonReferences="true">
         <Document>
@@ -323,10 +415,11 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
 </Workspace>]]></Text>
             Dim viewModel = Await GetViewModelAsync(markUp)
 
-            Assert.Equal(viewModel.DestinationName, "TestDefaultType")
+            Assert.Equal(viewModel.DestinationName, "TestClassHelpers")
+            Assert.Equal("TestNs.", viewModel.PrependedNamespace)
 
             Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+            Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
             Assert.True(viewModel.CanSubmit)
@@ -336,20 +429,21 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
+            viewModel.DestinationName = "ValidName"
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
+
+            ' spaces are not allowed as types
             viewModel.DestinationName = "asd "
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
-            viewModel.DestinationName = "ValidName"
-            Assert.True(viewModel.CanSubmit)
-            Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
-
+            ' different project
             viewModel.DestinationName = "ConflictingClassName3"
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+            Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             viewModel.DestinationName = "ITestInterface"
             Assert.False(viewModel.CanSubmit)
@@ -359,17 +453,69 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             viewModel.DestinationName = "NoNsClass"
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+            Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
+            ' different namespace
             viewModel.DestinationName = "ConflictingClassName2"
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.A_new_type_will_be_created, viewModel.Message)
+            Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             viewModel.DestinationName = "TestClass"
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+
+            viewModel.DestinationName = "ExtraNamespace.ValidName"
+            Assert.True(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
+
+            viewModel.DestinationName = "ExtraNs.ConflictingNsClassName"
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function VBTestRootNamespace() As Task
+            Dim markUp = <Text><![CDATA[
+<Workspace>
+    <Project Language="Visual Basic" AssemblyName="VBAssembly1" CommonReferences="true">
+        <CompilationOptions RootNamespace="RootNs"/>
+        <Document>
+            Namespace TestNs
+                Public Class TestClass
+                    Public Shared Function Bar$$bar() As Integer
+                        Return 12345;
+                    End Function
+                End Class
+            End Namespace
+        </Document>
+        <Document>
+            Namespace TestNs
+                Public Class ConflictingClassName
+                End Class
+            End Namespace
+        </Document>
+    </Project>
+</Workspace>]]></Text>
+
+            Dim viewModel = Await GetViewModelAsync(markUp)
+
+            Assert.Equal(viewModel.DestinationName, "TestClassHelpers")
+            Assert.Equal("RootNs.TestNs.", viewModel.PrependedNamespace)
+
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
+
+            Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
+            Assert.True(viewModel.CanSubmit)
+
+            viewModel.DestinationName = "ConflictingClassName"
+            Assert.False(viewModel.CanSubmit)
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>

From 9301ad872ad5237181b0c11a0c1d924f1a96d603 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Mon, 30 Aug 2021 10:36:26 -0700
Subject: [PATCH 41/64] small changes to fix merge

---
 .../VisualBasicMoveStaticMembersTests.vb      |  1 -
 .../MoveStaticMembersDialogViewModel.cs       |  2 +-
 ...alStudioMoveStaticMembersOptionsService.cs | 40 +++++-----
 .../MoveStaticMembersViewModelTest.vb         | 78 +++++++++----------
 4 files changed, 58 insertions(+), 63 deletions(-)

diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index ba38171e3036d..e5de946cff64c 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -1558,7 +1558,6 @@ End Namespace"
             Dim selection = ImmutableArray.Create("TestFunc")
             Dim expectedText1 = "
 Imports System.Runtime.CompilerServices
-Imports TestNs
 
 Namespace TestNs
     Public Module Class1
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
index a9a453a877080..e2183a64278bc 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
@@ -116,7 +116,7 @@ private void OnDestinationUpdated()
 
         private bool IsValidType(string typeName)
         {
-            if (string.IsNullOrEmpty(typeName) ||typeName == _sourceTypeName)
+            if (string.IsNullOrEmpty(typeName) || typeName == _sourceTypeName)
             {
                 return false;
             }
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index b1040be2604ca..dc6c9163ca824 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Composition;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using Microsoft.CodeAnalysis;
@@ -45,37 +46,38 @@ public VisualStudioMoveStaticMembersOptionsService(
 
         public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol)
         {
-            var viewModel = GetViewModel(document, selectedType, selectedNodeSymbol, _glyphService, _uiThreadOperationExecutor);
+            var viewModel = GetViewModel(document, selectedType, selectedNodeSymbol, History, _glyphService, _uiThreadOperationExecutor);
 
             var dialog = new MoveStaticMembersDialog(viewModel);
 
             var result = dialog.ShowModal();
 
-            return GenerateOptions(document.Project.Language, viewModel, result.GetValueOrDefault());
-        }
-
-        // internal for testing purposes
-        internal static MoveStaticMembersOptions GenerateOptions(string language, MoveStaticMembersDialogViewModel viewModel, bool dialogResult)
-        {
-            if (dialogResult)
+            if (result.GetValueOrDefault())
             {
-                // if the destination name contains extra namespaces, we want the last one as that is the real type name
-                var typeName = viewModel.DestinationName.Split('.').Last();
-                var newFileName = Path.ChangeExtension(typeName, language == LanguageNames.CSharp ? ".cs" : ".vb");
-                return new MoveStaticMembersOptions(
-                    newFileName,
-                    viewModel.PrependedNamespace + viewModel.DestinationName,
-                    viewModel.MemberSelectionViewModel.CheckedMembers.SelectAsArray(vm => vm.Symbol));
+                return GenerateOptions(document.Project.Language, viewModel);
             }
 
             return MoveStaticMembersOptions.Cancelled;
         }
 
+        // internal for testing purposes
+        internal static MoveStaticMembersOptions GenerateOptions(string language, MoveStaticMembersDialogViewModel viewModel)
+        {
+            // if the destination name contains extra namespaces, we want the last one as that is the real type name
+            var typeName = viewModel.DestinationName.TypeName.Split('.').Last();
+            var newFileName = Path.ChangeExtension(typeName, language == LanguageNames.CSharp ? ".cs" : ".vb");
+            return new MoveStaticMembersOptions(
+                newFileName,
+                viewModel.DestinationName.TypeName,
+                viewModel.MemberSelectionViewModel.CheckedMembers.SelectAsArray(vm => vm.Symbol));
+        }
+
         // internal for testing purposes, get the view model
         internal static MoveStaticMembersDialogViewModel GetViewModel(
             Document document,
             INamedTypeSymbol selectedType,
             ISymbol? selectedNodeSymbol,
+            LinkedList<(string, string)> history,
             IGlyphService? glyphService,
             IUIThreadOperationExecutor uiThreadOperationExecutor)
         {
@@ -97,6 +99,7 @@ internal static MoveStaticMembersDialogViewModel GetViewModel(
                 selectedType.ContainingNamespace,
                 selectedType,
                 document,
+                history,
                 cancellationTokenSource.Token);
 
             var candidateName = selectedType.Name + "Helpers";
@@ -114,7 +117,7 @@ internal static MoveStaticMembersDialogViewModel GetViewModel(
             return new MoveStaticMembersDialogViewModel(selectMembersViewModel,
                 defaultTypeName,
                 existingTypeNames,
-                containingNamespaceDisplay,
+                selectedType.Name,
                 document.GetRequiredLanguageService<ISyntaxFactsService>());
         }
 
@@ -123,10 +126,11 @@ internal static MoveStaticMembersDialogViewModel GetViewModel(
         /// <summary>
         /// Construct all the type names declared in the project, 
         /// </summary>
-        private ImmutableArray<TypeNameItem> MakeTypeNameItems(
+        private static ImmutableArray<TypeNameItem> MakeTypeNameItems(
             INamespaceSymbol currentNamespace,
             INamedTypeSymbol currentType,
             Document currentDocument,
+            LinkedList<(string, string)> history,
             CancellationToken cancellationToken)
         {
             return currentNamespace.GetAllTypes(cancellationToken).SelectMany(t =>
@@ -137,7 +141,7 @@ private ImmutableArray<TypeNameItem> MakeTypeNameItems(
                     .Where(l => l.IsInSource &&
                         (currentType.Name != t.Name || GetFile(l) != currentDocument.Name))
                     .Select(l => new TypeNameItem(
-                        History.Contains((t.Name, currentDocument.Name)),
+                        history.Contains((t.Name, currentDocument.Name)),
                         GetFile(l),
                         t));
             })
diff --git a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
index 8089bc08d2590..ac186c6d1ea1c 100644
--- a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
+++ b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
@@ -35,6 +35,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
                     workspaceDoc,
                     memberSymbol.ContainingType,
                     memberSymbol,
+                    New LinkedList(Of (String, String)),
                     Nothing,
                     workspace.GetService(Of IUIThreadOperationExecutor))
             End Using
@@ -84,16 +85,13 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             ' We can call the method, but we need the document still to test submission
             Dim viewModel = Await GetViewModelAsync(markUp).ConfigureAwait(False)
 
-            Assert.Equal("TestClassHelpers", viewModel.DestinationName)
-            viewModel.DestinationName = "ExtraNs.TestClassHelpers"
-            Assert.Equal("ExtraNs.TestClassHelpers", viewModel.DestinationName)
-            Assert.Equal("TestNs.", viewModel.PrependedNamespace)
+            Assert.Equal("TestClassHelpers", viewModel.SearchText)
+            viewModel.SearchText = "ExtraNs.TestClassHelpers"
+            Assert.Equal("ExtraNs.TestClassHelpers", viewModel.SearchText)
+            Assert.True(viewModel.DestinationName.IsNew)
             Assert.True(viewModel.CanSubmit)
 
-            Dim cancelledOptions = VisualStudioMoveStaticMembersOptionsService.GenerateOptions(LanguageNames.CSharp, viewModel, False)
-            Assert.True(cancelledOptions.IsCancelled)
-
-            Dim options = VisualStudioMoveStaticMembersOptionsService.GenerateOptions(LanguageNames.CSharp, viewModel, True)
+            Dim options = VisualStudioMoveStaticMembersOptionsService.GenerateOptions(LanguageNames.CSharp, viewModel)
             Assert.False(options.IsCancelled)
             Assert.Equal("TestClassHelpers.cs", options.FileName)
             Assert.Equal("TestClassHelpers", options.TypeName)
@@ -168,8 +166,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
 </Workspace>]]></Text>
             Dim viewModel = Await GetViewModelAsync(markUp)
 
-            Assert.Equal(viewModel.DestinationName, "TestClassHelpers")
-            Assert.Equal("TestNs.", viewModel.PrependedNamespace)
+            Assert.Equal(viewModel.SearchText, "TestClassHelpers")
 
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
@@ -177,54 +174,54 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
             Assert.True(viewModel.CanSubmit)
 
-            viewModel.DestinationName = "ConflictingClassName"
+            viewModel.SearchText = "ConflictingClassName"
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
-            viewModel.DestinationName = "ValidName"
+            viewModel.SearchText = "ValidName"
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             ' spaces are not allowed as types
-            viewModel.DestinationName = "asd "
+            viewModel.SearchText = "asd "
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
             ' different project
-            viewModel.DestinationName = "ConflictingClassName3"
+            viewModel.SearchText = "ConflictingClassName3"
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            viewModel.DestinationName = "ITestInterface"
+            viewModel.SearchText = "ITestInterface"
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
-            viewModel.DestinationName = "NoNsClass"
+            viewModel.SearchText = "NoNsClass"
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             ' different namespace
-            viewModel.DestinationName = "ConflictingClassName2"
+            viewModel.SearchText = "ConflictingClassName2"
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            viewModel.DestinationName = "TestClass"
+            viewModel.SearchText = "TestClass"
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
-            viewModel.DestinationName = "ExtraNamespace.ValidName"
+            viewModel.SearchText = "ExtraNamespace.ValidName"
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            viewModel.DestinationName = "ExtraNs.ConflictingNsClassName"
+            viewModel.SearchText = "ExtraNs.ConflictingNsClassName"
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
@@ -345,16 +342,13 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             ' We can call the method, but we need the document still to test submission
             Dim viewModel = Await GetViewModelAsync(markUp).ConfigureAwait(False)
 
-            Assert.Equal("TestClassHelpers", viewModel.DestinationName)
-            viewModel.DestinationName = "ExtraNs.TestClassHelpers"
-            Assert.Equal("ExtraNs.TestClassHelpers", viewModel.DestinationName)
-            Assert.Equal("TestNs.", viewModel.PrependedNamespace)
+            Assert.Equal("TestClassHelpers", viewModel.SearchText)
+            viewModel.SearchText = "ExtraNs.TestClassHelpers"
+            Assert.Equal("ExtraNs.TestClassHelpers", viewModel.SearchText)
+            Assert.True(viewModel.DestinationName.IsNew)
             Assert.True(viewModel.CanSubmit)
 
-            Dim cancelledOptions = VisualStudioMoveStaticMembersOptionsService.GenerateOptions(LanguageNames.VisualBasic, viewModel, False)
-            Assert.True(cancelledOptions.IsCancelled)
-
-            Dim options = VisualStudioMoveStaticMembersOptionsService.GenerateOptions(LanguageNames.VisualBasic, viewModel, True)
+            Dim options = VisualStudioMoveStaticMembersOptionsService.GenerateOptions(LanguageNames.VisualBasic, viewModel)
             Assert.False(options.IsCancelled)
             Assert.Equal("TestClassHelpers.vb", options.FileName)
             Assert.Equal("TestClassHelpers", options.TypeName)
@@ -415,8 +409,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
 </Workspace>]]></Text>
             Dim viewModel = Await GetViewModelAsync(markUp)
 
-            Assert.Equal(viewModel.DestinationName, "TestClassHelpers")
-            Assert.Equal("TestNs.", viewModel.PrependedNamespace)
+            Assert.Equal(viewModel.SearchText, "TestClassHelpers")
 
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
@@ -424,54 +417,54 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
             Assert.True(viewModel.CanSubmit)
 
-            viewModel.DestinationName = "ConflictingClassName"
+            viewModel.SearchText = "ConflictingClassName"
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
-            viewModel.DestinationName = "ValidName"
+            viewModel.SearchText = "ValidName"
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             ' spaces are not allowed as types
-            viewModel.DestinationName = "asd "
+            viewModel.SearchText = "asd "
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
             ' different project
-            viewModel.DestinationName = "ConflictingClassName3"
+            viewModel.SearchText = "ConflictingClassName3"
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            viewModel.DestinationName = "ITestInterface"
+            viewModel.SearchText = "ITestInterface"
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
-            viewModel.DestinationName = "NoNsClass"
+            viewModel.SearchText = "NoNsClass"
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             ' different namespace
-            viewModel.DestinationName = "ConflictingClassName2"
+            viewModel.SearchText = "ConflictingClassName2"
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            viewModel.DestinationName = "TestClass"
+            viewModel.SearchText = "TestClass"
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
-            viewModel.DestinationName = "ExtraNamespace.ValidName"
+            viewModel.SearchText = "ExtraNamespace.ValidName"
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            viewModel.DestinationName = "ExtraNs.ConflictingNsClassName"
+            viewModel.SearchText = "ExtraNs.ConflictingNsClassName"
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
@@ -503,8 +496,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
 
             Dim viewModel = Await GetViewModelAsync(markUp)
 
-            Assert.Equal(viewModel.DestinationName, "TestClassHelpers")
-            Assert.Equal("RootNs.TestNs.", viewModel.PrependedNamespace)
+            Assert.Equal(viewModel.SearchText, "TestClassHelpers")
 
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
@@ -512,7 +504,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
             Assert.True(viewModel.CanSubmit)
 
-            viewModel.DestinationName = "ConflictingClassName"
+            viewModel.SearchText = "ConflictingClassName"
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)

From 682e7cc2868f35a283826701ee4bd96dd5d6004b Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Tue, 31 Aug 2021 09:41:33 -0700
Subject: [PATCH 42/64] Changed destination selection mechanics

---
 .../MoveStaticMembersOptions.cs               | 28 ++++++++-
 .../MoveStaticMembersWithDialogCodeAction.cs  |  2 +-
 .../MoveStaticMembersDialog.xaml              | 23 +++----
 .../MoveStaticMembersDialogViewModel.cs       | 61 +++++++++++--------
 ...alStudioMoveStaticMembersOptionsService.cs | 27 +++++---
 .../MoveStaticMembersViewModelTest.vb         | 14 +++--
 6 files changed, 98 insertions(+), 57 deletions(-)

diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
index a9d08e971892f..baaa16ee913eb 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
@@ -13,9 +13,16 @@ internal readonly struct MoveStaticMembersOptions
 
         public string FileName { get; }
 
-        public string TypeName { get; }
+        public bool IsNewType { get; }
 
-        public string NamespaceDisplay { get; }
+        /// only has value when IsNewType is false
+        public INamedTypeSymbol? Destination { get; }
+
+        /// only has value when IsNewType is true
+        public string? TypeName { get; }
+
+        /// only has value when IsNewType is true
+        public string? NamespaceDisplay { get; }
 
         public ImmutableArray<ISymbol> SelectedMembers { get; }
 
@@ -25,6 +32,21 @@ internal readonly struct MoveStaticMembersOptions
             ImmutableArray<ISymbol>.Empty,
             isCancelled: true);
 
+        public MoveStaticMembersOptions(
+            string fileName,
+            INamedTypeSymbol destination,
+            ImmutableArray<ISymbol> selectedMembers,
+            bool isCancelled = false)
+        {
+            IsCancelled = isCancelled;
+            FileName = fileName;
+            IsNewType = false;
+            Destination = destination;
+            TypeName = null;
+            NamespaceDisplay = null;
+            SelectedMembers = selectedMembers;
+        }
+
         public MoveStaticMembersOptions(
             string fileName,
             string fullTypeName,
@@ -33,6 +55,8 @@ public MoveStaticMembersOptions(
         {
             IsCancelled = isCancelled;
             FileName = fileName;
+            IsNewType = true;
+            Destination = null;
             var namespacesAndType = fullTypeName.Split(separator: '.');
             TypeName = namespacesAndType.Last();
             NamespaceDisplay = string.Join(separator: ".", namespacesAndType.Take(namespacesAndType.Length - 1));
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 790294b6dd783..5a8ab5e5459a5 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -84,7 +84,7 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
                 Accessibility.NotApplicable,
                 DeclarationModifiers.Static,
                 GetNewTypeKind(_selectedType),
-                moveOptions.TypeName,
+                moveOptions.TypeName!,
                 typeParameters: typeParameters);
 
             var (newDoc, annotation) = await ExtractTypeHelpers.AddTypeToNewFileAsync(
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
index 55ba8ab3d6efd..7c37e498fa320 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
@@ -9,7 +9,6 @@
     xmlns:imagecatalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
     xmlns:movestaticmembers="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers" 
     d:DataContext="{d:DesignInstance Type=movestaticmembers:MoveStaticMembersDialogViewModel}"
-    vs:ThemedDialogStyleLoader.UseDefaultThemedDialogStyles="True"
     x:Uid="MoveStaticMembersDialog"
     x:Name="dialog"
     x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers.MoveStaticMembersDialog"
@@ -23,8 +22,7 @@
     HasDialogFrame="True"
     ShowInTaskbar="False"
     ResizeMode="CanResize"
-    Title="{Binding MoveStaticMembersDialogTitle, ElementName=dialog}"
-    Background="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}">
+    Title="{Binding MoveStaticMembersDialogTitle, ElementName=dialog}">
     <vs:DialogWindow.Resources>
         <Thickness x:Key="ButtonPadding">9, 2, 9, 2</Thickness>
         <sys:Double x:Key="ButtonWidth">73</sys:Double>
@@ -54,7 +52,7 @@
                 Text="{Binding SearchText, Mode=TwoWay}"
                 SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}"
                 ItemsSource="{Binding ShownTypes, Mode=OneWay}"
-                BorderThickness="0" 
+                BorderThickness="1" 
                 Margin="0 0 20 0"
                 MaxDropDownHeight="150">
                 <ComboBox.ItemContainerStyle>
@@ -96,7 +94,8 @@
             </ComboBox>
 
 
-            <GroupBox>
+            <GroupBox
+                BorderThickness="0">
                 <GroupBox.Style>
                     <Style TargetType="GroupBox">
                         <Setter Property="Foreground" Value="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
@@ -117,8 +116,7 @@
                         <vs:LiveTextBlock 
                             x:Name="MessageText"
                             Text="{Binding Message}"
-                            Margin="7, 0, 0, 0"
-                            Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
+                            Margin="7, 0, 0, 0"/>
                     </StackPanel>
                 </GroupBox.Header>
 
@@ -135,14 +133,12 @@
                         HorizontalAlignment="Right"
                         x:Name="Namespace"
                         Text="{Binding PrependedNamespace}"
-                        TextTrimming="CharacterEllipsis"
-                        Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
+                        TextTrimming="CharacterEllipsis"/>
 
                     <vs:LiveTextBlock 
                         Grid.Column="1"
                         x:Name="TypeName"
-                        Text="{Binding DestinationName}"
-                        Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
+                        Text="{Binding DestinationName.TypeName}"/>
                 </Grid>
             </GroupBox>
         </StackPanel>
@@ -154,11 +150,6 @@
             Grid.Row="1"
             Header="{Binding ElementName=dialog, Path=SelectMembers}"
             BorderThickness="1">
-            <GroupBox.Style>
-                <Style TargetType="GroupBox">
-                    <Setter Property="Foreground" Value="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
-                </Style>
-            </GroupBox.Style>
 
             <ContentPresenter Content="{Binding ElementName=dialog, Path=MemberSelectionControl}" />
         </GroupBox>
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
index e2183a64278bc..d62fffd534661 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Immutable;
 using System.ComponentModel;
+using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.VisualStudio.Imaging;
@@ -26,6 +27,7 @@ public MoveStaticMembersDialogViewModel(
             string defaultType,
             ImmutableArray<TypeNameItem> availableTypes,
             string sourceTypeName,
+            string containingNamespace,
             ISyntaxFacts syntaxFacts)
         {
             MemberSelectionViewModel = memberSelectionViewModel;
@@ -34,10 +36,10 @@ public MoveStaticMembersDialogViewModel(
             AvailableTypes = availableTypes;
             _destinationName = new TypeNameItem(defaultType);
             _sourceTypeName = sourceTypeName;
+            _prependedNamespace = containingNamespace + ".";
 
             PropertyChanged += MoveMembersToTypeDialogViewModel_PropertyChanged;
             // Set message and icon + shownTypes
-            OnSearchTextUpdated();
             OnDestinationUpdated();
         }
 
@@ -48,34 +50,21 @@ private void MoveMembersToTypeDialogViewModel_PropertyChanged(object sender, Pro
                 case nameof(DestinationName):
                     OnDestinationUpdated();
                     break;
-                case nameof(SearchText):
-                    OnSearchTextUpdated();
-                    break;
                 case nameof(SelectedIndex):
-                    OnSelectedIdnexUpdated();
+                    OnSearchTextOrIndexUpdated();
+                    break;
+                case nameof(SearchText):
+                    OnSearchTextOrIndexUpdated();
                     break;
             }
         }
 
-        private void OnSelectedIdnexUpdated()
-        {
-            // User changed their selection in the dropdown
-            if (SelectedIndex == -1)
-            {
-                // removed selection, search text will handle the dropdown
-                // even if the text hasn't changed
-                OnSearchTextUpdated();
-            }
-            else
-            {
-                DestinationName = ShownTypes[SelectedIndex];
-            }
-        }
-
-        private void OnSearchTextUpdated()
+        private void OnSearchTextOrIndexUpdated()
         {
+            // we either typed something or changed the selection
             if (SelectedIndex != -1 && SearchText == ShownTypes[SelectedIndex].TypeName)
             {
+                // The user has selected a destination
                 DestinationName = ShownTypes[SelectedIndex];
             }
             else
@@ -83,11 +72,6 @@ private void OnSearchTextUpdated()
                 // Search text is not selecting anything, create a destination for the
                 // contents of the text.
                 DestinationName = new TypeNameItem(SearchText);
-                ShownTypes = AvailableTypes.WhereAsArray(t => t.TypeName.Contains(SearchText));
-                if (_isValidName)
-                {
-                    ShownTypes = ShownTypes.Insert(0, DestinationName);
-                }
             }
         }
 
@@ -112,11 +96,27 @@ private void OnDestinationUpdated()
             {
                 ShowMessage = false;
             }
+
+            ShownTypes = AvailableTypes.WhereAsArray(t => t.TypeName.Contains(SearchText));
+            if (_isValidName)
+            {
+                // always show option to make new type if valid
+                if (isNewType)
+                {
+                    ShownTypes = ShownTypes.Insert(0, DestinationName);
+                }
+                else
+                {
+                    ShownTypes = ShownTypes.Insert(0, new TypeNameItem(DestinationName.TypeName));
+                }
+            }
         }
 
         private bool IsValidType(string typeName)
         {
-            if (string.IsNullOrEmpty(typeName) || typeName == _sourceTypeName)
+            if (string.IsNullOrEmpty(typeName) ||
+                typeName == _sourceTypeName ||
+                AvailableTypes.Any(t => t.TypeName == (PrependedNamespace + typeName)))
             {
                 return false;
             }
@@ -134,6 +134,13 @@ private bool IsValidType(string typeName)
             return true;
         }
 
+        private string _prependedNamespace;
+        public string PrependedNamespace
+        {
+            get => _prependedNamespace;
+            set => SetProperty(ref _prependedNamespace, value);
+        }
+
         private TypeNameItem _destinationName;
         public TypeNameItem DestinationName
         {
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index dc6c9163ca824..9427603539f30 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -63,13 +63,25 @@ public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, I
         // internal for testing purposes
         internal static MoveStaticMembersOptions GenerateOptions(string language, MoveStaticMembersDialogViewModel viewModel)
         {
-            // if the destination name contains extra namespaces, we want the last one as that is the real type name
-            var typeName = viewModel.DestinationName.TypeName.Split('.').Last();
-            var newFileName = Path.ChangeExtension(typeName, language == LanguageNames.CSharp ? ".cs" : ".vb");
-            return new MoveStaticMembersOptions(
-                newFileName,
-                viewModel.DestinationName.TypeName,
-                viewModel.MemberSelectionViewModel.CheckedMembers.SelectAsArray(vm => vm.Symbol));
+            var destination = viewModel.DestinationName;
+            var selectedMembers = viewModel.MemberSelectionViewModel.CheckedMembers.SelectAsArray(vm => vm.Symbol);
+            if (destination.IsNew)
+            {
+                // if the destination name contains extra namespaces, we want the last one as that is the real type name
+                var typeName = destination.TypeName.Split('.').Last();
+                var newFileName = Path.ChangeExtension(typeName, language == LanguageNames.CSharp ? ".cs" : ".vb");
+                return new MoveStaticMembersOptions(
+                    newFileName,
+                    viewModel.PrependedNamespace + destination.TypeName,
+                    selectedMembers);
+            }
+            else
+            {
+                return new MoveStaticMembersOptions(
+                    destination.DeclarationFile,
+                    destination.NamedType!,
+                    selectedMembers);
+            }
         }
 
         // internal for testing purposes, get the view model
@@ -118,6 +130,7 @@ internal static MoveStaticMembersDialogViewModel GetViewModel(
                 defaultTypeName,
                 existingTypeNames,
                 selectedType.Name,
+                containingNamespaceDisplay,
                 document.GetRequiredLanguageService<ISyntaxFactsService>());
         }
 
diff --git a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
index ac186c6d1ea1c..4e772826bd84f 100644
--- a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
+++ b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
@@ -7,6 +7,7 @@ Imports System.Threading
 Imports Microsoft.CodeAnalysis
 Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
 Imports Microsoft.CodeAnalysis.LanguageServices
+Imports Microsoft.CodeAnalysis.MoveStaticMembers
 Imports Microsoft.CodeAnalysis.PullMemberUp
 Imports Microsoft.CodeAnalysis.Shared.Extensions
 Imports Microsoft.CodeAnalysis.Test.Utilities
@@ -41,6 +42,13 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             End Using
         End Function
 
+        Private Function Submit(viewModel As MoveStaticMembersDialogViewModel, cSharp As Boolean) As MoveStaticMembersOptions
+            Assert.True(viewModel.CanSubmit)
+            Dim language = If(cSharp, LanguageNames.CSharp, LanguageNames.VisualBasic)
+
+            Return VisualStudioMoveStaticMembersOptionsService.GenerateOptions(language, viewModel)
+        End Function
+
         Private Function FindMemberByName(name As String, memberArray As ImmutableArray(Of SymbolViewModel(Of ISymbol))) As SymbolViewModel(Of ISymbol)
             Dim member = memberArray.FirstOrDefault(Function(memberViewModel) memberViewModel.Symbol.Name.Equals(name))
             Assert.NotNull(member)
@@ -89,9 +97,8 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             viewModel.SearchText = "ExtraNs.TestClassHelpers"
             Assert.Equal("ExtraNs.TestClassHelpers", viewModel.SearchText)
             Assert.True(viewModel.DestinationName.IsNew)
-            Assert.True(viewModel.CanSubmit)
 
-            Dim options = VisualStudioMoveStaticMembersOptionsService.GenerateOptions(LanguageNames.CSharp, viewModel)
+            Dim options = Submit(viewModel, cSharp:=True)
             Assert.False(options.IsCancelled)
             Assert.Equal("TestClassHelpers.cs", options.FileName)
             Assert.Equal("TestClassHelpers", options.TypeName)
@@ -346,9 +353,8 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             viewModel.SearchText = "ExtraNs.TestClassHelpers"
             Assert.Equal("ExtraNs.TestClassHelpers", viewModel.SearchText)
             Assert.True(viewModel.DestinationName.IsNew)
-            Assert.True(viewModel.CanSubmit)
 
-            Dim options = VisualStudioMoveStaticMembersOptionsService.GenerateOptions(LanguageNames.VisualBasic, viewModel)
+            Dim options = Submit(viewModel, cSharp:=False)
             Assert.False(options.IsCancelled)
             Assert.Equal("TestClassHelpers.vb", options.FileName)
             Assert.Equal("TestClassHelpers", options.TypeName)

From 46a78b5bf18da6156f139e80ef0ec44665843507 Mon Sep 17 00:00:00 2001
From: Soren Dahl <43689321+Soreloser2@users.noreply.github.com>
Date: Tue, 31 Aug 2021 10:11:44 -0700
Subject: [PATCH 43/64] Removed theming (#56013)

---
 .../MoveStaticMembersDialog.xaml              | 25 ++++---------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
index 5beb11ea8a638..7e07a465248e8 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
@@ -8,7 +8,6 @@
     xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging" 
     xmlns:movestaticmembers="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers" 
     d:DataContext="{d:DesignInstance Type=movestaticmembers:MoveStaticMembersDialogViewModel}"
-    vs:ThemedDialogStyleLoader.UseDefaultThemedDialogStyles="True"
     x:Uid="MoveStaticMembersDialog"
     x:Name="dialog"
     x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers.MoveStaticMembersDialog"
@@ -22,8 +21,7 @@
     HasDialogFrame="True"
     ShowInTaskbar="False"
     ResizeMode="CanResize"
-    Title="{Binding MoveStaticMembersDialogTitle, ElementName=dialog}"
-    Background="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}">
+    Title="{Binding MoveStaticMembersDialogTitle, ElementName=dialog}">
     <vs:DialogWindow.Resources>
         <Thickness x:Key="ButtonPadding">9, 2, 9, 2</Thickness>
         <sys:Double x:Key="ButtonWidth">73</sys:Double>
@@ -54,11 +52,6 @@
 
 
             <GroupBox>
-                <GroupBox.Style>
-                    <Style TargetType="GroupBox">
-                        <Setter Property="Foreground" Value="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
-                    </Style>
-                </GroupBox.Style>
                 <GroupBox.Header>
                     <StackPanel 
                     Orientation="Horizontal"  
@@ -74,8 +67,7 @@
                         <vs:LiveTextBlock 
                             x:Name="MessageText"
                             Text="{Binding Message}"
-                            Margin="7, 0, 0, 0"
-                            Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
+                            Margin="7, 0, 0, 0"/>
                     </StackPanel>
                 </GroupBox.Header>
 
@@ -92,19 +84,17 @@
                         HorizontalAlignment="Right"
                         x:Name="Namespace"
                         Text="{Binding PrependedNamespace}"
-                        TextTrimming="CharacterEllipsis"
-                        Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
+                        TextTrimming="CharacterEllipsis"/>
 
                     <vs:LiveTextBlock 
                         Grid.Column="1"
                         x:Name="TypeName"
-                        Text="{Binding DestinationName}"
-                        Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
+                        Text="{Binding DestinationName}"/>
                 </Grid>
             </GroupBox>
         </StackPanel>
 
-        
+
 
         <GroupBox 
             x:Uid="MemberSelectionGroupBox"
@@ -113,11 +103,6 @@
             Grid.Row="1"
             Header="{Binding ElementName=dialog, Path=SelectMembers}"
             BorderThickness="1">
-            <GroupBox.Style>
-                <Style TargetType="GroupBox">
-                    <Setter Property="Foreground" Value="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"/>
-                </Style>
-            </GroupBox.Style>
 
             <ContentPresenter Content="{Binding ElementName=dialog, Path=MemberSelectionControl}" />
         </GroupBox>

From d87b4f7a38884b0dfbb78cf20f12e43318e48139 Mon Sep 17 00:00:00 2001
From: Soren Dahl <43689321+Soreloser2@users.noreply.github.com>
Date: Tue, 31 Aug 2021 13:21:41 -0700
Subject: [PATCH 44/64] Move static members Root Namespace + OK button enabled
 fixes (#56035)

* Added tests and changed root namespace filtering. Removes crash bug.

* Disabled "OK" button when destination is invalid. Added ability to select no members (will create a new empty class)
---
 .../CSharpMoveStaticMembersTests.cs           | 37 +++++++
 .../VisualBasicMoveStaticMembersTests.vb      | 98 +++++++++++++++++++
 .../Shared/Utilities/ExtractTypeHelpers.cs    |  5 +-
 .../MoveStaticMembersDialog.xaml              |  3 +-
 .../MoveStaticMembersDialogViewModel.cs       |  9 +-
 .../MoveStaticMembersViewModelTest.vb         |  8 --
 6 files changed, 145 insertions(+), 15 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index d6f494db2a1ab..2aa3ae48d95aa 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -243,6 +243,43 @@ internal static class Class1Helpers
             await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
         }
 
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveNothing()
+        {
+            var initialMarkup = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var newFileName = "Class1Helpers.cs";
+            var selectedMembers = ImmutableArray<string>.Empty;
+            var expectedResult1 = @"
+namespace TestNs1
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}";
+            var expectedResult2 = @"namespace TestNs1
+{
+    internal static class Class1Helpers
+    {
+    }
+}";
+            await TestMovementNewFileAsync(initialMarkup, expectedResult1, expectedResult2, newFileName, selectedMembers, selectedDestinationName).ConfigureAwait(false);
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestMoveMethodWithTrivia()
         {
diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index e5de946cff64c..fd4c3d85b4b84 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -243,6 +243,36 @@ End Namespace
             Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
         End Function
 
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveNothing() As Task
+            Dim initialMarkup = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray(Of String).Empty
+            Dim expectedText1 = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim expectedText2 = "Namespace TestNs
+    Class Class1Helpers
+    End Class
+End Namespace
+"
+
+            Await TestMovementNewFileAsync(initialMarkup, expectedText1, expectedText2, newFileName, selection, newTypeName)
+        End Function
+
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveFunctionWithTrivia() As Task
             Dim initialMarkup = "
@@ -1741,6 +1771,74 @@ End Namespace
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveFunctionWithRootNamespace() As Task
             Dim initialMarkup = "
+Public Class Class1
+    Public Shared Function Test[||]Func() As Integer
+        Return 0
+    End Function
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Public Class Class1
+End Class"
+            ' if we cut out the root namespace, the returned namespace should still be the same
+            Dim expectedText2 = "Class Class1Helpers
+    Public Shared Function TestFunc() As Integer
+        Return 0
+    End Function
+End Class
+"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With {.TestCode = initialMarkup}
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+            test.SolutionTransforms.Add(
+                Function(solution, projectId)
+                    Dim project = solution.GetProject(projectId)
+                    Dim compilationOptions = DirectCast(project.CompilationOptions, VisualBasicCompilationOptions)
+                    Return project.WithCompilationOptions(compilationOptions.WithRootNamespace("RootNs")).Solution
+                End Function)
+            Await test.RunAsync()
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionWithMultipleRootNamespaces() As Task
+            Dim initialMarkup = "
+Public Class Class1
+    Public Shared Function Test[||]Func() As Integer
+        Return 0
+    End Function
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim newFileName = "Class1Helpers.vb"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim expectedText1 = "
+Public Class Class1
+End Class"
+            ' if we cut out the root namespace, the returned namespace should still be the same
+            Dim expectedText2 = "Class Class1Helpers
+    Public Shared Function TestFunc() As Integer
+        Return 0
+    End Function
+End Class
+"
+
+            Dim test = New Test(newTypeName, selection, newFileName) With {.TestCode = initialMarkup}
+            test.FixedState.Sources.Add(expectedText1)
+            test.FixedState.Sources.Add((newFileName, expectedText2))
+            test.SolutionTransforms.Add(
+                Function(solution, projectId)
+                    Dim project = solution.GetProject(projectId)
+                    Dim compilationOptions = DirectCast(project.CompilationOptions, VisualBasicCompilationOptions)
+                    Return project.WithCompilationOptions(compilationOptions.WithRootNamespace("RootNs.TestNs")).Solution
+                End Function)
+            Await test.RunAsync()
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionWithRootAndNestedNamespace() As Task
+            Dim initialMarkup = "
 Namespace TestNs
     Public Class Class1
         Public Shared Function Test[||]Func() As Integer
diff --git a/src/Features/Core/Portable/Shared/Utilities/ExtractTypeHelpers.cs b/src/Features/Core/Portable/Shared/Utilities/ExtractTypeHelpers.cs
index 2e7d22710f381..5f123921a3919 100644
--- a/src/Features/Core/Portable/Shared/Utilities/ExtractTypeHelpers.cs
+++ b/src/Features/Core/Portable/Shared/Utilities/ExtractTypeHelpers.cs
@@ -71,9 +71,10 @@ internal static class ExtractTypeHelpers
             var generateTypeService = newDocument.GetRequiredLanguageService<IGenerateTypeService>();
             var rootNamespace = generateTypeService.GetRootNamespace(newDocument.Project.CompilationOptions);
             var index = rootNamespace.IsEmpty() ? -1 : containingNamespaceDisplay.IndexOf(rootNamespace);
-            // if we did find the root namespace as the first element, then we remove it plus the "." character
+            // if we did find the root namespace as the first element, then we remove it
+            // this may leave us with an extra "." character at the start, but when we split it shouldn't matter
             var namespaceWithoutRoot = index == 0
-                ? containingNamespaceDisplay.Remove(index, rootNamespace.Length + 1)
+                ? containingNamespaceDisplay.Remove(index, rootNamespace.Length)
                 : containingNamespaceDisplay;
 
             var namespaceParts = namespaceWithoutRoot.Split('.').Where(s => !string.IsNullOrEmpty(s));
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
index 7e07a465248e8..f9fc94bc8df13 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
@@ -118,7 +118,8 @@
                     Click="OK_Click" 
                     IsDefault="True"
                     MinWidth="73"
-                    MinHeight="21"/>
+                    MinHeight="21"
+                    IsEnabled="{Binding CanSubmit}"/>
             <Button x:Uid="CancelButton" 
                     Name="CancelButton"
                     Content="{Binding ElementName=dialog, Path=Cancel}"
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
index 97ef295e58597..f02e161288486 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
@@ -52,9 +52,9 @@ public void OnDestinationUpdated()
             // TODO change once we allow movement to existing types
             var fullyQualifiedTypeName = PrependedNamespace + DestinationName;
             var isNewType = !_existingNames.Contains(fullyQualifiedTypeName);
-            _isValidName = isNewType && IsValidType(fullyQualifiedTypeName);
+            CanSubmit = isNewType && IsValidType(fullyQualifiedTypeName);
 
-            if (_isValidName)
+            if (CanSubmit)
             {
                 Icon = KnownMonikers.StatusInformation;
                 Message = ServicesVSResources.New_Type_Name_colon;
@@ -118,10 +118,11 @@ public bool ShowMessage
             private set => SetProperty(ref _showMessage, value);
         }
 
-        private bool _isValidName = true;
+        private bool _canSubmit = true;
         public bool CanSubmit
         {
-            get => _isValidName && MemberSelectionViewModel.CheckedMembers.Length > 0;
+            get => _canSubmit;
+            set => SetProperty(ref _canSubmit, value);
         }
     }
 }
diff --git a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
index 8089bc08d2590..50861850c323e 100644
--- a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
+++ b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
@@ -305,22 +305,18 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             DeselectMember("Dependent", selectionVm)
 
             Assert.True(selectionVm.CheckedMembers.IsEmpty)
-            Assert.False(viewModel.CanSubmit)
 
             selectionVm.SelectAll()
             ' If constructor and operators are able to be selected, this would be a higher number
             Assert.Equal(7, selectionVm.CheckedMembers.Length)
-            Assert.True(viewModel.CanSubmit)
 
             selectionVm.DeselectAll()
             Assert.True(selectionVm.CheckedMembers.IsEmpty)
-            Assert.False(viewModel.CanSubmit)
 
             SelectMember("Dependent", selectionVm)
             selectionVm.SelectDependents()
             Assert.True(FindMemberByName("Barbar", selectionVm.Members).IsChecked)
             Assert.Equal(2, selectionVm.CheckedMembers.Length)
-            Assert.True(viewModel.CanSubmit)
         End Function
 #End Region
 
@@ -586,22 +582,18 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             DeselectMember("Dependent", selectionVm)
 
             Assert.True(selectionVm.CheckedMembers.IsEmpty)
-            Assert.False(viewModel.CanSubmit)
 
             selectionVm.SelectAll()
             ' If constructor and operators are able to be selected, this would be a higher number
             Assert.Equal(7, selectionVm.CheckedMembers.Length)
-            Assert.True(viewModel.CanSubmit)
 
             selectionVm.DeselectAll()
             Assert.True(selectionVm.CheckedMembers.IsEmpty)
-            Assert.False(viewModel.CanSubmit)
 
             SelectMember("Dependent", selectionVm)
             selectionVm.SelectDependents()
             Assert.True(FindMemberByName("Barbar", selectionVm.Members).IsChecked)
             Assert.Equal(2, selectionVm.CheckedMembers.Length)
-            Assert.True(viewModel.CanSubmit)
         End Function
 #End Region
     End Class

From 276e65230ebccdcdc01575db87f9f67d0cc0a857 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Tue, 31 Aug 2021 13:35:50 -0700
Subject: [PATCH 45/64] Changed CanSubmit property

---
 .../MoveStaticMembersDialogViewModel.cs       | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
index d62fffd534661..7a66c070b8ea0 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
@@ -78,15 +78,15 @@ private void OnSearchTextOrIndexUpdated()
         private void OnDestinationUpdated()
         {
             var isNewType = DestinationName.IsNew;
-            _isValidName = !isNewType || IsValidType(DestinationName!.TypeName);
+            CanSubmit = !isNewType || IsValidType(DestinationName!.TypeName);
 
-            if (_isValidName && isNewType)
+            if (CanSubmit && isNewType)
             {
                 Icon = KnownMonikers.StatusInformation;
                 Message = ServicesVSResources.New_Type_Name_colon;
                 ShowMessage = true;
             }
-            else if (!_isValidName)
+            else if (!CanSubmit)
             {
                 Icon = KnownMonikers.StatusInvalid;
                 Message = ServicesVSResources.Invalid_type_name;
@@ -97,19 +97,14 @@ private void OnDestinationUpdated()
                 ShowMessage = false;
             }
 
-            ShownTypes = AvailableTypes.WhereAsArray(t => t.TypeName.Contains(SearchText));
-            if (_isValidName)
+            var shownTypes = AvailableTypes.WhereAsArray(t => t.TypeName.Contains(SearchText));
+            // always show option to make new type if valid
+            if (isNewType)
             {
-                // always show option to make new type if valid
-                if (isNewType)
-                {
-                    ShownTypes = ShownTypes.Insert(0, DestinationName);
-                }
-                else
-                {
-                    ShownTypes = ShownTypes.Insert(0, new TypeNameItem(DestinationName.TypeName));
-                }
+                shownTypes = shownTypes.Insert(0, DestinationName);
             }
+
+            ShownTypes = shownTypes;
         }
 
         private bool IsValidType(string typeName)
@@ -195,10 +190,11 @@ public bool ShowMessage
             private set => SetProperty(ref _showMessage, value);
         }
 
-        private bool _isValidName = true;
+        private bool _canSubmit = true;
         public bool CanSubmit
         {
-            get => _isValidName && MemberSelectionViewModel.CheckedMembers.Length > 0;
+            get => _canSubmit;
+            set => SetProperty(ref _canSubmit, value);
         }
     }
 }

From 50741a1bd9c048bb5d29720a0bd48addd11a87ea Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Tue, 31 Aug 2021 15:42:49 -0700
Subject: [PATCH 46/64] Dialog changes, now in line with move to namespace more
 or less

---
 .../MoveStaticMembersDialog.xaml              | 10 ++-----
 .../MoveStaticMembersDialogViewModel.cs       | 30 +++----------------
 2 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
index a4f48dea4b3d5..f4ad29c0d2c69 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
@@ -51,7 +51,7 @@
                 AutomationProperties.LabeledBy="{Binding ElementName=DestinationLabel}"
                 Text="{Binding SearchText, Mode=TwoWay}"
                 SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}"
-                ItemsSource="{Binding ShownTypes, Mode=OneWay}"
+                ItemsSource="{Binding AvailableTypes, Mode=OneTime}"
                 BorderThickness="1" 
                 Margin="0 0 20 0"
                 MaxDropDownHeight="150">
@@ -74,11 +74,6 @@
                                 Visibility="{Binding IsFromHistory, Converter={StaticResource BooleanToVisibilityConverter}}" 
                                 Margin="0 0 5 0" 
                                 Moniker="{x:Static imagecatalog:KnownMonikers.History}" />
-                            <imaging:CrispImage
-                                Grid.Column="1"
-                                Visibility="{Binding IsNew, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                Margin="0 0 5 0"
-                                Moniker="{x:Static imagecatalog:KnownMonikers.Add}"/>
                             <TextBlock
                                 Grid.Column="3"
                                 HorizontalAlignment="Left"
@@ -94,7 +89,8 @@
             </ComboBox>
 
 
-            <GroupBox>
+            <GroupBox
+                BorderThickness="0">
                 <GroupBox.Header>
                     <StackPanel 
                     Orientation="Horizontal"  
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
index 7a66c070b8ea0..7f600e6290a2b 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
@@ -51,8 +51,6 @@ private void MoveMembersToTypeDialogViewModel_PropertyChanged(object sender, Pro
                     OnDestinationUpdated();
                     break;
                 case nameof(SelectedIndex):
-                    OnSearchTextOrIndexUpdated();
-                    break;
                 case nameof(SearchText):
                     OnSearchTextOrIndexUpdated();
                     break;
@@ -62,15 +60,14 @@ private void MoveMembersToTypeDialogViewModel_PropertyChanged(object sender, Pro
         private void OnSearchTextOrIndexUpdated()
         {
             // we either typed something or changed the selection
-            if (SelectedIndex != -1 && SearchText == ShownTypes[SelectedIndex].TypeName)
+            if (SelectedIndex != -1 && SearchText == AvailableTypes[SelectedIndex].TypeName)
             {
-                // The user has selected a destination
-                DestinationName = ShownTypes[SelectedIndex];
+                // Search text is not selecting anything, create a destination for the
+                // contents of the text.
+                DestinationName = AvailableTypes[SelectedIndex];
             }
             else
             {
-                // Search text is not selecting anything, create a destination for the
-                // contents of the text.
                 DestinationName = new TypeNameItem(SearchText);
             }
         }
@@ -96,15 +93,6 @@ private void OnDestinationUpdated()
             {
                 ShowMessage = false;
             }
-
-            var shownTypes = AvailableTypes.WhereAsArray(t => t.TypeName.Contains(SearchText));
-            // always show option to make new type if valid
-            if (isNewType)
-            {
-                shownTypes = shownTypes.Insert(0, DestinationName);
-            }
-
-            ShownTypes = shownTypes;
         }
 
         private bool IsValidType(string typeName)
@@ -157,16 +145,6 @@ public string SearchText
             set => SetProperty(ref _searchText, value);
         }
 
-        private ImmutableArray<TypeNameItem> _shownTypes;
-        public ImmutableArray<TypeNameItem> ShownTypes
-        {
-            get => _shownTypes;
-            private set
-            {
-                SetProperty(ref _shownTypes, value);
-            }
-        }
-
         public ImmutableArray<TypeNameItem> AvailableTypes { get; }
 
         private ImageMoniker _icon;

From 7c3648202c323adeb402cc42ae2e3b968951b324 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Tue, 31 Aug 2021 16:03:11 -0700
Subject: [PATCH 47/64] Added history functionality

---
 ...alStudioMoveStaticMembersOptionsService.cs | 37 +++++++++++++------
 .../MoveStaticMembersViewModelTest.vb         |  2 +-
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index 9427603539f30..deb542e3ba00f 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -32,7 +32,7 @@ internal class VisualStudioMoveStaticMembersOptionsService : IMoveStaticMembersO
 
         private const int HistorySize = 3;
 
-        public readonly LinkedList<(string, string)> History = new();
+        public readonly LinkedList<INamedTypeSymbol> History = new();
 
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
@@ -54,12 +54,29 @@ public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, I
 
             if (result.GetValueOrDefault())
             {
+                UpdateHistory(viewModel);
                 return GenerateOptions(document.Project.Language, viewModel);
             }
 
             return MoveStaticMembersOptions.Cancelled;
         }
 
+        private void UpdateHistory(MoveStaticMembersDialogViewModel viewModel)
+        {
+            if (viewModel.DestinationName.IsNew || viewModel.DestinationName.IsFromHistory)
+            {
+                // if we create a new destination or already have it in the history,
+                // we don't need to update our history list.
+                return;
+            }
+
+            History.AddFirst(viewModel.DestinationName.NamedType!);
+            if (History.Count > HistorySize)
+            {
+                History.RemoveLast();
+            }
+        }
+
         // internal for testing purposes
         internal static MoveStaticMembersOptions GenerateOptions(string language, MoveStaticMembersDialogViewModel viewModel)
         {
@@ -75,13 +92,11 @@ internal static MoveStaticMembersOptions GenerateOptions(string language, MoveSt
                     viewModel.PrependedNamespace + destination.TypeName,
                     selectedMembers);
             }
-            else
-            {
-                return new MoveStaticMembersOptions(
-                    destination.DeclarationFile,
-                    destination.NamedType!,
-                    selectedMembers);
-            }
+
+            return new MoveStaticMembersOptions(
+                destination.DeclarationFile,
+                destination.NamedType!,
+                selectedMembers);
         }
 
         // internal for testing purposes, get the view model
@@ -89,7 +104,7 @@ internal static MoveStaticMembersDialogViewModel GetViewModel(
             Document document,
             INamedTypeSymbol selectedType,
             ISymbol? selectedNodeSymbol,
-            LinkedList<(string, string)> history,
+            LinkedList<INamedTypeSymbol> history,
             IGlyphService? glyphService,
             IUIThreadOperationExecutor uiThreadOperationExecutor)
         {
@@ -143,7 +158,7 @@ private static ImmutableArray<TypeNameItem> MakeTypeNameItems(
             INamespaceSymbol currentNamespace,
             INamedTypeSymbol currentType,
             Document currentDocument,
-            LinkedList<(string, string)> history,
+            LinkedList<INamedTypeSymbol> history,
             CancellationToken cancellationToken)
         {
             return currentNamespace.GetAllTypes(cancellationToken).SelectMany(t =>
@@ -154,7 +169,7 @@ private static ImmutableArray<TypeNameItem> MakeTypeNameItems(
                     .Where(l => l.IsInSource &&
                         (currentType.Name != t.Name || GetFile(l) != currentDocument.Name))
                     .Select(l => new TypeNameItem(
-                        history.Contains((t.Name, currentDocument.Name)),
+                        history.Contains(t),
                         GetFile(l),
                         t));
             })
diff --git a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
index c2b1f065cb028..57bad77344f13 100644
--- a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
+++ b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
@@ -36,7 +36,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
                     workspaceDoc,
                     memberSymbol.ContainingType,
                     memberSymbol,
-                    New LinkedList(Of (String, String)),
+                    New LinkedList(Of INamedTypeSymbol),
                     Nothing,
                     workspace.GetService(Of IUIThreadOperationExecutor))
             End Using

From bdf98b99c50020cfd181bb8318445f4fd713d75d Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Wed, 1 Sep 2021 13:03:15 -0700
Subject: [PATCH 48/64] Added separate conflicting type name list, added tests
 for viewModel

---
 .../MoveStaticMembersDialogViewModel.cs       |   8 +-
 .../MoveStaticMembers/TypeNameItem.cs         |   2 +-
 ...alStudioMoveStaticMembersOptionsService.cs |  15 +-
 .../MoveStaticMembersViewModelTest.vb         | 200 ++++++++++++++++++
 4 files changed, 216 insertions(+), 9 deletions(-)

diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
index 7f600e6290a2b..d845e384dd390 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
@@ -20,12 +20,13 @@ internal class MoveStaticMembersDialogViewModel : AbstractNotifyPropertyChanged
 
         private readonly ISyntaxFacts _syntaxFacts;
 
-        private readonly string _sourceTypeName;
+        private readonly ImmutableArray<INamedTypeSymbol> _conflictingTypeNames;
 
         public MoveStaticMembersDialogViewModel(
             StaticMemberSelectionViewModel memberSelectionViewModel,
             string defaultType,
             ImmutableArray<TypeNameItem> availableTypes,
+            ImmutableArray<INamedTypeSymbol> conflictingTypeNames,
             string sourceTypeName,
             string containingNamespace,
             ISyntaxFacts syntaxFacts)
@@ -34,8 +35,8 @@ public MoveStaticMembersDialogViewModel(
             _syntaxFacts = syntaxFacts ?? throw new ArgumentNullException(nameof(syntaxFacts));
             _searchText = defaultType;
             AvailableTypes = availableTypes;
+            _conflictingTypeNames = conflictingTypeNames;
             _destinationName = new TypeNameItem(defaultType);
-            _sourceTypeName = sourceTypeName;
             _prependedNamespace = containingNamespace + ".";
 
             PropertyChanged += MoveMembersToTypeDialogViewModel_PropertyChanged;
@@ -98,8 +99,7 @@ private void OnDestinationUpdated()
         private bool IsValidType(string typeName)
         {
             if (string.IsNullOrEmpty(typeName) ||
-                typeName == _sourceTypeName ||
-                AvailableTypes.Any(t => t.TypeName == (PrependedNamespace + typeName)))
+                _conflictingTypeNames.Any(t => t.ToDisplayString() == PrependedNamespace + typeName))
             {
                 return false;
             }
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/TypeNameItem.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/TypeNameItem.cs
index abe663db9df32..cb97870c112cb 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/TypeNameItem.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/TypeNameItem.cs
@@ -30,7 +30,7 @@ public TypeNameItem(string @typeName)
             IsNew = true;
             TypeName = @typeName;
             NamedType = null;
-            DeclarationFile = ServicesVSResources.Create_new_file;
+            DeclarationFile = string.Empty;
         }
 
         public override string ToString() => TypeName;
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index deb542e3ba00f..9b928d8350570 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -122,15 +122,18 @@ internal static MoveStaticMembersDialogViewModel GetViewModel(
             using var cancellationTokenSource = new CancellationTokenSource();
             var memberToDependentsMap = SymbolDependentsBuilder.FindMemberToDependentsMap(membersInType, document.Project, cancellationTokenSource.Token);
 
-            var existingTypeNames = MakeTypeNameItems(
+            var availableTypeNames = MakeTypeNameItems(
                 selectedType.ContainingNamespace,
                 selectedType,
                 document,
                 history,
                 cancellationTokenSource.Token);
 
+            // there can be type names that conflict but we can't move to (like interface type names or ourself)
+            var conflictingTypeNames = selectedType.ContainingNamespace.GetAllTypes(cancellationTokenSource.Token);
+
             var candidateName = selectedType.Name + "Helpers";
-            var defaultTypeName = NameGenerator.GenerateUniqueName(candidateName, name => !existingTypeNames.Contains(tName => tName.TypeName == name));
+            var defaultTypeName = NameGenerator.GenerateUniqueName(candidateName, name => !conflictingTypeNames.Any(t => t.Name == name));
 
             var containingNamespaceDisplay = selectedType.ContainingNamespace.IsGlobalNamespace
                 ? string.Empty
@@ -143,7 +146,8 @@ internal static MoveStaticMembersDialogViewModel GetViewModel(
 
             return new MoveStaticMembersDialogViewModel(selectMembersViewModel,
                 defaultTypeName,
-                existingTypeNames,
+                availableTypeNames,
+                conflictingTypeNames.ToImmutableArray(),
                 selectedType.Name,
                 containingNamespaceDisplay,
                 document.GetRequiredLanguageService<ISyntaxFactsService>());
@@ -161,7 +165,10 @@ private static ImmutableArray<TypeNameItem> MakeTypeNameItems(
             LinkedList<INamedTypeSymbol> history,
             CancellationToken cancellationToken)
         {
-            return currentNamespace.GetAllTypes(cancellationToken).SelectMany(t =>
+            return currentNamespace.GetAllTypes(cancellationToken)
+                // only take symbols that are the same kind of type (class, module)
+                .Where(t => t.TypeKind == currentType.TypeKind)
+                .SelectMany(t =>
             {
                 // for partially declared classes, we may want multiple entries for a single type.
                 // filter to those actually in a real file, and that is not our current location.
diff --git a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
index 57bad77344f13..43a456af8f068 100644
--- a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
+++ b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
@@ -322,6 +322,113 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.True(FindMemberByName("Barbar", selectionVm.Members).IsChecked)
             Assert.Equal(2, selectionVm.CheckedMembers.Length)
         End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function CSTestTypeSelection() As Task
+            Dim markUp = <Text><![CDATA[
+<Workspace>
+    <Project Language="C#" AssemblyName="CSAssembly1" CommonReferences="true">
+        <Document>
+            namespace TestNs
+            {
+                public class TestClass
+                {
+                    public static int Bar$$bar()
+                    {
+                        return 12345;
+                    }
+                }
+            }
+        </Document>
+        <Document>
+            public class NoNsClass
+            {
+            }
+        </Document>
+        <Document>
+            namespace TestNs
+            {
+                public interface ITestInterface
+                {
+                }
+            }
+        </Document>
+        <Document FilePath="TestFile.cs">
+            namespace TestNs 
+            {
+                public class ConflictingClassName
+                {
+                }
+            }
+        </Document>
+        <Document>
+            namespace TestNs2 
+            {
+                public class ConflictingClassName2
+                {
+                }
+            }
+        </Document>
+        <Document>
+            namespace TestNs.ExtraNs
+            {
+                public class ConflictingNsClassName
+                {
+                }
+            }
+        </Document>
+    </Project>
+    <Project Language="C#" AssemblyName="CSAssembly2" CommonReferences="true">
+        <Document>
+            namespace TestNs 
+            {
+                public class ConflictingClassName3
+                {
+                }
+            }
+        </Document>
+    </Project>
+</Workspace>]]></Text>
+            Dim viewModel = Await GetViewModelAsync(markUp)
+
+            Assert.Equal(viewModel.SearchText, "TestClassHelpers")
+
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
+
+            Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
+            Assert.True(viewModel.CanSubmit)
+
+            ' there should only be 2 available types that are
+            ' a) the same kind
+            ' b) in the same or nested namespace
+            ' c) in the same project
+            Assert.Equal(2, viewModel.AvailableTypes.Length)
+            Assert.Equal(-1, viewModel.SelectedIndex)
+
+            ' We can't really test searchtext or selected index behavior because it is
+            ' handled by the combobox, and doesn't update in the same way
+            viewModel.DestinationName = viewModel.AvailableTypes.ElementAt(1)
+            Assert.Equal("TestNs.ExtraNs.ConflictingNsClassName", viewModel.DestinationName.TypeName)
+            Assert.NotNull(viewModel.DestinationName.NamedType)
+            Assert.False(viewModel.DestinationName.IsNew)
+            Assert.False(viewModel.ShowMessage)
+            Assert.True(viewModel.CanSubmit)
+
+            viewModel.DestinationName = viewModel.AvailableTypes.ElementAt(0)
+            Assert.Equal("TestNs.ConflictingClassName", viewModel.DestinationName.TypeName)
+            Assert.NotNull(viewModel.DestinationName.NamedType)
+            Assert.False(viewModel.DestinationName.IsNew)
+            Assert.False(viewModel.ShowMessage)
+            Assert.True(viewModel.CanSubmit)
+
+            Dim options = Submit(viewModel, cSharp:=True)
+            Assert.False(options.IsNewType)
+            Assert.False(options.IsCancelled)
+            Assert.NotNull(options.Destination)
+            Assert.Equal("TestNs.ConflictingClassName", options.Destination.ToDisplayString())
+            Assert.Equal("TestFile.cs", options.FileName)
+        End Function
 #End Region
 
 #Region "VB"
@@ -593,6 +700,99 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.True(FindMemberByName("Barbar", selectionVm.Members).IsChecked)
             Assert.Equal(2, selectionVm.CheckedMembers.Length)
         End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function VBTestTypeSelection() As Task
+            Dim markUp = <Text><![CDATA[
+<Workspace>
+    <Project Language="Visual Basic" AssemblyName="VBAssembly1" CommonReferences="true">
+        <Document>
+            Namespace TestNs
+                Public Class TestClass
+                    Public Shared Function Bar$$bar() As Integer
+                        Return 12345;
+                    End Function
+                End Class
+            End Namespace
+        </Document>
+        <Document>
+            Public Class NoNsClass
+            End Class
+        </Document>
+        <Document>
+            Namespace TestNs
+                Public Interface ITestInterface
+                End Interface
+            End Namespace
+        </Document>
+        <Document FilePath="TestFile.vb">
+            Namespace TestNs
+                Public Class ConflictingClassName
+                End Class
+            End Namespace
+        </Document>
+        <Document>
+            Namespace TestNs2
+                Public Class ConflictingClassName2
+                End Class
+            End Namespace
+        </Document>
+        <Document>
+            Namespace TestNs.ExtraNs
+                Public Class ConflictingNsClassName
+                End Class
+            End Namespace
+        </Document>
+    </Project>
+    <Project Language="C#" AssemblyName="CSAssembly2" CommonReferences="true">
+        <Document>
+            Namespace TestNs
+                Public Class ConflictingClassName3
+                End Class
+            End Namespace
+        </Document>
+    </Project>
+</Workspace>]]></Text>
+            Dim viewModel = Await GetViewModelAsync(markUp)
+
+            Assert.Equal(viewModel.SearchText, "TestClassHelpers")
+
+            Assert.True(viewModel.ShowMessage)
+            Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
+
+            Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
+            Assert.True(viewModel.CanSubmit)
+
+            ' there should only be 2 available types that are
+            ' a) the same kind
+            ' b) in the same or nested namespace
+            ' c) in the same project
+            Assert.Equal(2, viewModel.AvailableTypes.Length)
+            Assert.Equal(-1, viewModel.SelectedIndex)
+
+            ' We can't really test searchtext or selected index behavior because it is
+            ' handled by the combobox, and doesn't update in the same way
+            viewModel.DestinationName = viewModel.AvailableTypes.ElementAt(1)
+            Assert.Equal("TestNs.ExtraNs.ConflictingNsClassName", viewModel.DestinationName.TypeName)
+            Assert.NotNull(viewModel.DestinationName.NamedType)
+            Assert.False(viewModel.DestinationName.IsNew)
+            Assert.False(viewModel.ShowMessage)
+            Assert.True(viewModel.CanSubmit)
+
+            viewModel.DestinationName = viewModel.AvailableTypes.ElementAt(0)
+            Assert.Equal("TestNs.ConflictingClassName", viewModel.DestinationName.TypeName)
+            Assert.NotNull(viewModel.DestinationName.NamedType)
+            Assert.False(viewModel.DestinationName.IsNew)
+            Assert.False(viewModel.ShowMessage)
+            Assert.True(viewModel.CanSubmit)
+
+            Dim options = Submit(viewModel, cSharp:=False)
+            Assert.False(options.IsNewType)
+            Assert.False(options.IsCancelled)
+            Assert.NotNull(options.Destination)
+            Assert.Equal("TestNs.ConflictingClassName", options.Destination.ToDisplayString())
+            Assert.Equal("TestFile.vb", options.FileName)
+        End Function
 #End Region
     End Class
 End Namespace

From e4088a7902d3fcfcec249ee0db2d7998fee247c4 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Thu, 2 Sep 2021 09:22:41 -0700
Subject: [PATCH 49/64] Added some basic tests and implementation

---
 .../CSharpMoveStaticMembersTests.cs           | 277 +++++++++++++++++-
 .../TestMoveStaticMembersService.cs           |  29 +-
 .../VisualBasicMoveStaticMembersTests.vb      |   2 +-
 .../MoveStaticMembersWithDialogCodeAction.cs  |  83 ++++--
 4 files changed, 357 insertions(+), 34 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index 2aa3ae48d95aa..5c2ce82deb940 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -18,7 +18,7 @@ public class CSharpMoveStaticMembersTests
     {
         private static readonly TestComposition s_testServices = FeaturesTestCompositions.Features.AddParts(typeof(TestMoveStaticMembersService));
 
-        #region Perform Actions From Options
+        #region Perform New Type Action From Options
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
         public async Task TestMoveField()
         {
@@ -2192,6 +2192,242 @@ public static int TestMethod()
         }
         #endregion
 
+        #region Perform Existing Type Action From Options
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveFieldToExistingType()
+        {
+            var initialSourceMarkup = @"
+public class Class1
+{
+    public static int Test[||]Field = 1;
+}";
+            var initialDestinationMarkup = @"
+public class Class1Helpers
+{
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var fixedSourceMarkup = @"
+public class Class1
+{
+}";
+            var fixedDestinationMarkup = @"
+public class Class1Helpers
+{
+    public static int TestField = 1;
+}";
+
+            await TestMovementExistingFileAsync(
+                initialSourceMarkup,
+                initialDestinationMarkup,
+                fixedSourceMarkup,
+                fixedDestinationMarkup,
+                selectedMembers,
+                selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMovePropertyToExistingType()
+        {
+            var initialSourceMarkup = @"
+public class Class1
+{
+    public static int Test[||]Property { get; set; }
+}";
+            var initialDestinationMarkup = @"
+public class Class1Helpers
+{
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var selectedMembers = ImmutableArray.Create("TestProperty");
+            var fixedSourceMarkup = @"
+public class Class1
+{
+}";
+            var fixedDestinationMarkup = @"
+public class Class1Helpers
+{
+    public static int TestProperty { get; set; }
+}";
+
+            await TestMovementExistingFileAsync(
+                initialSourceMarkup,
+                initialDestinationMarkup,
+                fixedSourceMarkup,
+                fixedDestinationMarkup,
+                selectedMembers,
+                selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveEventToExistingType()
+        {
+            var initialSourceMarkup = @"
+using System;
+
+public class Class1
+{
+    public static event EventHandler Test[||]Event;
+}";
+            var initialDestinationMarkup = @"
+public class Class1Helpers
+{
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var selectedMembers = ImmutableArray.Create("TestEvent");
+            var fixedSourceMarkup = @"
+using System;
+
+public class Class1
+{
+}";
+            var fixedDestinationMarkup = @"
+using System;
+
+public class Class1Helpers
+{
+    public static event EventHandler TestEvent;
+}";
+
+            await TestMovementExistingFileAsync(
+                initialSourceMarkup,
+                initialDestinationMarkup,
+                fixedSourceMarkup,
+                fixedDestinationMarkup,
+                selectedMembers,
+                selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodToExistingType()
+        {
+            var initialSourceMarkup = @"
+public class Class1
+{
+    public static int Test[||]Method()
+    {
+        return 0;
+    }
+}";
+            var initialDestinationMarkup = @"
+public class Class1Helpers
+{
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var fixedSourceMarkup = @"
+public class Class1
+{
+}";
+            var fixedDestinationMarkup = @"
+public class Class1Helpers
+{
+    public static int TestMethod()
+    {
+        return 0;
+    }
+}";
+
+            await TestMovementExistingFileAsync(
+                initialSourceMarkup,
+                initialDestinationMarkup,
+                fixedSourceMarkup,
+                fixedDestinationMarkup,
+                selectedMembers,
+                selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveExtensionMethodToExistingType()
+        {
+            var initialSourceMarkup = @"
+public static class Class1
+{
+    public static int Test[||]Method(this Other other)
+    {
+        return other.OtherInt + 2;
+    }
+}
+
+public class Other
+{
+    public int OtherInt;
+    public Other()
+    {
+        OtherInt = 5;
+    }
+}";
+            var initialDestinationMarkup = @"
+public static class Class1Helpers
+{
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var fixedSourceMarkup = @"
+public static class Class1
+{
+}
+
+public class Other
+{
+    public int OtherInt;
+    public Other()
+    {
+        OtherInt = 5;
+    }
+}";
+            var fixedDestinationMarkup = @"
+public static class Class1Helpers
+{
+    public static int TestMethod(this Other other)
+    {
+        return other.OtherInt + 2;
+    }
+}";
+
+            await TestMovementExistingFileAsync(
+                initialSourceMarkup,
+                initialDestinationMarkup,
+                fixedSourceMarkup,
+                fixedDestinationMarkup,
+                selectedMembers,
+                selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveConstFieldToExistingType()
+        {
+            var initialSourceMarkup = @"
+public class Class1
+{
+    public const int Test[||]Field = 1;
+}";
+            var initialDestinationMarkup = @"
+public class Class1Helpers
+{
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var selectedMembers = ImmutableArray.Create("TestField");
+            var fixedSourceMarkup = @"
+public class Class1
+{
+}";
+            var fixedDestinationMarkup = @"
+public class Class1Helpers
+{
+    public const int TestField = 1;
+}";
+
+            await TestMovementExistingFileAsync(
+                initialSourceMarkup,
+                initialDestinationMarkup,
+                fixedSourceMarkup,
+                fixedDestinationMarkup,
+                selectedMembers,
+                selectedDestinationName).ConfigureAwait(false);
+        }
+        #endregion
+
         #region Selections and caret position
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
@@ -2571,18 +2807,22 @@ private class Test : VerifyCS.Test
             public Test(
                 string destinationType,
                 ImmutableArray<string> selection,
-                string destinationName = "a.cs")
+                string? destinationName,
+                bool createNew = true)
             {
                 _destinationType = destinationType;
                 _selection = selection;
                 _destinationName = destinationName;
+                _createNew = createNew;
             }
 
             private readonly string _destinationType;
 
             private readonly ImmutableArray<string> _selection;
 
-            private readonly string _destinationName;
+            private readonly string? _destinationName;
+
+            private readonly bool _createNew;
 
             protected override Workspace CreateWorkspaceImpl()
             {
@@ -2590,9 +2830,10 @@ protected override Workspace CreateWorkspaceImpl()
 
                 var workspace = new AdhocWorkspace(hostServices);
                 var testOptionsService = (TestMoveStaticMembersService)workspace.Services.GetRequiredService<IMoveStaticMembersOptionsService>();
-                testOptionsService.DestinationType = _destinationType;
+                testOptionsService.DestinationName = _destinationType;
                 testOptionsService.SelectedMembers = _selection;
                 testOptionsService.Filename = _destinationName;
+                testOptionsService.CreateNew = _createNew;
 
                 return workspace;
             }
@@ -2618,9 +2859,35 @@ private static async Task TestMovementNewFileAsync(
                 },
             }.RunAsync().ConfigureAwait(false);
 
+        private static async Task TestMovementExistingFileAsync(
+            string intialSourceMarkup,
+            string initialDestinationMarkup,
+            string fixedSourceMarkup,
+            string fixedDestinationMarkup,
+            ImmutableArray<string> selectedMembers,
+            string selectedDestinationType,
+            string? selectedDestinationFile = null)
+        {
+            var test = new Test(selectedDestinationType, selectedMembers, selectedDestinationFile, createNew: false);
+            test.TestState.Sources.Add(intialSourceMarkup);
+            test.FixedState.Sources.Add(fixedSourceMarkup);
+            if (selectedDestinationFile != null)
+            {
+                test.TestState.Sources.Add((selectedDestinationFile, initialDestinationMarkup));
+                test.FixedState.Sources.Add((selectedDestinationFile, fixedDestinationMarkup));
+            }
+            else
+            {
+                test.TestState.Sources.Add(initialDestinationMarkup);
+                test.FixedState.Sources.Add(fixedDestinationMarkup);
+            }
+
+            await test.RunAsync().ConfigureAwait(false);
+        }
+
         private static async Task TestNoRefactoringAsync(string initialMarkup)
         {
-            await new Test("", ImmutableArray<string>.Empty)
+            await new Test("", ImmutableArray<string>.Empty, "")
             {
                 TestCode = initialMarkup,
                 FixedCode = initialMarkup,
diff --git a/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
index bc02f360ee914..a55d1167fb1c8 100644
--- a/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
+++ b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
@@ -4,8 +4,11 @@
 
 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
 {
@@ -20,23 +23,31 @@ public TestMoveStaticMembersService()
         {
         }
 
-        public string? DestinationType { get; set; }
+        public string? DestinationName { 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));
-            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);
+            if (CreateNew)
+            {
+                var namespaceDisplay = selectedType.ContainingNamespace.IsGlobalNamespace
+                    ? string.Empty
+                    : selectedType.ContainingNamespace.ToDisplayString();
+                return new MoveStaticMembersOptions(
+                    Filename!,
+                    string.Join(".", namespaceDisplay, DestinationName!),
+                    selectedMembers);
+            }
+
+            var destination = selectedType.ContainingNamespace.GetAllTypes(CancellationToken.None).First(t => t.ToDisplayString() == DestinationName);
+            var destinationFile = Filename ?? destination.DeclaringSyntaxReferences.Single().SyntaxTree.FilePath;
+            return new MoveStaticMembersOptions(destinationFile, destination, selectedMembers);
         }
     }
 }
diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index fd4c3d85b4b84..9c2cb92914da0 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -2250,7 +2250,7 @@ End Namespace"
 
                 Dim workspace = New AdhocWorkspace(hostServices)
                 Dim optionsService = DirectCast(workspace.Services.GetRequiredService(Of IMoveStaticMembersOptionsService)(), TestMoveStaticMembersService)
-                optionsService.DestinationType = _destinationType
+                optionsService.DestinationName = _destinationType
                 optionsService.Filename = _newFileName
                 optionsService.SelectedMembers = _members
 
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 5a8ab5e5459a5..10b8ab085ed5c 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -59,7 +59,6 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
             }
 
             // Find the original doc root
-            var syntaxFacts = _document.GetRequiredLanguageService<ISyntaxFactsService>();
             var root = await _document.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
 
             // add annotations to the symbols that we selected so we can find them later to pull up
@@ -72,13 +71,29 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
             root = root.TrackNodes(memberNodes);
             var sourceDoc = _document.WithSyntaxRoot(root);
 
+            if (!moveOptions.IsNewType)
+            {
+                // we already have our destination type
+                var fixedSolution = await RefactorAndMoveAsync(
+                    moveOptions.SelectedMembers,
+                    memberNodes,
+                    sourceDoc.Project.Solution,
+                    moveOptions.Destination!,
+                    // TODO: Find a way to merge/change generic type args for classes, or change PullMembersUp to handle instead
+                    typeArgIndices: ImmutableArray<int>.Empty,
+                    sourceDoc.Id,
+                    cancellationToken).ConfigureAwait(false);
+                return new CodeActionOperation[] { new ApplyChangesOperation(fixedSolution) };
+            }
+
+            // otherwise, we need to create a destination ourselves
             var typeParameters = ExtractTypeHelpers.GetRequiredTypeParametersForMembers(_selectedType, moveOptions.SelectedMembers);
             // which indices of the old type params should we keep for a new class reference, used for refactoring usages
             var typeArgIndices = Enumerable.Range(0, _selectedType.TypeParameters.Length)
                 .Where(i => typeParameters.Contains(_selectedType.TypeParameters[i]))
                 .ToImmutableArrayOrEmpty();
 
-            // even though we can move members here, we will move them by calling PullMembersUp
+            // even though we can move members here, we will move them later because of refactoring
             var newType = CodeGenerationSymbolFactory.CreateNamedTypeSymbol(
                 ImmutableArray.Create<AttributeData>(),
                 Accessibility.NotApplicable,
@@ -102,23 +117,14 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
             var destSemanticModel = await newDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
             newType = destSemanticModel.GetRequiredDeclaredSymbol(destRoot.GetAnnotatedNodes(annotation).Single(), cancellationToken) as INamedTypeSymbol;
 
-            // refactor references across the entire solution
-            var memberReferenceLocations = await FindMemberReferencesAsync(moveOptions.SelectedMembers, newDoc.Project.Solution, cancellationToken).ConfigureAwait(false);
-            var projectToLocations = memberReferenceLocations.ToLookup(loc => loc.location.Document.Project.Id);
-            var solutionWithFixedReferences = await RefactorReferencesAsync(projectToLocations, newDoc.Project.Solution, newType!, typeArgIndices, cancellationToken).ConfigureAwait(false);
-
-            sourceDoc = solutionWithFixedReferences.GetRequiredDocument(sourceDoc.Id);
-
-            // get back nodes from our changes
-            root = await sourceDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
-            var semanticModel = await sourceDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
-            var members = memberNodes
-                .Select(node => root.GetCurrentNode(node))
-                .WhereNotNull()
-                .SelectAsArray(node => (semanticModel.GetDeclaredSymbol(node!, cancellationToken), false));
-
-            var pullMembersUpOptions = PullMembersUpOptionsBuilder.BuildPullMembersUpOptions(newType!, members);
-            var movedSolution = await MembersPuller.PullMembersUpAsync(sourceDoc, pullMembersUpOptions, cancellationToken).ConfigureAwait(false);
+            var movedSolution = await RefactorAndMoveAsync(
+                moveOptions.SelectedMembers,
+                memberNodes,
+                newDoc.Project.Solution,
+                newType!,
+                typeArgIndices,
+                sourceDoc.Id,
+                cancellationToken).ConfigureAwait(false);
 
             return new CodeActionOperation[] { new ApplyChangesOperation(movedSolution) };
         }
@@ -133,6 +139,45 @@ private static TypeKind GetNewTypeKind(INamedTypeSymbol oldType)
             return oldType.TypeKind;
         }
 
+        /// <summary>
+        /// Finds references, refactors them, then moves the selected members to the destination.
+        /// Used when the destination type/file already exists.
+        /// </summary>
+        /// <param name="selectedMembers">selected member symbols</param>
+        /// <param name="oldMemberNodes">nodes corresponding to those symbols in the old solution, should have been annotated</param>
+        /// <param name="oldSolution">solution without any members moved/refactored</param>
+        /// <param name="newType">the type to move to, should be inserted into a document already</param>
+        /// <param name="typeArgIndices">generic type arg indices to keep when refactoring generic class access to the new type. Empty if not relevant</param>
+        /// <param name="sourceDocId">Id of the document where the mebers are being moved from</param>
+        /// <returns>The solution with references refactored and members moved to the newType</returns>
+        private static async Task<Solution> RefactorAndMoveAsync(
+            ImmutableArray<ISymbol> selectedMembers,
+            ImmutableArray<SyntaxNode> oldMemberNodes,
+            Solution oldSolution,
+            INamedTypeSymbol newType,
+            ImmutableArray<int> typeArgIndices,
+            DocumentId sourceDocId,
+            CancellationToken cancellationToken)
+        {
+            // refactor references across the entire solution
+            var memberReferenceLocations = await FindMemberReferencesAsync(selectedMembers, oldSolution, cancellationToken).ConfigureAwait(false);
+            var projectToLocations = memberReferenceLocations.ToLookup(loc => loc.location.Document.Project.Id);
+            var solutionWithFixedReferences = await RefactorReferencesAsync(projectToLocations, oldSolution, newType!, typeArgIndices, cancellationToken).ConfigureAwait(false);
+
+            var sourceDoc = solutionWithFixedReferences.GetRequiredDocument(sourceDocId);
+
+            // get back nodes from our changes
+            var root = await sourceDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var semanticModel = await sourceDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+            var members = oldMemberNodes
+                .Select(node => root.GetCurrentNode(node))
+                .WhereNotNull()
+                .SelectAsArray(node => (semanticModel.GetDeclaredSymbol(node!, cancellationToken), false));
+
+            var pullMembersUpOptions = PullMembersUpOptionsBuilder.BuildPullMembersUpOptions(newType!, members);
+            return await MembersPuller.PullMembersUpAsync(sourceDoc, pullMembersUpOptions, cancellationToken).ConfigureAwait(false);
+        }
+
         private static async Task<Solution> RefactorReferencesAsync(
             ILookup<ProjectId, (ReferenceLocation location, bool isExtensionMethod)> projectToLocations,
             Solution solution,

From b0757717712d6e7940e6001fa80b826d5891dacd Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Thu, 2 Sep 2021 10:25:20 -0700
Subject: [PATCH 50/64] Available types has extra filtering for static-ness

---
 ...VisualStudioMoveStaticMembersOptionsService.cs |  5 +++--
 .../MoveStaticMembersViewModelTest.vb             | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index 9b928d8350570..9d35e44722ad8 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -156,7 +156,7 @@ internal static MoveStaticMembersDialogViewModel GetViewModel(
         private static string GetFile(Location loc) => PathUtilities.GetFileName(loc.SourceTree!.FilePath);
 
         /// <summary>
-        /// Construct all the type names declared in the project, 
+        /// Construct all the type names declared in the project,
         /// </summary>
         private static ImmutableArray<TypeNameItem> MakeTypeNameItems(
             INamespaceSymbol currentNamespace,
@@ -167,7 +167,8 @@ private static ImmutableArray<TypeNameItem> MakeTypeNameItems(
         {
             return currentNamespace.GetAllTypes(cancellationToken)
                 // only take symbols that are the same kind of type (class, module)
-                .Where(t => t.TypeKind == currentType.TypeKind)
+                // and remove non-static types only when the current type is static
+                .Where(t => t.TypeKind == currentType.TypeKind && (t.IsStaticType() || !currentType.IsStaticType()))
                 .SelectMany(t =>
             {
                 // for partially declared classes, we may want multiple entries for a single type.
diff --git a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
index 43a456af8f068..b57021390436e 100644
--- a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
+++ b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
@@ -331,7 +331,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
         <Document>
             namespace TestNs
             {
-                public class TestClass
+                public static class TestClass
                 {
                     public static int Bar$$bar()
                     {
@@ -356,7 +356,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
         <Document FilePath="TestFile.cs">
             namespace TestNs 
             {
-                public class ConflictingClassName
+                public static class ConflictingClassName
                 {
                 }
             }
@@ -372,7 +372,15 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
         <Document>
             namespace TestNs.ExtraNs
             {
-                public class ConflictingNsClassName
+                public static class ConflictingNsClassName
+                {
+                }
+            }
+        </Document>
+        <Document>
+            namespace TestNs
+            {
+                public class NonStaticConflictingName
                 {
                 }
             }
@@ -401,6 +409,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
 
             ' there should only be 2 available types that are
             ' a) the same kind
+            ' b) static (if the current type is static)
             ' b) in the same or nested namespace
             ' c) in the same project
             Assert.Equal(2, viewModel.AvailableTypes.Length)

From 76d708f76d5cc44b0ad24b7b43dc3c7fea545f64 Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Thu, 2 Sep 2021 11:06:28 -0700
Subject: [PATCH 51/64] Small fixes and dialog resizing

---
 .../MoveStaticMembersWithDialogCodeAction.cs           |  2 +-
 .../MoveStaticMembers/MoveStaticMembersDialog.xaml     | 10 ++++++----
 .../MoveStaticMembersDialogViewModel.cs                |  3 +--
 .../VisualStudioMoveStaticMembersOptionsService.cs     |  1 -
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 10b8ab085ed5c..1946aa8aa1794 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -172,7 +172,7 @@ private static async Task<Solution> RefactorAndMoveAsync(
             var members = oldMemberNodes
                 .Select(node => root.GetCurrentNode(node))
                 .WhereNotNull()
-                .SelectAsArray(node => (semanticModel.GetDeclaredSymbol(node!, cancellationToken), false));
+                .SelectAsArray(node => (semanticModel.GetDeclaredSymbol(node, cancellationToken), false));
 
             var pullMembersUpOptions = PullMembersUpOptionsBuilder.BuildPullMembersUpOptions(newType!, members);
             return await MembersPuller.PullMembersUpAsync(sourceDoc, pullMembersUpOptions, cancellationToken).ConfigureAwait(false);
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
index f4ad29c0d2c69..0ab1bfe1e6cd9 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
@@ -15,7 +15,7 @@
     x:ClassModifier="internal"
     mc:Ignorable="d"
     WindowStartupLocation="CenterOwner"
-    Height="398"
+    Height="498"
     Width="500"
     MinHeight="298"
     MinWidth="210"
@@ -33,11 +33,13 @@
     </vs:DialogWindow.Resources>
     <Grid Margin="11,6,11,11">
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="160"/>
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <StackPanel Orientation="Vertical" Grid.Row="0">
+        <StackPanel
+            Orientation="Vertical"
+            Grid.Row="0">
             <Label x:Uid="DestinationLabel" 
                        x:Name="DestinationLabel"
                        Margin="{StaticResource verticalLabelMargin}"
@@ -54,7 +56,7 @@
                 ItemsSource="{Binding AvailableTypes, Mode=OneTime}"
                 BorderThickness="1" 
                 Margin="0 0 20 0"
-                MaxDropDownHeight="150">
+                MaxDropDownHeight="120">
                 <ComboBox.ItemContainerStyle>
                     <Style TargetType="{x:Type ComboBoxItem}">
                         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
index d845e384dd390..e61b2bc07fe33 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
@@ -27,7 +27,6 @@ public MoveStaticMembersDialogViewModel(
             string defaultType,
             ImmutableArray<TypeNameItem> availableTypes,
             ImmutableArray<INamedTypeSymbol> conflictingTypeNames,
-            string sourceTypeName,
             string containingNamespace,
             ISyntaxFacts syntaxFacts)
         {
@@ -37,7 +36,7 @@ public MoveStaticMembersDialogViewModel(
             AvailableTypes = availableTypes;
             _conflictingTypeNames = conflictingTypeNames;
             _destinationName = new TypeNameItem(defaultType);
-            _prependedNamespace = containingNamespace + ".";
+            _prependedNamespace = string.IsNullOrEmpty(containingNamespace) ? string.Empty : containingNamespace + ".";
 
             PropertyChanged += MoveMembersToTypeDialogViewModel_PropertyChanged;
             // Set message and icon + shownTypes
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index 9d35e44722ad8..703d93e5ff3c8 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -148,7 +148,6 @@ internal static MoveStaticMembersDialogViewModel GetViewModel(
                 defaultTypeName,
                 availableTypeNames,
                 conflictingTypeNames.ToImmutableArray(),
-                selectedType.Name,
                 containingNamespaceDisplay,
                 document.GetRequiredLanguageService<ISyntaxFactsService>());
         }

From 2af1216ea1b518d551feb5469469f193d321b48a Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Thu, 2 Sep 2021 13:41:03 -0700
Subject: [PATCH 52/64] Fixed some nullable suppressions

---
 .../MoveStaticMembersWithDialogCodeAction.cs              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 1946aa8aa1794..d50f62605308f 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -115,13 +115,13 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
             // get back type declaration in the newly created file
             var destRoot = await newDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
             var destSemanticModel = await newDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
-            newType = destSemanticModel.GetRequiredDeclaredSymbol(destRoot.GetAnnotatedNodes(annotation).Single(), cancellationToken) as INamedTypeSymbol;
+            newType = (INamedTypeSymbol)destSemanticModel.GetRequiredDeclaredSymbol(destRoot.GetAnnotatedNodes(annotation).Single(), cancellationToken);
 
             var movedSolution = await RefactorAndMoveAsync(
                 moveOptions.SelectedMembers,
                 memberNodes,
                 newDoc.Project.Solution,
-                newType!,
+                newType,
                 typeArgIndices,
                 sourceDoc.Id,
                 cancellationToken).ConfigureAwait(false);
@@ -162,7 +162,7 @@ private static async Task<Solution> RefactorAndMoveAsync(
             // refactor references across the entire solution
             var memberReferenceLocations = await FindMemberReferencesAsync(selectedMembers, oldSolution, cancellationToken).ConfigureAwait(false);
             var projectToLocations = memberReferenceLocations.ToLookup(loc => loc.location.Document.Project.Id);
-            var solutionWithFixedReferences = await RefactorReferencesAsync(projectToLocations, oldSolution, newType!, typeArgIndices, cancellationToken).ConfigureAwait(false);
+            var solutionWithFixedReferences = await RefactorReferencesAsync(projectToLocations, oldSolution, newType, typeArgIndices, cancellationToken).ConfigureAwait(false);
 
             var sourceDoc = solutionWithFixedReferences.GetRequiredDocument(sourceDocId);
 
@@ -174,7 +174,7 @@ private static async Task<Solution> RefactorAndMoveAsync(
                 .WhereNotNull()
                 .SelectAsArray(node => (semanticModel.GetDeclaredSymbol(node, cancellationToken), false));
 
-            var pullMembersUpOptions = PullMembersUpOptionsBuilder.BuildPullMembersUpOptions(newType!, members);
+            var pullMembersUpOptions = PullMembersUpOptionsBuilder.BuildPullMembersUpOptions(newType, members);
             return await MembersPuller.PullMembersUpAsync(sourceDoc, pullMembersUpOptions, cancellationToken).ConfigureAwait(false);
         }
 

From dac1a8e5198b83daf8d99959cc9106f3a9293c3d Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Thu, 2 Sep 2021 15:59:40 -0700
Subject: [PATCH 53/64] Added some more tests. Not all are passing

---
 .../CSharpMoveStaticMembersTests.cs           | 192 +++++++
 .../VisualBasicMoveStaticMembersTests.vb      | 474 +++++++++++++++++-
 2 files changed, 663 insertions(+), 3 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index 5c2ce82deb940..14c90c709a387 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -2426,6 +2426,198 @@ await TestMovementExistingFileAsync(
                 selectedMembers,
                 selectedDestinationName).ConfigureAwait(false);
         }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodToExistingTypeWithNamespace()
+        {
+            var initialSourceMarkup = @"
+namespace TestNs
+{
+    public class Class1
+    {
+        public static int Test[||]Method()
+        {
+            return 0;
+        }
+    }
+}";
+            var initialDestinationMarkup = @"
+namespace TestNs
+{
+    public class Class1Helpers
+    {
+    }
+}";
+            var selectedDestinationName = "TestNs.Class1Helpers";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var fixedSourceMarkup = @"
+namespace TestNs
+{
+    public class Class1
+    {
+    }
+}";
+            var fixedDestinationMarkup = @"
+namespace TestNs
+{
+    public class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+
+            await TestMovementExistingFileAsync(
+                initialSourceMarkup,
+                initialDestinationMarkup,
+                fixedSourceMarkup,
+                fixedDestinationMarkup,
+                selectedMembers,
+                selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodToExistingTypeWithNewNamespace()
+        {
+            var initialSourceMarkup = @"
+public class Class1
+{
+    public static int Test[||]Method()
+    {
+        return 0;
+    }
+}";
+            var initialDestinationMarkup = @"
+namespace TestNs
+{
+    public class Class1Helpers
+    {
+    }
+}";
+            var selectedDestinationName = "TestNs.Class1Helpers";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var fixedSourceMarkup = @"
+public class Class1
+{
+}";
+            var fixedDestinationMarkup = @"
+namespace TestNs
+{
+    public class Class1Helpers
+    {
+        public static int TestMethod()
+        {
+            return 0;
+        }
+    }
+}";
+
+            await TestMovementExistingFileAsync(
+                initialSourceMarkup,
+                initialDestinationMarkup,
+                fixedSourceMarkup,
+                fixedDestinationMarkup,
+                selectedMembers,
+                selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodToExistingTypeRefactorSourceUsage()
+        {
+            var initialSourceMarkup = @"
+public class Class1
+{
+    public static int Test[||]Method()
+    {
+        return 0;
+    }
+
+    public static int TestMethod2()
+    {
+        return TestMethod();
+    }
+}";
+            var initialDestinationMarkup = @"
+public class Class1Helpers
+{
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var fixedSourceMarkup = @"
+public class Class1
+{
+    public static int TestMethod2()
+    {
+        return Class1Helpers.TestMethod();
+    }
+}";
+            var fixedDestinationMarkup = @"
+public class Class1Helpers
+{
+    public static int TestMethod()
+    {
+        return 0;
+    }
+}";
+
+            await TestMovementExistingFileAsync(
+                initialSourceMarkup,
+                initialDestinationMarkup,
+                fixedSourceMarkup,
+                fixedDestinationMarkup,
+                selectedMembers,
+                selectedDestinationName).ConfigureAwait(false);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
+        public async Task TestMoveMethodToExistingTypeRefactorDestinationUsage()
+        {
+            var initialSourceMarkup = @"
+public class Class1
+{
+    public static int Test[||]Method()
+    {
+        return 0;
+    }
+}";
+            var initialDestinationMarkup = @"
+public class Class1Helpers
+{
+    public static int TestMethod2()
+    {
+        return Class1.TestMethod();
+    }
+}";
+            var selectedDestinationName = "Class1Helpers";
+            var selectedMembers = ImmutableArray.Create("TestMethod");
+            var fixedSourceMarkup = @"
+public class Class1
+{
+}";
+            var fixedDestinationMarkup = @"
+public class Class1Helpers
+{
+    public static int TestMethod()
+    {
+        return 0;
+    }
+
+    public static int TestMethod2()
+    {
+        return TestMethod();
+    }
+}";
+
+            await TestMovementExistingFileAsync(
+                initialSourceMarkup,
+                initialDestinationMarkup,
+                fixedSourceMarkup,
+                fixedDestinationMarkup,
+                selectedMembers,
+                selectedDestinationName).ConfigureAwait(false);
+        }
         #endregion
 
         #region Selections and caret position
diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index 9c2cb92914da0..ac003500032f7 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -14,7 +14,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.MoveStaticMembers
 
         Private Shared ReadOnly s_testServices As TestComposition = FeaturesTestCompositions.Features.AddParts(GetType(TestMoveStaticMembersService))
 
-#Region "Perform Actions From Options"
+#Region "Perform New Type Action From Options"
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveField() As Task
             Dim initialMarkup = "
@@ -1936,6 +1936,447 @@ End Namespace
         End Function
 
 #End Region
+#Region "Perform Existing Type Action From Options"
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFieldToExistingType() As Task
+            Dim initialSourceMarkup = "
+Public Class Class1
+    Public Shared Test[||]Field As Integer = 0
+End Class"
+            Dim initialDestinationMarkup = "
+Public Class Class1Helpers
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim fixedSourceMarkup = "
+Public Class Class1
+End Class"
+            Dim fixedDestinationMarkup = "
+Public Class Class1Helpers
+    Public Shared TestField As Integer = 0
+End Class"
+
+            Await TestMovementExistingFileAsync(initialSourceMarkup,
+                                                initialDestinationMarkup,
+                                                fixedSourceMarkup,
+                                                fixedDestinationMarkup,
+                                                newTypeName,
+                                                selection).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMovePropertyToExistingType() As Task
+            Dim initialSourceMarkup = "
+Public Class Class1
+    Public Shared ReadOnly Property Test[||]Prop As Integer
+        Get
+            Return 0
+        End Get
+    End Property
+End Class"
+            Dim initialDestinationMarkup = "
+Public Class Class1Helpers
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim selection = ImmutableArray.Create("TestProp")
+            Dim fixedSourceMarkup = "
+Public Class Class1
+End Class"
+            Dim fixedDestinationMarkup = "
+Public Class Class1Helpers
+    Public Shared ReadOnly Property TestProp As Integer
+        Get
+            Return 0
+        End Get
+    End Property
+End Class"
+
+            Await TestMovementExistingFileAsync(initialSourceMarkup,
+                                                initialDestinationMarkup,
+                                                fixedSourceMarkup,
+                                                fixedDestinationMarkup,
+                                                newTypeName,
+                                                selection).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveEventToExistingType() As Task
+            Dim initialSourceMarkup = "
+Imports System
+
+Public Class Class1
+    Public Shared Event Test[||]Event As EventHandler
+End Class"
+            Dim initialDestinationMarkup = "
+Public Class Class1Helpers
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim selection = ImmutableArray.Create("TestEvent")
+            Dim fixedSourceMarkup = "
+Imports System
+
+Public Class Class1
+End Class"
+            Dim fixedDestinationMarkup = "Imports System
+
+Public Class Class1Helpers
+    Public Shared Event TestEvent As EventHandler
+End Class"
+
+            Await TestMovementExistingFileAsync(initialSourceMarkup,
+                                                initialDestinationMarkup,
+                                                fixedSourceMarkup,
+                                                fixedDestinationMarkup,
+                                                newTypeName,
+                                                selection).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionToExistingType() As Task
+            Dim initialSourceMarkup = "
+Public Class Class1
+    Public Shared Function Test[||]Func() As Integer
+        Return 0
+    End Function
+End Class"
+            Dim initialDestinationMarkup = "
+Public Class Class1Helpers
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim fixedSourceMarkup = "
+Public Class Class1
+End Class"
+            Dim fixedDestinationMarkup = "
+Public Class Class1Helpers
+    Public Shared Function TestFunc() As Integer
+        Return 0
+    End Function
+End Class"
+
+            Await TestMovementExistingFileAsync(initialSourceMarkup,
+                                                initialDestinationMarkup,
+                                                fixedSourceMarkup,
+                                                fixedDestinationMarkup,
+                                                newTypeName,
+                                                selection).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveSubToExistingType() As Task
+            Dim initialSourceMarkup = "
+Public Class Class1
+    Public Shared Sub Test[||]Sub()
+        Return
+    End Sub
+End Class"
+            Dim initialDestinationMarkup = "
+Public Class Class1Helpers
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim selection = ImmutableArray.Create("TestSub")
+            Dim fixedSourceMarkup = "
+Public Class Class1
+End Class"
+            Dim fixedDestinationMarkup = "
+Public Class Class1Helpers
+    Public Shared Sub TestSub()
+        Return
+    End Sub
+End Class"
+
+            Await TestMovementExistingFileAsync(initialSourceMarkup,
+                                                initialDestinationMarkup,
+                                                fixedSourceMarkup,
+                                                fixedDestinationMarkup,
+                                                newTypeName,
+                                                selection).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveConstToExistingType() As Task
+            Dim initialSourceMarkup = "
+Public Class Class1
+    Public Const Test[||]Field As Integer = 0
+End Class"
+            Dim initialDestinationMarkup = "
+Public Class Class1Helpers
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim selection = ImmutableArray.Create("TestField")
+            Dim fixedSourceMarkup = "
+Public Class Class1
+End Class"
+            Dim fixedDestinationMarkup = "
+Public Class Class1Helpers
+    Public Const TestField As Integer = 0
+End Class"
+
+            Await TestMovementExistingFileAsync(initialSourceMarkup,
+                                                initialDestinationMarkup,
+                                                fixedSourceMarkup,
+                                                fixedDestinationMarkup,
+                                                newTypeName,
+                                                selection).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveExtensionFunctionToExistingType() As Task
+            Dim initialSourceMarkup = "
+Imports System.Runtime.CompilerServices
+
+Public Module Class1
+    <Extension>
+    Public Function Test[||]Func(other As Other) As Integer
+        Return other.OtherInt + 2
+    End Function
+End Module
+
+Public Class Class2
+    Public Function GetOtherInt() As Integer
+        Dim other = New Other()
+        Return other.TestFunc()
+    End Function
+End Class
+
+Public Class Other
+    Public OtherInt As Integer
+
+    Public Sub New()
+        OtherInt = 5
+    End Sub
+End Class"
+            Dim initialDestinationMarkup = "
+Public Module Class1Helpers
+End Module"
+            Dim newTypeName = "Class1Helpers"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim fixedSourceMarkup = "
+Imports System.Runtime.CompilerServices
+
+Public Module Class1
+End Module
+
+Public Class Class2
+    Public Function GetOtherInt() As Integer
+        Dim other = New Other()
+        Return other.TestFunc()
+    End Function
+End Class
+
+Public Class Other
+    Public OtherInt As Integer
+
+    Public Sub New()
+        OtherInt = 5
+    End Sub
+End Class"
+            Dim fixedDestinationMarkup = "
+Imports System.Runtime.CompilerServices
+
+Public Module Class1Helpers
+    <Extension>
+    Public Function Test[||]Func(other As Other) As Integer
+        Return other.OtherInt + 2
+    End Function
+End Module"
+
+            Await TestMovementExistingFileAsync(initialSourceMarkup,
+                                                initialDestinationMarkup,
+                                                fixedSourceMarkup,
+                                                fixedDestinationMarkup,
+                                                newTypeName,
+                                                selection).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionToExistingTypeWithNamespace() As Task
+            Dim initialSourceMarkup = "
+Namespace TestNs
+    Public Class Class1
+        Public Shared Function Test[||]Func() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+            Dim initialDestinationMarkup = "
+Namespace TestNs
+    Public Class Class1Helpers
+    End Class
+End Namespace"
+            Dim newTypeName = "TestNs.Class1Helpers"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim fixedSourceMarkup = "
+Namespace TestNs
+    Public Class Class1
+    End Class
+End Namespace"
+            Dim fixedDestinationMarkup = "
+Namespace TestNs
+    Public Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+
+            Await TestMovementExistingFileAsync(initialSourceMarkup,
+                                                initialDestinationMarkup,
+                                                fixedSourceMarkup,
+                                                fixedDestinationMarkup,
+                                                newTypeName,
+                                                selection).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionToExistingTypeWithNewNamespace() As Task
+            Dim initialSourceMarkup = "
+Public Class Class1
+    Public Shared Function Test[||]Func() As Integer
+        Return 0
+    End Function
+End Class"
+            Dim initialDestinationMarkup = "
+Namespace TestNs
+    Public Class Class1Helpers
+    End Class
+End Namespace"
+            Dim newTypeName = "TestNs.Class1Helpers"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim fixedSourceMarkup = "
+Public Class Class1
+End Class"
+            Dim fixedDestinationMarkup = "
+Namespace TestNs
+    Public Class Class1Helpers
+        Public Shared Function TestFunc() As Integer
+            Return 0
+        End Function
+    End Class
+End Namespace"
+
+            Await TestMovementExistingFileAsync(initialSourceMarkup,
+                                                initialDestinationMarkup,
+                                                fixedSourceMarkup,
+                                                fixedDestinationMarkup,
+                                                newTypeName,
+                                                selection).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionToExistingTypeRefactorSourceUsage() As Task
+            Dim initialSourceMarkup = "
+Public Class Class1
+    Public Shared Function Test[||]Func() As Integer
+        Return 0
+    End Function
+
+    Public Shared Function TestFunc2() As Integer
+        Return TestFunc()
+    End Function
+End Class"
+            Dim initialDestinationMarkup = "
+Public Class Class1Helpers
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim fixedSourceMarkup = "
+Public Class Class1
+    Public Shared Function TestFunc2() As Integer
+        Return Class1Helpers.TestFunc()
+    End Function
+End Class"
+            Dim fixedDestinationMarkup = "
+Public Class Class1Helpers
+    Public Shared Function TestFunc() As Integer
+        Return 0
+    End Function
+End Class"
+
+            Await TestMovementExistingFileAsync(initialSourceMarkup,
+                                                initialDestinationMarkup,
+                                                fixedSourceMarkup,
+                                                fixedDestinationMarkup,
+                                                newTypeName,
+                                                selection).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionToExistingModuleRefactorSourceUsage() As Task
+            Dim initialSourceMarkup = "
+Public Module Class1
+    Public Shared Function Test[||]Func() As Integer
+        Return 0
+    End Function
+
+    Public Shared Function TestFunc2() As Integer
+        Return TestFunc()
+    End Function
+End Module"
+            Dim initialDestinationMarkup = "
+Public Module Class1Helpers
+End Module"
+            Dim newTypeName = "Class1Helpers"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim fixedSourceMarkup = "
+Public Module Class1
+    Public Shared Function TestFunc2() As Integer
+        Return TestFunc()
+    End Function
+End Module"
+            Dim fixedDestinationMarkup = "
+Public Module Class1Helpers
+    Public Shared Function TestFunc() As Integer
+        Return 0
+    End Function
+End Module"
+
+            Await TestMovementExistingFileAsync(initialSourceMarkup,
+                                                initialDestinationMarkup,
+                                                fixedSourceMarkup,
+                                                fixedDestinationMarkup,
+                                                newTypeName,
+                                                selection).ConfigureAwait(False)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
+        Public Async Function TestMoveFunctionToExistingTypeRefactorDestinationUsage() As Task
+            Dim initialSourceMarkup = "
+Public Class Class1
+    Public Shared Function Test[||]Func() As Integer
+        Return 0
+    End Function
+End Class"
+            Dim initialDestinationMarkup = "
+Public Class Class1Helpers
+    Public Shared Function TestFunc2() As Integer
+        Return Class1.TestFunc()
+    End Function
+End Class"
+            Dim newTypeName = "Class1Helpers"
+            Dim selection = ImmutableArray.Create("TestFunc")
+            Dim fixedSourceMarkup = "
+Public Class Class1
+End Class"
+            Dim fixedDestinationMarkup = "
+Public Class Class1Helpers
+    Public Shared Function TestFunc2() As Integer
+        Return TestFunc()
+    End Function
+
+    Public Shared Function TestFunc() As Integer
+        Return 0
+    End Function
+End Class"
+
+            Await TestMovementExistingFileAsync(initialSourceMarkup,
+                                                initialDestinationMarkup,
+                                                fixedSourceMarkup,
+                                                fixedDestinationMarkup,
+                                                newTypeName,
+                                                selection).ConfigureAwait(False)
+        End Function
+#End Region
 #Region "SelectionTests"
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -2233,10 +2674,12 @@ End Namespace"
 
             Public Sub New(destinationType As String,
                            members As ImmutableArray(Of String),
-                           newFileName As String)
+                           newFileName As String,
+                           Optional newType As Boolean = True)
                 _destinationType = destinationType
                 _members = members
                 _newFileName = newFileName
+                _newType = newType
             End Sub
 
             Private ReadOnly _destinationType As String
@@ -2245,6 +2688,8 @@ End Namespace"
 
             Private ReadOnly _newFileName As String
 
+            Private ReadOnly _newType As Boolean
+
             Protected Overrides Function CreateWorkspaceImpl() As Workspace
                 Dim hostServices = s_testServices.GetHostServices()
 
@@ -2253,6 +2698,7 @@ End Namespace"
                 optionsService.DestinationName = _destinationType
                 optionsService.Filename = _newFileName
                 optionsService.SelectedMembers = _members
+                optionsService.CreateNew = _newType
 
                 Return workspace
             End Function
@@ -2271,7 +2717,29 @@ End Namespace"
             }
             test.FixedState.Sources.Add(expectedSource)
             test.FixedState.Sources.Add((newFileName, expectedNewFile))
-            Await test.RunAsync()
+            Await test.RunAsync().ConfigureAwait(False)
+        End Function
+
+        Private Shared Async Function TestMovementExistingFileAsync(initialSourceMarkup As String,
+                                                                    initialDestinationMarkup As String,
+                                                                    fixedSourceMarkup As String,
+                                                                    fixedDestinationMarkup As String,
+                                                                    destinationName As String,
+                                                                    selectedMembers As ImmutableArray(Of String),
+                                                                    Optional destinationFileName As String = Nothing) As Task
+            Dim test = New Test(destinationName, selectedMembers, destinationFileName, newType:=False)
+            test.TestState.Sources.Add(initialSourceMarkup)
+            test.FixedState.Sources.Add(fixedSourceMarkup)
+
+            If destinationFileName IsNot Nothing Then
+                test.TestState.Sources.Add((destinationFileName, initialDestinationMarkup))
+                test.FixedState.Sources.Add((destinationFileName, fixedDestinationMarkup))
+            Else
+                test.TestState.Sources.Add(initialDestinationMarkup)
+                test.FixedState.Sources.Add(fixedDestinationMarkup)
+            End If
+
+            Await test.RunAsync().ConfigureAwait(False)
         End Function
 
         Private Shared Async Function TestNoRefactoringAsync(initialMarkup As String) As Task

From 7bb29a11e08f5ecfb2c084599202d743152863fb Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Fri, 3 Sep 2021 09:41:59 -0700
Subject: [PATCH 54/64] Fixed bug where refactoring references in an existing
 destination caused the type symbol declaration reference to be out of date

---
 .../CSharpMoveStaticMembersTests.cs           |  3 +--
 .../VisualBasicMoveStaticMembersTests.vb      | 14 +++++-------
 .../MoveStaticMembersWithDialogCodeAction.cs  | 22 +++++++++++++++++--
 .../MoveStaticMembers/TypeNameItem.cs         | 12 ++++++----
 ...alStudioMoveStaticMembersOptionsService.cs |  6 ++---
 5 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index 14c90c709a387..aac8db62dcc28 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -2603,10 +2603,9 @@ public static int TestMethod()
     {
         return 0;
     }
-
     public static int TestMethod2()
     {
-        return TestMethod();
+        return Class1Helpers.TestMethod();
     }
 }";
 
diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index ac003500032f7..f0a5f91b24794 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -2171,8 +2171,7 @@ Public Class Other
         OtherInt = 5
     End Sub
 End Class"
-            Dim fixedDestinationMarkup = "
-Imports System.Runtime.CompilerServices
+            Dim fixedDestinationMarkup = "Imports System.Runtime.CompilerServices
 
 Public Module Class1Helpers
     <Extension>
@@ -2305,11 +2304,11 @@ End Class"
         Public Async Function TestMoveFunctionToExistingModuleRefactorSourceUsage() As Task
             Dim initialSourceMarkup = "
 Public Module Class1
-    Public Shared Function Test[||]Func() As Integer
+    Public Function Test[||]Func() As Integer
         Return 0
     End Function
 
-    Public Shared Function TestFunc2() As Integer
+    Public Function TestFunc2() As Integer
         Return TestFunc()
     End Function
 End Module"
@@ -2320,13 +2319,13 @@ End Module"
             Dim selection = ImmutableArray.Create("TestFunc")
             Dim fixedSourceMarkup = "
 Public Module Class1
-    Public Shared Function TestFunc2() As Integer
+    Public Function TestFunc2() As Integer
         Return TestFunc()
     End Function
 End Module"
             Dim fixedDestinationMarkup = "
 Public Module Class1Helpers
-    Public Shared Function TestFunc() As Integer
+    Public Function TestFunc() As Integer
         Return 0
     End Function
 End Module"
@@ -2361,9 +2360,8 @@ End Class"
             Dim fixedDestinationMarkup = "
 Public Class Class1Helpers
     Public Shared Function TestFunc2() As Integer
-        Return TestFunc()
+        Return Class1Helpers.TestFunc()
     End Function
-
     Public Shared Function TestFunc() As Integer
         Return 0
     End Function
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index d50f62605308f..599c9b080de48 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -73,7 +73,10 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
 
             if (!moveOptions.IsNewType)
             {
-                // we already have our destination type
+                // we already have our destination type, but we need to find the document it is in
+                // When it is an existing type, "FileName" points to a full path rather than just the name
+                // There should be no two docs that have the same file path
+                var destinationDocId = _document.Project.Solution.GetDocumentIdsWithFilePath(moveOptions.FileName).Single();
                 var fixedSolution = await RefactorAndMoveAsync(
                     moveOptions.SelectedMembers,
                     memberNodes,
@@ -82,6 +85,7 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
                     // TODO: Find a way to merge/change generic type args for classes, or change PullMembersUp to handle instead
                     typeArgIndices: ImmutableArray<int>.Empty,
                     sourceDoc.Id,
+                    destinationDocId,
                     cancellationToken).ConfigureAwait(false);
                 return new CodeActionOperation[] { new ApplyChangesOperation(fixedSolution) };
             }
@@ -124,6 +128,7 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
                 newType,
                 typeArgIndices,
                 sourceDoc.Id,
+                newDoc.Id,
                 cancellationToken).ConfigureAwait(false);
 
             return new CodeActionOperation[] { new ApplyChangesOperation(movedSolution) };
@@ -157,8 +162,16 @@ private static async Task<Solution> RefactorAndMoveAsync(
             INamedTypeSymbol newType,
             ImmutableArray<int> typeArgIndices,
             DocumentId sourceDocId,
+            DocumentId newTypeDocId,
             CancellationToken cancellationToken)
         {
+            // annotate our new type, in case our refactoring changes it
+            var newTypeDoc = await oldSolution.GetRequiredDocumentAsync(newTypeDocId, cancellationToken: cancellationToken).ConfigureAwait(false);
+            var newTypeNode = newType.DeclaringSyntaxReferences.First().GetSyntax(cancellationToken);
+            var newTypeRoot = newTypeNode.SyntaxTree.GetRoot(cancellationToken);
+            newTypeRoot = newTypeRoot.TrackNodes(newTypeNode);
+            oldSolution = newTypeDoc.WithSyntaxRoot(newTypeRoot).Project.Solution;
+
             // refactor references across the entire solution
             var memberReferenceLocations = await FindMemberReferencesAsync(selectedMembers, oldSolution, cancellationToken).ConfigureAwait(false);
             var projectToLocations = memberReferenceLocations.ToLookup(loc => loc.location.Document.Project.Id);
@@ -166,7 +179,7 @@ private static async Task<Solution> RefactorAndMoveAsync(
 
             var sourceDoc = solutionWithFixedReferences.GetRequiredDocument(sourceDocId);
 
-            // get back nodes from our changes
+            // get back tracked nodes from our changes
             var root = await sourceDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
             var semanticModel = await sourceDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
             var members = oldMemberNodes
@@ -174,6 +187,11 @@ private static async Task<Solution> RefactorAndMoveAsync(
                 .WhereNotNull()
                 .SelectAsArray(node => (semanticModel.GetDeclaredSymbol(node, cancellationToken), false));
 
+            newTypeDoc = solutionWithFixedReferences.GetRequiredDocument(newTypeDoc.Id);
+            newTypeRoot = await newTypeDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var newTypeSemanticModel = await newTypeDoc.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+            newType = (INamedTypeSymbol)newTypeSemanticModel.GetRequiredDeclaredSymbol(newTypeRoot.GetCurrentNode(newTypeNode)!, cancellationToken);
+
             var pullMembersUpOptions = PullMembersUpOptionsBuilder.BuildPullMembersUpOptions(newType, members);
             return await MembersPuller.PullMembersUpAsync(sourceDoc, pullMembersUpOptions, cancellationToken).ConfigureAwait(false);
         }
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/TypeNameItem.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/TypeNameItem.cs
index cb97870c112cb..cac997b753feb 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/TypeNameItem.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/TypeNameItem.cs
@@ -4,6 +4,7 @@
 
 using System;
 using Microsoft.CodeAnalysis;
+using Roslyn.Utilities;
 
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
 {
@@ -11,7 +12,8 @@ internal class TypeNameItem
     {
         public string TypeName { get; }
         public INamedTypeSymbol? NamedType { get; }
-        public string DeclarationFile { get; }
+        public string DeclarationFilePath { get; }
+        public string DeclarationFileName { get; }
         public bool IsFromHistory { get; }
         public bool IsNew { get; }
 
@@ -21,7 +23,8 @@ public TypeNameItem(bool isFromHistory, string declarationFile, INamedTypeSymbol
             IsNew = false;
             NamedType = type;
             TypeName = type.ToDisplayString();
-            DeclarationFile = declarationFile;
+            DeclarationFileName = PathUtilities.GetFileName(declarationFile);
+            DeclarationFilePath = declarationFile;
         }
 
         public TypeNameItem(string @typeName)
@@ -30,7 +33,8 @@ public TypeNameItem(string @typeName)
             IsNew = true;
             TypeName = @typeName;
             NamedType = null;
-            DeclarationFile = string.Empty;
+            DeclarationFileName = string.Empty;
+            DeclarationFilePath = string.Empty;
         }
 
         public override string ToString() => TypeName;
@@ -56,7 +60,7 @@ public static int CompareTo(TypeNameItem x, TypeNameItem y)
                 }
             }
 
-            return x.DeclarationFile.CompareTo(y.DeclarationFile);
+            return x.DeclarationFileName.CompareTo(y.DeclarationFileName);
         }
     }
 }
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index 703d93e5ff3c8..423b1c2b258d6 100644
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -94,7 +94,7 @@ internal static MoveStaticMembersOptions GenerateOptions(string language, MoveSt
             }
 
             return new MoveStaticMembersOptions(
-                destination.DeclarationFile,
+                destination.DeclarationFilePath,
                 destination.NamedType!,
                 selectedMembers);
         }
@@ -152,7 +152,7 @@ internal static MoveStaticMembersDialogViewModel GetViewModel(
                 document.GetRequiredLanguageService<ISyntaxFactsService>());
         }
 
-        private static string GetFile(Location loc) => PathUtilities.GetFileName(loc.SourceTree!.FilePath);
+        private static string GetFile(Location loc) => loc.SourceTree!.FilePath;
 
         /// <summary>
         /// Construct all the type names declared in the project,
@@ -174,7 +174,7 @@ private static ImmutableArray<TypeNameItem> MakeTypeNameItems(
                 // filter to those actually in a real file, and that is not our current location.
                 return t.Locations
                     .Where(l => l.IsInSource &&
-                        (currentType.Name != t.Name || GetFile(l) != currentDocument.Name))
+                        (currentType.Name != t.Name || GetFile(l) != currentDocument.FilePath))
                     .Select(l => new TypeNameItem(
                         history.Contains(t),
                         GetFile(l),

From 3bc2999edc7465251984982631d1776dd60ec5ba Mon Sep 17 00:00:00 2001
From: Soren Dahl <t-sorendahl@microsoft.com>
Date: Fri, 3 Sep 2021 10:22:32 -0700
Subject: [PATCH 55/64] Add small fix to handle possible partial class
 declarations for destination type

---
 .../MoveStaticMembersWithDialogCodeAction.cs                | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 599c9b080de48..3f63e1c5c30f8 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -167,8 +167,10 @@ private static async Task<Solution> RefactorAndMoveAsync(
         {
             // annotate our new type, in case our refactoring changes it
             var newTypeDoc = await oldSolution.GetRequiredDocumentAsync(newTypeDocId, cancellationToken: cancellationToken).ConfigureAwait(false);
-            var newTypeNode = newType.DeclaringSyntaxReferences.First().GetSyntax(cancellationToken);
-            var newTypeRoot = newTypeNode.SyntaxTree.GetRoot(cancellationToken);
+            var newTypeRoot = await newTypeDoc.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var newTypeNode = newType.DeclaringSyntaxReferences
+                .SelectAsArray(sRef => sRef.GetSyntax(cancellationToken))
+                .First(node => newTypeRoot.Contains(node));
             newTypeRoot = newTypeRoot.TrackNodes(newTypeNode);
             oldSolution = newTypeDoc.WithSyntaxRoot(newTypeRoot).Project.Solution;
 

From 7e8c3ac60a5a5d4009915ae9cd8a8969ee0bf46b Mon Sep 17 00:00:00 2001
From: Andrew Hall <andrha@microsoft.com>
Date: Tue, 17 May 2022 01:01:58 -0700
Subject: [PATCH 56/64] Remove Implementation folder

---
 .../CSharpMoveStaticMembersTests.cs           |   2 +-
 .../VisualBasicMoveStaticMembersTests.vb      |  30 +--
 .../MoveStaticMembersDialog.xaml              | 173 ----------------
 .../MoveStaticMembersDialog.xaml.cs           |  61 ------
 .../MoveStaticMembersDialogViewModel.cs       | 177 -----------------
 .../StaticMemberSelection.xaml                |  96 ---------
 .../StaticMemberSelection.xaml.cs             |  39 ----
 .../StaticMemberSelectionViewModel.cs         | 109 ----------
 .../MoveStaticMembers/TypeNameItem.cs         |  66 -------
 ...alStudioMoveStaticMembersOptionsService.cs | 187 ------------------
 .../MoveStaticMembersViewModelTest.vb         |   4 +-
 11 files changed, 5 insertions(+), 939 deletions(-)
 delete mode 100644 src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
 delete mode 100644 src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs
 delete mode 100644 src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
 delete mode 100644 src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml
 delete mode 100644 src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml.cs
 delete mode 100644 src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs
 delete mode 100644 src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/TypeNameItem.cs
 delete mode 100644 src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index c37c4dc911cfb..27faade374b19 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -3005,7 +3005,7 @@ public class Class1
         public static int TestField = 1;[||]
     }
 }";
-            await TestNoRefactoringAsync(initialMarkup, hostServices: FeaturesTestCompositions.Features.GetHostServices()).ConfigureAwait(false);
+            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
         }
 
         private class Test : VerifyCS.Test
diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index fac311e17eae0..2d8f98f915788 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -14,7 +14,6 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.MoveStaticMembers
 
         Private Shared ReadOnly s_testServices As TestComposition = FeaturesTestCompositions.Features.AddParts(GetType(TestMoveStaticMembersService))
 
-#Region "Perform New Type Action From Options"
 #Region "Perform New Type Action From Options"
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function TestMoveField() As Task
@@ -2672,9 +2671,7 @@ End Namespace"
             Inherits VerifyVB.Test
 
             Public Sub New(destinationType As String,
-                           newFileName As String,
-                           Optional newType As Boolean = True)
-                members As ImmutableArray(Of String),
+                           members As ImmutableArray(Of String),
                            newFileName As String,
                            Optional newType As Boolean = True)
                 _destinationType = destinationType
@@ -2715,30 +2712,7 @@ End Namespace"
 
             Dim test = New Test(newTypeName, selectedMembers, newFileName) With
             {
-            Await test.RunAsync().ConfigureAwait(False)
-        End Function
-
-        Private Shared Async Function TestMovementExistingFileAsync(initialSourceMarkup As String,
-                                                                    initialDestinationMarkup As String,
-                                                                    fixedSourceMarkup As String,
-                                                                    fixedDestinationMarkup As String,
-                                                                    destinationName As String,
-                                                                    selectedMembers As ImmutableArray(Of String),
-                                                                    Optional destinationFileName As String = Nothing) As Task
-            Dim test = New Test(destinationName, selectedMembers, destinationFileName, newType:=False)
-            test.TestState.Sources.Add(initialSourceMarkup)
-            test.FixedState.Sources.Add(fixedSourceMarkup)
-
-            If destinationFileName IsNot Nothing Then
-                test.TestState.Sources.Add((destinationFileName, initialDestinationMarkup))
-                test.FixedState.Sources.Add((destinationFileName, fixedDestinationMarkup))
-            Else
-                test.TestState.Sources.Add(initialDestinationMarkup)
-                test.FixedState.Sources.Add(fixedDestinationMarkup)
-            End If
-
-            Await test.RunAsync().ConfigureAwait(False)
-            .TestCode = initialMarkup
+                .TestCode = initialMarkup
             }
             test.FixedState.Sources.Add(expectedSource)
             test.FixedState.Sources.Add((newFileName, expectedNewFile))
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
deleted file mode 100644
index 0ab1bfe1e6cd9..0000000000000
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml
+++ /dev/null
@@ -1,173 +0,0 @@
-<vs:DialogWindow
-    xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:sys="clr-namespace:System;assembly=mscorlib"
-    xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
-    xmlns:imagecatalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
-    xmlns:movestaticmembers="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers" 
-    d:DataContext="{d:DesignInstance Type=movestaticmembers:MoveStaticMembersDialogViewModel}"
-    x:Uid="MoveStaticMembersDialog"
-    x:Name="dialog"
-    x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers.MoveStaticMembersDialog"
-    x:ClassModifier="internal"
-    mc:Ignorable="d"
-    WindowStartupLocation="CenterOwner"
-    Height="498"
-    Width="500"
-    MinHeight="298"
-    MinWidth="210"
-    HasDialogFrame="True"
-    ShowInTaskbar="False"
-    ResizeMode="CanResize"
-    Title="{Binding MoveStaticMembersDialogTitle, ElementName=dialog}">
-    <vs:DialogWindow.Resources>
-        <Thickness x:Key="ButtonPadding">9, 2, 9, 2</Thickness>
-        <sys:Double x:Key="ButtonWidth">73</sys:Double>
-        <sys:Double x:Key="ButtonHeight">21</sys:Double>
-        <Thickness x:Key="verticalLabelMargin">0, 0, 0, 5</Thickness>
-        <Thickness x:Key="messageMargin">0, 9, 0, 0</Thickness>
-        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-    </vs:DialogWindow.Resources>
-    <Grid Margin="11,6,11,11">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="160"/>
-            <RowDefinition/>
-            <RowDefinition Height="Auto"/>
-        </Grid.RowDefinitions>
-        <StackPanel
-            Orientation="Vertical"
-            Grid.Row="0">
-            <Label x:Uid="DestinationLabel" 
-                       x:Name="DestinationLabel"
-                       Margin="{StaticResource verticalLabelMargin}"
-                       Content="{Binding ElementName=dialog, Path=DestinationLabelText}"
-                       Target="{Binding ElementName=DestinationTextBox}" />
-            <ComboBox
-                x:Uid="DestinationBox"
-                Name="DestinationBox"
-                IsEditable="True"
-                IsReadOnly="False"
-                AutomationProperties.LabeledBy="{Binding ElementName=DestinationLabel}"
-                Text="{Binding SearchText, Mode=TwoWay}"
-                SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}"
-                ItemsSource="{Binding AvailableTypes, Mode=OneTime}"
-                BorderThickness="1" 
-                Margin="0 0 20 0"
-                MaxDropDownHeight="120">
-                <ComboBox.ItemContainerStyle>
-                    <Style TargetType="{x:Type ComboBoxItem}">
-                        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-                    </Style>
-                </ComboBox.ItemContainerStyle>
-                <ComboBox.ItemTemplate>
-                    <DataTemplate DataType="Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType.TypeNameItem">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-                            <imaging:CrispImage
-                                Grid.Column="0"
-                                Visibility="{Binding IsFromHistory, Converter={StaticResource BooleanToVisibilityConverter}}" 
-                                Margin="0 0 5 0" 
-                                Moniker="{x:Static imagecatalog:KnownMonikers.History}" />
-                            <TextBlock
-                                Grid.Column="3"
-                                HorizontalAlignment="Left"
-                                TextTrimming="CharacterEllipsis"
-                                Text="{Binding TypeName}"/>
-                            <TextBlock
-                                Grid.Column="4"
-                                HorizontalAlignment="Right"
-                                Text="{Binding DeclarationFile}"/>
-                        </Grid>
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>
-
-
-            <GroupBox
-                BorderThickness="0">
-                <GroupBox.Header>
-                    <StackPanel 
-                    Orientation="Horizontal"  
-                    Visibility="{Binding ShowMessage, Converter={StaticResource BooleanToVisibilityConverter}}"
-                    Margin="{StaticResource messageMargin}">
-                        <imaging:CrispImage 
-                            Name="MessageIcon"
-                            Moniker="{Binding Icon}" 
-                            Height="16"
-                            Width="16"
-                            VerticalAlignment="Top" />
-
-                        <vs:LiveTextBlock 
-                            x:Name="MessageText"
-                            Text="{Binding Message}"
-                            Margin="7, 0, 0, 0"/>
-                    </StackPanel>
-                </GroupBox.Header>
-
-                <Grid 
-                    Margin="{StaticResource messageMargin}"
-                    HorizontalAlignment="Left"
-                    Visibility="{Binding ShowMessage, Converter={StaticResource BooleanToVisibilityConverter}}">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-                    <vs:LiveTextBlock 
-                        Grid.Column="0"
-                        HorizontalAlignment="Right"
-                        x:Name="Namespace"
-                        Text="{Binding PrependedNamespace}"
-                        TextTrimming="CharacterEllipsis"/>
-
-                    <vs:LiveTextBlock 
-                        Grid.Column="1"
-                        x:Name="TypeName"
-                        Text="{Binding DestinationName.TypeName}"/>
-                </Grid>
-            </GroupBox>
-        </StackPanel>
-
-        <GroupBox 
-            x:Uid="MemberSelectionGroupBox"
-            x:Name="MemberSelectionGroupBox"
-            Margin="0, 20, 0, 0"
-            Grid.Row="1"
-            Header="{Binding ElementName=dialog, Path=SelectMembers}"
-            BorderThickness="1">
-
-            <ContentPresenter Content="{Binding ElementName=dialog, Path=MemberSelectionControl}" />
-        </GroupBox>
-        <StackPanel Grid.Row="2"
-                    HorizontalAlignment="Right" 
-                    Margin="0, 11, 0, 0"
-                    Orientation="Horizontal">
-            <Button x:Uid="OkButton" 
-                    Name="OKButton"
-                    Content="{Binding ElementName=dialog, Path=OK}" 
-                    Margin="0, 0, 0, 0" 
-                    Padding="{StaticResource ResourceKey=ButtonPadding}"
-                    Click="OK_Click" 
-                    IsDefault="True"
-                    MinWidth="73"
-                    MinHeight="21"
-                    IsEnabled="{Binding CanSubmit}"/>
-            <Button x:Uid="CancelButton" 
-                    Name="CancelButton"
-                    Content="{Binding ElementName=dialog, Path=Cancel}"
-                    Margin="7, 0, 0, 0" 
-                    Padding="{StaticResource ResourceKey=ButtonPadding}"
-                    Click="Cancel_Click"
-                    IsCancel="True"
-                    MinWidth="73"
-                    MinHeight="21"/>
-        </StackPanel>
-    </Grid>
-</vs:DialogWindow>
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs
deleted file mode 100644
index bbe06370f070c..0000000000000
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialog.xaml.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// 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.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using Microsoft.VisualStudio.PlatformUI;
-
-namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
-{
-    /// <summary>
-    /// Interaction logic for MoveMembersToTypeDialog.xaml
-    /// </summary>
-    internal partial class MoveStaticMembersDialog : DialogWindow
-    {
-        public string MoveStaticMembersDialogTitle => ServicesVSResources.Move_static_members_to_another_type_colon;
-        public string DestinationLabelText => ServicesVSResources.Type_Name;
-        public string OK => ServicesVSResources.OK;
-        public string Cancel => ServicesVSResources.Cancel;
-        public string SelectMembers => ServicesVSResources.Select_members_colon;
-
-        public MoveStaticMembersDialogViewModel ViewModel { get; }
-        public StaticMemberSelection MemberSelectionControl { get; }
-
-        internal MoveStaticMembersDialog(MoveStaticMembersDialogViewModel viewModel)
-            : base()
-        {
-            ViewModel = viewModel;
-            DataContext = viewModel;
-
-            MemberSelectionControl = new StaticMemberSelection(ViewModel.MemberSelectionViewModel);
-
-            // Set focus to first tab control when the window is loaded
-            Loaded += (s, e) => MoveFocus(new TraversalRequest(FocusNavigationDirection.Next));
-
-            InitializeComponent();
-        }
-
-        private void Cancel_Click(object sender, RoutedEventArgs e)
-            => DialogResult = false;
-
-        internal TestAccessor GetTestAccessor() => new(this);
-
-        private void OK_Click(object sender, RoutedEventArgs e)
-        {
-            DialogResult = ViewModel.CanSubmit;
-        }
-
-        internal readonly struct TestAccessor
-        {
-            private readonly MoveStaticMembersDialog _dialog;
-            public TestAccessor(MoveStaticMembersDialog dialog)
-                => _dialog = dialog;
-
-            public Button OKButton => _dialog.OKButton;
-            public Button CancelButton => _dialog.CancelButton;
-
-        }
-    }
-}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
deleted file mode 100644
index e61b2bc07fe33..0000000000000
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// 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;
-using System.Collections.Immutable;
-using System.ComponentModel;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.LanguageServices;
-using Microsoft.VisualStudio.Imaging;
-using Microsoft.VisualStudio.Imaging.Interop;
-using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
-
-namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
-{
-    internal class MoveStaticMembersDialogViewModel : AbstractNotifyPropertyChanged
-    {
-        public StaticMemberSelectionViewModel MemberSelectionViewModel { get; }
-
-        private readonly ISyntaxFacts _syntaxFacts;
-
-        private readonly ImmutableArray<INamedTypeSymbol> _conflictingTypeNames;
-
-        public MoveStaticMembersDialogViewModel(
-            StaticMemberSelectionViewModel memberSelectionViewModel,
-            string defaultType,
-            ImmutableArray<TypeNameItem> availableTypes,
-            ImmutableArray<INamedTypeSymbol> conflictingTypeNames,
-            string containingNamespace,
-            ISyntaxFacts syntaxFacts)
-        {
-            MemberSelectionViewModel = memberSelectionViewModel;
-            _syntaxFacts = syntaxFacts ?? throw new ArgumentNullException(nameof(syntaxFacts));
-            _searchText = defaultType;
-            AvailableTypes = availableTypes;
-            _conflictingTypeNames = conflictingTypeNames;
-            _destinationName = new TypeNameItem(defaultType);
-            _prependedNamespace = string.IsNullOrEmpty(containingNamespace) ? string.Empty : containingNamespace + ".";
-
-            PropertyChanged += MoveMembersToTypeDialogViewModel_PropertyChanged;
-            // Set message and icon + shownTypes
-            OnDestinationUpdated();
-        }
-
-        private void MoveMembersToTypeDialogViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            switch (e.PropertyName)
-            {
-                case nameof(DestinationName):
-                    OnDestinationUpdated();
-                    break;
-                case nameof(SelectedIndex):
-                case nameof(SearchText):
-                    OnSearchTextOrIndexUpdated();
-                    break;
-            }
-        }
-
-        private void OnSearchTextOrIndexUpdated()
-        {
-            // we either typed something or changed the selection
-            if (SelectedIndex != -1 && SearchText == AvailableTypes[SelectedIndex].TypeName)
-            {
-                // Search text is not selecting anything, create a destination for the
-                // contents of the text.
-                DestinationName = AvailableTypes[SelectedIndex];
-            }
-            else
-            {
-                DestinationName = new TypeNameItem(SearchText);
-            }
-        }
-
-        private void OnDestinationUpdated()
-        {
-            var isNewType = DestinationName.IsNew;
-            CanSubmit = !isNewType || IsValidType(DestinationName!.TypeName);
-
-            if (CanSubmit && isNewType)
-            {
-                Icon = KnownMonikers.StatusInformation;
-                Message = ServicesVSResources.New_Type_Name_colon;
-                ShowMessage = true;
-            }
-            else if (!CanSubmit)
-            {
-                Icon = KnownMonikers.StatusInvalid;
-                Message = ServicesVSResources.Invalid_type_name;
-                ShowMessage = true;
-            }
-            else
-            {
-                ShowMessage = false;
-            }
-        }
-
-        private bool IsValidType(string typeName)
-        {
-            if (string.IsNullOrEmpty(typeName) ||
-                _conflictingTypeNames.Any(t => t.ToDisplayString() == PrependedNamespace + typeName))
-            {
-                return false;
-            }
-
-            foreach (var identifier in typeName.Split('.'))
-            {
-                if (_syntaxFacts.IsValidIdentifier(identifier))
-                {
-                    continue;
-                }
-
-                return false;
-            }
-
-            return true;
-        }
-
-        private string _prependedNamespace;
-        public string PrependedNamespace
-        {
-            get => _prependedNamespace;
-            set => SetProperty(ref _prependedNamespace, value);
-        }
-
-        private TypeNameItem _destinationName;
-        public TypeNameItem DestinationName
-        {
-            get => _destinationName;
-            set => SetProperty(ref _destinationName, value);
-        }
-
-        private int _selectedIndex = -1;
-        public int SelectedIndex
-        {
-            get => _selectedIndex;
-            set => SetProperty(ref _selectedIndex, value);
-        }
-
-        private string _searchText;
-        public string SearchText
-        {
-            get => _searchText;
-            set => SetProperty(ref _searchText, value);
-        }
-
-        public ImmutableArray<TypeNameItem> AvailableTypes { get; }
-
-        private ImageMoniker _icon;
-        public ImageMoniker Icon
-        {
-            get => _icon;
-            private set => SetProperty(ref _icon, value);
-        }
-
-        private string? _message;
-        public string? Message
-        {
-            get => _message;
-            private set => SetProperty(ref _message, value);
-        }
-
-        private bool _showMessage = false;
-        public bool ShowMessage
-        {
-            get => _showMessage;
-            private set => SetProperty(ref _showMessage, value);
-        }
-
-        private bool _canSubmit = true;
-        public bool CanSubmit
-        {
-            get => _canSubmit;
-            set => SetProperty(ref _canSubmit, value);
-        }
-    }
-}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml
deleted file mode 100644
index fb93072343c9f..0000000000000
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml
+++ /dev/null
@@ -1,96 +0,0 @@
-<UserControl x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers.StaticMemberSelection"
-             x:ClassModifier="internal"
-             x:Name="MemberSelectionControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:utilities="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.Utilities"
-             xmlns:movestaticmembers="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers"
-             d:DataContext="{d:DesignInstance Type=movestaticmembers:StaticMemberSelectionViewModel}"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <UserControl.Resources>
-        <Thickness x:Key="ButtonControlsPadding">2, 4, 4, 2</Thickness>
-        <utilities:BooleanReverseConverter x:Key="BooleanReverseConverter"/>
-    </UserControl.Resources>
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="Auto"/>
-        </Grid.ColumnDefinitions>
-        <ListBox
-            x:Uid="MemberSelectionList"
-            x:Name="MemberSelectionList"
-            Grid.Column="0"
-            Margin="2, 5, 12, 2"
-            SelectionMode="Multiple"
-            AutomationProperties.Name="SelectMembersList"
-            ItemsSource="{Binding Members}">
-            <ListBox.Resources>
-                <Style TargetType="{x:Type ListBoxItem}">
-                    <Setter Property="IsSelected" Value="{Binding IsChecked, Mode=TwoWay}" />
-                </Style>
-            </ListBox.Resources>
-            <ListBox.ItemTemplate>
-                <DataTemplate>
-                    <StackPanel
-                        Orientation="Horizontal"
-                        HorizontalAlignment="Left"
-                        MinWidth="186"
-                        Width="Auto"
-                        Margin="5, 2, 0, 2">
-                        <CheckBox
-                            x:Name="MemberSelected"
-                            AutomationProperties.Name="IsSelected"
-                            Margin="0, 0, 5, 0"
-                            IsChecked="{Binding IsChecked, Mode=TwoWay}"/>
-                        <Image 
-                            x:Name="GlyphOfMember"
-                            Margin="8, 0, 5, 0"
-                            Source="{Binding Glyph}"/>
-                        <TextBlock
-                            x:Name="MemberName"
-                            Text="{Binding SymbolName}"
-                            Margin="0, 0, 5, 0"/>
-                    </StackPanel>
-                </DataTemplate>
-            </ListBox.ItemTemplate>
-        </ListBox>
-        <StackPanel
-            Grid.Column="1"
-            Orientation="Vertical"
-            VerticalAlignment="Top"
-            HorizontalAlignment="Center"
-            Margin="0, 4, 0, 0"
-            Width="Auto">
-            <Button
-                x:Name="SelectAllButton"
-                x:Uid="SelectAllButton"
-                Padding="{StaticResource ResourceKey=ButtonControlsPadding}"
-                Content="{Binding ElementName=MemberSelectionControl, Path=SelectAll}"
-                Click="SelectAllButton_Click"
-                Margin="2, 2, 2, 7"
-                Width="Auto"
-                Height="Auto" />
-            <Button
-                x:Name="DeselectAllButton"
-                x:Uid="DeselectAllButton"
-                Padding="{StaticResource ResourceKey=ButtonControlsPadding}"
-                Content="{Binding ElementName=MemberSelectionControl, Path=DeselectAll}"
-                Click="DeselectAllButton_Click"
-                Margin="2, 2, 2, 7"
-                Width="Auto"
-                Height="Auto" />
-            <Button
-                x:Name="SelectDependentsButton"
-                x:Uid="SelectDependentsButton"
-                Padding="{StaticResource ResourceKey=ButtonControlsPadding}"
-                Content="{Binding ElementName=MemberSelectionControl, Path=SelectDependents}"
-                Click="SelectDependentsButton_Click"
-                Margin="2, 2, 2, 7"
-                Width="Auto"
-                Height="Auto"/>
-        </StackPanel>
-    </Grid>
-</UserControl>
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml.cs
deleted file mode 100644
index 5049ee920643e..0000000000000
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelection.xaml.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// 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.Windows;
-using System.Windows.Controls;
-
-namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
-{
-    /// <summary>
-    /// Interaction logic for StaticMemberSelection.xaml
-    /// </summary>
-    internal partial class StaticMemberSelection : UserControl
-    {
-
-        public string SelectDependents => ServicesVSResources.Select_Dependents;
-        public string MembersHeader => ServicesVSResources.Members;
-        public string SelectAll => ServicesVSResources.Select_All;
-        public string DeselectAll => ServicesVSResources.Deselect_All;
-
-        internal StaticMemberSelectionViewModel ViewModel { get; }
-
-        internal StaticMemberSelection(StaticMemberSelectionViewModel viewModel)
-        {
-            ViewModel = viewModel;
-            DataContext = ViewModel;
-            InitializeComponent();
-        }
-
-        private void SelectDependentsButton_Click(object sender, RoutedEventArgs e)
-            => ViewModel.SelectDependents();
-
-        private void SelectAllButton_Click(object sender, RoutedEventArgs e)
-            => ViewModel.SelectAll();
-
-        private void DeselectAllButton_Click(object sender, RoutedEventArgs e)
-            => ViewModel.DeselectAll();
-    }
-}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs
deleted file mode 100644
index 69a10d6865c97..0000000000000
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/StaticMemberSelectionViewModel.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// 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.Collections.Generic;
-using System.Collections.Immutable;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
-using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
-using Microsoft.VisualStudio.Utilities;
-using Roslyn.Utilities;
-
-namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
-{
-    internal class StaticMemberSelectionViewModel : AbstractNotifyPropertyChanged
-    {
-        private readonly IUIThreadOperationExecutor _uiThreadOperationExecutor;
-        private readonly ImmutableDictionary<ISymbol, Task<ImmutableArray<ISymbol>>> _symbolToDependentsMap;
-        private readonly ImmutableDictionary<ISymbol, SymbolViewModel<ISymbol>> _symbolToMemberViewMap;
-
-        public StaticMemberSelectionViewModel(
-            IUIThreadOperationExecutor uiThreadOperationExecutor,
-            ImmutableArray<SymbolViewModel<ISymbol>> members,
-            ImmutableDictionary<ISymbol, Task<ImmutableArray<ISymbol>>> dependentsMap)
-        {
-            _uiThreadOperationExecutor = uiThreadOperationExecutor;
-            _members = members;
-            _symbolToDependentsMap = dependentsMap;
-            _symbolToMemberViewMap = members.ToImmutableDictionary(memberViewModel => memberViewModel.Symbol);
-        }
-
-        public ImmutableArray<SymbolViewModel<ISymbol>> CheckedMembers => Members.WhereAsArray(m => m.IsChecked);
-
-        private ImmutableArray<SymbolViewModel<ISymbol>> _members;
-        public ImmutableArray<SymbolViewModel<ISymbol>> Members
-        {
-            get => _members;
-            set => SetProperty(ref _members, value);
-        }
-
-        public void SelectAll()
-            => SelectMembers(Members);
-
-        internal void DeselectAll()
-            => SelectMembers(Members, isChecked: false);
-
-        public void SelectDependents()
-        {
-            var checkedMembers = Members
-                .WhereAsArray(member => member.IsChecked);
-
-            var result = _uiThreadOperationExecutor.Execute(
-                title: ServicesVSResources.Move_static_members_to_another_type_colon,
-                defaultDescription: ServicesVSResources.Calculating_dependents,
-                allowCancellation: true,
-                showProgress: true,
-                context =>
-                {
-                    foreach (var member in Members)
-                    {
-                        _symbolToDependentsMap[member.Symbol].Wait(context.UserCancellationToken);
-                    }
-                });
-
-            if (result == UIThreadOperationStatus.Completed)
-            {
-                foreach (var member in checkedMembers)
-                {
-                    var membersToSelected = FindDependents(member.Symbol).SelectAsArray(symbol => _symbolToMemberViewMap[symbol]);
-                    SelectMembers(membersToSelected);
-                }
-            }
-        }
-
-        private void SelectMembers(ImmutableArray<SymbolViewModel<ISymbol>> members, bool isChecked = true)
-        {
-            foreach (var member in members)
-            {
-                member.IsChecked = isChecked;
-            }
-        }
-
-        private ImmutableHashSet<ISymbol> FindDependents(ISymbol member)
-        {
-            var queue = new Queue<ISymbol>();
-            // Under situation like two methods call each other, this hashset is used to 
-            // prevent the infinity loop.
-            var visited = new HashSet<ISymbol>();
-            var result = new HashSet<ISymbol>();
-            queue.Enqueue(member);
-            visited.Add(member);
-            while (!queue.IsEmpty())
-            {
-                var currentMember = queue.Dequeue();
-                result.Add(currentMember);
-                visited.Add(currentMember);
-                foreach (var dependent in _symbolToDependentsMap[currentMember].Result)
-                {
-                    if (!visited.Contains(dependent))
-                    {
-                        queue.Enqueue(dependent);
-                    }
-                }
-            }
-
-            return result.ToImmutableHashSet();
-        }
-    }
-}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/TypeNameItem.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/TypeNameItem.cs
deleted file mode 100644
index cac997b753feb..0000000000000
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/TypeNameItem.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// 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;
-using Microsoft.CodeAnalysis;
-using Roslyn.Utilities;
-
-namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
-{
-    internal class TypeNameItem
-    {
-        public string TypeName { get; }
-        public INamedTypeSymbol? NamedType { get; }
-        public string DeclarationFilePath { get; }
-        public string DeclarationFileName { get; }
-        public bool IsFromHistory { get; }
-        public bool IsNew { get; }
-
-        public TypeNameItem(bool isFromHistory, string declarationFile, INamedTypeSymbol type)
-        {
-            IsFromHistory = isFromHistory;
-            IsNew = false;
-            NamedType = type;
-            TypeName = type.ToDisplayString();
-            DeclarationFileName = PathUtilities.GetFileName(declarationFile);
-            DeclarationFilePath = declarationFile;
-        }
-
-        public TypeNameItem(string @typeName)
-        {
-            IsFromHistory = false;
-            IsNew = true;
-            TypeName = @typeName;
-            NamedType = null;
-            DeclarationFileName = string.Empty;
-            DeclarationFilePath = string.Empty;
-        }
-
-        public override string ToString() => TypeName;
-
-        public static int CompareTo(TypeNameItem x, TypeNameItem y)
-        {
-            // sort so that history is first, then type name, then file name
-            if (x.IsFromHistory ^ y.IsFromHistory)
-            {
-                // one is from history and the other isn't
-                return x.IsFromHistory ? -1 : 1;
-            }
-            // compare by each namespace/finally type
-            var xnames = x.TypeName.Split('.');
-            var ynames = y.TypeName.Split('.');
-
-            for (var i = 0; i < Math.Min(xnames.Length, ynames.Length); i++)
-            {
-                var comp = xnames[i].CompareTo(ynames[i]);
-                if (comp != 0)
-                {
-                    return comp;
-                }
-            }
-
-            return x.DeclarationFileName.CompareTo(y.DeclarationFileName);
-        }
-    }
-}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
deleted file mode 100644
index 423b1c2b258d6..0000000000000
--- a/src/VisualStudio/Core/Def/Implementation/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// 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;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Composition;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.LanguageServices;
-using Microsoft.CodeAnalysis.MoveStaticMembers;
-using Microsoft.CodeAnalysis.PullMemberUp;
-using Microsoft.CodeAnalysis.Shared.Extensions;
-using Microsoft.CodeAnalysis.Shared.Utilities;
-using Microsoft.VisualStudio.Language.Intellisense;
-using Microsoft.VisualStudio.LanguageServices.Implementation.PullMemberUp;
-using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
-using Microsoft.VisualStudio.Utilities;
-using Roslyn.Utilities;
-
-namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
-{
-    [ExportWorkspaceService(typeof(IMoveStaticMembersOptionsService), ServiceLayer.Host), Shared]
-    internal class VisualStudioMoveStaticMembersOptionsService : IMoveStaticMembersOptionsService
-    {
-        private readonly IGlyphService _glyphService;
-        private readonly IUIThreadOperationExecutor _uiThreadOperationExecutor;
-
-        private const int HistorySize = 3;
-
-        public readonly LinkedList<INamedTypeSymbol> History = new();
-
-        [ImportingConstructor]
-        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-        public VisualStudioMoveStaticMembersOptionsService(
-            IGlyphService glyphService,
-            IUIThreadOperationExecutor uiThreadOperationExecutor)
-        {
-            _glyphService = glyphService;
-            _uiThreadOperationExecutor = uiThreadOperationExecutor;
-        }
-
-        public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol)
-        {
-            var viewModel = GetViewModel(document, selectedType, selectedNodeSymbol, History, _glyphService, _uiThreadOperationExecutor);
-
-            var dialog = new MoveStaticMembersDialog(viewModel);
-
-            var result = dialog.ShowModal();
-
-            if (result.GetValueOrDefault())
-            {
-                UpdateHistory(viewModel);
-                return GenerateOptions(document.Project.Language, viewModel);
-            }
-
-            return MoveStaticMembersOptions.Cancelled;
-        }
-
-        private void UpdateHistory(MoveStaticMembersDialogViewModel viewModel)
-        {
-            if (viewModel.DestinationName.IsNew || viewModel.DestinationName.IsFromHistory)
-            {
-                // if we create a new destination or already have it in the history,
-                // we don't need to update our history list.
-                return;
-            }
-
-            History.AddFirst(viewModel.DestinationName.NamedType!);
-            if (History.Count > HistorySize)
-            {
-                History.RemoveLast();
-            }
-        }
-
-        // internal for testing purposes
-        internal static MoveStaticMembersOptions GenerateOptions(string language, MoveStaticMembersDialogViewModel viewModel)
-        {
-            var destination = viewModel.DestinationName;
-            var selectedMembers = viewModel.MemberSelectionViewModel.CheckedMembers.SelectAsArray(vm => vm.Symbol);
-            if (destination.IsNew)
-            {
-                // if the destination name contains extra namespaces, we want the last one as that is the real type name
-                var typeName = destination.TypeName.Split('.').Last();
-                var newFileName = Path.ChangeExtension(typeName, language == LanguageNames.CSharp ? ".cs" : ".vb");
-                return new MoveStaticMembersOptions(
-                    newFileName,
-                    viewModel.PrependedNamespace + destination.TypeName,
-                    selectedMembers);
-            }
-
-            return new MoveStaticMembersOptions(
-                destination.DeclarationFilePath,
-                destination.NamedType!,
-                selectedMembers);
-        }
-
-        // internal for testing purposes, get the view model
-        internal static MoveStaticMembersDialogViewModel GetViewModel(
-            Document document,
-            INamedTypeSymbol selectedType,
-            ISymbol? selectedNodeSymbol,
-            LinkedList<INamedTypeSymbol> history,
-            IGlyphService? glyphService,
-            IUIThreadOperationExecutor uiThreadOperationExecutor)
-        {
-            var membersInType = selectedType.GetMembers().
-               WhereAsArray(member => MemberAndDestinationValidator.IsMemberValid(member) && member.IsStatic);
-
-            var memberViewModels = membersInType
-                .SelectAsArray(member =>
-                    new SymbolViewModel<ISymbol>(member, glyphService)
-                    {
-                        // The member user selected will be checked at the beginning.
-                        IsChecked = SymbolEquivalenceComparer.Instance.Equals(selectedNodeSymbol, member),
-                    });
-
-            using var cancellationTokenSource = new CancellationTokenSource();
-            var memberToDependentsMap = SymbolDependentsBuilder.FindMemberToDependentsMap(membersInType, document.Project, cancellationTokenSource.Token);
-
-            var availableTypeNames = MakeTypeNameItems(
-                selectedType.ContainingNamespace,
-                selectedType,
-                document,
-                history,
-                cancellationTokenSource.Token);
-
-            // there can be type names that conflict but we can't move to (like interface type names or ourself)
-            var conflictingTypeNames = selectedType.ContainingNamespace.GetAllTypes(cancellationTokenSource.Token);
-
-            var candidateName = selectedType.Name + "Helpers";
-            var defaultTypeName = NameGenerator.GenerateUniqueName(candidateName, name => !conflictingTypeNames.Any(t => t.Name == name));
-
-            var containingNamespaceDisplay = selectedType.ContainingNamespace.IsGlobalNamespace
-                ? string.Empty
-                : selectedType.ContainingNamespace.ToDisplayString();
-
-            var selectMembersViewModel = new StaticMemberSelectionViewModel(
-                uiThreadOperationExecutor,
-                memberViewModels,
-                memberToDependentsMap);
-
-            return new MoveStaticMembersDialogViewModel(selectMembersViewModel,
-                defaultTypeName,
-                availableTypeNames,
-                conflictingTypeNames.ToImmutableArray(),
-                containingNamespaceDisplay,
-                document.GetRequiredLanguageService<ISyntaxFactsService>());
-        }
-
-        private static string GetFile(Location loc) => loc.SourceTree!.FilePath;
-
-        /// <summary>
-        /// Construct all the type names declared in the project,
-        /// </summary>
-        private static ImmutableArray<TypeNameItem> MakeTypeNameItems(
-            INamespaceSymbol currentNamespace,
-            INamedTypeSymbol currentType,
-            Document currentDocument,
-            LinkedList<INamedTypeSymbol> history,
-            CancellationToken cancellationToken)
-        {
-            return currentNamespace.GetAllTypes(cancellationToken)
-                // only take symbols that are the same kind of type (class, module)
-                // and remove non-static types only when the current type is static
-                .Where(t => t.TypeKind == currentType.TypeKind && (t.IsStaticType() || !currentType.IsStaticType()))
-                .SelectMany(t =>
-            {
-                // for partially declared classes, we may want multiple entries for a single type.
-                // filter to those actually in a real file, and that is not our current location.
-                return t.Locations
-                    .Where(l => l.IsInSource &&
-                        (currentType.Name != t.Name || GetFile(l) != currentDocument.FilePath))
-                    .Select(l => new TypeNameItem(
-                        history.Contains(t),
-                        GetFile(l),
-                        t));
-            })
-            .ToImmutableArrayOrEmpty()
-            .Sort(comparison: TypeNameItem.CompareTo);
-        }
-    }
-}
diff --git a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
index afad8bbe8a315..e353586ff2a3f 100644
--- a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
+++ b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
@@ -418,7 +418,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             ' b) in the same or nested namespace
             ' c) in the same project
             Assert.Equal(2, viewModel.AvailableTypes.Length)
-            Assert.Equal(-1, viewModel.SelectedIndex)
+            Assert.Equal(-1, viewModel.MemberSelectionViewModel.)
 
             ' We can't really test searchtext or selected index behavior because it is
             ' handled by the combobox, and doesn't update in the same way
@@ -788,7 +788,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             ' b) in the same or nested namespace
             ' c) in the same project
             Assert.Equal(2, viewModel.AvailableTypes.Length)
-            Assert.Equal(-1, viewModel.SelectedIndex)
+            Assert.Equal(-1, viewModel.MemberSelection)
 
             ' We can't really test searchtext or selected index behavior because it is
             ' handled by the combobox, and doesn't update in the same way

From 3627259e62ca2dad6903376f3807d7f5643d610f Mon Sep 17 00:00:00 2001
From: Andrew Hall <andrha@microsoft.com>
Date: Tue, 17 May 2022 16:39:18 -0700
Subject: [PATCH 57/64] WIP

---
 .../VisualBasicMoveStaticMembersTests.vb      |  2 -
 .../MoveStaticMembersDialog.xaml              | 77 ++++++++++++-----
 .../MoveStaticMembersDialogViewModel.cs       | 29 ++++---
 .../Def/MoveStaticMembers/TypeNameItem.cs     | 66 +++++++++++++++
 ...alStudioMoveStaticMembersOptionsService.cs | 83 +++++++++++++++++--
 .../MoveStaticMembersViewModelTest.vb         | 14 ++--
 6 files changed, 227 insertions(+), 44 deletions(-)
 create mode 100644 src/VisualStudio/Core/Def/MoveStaticMembers/TypeNameItem.cs

diff --git a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
index 2d8f98f915788..6d8431c459ed0 100644
--- a/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb
@@ -2690,8 +2690,6 @@ End Namespace"
 
             Protected Overrides Function CreateWorkspaceImpl() As Workspace
                 Dim hostServices = s_testServices.GetHostServices()
-                optionsService.DestinationName = _destinationType
-
                 Dim workspace = New AdhocWorkspace(hostServices)
                 Dim optionsService = DirectCast(workspace.Services.GetRequiredService(Of IMoveStaticMembersOptionsService)(), TestMoveStaticMembersService)
                 optionsService.DestinationName = _destinationType
diff --git a/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialog.xaml b/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialog.xaml
index f9fc94bc8df13..90d281f923edf 100644
--- a/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialog.xaml
+++ b/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialog.xaml
@@ -5,7 +5,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
-    xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging" 
+    xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
+    xmlns:imagecatalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
     xmlns:movestaticmembers="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers" 
     d:DataContext="{d:DesignInstance Type=movestaticmembers:MoveStaticMembersDialogViewModel}"
     x:Uid="MoveStaticMembersDialog"
@@ -14,7 +15,7 @@
     x:ClassModifier="internal"
     mc:Ignorable="d"
     WindowStartupLocation="CenterOwner"
-    Height="398"
+    Height="498"
     Width="500"
     MinHeight="298"
     MinWidth="210"
@@ -32,26 +33,66 @@
     </vs:DialogWindow.Resources>
     <Grid Margin="11,6,11,11">
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="160"/>
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <StackPanel Orientation="Vertical" Grid.Row="0">
-            <Label 
-                x:Uid="DestinationLabel" 
-                x:Name="DestinationLabel"
-                Margin="{StaticResource verticalLabelMargin}"
-                Content="{Binding ElementName=dialog, Path=DestinationLabelText}"
-                Target="{Binding ElementName=DestinationTextBox}" />
-            <TextBox 
+        <StackPanel
+            Orientation="Vertical"
+            Grid.Row="0">
+            <Label x:Uid="DestinationLabel" 
+                       x:Name="DestinationLabel"
+                       Margin="{StaticResource verticalLabelMargin}"
+                       Content="{Binding ElementName=dialog, Path=DestinationLabelText}"
+                       Target="{Binding ElementName=DestinationTextBox}" />
+            <ComboBox
                 x:Uid="DestinationBox"
                 Name="DestinationBox"
-                AutomationProperties.Name="DestinationName"
-                Text="{Binding DestinationName, UpdateSourceTrigger=PropertyChanged}"
-                Margin="2 0 2 0"/>
+                IsEditable="True"
+                IsReadOnly="False"
+                AutomationProperties.LabeledBy="{Binding ElementName=DestinationLabel}"
+                Text="{Binding SearchText, Mode=TwoWay}"
+                SelectedIndex="{Binding SelectedIndex, Mode=TwoWay}"
+                ItemsSource="{Binding AvailableTypes, Mode=OneTime}"
+                BorderThickness="1" 
+                Margin="0 0 20 0"
+                MaxDropDownHeight="120">
+                <ComboBox.ItemContainerStyle>
+                    <Style TargetType="{x:Type ComboBoxItem}">
+                        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+                    </Style>
+                </ComboBox.ItemContainerStyle>
+                <ComboBox.ItemTemplate>
+                    <DataTemplate DataType="Microsoft.VisualStudio.LanguageServices.Implementation.MoveMembersToType.TypeNameItem">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <imaging:CrispImage
+                                Grid.Column="0"
+                                Visibility="{Binding IsFromHistory, Converter={StaticResource BooleanToVisibilityConverter}}" 
+                                Margin="0 0 5 0" 
+                                Moniker="{x:Static imagecatalog:KnownMonikers.History}" />
+                            <TextBlock
+                                Grid.Column="3"
+                                HorizontalAlignment="Left"
+                                TextTrimming="CharacterEllipsis"
+                                Text="{Binding TypeName}"/>
+                            <TextBlock
+                                Grid.Column="4"
+                                HorizontalAlignment="Right"
+                                Text="{Binding DeclarationFile}"/>
+                        </Grid>
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
 
 
-            <GroupBox>
+            <GroupBox
+                BorderThickness="0">
                 <GroupBox.Header>
                     <StackPanel 
                     Orientation="Horizontal"  
@@ -89,13 +130,11 @@
                     <vs:LiveTextBlock 
                         Grid.Column="1"
                         x:Name="TypeName"
-                        Text="{Binding DestinationName}"/>
+                        Text="{Binding DestinationName.TypeName}"/>
                 </Grid>
             </GroupBox>
         </StackPanel>
 
-
-
         <GroupBox 
             x:Uid="MemberSelectionGroupBox"
             x:Name="MemberSelectionGroupBox"
@@ -131,4 +170,4 @@
                     MinHeight="21"/>
         </StackPanel>
     </Grid>
-</vs:DialogWindow>
+</vs:DialogWindow>
\ No newline at end of file
diff --git a/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs b/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
index f02e161288486..1ade7f87ba1db 100644
--- a/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Immutable;
 using System.ComponentModel;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.VisualStudio.Imaging;
 using Microsoft.VisualStudio.Imaging.Interop;
@@ -18,19 +19,22 @@ internal class MoveStaticMembersDialogViewModel : AbstractNotifyPropertyChanged
 
         private readonly ISyntaxFacts _syntaxFacts;
 
-        private readonly ImmutableArray<string> _existingNames;
+        private readonly ImmutableArray<INamedTypeSymbol> _conflictingTypeNames;
 
         public MoveStaticMembersDialogViewModel(
             StaticMemberSelectionViewModel memberSelectionViewModel,
             string defaultType,
-            ImmutableArray<string> existingNames,
+            ImmutableArray<TypeNameItem> availableTypes,
+            ImmutableArray<INamedTypeSymbol> conflictingTypeNames,
             string prependedNamespace,
             ISyntaxFacts syntaxFacts)
         {
             MemberSelectionViewModel = memberSelectionViewModel;
             _syntaxFacts = syntaxFacts ?? throw new ArgumentNullException(nameof(syntaxFacts));
-            _destinationName = defaultType;
-            _existingNames = existingNames;
+            _searchText = defaultType;
+            _destinationName = new TypeNameItem(defaultType);
+            _conflictingTypeNames = conflictingTypeNames;
+            AvailableTypes = availableTypes;
             PrependedNamespace = string.IsNullOrEmpty(prependedNamespace) ? prependedNamespace : prependedNamespace + ".";
 
             PropertyChanged += MoveMembersToTypeDialogViewModel_PropertyChanged;
@@ -49,10 +53,7 @@ private void MoveMembersToTypeDialogViewModel_PropertyChanged(object sender, Pro
 
         public void OnDestinationUpdated()
         {
-            // TODO change once we allow movement to existing types
-            var fullyQualifiedTypeName = PrependedNamespace + DestinationName;
-            var isNewType = !_existingNames.Contains(fullyQualifiedTypeName);
-            CanSubmit = isNewType && IsValidType(fullyQualifiedTypeName);
+            CanSubmit = _destinationName.IsNew && IsValidType(_destinationName.TypeName);
 
             if (CanSubmit)
             {
@@ -89,9 +90,10 @@ private bool IsValidType(string typeName)
         }
 
         public string PrependedNamespace { get; }
+        public ImmutableArray<TypeNameItem> AvailableTypes { get; }
 
-        private string _destinationName;
-        public string DestinationName
+        private TypeNameItem _destinationName;
+        public TypeNameItem DestinationName
         {
             get => _destinationName;
             set => SetProperty(ref _destinationName, value);
@@ -124,5 +126,12 @@ public bool CanSubmit
             get => _canSubmit;
             set => SetProperty(ref _canSubmit, value);
         }
+
+        private string _searchText;
+        public string SearchText
+        {
+            get => _searchText;
+            set => SetProperty(ref _searchText, value);
+        }
     }
 }
diff --git a/src/VisualStudio/Core/Def/MoveStaticMembers/TypeNameItem.cs b/src/VisualStudio/Core/Def/MoveStaticMembers/TypeNameItem.cs
new file mode 100644
index 0000000000000..cac997b753feb
--- /dev/null
+++ b/src/VisualStudio/Core/Def/MoveStaticMembers/TypeNameItem.cs
@@ -0,0 +1,66 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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;
+using Microsoft.CodeAnalysis;
+using Roslyn.Utilities;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveStaticMembers
+{
+    internal class TypeNameItem
+    {
+        public string TypeName { get; }
+        public INamedTypeSymbol? NamedType { get; }
+        public string DeclarationFilePath { get; }
+        public string DeclarationFileName { get; }
+        public bool IsFromHistory { get; }
+        public bool IsNew { get; }
+
+        public TypeNameItem(bool isFromHistory, string declarationFile, INamedTypeSymbol type)
+        {
+            IsFromHistory = isFromHistory;
+            IsNew = false;
+            NamedType = type;
+            TypeName = type.ToDisplayString();
+            DeclarationFileName = PathUtilities.GetFileName(declarationFile);
+            DeclarationFilePath = declarationFile;
+        }
+
+        public TypeNameItem(string @typeName)
+        {
+            IsFromHistory = false;
+            IsNew = true;
+            TypeName = @typeName;
+            NamedType = null;
+            DeclarationFileName = string.Empty;
+            DeclarationFilePath = string.Empty;
+        }
+
+        public override string ToString() => TypeName;
+
+        public static int CompareTo(TypeNameItem x, TypeNameItem y)
+        {
+            // sort so that history is first, then type name, then file name
+            if (x.IsFromHistory ^ y.IsFromHistory)
+            {
+                // one is from history and the other isn't
+                return x.IsFromHistory ? -1 : 1;
+            }
+            // compare by each namespace/finally type
+            var xnames = x.TypeName.Split('.');
+            var ynames = y.TypeName.Split('.');
+
+            for (var i = 0; i < Math.Min(xnames.Length, ynames.Length); i++)
+            {
+                var comp = xnames[i].CompareTo(ynames[i]);
+                if (comp != 0)
+                {
+                    return comp;
+                }
+            }
+
+            return x.DeclarationFileName.CompareTo(y.DeclarationFileName);
+        }
+    }
+}
diff --git a/src/VisualStudio/Core/Def/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index 4013ff86f1364..ddef5c6e0ffb6 100644
--- a/src/VisualStudio/Core/Def/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ b/src/VisualStudio/Core/Def/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -3,6 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Composition;
 using System.IO;
 using System.Linq;
@@ -28,6 +30,10 @@ internal class VisualStudioMoveStaticMembersOptionsService : IMoveStaticMembersO
         private readonly IGlyphService _glyphService;
         private readonly IUIThreadOperationExecutor _uiThreadOperationExecutor;
 
+        private const int HistorySize = 3;
+
+        public readonly LinkedList<INamedTypeSymbol> History = new();
+
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
         public VisualStudioMoveStaticMembersOptionsService(
@@ -40,13 +46,19 @@ public VisualStudioMoveStaticMembersOptionsService(
 
         public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, INamedTypeSymbol selectedType, ISymbol? selectedNodeSymbol)
         {
-            var viewModel = GetViewModel(document, selectedType, selectedNodeSymbol, _glyphService, _uiThreadOperationExecutor);
+            var viewModel = GetViewModel(document, selectedType, selectedNodeSymbol, History, _glyphService, _uiThreadOperationExecutor);
 
             var dialog = new MoveStaticMembersDialog(viewModel);
 
             var result = dialog.ShowModal();
 
-            return GenerateOptions(document.Project.Language, viewModel, result.GetValueOrDefault());
+            if (result.GetValueOrDefault())
+            {
+                UpdateHistory(viewModel);
+                return GenerateOptions(document.Project.Language, viewModel, result.GetValueOrDefault());
+            }
+
+            return MoveStaticMembersOptions.Cancelled;
         }
 
         // internal for testing purposes
@@ -55,7 +67,7 @@ internal static MoveStaticMembersOptions GenerateOptions(string language, MoveSt
             if (dialogResult)
             {
                 // if the destination name contains extra namespaces, we want the last one as that is the real type name
-                var typeName = viewModel.DestinationName.Split('.').Last();
+                var typeName = viewModel.DestinationName.TypeName.Split('.').Last();
                 var newFileName = Path.ChangeExtension(typeName, language == LanguageNames.CSharp ? ".cs" : ".vb");
                 return new MoveStaticMembersOptions(
                     newFileName,
@@ -71,6 +83,7 @@ internal static MoveStaticMembersDialogViewModel GetViewModel(
             Document document,
             INamedTypeSymbol selectedType,
             ISymbol? selectedNodeSymbol,
+            LinkedList<INamedTypeSymbol> history,
             IGlyphService? glyphService,
             IUIThreadOperationExecutor uiThreadOperationExecutor)
         {
@@ -88,7 +101,8 @@ internal static MoveStaticMembersDialogViewModel GetViewModel(
             using var cancellationTokenSource = new CancellationTokenSource();
             var memberToDependentsMap = SymbolDependentsBuilder.FindMemberToDependentsMap(membersInType, document.Project, cancellationTokenSource.Token);
 
-            var existingTypeNames = selectedType.ContainingNamespace.GetAllTypes(cancellationTokenSource.Token).SelectAsArray(t => t.ToDisplayString());
+            var existingTypes = selectedType.ContainingNamespace.GetAllTypes(cancellationTokenSource.Token).ToImmutableArray();
+            var existingTypeNames = existingTypes.SelectAsArray(t => t.ToDisplayString());
             var candidateName = selectedType.Name + "Helpers";
             var defaultTypeName = NameGenerator.GenerateUniqueName(candidateName, name => !existingTypeNames.Contains(name));
 
@@ -101,11 +115,68 @@ internal static MoveStaticMembersDialogViewModel GetViewModel(
                 memberViewModels,
                 memberToDependentsMap);
 
-            return new MoveStaticMembersDialogViewModel(selectMembersViewModel,
+            var availableTypeNames = MakeTypeNameItems(
+                selectedType.ContainingNamespace,
+                selectedType,
+                document,
+                history,
+                cancellationTokenSource.Token);
+
+            return new MoveStaticMembersDialogViewModel(
+                selectMembersViewModel,
                 defaultTypeName,
-                existingTypeNames,
+                availableTypeNames,
+                existingTypes,
                 containingNamespaceDisplay,
                 document.GetRequiredLanguageService<ISyntaxFactsService>());
         }
+
+        private void UpdateHistory(MoveStaticMembersDialogViewModel viewModel)
+        {
+            if (viewModel.DestinationName.IsNew || viewModel.DestinationName.IsFromHistory)
+            {
+                // if we create a new destination or already have it in the history,
+                // we don't need to update our history list.
+                return;
+            }
+
+            History.AddFirst(viewModel.DestinationName.NamedType!);
+            if (History.Count > HistorySize)
+            {
+                History.RemoveLast();
+            }
+        }
+
+        private static string GetFile(Location loc) => loc.SourceTree!.FilePath;
+
+        /// <summary>
+        /// Construct all the type names declared in the project,
+        /// </summary>
+        private static ImmutableArray<TypeNameItem> MakeTypeNameItems(
+            INamespaceSymbol currentNamespace,
+            INamedTypeSymbol currentType,
+            Document currentDocument,
+            LinkedList<INamedTypeSymbol> history,
+            CancellationToken cancellationToken)
+        {
+            return currentNamespace.GetAllTypes(cancellationToken)
+                // only take symbols that are the same kind of type (class, module)
+                // and remove non-static types only when the current type is static
+                .Where(t => t.TypeKind == currentType.TypeKind && (t.IsStaticType() || !currentType.IsStaticType()))
+                .SelectMany(t =>
+                {
+                    // for partially declared classes, we may want multiple entries for a single type.
+                    // filter to those actually in a real file, and that is not our current location.
+                    return t.Locations
+                        .Where(l => l.IsInSource &&
+                            (currentType.Name != t.Name || GetFile(l) != currentDocument.FilePath))
+                        .Select(l => new TypeNameItem(
+                            history.Contains(t),
+                            GetFile(l),
+                            t));
+                })
+            .ToImmutableArrayOrEmpty()
+            .Sort(comparison: TypeNameItem.CompareTo);
+        }
     }
 }
diff --git a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
index e353586ff2a3f..f70e2fd08e99b 100644
--- a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
+++ b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
@@ -42,14 +42,14 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
         End Using
         End Function
 
-        Private Function Submit(viewModel As MoveStaticMembersDialogViewModel, cSharp As Boolean) As MoveStaticMembersOptions
+        Private Shared Function Submit(viewModel As MoveStaticMembersDialogViewModel, cSharp As Boolean) As MoveStaticMembersOptions
             Assert.True(viewModel.CanSubmit)
             Dim language = If(cSharp, LanguageNames.CSharp, LanguageNames.VisualBasic)
 
-            Return VisualStudioMoveStaticMembersOptionsService.GenerateOptions(language, viewModel)
+            Return VisualStudioMoveStaticMembersOptionsService.GenerateOptions(language, viewModel, True)
         End Function
 
-        Private Function FindMemberByName(name As String, memberArray As ImmutableArray(Of SymbolViewModel(Of ISymbol))) As SymbolViewModel(Of ISymbol)
+        Private Shared Function FindMemberByName(name As String, memberArray As ImmutableArray(Of SymbolViewModel(Of ISymbol))) As SymbolViewModel(Of ISymbol)
             Dim member = memberArray.FirstOrDefault(Function(memberViewModel) memberViewModel.Symbol.Name.Equals(name))
             Assert.NotNull(member)
             Return member
@@ -93,9 +93,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             ' We can call the method, but we need the document still to test submission
             Dim viewModel = Await GetViewModelAsync(markUp).ConfigureAwait(False)
 
-            Assert.Equal("TestClassHelpers", viewModel.DestinationName)
+            Assert.Equal("TestClassHelpers", viewModel.DestinationName.TypeName)
             viewModel.DestinationName = "ExtraNs.TestClassHelpers"
-            Assert.Equal("ExtraNs.TestClassHelpers", viewModel.DestinationName)
+            Assert.Equal("ExtraNs.TestClassHelpers", viewModel.DestinationName.TypeName)
             Assert.Equal("TestNs.", viewModel.PrependedNamespace)
             Assert.True(viewModel.CanSubmit)
 
@@ -418,7 +418,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             ' b) in the same or nested namespace
             ' c) in the same project
             Assert.Equal(2, viewModel.AvailableTypes.Length)
-            Assert.Equal(-1, viewModel.MemberSelectionViewModel.)
+            Assert.Equal(0, viewModel.MemberSelectionViewModel.CheckedMembers.Length)
 
             ' We can't really test searchtext or selected index behavior because it is
             ' handled by the combobox, and doesn't update in the same way
@@ -788,7 +788,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             ' b) in the same or nested namespace
             ' c) in the same project
             Assert.Equal(2, viewModel.AvailableTypes.Length)
-            Assert.Equal(-1, viewModel.MemberSelection)
+            Assert.Equal(0, viewModel.MemberSelectionViewModel.CheckedMembers.Length)
 
             ' We can't really test searchtext or selected index behavior because it is
             ' handled by the combobox, and doesn't update in the same way

From 41d2f101494b0dacc9b2bedbdab3eb751b740e14 Mon Sep 17 00:00:00 2001
From: Andrew Hall <andrha@microsoft.com>
Date: Thu, 19 May 2022 18:11:57 -0700
Subject: [PATCH 58/64] It compiles

---
 .../MoveStaticMembersViewModelTest.vb         | 68 +++++++++++--------
 1 file changed, 40 insertions(+), 28 deletions(-)

diff --git a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
index f70e2fd08e99b..7522e1e56aa47 100644
--- a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
+++ b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
@@ -94,7 +94,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Dim viewModel = Await GetViewModelAsync(markUp).ConfigureAwait(False)
 
             Assert.Equal("TestClassHelpers", viewModel.DestinationName.TypeName)
-            viewModel.DestinationName = "ExtraNs.TestClassHelpers"
+            SetDestinationName(viewModel, "ExtraNs.TestClassHelpers")
             Assert.Equal("ExtraNs.TestClassHelpers", viewModel.DestinationName.TypeName)
             Assert.Equal("TestNs.", viewModel.PrependedNamespace)
             Assert.True(viewModel.CanSubmit)
@@ -177,7 +177,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
 </Workspace>]]></Text>
             Dim viewModel = Await GetViewModelAsync(markUp)
 
-            Assert.Equal(viewModel.DestinationName, "TestClassHelpers")
+            Assert.Equal(viewModel.DestinationName.TypeName, "TestClassHelpers")
             Assert.Equal("TestNs.", viewModel.PrependedNamespace)
 
             Assert.True(viewModel.ShowMessage)
@@ -186,59 +186,71 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
             Assert.True(viewModel.CanSubmit)
 
-            viewModel.DestinationName = "ConflictingClassName"
+            SetDestinationName(viewModel, "ConflictingClassName")
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
-            viewModel.DestinationName = "ValidName"
+            SetDestinationName(viewModel, "ValidName")
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             ' spaces are not allowed as types
-            viewModel.DestinationName = "asd "
+            SetDestinationName(viewModel, "asd ")
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
             ' different project
-            viewModel.DestinationName = "ConflictingClassName3"
+            SetDestinationName(viewModel, "ConflictingClassName3")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            viewModel.DestinationName = "ITestInterface"
+            SetDestinationName(viewModel, "ITestInterface")
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
-            viewModel.DestinationName = "NoNsClass"
+            SetDestinationName(viewModel, "NoNsClass")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             ' different namespace
-            viewModel.DestinationName = "ConflictingClassName2"
+            SetDestinationName(viewModel, "ConflictingClassName2")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            viewModel.DestinationName = "TestClass"
+            SetDestinationName(viewModel, "TestClass")
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
-            viewModel.DestinationName = "ExtraNamespace.ValidName"
+            SetDestinationName(viewModel, "ExtraNamespace.ValidName")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            viewModel.DestinationName = "ExtraNs.ConflictingNsClassName"
+            SetDestinationName(viewModel, "ExtraNs.ConflictingNsClassName")
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
         End Function
 
+        Private Shared Sub SetDestinationName(viewModel As MoveStaticMembersDialogViewModel, destinationName As String)
+            Dim destination = viewModel.AvailableTypes.FirstOrDefault(Function(availableType As TypeNameItem)
+                                                                          Return availableType.TypeName = destinationName
+                                                                      End Function)
+
+            If destination IsNot Nothing Then
+                viewModel.DestinationName = destination
+            Else
+                viewModel.DestinationName = New TypeNameItem(destinationName)
+            End If
+        End Sub
+
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
         Public Async Function CSTestMemberSelection() As Task
             Dim markUp = <Text><![CDATA[
@@ -466,9 +478,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             ' We can call the method, but we need the document still to test submission
             Dim viewModel = Await GetViewModelAsync(markUp).ConfigureAwait(False)
 
-            Assert.Equal("TestClassHelpers", viewModel.DestinationName)
-            viewModel.DestinationName = "ExtraNs.TestClassHelpers"
-            Assert.Equal("ExtraNs.TestClassHelpers", viewModel.DestinationName)
+            Assert.Equal("TestClassHelpers", viewModel.DestinationName.TypeName)
+            SetDestinationName(viewModel, "ExtraNs.TestClassHelpers")
+            Assert.Equal("ExtraNs.TestClassHelpers", viewModel.DestinationName.TypeName)
             Assert.Equal("TestNs.", viewModel.PrependedNamespace)
             Assert.True(viewModel.CanSubmit)
 
@@ -536,7 +548,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
 </Workspace>]]></Text>
             Dim viewModel = Await GetViewModelAsync(markUp)
 
-            Assert.Equal(viewModel.DestinationName, "TestClassHelpers")
+            Assert.Equal(viewModel.DestinationName.TypeName, "TestClassHelpers")
             Assert.Equal("TestNs.", viewModel.PrependedNamespace)
 
             Assert.True(viewModel.ShowMessage)
@@ -545,54 +557,54 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
             Assert.True(viewModel.CanSubmit)
 
-            viewModel.DestinationName = "ConflictingClassName"
+            SetDestinationName(viewModel, "ConflictingClassName")
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
-            viewModel.DestinationName = "ValidName"
+            SetDestinationName(viewModel, "ValidName")
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             ' spaces are not allowed as types
-            viewModel.DestinationName = "asd "
+            SetDestinationName(viewModel, "asd ")
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
             ' different project
-            viewModel.DestinationName = "ConflictingClassName3"
+            SetDestinationName(viewModel, "ConflictingClassName3")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            viewModel.DestinationName = "ITestInterface"
+            SetDestinationName(viewModel, "ITestInterface")
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
-            viewModel.DestinationName = "NoNsClass"
+            SetDestinationName(viewModel, "NoNsClass")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             ' different namespace
-            viewModel.DestinationName = "ConflictingClassName2"
+            SetDestinationName(viewModel, "ConflictingClassName2")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            viewModel.DestinationName = "TestClass"
+            SetDestinationName(viewModel, "TestClass")
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
-            viewModel.DestinationName = "ExtraNamespace.ValidName"
+            SetDestinationName(viewModel, "ExtraNamespace.ValidName")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            viewModel.DestinationName = "ExtraNs.ConflictingNsClassName"
+            SetDestinationName(viewModel, "ExtraNs.ConflictingNsClassName")
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
@@ -624,7 +636,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
 
             Dim viewModel = Await GetViewModelAsync(markUp)
 
-            Assert.Equal(viewModel.DestinationName, "TestClassHelpers")
+            Assert.Equal(viewModel.DestinationName.TypeName, "TestClassHelpers")
             Assert.Equal("RootNs.TestNs.", viewModel.PrependedNamespace)
 
             Assert.True(viewModel.ShowMessage)
@@ -633,7 +645,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
             Assert.True(viewModel.CanSubmit)
 
-            viewModel.DestinationName = "ConflictingClassName"
+            SetDestinationName(viewModel, "ConflictingClassName")
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)

From cf5c10baaeb02533a4f5cc119d4831a699abcb85 Mon Sep 17 00:00:00 2001
From: Andrew Hall <andrha@microsoft.com>
Date: Wed, 25 May 2022 15:08:15 -0700
Subject: [PATCH 59/64] Fix submit logic and some of the tests. More to follow

---
 .../CSharpMoveStaticMembersTests.cs           | 18 +--------
 .../MoveStaticMembersOptions.cs               |  7 +++-
 .../MoveStaticMembersDialogViewModel.cs       | 10 ++++-
 .../Def/MoveStaticMembers/TypeNameItem.cs     |  1 +
 ...alStudioMoveStaticMembersOptionsService.cs | 18 +++++++--
 .../MoveStaticMembersViewModelTest.vb         | 37 ++++++-------------
 6 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
index 27faade374b19..ee5113cb83832 100644
--- a/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs
@@ -2994,20 +2994,6 @@ public class Class1
         }
         #endregion
 
-        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)]
-        public async Task NoOptionsService_NoAction()
-        {
-            var initialMarkup = @"
-namespace TestNs1
-{
-    public class Class1
-    {
-        public static int TestField = 1;[||]
-    }
-}";
-            await TestNoRefactoringAsync(initialMarkup).ConfigureAwait(false);
-        }
-
         private class Test : VerifyCS.Test
         {
             public Test(
@@ -3037,8 +3023,8 @@ protected override Workspace CreateWorkspaceImpl()
                 var workspace = new AdhocWorkspace(hostServices);
                 var testOptionsService = (TestMoveStaticMembersService)workspace.Services.GetRequiredService<IMoveStaticMembersOptionsService>();
                 testOptionsService.DestinationName = _destinationType;
-                    testOptionsService.SelectedMembers = _selection;
-                    testOptionsService.Filename = _destinationName;
+                testOptionsService.SelectedMembers = _selection;
+                testOptionsService.Filename = _destinationName;
                 testOptionsService.CreateNew = _createNew;
 
                 return workspace;
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
index baaa16ee913eb..9f4c66c7e478c 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
@@ -4,6 +4,7 @@
 
 using System.Collections.Immutable;
 using System.Linq;
+using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.MoveStaticMembers
 {
@@ -33,13 +34,15 @@ internal readonly struct MoveStaticMembersOptions
             isCancelled: true);
 
         public MoveStaticMembersOptions(
-            string fileName,
             INamedTypeSymbol destination,
             ImmutableArray<ISymbol> selectedMembers,
             bool isCancelled = false)
         {
+            var sourceLocation = destination.Locations.First(l => l.IsInSource);
+            RoslynDebug.AssertNotNull(sourceLocation.SourceTree);
+
             IsCancelled = isCancelled;
-            FileName = fileName;
+            FileName = sourceLocation.SourceTree.FilePath;
             IsNewType = false;
             Destination = destination;
             TypeName = null;
diff --git a/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs b/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
index 1ade7f87ba1db..df4ee6a94401a 100644
--- a/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Immutable;
 using System.ComponentModel;
+using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.VisualStudio.Imaging;
@@ -53,7 +54,14 @@ private void MoveMembersToTypeDialogViewModel_PropertyChanged(object sender, Pro
 
         public void OnDestinationUpdated()
         {
-            CanSubmit = _destinationName.IsNew && IsValidType(_destinationName.TypeName);
+            if (!_destinationName.IsNew)
+            {
+                CanSubmit = true;
+                ShowMessage = false;
+                return;
+            }
+
+            CanSubmit = IsValidType(_destinationName.TypeName);
 
             if (CanSubmit)
             {
diff --git a/src/VisualStudio/Core/Def/MoveStaticMembers/TypeNameItem.cs b/src/VisualStudio/Core/Def/MoveStaticMembers/TypeNameItem.cs
index cac997b753feb..664617257d26a 100644
--- a/src/VisualStudio/Core/Def/MoveStaticMembers/TypeNameItem.cs
+++ b/src/VisualStudio/Core/Def/MoveStaticMembers/TypeNameItem.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.CodeAnalysis;
 using Roslyn.Utilities;
 
diff --git a/src/VisualStudio/Core/Def/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index ddef5c6e0ffb6..4f18b014f16e5 100644
--- a/src/VisualStudio/Core/Def/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ b/src/VisualStudio/Core/Def/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Composition;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -69,10 +70,21 @@ internal static MoveStaticMembersOptions GenerateOptions(string language, MoveSt
                 // if the destination name contains extra namespaces, we want the last one as that is the real type name
                 var typeName = viewModel.DestinationName.TypeName.Split('.').Last();
                 var newFileName = Path.ChangeExtension(typeName, language == LanguageNames.CSharp ? ".cs" : ".vb");
+                var selectedMembers = viewModel.MemberSelectionViewModel.CheckedMembers.SelectAsArray(vm => vm.Symbol);
+
+                if (viewModel.DestinationName.IsNew)
+                {
+                    return new MoveStaticMembersOptions(
+                        newFileName,
+                        viewModel.PrependedNamespace + viewModel.DestinationName,
+                        selectedMembers);
+                }
+
+                RoslynDebug.AssertNotNull(viewModel.DestinationName.NamedType);
+
                 return new MoveStaticMembersOptions(
-                    newFileName,
-                    viewModel.PrependedNamespace + viewModel.DestinationName,
-                    viewModel.MemberSelectionViewModel.CheckedMembers.SelectAsArray(vm => vm.Symbol));
+                    viewModel.DestinationName.NamedType,
+                    selectedMembers);
             }
 
             return MoveStaticMembersOptions.Cancelled;
diff --git a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
index 7522e1e56aa47..90a61856d041a 100644
--- a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
+++ b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
@@ -22,15 +22,15 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
         Private Shared Async Function GetViewModelAsync(xmlElement As XElement) As Task(Of MoveStaticMembersDialogViewModel)
             Dim workspaceXml = xmlElement.Value
             Using workspace = TestWorkspace.Create(workspaceXml)
-        Dim doc = workspace.Documents.ElementAt(0)
-        Dim workspaceDoc = workspace.CurrentSolution.GetDocument(doc.Id)
-        If Not doc.CursorPosition.HasValue Then
-        Throw New ArgumentException("Missing caret location in document.")
-        End If
+                Dim doc = workspace.Documents.ElementAt(0)
+                Dim workspaceDoc = workspace.CurrentSolution.GetDocument(doc.Id)
+                If Not doc.CursorPosition.HasValue Then
+                    Throw New ArgumentException("Missing caret location in document.")
+                End If
 
-        Dim tree = Await workspaceDoc.GetSyntaxTreeAsync().ConfigureAwait(False)
+                Dim tree = Await workspaceDoc.GetSyntaxTreeAsync().ConfigureAwait(False)
                 Dim syntaxFacts = workspaceDoc.Project.LanguageServices.GetService(Of ISyntaxFactsService)()
-        Dim token = Await tree.GetTouchingWordAsync(doc.CursorPosition.Value, syntaxFacts, CancellationToken.None).ConfigureAwait(False)
+                Dim token = Await tree.GetTouchingWordAsync(doc.CursorPosition.Value, syntaxFacts, CancellationToken.None).ConfigureAwait(False)
                 Dim memberSymbol = (Await workspaceDoc.GetRequiredSemanticModelAsync(CancellationToken.None)).GetDeclaredSymbol(token.Parent)
                 Return VisualStudioMoveStaticMembersOptionsService.GetViewModel(
                     workspaceDoc,
@@ -39,7 +39,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
                     New LinkedList(Of INamedTypeSymbol),
                     Nothing,
                     workspace.GetService(Of IUIThreadOperationExecutor))
-        End Using
+            End Using
         End Function
 
         Private Shared Function Submit(viewModel As MoveStaticMembersDialogViewModel, cSharp As Boolean) As MoveStaticMembersOptions
@@ -110,7 +110,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
-        Public Async Function CSTestNameConflicts() As Task
+        Public Async Function CSTestInvalidNames() As Task
             Dim markUp = <Text><![CDATA[
 <Workspace>
     <Project Language="C#" AssemblyName="CSAssembly1" CommonReferences="true">
@@ -186,11 +186,6 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
             Assert.True(viewModel.CanSubmit)
 
-            SetDestinationName(viewModel, "ConflictingClassName")
-            Assert.False(viewModel.CanSubmit)
-            Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
-
             SetDestinationName(viewModel, "ValidName")
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
@@ -232,11 +227,6 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
-
-            SetDestinationName(viewModel, "ExtraNs.ConflictingNsClassName")
-            Assert.False(viewModel.CanSubmit)
-            Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
         End Function
 
         Private Shared Sub SetDestinationName(viewModel As MoveStaticMembersDialogViewModel, destinationName As String)
@@ -244,11 +234,8 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
                                                                           Return availableType.TypeName = destinationName
                                                                       End Function)
 
-            If destination IsNot Nothing Then
-                viewModel.DestinationName = destination
-            Else
-                viewModel.DestinationName = New TypeNameItem(destinationName)
-            End If
+            destination = If(destination, New TypeNameItem(destinationName))
+            viewModel.DestinationName = destination
         End Sub
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -430,7 +417,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             ' b) in the same or nested namespace
             ' c) in the same project
             Assert.Equal(2, viewModel.AvailableTypes.Length)
-            Assert.Equal(0, viewModel.MemberSelectionViewModel.CheckedMembers.Length)
+            Assert.Equal(1, viewModel.MemberSelectionViewModel.CheckedMembers.Length)
 
             ' We can't really test searchtext or selected index behavior because it is
             ' handled by the combobox, and doesn't update in the same way

From 719d0651b57ad15c663d2634bd4c5692bc00163a Mon Sep 17 00:00:00 2001
From: Andrew Hall <andrha@microsoft.com>
Date: Wed, 25 May 2022 15:10:47 -0700
Subject: [PATCH 60/64] Use declaring syntax instead of locations

---
 .../TestMoveStaticMembersService.cs           | 21 +++++++++----------
 .../MoveStaticMembersOptions.cs               |  6 +++---
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
index fc1eebe71f601..901aab1f94123 100644
--- a/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
+++ b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
@@ -36,19 +36,18 @@ public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, I
             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 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);
-            var destinationFile = Filename ?? destination.DeclaringSyntaxReferences.Single().SyntaxTree.FilePath;
-            return new MoveStaticMembersOptions(destinationFile, destination, selectedMembers);
+            return new MoveStaticMembersOptions(destination, selectedMembers);
         }
     }
 }
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
index 9f4c66c7e478c..5f85207e28c22 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
@@ -38,11 +38,11 @@ public MoveStaticMembersOptions(
             ImmutableArray<ISymbol> selectedMembers,
             bool isCancelled = false)
         {
-            var sourceLocation = destination.Locations.First(l => l.IsInSource);
-            RoslynDebug.AssertNotNull(sourceLocation.SourceTree);
+            var sourceLocation = destination.DeclaringSyntaxReferences.First();
+            RoslynDebug.AssertNotNull(sourceLocation.SyntaxTree);
 
             IsCancelled = isCancelled;
-            FileName = sourceLocation.SourceTree.FilePath;
+            FileName = sourceLocation.SyntaxTree.FilePath;
             IsNewType = false;
             Destination = destination;
             TypeName = null;

From 7f8f879291780a9dcc1eec21b24f206add2c0c00 Mon Sep 17 00:00:00 2001
From: Andrew Hall <andrha@microsoft.com>
Date: Fri, 27 May 2022 14:30:21 -0700
Subject: [PATCH 61/64] Fix test expectations

---
 .../MoveStaticMembersWithDialogCodeAction.cs  |  2 +-
 .../MoveStaticMembersViewModelTest.vb         | 41 ++++---------------
 2 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
index 2bad9e229f854..0c27b1b51b98c 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersWithDialogCodeAction.cs
@@ -107,7 +107,7 @@ protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperation
                 Accessibility.NotApplicable,
                 DeclarationModifiers.Static,
                 GetNewTypeKind(_selectedType),
-                moveOptions.TypeName,
+                moveOptions.TypeName!,
                 typeParameters: typeParameters);
 
             var (newDoc, annotation) = await ExtractTypeHelpers.AddTypeToNewFileAsync(
diff --git a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
index 90a61856d041a..bca75277f591f 100644
--- a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
+++ b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
@@ -202,11 +202,6 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            SetDestinationName(viewModel, "ITestInterface")
-            Assert.False(viewModel.CanSubmit)
-            Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
-
             SetDestinationName(viewModel, "NoNsClass")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
@@ -218,11 +213,6 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            SetDestinationName(viewModel, "TestClass")
-            Assert.False(viewModel.CanSubmit)
-            Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
-
             SetDestinationName(viewModel, "ExtraNamespace.ValidName")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
@@ -544,10 +534,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
             Assert.True(viewModel.CanSubmit)
 
-            SetDestinationName(viewModel, "ConflictingClassName")
-            Assert.False(viewModel.CanSubmit)
-            Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+            SetDestinationName(viewModel, "TestNs.ConflictingClassName")
+            Assert.True(viewModel.CanSubmit)
+            Assert.False(viewModel.ShowMessage)
 
             SetDestinationName(viewModel, "ValidName")
             Assert.True(viewModel.ShowMessage)
@@ -565,11 +554,6 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            SetDestinationName(viewModel, "ITestInterface")
-            Assert.False(viewModel.CanSubmit)
-            Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
-
             SetDestinationName(viewModel, "NoNsClass")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
@@ -581,20 +565,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            SetDestinationName(viewModel, "TestClass")
-            Assert.False(viewModel.CanSubmit)
-            Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
-
             SetDestinationName(viewModel, "ExtraNamespace.ValidName")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
-
-            SetDestinationName(viewModel, "ExtraNs.ConflictingNsClassName")
-            Assert.False(viewModel.CanSubmit)
-            Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -632,10 +606,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
             Assert.True(viewModel.CanSubmit)
 
-            SetDestinationName(viewModel, "ConflictingClassName")
-            Assert.False(viewModel.CanSubmit)
-            Assert.True(viewModel.ShowMessage)
-            Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
+            SetDestinationName(viewModel, "RootNs.TestNs.ConflictingClassName")
+            Assert.True(viewModel.CanSubmit)
+            Assert.False(viewModel.ShowMessage)
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -787,7 +760,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             ' b) in the same or nested namespace
             ' c) in the same project
             Assert.Equal(2, viewModel.AvailableTypes.Length)
-            Assert.Equal(0, viewModel.MemberSelectionViewModel.CheckedMembers.Length)
+            Assert.Equal(1, viewModel.MemberSelectionViewModel.CheckedMembers.Length)
 
             ' We can't really test searchtext or selected index behavior because it is
             ' handled by the combobox, and doesn't update in the same way

From 51849e5eb7c881f76a2e3c35d12cb5189c315907 Mon Sep 17 00:00:00 2001
From: Andrew Hall <ryzngard@live.com>
Date: Mon, 30 May 2022 12:27:29 -0700
Subject: [PATCH 62/64] Update
 src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs

Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com>
---
 .../MoveStaticMembers/TestMoveStaticMembersService.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
index 901aab1f94123..0e39174413f81 100644
--- a/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
+++ b/src/EditorFeatures/TestUtilities/MoveStaticMembers/TestMoveStaticMembersService.cs
@@ -42,7 +42,7 @@ public MoveStaticMembersOptions GetMoveMembersToTypeOptions(Document document, I
                 // just return all the selected members
                 return new MoveStaticMembersOptions(
                     Filename!,
-                        string.Join(".", namespaceDisplay, DestinationName!),
+                    string.Join(".", namespaceDisplay, DestinationName!),
                     selectedMembers);
             }
 

From 39490bbe754bd3dd661a4bda5617e40997008420 Mon Sep 17 00:00:00 2001
From: Andrew Hall <andrha@microsoft.com>
Date: Mon, 30 May 2022 13:00:17 -0700
Subject: [PATCH 63/64] PR feedback. Update search to work with combobox

---
 .../Core/Portable/FeaturesResources.resx      | 54 +++++++++----------
 .../MoveStaticMembersOptions.cs               |  6 +--
 .../MoveStaticMembersDialog.xaml              |  2 +-
 .../MoveStaticMembersDialogViewModel.cs       | 22 ++++++--
 ...alStudioMoveStaticMembersOptionsService.cs |  1 -
 .../MoveStaticMembersViewModelTest.vb         | 53 ++++++++----------
 6 files changed, 70 insertions(+), 68 deletions(-)

diff --git a/src/Features/Core/Portable/FeaturesResources.resx b/src/Features/Core/Portable/FeaturesResources.resx
index b2a4758cddcbb..00a04f5cb7671 100644
--- a/src/Features/Core/Portable/FeaturesResources.resx
+++ b/src/Features/Core/Portable/FeaturesResources.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
     Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
diff --git a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
index 5f85207e28c22..6975629882700 100644
--- a/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
+++ b/src/Features/Core/Portable/MoveStaticMembers/MoveStaticMembersOptions.cs
@@ -16,13 +16,13 @@ internal readonly struct MoveStaticMembersOptions
 
         public bool IsNewType { get; }
 
-        /// only has value when IsNewType is false
+        // only has value when IsNewType is false
         public INamedTypeSymbol? Destination { get; }
 
-        /// only has value when IsNewType is true
+        // only has value when IsNewType is true
         public string? TypeName { get; }
 
-        /// only has value when IsNewType is true
+        // only has value when IsNewType is true
         public string? NamespaceDisplay { get; }
 
         public ImmutableArray<ISymbol> SelectedMembers { get; }
diff --git a/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialog.xaml b/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialog.xaml
index 90d281f923edf..d656667ae1413 100644
--- a/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialog.xaml
+++ b/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialog.xaml
@@ -33,7 +33,7 @@
     </vs:DialogWindow.Resources>
     <Grid Margin="11,6,11,11">
         <Grid.RowDefinitions>
-            <RowDefinition Height="160"/>
+            <RowDefinition Height="Auto"/>
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
diff --git a/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs b/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
index df4ee6a94401a..3cd86f203ecc1 100644
--- a/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
+++ b/src/VisualStudio/Core/Def/MoveStaticMembers/MoveStaticMembersDialogViewModel.cs
@@ -20,13 +20,10 @@ internal class MoveStaticMembersDialogViewModel : AbstractNotifyPropertyChanged
 
         private readonly ISyntaxFacts _syntaxFacts;
 
-        private readonly ImmutableArray<INamedTypeSymbol> _conflictingTypeNames;
-
         public MoveStaticMembersDialogViewModel(
             StaticMemberSelectionViewModel memberSelectionViewModel,
             string defaultType,
             ImmutableArray<TypeNameItem> availableTypes,
-            ImmutableArray<INamedTypeSymbol> conflictingTypeNames,
             string prependedNamespace,
             ISyntaxFacts syntaxFacts)
         {
@@ -34,7 +31,6 @@ public MoveStaticMembersDialogViewModel(
             _syntaxFacts = syntaxFacts ?? throw new ArgumentNullException(nameof(syntaxFacts));
             _searchText = defaultType;
             _destinationName = new TypeNameItem(defaultType);
-            _conflictingTypeNames = conflictingTypeNames;
             AvailableTypes = availableTypes;
             PrependedNamespace = string.IsNullOrEmpty(prependedNamespace) ? prependedNamespace : prependedNamespace + ".";
 
@@ -49,7 +45,23 @@ private void MoveMembersToTypeDialogViewModel_PropertyChanged(object sender, Pro
                 case nameof(DestinationName):
                     OnDestinationUpdated();
                     break;
+
+                case nameof(SearchText):
+                    OnSearchTextUpdated();
+                    break;
+            }
+        }
+
+        private void OnSearchTextUpdated()
+        {
+            var foundItem = AvailableTypes.FirstOrDefault(t => t.TypeName == SearchText);
+            if (foundItem is null)
+            {
+                DestinationName = new(PrependedNamespace + SearchText);
+                return;
             }
+
+            DestinationName = foundItem;
         }
 
         public void OnDestinationUpdated()
@@ -104,7 +116,7 @@ private bool IsValidType(string typeName)
         public TypeNameItem DestinationName
         {
             get => _destinationName;
-            set => SetProperty(ref _destinationName, value);
+            private set => SetProperty(ref _destinationName, value);
         }
 
         private ImageMoniker _icon;
diff --git a/src/VisualStudio/Core/Def/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index 4f18b014f16e5..cab0fa7985ee5 100644
--- a/src/VisualStudio/Core/Def/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ b/src/VisualStudio/Core/Def/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -138,7 +138,6 @@ internal static MoveStaticMembersDialogViewModel GetViewModel(
                 selectMembersViewModel,
                 defaultTypeName,
                 availableTypeNames,
-                existingTypes,
                 containingNamespaceDisplay,
                 document.GetRequiredLanguageService<ISyntaxFactsService>());
         }
diff --git a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
index bca75277f591f..1f73d59f94fe2 100644
--- a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
+++ b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
@@ -94,7 +94,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Dim viewModel = Await GetViewModelAsync(markUp).ConfigureAwait(False)
 
             Assert.Equal("TestClassHelpers", viewModel.DestinationName.TypeName)
-            SetDestinationName(viewModel, "ExtraNs.TestClassHelpers")
+            SetSearchText(viewModel, "ExtraNs.TestClassHelpers")
             Assert.Equal("ExtraNs.TestClassHelpers", viewModel.DestinationName.TypeName)
             Assert.Equal("TestNs.", viewModel.PrependedNamespace)
             Assert.True(viewModel.CanSubmit)
@@ -186,46 +186,41 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
             Assert.True(viewModel.CanSubmit)
 
-            SetDestinationName(viewModel, "ValidName")
+            SetSearchText(viewModel, "ValidName")
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             ' spaces are not allowed as types
-            SetDestinationName(viewModel, "asd ")
+            SetSearchText(viewModel, "asd ")
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
             ' different project
-            SetDestinationName(viewModel, "ConflictingClassName3")
+            SetSearchText(viewModel, "ConflictingClassName3")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            SetDestinationName(viewModel, "NoNsClass")
+            SetSearchText(viewModel, "NoNsClass")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             ' different namespace
-            SetDestinationName(viewModel, "ConflictingClassName2")
+            SetSearchText(viewModel, "ConflictingClassName2")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            SetDestinationName(viewModel, "ExtraNamespace.ValidName")
+            SetSearchText(viewModel, "ExtraNamespace.ValidName")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
         End Function
 
-        Private Shared Sub SetDestinationName(viewModel As MoveStaticMembersDialogViewModel, destinationName As String)
-            Dim destination = viewModel.AvailableTypes.FirstOrDefault(Function(availableType As TypeNameItem)
-                                                                          Return availableType.TypeName = destinationName
-                                                                      End Function)
-
-            destination = If(destination, New TypeNameItem(destinationName))
-            viewModel.DestinationName = destination
+        Private Shared Sub SetSearchText(viewModel As MoveStaticMembersDialogViewModel, destinationName As String)
+            viewModel.SearchText = destinationName
         End Sub
 
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveStaticMembers)>
@@ -409,16 +404,14 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.Equal(2, viewModel.AvailableTypes.Length)
             Assert.Equal(1, viewModel.MemberSelectionViewModel.CheckedMembers.Length)
 
-            ' We can't really test searchtext or selected index behavior because it is
-            ' handled by the combobox, and doesn't update in the same way
-            viewModel.DestinationName = viewModel.AvailableTypes.ElementAt(1)
+            viewModel.SearchText = viewModel.AvailableTypes.ElementAt(1).TypeName
             Assert.Equal("TestNs.ExtraNs.ConflictingNsClassName", viewModel.DestinationName.TypeName)
             Assert.NotNull(viewModel.DestinationName.NamedType)
             Assert.False(viewModel.DestinationName.IsNew)
             Assert.False(viewModel.ShowMessage)
             Assert.True(viewModel.CanSubmit)
 
-            viewModel.DestinationName = viewModel.AvailableTypes.ElementAt(0)
+            viewModel.SearchText = viewModel.AvailableTypes.ElementAt(0).TypeName
             Assert.Equal("TestNs.ConflictingClassName", viewModel.DestinationName.TypeName)
             Assert.NotNull(viewModel.DestinationName.NamedType)
             Assert.False(viewModel.DestinationName.IsNew)
@@ -456,7 +449,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Dim viewModel = Await GetViewModelAsync(markUp).ConfigureAwait(False)
 
             Assert.Equal("TestClassHelpers", viewModel.DestinationName.TypeName)
-            SetDestinationName(viewModel, "ExtraNs.TestClassHelpers")
+            SetSearchText(viewModel, "ExtraNs.TestClassHelpers")
             Assert.Equal("ExtraNs.TestClassHelpers", viewModel.DestinationName.TypeName)
             Assert.Equal("TestNs.", viewModel.PrependedNamespace)
             Assert.True(viewModel.CanSubmit)
@@ -534,38 +527,38 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
             Assert.True(viewModel.CanSubmit)
 
-            SetDestinationName(viewModel, "TestNs.ConflictingClassName")
+            SetSearchText(viewModel, "TestNs.ConflictingClassName")
             Assert.True(viewModel.CanSubmit)
             Assert.False(viewModel.ShowMessage)
 
-            SetDestinationName(viewModel, "ValidName")
+            SetSearchText(viewModel, "ValidName")
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             ' spaces are not allowed as types
-            SetDestinationName(viewModel, "asd ")
+            SetSearchText(viewModel, "asd ")
             Assert.False(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.Invalid_type_name, viewModel.Message)
 
             ' different project
-            SetDestinationName(viewModel, "ConflictingClassName3")
+            SetSearchText(viewModel, "ConflictingClassName3")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            SetDestinationName(viewModel, "NoNsClass")
+            SetSearchText(viewModel, "NoNsClass")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
             ' different namespace
-            SetDestinationName(viewModel, "ConflictingClassName2")
+            SetSearchText(viewModel, "ConflictingClassName2")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
 
-            SetDestinationName(viewModel, "ExtraNamespace.ValidName")
+            SetSearchText(viewModel, "ExtraNamespace.ValidName")
             Assert.True(viewModel.CanSubmit)
             Assert.True(viewModel.ShowMessage)
             Assert.Equal(ServicesVSResources.New_Type_Name_colon, viewModel.Message)
@@ -606,7 +599,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.False(viewModel.MemberSelectionViewModel.CheckedMembers.IsEmpty)
             Assert.True(viewModel.CanSubmit)
 
-            SetDestinationName(viewModel, "RootNs.TestNs.ConflictingClassName")
+            SetSearchText(viewModel, "RootNs.TestNs.ConflictingClassName")
             Assert.True(viewModel.CanSubmit)
             Assert.False(viewModel.ShowMessage)
         End Function
@@ -762,16 +755,14 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
             Assert.Equal(2, viewModel.AvailableTypes.Length)
             Assert.Equal(1, viewModel.MemberSelectionViewModel.CheckedMembers.Length)
 
-            ' We can't really test searchtext or selected index behavior because it is
-            ' handled by the combobox, and doesn't update in the same way
-            viewModel.DestinationName = viewModel.AvailableTypes.ElementAt(1)
+            viewModel.SearchText = viewModel.AvailableTypes.ElementAt(1).TypeName
             Assert.Equal("TestNs.ExtraNs.ConflictingNsClassName", viewModel.DestinationName.TypeName)
             Assert.NotNull(viewModel.DestinationName.NamedType)
             Assert.False(viewModel.DestinationName.IsNew)
             Assert.False(viewModel.ShowMessage)
             Assert.True(viewModel.CanSubmit)
 
-            viewModel.DestinationName = viewModel.AvailableTypes.ElementAt(0)
+            viewModel.SearchText = viewModel.AvailableTypes.ElementAt(0).TypeName
             Assert.Equal("TestNs.ConflictingClassName", viewModel.DestinationName.TypeName)
             Assert.NotNull(viewModel.DestinationName.NamedType)
             Assert.False(viewModel.DestinationName.IsNew)

From 3c912ad3a2d0199e4218bfd4193b7a5ac4c8e189 Mon Sep 17 00:00:00 2001
From: Andrew Hall <andrha@microsoft.com>
Date: Mon, 30 May 2022 15:45:08 -0700
Subject: [PATCH 64/64] Fix that destination will include prepended namespace
 if it's a new type

---
 .../VisualStudioMoveStaticMembersOptionsService.cs            | 2 +-
 .../Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/VisualStudio/Core/Def/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs b/src/VisualStudio/Core/Def/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
index cab0fa7985ee5..88ca05381b3fb 100644
--- a/src/VisualStudio/Core/Def/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
+++ b/src/VisualStudio/Core/Def/MoveStaticMembers/VisualStudioMoveStaticMembersOptionsService.cs
@@ -76,7 +76,7 @@ internal static MoveStaticMembersOptions GenerateOptions(string language, MoveSt
                 {
                     return new MoveStaticMembersOptions(
                         newFileName,
-                        viewModel.PrependedNamespace + viewModel.DestinationName,
+                        viewModel.DestinationName.TypeName,
                         selectedMembers);
                 }
 
diff --git a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
index 1f73d59f94fe2..11a6f240a1b3c 100644
--- a/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
+++ b/src/VisualStudio/Core/Test/MoveStaticMembers/MoveStaticMembersViewModelTest.vb
@@ -95,7 +95,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
 
             Assert.Equal("TestClassHelpers", viewModel.DestinationName.TypeName)
             SetSearchText(viewModel, "ExtraNs.TestClassHelpers")
-            Assert.Equal("ExtraNs.TestClassHelpers", viewModel.DestinationName.TypeName)
+            Assert.Equal("TestNs.ExtraNs.TestClassHelpers", viewModel.DestinationName.TypeName)
             Assert.Equal("TestNs.", viewModel.PrependedNamespace)
             Assert.True(viewModel.CanSubmit)
 
@@ -450,7 +450,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveStaticMembers
 
             Assert.Equal("TestClassHelpers", viewModel.DestinationName.TypeName)
             SetSearchText(viewModel, "ExtraNs.TestClassHelpers")
-            Assert.Equal("ExtraNs.TestClassHelpers", viewModel.DestinationName.TypeName)
+            Assert.Equal("TestNs.ExtraNs.TestClassHelpers", viewModel.DestinationName.TypeName)
             Assert.Equal("TestNs.", viewModel.PrependedNamespace)
             Assert.True(viewModel.CanSubmit)